From bdwalton at users.sourceforge.net Mon Dec 1 15:58:47 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 01 Dec 2008 14:58:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[2419] csw/mgar/pkg Message-ID: Revision: 2419 http://gar.svn.sourceforge.net/gar/?rev=2419&view=rev Author: bdwalton Date: 2008-12-01 14:58:46 +0000 (Mon, 01 Dec 2008) Log Message: ----------- Skeleton of the new docbook-dtds package. Added Paths: ----------- csw/mgar/pkg/docbook-dtds/ csw/mgar/pkg/docbook-dtds/branches/ csw/mgar/pkg/docbook-dtds/tags/ csw/mgar/pkg/docbook-dtds/trunk/ csw/mgar/pkg/docbook-dtds/trunk/Makefile csw/mgar/pkg/docbook-dtds/trunk/files/ Property changes on: csw/mgar/pkg/docbook-dtds/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 Added: csw/mgar/pkg/docbook-dtds/trunk/Makefile =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/Makefile (rev 0) +++ csw/mgar/pkg/docbook-dtds/trunk/Makefile 2008-12-01 14:58:46 UTC (rev 2419) @@ -0,0 +1,16 @@ +GARNAME = package +GARVERSION = 1.0 +CATEGORIES = category + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWpackage,) + +CONFIGURE_ARGS = $(DIRPATHS) + +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 Mon Dec 1 19:24:02 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 01 Dec 2008 18:24:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[2420] csw/mgar/pkg/docbook-dtds/trunk Message-ID: Revision: 2420 http://gar.svn.sourceforge.net/gar/?rev=2420&view=rev Author: bdwalton Date: 2008-12-01 18:24:02 +0000 (Mon, 01 Dec 2008) Log Message: ----------- Horrible extract process works. Overrode zip-extract-FOO for each source file so that they could go to a specific location (non-standard). Patched updated to reflect csw/gar needs as opposed to the rhel5 rpm spec usage. Modified Paths: -------------- csw/mgar/pkg/docbook-dtds/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/docbook-dtds/trunk/checksums csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.gspec csw/mgar/pkg/docbook-dtds/trunk/files/docbook-4.2-euro.patch csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtd30-sgml-1.0.catalog.patch csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtd31-sgml-1.0.catalog.patch csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtd40-sgml-1.0.catalog.patch csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtd41-sgml-1.0.catalog.patch csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtd42-sgml-1.0.catalog.patch csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtds-ents.patch Modified: csw/mgar/pkg/docbook-dtds/trunk/Makefile =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/Makefile 2008-12-01 14:58:46 UTC (rev 2419) +++ csw/mgar/pkg/docbook-dtds/trunk/Makefile 2008-12-01 18:24:02 UTC (rev 2420) @@ -1,16 +1,138 @@ -GARNAME = package -GARVERSION = 1.0 -CATEGORIES = category +GARNAME = docbookdtds +GARVERSION = 1.0.30 +PATCHLEVEL = 1 +CATEGORIES = xtra -DESCRIPTION = Brief description +PREREQUISITES = CSWunzip + +DESCRIPTION = SGML and XML document type definitions for DocBook. define BLURB - Long description +The DocBook Document Type Definition (DTD) describes the syntax of +technical documentation texts (articles, books and manual pages). +This syntax is XML-compliant and is developed by the OASIS consortium. +This package contains SGML and XML versions of the DocBook DTD. endef -MASTER_SITES = -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWpackage,) +# The following is from the rhel5 1.0.3.1 docbook-dtds spec file. Given +# this list, we put together the insane list of master_sites and distfiles +# below...the initial wget kinda stinks, but it gets the job done. -CONFIGURE_ARGS = $(DIRPATHS) +# Source0: http://www.oasis-open.org/docbook/sgml/3.0/docbk30.zip +# Source1: http://www.oasis-open.org/docbook/sgml/3.1/docbk31.zip +# Source2: http://www.oasis-open.org/docbook/sgml/4.0/docbk40.zip +# Source3: http://www.oasis-open.org/docbook/sgml/4.1/docbk41.zip +# Source4: http://www.oasis-open.org/docbook/xml/4.1.2/docbkx412.zip +# Source5: http://www.oasis-open.org/docbook/sgml/4.2/docbook-4.2.zip +# Source6: http://www.oasis-open.org/docbook/xml/4.2/docbook-xml-4.2.zip +# Source7: http://www.docbook.org/sgml/4.3/docbook-4.3.zip +# Source8: http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip +# Source9: http://www.docbook.org/sgml/4.4/docbook-4.4.zip +# Source10: http://www.docbook.org/xml/4.4/docbook-xml-4.4.zip +OASIS = http://www.oasis-open.org/docbook +DOCBOOK = http://www.docbook.org + +# based on the above, we'll need to look for files in the following locations +# ...basically one file per url. that blows, eh? +O_SRC = $(OASIS)/sgml/3.0/ $(OASIS)/sgml/3.1/ $(OASIS)/sgml/4.0/ +O_SRC += $(OASIS)/sgml/4.1/ $(OASIS)/xml/4.1.2/ $(OASIS)/sgml/4.2/ +O_SRC += $(OASIS)/xml/4.2/ +D_SRC = $(DOCBOOK)/sgml/4.3/ $(DOCBOOK)/xml/4.3/ $(DOCBOOK)/sgml/4.4/ +D_SRC += $(DOCBOOK)/xml/4.4/ + +# the various files we'll need to fetch from the various sources +DBFILES = docbk30.zip docbk31.zip docbk40.zip docbk41.zip docbkx412.zip +DBFILES += docbook-4.2.zip docbook-xml-4.2.zip docbook-4.3.zip +DBFILES += docbook-xml-4.3.zip docbook-4.4.zip docbook-xml-4.4.zip + +MASTER_SITES = $(O_SRC) $(D_SRC) +DISTFILES = $(DBFILES) + +PATCHFILES = docbook-4.2-euro.patch docbook-dtd30-sgml-1.0.catalog.patch +PATCHFILES += docbook-dtd31-sgml-1.0.catalog.patch +PATCHFILES += docbook-dtd40-sgml-1.0.catalog.patch +PATCHFILES += docbook-dtd41-sgml-1.0.catalog.patch +PATCHFILES += docbook-dtd42-sgml-1.0.catalog.patch +PATCHFILES += docbook-dtds-ents.patch + +#CONFIGURE_ARGS = $(DIRPATHS) + include gar/category.mk + +# BuildArch: noarch + +# Patch0: docbook-dtd30-sgml-1.0.catalog.patch +# Patch1: docbook-dtd31-sgml-1.0.catalog.patch +# Patch2: docbook-dtd40-sgml-1.0.catalog.patch +# Patch3: docbook-dtd41-sgml-1.0.catalog.patch +# Patch4: docbook-dtd42-sgml-1.0.catalog.patch +# Patch5: docbook-4.2-euro.patch +# Patch6: docbook-dtds-ents.patch + +local-zip-%: + @echo " ==> Extracting $(DOWNLOADDIR)/$*" + @unzip $(DOWNLOADDIR)/$* -d $(EXTRACTDIR) + @$(MAKECOOKIE) + +SGMLDIRS = 3.0 3.1 4.0 4.1 4.2 4.3 4.4 +XMLDIRS = 4.1.2 4.2 4.3 4.4 + + +# ok, for each source, we make an explicit target that overrides the implicit +# zip-extract-% targets in GAR. +zip-extract-docbk30.zip: + unzip $(DOWNLOADDIR)/docbk30.zip -d $(WORKSRC)/3.0-sgml + @$(MAKECOOKIE) + +zip-extract-docbk31.zip: + unzip $(DOWNLOADDIR)/docbk31.zip -d $(WORKSRC)/3.1-sgml + @$(MAKECOOKIE) + +zip-extract-docbk40.zip: + unzip $(DOWNLOADDIR)/docbk40.zip -d $(WORKSRC)/4.0-sgml + @$(MAKECOOKIE) + +zip-extract-docbk41.zip: + unzip $(DOWNLOADDIR)/docbk41.zip -d $(WORKSRC)/4.1-sgml + @$(MAKECOOKIE) + +zip-extract-docbook-4.2.zip: + unzip $(DOWNLOADDIR)/docbook-4.2.zip -d $(WORKSRC)/4.2-sgml + @$(MAKECOOKIE) + +zip-extract-docbkx412.zip: + unzip $(DOWNLOADDIR)/docbkx412.zip -d $(WORKSRC)/4.1.2-xml + @$(MAKECOOKIE) + + +zip-extract-docbook-4.3.zip: + unzip $(DOWNLOADDIR)/docbook-4.3.zip -d $(WORKSRC)/4.3-sgml + @$(MAKECOOKIE) + +zip-extract-docbook-4.4.zip: + unzip $(DOWNLOADDIR)/docbook-4.4.zip -d $(WORKSRC)/4.4-sgml + @$(MAKECOOKIE) + +zip-extract-docbook-xml-4.2.zip: + unzip $(DOWNLOADDIR)/docbook-xml-4.2.zip -d $(WORKSRC)/4.2-xml + @$(MAKECOOKIE) + +zip-extract-docbook-xml-4.3.zip: + unzip $(DOWNLOADDIR)/docbook-xml-4.3.zip -d $(WORKSRC)/4.3-xml + @$(MAKECOOKIE) + +zip-extract-docbook-xml-4.4.zip: + unzip $(DOWNLOADDIR)/docbook-xml-4.4.zip -d $(WORKSRC)/4.4-xml + @$(MAKECOOKIE) + +# we override extract for our needs...man this is horrible! (note the cookie +# madness) +pre-extract: $(WORKSRC) + ( cd $(WORKSRC); \ + for d in $(SGMLDIRS); do \ + mkdir $$d-sgml; \ + done; \ + for d in $(XMLDIRS); do \ + mkdir $$d-xml; \ + done ) + @$(MAKECOOKIE) \ No newline at end of file Added: csw/mgar/pkg/docbook-dtds/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/checksums (rev 0) +++ csw/mgar/pkg/docbook-dtds/trunk/checksums 2008-12-01 18:24:02 UTC (rev 2420) @@ -0,0 +1,18 @@ +9a7f5b1b7dd52d0ca4fb080619f0459c download/docbk30.zip +432749c0c806dbae81c8bcb70da3b5d3 download/docbk31.zip +fabcf7dd1d88b94797b7e5344389eab9 download/docbk40.zip +489f6ff2a2173eb1e14216c10533ede2 download/docbk41.zip +900d7609fb7e6d78901b357e4acfbc17 download/docbkx412.zip +0dfeb94569334dd22a62d90d99fc0630 download/docbook-4.2.zip +73fe50dfe74ca631c1602f558ed8961f download/docbook-xml-4.2.zip +e3beb1b0b2923c24fa55a68e88654b01 download/docbook-4.3.zip +ab200202b9e136a144db1e0864c45074 download/docbook-xml-4.3.zip +f89e1bd0b2c7a361e3f1f739e16b5d0d download/docbook-4.4.zip +cbb04e9a700955d88c50962ef22c1634 download/docbook-xml-4.4.zip +318742d3a6648a6905727f071cbc9847 download/docbook-4.2-euro.patch +e3067045964536cc7445d5c3f1e99916 download/docbook-dtd30-sgml-1.0.catalog.patch +856d40f5d1e3fc8fd939b88bf5fedc87 download/docbook-dtd31-sgml-1.0.catalog.patch +8167663f53857ded5095768a85eee387 download/docbook-dtd40-sgml-1.0.catalog.patch +e976c302070ec2e14316d4a601c224cb download/docbook-dtd41-sgml-1.0.catalog.patch +0ee42c28835cd448b6b47b2345394b28 download/docbook-dtd42-sgml-1.0.catalog.patch +1dae3f33fe7dda3fd68a4d4a3df2c653 download/docbook-dtds-ents.patch Added: csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.gspec =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.gspec (rev 0) +++ csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.gspec 2008-12-01 18:24:02 UTC (rev 2420) @@ -0,0 +1,4 @@ +%var bitname package +%var pkgname CSWpackage +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKSRC}/LICENSE Added: csw/mgar/pkg/docbook-dtds/trunk/files/docbook-4.2-euro.patch =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/docbook-4.2-euro.patch (rev 0) +++ csw/mgar/pkg/docbook-dtds/trunk/files/docbook-4.2-euro.patch 2008-12-01 18:24:02 UTC (rev 2420) @@ -0,0 +1,22 @@ +--- docbook-dtds-1.0/4.2-sgml/docbookx.dtd.euro 2003-07-15 09:07:58.000000000 +0100 ++++ docbook-dtds-1.0/4.2-sgml/docbookx.dtd 2003-07-15 09:08:12.000000000 +0100 +@@ -106,7 +106,7 @@ + ++ + ]]> + +--- docbook-dtds-1.0/4.2-xml/docbookx.dtd.euro 2003-07-15 09:08:02.000000000 +0100 ++++ docbook-dtds-1.0/4.2-xml/docbookx.dtd 2003-07-15 09:08:21.000000000 +0100 +@@ -106,7 +106,7 @@ + ++ + ]]> + Added: csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtd30-sgml-1.0.catalog.patch =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtd30-sgml-1.0.catalog.patch (rev 0) +++ csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtd30-sgml-1.0.catalog.patch 2008-12-01 18:24:02 UTC (rev 2420) @@ -0,0 +1,41 @@ +--- docbook-1.0.30/3.0-sgml/docbook.cat Tue Dec 10 16:35:22 1996 ++++ docbook-1.0.30/3.0-sgml/catalog Mon Jun 5 11:08:34 2000 +@@ -27,7 +27,7 @@ + -- ...................................................................... -- + -- SGML declaration associated with DocBook ............................. -- + +-DTDDECL "-//Davenport//DTD DocBook V3.0//EN" "docbook.dcl" ++SGMLDECL "docbook.dcl" + + -- ...................................................................... -- + -- DocBook driver file .................................................. -- +@@ -41,29 +41,6 @@ + PUBLIC "-//Davenport//ELEMENTS DocBook Information Pool V3.0//EN" "dbpool.mod" + PUBLIC "-//Davenport//ELEMENTS DocBook Document Hierarchy V3.0//EN" "dbhier.mod" + PUBLIC "-//Davenport//ENTITIES DocBook Additional General Entities V3.0//EN" "dbgenent.mod" +- +- -- ...................................................................... -- +- -- ISO entity sets ...................................................... -- +- +-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml" +-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml" + + -- End of catalog data for DocBook V3.0 ................................. -- + -- ...................................................................... -- Added: csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtd31-sgml-1.0.catalog.patch =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtd31-sgml-1.0.catalog.patch (rev 0) +++ csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtd31-sgml-1.0.catalog.patch 2008-12-01 18:24:02 UTC (rev 2420) @@ -0,0 +1,41 @@ +--- docbook-1.0.30/3.1-sgml/docbook.cat Tue Feb 2 06:53:32 1999 ++++ docbook-1.0.30/3.1-sgml/catalog Thu May 25 11:45:01 2000 +@@ -19,7 +19,7 @@ + -- ...................................................................... -- + -- SGML declaration associated with DocBook ............................. -- + +-DTDDECL "-//OASIS//DTD DocBook V3.1//EN" "docbook.dcl" ++SGMLDECL "docbook.dcl" + + -- ...................................................................... -- + -- DocBook driver file .................................................. -- +@@ -35,29 +35,6 @@ + PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V3.1//EN" "dbgenent.mod" + PUBLIC "-//OASIS//ENTITIES DocBook Notations V3.1//EN" "dbnotn.mod" + PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V3.1//EN" "dbcent.mod" +- +- -- ...................................................................... -- +- -- ISO entity sets ...................................................... -- +- +-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml" +-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml" + + -- End of catalog data for DocBook V3.1 ................................. -- + -- ...................................................................... -- Added: csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtd40-sgml-1.0.catalog.patch =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtd40-sgml-1.0.catalog.patch (rev 0) +++ csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtd40-sgml-1.0.catalog.patch 2008-12-01 18:24:02 UTC (rev 2420) @@ -0,0 +1,41 @@ +--- docbook-1.0.30/4.0-sgml/docbook.cat Mon May 22 22:38:05 2000 ++++ docbook-1.0.30/4.0-sgml/catalog Mon May 22 22:12:36 2000 +@@ -19,7 +19,7 @@ + -- ...................................................................... -- + -- SGML declaration associated with DocBook ............................. -- + +-DTDDECL "-//OASIS//DTD DocBook V4.0//EN" "docbook.dcl" ++SGMLDECL "docbook.dcl" + + -- ...................................................................... -- + -- DocBook driver file .................................................. -- +@@ -35,29 +35,6 @@ + PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.0//EN" "dbgenent.mod" + PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.0//EN" "dbnotn.mod" + PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.0//EN" "dbcent.mod" +- +- -- ...................................................................... -- +- -- ISO entity sets ...................................................... -- +- +-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml" +-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml" + + -- End of catalog data for DocBook V4.0 ................................. -- + -- ...................................................................... -- Added: csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtd41-sgml-1.0.catalog.patch =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtd41-sgml-1.0.catalog.patch (rev 0) +++ csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtd41-sgml-1.0.catalog.patch 2008-12-01 18:24:02 UTC (rev 2420) @@ -0,0 +1,41 @@ +--- docbook-1.0.30/4.1-sgml/docbook.cat Mon May 22 22:38:05 2000 ++++ docbook-1.0.30/4.1-sgml/catalog Mon May 22 22:12:36 2000 +@@ -19,7 +19,7 @@ + -- ...................................................................... -- + -- SGML declaration associated with DocBook ............................. -- + +-DTDDECL "-//OASIS//DTD DocBook V4.1//EN" "docbook.dcl" ++SGMLDECL "docbook.dcl" + + -- ...................................................................... -- + -- DocBook driver file .................................................. -- +@@ -35,29 +35,6 @@ + PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.1//EN" "dbgenent.mod" + PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.1//EN" "dbnotn.mod" + PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.1//EN" "dbcent.mod" +- +- -- ...................................................................... -- +- -- ISO entity sets ...................................................... -- +- +-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml" +-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml" + + -- End of catalog data for DocBook V4.1 ................................. -- + -- ...................................................................... -- Added: csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtd42-sgml-1.0.catalog.patch =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtd42-sgml-1.0.catalog.patch (rev 0) +++ csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtd42-sgml-1.0.catalog.patch 2008-12-01 18:24:02 UTC (rev 2420) @@ -0,0 +1,68 @@ +--- docbook-1.0.30/4.2-sgml/docbook.cat.orig 2002-07-17 17:14:28.000000000 +0100 ++++ docbook-1.0.30/4.2-sgml/docbook.cat 2002-07-17 21:58:24.000000000 +0100 +@@ -49,65 +49,5 @@ + PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.2//EN" + "dbcentx.mod" + +- -- ...................................................................... -- +- -- ISO entity sets ...................................................... -- +- +-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" +- "iso-dia.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" +- "iso-num.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" +- "iso-pub.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" +- "iso-tech.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" +- "iso-lat1.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" +- "iso-lat2.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" +- "iso-grk1.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" +- "iso-grk2.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" +- "iso-grk3.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" +- "iso-grk4.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" +- "iso-amsa.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" +- "iso-amsb.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" +- "iso-amsc.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" +- "iso-amsn.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" +- "iso-amso.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" +- "iso-amsr.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" +- "iso-box.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" +- "iso-cyr1.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" +- "iso-cyr2.gml" +- + -- End of catalog data for DocBook V4.2 ................................. -- + -- ...................................................................... -- Added: csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtds-ents.patch =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtds-ents.patch (rev 0) +++ csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtds-ents.patch 2008-12-01 18:24:02 UTC (rev 2420) @@ -0,0 +1,34 @@ +--- docbook-dtds-1.0/4.3-sgml/docbook.cat.ents 2005-12-13 13:14:24.000000000 +0000 ++++ docbook-dtds-1.0/4.3-sgml/docbook.cat 2005-12-13 13:14:38.000000000 +0000 +@@ -51,6 +51,7 @@ + + -- ...................................................................... -- + -- ISO entity sets ...................................................... -- ++-- + + PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" + "iso-dia.gml" +@@ -109,5 +110,6 @@ + PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" + "iso-cyr2.gml" + ++-- + -- End of catalog data for DocBook V4.3 ................................. -- + -- ...................................................................... -- +--- docbook-dtds-1.0/4.4-sgml/docbook.cat.ents 2005-12-13 13:14:51.000000000 +0000 ++++ docbook-dtds-1.0/4.4-sgml/docbook.cat 2005-12-13 13:14:59.000000000 +0000 +@@ -54,6 +54,7 @@ + + -- ...................................................................... -- + -- ISO entity sets ...................................................... -- ++-- + + PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" + "iso-dia.gml" +@@ -112,5 +113,6 @@ + PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" + "iso-cyr2.gml" + ++-- + -- End of catalog data for DocBook V4.4 ................................. -- + -- ...................................................................... -- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Dec 1 21:16:21 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 01 Dec 2008 20:16:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[2421] csw/mgar/gar/v1/gar.lib.mk Message-ID: Revision: 2421 http://gar.svn.sourceforge.net/gar/?rev=2421&view=rev Author: wbonnet Date: 2008-12-01 20:16:21 +0000 (Mon, 01 Dec 2008) Log Message: ----------- Fix default master site and empty file list Modified Paths: -------------- csw/mgar/gar/v1/gar.lib.mk Modified: csw/mgar/gar/v1/gar.lib.mk =================================================================== --- csw/mgar/gar/v1/gar.lib.mk 2008-12-01 18:24:02 UTC (rev 2420) +++ csw/mgar/gar/v1/gar.lib.mk 2008-12-01 20:16:21 UTC (rev 2421) @@ -105,6 +105,7 @@ # check a new upstream files are available +UPSTREAM_MASTER_SITES ?= $(MASTER_SITES) UW_ARGS = $(addprefix -u ,$(UPSTREAM_MASTER_SITES)) ifneq ($(UFILES_REGEX), "") FILES2CHECK = $(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/upstream_watch $(UW_ARGS) $(addsuffix ',$(addprefix ',$(UFILES_REGEX)))) @@ -124,7 +125,7 @@ fi; \ $(MAKE) checknew-$$FILE >/dev/null; \ done; \ - if [ ! "$$NEW_FILES" -eq "" ]; then \ + if test -z "$$NEW_FILES" ; then \ { echo ""; \ echo "Hello dear $(GARNAME) maintainer,"; \ echo ""; \ @@ -141,7 +142,7 @@ echo "---"; \ echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ else \ - if [ ! -n "$(UFILES_REGEX)" ]; then \ + if [ ! -n '$(UFILES_REGEX)' ]; then \ { echo ""; \ echo "Hello dear $(GARNAME) maintainer,"; \ echo ""; \ @@ -168,13 +169,16 @@ fi; \ $(MAKE) checknew-$$FILE >/dev/null; \ done; \ - if [ ! "$$NEW_FILES" -eq "" ]; then \ - echo "$(GARNAME): new upstream files available: $$NEW_FILES"; \ - else \ - if [ ! -n "$(UFILES_REGEX)" ]; then \ + if test -z "$$NEW_FILES" ; then \ + if [ ! -n '$(UFILES_REGEX)' ]; then \ echo "$(GARNAME): Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \ fi; \ + else \ + echo "$(GARNAME): new upstream files available: $$NEW_FILES"; \ fi; \ +else \ +echo "UPSTREAM_MASTER_SITES : $(UPSTREAM_MASTER_SITES)"; \ +echo "MASTER_SITES : $(MASTER_SITES)"; \ fi checknew-%: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Dec 1 21:26:45 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 01 Dec 2008 20:26:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[2422] csw/mgar/gar/v1/gar.lib.mk Message-ID: Revision: 2422 http://gar.svn.sourceforge.net/gar/?rev=2422&view=rev Author: wbonnet Date: 2008-12-01 20:26:45 +0000 (Mon, 01 Dec 2008) Log Message: ----------- Remove extra comments Modified Paths: -------------- csw/mgar/gar/v1/gar.lib.mk Modified: csw/mgar/gar/v1/gar.lib.mk =================================================================== --- csw/mgar/gar/v1/gar.lib.mk 2008-12-01 20:16:21 UTC (rev 2421) +++ csw/mgar/gar/v1/gar.lib.mk 2008-12-01 20:26:45 UTC (rev 2422) @@ -176,9 +176,6 @@ else \ echo "$(GARNAME): new upstream files available: $$NEW_FILES"; \ fi; \ -else \ -echo "UPSTREAM_MASTER_SITES : $(UPSTREAM_MASTER_SITES)"; \ -echo "MASTER_SITES : $(MASTER_SITES)"; \ fi checknew-%: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Dec 1 23:48:53 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 01 Dec 2008 22:48:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[2423] csw/mgar/gar/v1/gar.lib.mk Message-ID: Revision: 2423 http://gar.svn.sourceforge.net/gar/?rev=2423&view=rev Author: wbonnet Date: 2008-12-01 22:48:53 +0000 (Mon, 01 Dec 2008) Log Message: ----------- Add warning when the upstream url is invalid Modified Paths: -------------- csw/mgar/gar/v1/gar.lib.mk Modified: csw/mgar/gar/v1/gar.lib.mk =================================================================== --- csw/mgar/gar/v1/gar.lib.mk 2008-12-01 20:26:45 UTC (rev 2422) +++ csw/mgar/gar/v1/gar.lib.mk 2008-12-01 22:48:53 UTC (rev 2423) @@ -156,25 +156,38 @@ fi; \ fi - check-upstream: @if [ -n '$(FILES2CHECK)' ]; then \ NEW_FILES=""; \ + PACKAGE_UP_TO_DATE=0; \ for FILE in $(FILES2CHECK) ""; do \ [ -n "$$FILE" ] || continue; \ - if test -f $(COOKIEDIR)/checknew-$$FILE || echo $(DISTFILES) | grep -w $$FILE >/dev/null; then \ - : ; \ + if test -f $(COOKIEDIR)/checknew-$$FILE ; then \ + PACKAGE_UP_TO_DATE=1; \ else \ - NEW_FILES="$$FILE $$NEW_FILES"; \ + if echo $(DISTFILES) | grep -w $$FILE >/dev/null; then \ + PACKAGE_UP_TO_DATE=1; \ + echo "$(GARNAME) : Package is up-to-date. Current version is $$FILE" ; \ + else \ + NEW_FILES="$$FILE $$NEW_FILES"; \ + fi; \ fi; \ $(MAKE) checknew-$$FILE >/dev/null; \ done; \ if test -z "$$NEW_FILES" ; then \ if [ ! -n '$(UFILES_REGEX)' ]; then \ - echo "$(GARNAME): Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \ + echo "$(GARNAME) : Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \ + else \ + if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ + echo "$(GARNAME) : Warning no files to check ! $(FILES2CHECK)" ; \ + echo "$(GARNAME) : UPSTREAM_MASTER_SITES is $(UPSTREAM_MASTER_SITES)" ; \ + echo "$(GARNAME) : DISTNAME is $(DISTNAME)" ; \ + echo "$(GARNAME) : UFILES_REGEX is : $(UFILES_REGEX)" ; \ + echo "$(GARNAME) : Please check configuration" ; \ + fi; \ fi; \ else \ - echo "$(GARNAME): new upstream files available: $$NEW_FILES"; \ + echo "$(GARNAME) : new upstream files available: $$NEW_FILES"; \ fi; \ fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Dec 1 23:57:14 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 01 Dec 2008 22:57:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[2424] csw/mgar/pkg/xfce Message-ID: Revision: 2424 http://gar.svn.sourceforge.net/gar/?rev=2424&view=rev Author: wbonnet Date: 2008-12-01 22:57:13 +0000 (Mon, 01 Dec 2008) Log Message: ----------- Add check upstream support Modified Paths: -------------- csw/mgar/pkg/xfce/appfinder/trunk/Makefile csw/mgar/pkg/xfce/desktop/trunk/Makefile csw/mgar/pkg/xfce/devtools/trunk/Makefile csw/mgar/pkg/xfce/exo/trunk/Makefile csw/mgar/pkg/xfce/gtk-xfce-engine/trunk/Makefile csw/mgar/pkg/xfce/icon-theme/trunk/Makefile csw/mgar/pkg/xfce/libxfce4mcs/trunk/Makefile csw/mgar/pkg/xfce/libxfce4util/trunk/Makefile csw/mgar/pkg/xfce/libxfcegui4/trunk/Makefile csw/mgar/pkg/xfce/mcs-manager/trunk/Makefile csw/mgar/pkg/xfce/mcs-plugins/trunk/Makefile csw/mgar/pkg/xfce/mixer/trunk/Makefile csw/mgar/pkg/xfce/mousepad/trunk/Makefile csw/mgar/pkg/xfce/orage/trunk/Makefile csw/mgar/pkg/xfce/panel/trunk/Makefile csw/mgar/pkg/xfce/print/trunk/Makefile csw/mgar/pkg/xfce/session/trunk/Makefile csw/mgar/pkg/xfce/terminal/trunk/Makefile csw/mgar/pkg/xfce/thunar/trunk/Makefile csw/mgar/pkg/xfce/utils/trunk/Makefile csw/mgar/pkg/xfce/xfwm4/trunk/Makefile csw/mgar/pkg/xfce/xfwm4-themes/trunk/Makefile Modified: csw/mgar/pkg/xfce/appfinder/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/appfinder/trunk/Makefile 2008-12-01 22:48:53 UTC (rev 2423) +++ csw/mgar/pkg/xfce/appfinder/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) @@ -10,6 +10,9 @@ # DISTFILES += CSWxfceappfinder.depend CSWxfceappfinder.gspec CSWxfceappfinder.prototype DISTFILES += $(call admfiles,CSWxfceappfinder, depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + TEST_SCRIPTS = none include gar/category.mk Modified: csw/mgar/pkg/xfce/desktop/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/desktop/trunk/Makefile 2008-12-01 22:48:53 UTC (rev 2423) +++ csw/mgar/pkg/xfce/desktop/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) @@ -11,6 +11,9 @@ # DISTFILES += CSWxfcedesktopdoc.depend CSWxfcedesktopdoc.gspec CSWxfcedesktopdoc.prototype DISTFILES += $(call admfiles,CSWxfcedesktop, depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + TEST_SCRIPTS = none CONFIGURE_ARGS += --enable-desktop-icons Modified: csw/mgar/pkg/xfce/devtools/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/devtools/trunk/Makefile 2008-12-01 22:48:53 UTC (rev 2423) +++ csw/mgar/pkg/xfce/devtools/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) @@ -9,6 +9,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWxfcedevtools, depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + include gar/category.mk post-install: Modified: csw/mgar/pkg/xfce/exo/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/exo/trunk/Makefile 2008-12-01 22:48:53 UTC (rev 2423) +++ csw/mgar/pkg/xfce/exo/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) @@ -14,6 +14,9 @@ # DISTFILES += CSWxfcelibexodev.depend CSWxfcelibexodev.gspec CSWxfcelibexodev.prototype DISTFILES += $(call admfiles,CSWxfceexo, depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + # Patch for the exo-mount.c file # PATCHFILES = exo.diff Modified: csw/mgar/pkg/xfce/gtk-xfce-engine/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/gtk-xfce-engine/trunk/Makefile 2008-12-01 22:48:53 UTC (rev 2423) +++ csw/mgar/pkg/xfce/gtk-xfce-engine/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) @@ -11,6 +11,9 @@ # DISTFILES += CSWgtkxfceengine.depend CSWgtkxfceengine.gspec CSWgtkxfceengine.prototype DISTFILES += $(call admfiles,CSWgtkxfceengine, depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + TEST_SCRIPTS = none include gar/category.mk Modified: csw/mgar/pkg/xfce/icon-theme/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/icon-theme/trunk/Makefile 2008-12-01 22:48:53 UTC (rev 2423) +++ csw/mgar/pkg/xfce/icon-theme/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) @@ -9,6 +9,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += CSWxfceicontheme.depend CSWxfceicontheme.gspec CSWxfceicontheme.prototype +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + TEST_SCRIPTS = none include gar/category.mk Modified: csw/mgar/pkg/xfce/libxfce4mcs/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/libxfce4mcs/trunk/Makefile 2008-12-01 22:48:53 UTC (rev 2423) +++ csw/mgar/pkg/xfce/libxfce4mcs/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) @@ -12,6 +12,9 @@ # DISTFILES += CSWlibxfce4mcsdev.depend CSWlibxfce4mcsdev.gspec CSWlibxfce4mcsdev.prototype DISTFILES += $(call admfiles,CSWlibxfce4mcs, depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + TEST_SCRIPTS = none include gar/category.mk Modified: csw/mgar/pkg/xfce/libxfce4util/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/libxfce4util/trunk/Makefile 2008-12-01 22:48:53 UTC (rev 2423) +++ csw/mgar/pkg/xfce/libxfce4util/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) @@ -12,6 +12,9 @@ DISTFILES += CSWlibxfce4utildev.depend CSWlibxfce4utildev.gspec CSWlibxfce4utildev.prototype # DISTFILES += $(call admfiles,CSWlibxfce4util, depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + PATCHFILES += gar-base.diff TEST_SCRIPTS = none Modified: csw/mgar/pkg/xfce/libxfcegui4/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/libxfcegui4/trunk/Makefile 2008-12-01 22:48:53 UTC (rev 2423) +++ csw/mgar/pkg/xfce/libxfcegui4/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) @@ -13,6 +13,9 @@ DISTFILES += CSWlibxfcegui4dev.depend CSWlibxfcegui4dev.gspec CSWlibxfcegui4dev.prototype # DISTFILES += $(call admfiles,CSWlibxfcegui4, depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + LIBDEPS = xfce/libxfce4util TEST_SCRIPTS = none Modified: csw/mgar/pkg/xfce/mcs-manager/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/mcs-manager/trunk/Makefile 2008-12-01 22:48:53 UTC (rev 2423) +++ csw/mgar/pkg/xfce/mcs-manager/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) @@ -13,6 +13,9 @@ DISTFILES += $(call admfiles,CSWxfcemcsmanager, depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + LIBDEPS = xfce/libxfce4util TEST_SCRIPTS = none Modified: csw/mgar/pkg/xfce/mcs-plugins/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/mcs-plugins/trunk/Makefile 2008-12-01 22:48:53 UTC (rev 2423) +++ csw/mgar/pkg/xfce/mcs-plugins/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) @@ -12,6 +12,9 @@ DISTFILES += $(call admfiles,CSWxfcemcsplugins, depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + # PATCHFILES += configure.in.diff # PATCHFILES += configure.diff Modified: csw/mgar/pkg/xfce/mixer/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/mixer/trunk/Makefile 2008-12-01 22:48:53 UTC (rev 2423) +++ csw/mgar/pkg/xfce/mixer/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) @@ -10,6 +10,9 @@ # DISTFILES += CSWxfcemixer.depend CSWxfcemixer.gspec CSWxfcemixer.prototype DISTFILES += $(call admfiles,CSWxfcemixer, depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + TEST_SCRIPTS = none include gar/category.mk Modified: csw/mgar/pkg/xfce/mousepad/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/mousepad/trunk/Makefile 2008-12-01 22:48:53 UTC (rev 2423) +++ csw/mgar/pkg/xfce/mousepad/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) @@ -11,6 +11,9 @@ # DISTFILES += CSWxfcemousepad.depend CSWxfcemousepad.gspec CSWxfcemousepad.prototype DISTFILES += $(call admfiles,CSWxfcemousepad, depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + TEST_SCRIPTS = none include gar/category.mk Modified: csw/mgar/pkg/xfce/orage/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/orage/trunk/Makefile 2008-12-01 22:48:53 UTC (rev 2423) +++ csw/mgar/pkg/xfce/orage/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) @@ -11,6 +11,9 @@ # DISTFILES += CSWxfceorage.depend CSWxfceorage.gspec CSWxfceorage.prototype # DISTFILES += CSWxfceoragedoc.depend CSWxfceoragedoc.gspec CSWxfceoragedoc.prototype +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + TEST_SCRIPTS = none include gar/category.mk Modified: csw/mgar/pkg/xfce/panel/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/panel/trunk/Makefile 2008-12-01 22:48:53 UTC (rev 2423) +++ csw/mgar/pkg/xfce/panel/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) @@ -12,6 +12,9 @@ # DISTFILES += CSWlibxfcepanel.depend CSWlibxfcepanel.gspec CSWlibxfcepanel.prototype # DISTFILES += CSWxfcepanel.depend CSWxfcepanel.gspec CSWxfcepanel.prototype +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + DISTFILES += $(call admfiles,CSWxfcepanel, depend) TEST_SCRIPTS = none Modified: csw/mgar/pkg/xfce/print/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/print/trunk/Makefile 2008-12-01 22:48:53 UTC (rev 2423) +++ csw/mgar/pkg/xfce/print/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) @@ -12,6 +12,9 @@ # DISTFILES += CSWlibxfceprint.depend CSWlibxfceprint.gspec CSWlibxfceprint.prototype # DISTFILES += CSWlibxfceprintdev.depend CSWlibxfceprintdev.gspec CSWlibxfceprintdev.prototype +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + DISTFILES += $(call admfiles,CSWxfceprint, depend) TEST_SCRIPTS = none Modified: csw/mgar/pkg/xfce/session/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/session/trunk/Makefile 2008-12-01 22:48:53 UTC (rev 2423) +++ csw/mgar/pkg/xfce/session/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) @@ -12,6 +12,9 @@ # DISTFILES += CSWxfcesessiondoc.depend CSWxfcesessiondoc.gspec CSWxfcesessiondoc.prototype # DISTFILES += CSWlibxfcesessiondev.depend CSWlibxfcesessiondev.gspec CSWlibxfcesessiondev.prototype +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + DISTFILES += $(call admfiles,CSWxfcesession, depend) TEST_SCRIPTS = none Modified: csw/mgar/pkg/xfce/terminal/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/terminal/trunk/Makefile 2008-12-01 22:48:53 UTC (rev 2423) +++ csw/mgar/pkg/xfce/terminal/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) @@ -16,6 +16,9 @@ DISTFILES += $(call admfiles,CSWxfceterminal, depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + TEST_SCRIPTS = none include gar/category.mk Modified: csw/mgar/pkg/xfce/thunar/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/thunar/trunk/Makefile 2008-12-01 22:48:53 UTC (rev 2423) +++ csw/mgar/pkg/xfce/thunar/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) @@ -18,6 +18,9 @@ # PATCHFILES = thunar-vfs-path-private.h.diff # PATCHFILES += thunar-vfs-thumb-jpeg.c.diff +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + TEST_SCRIPTS = none include gar/category.mk Modified: csw/mgar/pkg/xfce/utils/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/utils/trunk/Makefile 2008-12-01 22:48:53 UTC (rev 2423) +++ csw/mgar/pkg/xfce/utils/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) @@ -12,6 +12,9 @@ # PATCHFILES = xinitrc.patch +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + TEST_SCRIPTS = none include gar/category.mk Modified: csw/mgar/pkg/xfce/xfwm4/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/xfwm4/trunk/Makefile 2008-12-01 22:48:53 UTC (rev 2423) +++ csw/mgar/pkg/xfce/xfwm4/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) @@ -12,6 +12,9 @@ # PATCHFILES = frame.c.diff +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + LIBDEPS = xfce/mcs-mananager TEST_SCRIPTS = none Modified: csw/mgar/pkg/xfce/xfwm4-themes/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/xfwm4-themes/trunk/Makefile 2008-12-01 22:48:53 UTC (rev 2423) +++ csw/mgar/pkg/xfce/xfwm4-themes/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) @@ -10,6 +10,9 @@ # DISTFILES += CSWxfcexfwm4themes.depend CSWxfcexfwm4themes.gspec CSWxfcexfwm4themes.prototype DISTFILES += $(call admfiles,CSWxfcexfwm4themes, depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + TEST_SCRIPTS = none include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Dec 2 00:29:33 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 01 Dec 2008 23:29:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[2425] csw/mgar/pkg Message-ID: Revision: 2425 http://gar.svn.sourceforge.net/gar/?rev=2425&view=rev Author: wbonnet Date: 2008-12-01 23:29:31 +0000 (Mon, 01 Dec 2008) Log Message: ----------- Add check upstream support to some package upstream master sites and regexp have to be fixed for some packages Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile csw/mgar/pkg/a52dec/trunk/Makefile csw/mgar/pkg/amarok/trunk/Makefile csw/mgar/pkg/amavisd-new/trunk/Makefile csw/mgar/pkg/apache/trunk/Makefile csw/mgar/pkg/apcupsd/trunk/Makefile csw/mgar/pkg/apg/trunk/Makefile csw/mgar/pkg/apr/trunk/Makefile csw/mgar/pkg/apr-util/trunk/Makefile csw/mgar/pkg/asciidoc/trunk/Makefile csw/mgar/pkg/atk/trunk/Makefile csw/mgar/pkg/audiofile/trunk/Makefile csw/mgar/pkg/authz-tools/trunk/Makefile csw/mgar/pkg/avantfax/trunk/Makefile csw/mgar/pkg/balance/trunk/Makefile csw/mgar/pkg/bdb4/trunk/Makefile csw/mgar/pkg/bdb43/trunk/Makefile csw/mgar/pkg/bdb44/trunk/Makefile csw/mgar/pkg/bdb46/trunk/Makefile csw/mgar/pkg/bind/trunk/Makefile csw/mgar/pkg/bison/trunk/Makefile csw/mgar/pkg/boost/trunk/Makefile csw/mgar/pkg/bugzilla/trunk/Makefile csw/mgar/pkg/cabextract/trunk/Makefile csw/mgar/pkg/cadaver/trunk/Makefile csw/mgar/pkg/cfengine/trunk/Makefile csw/mgar/pkg/clearsilver/trunk/Makefile csw/mgar/pkg/climm/trunk/Makefile csw/mgar/pkg/clusterit/trunk/Makefile csw/mgar/pkg/clusterssh/trunk/Makefile csw/mgar/pkg/cmake/trunk/Makefile csw/mgar/pkg/coreutils/trunk/Makefile csw/mgar/pkg/cronolog/trunk/Makefile csw/mgar/pkg/ctags/trunk/Makefile csw/mgar/pkg/cups/trunk/Makefile csw/mgar/pkg/curl/trunk/Makefile csw/mgar/pkg/cvs/trunk/Makefile csw/mgar/pkg/cyrus_imapd/trunk/Makefile csw/mgar/pkg/daemontools/trunk/Makefile csw/mgar/pkg/dbus/trunk/Makefile csw/mgar/pkg/dbus-glib/trunk/Makefile csw/mgar/pkg/ddd/trunk/Makefile csw/mgar/pkg/diffutils/trunk/Makefile csw/mgar/pkg/distcc/trunk/Makefile csw/mgar/pkg/docbook/trunk/Makefile csw/mgar/pkg/easytag/trunk/Makefile csw/mgar/pkg/elinks/trunk/Makefile csw/mgar/pkg/emacs/trunk/Makefile csw/mgar/pkg/esvn/trunk/Makefile csw/mgar/pkg/ethereal/trunk/Makefile csw/mgar/pkg/eventlog/trunk/Makefile csw/mgar/pkg/exim/trunk/Makefile csw/mgar/pkg/expat/trunk/Makefile csw/mgar/pkg/fastcgi/trunk/Makefile csw/mgar/pkg/figlet/trunk/Makefile csw/mgar/pkg/fileutils/trunk/Makefile csw/mgar/pkg/findutils/trunk/Makefile csw/mgar/pkg/flac/trunk/Makefile csw/mgar/pkg/flphoto/trunk/Makefile csw/mgar/pkg/fltk/trunk/Makefile csw/mgar/pkg/fontconfig/trunk/Makefile csw/mgar/pkg/fox/trunk/Makefile csw/mgar/pkg/freeciv/trunk/Makefile csw/mgar/pkg/freetype/trunk/Makefile csw/mgar/pkg/gaim/trunk/Makefile csw/mgar/pkg/ganglia/trunk/Makefile csw/mgar/pkg/gawk/trunk/Makefile csw/mgar/pkg/gd/trunk/Makefile csw/mgar/pkg/gdbm/trunk/Makefile csw/mgar/pkg/gettext/trunk/Makefile csw/mgar/pkg/gforth/trunk/Makefile csw/mgar/pkg/gftp/trunk/Makefile csw/mgar/pkg/git/trunk/Makefile csw/mgar/pkg/gkrellm/trunk/Makefile csw/mgar/pkg/gmp/trunk/Makefile csw/mgar/pkg/gperf/trunk/Makefile csw/mgar/pkg/gphoto2/trunk/Makefile csw/mgar/pkg/graphviz/trunk/Makefile csw/mgar/pkg/graphviz2/trunk/Makefile csw/mgar/pkg/grep/trunk/Makefile csw/mgar/pkg/groff/trunk/Makefile csw/mgar/pkg/gtar/trunk/Makefile csw/mgar/pkg/gtkpod/trunk/Makefile csw/mgar/pkg/guile/trunk/Makefile csw/mgar/pkg/hicolor-icon-theme/trunk/Makefile csw/mgar/pkg/hylafax/trunk/Makefile csw/mgar/pkg/hypermail/trunk/Makefile csw/mgar/pkg/imapfilter/trunk/Makefile csw/mgar/pkg/inputproto/trunk/Makefile csw/mgar/pkg/iozone/trunk/Makefile csw/mgar/pkg/irssi/trunk/Makefile csw/mgar/pkg/jboss4/trunk/Makefile csw/mgar/pkg/jetty6/trunk/Makefile csw/mgar/pkg/jhead/trunk/Makefile csw/mgar/pkg/jicmp/trunk/Makefile csw/mgar/pkg/joe/trunk/Makefile csw/mgar/pkg/jrrd/trunk/Makefile csw/mgar/pkg/kbproto/trunk/Makefile csw/mgar/pkg/kdesvn/trunk/Makefile csw/mgar/pkg/kile/trunk/Makefile csw/mgar/pkg/koffice/trunk/Makefile csw/mgar/pkg/krb5/trunk/Makefile csw/mgar/pkg/ksh/trunk/Makefile csw/mgar/pkg/ldapvi/trunk/Makefile csw/mgar/pkg/less/trunk/Makefile csw/mgar/pkg/libX11/trunk/Makefile csw/mgar/pkg/libao/trunk/Makefile csw/mgar/pkg/libart/trunk/Makefile csw/mgar/pkg/libcairo/trunk/Makefile csw/mgar/pkg/libdvdcss/trunk/Makefile csw/mgar/pkg/libdvdread/trunk/Makefile csw/mgar/pkg/libevent/trunk/Makefile csw/mgar/pkg/libglade/trunk/Makefile csw/mgar/pkg/libgphoto2/trunk/Makefile csw/mgar/pkg/libgpod/trunk/Makefile csw/mgar/pkg/libgsasl/trunk/Makefile csw/mgar/pkg/libmp4v2/trunk/Makefile csw/mgar/pkg/libntlm/trunk/Makefile csw/mgar/pkg/libogg/trunk/Makefile csw/mgar/pkg/libpcap/trunk/Makefile csw/mgar/pkg/libpthread-stubs/trunk/Makefile csw/mgar/pkg/libsamplerate/trunk/Makefile csw/mgar/pkg/libsdl/trunk/Makefile csw/mgar/pkg/libtool/trunk/Makefile csw/mgar/pkg/libvorbis/trunk/Makefile Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -15,6 +15,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION)-$(GARSUBREV).tar.bz2 DISTFILES += $(call admfiles,CSWimagick,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)-(\d+).tar.bz2 + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-perl=$(bindir)/perl CONFIGURE_ARGS += --enable-shared --disable-static Modified: csw/mgar/pkg/a52dec/trunk/Makefile =================================================================== --- csw/mgar/pkg/a52dec/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/a52dec/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWliba52, depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) --enable-shared --disable-static Modified: csw/mgar/pkg/amarok/trunk/Makefile =================================================================== --- csw/mgar/pkg/amarok/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/amarok/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -12,6 +12,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWamarok,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + PATCHFILES = disable-broken-languages.diff PATCHFILES += gpod-stdint.h.diff Modified: csw/mgar/pkg/amavisd-new/trunk/Makefile =================================================================== --- csw/mgar/pkg/amavisd-new/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/amavisd-new/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWamavisdnew, depend postinstall preinstall prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + PATCHFILES += amavisd-agent.diff PATCHFILES += amavisd-nanny.diff PATCHFILES += amavisd-release.diff Modified: csw/mgar/pkg/apache/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/apache/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -11,6 +11,9 @@ MASTER_SITES = http://www.ibiblio.org/pub/mirrors/apache/httpd/ DISTFILES = $(GARNAME)_$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)_(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-apr=$(prefix) CONFIGURE_ARGS += --with-apr-util=$(prefix) Modified: csw/mgar/pkg/apcupsd/trunk/Makefile =================================================================== --- csw/mgar/pkg/apcupsd/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/apcupsd/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -15,6 +15,9 @@ DISTFILES += $(call admfiles,CSWapcupsd, depend prototype postinstall) DISTFILES += cswapcupsd +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + SPKG_CLASSES = none cswinitsmf CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/apg/trunk/Makefile =================================================================== --- csw/mgar/pkg/apg/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/apg/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -10,6 +10,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWapg) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk Modified: csw/mgar/pkg/apr/trunk/Makefile =================================================================== --- csw/mgar/pkg/apr/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/apr/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -15,6 +15,9 @@ DISTFILES += $(call admfiles,CSWapr-devel,depend prototype) DISTFILES += config.layout +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = --prefix=$(prefix) CONFIGURE_ARGS += --enable-layout=csw CONFIGURE_ARGS += --enable-threads Modified: csw/mgar/pkg/apr-util/trunk/Makefile =================================================================== --- csw/mgar/pkg/apr-util/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/apr-util/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -17,6 +17,9 @@ DISTFILES += $(call admfiles,CSWaprutil-devel,depend prototype) DISTFILES += config.layout +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # Force use of GNU iconv PATCHFILES += iconv.diff Modified: csw/mgar/pkg/asciidoc/trunk/Makefile =================================================================== --- csw/mgar/pkg/asciidoc/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/asciidoc/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -20,6 +20,9 @@ DISTFILES += CSWasciidoc.gspec CSWasciidoc.depend DISTFILES += $(AUTOFILES) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk Modified: csw/mgar/pkg/atk/trunk/Makefile =================================================================== --- csw/mgar/pkg/atk/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/atk/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -14,6 +14,9 @@ MASTER_SITES = http://ftp.gnome.org/pub/gnome/sources/atk/1.6/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + LIBDEPS += lib/glib2 CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/audiofile/trunk/Makefile =================================================================== --- csw/mgar/pkg/audiofile/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/audiofile/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -16,6 +16,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWaudiofile) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/authz-tools/trunk/Makefile =================================================================== --- csw/mgar/pkg/authz-tools/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/authz-tools/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -18,6 +18,9 @@ #DISTFILES += $(call admfiles,CSWauthztools,depend,prototype) DISTFILES += $(call admfiles,CSWauthztools,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = Modified: csw/mgar/pkg/avantfax/trunk/Makefile =================================================================== --- csw/mgar/pkg/avantfax/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/avantfax/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -16,6 +16,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tgz DISTFILES += $(call admfiles,CSWavantfax,depend preinstall postinstall) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = Modified: csw/mgar/pkg/balance/trunk/Makefile =================================================================== --- csw/mgar/pkg/balance/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/balance/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -13,6 +13,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWbalance,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # Configure for build with SunONE PATCHFILES = build.diff Modified: csw/mgar/pkg/bdb4/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb4/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/bdb4/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -17,6 +17,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += CSWbdb4.gspec +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # See http://www.sleepycat.com/update/4.1.25/patch.4.1.25.html PATCHFILES += 4.1.25.1.diff 4.1.25.2.diff PATCHDIRLEVEL = 0 Modified: csw/mgar/pkg/bdb43/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb43/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/bdb43/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -19,6 +19,9 @@ DISTFILES += $(call admfiles,CSWbdb43-devel,depend prototype) DISTFILES += $(call admfiles,CSWbdb43-doc,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/build_unix CONFIGURE_SCRIPTS = dist Modified: csw/mgar/pkg/bdb44/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb44/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/bdb44/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -19,6 +19,9 @@ DISTFILES += $(call admfiles,CSWbdb44-devel,depend prototype) DISTFILES += $(call admfiles,CSWbdb44-doc,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/build_unix Modified: csw/mgar/pkg/bdb46/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb46/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/bdb46/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -19,6 +19,9 @@ DISTFILES += $(call admfiles,CSWbdb46-devel,depend prototype) DISTFILES += $(call admfiles,CSWbdb46-doc,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/build_unix Modified: csw/mgar/pkg/bind/trunk/Makefile =================================================================== --- csw/mgar/pkg/bind/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/bind/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -14,10 +14,14 @@ high-volume and high-reliability applications. endef +UPSTREAM_MASTER_SITES = http://ftp.isc.org/isc/bind9/ MASTER_SITES = http://ftp.isc.org/isc/bind9/$(GARVERSION)-$(RELEASE)/ DISTFILES = $(GARNAME)-$(GARVERSION)-$(RELEASE).tar.gz DISTFILES += $(call admfiles,CSWbind,preinstall postinstall preremove) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = (\d+(?:\.\d+)*)-([A-Z][0-9]) + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-libtool CONFIGURE_ARGS += --with-openssl=/opt/csw Modified: csw/mgar/pkg/bison/trunk/Makefile =================================================================== --- csw/mgar/pkg/bison/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/bison/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -12,6 +12,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWbison,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + TAR_ARGS = CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/boost/trunk/Makefile =================================================================== --- csw/mgar/pkg/boost/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/boost/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -20,6 +20,9 @@ DISTFILES = $(GARNAME)_$(DISTVERSION).tar.bz2 DISTFILES += CSWboost.gspec +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + WORKSRC = $(WORKDIR)/$(GARNAME)_$(DISTVERSION) CONFIGURE_SCRIPTS = Modified: csw/mgar/pkg/bugzilla/trunk/Makefile =================================================================== --- csw/mgar/pkg/bugzilla/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/bugzilla/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWbugzilla,prototype depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # Adjust the shebang path for all scripts PATCHFILES += perlpath.diff Modified: csw/mgar/pkg/cabextract/trunk/Makefile =================================================================== --- csw/mgar/pkg/cabextract/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/cabextract/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -16,6 +16,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWcabextract,prototype depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) # cabextract doesn't have a test target Modified: csw/mgar/pkg/cadaver/trunk/Makefile =================================================================== --- csw/mgar/pkg/cadaver/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/cadaver/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -9,6 +9,7 @@ endef MASTER_SITES = http://www.webdav.org/cadaver/ +UPSTREAM_MASTER_SITES = http://www.webdav.org/cadaver/ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -17,6 +18,9 @@ DISTFILES += $(call admfiles,CSWcadav,prototype depend) DISTFILES += changelog.CSW +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # add destdir support to makefile PATCHFILES = destdir.patch Modified: csw/mgar/pkg/cfengine/trunk/Makefile =================================================================== --- csw/mgar/pkg/cfengine/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/cfengine/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -17,6 +17,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWcfengine,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # Requires GNU texi PATCHFILES = nodoc.diff Modified: csw/mgar/pkg/clearsilver/trunk/Makefile =================================================================== --- csw/mgar/pkg/clearsilver/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/clearsilver/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -16,6 +16,9 @@ DISTFILES += $(call admfiles,CSWpmcs,depend prototype) DISTFILES += $(call admfiles,CSWpycs,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # Remove an unneeded linux-only header PATCHFILES += linuxheader.diff Modified: csw/mgar/pkg/climm/trunk/Makefile =================================================================== --- csw/mgar/pkg/climm/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/climm/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -13,6 +13,9 @@ DISTFILES += $(call admfiles,CSWclimm,prototype depend) DISTFILES += climm.patch +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz + PATCHFILES = climm.patch CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/clusterit/trunk/Makefile =================================================================== --- csw/mgar/pkg/clusterit/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/clusterit/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -12,6 +12,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWclusterit,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + PREFIX = /opt/csw/$(GARNAME) CONFIGURE_ARGS = --prefix=$(PREFIX) Modified: csw/mgar/pkg/clusterssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/clusterssh/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/clusterssh/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -12,6 +12,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWclusterssh,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + PREFIX = /opt/csw/ CONFIGURE_ARGS = --prefix=$(PREFIX) Modified: csw/mgar/pkg/cmake/trunk/Makefile =================================================================== --- csw/mgar/pkg/cmake/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/cmake/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -12,10 +12,14 @@ generation, code generation, and template instantiation. endef +UPSTREAM_MASTER_SITES = http://www.cmake.org/files/ MASTER_SITES = http://www.cmake.org/files/v2.6/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWcmake) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = (\d+(?:\.\d+)*) + datadir = /share/$(GARNAME)-$(GARVERSION) sharedstatedir = /share docdir = /share/doc/$(GARNAME)-$(GARVERSION) Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -16,6 +16,9 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + # Prevent autoconf from running --recheck PATCHFILES += autoconf.diff Modified: csw/mgar/pkg/cronolog/trunk/Makefile =================================================================== --- csw/mgar/pkg/cronolog/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/cronolog/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -14,6 +14,9 @@ MASTER_SITES = http://www.cronolog.org/download/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk Modified: csw/mgar/pkg/ctags/trunk/Makefile =================================================================== --- csw/mgar/pkg/ctags/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/ctags/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -15,6 +15,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += CSWctags.gspec CSWctags.prototype +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # Respect DESTDIR PATCHFILES += install.diff Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/cups/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -32,6 +32,9 @@ DISTFILES += i.smfyes i.smfno space checkinstall +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = cups-(\d+(?:\.\d+)*)-source.tar.bz2 + LD_OPTIONS = -R/opt/csw/lib/\$$ISALIST -R/opt/csw/lib CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/curl/trunk/Makefile =================================================================== --- csw/mgar/pkg/curl/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/curl/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -17,6 +17,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWcurl,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + LIBDEPS += lib/openssl CONFIGURE_ARGS = $(DIRPATHS) --with-ssl Modified: csw/mgar/pkg/cvs/trunk/Makefile =================================================================== --- csw/mgar/pkg/cvs/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/cvs/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -16,11 +16,15 @@ endef MASTER_SITES = http://ftp.gnu.org/non-gnu/cvs/source/stable/$(GARVERSION)/ +UPSTREAM_MASTER_SITES = http://ftp.gnu.org/non-gnu/cvs/source/stable/ DISTFILES = $(DISTNAME).tar.bz2 DISTFILES += $(call admfiles,CSWcvs,) CONFIGURE_ARGS = $(DIRPATHS) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = (\d+(?:\.\d+)*) + TEST_TARGET = check # Test suite won't run as root! Modified: csw/mgar/pkg/cyrus_imapd/trunk/Makefile =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -33,6 +33,9 @@ DISTFILES += cyrus_imapd_utils.changelog.CSW DISTFILES += pm_cyrus.changelog.CSW +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(shell echo $(GARNAME) | tr '_' '-')-(\d+(?:\.\d+)*).tar.gz + # compile_et is not provided by krb5lib_dev so we must provide our own version # taken from the krb5 source. DISTFILES += compile_et et_c.awk et_h.awk Modified: csw/mgar/pkg/daemontools/trunk/Makefile =================================================================== --- csw/mgar/pkg/daemontools/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/daemontools/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -14,6 +14,10 @@ #PATCHFILES = daemontools-0.70-man.diff.bz2 +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + + CONFIGURE_SCRIPTS = custom BUILD_SCRIPTS = custom INSTALL_SCRIPTS = custom Modified: csw/mgar/pkg/dbus/trunk/Makefile =================================================================== --- csw/mgar/pkg/dbus/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/dbus/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -18,6 +18,9 @@ DISTFILES += CSWlibdbusdev.gspec CSWlibdbusdev.prototype CSWlibdbusdev.depend # DISTFILES += $(call admfiles,CSWdbus, depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CFLAGS += -xlibmil -errtags=yes -erroff=E_EMPTY_DECLARATION CXXFLAGS += -xlibmil -xlibmopt -features=tmplife -norunpath LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib Modified: csw/mgar/pkg/dbus-glib/trunk/Makefile =================================================================== --- csw/mgar/pkg/dbus-glib/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/dbus-glib/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -13,6 +13,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + DISTFILES += CSWdbusglib.gspec CSWdbusglib.prototype CSWdbusglib.depend DISTFILES += CSWdbusglibdev.gspec CSWdbusglibdev.prototype CSWdbusglibdev.depend # DISTFILES += $(call admfiles,CSWdbusglib, depend) Modified: csw/mgar/pkg/ddd/trunk/Makefile =================================================================== --- csw/mgar/pkg/ddd/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/ddd/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -13,6 +13,9 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + ifneq ($(BUILD_XDEPS),0) LIBDEPS = lib/ncurses lib/readline endif Modified: csw/mgar/pkg/diffutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/diffutils/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/diffutils/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -10,6 +10,9 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/distcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/distcc/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/distcc/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -19,6 +19,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWdistcc,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/docbook/trunk/Makefile =================================================================== --- csw/mgar/pkg/docbook/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/docbook/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -14,6 +14,10 @@ MASTER_SITES = $(SF_MIRROR)/$(GARNAME)/ DISTFILES = $(GARNAME)-xsl-$(GARVERSION).tar.bz2 +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-xsl-(\d+(?:\.\d+)*).tar.bz2 + + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = Modified: csw/mgar/pkg/easytag/trunk/Makefile =================================================================== --- csw/mgar/pkg/easytag/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/easytag/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -11,6 +11,8 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWeasytag,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 GARCOMPILER = GNU Modified: csw/mgar/pkg/elinks/trunk/Makefile =================================================================== --- csw/mgar/pkg/elinks/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/elinks/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -19,6 +19,9 @@ DISTFILES += $(call admfiles,CSWelinks,prototype depend) DISTFILES += changelog.CSW +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + # suppress the rdynamic test which doesn't # work correctly # PATCHFILES = configure_no_rdynamic.patch Modified: csw/mgar/pkg/emacs/trunk/Makefile =================================================================== --- csw/mgar/pkg/emacs/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/emacs/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -17,6 +17,9 @@ #DISTFILES += CSWemacsrt.gspec CSWemacs.gspec CSWxemacs.gspec #DISTFILES += CSWemacsrt.prototype CSWemacs.prototype CSWxemacs.prototype +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)([a-z]).tar.gz + # Force make to acknowledge DESTDIR #PATCHFILES += destdir.diff Modified: csw/mgar/pkg/esvn/trunk/Makefile =================================================================== --- csw/mgar/pkg/esvn/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/esvn/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -12,6 +12,9 @@ DISTFILES = $(GARNAME)-$(DISTVERSION).tar.gz WORKSRC = $(WORKDIR)/$(GARNAME) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # Specs and pre-built prototypes #DISTFILES += CSWesvn.gspec #DISTFILES += CSWesvn.gspec CSWesvn.prototype Modified: csw/mgar/pkg/ethereal/trunk/Makefile =================================================================== --- csw/mgar/pkg/ethereal/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/ethereal/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -13,6 +13,9 @@ MASTER_SITES = http://www.ethereal.com/distribution/ DISTFILES = $(DISTNAME).tar.bz2 +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + DEPENDS += lib/libpcap DEPENDS += lib/gtk2 Modified: csw/mgar/pkg/eventlog/trunk/Makefile =================================================================== --- csw/mgar/pkg/eventlog/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/eventlog/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -18,6 +18,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWeventlog,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) GARCOMPILER = GNU Modified: csw/mgar/pkg/exim/trunk/Makefile =================================================================== --- csw/mgar/pkg/exim/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/exim/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -21,6 +21,9 @@ DISTFILES += Makefile.patch exim_install.patch spf2.patch DISTFILES += i.smfyes i.smfno +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + PATCHFILES = Makefile.patch exim_install.patch spf2.patch LD_OPTIONS = -R/opt/csw/lib/\$$ISALIST -R/opt/csw/lib Modified: csw/mgar/pkg/expat/trunk/Makefile =================================================================== --- csw/mgar/pkg/expat/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/expat/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -14,6 +14,9 @@ DISTFILES += $(call admfiles,CSWexpat,depend prototype) DISTFILES += $(call admfiles,CSWexpat-devel,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # Compatibility libraries EXTLIBS += libexpat.so.0.4.0 EXTLIBS += libexpat.so.0.5.0 Modified: csw/mgar/pkg/fastcgi/trunk/Makefile =================================================================== --- csw/mgar/pkg/fastcgi/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/fastcgi/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -19,6 +19,10 @@ DISTFILES += CSWfastcgi.gspec CSWfastcgi.depend CSWfastcgi.prototype #DISTFILES += CSWfastcgidoc.gspec CSWfastcgidoc.depend CSWfastcgidoc.prototype +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = fcgi-(\d+(?:\.\d+)*).tar.gz + + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/figlet/trunk/Makefile =================================================================== --- csw/mgar/pkg/figlet/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/figlet/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -21,6 +21,9 @@ DISTNAME = $(GARNAME)$(RELEASE) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)(\d+(?:\.\d+)*).tar.gz + # We don't have this modern autoconfig-doodle-crap CONFIGURE_SCRIPTS = Modified: csw/mgar/pkg/fileutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/fileutils/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/fileutils/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -10,6 +10,9 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/findutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/findutils/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/findutils/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -16,6 +16,9 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # Fix up prototypes PATCHFILES = prototypes.patch Modified: csw/mgar/pkg/flac/trunk/Makefile =================================================================== --- csw/mgar/pkg/flac/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/flac/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -18,6 +18,10 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWflac,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + + LIBDEPS += lib/libogg CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/flphoto/trunk/Makefile =================================================================== --- csw/mgar/pkg/flphoto/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/flphoto/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -11,6 +11,10 @@ DISTFILES = $(GARNAME)-$(GARVERSION)-source.tar.gz DISTFILES += $(call admfiles,CSWflphoto, prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + + PATCHFILES = Fl_Image_Display.cxx.diff PATCHFILES = gamma.cxx.diff PATCHFILES = export.cxx.diff Modified: csw/mgar/pkg/fltk/trunk/Makefile =================================================================== --- csw/mgar/pkg/fltk/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/fltk/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -8,9 +8,14 @@ endef MASTER_SITES = http://ftp.easysw.com/pub/fltk/1.1.7/ +UPSTREAM_MASTER_SITES = http://ftp.easysw.com/pub/fltk/ + DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWfltk,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = (\d+(?:\.\d+)*) + PATCHFILES = makeincludes.diff CONFIGURE_ARGS = $(DIRPATHS) --mandir=/opt/csw/share/man --disable-localpng --disable-localjpeg --disable-localzlib --enable-shared Modified: csw/mgar/pkg/fontconfig/trunk/Makefile =================================================================== --- csw/mgar/pkg/fontconfig/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/fontconfig/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -14,6 +14,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWfconfig,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk Modified: csw/mgar/pkg/fox/trunk/Makefile =================================================================== --- csw/mgar/pkg/fox/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/fox/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -12,6 +12,9 @@ DISTFILES += $(call admfiles,CSWfoxrt, depend prototype ) DISTFILES += $(call admfiles,CSWfox, depend prototype ) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + LD=CC CONFIGURE_ARGS = $(DIRPATHS) --enable-release --with-shape=no --with-xshm=no --disable-threadsafe Modified: csw/mgar/pkg/freeciv/trunk/Makefile =================================================================== --- csw/mgar/pkg/freeciv/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/freeciv/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWfreeciv, depend prototype ) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + GARCOMPILER = GNU PATCHFILES = dataio.c.diff Modified: csw/mgar/pkg/freetype/trunk/Makefile =================================================================== --- csw/mgar/pkg/freetype/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/freetype/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -17,6 +17,9 @@ MASTER_SITES = $(SF_MIRROR)/$(GARNAME)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/gaim/trunk/Makefile =================================================================== --- csw/mgar/pkg/gaim/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/gaim/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -14,6 +14,9 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + ifneq ($(BUILD_XDEPS),0) LIBDEPS = lib/libao endif Modified: csw/mgar/pkg/ganglia/trunk/Makefile =================================================================== --- csw/mgar/pkg/ganglia/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/ganglia/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -14,6 +14,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWpackage,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # This is attachment #45 from Ganglia bug # http://bugzilla.ganglia.info/cgi-bin/bugzilla/show_bug.cgi?id=77 PATCHFILES = $(GARNAME)-$(GARVERSION)-solaris-cc.patch Modified: csw/mgar/pkg/gawk/trunk/Makefile =================================================================== --- csw/mgar/pkg/gawk/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/gawk/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -11,6 +11,9 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) INSTALL_ARGS = $(foreach VAR, bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir infodir mandir includedir,$(VAR)=$($(VAR))) Modified: csw/mgar/pkg/gd/trunk/Makefile =================================================================== --- csw/mgar/pkg/gd/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/gd/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -13,6 +13,9 @@ DISTFILES += $(call admfiles,CSWgd,depend prototype) DISTFILES += $(call admfiles,CSWgd-devel,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk Modified: csw/mgar/pkg/gdbm/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdbm/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/gdbm/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -13,6 +13,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWgdbm,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # Makefile install permissions patch PATCHFILES = perms.diff Modified: csw/mgar/pkg/gettext/trunk/Makefile =================================================================== --- csw/mgar/pkg/gettext/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/gettext/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -10,6 +10,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWggettext) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + EXTRA_BUILD_ISAS_sparc = sparcv9 EXTRA_BUILD_ISAS_i386 = amd64 Modified: csw/mgar/pkg/gforth/trunk/Makefile =================================================================== --- csw/mgar/pkg/gforth/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/gforth/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -16,6 +16,9 @@ DISTFILES += $(call admfiles,CSWgforth,prototype) PATCHFILES = gforth-DESTDIR.diff +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # Compile with GCC GARCOMPILER = GNU Modified: csw/mgar/pkg/gftp/trunk/Makefile =================================================================== --- csw/mgar/pkg/gftp/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/gftp/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -14,6 +14,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWgftp, depend ) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + CONFIGURE_ARGS = $(DIRPATHS) --disable-nls TEST_TARGET = check Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/git/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -13,6 +13,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWgit,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + PREREQUISITE_PKGS = CSWasciidoc CSWossldevel CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/gkrellm/trunk/Makefile =================================================================== --- csw/mgar/pkg/gkrellm/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/gkrellm/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -18,6 +18,9 @@ MASTER_SITES = http://members.dslextreme.com/users/billw/$(GARNAME)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + # Patch up makefile to honor environment variables PATCHFILES = suncc.diff Modified: csw/mgar/pkg/gmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/gmp/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/gmp/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -21,6 +21,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWgmp,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + TEST_TARGET = check CONFIGURE_ARGS = ABI=32 $(DIRPATHS) Modified: csw/mgar/pkg/gperf/trunk/Makefile =================================================================== --- csw/mgar/pkg/gperf/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/gperf/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -15,6 +15,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWgperf) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/gphoto2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gphoto2/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/gphoto2/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -15,6 +15,9 @@ # 'cc' is a shell script to hack around libtool craziness DISTFILES += cc +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + DEPENDS += lib/libgphoto2 PWD = $(shell pwd) Modified: csw/mgar/pkg/graphviz/trunk/Makefile =================================================================== --- csw/mgar/pkg/graphviz/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/graphviz/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -13,6 +13,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWgraphviz,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/graphviz2/trunk/Makefile =================================================================== --- csw/mgar/pkg/graphviz2/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/graphviz2/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -12,6 +12,9 @@ MASTER_SITES = http://www.graphviz.org/pub/graphviz/ARCHIVE/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/grep/trunk/Makefile =================================================================== --- csw/mgar/pkg/grep/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/grep/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -17,6 +17,9 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + # Patch makefile to honor DESTDIR PATCHFILES = install.diff Modified: csw/mgar/pkg/groff/trunk/Makefile =================================================================== --- csw/mgar/pkg/groff/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/groff/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -16,6 +16,9 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) INSTALL_OVERRIDE_DIRS = bindir datadir Modified: csw/mgar/pkg/gtar/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtar/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/gtar/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -18,6 +18,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWgtar,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) --program-prefix=g TEST_SCRIPTS = Modified: csw/mgar/pkg/gtkpod/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtkpod/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/gtkpod/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -17,6 +17,9 @@ DISTFILES += $(call admfiles,CSWgtkpod) PATCHFILES = file_convert.diff +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + GARCOMPILER = GNU LIBDEPS += lib/libgpod Modified: csw/mgar/pkg/guile/trunk/Makefile =================================================================== --- csw/mgar/pkg/guile/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/guile/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -12,6 +12,9 @@ DISTFILES += $(call admfiles,CSWguile,$(ADMSTANDARD)) DISTFILES += $(call admfiles,CSWguilelib12,$(ADMSTANDARD)) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) TEST_SCRIPTS = Modified: csw/mgar/pkg/hicolor-icon-theme/trunk/Makefile =================================================================== --- csw/mgar/pkg/hicolor-icon-theme/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/hicolor-icon-theme/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -10,6 +10,9 @@ MASTER_SITES = http://freedesktop.org/Software/icon-theme/releases/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_SCRIPTS = $(WORKSRC)/configure BUILD_SCRIPTS = $(WORKSRC)/Makefile INSTALL_SCRIPTS = $(WORKSRC)/Makefile Modified: csw/mgar/pkg/hylafax/trunk/Makefile =================================================================== --- csw/mgar/pkg/hylafax/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/hylafax/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -13,6 +13,9 @@ DISTFILES += config.site.CSW #DISTFILES += cswhylafax.init cswhylafax.xml svc-cswhylafax +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + PATCHFILES = patch-hylafax.diff PREREQUISITE_PKGS = CSWoldapdevel Modified: csw/mgar/pkg/hypermail/trunk/Makefile =================================================================== --- csw/mgar/pkg/hypermail/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/hypermail/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -17,6 +17,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWhypermail,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # configure cancels out env LDFLAGS by default PATCHFILES += ldflag.diff # force Makefiles to honor DESTDIR Modified: csw/mgar/pkg/imapfilter/trunk/Makefile =================================================================== --- csw/mgar/pkg/imapfilter/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/imapfilter/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -16,6 +16,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += CSWimapfilter.gspec CSWimapfilter.depend CSWimapfilter.prototype +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + # Remove anti-social makeflags PATCHFILES += make.diff Modified: csw/mgar/pkg/inputproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/inputproto/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/inputproto/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + DISTFILES += $(call admfiles,CSWinputproto, depend) LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib Modified: csw/mgar/pkg/iozone/trunk/Makefile =================================================================== --- csw/mgar/pkg/iozone/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/iozone/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -19,6 +19,9 @@ DISTNAME = $(GARNAME)$(VERSION) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)(\d+(?:\.\d+)*).tar + PATCHFILES = patch-vx_ioctl.diff DOCS = IOzone_msword_98.pdf Modified: csw/mgar/pkg/irssi/trunk/Makefile =================================================================== --- csw/mgar/pkg/irssi/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/irssi/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -15,6 +15,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWirssi, postinstall depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-ipv6 CONFIGURE_ARGS += --with-socks Modified: csw/mgar/pkg/jboss4/trunk/Makefile =================================================================== --- csw/mgar/pkg/jboss4/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/jboss4/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -13,6 +13,9 @@ DISTFILES += CSWjboss4.gspec CSWjboss4.prototype CSWjboss4.depend preremove postinstall preinstall checkinstall space i.smfno i.smfyes svc-jboss4 jboss4.xml jboss4.conf cswjboss4 # DISTFILES += $(call admfiles, CSWjboss4, depend ) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = jboss-(\d+(?:\.\d+)*).zip + CONFIGURE_SCRIPTS = none BUILD_SCRIPTS = none TEST_SCRIPTS = none Modified: csw/mgar/pkg/jetty6/trunk/Makefile =================================================================== --- csw/mgar/pkg/jetty6/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/jetty6/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -21,6 +21,9 @@ DISTFILES += $(call admfiles,CSW$(GARNAME),prototype csw_usrgrp_config postinstall) DISTFILES += $(call admfiles,CSW$(GARNAME)doc,prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = jetty-(\d+(?:\.\d+)*).zip + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = Modified: csw/mgar/pkg/jhead/trunk/Makefile =================================================================== --- csw/mgar/pkg/jhead/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/jhead/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += CSWjhead.gspec CSWjhead.prototype +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + PATCHFILES = makefile.patch # jhead doesn't use configure Modified: csw/mgar/pkg/jicmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/jicmp/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/jicmp/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -8,6 +8,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWjicmp,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + PATCHFILES = gar-base.diff CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/joe/trunk/Makefile =================================================================== --- csw/mgar/pkg/joe/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/joe/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -22,6 +22,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWjoe,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) # joe doesn't have a test target Modified: csw/mgar/pkg/jrrd/trunk/Makefile =================================================================== --- csw/mgar/pkg/jrrd/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/jrrd/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -8,6 +8,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWjrrd,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-java=/usr/jdk/latest CONFIGURE_ARGS += --disable-rpm-rules Modified: csw/mgar/pkg/kbproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/kbproto/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/kbproto/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + DISTFILES += $(call admfiles,CSWkbproto, depend) LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib Modified: csw/mgar/pkg/kdesvn/trunk/Makefile =================================================================== --- csw/mgar/pkg/kdesvn/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/kdesvn/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -15,6 +15,9 @@ DISTFILES += $(call admfiles,CSWkdesvn,) #DISTFILES += $(call admfiles,CSWkdesvn,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + #CONFIGURE_ARGS = $(DIRPATHS) LD_OPTIONS = -R/opt/csw/kde-gcc/lib -R/opt/csw/lib/\$$ISALIST -R/opt/csw/lib Modified: csw/mgar/pkg/kile/trunk/Makefile =================================================================== --- csw/mgar/pkg/kile/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/kile/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -14,6 +14,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWkile,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + # Compile with GCC GARCOMPILER = GNU Modified: csw/mgar/pkg/koffice/trunk/Makefile =================================================================== --- csw/mgar/pkg/koffice/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/koffice/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -11,6 +11,8 @@ #DISTFILES += Templates, addons, etc... DISTFILES += $(call admfiles,CSWkofficegcc,) DISTFILES += $(call admfiles,CSWkofficeaddons,) +# We define upstream file regex so we can be notifed of new upstream software release +#UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz DEPENDS += Modified: csw/mgar/pkg/krb5/trunk/Makefile =================================================================== --- csw/mgar/pkg/krb5/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/krb5/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -20,6 +20,9 @@ DISTFILES += $(call admfiles,CSWkrb5libdev,depend) DISTFILES += $(call admfiles,CSWkrb5user,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)-signed.tar + PATCHFILES = patch-man2html-perl.diff PATCHFILES += patch-ldap-const.diff Modified: csw/mgar/pkg/ksh/trunk/Makefile =================================================================== --- csw/mgar/pkg/ksh/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/ksh/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -15,6 +15,9 @@ #DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWksh,) +# We define upstream file regex so we can be notifed of new upstream software release +# UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk Modified: csw/mgar/pkg/ldapvi/trunk/Makefile =================================================================== --- csw/mgar/pkg/ldapvi/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/ldapvi/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -13,6 +13,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWldapvi,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + PATCHFILES = patch-putenv.diff PREREQUISITE_PKGS = CSWoldapdevel Modified: csw/mgar/pkg/less/trunk/Makefile =================================================================== --- csw/mgar/pkg/less/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/less/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -12,6 +12,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWless,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + PREREQUISITE_PKGS = CSWncurses CSWggettext CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/libX11/trunk/Makefile =================================================================== --- csw/mgar/pkg/libX11/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/libX11/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + DISTFILES += CSWlibX11.gspec CSWlibX11.prototype CSWlibX11.depend DISTFILES += CSWlibX11dev.gspec CSWlibX11dev.prototype CSWlibX11dev.depend # DISTFILES += $(call admfiles,CSWlibX11, depend) Modified: csw/mgar/pkg/libao/trunk/Makefile =================================================================== --- csw/mgar/pkg/libao/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/libao/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -13,6 +13,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWlibao,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/libart/trunk/Makefile =================================================================== --- csw/mgar/pkg/libart/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/libart/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -42,6 +42,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWlibart) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + WORKDIR = $(WORKROOTDIR)/$(DESTIMG).d/$(ISA) COOKIEROOTDIR = cookies.$(ISA) COOKIEDIR = $(COOKIEROOTDIR) Modified: csw/mgar/pkg/libcairo/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcairo/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/libcairo/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -21,6 +21,9 @@ export CFLAGS CXXFLAGS LDFLAGS +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + GREP = ggrep include gar/category.mk Modified: csw/mgar/pkg/libdvdcss/trunk/Makefile =================================================================== --- csw/mgar/pkg/libdvdcss/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/libdvdcss/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWlibdvdcss, depend ) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + GARCOMPILER ?= GNU CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/libdvdread/trunk/Makefile =================================================================== --- csw/mgar/pkg/libdvdread/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/libdvdread/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWlibdvdread, depend ) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) TEST_SCRIPTS = Modified: csw/mgar/pkg/libevent/trunk/Makefile =================================================================== --- csw/mgar/pkg/libevent/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/libevent/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -17,6 +17,9 @@ DISTFILES += $(call admfiles,CSWlibevent,depend prototype) DISTFILES += $(call admfiles,CSWlibevent-devel,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + GARCOMPILER = GNU # Adjust test.sh shell Modified: csw/mgar/pkg/libglade/trunk/Makefile =================================================================== --- csw/mgar/pkg/libglade/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/libglade/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWlibglade,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) --disable-nls TEST_SCRIPTS = Modified: csw/mgar/pkg/libgphoto2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgphoto2/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/libgphoto2/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -20,6 +20,9 @@ # 'cc' is a shell script to hack around libtool craziness DISTFILES += cc +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + LD_OPTIONS = -R/opt/csw/lib/\$$ISALIST -R/opt/csw/lib # We need these directories in EXTRA_INC to make sure they appear before Modified: csw/mgar/pkg/libgpod/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgpod/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/libgpod/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -15,6 +15,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWlibgpod,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + GARCOMPILER = GNU #GCC4 won't work. There are too many libtool deps using GCC3 GNU_CC_HOME = /opt/csw/gcc3 Modified: csw/mgar/pkg/libgsasl/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgsasl/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/libgsasl/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -14,6 +14,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWlibgsasl,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + PREREQUISITE_PKGS = CSWkrb5libdev CSWlibntlm CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/libmp4v2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmp4v2/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/libmp4v2/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -17,6 +17,9 @@ PATCHFILES += include-limits.h.diff PATCHFILES += stdint-to-inttypes.h.diff +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + GARCOMPILER = GNU CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/libntlm/trunk/Makefile =================================================================== --- csw/mgar/pkg/libntlm/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/libntlm/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -15,6 +15,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWlibntlm,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/libogg/trunk/Makefile =================================================================== --- csw/mgar/pkg/libogg/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/libogg/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -12,6 +12,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWlibogg,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/libpcap/trunk/Makefile =================================================================== --- csw/mgar/pkg/libpcap/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/libpcap/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWlibpcap,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # Shared libraries patch PATCHFILES = solib.diff Modified: csw/mgar/pkg/libpthread-stubs/trunk/Makefile =================================================================== --- csw/mgar/pkg/libpthread-stubs/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/libpthread-stubs/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # DISTFILES += CSWlibpthreadstubs.gspec CSWlibpthreadstubs.prototype CSWlibpthreadstubs.depend # DISTFILES += CSWlibpthreadstubsdev.gspec CSWlibpthreadstubsdev.prototype CSWlibpthreadstubsdev.depend DISTFILES += $(call admfiles,CSWlibpthreadstubs, depend) Modified: csw/mgar/pkg/libsamplerate/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsamplerate/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/libsamplerate/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -15,6 +15,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWlibsamplerate,prototype depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + PATCHFILES += $(notdir $(wildcard $(FILEDIR)/*.patch)) CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/libsdl/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsdl/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/libsdl/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -13,6 +13,7 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWlibsdl) +# We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/libtool/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtool/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/libtool/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -15,7 +15,8 @@ DISTFILES += $(call admfiles,CSWlibtoolrt,prototype) DISTFILES += $(foreach ARCH,i386 sparc,$(ARCH)-gcc2.conf $(ARCH)-gcc2.tags $(ARCH)-gcc3.conf $(ARCH)-gcc3.tags) -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/libvorbis/trunk/Makefile =================================================================== --- csw/mgar/pkg/libvorbis/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/libvorbis/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -13,6 +13,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWlibvorbis,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + LIBDEPS += lib/libogg CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From william at wbonnet.net Tue Dec 2 00:59:38 2008 From: william at wbonnet.net (William Bonnet) Date: Tue, 02 Dec 2008 00:59:38 +0100 Subject: [csw-devel] Upstream check Message-ID: <49347A6A.5040609@wbonnet.net> Hi, Today I have made several minor modification to gar scripts to support source update detection (check-upstream target). I also added the basic regexp definition to most of the makefiles (but cpan stuff). Now i will start to iterate on test loop to check each master site url and reg exp to detect notification errors (i won't prevent from building don't worry...) and fix them. It may take some time depending on how much error i'll get ;) Please blame me i created error in your makefile ;) cheers -- William http://www.wbonnet.net http://www.sunwizard.net Le site fran?ais des amateurs de stations Unix http://www.blastwave.org An OpenSolaris Community Site http://www.opencsw.org Community SoftWare for Solaris http://www.guses.org French speaking Solaris User Group From wbonnet at users.sourceforge.net Tue Dec 2 01:03:56 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 02 Dec 2008 00:03:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[2426] csw/mgar/pkg Message-ID: Revision: 2426 http://gar.svn.sourceforge.net/gar/?rev=2426&view=rev Author: wbonnet Date: 2008-12-02 00:03:53 +0000 (Tue, 02 Dec 2008) Log Message: ----------- Add upstream check to some more makefiles URL for upstream master site and reg exp will now be checked one by one Modified Paths: -------------- csw/mgar/pkg/libXau/trunk/Makefile csw/mgar/pkg/libXdmcp/trunk/Makefile csw/mgar/pkg/libxcb/trunk/Makefile csw/mgar/pkg/libxine/trunk/Makefile csw/mgar/pkg/listadmin/trunk/Makefile csw/mgar/pkg/lsof/trunk/Makefile csw/mgar/pkg/lua/trunk/Makefile csw/mgar/pkg/lynx/trunk/Makefile csw/mgar/pkg/lyx/trunk/Makefile csw/mgar/pkg/m4/trunk/Makefile csw/mgar/pkg/make/trunk/Makefile csw/mgar/pkg/mantis/trunk/Makefile csw/mgar/pkg/maven2/trunk/Makefile csw/mgar/pkg/memcached/trunk/Makefile csw/mgar/pkg/mercurial/trunk/Makefile csw/mgar/pkg/mktemp/trunk/Makefile csw/mgar/pkg/mm/trunk/Makefile csw/mgar/pkg/mod_auth_mysql/trunk/Makefile csw/mgar/pkg/mod_auth_pam/trunk/Makefile csw/mgar/pkg/mod_evasive/trunk/Makefile csw/mgar/pkg/mod_fastcgi/trunk/Makefile csw/mgar/pkg/mod_geoip/trunk/Makefile csw/mgar/pkg/mod_highlight/trunk/Makefile csw/mgar/pkg/mod_jk/trunk/Makefile csw/mgar/pkg/mod_proxy_html/trunk/Makefile csw/mgar/pkg/mod_python/trunk/Makefile csw/mgar/pkg/mod_ruby/trunk/Makefile csw/mgar/pkg/mod_transform/trunk/Makefile csw/mgar/pkg/mono/trunk/Makefile csw/mgar/pkg/mpd/trunk/Makefile csw/mgar/pkg/mplayer/trunk/Makefile csw/mgar/pkg/mrtg/trunk/Makefile csw/mgar/pkg/msmtp/trunk/Makefile csw/mgar/pkg/mysql-python/trunk/Makefile csw/mgar/pkg/mysql-ruby/trunk/Makefile csw/mgar/pkg/mysql4/trunk/Makefile csw/mgar/pkg/namazu/trunk/Makefile csw/mgar/pkg/ncftp/trunk/Makefile csw/mgar/pkg/ncmpc/trunk/Makefile csw/mgar/pkg/neon/trunk/Makefile csw/mgar/pkg/ngrep/trunk/Makefile csw/mgar/pkg/nmap/trunk/Makefile csw/mgar/pkg/nspr/trunk/Makefile csw/mgar/pkg/ntop/trunk/Makefile csw/mgar/pkg/ogle/trunk/Makefile csw/mgar/pkg/ogle_gui/trunk/Makefile csw/mgar/pkg/openal/trunk/Makefile csw/mgar/pkg/openexr/trunk/Makefile csw/mgar/pkg/opengrok/trunk/Makefile csw/mgar/pkg/openldap/trunk/Makefile csw/mgar/pkg/openvpn/trunk/Makefile csw/mgar/pkg/opera/trunk/Makefile csw/mgar/pkg/orca/trunk/Makefile csw/mgar/pkg/pango/trunk/Makefile csw/mgar/pkg/pari/trunk/Makefile csw/mgar/pkg/patch/trunk/Makefile csw/mgar/pkg/pca/trunk/Makefile csw/mgar/pkg/pcre/trunk/Makefile csw/mgar/pkg/pixman/trunk/Makefile csw/mgar/pkg/pkgconfig/trunk/Makefile csw/mgar/pkg/pkgutil/trunk/Makefile csw/mgar/pkg/postfix/trunk/Makefile csw/mgar/pkg/pound/trunk/Makefile csw/mgar/pkg/proftpd/trunk/Makefile csw/mgar/pkg/pth/trunk/Makefile csw/mgar/pkg/pubcookie/trunk/Makefile csw/mgar/pkg/pv/trunk/Makefile csw/mgar/pkg/pydocutils/trunk/Makefile csw/mgar/pkg/pysetuptools/trunk/Makefile csw/mgar/pkg/pysqlite/trunk/Makefile csw/mgar/pkg/pysqlite2/trunk/Makefile csw/mgar/pkg/python/trunk/Makefile csw/mgar/pkg/python25/trunk/Makefile csw/mgar/pkg/qt4/trunk/Makefile csw/mgar/pkg/qt4-gcc/trunk/Makefile csw/mgar/pkg/quanta/trunk/Makefile csw/mgar/pkg/rake/trunk/Makefile csw/mgar/pkg/rapidsvn/trunk/Makefile csw/mgar/pkg/readline/trunk/Makefile csw/mgar/pkg/recode/trunk/Makefile csw/mgar/pkg/renderproto/trunk/Makefile csw/mgar/pkg/resin/trunk/Makefile csw/mgar/pkg/rl/trunk/Makefile csw/mgar/pkg/rrdtool/trunk/Makefile csw/mgar/pkg/ruby/trunk/Makefile csw/mgar/pkg/rubygems/trunk/Makefile csw/mgar/pkg/sasl/trunk/Makefile csw/mgar/pkg/sdlimage/trunk/Makefile csw/mgar/pkg/sdlmixer/trunk/Makefile csw/mgar/pkg/sdlnet/trunk/Makefile csw/mgar/pkg/sdlsound/trunk/Makefile csw/mgar/pkg/sdlttf/trunk/Makefile csw/mgar/pkg/sed/trunk/Makefile csw/mgar/pkg/setoolkit/trunk/Makefile csw/mgar/pkg/sgml-xml-common/trunk/Makefile csw/mgar/pkg/sh-utils/trunk/Makefile csw/mgar/pkg/silvercity/trunk/Makefile csw/mgar/pkg/sloccount/trunk/Makefile csw/mgar/pkg/slrn/trunk/Makefile csw/mgar/pkg/smbldap-tools/trunk/Makefile csw/mgar/pkg/snort/trunk/Makefile csw/mgar/pkg/socat/trunk/Makefile csw/mgar/pkg/spamassassin/trunk/Makefile csw/mgar/pkg/spidermonkey/trunk/Makefile csw/mgar/pkg/sqlite3/trunk/Makefile csw/mgar/pkg/squidpurge/trunk/Makefile csw/mgar/pkg/subversion/trunk/Makefile csw/mgar/pkg/sudo/trunk/Makefile csw/mgar/pkg/sudo-ldap/trunk/Makefile csw/mgar/pkg/swaks/trunk/Makefile csw/mgar/pkg/swig/trunk/Makefile csw/mgar/pkg/sword/trunk/Makefile csw/mgar/pkg/synergy/trunk/Makefile csw/mgar/pkg/sysbench/trunk/Makefile csw/mgar/pkg/syslog_ng/trunk/Makefile csw/mgar/pkg/sysstat/trunk/Makefile csw/mgar/pkg/system-tray-applet/trunk/Makefile csw/mgar/pkg/tcp_wrappers/trunk/Makefile csw/mgar/pkg/template/trunk/Makefile csw/mgar/pkg/texinfo/trunk/Makefile csw/mgar/pkg/textutils/trunk/Makefile csw/mgar/pkg/tin/trunk/Makefile csw/mgar/pkg/tme/trunk/Makefile csw/mgar/pkg/tnef/trunk/Makefile csw/mgar/pkg/tomcat4/trunk/Makefile csw/mgar/pkg/tomcat5/trunk/Makefile csw/mgar/pkg/tomcat6/trunk/Makefile csw/mgar/pkg/trac/trunk/Makefile csw/mgar/pkg/tsclient/trunk/Makefile csw/mgar/pkg/vorbis-tools/trunk/Makefile csw/mgar/pkg/wesnoth/trunk/Makefile csw/mgar/pkg/wget/trunk/Makefile csw/mgar/pkg/xcb-proto/trunk/Makefile csw/mgar/pkg/xchat/trunk/Makefile csw/mgar/pkg/xextproto/trunk/Makefile csw/mgar/pkg/xft/trunk/Makefile csw/mgar/pkg/xine-ui/trunk/Makefile csw/mgar/pkg/xinetd/trunk/Makefile csw/mgar/pkg/xmlstarlet/trunk/Makefile csw/mgar/pkg/xmlto/trunk/Makefile csw/mgar/pkg/xmms/trunk/Makefile csw/mgar/pkg/xproto/trunk/Makefile csw/mgar/pkg/xrender/trunk/Makefile csw/mgar/pkg/xrestop/trunk/Makefile csw/mgar/pkg/xtrans/trunk/Makefile csw/mgar/pkg/zsh/trunk/Makefile Modified: csw/mgar/pkg/libXau/trunk/Makefile =================================================================== --- csw/mgar/pkg/libXau/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/libXau/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + DISTFILES += CSWlibXau.gspec CSWlibXau.prototype CSWlibXau.depend DISTFILES += CSWlibXaudev.gspec CSWlibXaudev.prototype CSWlibXaudev.depend # DISTFILES += $(call admfiles,CSWlibXau, depend) Modified: csw/mgar/pkg/libXdmcp/trunk/Makefile =================================================================== --- csw/mgar/pkg/libXdmcp/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/libXdmcp/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + DISTFILES += CSWlibXdmcp.gspec CSWlibXdmcp.prototype CSWlibXdmcp.depend DISTFILES += CSWlibXdmcpdev.gspec CSWlibXdmcpdev.prototype CSWlibXdmcpdev.depend # DISTFILES += $(call admfiles,CSWlibXdmcp, depend) Modified: csw/mgar/pkg/libxcb/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxcb/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/libxcb/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + DISTFILES += CSWlibxcb.gspec CSWlibxcb.prototype CSWlibxcb.depend DISTFILES += CSWlibxcbdev.gspec CSWlibxcbdev.prototype CSWlibxcbdev.depend # DISTFILES += $(call admfiles,CSWlibxcb, depend) Modified: csw/mgar/pkg/libxine/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxine/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/libxine/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ DISTFILES = xine-lib-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWlibxine,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + PATCHFILES = int_fast-defs-sol8.diff PATCHFILES += bswap-for-sol8-i386.diff PATCHFILES += configure-v8only.diff Modified: csw/mgar/pkg/listadmin/trunk/Makefile =================================================================== --- csw/mgar/pkg/listadmin/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/listadmin/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -8,6 +8,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWlistadmin,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + PATCHFILES = gar-base.diff # This package doesn't use ./configure Modified: csw/mgar/pkg/lsof/trunk/Makefile =================================================================== --- csw/mgar/pkg/lsof/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/lsof/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -17,6 +17,9 @@ #DISTFILES = $(TOPDIST).tar.bz2 WORKSRC = $(WORKDIR)/$(TOPDIST)/$(SRCDIST) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)_(\d+(?:\.\d+)*).tar.bz2 + CONFIGURE_SCRIPTS = custom CONFIGURE_ARGS = -n solariscc Modified: csw/mgar/pkg/lua/trunk/Makefile =================================================================== --- csw/mgar/pkg/lua/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/lua/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz #DISTFILES += CSWlua.gspec CSWlua.prototype CSWlua.depend +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + #LIBDEPS += lib/db lib/gdbm # Configuration flags Modified: csw/mgar/pkg/lynx/trunk/Makefile =================================================================== --- csw/mgar/pkg/lynx/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/lynx/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -15,6 +15,9 @@ DISTFILES = $(GARNAME)$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWlynx,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + WORKSRC = $(WORKDIR)/$(subst .,-,$(GARNAME)$(GARVERSION)) #LIBDEPS += lib/ncurses lib/openssl Modified: csw/mgar/pkg/lyx/trunk/Makefile =================================================================== --- csw/mgar/pkg/lyx/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/lyx/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWlyx,depend prototype postinstall) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + PATCHFILES = solaris.patch CONFIGURE_ARGS = PATH="/opt/csw/kde-gcc/bin:$$PATH" Modified: csw/mgar/pkg/m4/trunk/Makefile =================================================================== --- csw/mgar/pkg/m4/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/m4/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -14,6 +14,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWgm4,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) --program-prefix=g TEST_SCRIPTS = Modified: csw/mgar/pkg/make/trunk/Makefile =================================================================== --- csw/mgar/pkg/make/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/make/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -15,6 +15,9 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/mantis/trunk/Makefile =================================================================== --- csw/mgar/pkg/mantis/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/mantis/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -16,6 +16,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWmantis,depend preinstall postinstall) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = Modified: csw/mgar/pkg/maven2/trunk/Makefile =================================================================== --- csw/mgar/pkg/maven2/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/maven2/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -27,6 +27,9 @@ DISTFILES += $(call admfiles,CSWmaven2,) DISTFILES += bin-mvn +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = apache-maven-(\d+(?:\.\d+)*)-bin.tar.gz + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = Modified: csw/mgar/pkg/memcached/trunk/Makefile =================================================================== --- csw/mgar/pkg/memcached/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/memcached/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWmemcached,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + GARCOMPILER = GNU DEPENDS += lib/libevent Modified: csw/mgar/pkg/mercurial/trunk/Makefile =================================================================== --- csw/mgar/pkg/mercurial/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -10,6 +10,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWmercurial,prototype changelog.CSW) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = $(WORKSRC)/setup.py TEST_TARGET = Modified: csw/mgar/pkg/mktemp/trunk/Makefile =================================================================== --- csw/mgar/pkg/mktemp/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/mktemp/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -14,6 +14,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWmktemp) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + PATCHFILES = makefile-destdir.patch CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/mm/trunk/Makefile =================================================================== --- csw/mgar/pkg/mm/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/mm/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -18,6 +18,9 @@ DISTFILES += $(call admfiles,CSWlibmm,prototype) DISTFILES += libmm.so.13.0.20.bz2 +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-static Modified: csw/mgar/pkg/mod_auth_mysql/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_auth_mysql/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/mod_auth_mysql/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ ADMFILES = depend prototype postinstall preremove copyright DISTFILES += $(call admfiles,CSWap2modauthmysql,$(ADMFILES)) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # Restore deprecated (removed) macros PATCHFILES += apr.diff Modified: csw/mgar/pkg/mod_auth_pam/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_auth_pam/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/mod_auth_pam/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -17,6 +17,9 @@ CSWadmin = depend prototype postinstall preremove space DISTFILES += $(call admfiles,CSWap2modauthpam,$(CSWadmin)) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)-(\d+(?:\.\d+)*).tar.gz + # Fix up installation routine PATCHFILES += install.diff Modified: csw/mgar/pkg/mod_evasive/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_evasive/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/mod_evasive/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -15,6 +15,9 @@ DISTFILES += $(GARNAME)_$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWap2modevasive,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)_(\d+(?:\.\d+)*).tar.gz + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = custom INSTALL_SCRIPTS = custom Modified: csw/mgar/pkg/mod_fastcgi/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_fastcgi/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/mod_fastcgi/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ ADMFILES = depend prototype postinstall preremove copyright DISTFILES += $(call admfiles,CSWap2modfastcgi,$(ADMFILES)) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # Allow fcgi to compile against Apache 2.2. From # http://www.fastcgi.com/archives/fastcgi-developers/2005-December/004060.html # with blastwave modifications. Modified: csw/mgar/pkg/mod_geoip/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_geoip/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/mod_geoip/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -16,6 +16,9 @@ DISTFILES = $(SPKG_NAME)2_$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWap2modgeoip,depend postinstall preremove) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(SPKG_NAME)2-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = custom INSTALL_SCRIPTS = custom Modified: csw/mgar/pkg/mod_highlight/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_highlight/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/mod_highlight/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -17,6 +17,9 @@ DISTFILES += CSWap2modhighlight.prototype CSWap2modhighlight.depend DISTFILES += CSWap2modhighlight.postinstall CSWap2modhighlight.preremove +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-apxs=$(prefix)/apache2/sbin/apxs Modified: csw/mgar/pkg/mod_jk/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_jk/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/mod_jk/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -26,6 +26,9 @@ DISTFILES += $(call admfiles,CSWap2modjk,$(ADMINFILES)) DISTFILES += httpd-jk.conf.CSW +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)-src.tar.gz + AUXCONFIG += workers.properties AUXCONFIG += workers.properties.minimal AUXCONFIG += uriworkermap.properties Modified: csw/mgar/pkg/mod_proxy_html/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_proxy_html/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/mod_proxy_html/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -15,6 +15,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).c DISTFILES += $(call admfiles,CSWap2modproxyhtml,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).c + PREREQUISITE_PKGS = CSWapache2-devel CSWapache2 CSWlibxml2 WORKSRC = $(WORKDIR) Modified: csw/mgar/pkg/mod_python/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_python/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/mod_python/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -14,6 +14,9 @@ pkgfiles = depend prototype postinstall preremove space DISTFILES += $(call admfiles,CSWap2modpython,$(pkgfiles)) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz + #DEPENDS += lang/python CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/mod_ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_ruby/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/mod_ruby/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -18,6 +18,9 @@ #DISTFILES += CSWap2modruby.preremove #DISTFILES += CSWap2modruby.space +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_SCRIPTS = ruby CONFIGURE_ARGS = --prefix=$(prefix) Modified: csw/mgar/pkg/mod_transform/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_transform/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/mod_transform/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -17,6 +17,9 @@ DISTFILES += CSWap2modtransform.prototype CSWap2modtransform.depend DISTFILES += CSWap2modtransform.postinstall CSWap2modtransform.preremove +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # Anti-social GCC only behavior PATCHFILES += gcc.diff # Don't use APXS to install the module Modified: csw/mgar/pkg/mono/trunk/Makefile =================================================================== --- csw/mgar/pkg/mono/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/mono/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -14,6 +14,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += CSWmono.gspec CSWmono.depend CSWmono.prototype +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/mpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/mpd/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/mpd/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -18,6 +18,9 @@ DISTFILES += cswmpd.xml svc-cswmpd cswmpd DISTFILES += CSWmpd.csw_usrgrp_config +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + TEST_TARGET = check include gar/category.mk Modified: csw/mgar/pkg/mplayer/trunk/Makefile =================================================================== --- csw/mgar/pkg/mplayer/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/mplayer/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -23,6 +23,9 @@ DISTFILES += Blue-1.7.tar.bz2 DISTFILES += $(call admfiles,CSWmplayer,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + PATCHFILES = fix-configure.diff PATCHFILES += fix-libavcodec-gcc-bug.diff PATCHFILES += fix-manpage-macros.diff Modified: csw/mgar/pkg/mrtg/trunk/Makefile =================================================================== --- csw/mgar/pkg/mrtg/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/mrtg/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWmrtg, depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-gd=/opt/csw CONFIGURE_ARGS += --with-gd-lib=/opt/csw/lib Modified: csw/mgar/pkg/msmtp/trunk/Makefile =================================================================== --- csw/mgar/pkg/msmtp/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/msmtp/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -26,6 +26,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWmsmtp,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/mysql-python/trunk/Makefile =================================================================== --- csw/mgar/pkg/mysql-python/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/mysql-python/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWpymysql,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = $(WORKSRC)/setup.py TEST_SCRIPTS = Modified: csw/mgar/pkg/mysql-ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/mysql-ruby/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/mysql-ruby/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWrbmysql,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + #DEPENDS += lang/ruby server/mysql4 CONFIGURE_SCRIPTS = ruby Modified: csw/mgar/pkg/mysql4/trunk/Makefile =================================================================== --- csw/mgar/pkg/mysql4/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/mysql4/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWmysql4,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + DB_USER = mysqld CONFIGURE_ARGS = --prefix=$(prefix)/mysql4 Modified: csw/mgar/pkg/namazu/trunk/Makefile =================================================================== --- csw/mgar/pkg/namazu/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/namazu/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ DISTFILES = $(DISTNAME).tar.gz DISTFILES += CSWnamazu.gspec CSWnamazu.depend CSWnamazu.prototype +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS += $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/ncftp/trunk/Makefile =================================================================== --- csw/mgar/pkg/ncftp/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/ncftp/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION)-src.tar.bz2 DISTFILES += $(call admfiles,CSWncftp,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)-src.tar.bz2 + WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) CONFIGURE_ARGS = $(DIRPATHS) --without-ncurses Modified: csw/mgar/pkg/ncmpc/trunk/Makefile =================================================================== --- csw/mgar/pkg/ncmpc/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/ncmpc/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -18,6 +18,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWncmpc,prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + TEST_TARGET = include gar/category.mk Modified: csw/mgar/pkg/neon/trunk/Makefile =================================================================== --- csw/mgar/pkg/neon/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/neon/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -22,6 +22,9 @@ DISTFILES += $(call admfiles,CSWneon-devel,$(ADMSTANDARD)) #DISTFILES += $(COMPATLIBS) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shared CONFIGURE_ARGS += --with-ssl=openssl Modified: csw/mgar/pkg/ngrep/trunk/Makefile =================================================================== --- csw/mgar/pkg/ngrep/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/ngrep/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -19,6 +19,9 @@ DISTFILES += $(call admfiles,CSWngrep,depend) PATCHFILES = gar-base.diff +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = Modified: csw/mgar/pkg/nmap/trunk/Makefile =================================================================== --- csw/mgar/pkg/nmap/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/nmap/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -17,6 +17,9 @@ MASTER_SITES = http://download.insecure.org/nmap/dist/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + # Compile against gtk+-2.0 (2.4.0) PATCHFILES = gtk20.diff Modified: csw/mgar/pkg/nspr/trunk/Makefile =================================================================== --- csw/mgar/pkg/nspr/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/nspr/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ DISTFILES += $(call admfiles,CSWnspr, depend ) # DISTFILES += CSWnspr.depend CSWnspr.gspec CSWnspr.prototype +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + PERL="/opt/csw/bin/perl" CFLAGS=-xlibmil CXXFLAGS="-xlibmil -xlibmopt -features=tmplife -norunpath" Modified: csw/mgar/pkg/ntop/trunk/Makefile =================================================================== --- csw/mgar/pkg/ntop/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/ntop/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -16,6 +16,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tgz DISTFILES += $(call admfiles,CSWntop,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + LIBDEPS += utils/rrdtool CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/ogle/trunk/Makefile =================================================================== --- csw/mgar/pkg/ogle/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/ogle/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWogle, depend ) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + #PATCHFILES = configure.in.diff CONFIGURE_ARGS = $(DIRPATHS) --disable-mmx Modified: csw/mgar/pkg/ogle_gui/trunk/Makefile =================================================================== --- csw/mgar/pkg/ogle_gui/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/ogle_gui/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWogle_gui, depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + GARCOMPILER ?= GNU CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/openal/trunk/Makefile =================================================================== --- csw/mgar/pkg/openal/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/openal/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES =$(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWopenal,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + PATCHFILES = al_main.diff GARCOMPILER = GNU Modified: csw/mgar/pkg/openexr/trunk/Makefile =================================================================== --- csw/mgar/pkg/openexr/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/openexr/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWopenexr,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) TEST_SCRIPTS = Modified: csw/mgar/pkg/opengrok/trunk/Makefile =================================================================== --- csw/mgar/pkg/opengrok/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/opengrok/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -17,6 +17,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWopengrok,depend postinstall preremove) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = Modified: csw/mgar/pkg/openldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/openldap/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/openldap/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -20,6 +20,9 @@ DISTFILES += $(call admfiles,CSWoldaprt,depend) DISTFILES += README.CSW openldaprc +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + PATCHFILES = patch-oldap-2.3.24-ntlm.diff DISTFILES += $(PATCHFILES) Modified: csw/mgar/pkg/openvpn/trunk/Makefile =================================================================== --- csw/mgar/pkg/openvpn/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/openvpn/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWopenvpn, prototype ) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = --prefix=$(prefix) --mandir=/opt/csw/share/man TEST_SCRIPTS = Modified: csw/mgar/pkg/opera/trunk/Makefile =================================================================== --- csw/mgar/pkg/opera/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/opera/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).gcc3-static-qt3.tar.gz DISTFILES += $(call admfiles,CSWopera, depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + PATCHFILES += bin-opera.diff WORKSRC = $(WORKDIR)/$(DISTNAME)-2466.gcc3-static-qt3 Modified: csw/mgar/pkg/orca/trunk/Makefile =================================================================== --- csw/mgar/pkg/orca/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/orca/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -35,6 +35,9 @@ PATCHFILES = $(GARNAME)-$(GARVERSION)-se-3.5.0.patch +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + PREREQUISITE_PKGS = CSWperl CSWpmtimedate CSWpmmathinterpolate CSWrrd CSWgawk CSWbzip2 CSWsetoolkit #libdir = $(exec_prefix)/lib/$(GARNAME) Modified: csw/mgar/pkg/pango/trunk/Makefile =================================================================== --- csw/mgar/pkg/pango/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/pango/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -14,6 +14,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWpango,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + LIBDEPS += lib/xft CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/pari/trunk/Makefile =================================================================== --- csw/mgar/pkg/pari/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/pari/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tgz DISTFILES += $(call admfiles,CSWparigp,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_SCRIPTS = custom CONFIGURE_ARGS = --prefix=$(prefix) CONFIGURE_ARGS += --miscdir=$(docdir)/pari Modified: csw/mgar/pkg/patch/trunk/Makefile =================================================================== --- csw/mgar/pkg/patch/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/patch/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -10,6 +10,9 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) INSTALL_OVERRIDE_DIRS = prefix exec_prefix bindir mandir Modified: csw/mgar/pkg/pca/trunk/Makefile =================================================================== --- csw/mgar/pkg/pca/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/pca/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -17,6 +17,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION) DISTFILES += $(call admfiles,CSWpca) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*) + WORKSRC = $(WORKDIR) CONFIGURE_SCRIPTS = Modified: csw/mgar/pkg/pcre/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcre/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/pcre/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -15,6 +15,9 @@ DISTFILES += $(call admfiles,CSWpcrert,depend prototype) DISTFILES += $(call admfiles,CSWpcre,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-unicode-properties CONFIGURE_ARGS += --enable-pcregrep-libz Modified: csw/mgar/pkg/pixman/trunk/Makefile =================================================================== --- csw/mgar/pkg/pixman/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/pixman/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ DISTFILES += CSWpixmandev.gspec CSWpixmandev.prototype CSWpixmandev.depend # DISTFILES += $(call admfiles,CSWpixman, depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CFLAGS += -xlibmil -errtags=yes -erroff=E_EMPTY_DECLARATION CXXFLAGS += -xlibmil -xlibmopt -features=tmplife -norunpath LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib Modified: csw/mgar/pkg/pkgconfig/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgconfig/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/pkgconfig/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -16,6 +16,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWpkgconfig,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + PATCHFILES = gsed-check.patch PREREQUISITE_PKGS = CSWggettext CSWglib2 CSWiconv CSWsunmath Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -14,6 +14,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).zip DISTFILES += $(call admfiles,CSWpkgutil,prototype postinstall preremove) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).zip + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = Modified: csw/mgar/pkg/postfix/trunk/Makefile =================================================================== --- csw/mgar/pkg/postfix/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/postfix/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -17,6 +17,9 @@ DISTFILES += $(call admfiles,CSWpostfix,prototype csw_conf_config csw_usrgrp_config postinstall postremove) DISTFILES += cswpostfix.xml svc-cswpostfix cswpostfix +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + PREREQUISITE_PKGS = CSWbdb4 CSWmysql4devel CSWlibpq CSWossldevel CSWoldapdevel SPKG_CLASSES = none csw_conf Modified: csw/mgar/pkg/pound/trunk/Makefile =================================================================== --- csw/mgar/pkg/pound/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/pound/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -15,6 +15,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tgz DISTFILES += $(call admfiles,CSWpound,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz + # Install properly when # (a) destdir does not exist, and # (b) installing as non root. Modified: csw/mgar/pkg/proftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/proftpd/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/proftpd/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -16,6 +16,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWproftpd,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + CONFIGURE_ARGS = $(DIRPATHS) # No test suite Modified: csw/mgar/pkg/pth/trunk/Makefile =================================================================== --- csw/mgar/pkg/pth/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/pth/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWpth,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk Modified: csw/mgar/pkg/pubcookie/trunk/Makefile =================================================================== --- csw/mgar/pkg/pubcookie/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/pubcookie/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -15,6 +15,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWpubcookie) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + PREREQUISITE_PKGS = CSWapache2-devel CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/pv/trunk/Makefile =================================================================== --- csw/mgar/pkg/pv/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/pv/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -20,6 +20,8 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += CSWpv.gspec CSWpv.depend CSWpv.prototype +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/pydocutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/pydocutils/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/pydocutils/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWpydocutils,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = $(WORKSRC)/setup.py TEST_SCRIPTS = Modified: csw/mgar/pkg/pysetuptools/trunk/Makefile =================================================================== --- csw/mgar/pkg/pysetuptools/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/pysetuptools/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWpysetuptools,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # Use versionless python lib PATCHFILES += pyversion.diff Modified: csw/mgar/pkg/pysqlite/trunk/Makefile =================================================================== --- csw/mgar/pkg/pysqlite/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/pysqlite/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -12,6 +12,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += CSWpysqlite.gspec +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = $(WORKSRC)/setup.py TEST_SCRIPTS = Modified: csw/mgar/pkg/pysqlite2/trunk/Makefile =================================================================== --- csw/mgar/pkg/pysqlite2/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/pysqlite2/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWpysqlite2,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = $(WORKSRC)/setup.py TEST_SCRIPTS = Modified: csw/mgar/pkg/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/python/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/python/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -16,6 +16,9 @@ MASTER_SITES = http://www.python.org/ftp/python/$(GARVERSION)/ DISTFILES = Python-$(GARVERSION).tar.bz2 +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = Python-(\d+(?:\.\d+)*).tar.bz2 + # Configure some site specific variables PATCHFILES = site-config.diff Modified: csw/mgar/pkg/python25/trunk/Makefile =================================================================== --- csw/mgar/pkg/python25/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/python25/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -19,11 +19,15 @@ endef MASTER_SITES = http://www.python.org/ftp/python/$(GARVERSION)/ +UPSTREAM_MASTER_SITES = http://www.python.org/ftp/python/ DISTFILES = $(DISTNAME).tar.bz2 DISTFILES += $(call admfiles,CSWpython,depend prototype) DISTFILES += $(call admfiles,CSWpython-tk,depend prototype) DISTFILES += $(call admfiles,CSWidle,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = (\d+(?:\.\d+)*) + # Configure PATCHFILES += setup.diff Modified: csw/mgar/pkg/qt4/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/qt4/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -39,6 +39,9 @@ DISTFILES += $(call admfiles,CSWqt4-devel,depend prototype-sparc prototype-i386) DISTFILES += $(call admfiles,CSWqt4-docs,prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = qt-x11-opensource-src-(\d+(?:\.\d+)*).tar.gz + WORKDIR = $(WORKROOTDIR)/$(DESTIMG).d/$(PLATFORM) COOKIEROOTDIR = cookies.$(PLATFORM) Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -16,6 +16,9 @@ #DISTFILES += $(call admfiles,CSWqt4gcc,depend prototype) DISTFILES += $(call admfiles,CSWqt4gcc,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = qt-x11-opensource-src-(\d+(?:\.\d+)*).tar.gz + #TMP_DIRPATHS = --prefix=$(prefix) --exec_prefix=$(exec_prefix) --bindir=$(bindir #) --sbindir=$(sbindir) --libexecdir=$(libexecdir) --datadir=$(datadir) --sysconf #dir=$(sysconfdir) --sharedstatedir=$(sharedstatedir) --localstatedir=$(localstat Modified: csw/mgar/pkg/quanta/trunk/Makefile =================================================================== --- csw/mgar/pkg/quanta/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/quanta/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -9,6 +9,9 @@ PKGDIST = kdewebdev-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWquantagcc,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = kdewebdev-(\d+(?:\.\d+)*).tar.bz2 + DEPENDS += CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/rake/trunk/Makefile =================================================================== --- csw/mgar/pkg/rake/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/rake/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tgz DISTFILES += CSWrake.gspec CSWrake.depend CSWrake.prototype +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + BUILD_SCRIPTS = CONFIGURE_SCRIPTS = INSTALL_SCRIPTS = ruby Modified: csw/mgar/pkg/rapidsvn/trunk/Makefile =================================================================== --- csw/mgar/pkg/rapidsvn/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/rapidsvn/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -12,6 +12,9 @@ DISTFILES += $(call admfiles,CSWrapidsvn,depend prototype) DISTFILES += $(call admfiles,CSWsvncpp,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # RapidSVN 0.9.1 omits the manpage from the dist archive DISTFILES += rapidsvn.xml Modified: csw/mgar/pkg/readline/trunk/Makefile =================================================================== --- csw/mgar/pkg/readline/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/readline/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -16,6 +16,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWreadline,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + LIBDEPS += lib/ncurses CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/recode/trunk/Makefile =================================================================== --- csw/mgar/pkg/recode/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/recode/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -16,6 +16,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWrecode,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # I did some more tests. The faulted tests have something to do # with compiler optimization: # Modified: csw/mgar/pkg/renderproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/renderproto/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/renderproto/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + DISTFILES += $(call admfiles,CSWrenderproto, depend) LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib Modified: csw/mgar/pkg/resin/trunk/Makefile =================================================================== --- csw/mgar/pkg/resin/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/resin/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -17,6 +17,9 @@ #DEPENDS = server/apache2 +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = --prefix=$(prefix)/resin CONFIGURE_ARGS += --enable-jni CONFIGURE_ARGS += --enable-ssl Modified: csw/mgar/pkg/rl/trunk/Makefile =================================================================== --- csw/mgar/pkg/rl/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/rl/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWrl,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) # Not gonna do it TEST_SCRIPTS = Modified: csw/mgar/pkg/rrdtool/trunk/Makefile =================================================================== --- csw/mgar/pkg/rrdtool/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/rrdtool/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWrrdtool,prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # Patch to make it build on x86 PATCHFILES += rrd_config.diff Modified: csw/mgar/pkg/ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/ruby/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -22,6 +22,9 @@ DISTFILES = $(GARNAME)-$(DISTVERSION)-$(PATCHLEVEL).tar.bz2 +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)-p(\d+).tar.bz2 + DISTFILES += CSWruby.gspec CSWruby.depend CSWruby.prototype DISTFILES += CSWrubytk.gspec CSWrubytk.depend CSWrubytk.prototype Modified: csw/mgar/pkg/rubygems/trunk/Makefile =================================================================== --- csw/mgar/pkg/rubygems/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/rubygems/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -14,6 +14,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tgz DISTFILES += $(call admfiles,CSWrubygems,depend copyright) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz + # Redirect Gem installation to $(DESTDIR) #PATCHFILES += postinstall.diff Modified: csw/mgar/pkg/sasl/trunk/Makefile =================================================================== --- csw/mgar/pkg/sasl/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/sasl/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -21,6 +21,9 @@ DISTFILES = cyrus-$(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = cyrus-$(GARNAME)-(\d+(?:\.\d+)*).tar.gz + BUILD_ENV = _REENTRANT=1 TEST_TARGET = check Modified: csw/mgar/pkg/sdlimage/trunk/Makefile =================================================================== --- csw/mgar/pkg/sdlimage/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/sdlimage/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWsdlimage,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) TEST_SCRIPTS = include gar/category.mk Modified: csw/mgar/pkg/sdlmixer/trunk/Makefile =================================================================== --- csw/mgar/pkg/sdlmixer/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/sdlmixer/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWsdlmixer, depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = --prefix=$(prefix) LDFLAGS=-lsunmath TEST_SCRIPTS = Modified: csw/mgar/pkg/sdlnet/trunk/Makefile =================================================================== --- csw/mgar/pkg/sdlnet/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/sdlnet/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWsdlnet,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) TEST_SCRIPTS = Modified: csw/mgar/pkg/sdlsound/trunk/Makefile =================================================================== --- csw/mgar/pkg/sdlsound/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/sdlsound/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWsdlsound,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) TEST_SCRIPTS = Modified: csw/mgar/pkg/sdlttf/trunk/Makefile =================================================================== --- csw/mgar/pkg/sdlttf/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/sdlttf/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWsdlttf,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + #PATCHFILES = SDL_ttf.c.diff TEST_SCRIPTS = Modified: csw/mgar/pkg/sed/trunk/Makefile =================================================================== --- csw/mgar/pkg/sed/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/sed/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/setoolkit/trunk/Makefile =================================================================== --- csw/mgar/pkg/setoolkit/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/setoolkit/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -35,6 +35,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWsetoolkit,prototype depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + WORKDIR = $(WORKROOTDIR)/$(DESTIMG).d/$(ISA) COOKIEROOTDIR = cookies.$(ISA) Modified: csw/mgar/pkg/sgml-xml-common/trunk/Makefile =================================================================== --- csw/mgar/pkg/sgml-xml-common/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/sgml-xml-common/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -22,6 +22,9 @@ DISTFILES += CSWxmlcommon.gspec CSWxmlcommon.prototype DISTFILES += $(EXTRA_FILES) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + PATCHFILES = sgml-common-0.6.3-docdir.patch sgml-common-automake.patch PATCHFILES += sgml-common-quotes.patch sgml-common-umask.patch PATCHFILES += sgml-common-xmldir.patch install-catalog-sanity.patch Modified: csw/mgar/pkg/sh-utils/trunk/Makefile =================================================================== --- csw/mgar/pkg/sh-utils/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/sh-utils/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -10,6 +10,9 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # Chinese translation has errors PATCHFILES = zh.diff Modified: csw/mgar/pkg/silvercity/trunk/Makefile =================================================================== --- csw/mgar/pkg/silvercity/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/silvercity/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -12,6 +12,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWsilvercity,depend prototype copyright) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = $(WORKSRC)/setup.py TEST_SCRIPTS = Modified: csw/mgar/pkg/sloccount/trunk/Makefile =================================================================== --- csw/mgar/pkg/sloccount/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/sloccount/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -15,6 +15,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += CSWsloc.gspec +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # Listen to the environment... PATCHFILES = make.diff Modified: csw/mgar/pkg/slrn/trunk/Makefile =================================================================== --- csw/mgar/pkg/slrn/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/slrn/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -18,6 +18,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWslrn,prototype depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + LD_OPTIONS = -R/opt/csw/lib/\$$ISALIST -R/opt/csw/lib CONFIGURE_ARGS = $(DIRPATHS) --with-ssl=/opt/csw Modified: csw/mgar/pkg/smbldap-tools/trunk/Makefile =================================================================== --- csw/mgar/pkg/smbldap-tools/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/smbldap-tools/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -12,6 +12,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tgz DISTFILES += $(call admfiles,CSWsmbldap-tools,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + #PREREQUISITE_PKGS = CSWpmldap CSWpmdigestsha1 CSWpmunicodemap PATCHFILES = header-confdir-fix.diff Modified: csw/mgar/pkg/snort/trunk/Makefile =================================================================== --- csw/mgar/pkg/snort/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/snort/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWsnort, depend ) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) --libdir=/opt/csw/lib CONFIGURE_ARGS += --enable-dynamicplugin Modified: csw/mgar/pkg/socat/trunk/Makefile =================================================================== --- csw/mgar/pkg/socat/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/socat/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -19,6 +19,9 @@ DISTFILES += changelog.CSW +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # Disable gcc specific options PATCHFILES = cc_compile.patch Modified: csw/mgar/pkg/spamassassin/trunk/Makefile =================================================================== --- csw/mgar/pkg/spamassassin/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/spamassassin/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -14,6 +14,9 @@ DISTFILES = $(SPKG_NAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWspamassassin,checkinstall depend postinstall) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(SPKG_NAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_SCRIPTS = custom BUILD_SCRIPTS = custom TEST_SCRIPTS = custom Modified: csw/mgar/pkg/spidermonkey/trunk/Makefile =================================================================== --- csw/mgar/pkg/spidermonkey/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/spidermonkey/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -14,6 +14,9 @@ # we are using our own DISTFILES += SunOS5.8_i86pc.mk +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = js-(\d+(?:\.\d+)*).tar.gz + DISTNAME = js # we find the os string used by the makefile by using Modified: csw/mgar/pkg/sqlite3/trunk/Makefile =================================================================== --- csw/mgar/pkg/sqlite3/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/sqlite3/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -15,6 +15,9 @@ DISTFILES += COPYING # DISTFILES += $(call admfiles,CSWsqlite3, depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = sqlite-(\d+(?:\.\d+)*).tar.gz + CFLAGS += -xlibmil -errtags=yes -erroff=E_EMPTY_DECLARATION CXXFLAGS += -xlibmil -xlibmopt -features=tmplife -norunpath LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib Modified: csw/mgar/pkg/squidpurge/trunk/Makefile =================================================================== --- csw/mgar/pkg/squidpurge/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/squidpurge/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -16,6 +16,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION)-src.tar.gz WORKSRC = $(WORKDIR)/$(GARNAME) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)-src.tar.gz + DISTFILES += $(call admfiles,CSWsquidpurge,prototype copyright) # Build with SunONE Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/subversion/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -17,6 +17,9 @@ DISTFILES = $(GARNAME)-$(DISTVERSION).tar.bz2 +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + # JUnit #MASTER_SITES += $(SF_MIRROR)/junit/ #DISTFILES += junit3.8.1.zip Modified: csw/mgar/pkg/sudo/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/sudo/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ MASTER_SITES = ftp://ftp.sudo.ws/pub/sudo/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + DISTFILES += CSWsudo.gspec CSWsudo.postinstall DISTFILES += CSWsudo.prototype CSWsudo.depend DISTFILES += CSWsudo.space CSWsudo.postremove Modified: csw/mgar/pkg/sudo-ldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo-ldap/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/sudo-ldap/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ MASTER_SITES = ftp://ftp.sudo.ws/pub/sudo/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + DISTFILES += CSWsudo-ldap.gspec CSWsudo-ldap.postinstall DISTFILES += CSWsudo-ldap.prototype CSWsudo-ldap.depend DISTFILES += CSWsudo-ldap.space CSWsudo-ldap.postremove Modified: csw/mgar/pkg/swaks/trunk/Makefile =================================================================== --- csw/mgar/pkg/swaks/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/swaks/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION) DISTFILES += $(call admfiles,CSW$(GARNAME), depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*) + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = INSTALL_SCRIPTS = custom Modified: csw/mgar/pkg/swig/trunk/Makefile =================================================================== --- csw/mgar/pkg/swig/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/swig/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -20,6 +20,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWswig,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # Prevent automake from attempting to regenerate everything PATCHFILES += am.diff Modified: csw/mgar/pkg/sword/trunk/Makefile =================================================================== --- csw/mgar/pkg/sword/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/sword/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -8,9 +8,13 @@ endef MASTER_SITES = http://crosswire.org/ftpmirror/pub/sword/source/v1.5 +UPSTREAM_MASTER_SITES = http://crosswire.org/ftpmirror/pub/sword/source/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWsword, depend ) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = v(\d+(?:\.\d+)*) + GARCOMPILER ?= GNU CPPFLAGS=-D_REENTRANT Modified: csw/mgar/pkg/synergy/trunk/Makefile =================================================================== --- csw/mgar/pkg/synergy/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/synergy/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -15,6 +15,9 @@ DISTFILES = synergy-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWsynergy) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = synergy-(\d+(?:\.\d+)*).tar.gz + # Adjust code so that it compiles with Sun Studio Compiler # https://sourceforge.net/tracker/index.php?func=detail&aid=1574331&group_id=59275&atid=490469 PATCHFILES = suncc.diff Modified: csw/mgar/pkg/sysbench/trunk/Makefile =================================================================== --- csw/mgar/pkg/sysbench/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/sysbench/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -21,6 +21,9 @@ #DISTFILES += $(call admfiles,CSWsysbench,) DISTFILES += $(call admfiles,CSWsysbench,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = Modified: csw/mgar/pkg/syslog_ng/trunk/Makefile =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/syslog_ng/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -15,6 +15,9 @@ DISTFILES += syslog-ng.conf.CSW DISTFILES += cswsyslog_ng +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + SPKG_CLASSES = none cswinitsmf PREREQUISITE_PKGS = CSWeventlog Modified: csw/mgar/pkg/sysstat/trunk/Makefile =================================================================== --- csw/mgar/pkg/sysstat/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/sysstat/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -20,6 +20,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tgz DISTFILES += $(call admfiles,CSWsysstat,prototype-sparc prototype-i386 depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + SPKG_SOURCEURL = http://www.maier-komor.de/sysstat.html PATCHFILES = patch-onlyisaexec-sysstatd.diff Modified: csw/mgar/pkg/system-tray-applet/trunk/Makefile =================================================================== --- csw/mgar/pkg/system-tray-applet/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/system-tray-applet/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -10,6 +10,9 @@ MASTER_SITES = http://ftp.gnome.org/pub/GNOME/sources/$(GARNAME)/$(GARVERSION)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + CONFIGURE_ARGS = $(DIRPATHS) # No test suite Modified: csw/mgar/pkg/tcp_wrappers/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcp_wrappers/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/tcp_wrappers/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -12,6 +12,9 @@ DISTFILES = $(DISTNAME).tar.gz WORKSRC = $(WORKDIR)/$(DISTNAME) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)_(\d+(?:\.\d+)*).tar.gz + #BUILD_ARGS = REAL_DAEMON_DIR=/foo/bar BUILD_ARGS += STYLE=-DPROCESS_OPTIONS Modified: csw/mgar/pkg/template/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/template/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWpackage,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) # Remove the following rules and uncomment the Modified: csw/mgar/pkg/texinfo/trunk/Makefile =================================================================== --- csw/mgar/pkg/texinfo/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/texinfo/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk Modified: csw/mgar/pkg/textutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/textutils/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/textutils/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -10,6 +10,9 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/tin/trunk/Makefile =================================================================== --- csw/mgar/pkg/tin/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/tin/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWtin,prototype depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + PATCHFILES = configure.patch CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/tme/trunk/Makefile =================================================================== --- csw/mgar/pkg/tme/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/tme/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -15,6 +15,9 @@ MASTER_SITES = http://people.csail.mit.edu/fredette/tme/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # -- ROM Images -- # Sun 2 Multibus Rev R ROM: Modified: csw/mgar/pkg/tnef/trunk/Makefile =================================================================== --- csw/mgar/pkg/tnef/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/tnef/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWtnef,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) TEST_SCRIPTS = custom Modified: csw/mgar/pkg/tomcat4/trunk/Makefile =================================================================== --- csw/mgar/pkg/tomcat4/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/tomcat4/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -7,12 +7,16 @@ Apache Tomcat is the servlet container that is used in the official Reference Implementation for the Java Servlet and JavaServer Pages technologies. The Java Servlet and JavaServer Pages specifications are developed by Sun under the Java Community Process. endef +UPSTREAM_MASTER_SITES = http://mir2.ovh.net/ftp.apache.org/dist/jakarta/tomcat-4/ MASTER_SITES = http://mir2.ovh.net/ftp.apache.org/dist/jakarta/tomcat-4/v$(GARVERSION)/bin/ DISTFILES = apache-tomcat-$(GARVERSION).tar.gz PKGDIST = apache-tomcat-$(GARVERSION).tar.gz DISTFILES += CSWtomcat4.gspec CSWtomcat4.prototype CSWtomcat4.depend preremove postinstall preinstall checkinstall space i.smfno i.smfyes svc-tomcat4 tomcat4.xml tomcat4 cswtomcat4 # DISTFILES += $(call admfiles, CSWtomcat4, depend ) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = v(\d+(?:\.\d+)*) + CONFIGURE_SCRIPTS = none BUILD_SCRIPTS = none TEST_SCRIPTS = none Modified: csw/mgar/pkg/tomcat5/trunk/Makefile =================================================================== --- csw/mgar/pkg/tomcat5/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/tomcat5/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -7,12 +7,16 @@ Apache Tomcat is the servlet container that is used in the official Reference Implementation for the Java Servlet and JavaServer Pages technologies. The Java Servlet and JavaServer Pages specifications are developed by Sun under the Java Community Process. endef +UPSTREAM_MASTER_SITES = http://mir2.ovh.net/ftp.apache.org/dist/jakarta/tomcat-5/ MASTER_SITES = http://mir2.ovh.net/ftp.apache.org/dist/jakarta/tomcat-5/v$(GARVERSION)/bin/ DISTFILES = apache-tomcat-$(GARVERSION).tar.gz PKGDIST = apache-tomcat-$(GARVERSION).tar.gz DISTFILES += CSWtomcat5.gspec CSWtomcat5.prototype CSWtomcat5.depend preremove postinstall preinstall checkinstall space i.smfno i.smfyes svc-tomcat5 tomcat5.xml tomcat5 cswtomcat5 # DISTFILES += $(call admfiles, CSWtomcat5, depend ) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = v(\d+(?:\.\d+)*) + CONFIGURE_SCRIPTS = none BUILD_SCRIPTS = none TEST_SCRIPTS = none Modified: csw/mgar/pkg/tomcat6/trunk/Makefile =================================================================== --- csw/mgar/pkg/tomcat6/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/tomcat6/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -7,12 +7,16 @@ Apache Tomcat is the servlet container that is used in the official Reference Implementation for the Java Servlet and JavaServer Pages technologies. The Java Servlet and JavaServer Pages specifications are developed by Sun under the Java Community Process. endef +UPSTREAM_MASTER_SITES = http://mir2.ovh.net/ftp.apache.org/dist/jakarta/tomcat-6/ MASTER_SITES = http://mir2.ovh.net/ftp.apache.org/dist/jakarta/tomcat-6/v$(GARVERSION)/bin/ DISTFILES = apache-tomcat-$(GARVERSION).tar.gz PKGDIST = apache-tomcat-$(GARVERSION).tar.gz DISTFILES += CSWtomcat6.gspec CSWtomcat6.prototype CSWtomcat6.depend preremove postinstall preinstall checkinstall space i.smfno i.smfyes svc-tomcat6 tomcat6.xml tomcat6 cswtomcat6 # DISTFILES += $(call admfiles, CSWtomcat6, depend ) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = v(\d+(?:\.\d+)*) + CONFIGURE_SCRIPTS = none BUILD_SCRIPTS = none TEST_SCRIPTS = none Modified: csw/mgar/pkg/trac/trunk/Makefile =================================================================== --- csw/mgar/pkg/trac/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/trac/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -15,6 +15,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWtrac,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + SPKG_SOURCEURL = http://trac.edgewall.org/wiki/TracDownload CONFIGURE_SCRIPTS = Modified: csw/mgar/pkg/tsclient/trunk/Makefile =================================================================== --- csw/mgar/pkg/tsclient/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/tsclient/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -12,6 +12,9 @@ PATCHFILES = support.c.diff CONFIGURE_ARGS = --prefix=$(prefix) LD_OPTIONS='-lsocket -lnsl' +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + TEST_SCRIPTS = include gar/category.mk Modified: csw/mgar/pkg/vorbis-tools/trunk/Makefile =================================================================== --- csw/mgar/pkg/vorbis-tools/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/vorbis-tools/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -10,9 +10,13 @@ simple commentor. endef +UPSTREAM_MASTER_SITES = http://www.vorbis.com/files/ MASTER_SITES = http://www.vorbis.com/files/1.0.1/unix/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = (\d+(?:\.\d+)*) + DEPENDS = lib/libvorbis CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/wesnoth/trunk/Makefile =================================================================== --- csw/mgar/pkg/wesnoth/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/wesnoth/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWwesnoth, depend ) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + GARCOMPILER ?= GNU PATCHFILES = language.cpp.diff Modified: csw/mgar/pkg/wget/trunk/Makefile =================================================================== --- csw/mgar/pkg/wget/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/wget/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -16,6 +16,9 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + LIBDEPS += lib/openssl CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/xcb-proto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xcb-proto/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/xcb-proto/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + DISTFILES += $(call admfiles,CSWxcb-proto, depend) LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib Modified: csw/mgar/pkg/xchat/trunk/Makefile =================================================================== --- csw/mgar/pkg/xchat/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/xchat/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -16,6 +16,9 @@ DISTFILES += CSWxchat-py.gspec CSWxchat-py.depend CSWxchat-py.prototype DISTFILES += CSWxchat-tcl.gspec CSWxchat-tcl.depend CSWxchat-tcl.prototype +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + # Remove hardcoded use of -lutil for the python plugin PATCHFILES += pylibs.diff Modified: csw/mgar/pkg/xextproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xextproto/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/xextproto/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + DISTFILES += $(call admfiles,CSWxextproto, depend) LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib Modified: csw/mgar/pkg/xft/trunk/Makefile =================================================================== --- csw/mgar/pkg/xft/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/xft/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = libXft-$(GARVERSION).tar.gz PKGDIST = libXft-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + DISTFILES += CSWlibxft2.gspec CSWlibxft2.prototype CSWlibxft2.depend DISTFILES += CSWlibxft2dev.gspec CSWlibxft2dev.prototype CSWlibxft2dev.depend # DISTFILES += $(call admfiles,CSWlibxft2, depend) Modified: csw/mgar/pkg/xine-ui/trunk/Makefile =================================================================== --- csw/mgar/pkg/xine-ui/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/xine-ui/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + LIBDEPS = lib/xine-lib CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/xinetd/trunk/Makefile =================================================================== --- csw/mgar/pkg/xinetd/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/xinetd/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -15,6 +15,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWxinetd,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + LIBDEPS += lib/tcp_wrappers CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/xmlstarlet/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlstarlet/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/xmlstarlet/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -16,6 +16,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWxmlstarlet,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + PATCHFILES = $(GARNAME)-$(GARVERSION)-cc.patch include gar/category.mk Modified: csw/mgar/pkg/xmlto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlto/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/xmlto/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -10,6 +10,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWxmlto) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-mktemp=/opt/csw/bin/mktemp CONFIGURE_ARGS += --with-find=/opt/csw/bin/gfind Modified: csw/mgar/pkg/xmms/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmms/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/xmms/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ MASTER_SITES = http://www.xmms.org/files/1.2.x/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + DEPENDS = lib/libvorbis CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/xproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xproto/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/xproto/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + DISTFILES += $(call admfiles,CSWxproto, depend) LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib Modified: csw/mgar/pkg/xrender/trunk/Makefile =================================================================== --- csw/mgar/pkg/xrender/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/xrender/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = libXrender-$(GARVERSION).tar.gz PKGDIST = libXrender-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + DISTFILES += CSWlibxrender.gspec CSWlibxrender.prototype CSWlibxrender.depend DISTFILES += CSWrenderdev.gspec CSWrenderdev.prototype CSWrenderdev.depend # DISTFILES += $(call admfiles,CSWxrender, depend) Modified: csw/mgar/pkg/xrestop/trunk/Makefile =================================================================== --- csw/mgar/pkg/xrestop/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/xrestop/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -16,4 +16,7 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWxrestop,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + include gar/category.mk Modified: csw/mgar/pkg/xtrans/trunk/Makefile =================================================================== --- csw/mgar/pkg/xtrans/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/xtrans/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # DISTFILES += CSWxtrans.gspec CSWxtrans.prototype CSWxtrans.depend # DISTFILES += CSWxtransdev.gspec CSWxtransdev.prototype CSWxtransdev.depend DISTFILES += $(call admfiles,CSWxtrans, depend) Modified: csw/mgar/pkg/zsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/zsh/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/zsh/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWzsh,depend postinstall postremove) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-maildir-support CONFIGURE_ARGS += --enable-fndir=$(sharedstatedir)/$(GARNAME)/functions This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Dec 2 07:53:18 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 02 Dec 2008 06:53:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[2427] csw/mgar/pkg/ethereal/trunk/Makefile Message-ID: Revision: 2427 http://gar.svn.sourceforge.net/gar/?rev=2427&view=rev Author: wbonnet Date: 2008-12-02 06:53:17 +0000 (Tue, 02 Dec 2008) Log Message: ----------- Comment UREG_FILEs something is blocking the parser, will fix it later Modified Paths: -------------- csw/mgar/pkg/ethereal/trunk/Makefile Modified: csw/mgar/pkg/ethereal/trunk/Makefile =================================================================== --- csw/mgar/pkg/ethereal/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) +++ csw/mgar/pkg/ethereal/trunk/Makefile 2008-12-02 06:53:17 UTC (rev 2427) @@ -14,7 +14,7 @@ DISTFILES = $(DISTNAME).tar.bz2 # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +# UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 DEPENDS += lib/libpcap DEPENDS += lib/gtk2 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 Dec 2 16:49:33 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Dec 2008 15:49:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[2428] csw/mgar Message-ID: Revision: 2428 http://gar.svn.sourceforge.net/gar/?rev=2428&view=rev Author: dmichelsen Date: 2008-12-02 15:49:33 +0000 (Tue, 02 Dec 2008) Log Message: ----------- mGAR v1: Added new target 'pkglist' Modified Paths: -------------- csw/mgar/gar/v1/gar.pkg.mk csw/mgar/pkg/Makefile Modified: csw/mgar/gar/v1/gar.pkg.mk =================================================================== --- csw/mgar/gar/v1/gar.pkg.mk 2008-12-02 06:53:17 UTC (rev 2427) +++ csw/mgar/gar/v1/gar.pkg.mk 2008-12-02 15:49:33 UTC (rev 2428) @@ -195,3 +195,22 @@ pkgenv: @$(PKG_ENV) env + +# pkglist - list the packages to be built with GAR pathname, catalog name and package name +# + +define _pkglist_pkgname +$(shell perl -F'\s+' -ane 'print "$$F[2]" if( $$F[0] eq "%var" && $$F[1] eq "pkgname")' files/$(1).gspec) +endef + +define _pkglist_catalogname +$(shell perl -F'\s+' -ane 'print "$$F[2]" if( $$F[0] eq "%var" && $$F[1] eq "bitname")' files/$(1).gspec) +endef + +define _pkglist_one +$(shell /usr/bin/echo "$(patsubst $(realpath $(shell pwd)/$(GARDIR))/%,%,$(realpath .))\t$(call _pkglist_catalogname,$(1))\t$(call _pkglist_pkgname,$(1))") +endef + +pkglist: + @echo "G: $(GARDIR) - $(shell pwd) - $(realpath $(shell pwd)/$(GARDIR)) - $(realpath .)" + @$(foreach SPEC,$(SPKG_SPECS),echo "$(call _pkglist_one,$(SPEC))";) Modified: csw/mgar/pkg/Makefile =================================================================== --- csw/mgar/pkg/Makefile 2008-12-02 06:53:17 UTC (rev 2427) +++ csw/mgar/pkg/Makefile 2008-12-02 15:49:33 UTC (rev 2428) @@ -22,6 +22,11 @@ $(MAKE) -C $$i $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG); \ done +pkglist: + @for i in $(filter-out $(FILTER_DIRS),$(wildcard */)) ; do \ + $(MAKE) -s -C $$i/trunk pkglist ; \ + done + newpkg-%: @svn mkdir $* $*/tags $*/branches $*/trunk $*/trunk/files @(echo "GARNAME = package"; \ 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 Dec 2 17:18:42 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Dec 2008 16:18:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[2429] csw/branches/dam/automatic-multiarch-compile Message-ID: Revision: 2429 http://gar.svn.sourceforge.net/gar/?rev=2429&view=rev Author: dmichelsen Date: 2008-12-02 16:18:42 +0000 (Tue, 02 Dec 2008) Log Message: ----------- automatic-multiarch-compile: Last LDFLAGS fix before merge Modified Paths: -------------- csw/branches/dam/automatic-multiarch-compile/gar.conf.mk csw/branches/dam/automatic-multiarch-compile/gar.mk Modified: csw/branches/dam/automatic-multiarch-compile/gar.conf.mk =================================================================== --- csw/branches/dam/automatic-multiarch-compile/gar.conf.mk 2008-12-02 15:49:33 UTC (rev 2428) +++ csw/branches/dam/automatic-multiarch-compile/gar.conf.mk 2008-12-02 16:18:42 UTC (rev 2429) @@ -330,28 +330,15 @@ # Subdirectories for specialized binaries and libraries # Use defaults for sparcv8 and i386 as those are symlinks -ISALIBDIR_sparcv9+fmuladd ?= sparcv9+fmuladd -ISALIBDIR_sparcv9+vis2 ?= sparcv9+vis2 -ISALIBDIR_sparcv9+vis ?= sparcv9+vis -ISALIBDIR_sparcv9 ?= sparcv9 -ISALIBDIR_sparcv8plus+fmuladd ?= sparcv8plus+fmuladd -ISALIBDIR_sparcv8plus+vis2 ?= sparcv8plus+vis2 -ISALIBDIR_sparcv8plus+vis ?= sparcv8plus+vis -ISALIBDIR_sparcv8plus ?= sparcv8plus ISALIBDIR_sparcv8 ?= . -ISALIBDIR_sparcv8-fsmuld ?= sparcv8-fsmuld -ISALIBDIR_amd64 ?= amd64 -ISALIBDIR_pentium_pro+mmx ?= pentium_pro+mmx -ISALIBDIR_pentium_pro ?= pentium_pro -ISALIBDIR_pentium+mmx ?= pentium+mmx -ISALIBDIR_pentium ?= pentium ISALIBDIR_i386 ?= . +$(foreach I,$(ISALIST),$(eval ISALIBDIR_$(I) ?= $I)) # These are the directories where the optimized libraries should go to ISALIBDIR ?= $(ISALIBDIR_$(ISA)) # These are the directories where the optimized binaries should go to -$(foreach ARCH,$(ISALIST), $(eval ISABINDIR_$(ARCH) ?= $(ISALIBDIR_$(ARCH)))) +$(foreach I,$(ISALIST), $(eval ISABINDIR_$(I) ?= $(ISALIBDIR_$(I)))) ISABINDIR ?= $(ISABINDIR_$(ISA)) # @@ -428,16 +415,15 @@ # the links 32 and 64. ifeq ($(origin LINKER_FLAGS), undefined) ifdef NOISALIST -LINKER_FLAGS = $(foreach ELIB,$(libdir)/$(MM_LIBDIR) $(EXTRA_LIB),-L$(ELIB) -R$(ELIB)) +LINKER_FLAGS = $(foreach ELIB,$(libdir) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR)) -R$(abspath $(ELIB)/$(MM_LIBDIR)) else # If we use $ISALIST it is a good idea to also add $MM_LIBDIR as there # may not be a subdirectory for the 32-bit standard case (this would normally -# be a symlink of the form lib/sparcv8 -> . and lib/i386 -> .) -LINKER_FLAGS = $(foreach ELIB,$(libdir) $(EXTRA_LIB),-L$(ELIB)/$(MM_LIBDIR) -R'$(ELIB)/\$$$$''ISALIST' -R$(ELIB)/$(MM_LIBDIR)) +# be a symlink of the form lib/sparcv8 -> . and lib/i386 -> .). This is most likely +# the case for libraries in $(EXTRA_LIBS) for which no links generated in CSWcommon. +LINKER_FLAGS = $(foreach ELIB,$(libdir) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR)) -R$(ELIB)/\\\\\\\$$\$$ISALIST -R$(abspath $(ELIB)/$(MM_LIBDIR))) +#LINKER_FLAGS = $(foreach ELIB,$(libdir) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR)) -R'$(abspath $(ELIB)/\$$ISALIST)' -R$(abspath $(ELIB)/$(MM_LIBDIR))) endif -#LINKER_FLAGS = $(foreach ELIB,$(EXTRA_LIB) $(abspath $(libdir)/$(MM_LIBDIR)),-L$(ELIB) -R$(ELIB)) -# DESTDIR is an old concept, disable for now -#LINKER_FLAGS += $(if $(IGNORE_DESTDIR),,-L$(abspath $(DESTDIR)$(libdir)/$(MM_LIBDIR))) endif CC_HOME = $($(GARCOMPILER)_CC_HOME) @@ -471,11 +457,9 @@ PATH = $(if $(filter SOS12,$(GARCOMPILER)),$(abspath $(GARBIN)/sos12-wrappers):)$(if $(IGNORE_DESTDIR),,$(abspath $(DESTDIR)$(bindir)/$(MM_BINDIR)):$(DESTDIR)$(bindir):$(abspath $(DESTDIR)$(sbindir)/$(MM_BINDIR)):$(DESTDIR)$(sbindir):)$(abspath $(bindir)/$(MM_BINDIR)):$(bindir):$(abspath $(sbindir)/$(MM_BINDIR)):$(sbindir):$(CC_HOME)/bin:$(abspath $(GARBIN)):/usr/bin:/usr/sbin:/usr/java/bin:/usr/ccs/bin # This is for foo-config chaos -PKG_CONFIG_PATH := $(abspath $(libdir)/$(MM_LIBDIR)/pkgconfig):$(libdir)/pkgconfig:$(PKG_CONFIG_PATH) -# DESTDIR is an old concept, disable for now. -#ifneq ($(IGNORE_DESTDIR),1) -#PKG_CONFIG_PATH := $(abspath $(DESTDIR)$(libdir)/$(MM_LIBDIR)/pkgconfig):$(DESTDIR)$(libdir)/pkgconfig:$(PKG_CONFIG_PATH) -#endif +#PKG_CONFIG_PATH := $(abspath $(libdir)/$(MM_LIBDIR)/pkgconfig):$(libdir)/pkgconfig:$(PKG_CONFIG_PATH) +PKG_CONFIG_DIRS ?= $(libdir) $(EXTRA_PKG_CONFIG_DIRS) +PKG_CONFIG_PATH ?= $(foreach D,$(PKG_CONFIG_DIRS),$(abspath $D/$(MM_LIBDIR)/pkgconfig)) # # Mirror Sites @@ -492,6 +476,10 @@ # Keep this for compatibility SF_MIRROR = $(firstword $(SF_MIRRORS)) +# Google Code +GOOGLE_PROJECT ?= $(GARNAME) +GOOGLE_MIRROR ?= http://$(GOOGLE_PROJECT).googlecode.com/files/ + # GNU GNU_SITE = http://mirrors.kernel.org/ GNU_GNUROOT = $(GNU_SITE)/gnu @@ -522,7 +510,6 @@ ifeq ($(origin COMPILER_EXPORTS), undefined) COMPILER_EXPORTS = CPPFLAGS CFLAGS CXXFLAGS LDFLAGS -#COMPILER_EXPORTS += ASFLAGS OPTFLAGS CC CXX LD_OPTIONS COMPILER_EXPORTS += ASFLAGS OPTFLAGS CC CXX COMPILER_EXPORTS += CC_HOME CC_VERSION CXX_VERSION endif @@ -534,15 +521,15 @@ COMMON_EXPORTS ?= $(DIRECTORY_EXPORTS) $(COMPILER_EXPORTS) $(GARPKG_EXPORTS) $(EXTRA_COMMON_EXPORTS) -CONFIGURE_EXPORTS ?= $(COMMON_EXPORTS) PKG_CONFIG_PATH DESTDIR -BUILD_EXPORTS ?= $(COMMON_EXPORTS) -TEST_EXPORTS ?= $(COMMON_EXPORTS) -INSTALL_EXPORTS ?= $(COMMON_EXPORTS) DESTDIR +CONFIGURE_EXPORTS ?= $(COMMON_EXPORTS) $(EXTRA_CONFIGURE_EXPORTS) PKG_CONFIG_PATH DESTDIR +BUILD_EXPORTS ?= $(COMMON_EXPORTS) $(EXTRA_BUILD_EXPORTS) +TEST_EXPORTS ?= $(COMMON_EXPORTS) $(EXTRA_TEST_EXPORTS) +INSTALL_EXPORTS ?= $(COMMON_EXPORTS) $(EXTRA_INSTALL_EXPORTS) DESTDIR -CONFIGURE_ENV ?= $(foreach TTT,$(CONFIGURE_EXPORTS) $(EXTRA_CONFIGURE_EXPORTS),$(TTT)="$($(TTT))") -BUILD_ENV ?= $(foreach TTT,$(BUILD_EXPORTS) $(EXTRA_BUILD_EXPORTS),$(TTT)="$($(TTT))") -TEST_ENV ?= $(foreach TTT,$(TEST_EXPORTS) $(EXTRA_TEST_EXPORTS),$(TTT)="$($(TTT))") -INSTALL_ENV ?= $(foreach TTT,$(INSTALL_EXPORTS) $(EXTRA_INSTALL_EXPORTS),$(TTT)="$($(TTT))") +CONFIGURE_ENV ?= $(foreach TTT,$(CONFIGURE_EXPORTS),$(TTT)="$($(TTT))") +BUILD_ENV ?= $(foreach TTT,$(BUILD_EXPORTS),$(TTT)="$($(TTT))") +TEST_ENV ?= $(foreach TTT,$(TEST_EXPORTS),$(TTT)="$($(TTT))") +INSTALL_ENV ?= $(foreach TTT,$(INSTALL_EXPORTS),$(TTT)="$($(TTT))") # Standard Scripts CONFIGURE_SCRIPTS ?= $(WORKSRC)/configure Modified: csw/branches/dam/automatic-multiarch-compile/gar.mk =================================================================== --- csw/branches/dam/automatic-multiarch-compile/gar.mk 2008-12-02 15:49:33 UTC (rev 2428) +++ csw/branches/dam/automatic-multiarch-compile/gar.mk 2008-12-02 16:18:42 UTC (rev 2429) @@ -582,7 +582,8 @@ _MERGE_INCLUDE_FILES += $(EXTRA_MERGE_INCLUDE_FILES) $(EXTRA_MERGE_INCLUDE_FILES_$(MODULATION)) MERGE_EXCLUDE_INFODIR ?= $(sharedstatedir)/info/dir -MERGE_EXCLUDE_DEFAULT ?= $(MERGE_EXCLUDE_INFODIR) $(libdir)/.*\.a $(libdir)/.*\.la +#MERGE_EXCLUDE_DEFAULT ?= $(MERGE_EXCLUDE_INFODIR) $(libdir)/.*\.a $(libdir)/.*\.la +MERGE_EXCLUDE_DEFAULT ?= $(MERGE_EXCLUDE_INFODIR) $(libdir)/.*\.a # Exclude these files ifeq ($(origin MERGE_EXCLUDE_FILES_$(MODULATION)), undefined) 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 Dec 2 17:21:00 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Dec 2008 16:21:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[2430] csw/mgar/gar/v2 Message-ID: Revision: 2430 http://gar.svn.sourceforge.net/gar/?rev=2430&view=rev Author: dmichelsen Date: 2008-12-02 16:20:57 +0000 (Tue, 02 Dec 2008) Log Message: ----------- mGAR v2: Merge [2429] from private branch Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2008-12-02 16:18:42 UTC (rev 2429) +++ csw/mgar/gar/v2/gar.conf.mk 2008-12-02 16:20:57 UTC (rev 2430) @@ -330,28 +330,15 @@ # Subdirectories for specialized binaries and libraries # Use defaults for sparcv8 and i386 as those are symlinks -ISALIBDIR_sparcv9+fmuladd ?= sparcv9+fmuladd -ISALIBDIR_sparcv9+vis2 ?= sparcv9+vis2 -ISALIBDIR_sparcv9+vis ?= sparcv9+vis -ISALIBDIR_sparcv9 ?= sparcv9 -ISALIBDIR_sparcv8plus+fmuladd ?= sparcv8plus+fmuladd -ISALIBDIR_sparcv8plus+vis2 ?= sparcv8plus+vis2 -ISALIBDIR_sparcv8plus+vis ?= sparcv8plus+vis -ISALIBDIR_sparcv8plus ?= sparcv8plus ISALIBDIR_sparcv8 ?= . -ISALIBDIR_sparcv8-fsmuld ?= sparcv8-fsmuld -ISALIBDIR_amd64 ?= amd64 -ISALIBDIR_pentium_pro+mmx ?= pentium_pro+mmx -ISALIBDIR_pentium_pro ?= pentium_pro -ISALIBDIR_pentium+mmx ?= pentium+mmx -ISALIBDIR_pentium ?= pentium ISALIBDIR_i386 ?= . +$(foreach I,$(ISALIST),$(eval ISALIBDIR_$(I) ?= $I)) # These are the directories where the optimized libraries should go to ISALIBDIR ?= $(ISALIBDIR_$(ISA)) # These are the directories where the optimized binaries should go to -$(foreach ARCH,$(ISALIST), $(eval ISABINDIR_$(ARCH) ?= $(ISALIBDIR_$(ARCH)))) +$(foreach I,$(ISALIST), $(eval ISABINDIR_$(I) ?= $(ISALIBDIR_$(I)))) ISABINDIR ?= $(ISABINDIR_$(ISA)) # @@ -428,16 +415,15 @@ # the links 32 and 64. ifeq ($(origin LINKER_FLAGS), undefined) ifdef NOISALIST -LINKER_FLAGS = $(foreach ELIB,$(libdir)/$(MM_LIBDIR) $(EXTRA_LIB),-L$(ELIB) -R$(ELIB)) +LINKER_FLAGS = $(foreach ELIB,$(libdir) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR)) -R$(abspath $(ELIB)/$(MM_LIBDIR)) else # If we use $ISALIST it is a good idea to also add $MM_LIBDIR as there # may not be a subdirectory for the 32-bit standard case (this would normally -# be a symlink of the form lib/sparcv8 -> . and lib/i386 -> .) -LINKER_FLAGS = $(foreach ELIB,$(libdir) $(EXTRA_LIB),-L$(ELIB)/$(MM_LIBDIR) -R'$(ELIB)/\$$$$''ISALIST' -R$(ELIB)/$(MM_LIBDIR)) +# be a symlink of the form lib/sparcv8 -> . and lib/i386 -> .). This is most likely +# the case for libraries in $(EXTRA_LIBS) for which no links generated in CSWcommon. +LINKER_FLAGS = $(foreach ELIB,$(libdir) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR)) -R$(ELIB)/\\\\\\\$$\$$ISALIST -R$(abspath $(ELIB)/$(MM_LIBDIR))) +#LINKER_FLAGS = $(foreach ELIB,$(libdir) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR)) -R'$(abspath $(ELIB)/\$$ISALIST)' -R$(abspath $(ELIB)/$(MM_LIBDIR))) endif -#LINKER_FLAGS = $(foreach ELIB,$(EXTRA_LIB) $(abspath $(libdir)/$(MM_LIBDIR)),-L$(ELIB) -R$(ELIB)) -# DESTDIR is an old concept, disable for now -#LINKER_FLAGS += $(if $(IGNORE_DESTDIR),,-L$(abspath $(DESTDIR)$(libdir)/$(MM_LIBDIR))) endif CC_HOME = $($(GARCOMPILER)_CC_HOME) @@ -471,11 +457,9 @@ PATH = $(if $(filter SOS12,$(GARCOMPILER)),$(abspath $(GARBIN)/sos12-wrappers):)$(if $(IGNORE_DESTDIR),,$(abspath $(DESTDIR)$(bindir)/$(MM_BINDIR)):$(DESTDIR)$(bindir):$(abspath $(DESTDIR)$(sbindir)/$(MM_BINDIR)):$(DESTDIR)$(sbindir):)$(abspath $(bindir)/$(MM_BINDIR)):$(bindir):$(abspath $(sbindir)/$(MM_BINDIR)):$(sbindir):$(CC_HOME)/bin:$(abspath $(GARBIN)):/usr/bin:/usr/sbin:/usr/java/bin:/usr/ccs/bin # This is for foo-config chaos -PKG_CONFIG_PATH := $(abspath $(libdir)/$(MM_LIBDIR)/pkgconfig):$(libdir)/pkgconfig:$(PKG_CONFIG_PATH) -# DESTDIR is an old concept, disable for now. -#ifneq ($(IGNORE_DESTDIR),1) -#PKG_CONFIG_PATH := $(abspath $(DESTDIR)$(libdir)/$(MM_LIBDIR)/pkgconfig):$(DESTDIR)$(libdir)/pkgconfig:$(PKG_CONFIG_PATH) -#endif +#PKG_CONFIG_PATH := $(abspath $(libdir)/$(MM_LIBDIR)/pkgconfig):$(libdir)/pkgconfig:$(PKG_CONFIG_PATH) +PKG_CONFIG_DIRS ?= $(libdir) $(EXTRA_PKG_CONFIG_DIRS) +PKG_CONFIG_PATH ?= $(foreach D,$(PKG_CONFIG_DIRS),$(abspath $D/$(MM_LIBDIR)/pkgconfig)) # # Mirror Sites @@ -492,6 +476,10 @@ # Keep this for compatibility SF_MIRROR = $(firstword $(SF_MIRRORS)) +# Google Code +GOOGLE_PROJECT ?= $(GARNAME) +GOOGLE_MIRROR ?= http://$(GOOGLE_PROJECT).googlecode.com/files/ + # GNU GNU_SITE = http://mirrors.kernel.org/ GNU_GNUROOT = $(GNU_SITE)/gnu @@ -522,7 +510,6 @@ ifeq ($(origin COMPILER_EXPORTS), undefined) COMPILER_EXPORTS = CPPFLAGS CFLAGS CXXFLAGS LDFLAGS -#COMPILER_EXPORTS += ASFLAGS OPTFLAGS CC CXX LD_OPTIONS COMPILER_EXPORTS += ASFLAGS OPTFLAGS CC CXX COMPILER_EXPORTS += CC_HOME CC_VERSION CXX_VERSION endif @@ -534,15 +521,15 @@ COMMON_EXPORTS ?= $(DIRECTORY_EXPORTS) $(COMPILER_EXPORTS) $(GARPKG_EXPORTS) $(EXTRA_COMMON_EXPORTS) -CONFIGURE_EXPORTS ?= $(COMMON_EXPORTS) PKG_CONFIG_PATH DESTDIR -BUILD_EXPORTS ?= $(COMMON_EXPORTS) -TEST_EXPORTS ?= $(COMMON_EXPORTS) -INSTALL_EXPORTS ?= $(COMMON_EXPORTS) DESTDIR +CONFIGURE_EXPORTS ?= $(COMMON_EXPORTS) $(EXTRA_CONFIGURE_EXPORTS) PKG_CONFIG_PATH DESTDIR +BUILD_EXPORTS ?= $(COMMON_EXPORTS) $(EXTRA_BUILD_EXPORTS) +TEST_EXPORTS ?= $(COMMON_EXPORTS) $(EXTRA_TEST_EXPORTS) +INSTALL_EXPORTS ?= $(COMMON_EXPORTS) $(EXTRA_INSTALL_EXPORTS) DESTDIR -CONFIGURE_ENV ?= $(foreach TTT,$(CONFIGURE_EXPORTS) $(EXTRA_CONFIGURE_EXPORTS),$(TTT)="$($(TTT))") -BUILD_ENV ?= $(foreach TTT,$(BUILD_EXPORTS) $(EXTRA_BUILD_EXPORTS),$(TTT)="$($(TTT))") -TEST_ENV ?= $(foreach TTT,$(TEST_EXPORTS) $(EXTRA_TEST_EXPORTS),$(TTT)="$($(TTT))") -INSTALL_ENV ?= $(foreach TTT,$(INSTALL_EXPORTS) $(EXTRA_INSTALL_EXPORTS),$(TTT)="$($(TTT))") +CONFIGURE_ENV ?= $(foreach TTT,$(CONFIGURE_EXPORTS),$(TTT)="$($(TTT))") +BUILD_ENV ?= $(foreach TTT,$(BUILD_EXPORTS),$(TTT)="$($(TTT))") +TEST_ENV ?= $(foreach TTT,$(TEST_EXPORTS),$(TTT)="$($(TTT))") +INSTALL_ENV ?= $(foreach TTT,$(INSTALL_EXPORTS),$(TTT)="$($(TTT))") # Standard Scripts CONFIGURE_SCRIPTS ?= $(WORKSRC)/configure Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2008-12-02 16:18:42 UTC (rev 2429) +++ csw/mgar/gar/v2/gar.mk 2008-12-02 16:20:57 UTC (rev 2430) @@ -582,7 +582,8 @@ _MERGE_INCLUDE_FILES += $(EXTRA_MERGE_INCLUDE_FILES) $(EXTRA_MERGE_INCLUDE_FILES_$(MODULATION)) MERGE_EXCLUDE_INFODIR ?= $(sharedstatedir)/info/dir -MERGE_EXCLUDE_DEFAULT ?= $(MERGE_EXCLUDE_INFODIR) $(libdir)/.*\.a $(libdir)/.*\.la +#MERGE_EXCLUDE_DEFAULT ?= $(MERGE_EXCLUDE_INFODIR) $(libdir)/.*\.a $(libdir)/.*\.la +MERGE_EXCLUDE_DEFAULT ?= $(MERGE_EXCLUDE_INFODIR) $(libdir)/.*\.a # Exclude these files ifeq ($(origin MERGE_EXCLUDE_FILES_$(MODULATION)), undefined) 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 Dec 2 17:23:52 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Dec 2008 16:23:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[2431] csw/mgar/pkg/setoolkit/trunk/ Message-ID: Revision: 2431 http://gar.svn.sourceforge.net/gar/?rev=2431&view=rev Author: dmichelsen Date: 2008-12-02 16:23:52 +0000 (Tue, 02 Dec 2008) Log Message: ----------- setoolkit: Move to mGAR v2, delete old stuff Removed Paths: ------------- csw/mgar/pkg/setoolkit/trunk/ 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 Dec 2 17:27:24 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Dec 2008 16:27:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[2432] csw/mgar/pkg/setoolkit/trunk/ Message-ID: Revision: 2432 http://gar.svn.sourceforge.net/gar/?rev=2432&view=rev Author: dmichelsen Date: 2008-12-02 16:27:24 +0000 (Tue, 02 Dec 2008) Log Message: ----------- setoolkit: Move to mGAR v2, pull in Added Paths: ----------- csw/mgar/pkg/setoolkit/trunk/ Property changes on: csw/mgar/pkg/setoolkit/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 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 Dec 2 17:28:21 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 02 Dec 2008 16:28:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[2433] csw/mgar/pkg/docbook-dtds/trunk Message-ID: Revision: 2433 http://gar.svn.sourceforge.net/gar/?rev=2433&view=rev Author: bdwalton Date: 2008-12-02 16:28:21 +0000 (Tue, 02 Dec 2008) Log Message: ----------- Crafted a Makefile to actually install all these catalogs and descriptions. Modified Paths: -------------- csw/mgar/pkg/docbook-dtds/trunk/Makefile csw/mgar/pkg/docbook-dtds/trunk/checksums Added Paths: ----------- csw/mgar/pkg/docbook-dtds/trunk/files/Makefile Modified: csw/mgar/pkg/docbook-dtds/trunk/Makefile =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/Makefile 2008-12-02 16:27:24 UTC (rev 2432) +++ csw/mgar/pkg/docbook-dtds/trunk/Makefile 2008-12-02 16:28:21 UTC (rev 2433) @@ -1,6 +1,9 @@ +# Replicate the RHEL5 docbook-dtds-1.0.30.1 rpm for CSW. Patches are taken +# from that srpm and modified (so paths work for GAR). + GARNAME = docbookdtds -GARVERSION = 1.0.30 -PATCHLEVEL = 1 +GARVERSION = 1.0 +PATCHLEVEL = 30.1 CATEGORIES = xtra PREREQUISITES = CSWunzip @@ -46,7 +49,7 @@ DBFILES += docbook-xml-4.3.zip docbook-4.4.zip docbook-xml-4.4.zip MASTER_SITES = $(O_SRC) $(D_SRC) -DISTFILES = $(DBFILES) +DISTFILES = $(DBFILES) Makefile PATCHFILES = docbook-4.2-euro.patch docbook-dtd30-sgml-1.0.catalog.patch PATCHFILES += docbook-dtd31-sgml-1.0.catalog.patch @@ -55,25 +58,18 @@ PATCHFILES += docbook-dtd42-sgml-1.0.catalog.patch PATCHFILES += docbook-dtds-ents.patch -#CONFIGURE_ARGS = $(DIRPATHS) +# we don't need no stinkin' configure! :) +CONFIGURE_SCRIPTS = +# no tests either. +TEST_SCRIPTS = -include gar/category.mk +# nothing to build either... +BUILD_SCRIPTS = -# BuildArch: noarch +INSTALL_ARGS = DESTDIR=$(DESTDIR) GARVERSION=$(GARVERSION) PATCHLEVEL=$(PATCHLEVEL) -# Patch0: docbook-dtd30-sgml-1.0.catalog.patch -# Patch1: docbook-dtd31-sgml-1.0.catalog.patch -# Patch2: docbook-dtd40-sgml-1.0.catalog.patch -# Patch3: docbook-dtd41-sgml-1.0.catalog.patch -# Patch4: docbook-dtd42-sgml-1.0.catalog.patch -# Patch5: docbook-4.2-euro.patch -# Patch6: docbook-dtds-ents.patch +include gar/category.mk -local-zip-%: - @echo " ==> Extracting $(DOWNLOADDIR)/$*" - @unzip $(DOWNLOADDIR)/$* -d $(EXTRACTDIR) - @$(MAKECOOKIE) - SGMLDIRS = 3.0 3.1 4.0 4.1 4.2 4.3 4.4 XMLDIRS = 4.1.2 4.2 4.3 4.4 @@ -130,9 +126,17 @@ pre-extract: $(WORKSRC) ( cd $(WORKSRC); \ for d in $(SGMLDIRS); do \ - mkdir $$d-sgml; \ + [ -d $$d-sgml ] || mkdir $$d-sgml; \ done; \ for d in $(XMLDIRS); do \ - mkdir $$d-xml; \ + [ -d $$d-xml ] || mkdir $$d-xml; \ done ) + @$(MAKECOOKIE) + +post-extract: + # Increase NAMELEN (bug #36058, bug #159382). [bug references from + # rpm .spec file] + ( cd $(WORKSRC); \ + gsed -e's,\(NAMELEN\s\+\)44\(\s\*\)\?,\1256,' -i.namelen */docbook.dcl; \ + cp ../Makefile .) @$(MAKECOOKIE) \ No newline at end of file Modified: csw/mgar/pkg/docbook-dtds/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/checksums 2008-12-02 16:27:24 UTC (rev 2432) +++ csw/mgar/pkg/docbook-dtds/trunk/checksums 2008-12-02 16:28:21 UTC (rev 2433) @@ -9,6 +9,7 @@ ab200202b9e136a144db1e0864c45074 download/docbook-xml-4.3.zip f89e1bd0b2c7a361e3f1f739e16b5d0d download/docbook-4.4.zip cbb04e9a700955d88c50962ef22c1634 download/docbook-xml-4.4.zip +9f1b87ab4fa6da7b7284a1c7edd1e3da download/Makefile 318742d3a6648a6905727f071cbc9847 download/docbook-4.2-euro.patch e3067045964536cc7445d5c3f1e99916 download/docbook-dtd30-sgml-1.0.catalog.patch 856d40f5d1e3fc8fd939b88bf5fedc87 download/docbook-dtd31-sgml-1.0.catalog.patch Added: csw/mgar/pkg/docbook-dtds/trunk/files/Makefile =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/Makefile (rev 0) +++ csw/mgar/pkg/docbook-dtds/trunk/files/Makefile 2008-12-02 16:28:21 UTC (rev 2433) @@ -0,0 +1,52 @@ +prefix = /opt/csw +datadir = $(prefix)/share + +INSTALL = /opt/csw/bin/ginstall -c +INSTALL_DATA = $(INSTALL) -m 0644 +INSTALL_DIR = $(INSTALL) -m 0755 -d + +docbookdir = $(datadir)/sgml/docbook + +SGML = $(wildcard *-sgml) +XML = $(wildcard *-xml) + +SGMLTARG = $(patsubst %,inst-%,$(SGML)) +XMLTARG = $(patsubst %,inst-%,$(XML)) + +.PHONY: $(SGML) $(XMLT) + +all: build + +install: $(SGMLTARG) $(XMLTARG) + +inst-%-sgml: DD=$(DESTDIR)/$(docbookdir)/sgml-dtd-$*$(GARVERSION)-$(PATCHLEVEL) +inst-%-sgml: + @echo Installing $*-sgml + @( cd $*-sgml; \ + gmkdir -p $(DD); \ + $(INSTALL_DATA) *dtd *mod $(DD)/; \ + [ -n "`ls *dcl 2>/dev/null`" ] && $(INSTALL_DATA) *dcl $(DD); \ + $(INSTALL_DATA) docbook.cat $(DD)/; \ + if [ -d ent ]; then \ + $(INSTALL_DIR) $(DD)/ent; \ + $(INSTALL_DATA) ent/* $(DD)/ent/; \ + fi ) + +inst-%-xml: DD=$(DESTDIR)/$(docbookdir)/xml-dtd-$*$(GARVERSION)-$(PATCHLEVEL) +inst-%-xml: + @echo Installing $*-xml + @( cd $*-xml; \ + gmkdir -p $(DD); \ + $(INSTALL_DATA) *dtd *mod $(DD)/; \ + [ -n "`ls *dcl 2>/dev/null`" ] && $(INSTALL_DATA) *dcl $(DD); \ + $(INSTALL_DATA) docbook.cat $(DD)/; \ + if [ -d ent ]; then \ + $(INSTALL_DIR) $(DD)/ent; \ + $(INSTALL_DATA) ent/* $(DD)/ent/; \ + fi ) + +build: + @echo Nothing to build...dummy statement in action. + +showtarg: + @echo $(SGMLTARG) $(XMLTARG) 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 Dec 2 17:30:51 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Dec 2008 16:30:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[2434] csw/mgar/pkg/setoolkit/trunk/Makefile Message-ID: Revision: 2434 http://gar.svn.sourceforge.net/gar/?rev=2434&view=rev Author: dmichelsen Date: 2008-12-02 16:30:51 +0000 (Tue, 02 Dec 2008) Log Message: ----------- setoolkit: Move to mGAR v2, reapply [2426] Modified Paths: -------------- csw/mgar/pkg/setoolkit/trunk/Makefile Modified: csw/mgar/pkg/setoolkit/trunk/Makefile =================================================================== --- csw/mgar/pkg/setoolkit/trunk/Makefile 2008-12-02 16:28:21 UTC (rev 2433) +++ csw/mgar/pkg/setoolkit/trunk/Makefile 2008-12-02 16:30:51 UTC (rev 2434) @@ -18,6 +18,9 @@ DISTFILES = $(DISTNAME).tar.gz DISTFILES += $(call admfiles,CSWsetoolkit,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) BUILD64 = 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 Dec 2 18:05:31 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Dec 2008 17:05:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[2435] csw/mgar/pkg/libtool/trunk/ Message-ID: Revision: 2435 http://gar.svn.sourceforge.net/gar/?rev=2435&view=rev Author: dmichelsen Date: 2008-12-02 17:05:31 +0000 (Tue, 02 Dec 2008) Log Message: ----------- libtool: Move to mGAR v2, remove old trunk/ Removed Paths: ------------- csw/mgar/pkg/libtool/trunk/ 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 Dec 2 18:07:07 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Dec 2008 17:07:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[2436] csw/mgar/pkg/setoolkit/trunk/Makefile Message-ID: Revision: 2436 http://gar.svn.sourceforge.net/gar/?rev=2436&view=rev Author: dmichelsen Date: 2008-12-02 17:07:07 +0000 (Tue, 02 Dec 2008) Log Message: ----------- setoolkit: Fix GAR include Modified Paths: -------------- csw/mgar/pkg/setoolkit/trunk/Makefile Modified: csw/mgar/pkg/setoolkit/trunk/Makefile =================================================================== --- csw/mgar/pkg/setoolkit/trunk/Makefile 2008-12-02 17:05:31 UTC (rev 2435) +++ csw/mgar/pkg/setoolkit/trunk/Makefile 2008-12-02 17:07:07 UTC (rev 2436) @@ -36,4 +36,4 @@ SKIPTEST = 1 -include ../category.mk +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 Tue Dec 2 18:10:13 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Dec 2008 17:10:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[2437] csw/mgar/pkg/libtool Message-ID: Revision: 2437 http://gar.svn.sourceforge.net/gar/?rev=2437&view=rev Author: dmichelsen Date: 2008-12-02 17:10:12 +0000 (Tue, 02 Dec 2008) Log Message: ----------- libtool: Move to mGAR v2, pull in from private branch Modified Paths: -------------- csw/mgar/pkg/libtool/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/libtool/trunk/ Property changes on: csw/mgar/pkg/libtool/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/libtool/trunk/Makefile =================================================================== --- csw/branches/dam/automatic-multiarch-compile/devel/libtool/Makefile 2008-10-28 16:25:47 UTC (rev 2195) +++ csw/mgar/pkg/libtool/trunk/Makefile 2008-12-02 17:10:12 UTC (rev 2437) @@ -19,6 +19,9 @@ DISTFILES += $(call admfiles,CSWlibtoolrt) #NOEXTRACT = $(filter-out $(GARNAME)-$(GARVERSION).tar.gz, $(SOURCEFILES)) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) BUILD64 = 1 @@ -47,7 +50,7 @@ # Move runtime stuff to CSWlibtoolrt and put the rest in CSWlibtool PKGFILES_CSWlibtoolrt_EXCLUSIVE = $(PKGFILES_RT) -include ../category.mk +include gar/category.mk #pre-package: # @(for VERSION in $(OLD_VERSIONS); do gmake GARVERSION=$$VERSION install; done) 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 Dec 2 18:19:14 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Dec 2008 17:19:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[2438] csw/trunk/ Message-ID: Revision: 2438 http://gar.svn.sourceforge.net/gar/?rev=2438&view=rev Author: dmichelsen Date: 2008-12-02 17:19:13 +0000 (Tue, 02 Dec 2008) Log Message: ----------- Legacy GAR: Remove trunk/, use 'svn cp -r ' to get back old versions Removed Paths: ------------- csw/trunk/ 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 Dec 2 18:19:48 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Dec 2008 17:19:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[2439] csw/tags/ Message-ID: Revision: 2439 http://gar.svn.sourceforge.net/gar/?rev=2439&view=rev Author: dmichelsen Date: 2008-12-02 17:19:41 +0000 (Tue, 02 Dec 2008) Log Message: ----------- Legacy GAR: Remove tags/ as it is empty Removed Paths: ------------- csw/tags/ 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 Dec 2 18:20:43 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Dec 2008 17:20:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[2440] csw/branches/joyent/ Message-ID: Revision: 2440 http://gar.svn.sourceforge.net/gar/?rev=2440&view=rev Author: dmichelsen Date: 2008-12-02 17:20:43 +0000 (Tue, 02 Dec 2008) Log Message: ----------- Legacy GAR: Remove branches/joyent/ as it never had any changes Removed Paths: ------------- csw/branches/joyent/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Tue Dec 2 18:24:48 2008 From: dam at opencsw.org (Dagobert Michelsen) Date: Tue, 2 Dec 2008 18:24:48 +0100 Subject: [csw-devel] Legacy GAR is now gone Message-ID: Hi, I just deleted the old trunk/, tags/ and branches/joyent/. If you still need anything please either use the web repository browser with or pull in old versions of your files with svn cp -r 2437 https://gar.svn.sf.net/svnroot/gar/csw/trunk/... (Revision 2437 was the last before the first deletion) Best regards and have fun with mGAR -- Dago From dmichelsen at users.sourceforge.net Tue Dec 2 18:26:04 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Dec 2008 17:26:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[2441] csw/branches/modularpkg/ Message-ID: Revision: 2441 http://gar.svn.sourceforge.net/gar/?rev=2441&view=rev Author: dmichelsen Date: 2008-12-02 17:26:04 +0000 (Tue, 02 Dec 2008) Log Message: ----------- Legacy GAR: Remove branches/modularpkg as this was only a study for mGAR which is now live Removed Paths: ------------- csw/branches/modularpkg/ 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 Dec 2 18:27:04 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 02 Dec 2008 17:27:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[2442] csw/mgar/pkg Message-ID: Revision: 2442 http://gar.svn.sourceforge.net/gar/?rev=2442&view=rev Author: bdwalton Date: 2008-12-02 17:27:03 +0000 (Tue, 02 Dec 2008) Log Message: ----------- Initial stub package for openjade. Added Paths: ----------- csw/mgar/pkg/openjade/ csw/mgar/pkg/openjade/branches/ csw/mgar/pkg/openjade/tags/ csw/mgar/pkg/openjade/trunk/ csw/mgar/pkg/openjade/trunk/Makefile csw/mgar/pkg/openjade/trunk/files/ csw/mgar/pkg/openjade/trunk/files/CSWopenjade.gspec Property changes on: csw/mgar/pkg/openjade/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 Added: csw/mgar/pkg/openjade/trunk/Makefile =================================================================== --- csw/mgar/pkg/openjade/trunk/Makefile (rev 0) +++ csw/mgar/pkg/openjade/trunk/Makefile 2008-12-02 17:27:03 UTC (rev 2442) @@ -0,0 +1,16 @@ +GARNAME = package +GARVERSION = 1.0 +CATEGORIES = category + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWpackage,) + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/openjade/trunk/files/CSWopenjade.gspec =================================================================== --- csw/mgar/pkg/openjade/trunk/files/CSWopenjade.gspec (rev 0) +++ csw/mgar/pkg/openjade/trunk/files/CSWopenjade.gspec 2008-12-02 17:27:03 UTC (rev 2442) @@ -0,0 +1,4 @@ +%var bitname package +%var pkgname CSWpackage +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKSRC}/LICENSE 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 Dec 2 18:33:10 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Dec 2008 17:33:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[2443] csw/mgar/pkg Message-ID: Revision: 2443 http://gar.svn.sourceforge.net/gar/?rev=2443&view=rev Author: dmichelsen Date: 2008-12-02 17:33:10 +0000 (Tue, 02 Dec 2008) Log Message: ----------- libxml2: Pull in mGAR v2 from private branch Modified Paths: -------------- csw/mgar/pkg/libxml2/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/libxml2/ csw/mgar/pkg/libxml2/branches/ csw/mgar/pkg/libxml2/tags/ csw/mgar/pkg/libxml2/trunk/ Property changes on: csw/mgar/pkg/libxml2/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 Modified: csw/mgar/pkg/libxml2/trunk/Makefile =================================================================== --- csw/branches/dam/automatic-multiarch-compile/lib/libxml2/Makefile 2008-11-21 14:49:42 UTC (rev 2336) +++ csw/mgar/pkg/libxml2/trunk/Makefile 2008-12-02 17:33:10 UTC (rev 2443) @@ -13,6 +13,9 @@ DISTFILES += $(call admfiles,CSWlibxml2,depend) DISTFILES += $(call admfiles,CSWlibxml2devel,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # We don't have 64 bit Python yet CONFIGURE_ARGS_32 = --with-python=$(prefix) CONFIGURE_ARGS_64 = --without-python @@ -33,5 +36,5 @@ PKGFILES_CSWpylibxml2_EXCLUSIVE = $(libdir)/python/.* PKGFILES_CSWpylibxml2_EXCLUSIVE += $(docdir)/libxml2-python-$(GARVERSION)/.* -include ../category.mk +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 Tue Dec 2 18:34:22 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Dec 2008 17:34:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[2444] csw/mgar/pkg/libxml2/trunk/ Message-ID: Revision: 2444 http://gar.svn.sourceforge.net/gar/?rev=2444&view=rev Author: dmichelsen Date: 2008-12-02 17:34:22 +0000 (Tue, 02 Dec 2008) Log Message: ----------- libxml2: Fix external to use v2 Property Changed: ---------------- csw/mgar/pkg/libxml2/trunk/ Property changes on: csw/mgar/pkg/libxml2/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 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 Dec 2 18:40:48 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 02 Dec 2008 17:40:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[2445] csw/mgar/pkg Message-ID: Revision: 2445 http://gar.svn.sourceforge.net/gar/?rev=2445&view=rev Author: bdwalton Date: 2008-12-02 17:40:48 +0000 (Tue, 02 Dec 2008) Log Message: ----------- Stub package for opensp. [Yet another git-doc dependency...sheesh!] Added Paths: ----------- csw/mgar/pkg/opensp/ csw/mgar/pkg/opensp/branches/ csw/mgar/pkg/opensp/tags/ csw/mgar/pkg/opensp/trunk/ csw/mgar/pkg/opensp/trunk/Makefile csw/mgar/pkg/opensp/trunk/files/ csw/mgar/pkg/opensp/trunk/files/CSWopensp.gspec Property changes on: csw/mgar/pkg/opensp/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 Added: csw/mgar/pkg/opensp/trunk/Makefile =================================================================== --- csw/mgar/pkg/opensp/trunk/Makefile (rev 0) +++ csw/mgar/pkg/opensp/trunk/Makefile 2008-12-02 17:40:48 UTC (rev 2445) @@ -0,0 +1,16 @@ +GARNAME = package +GARVERSION = 1.0 +CATEGORIES = category + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWpackage,) + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/opensp/trunk/files/CSWopensp.gspec =================================================================== --- csw/mgar/pkg/opensp/trunk/files/CSWopensp.gspec (rev 0) +++ csw/mgar/pkg/opensp/trunk/files/CSWopensp.gspec 2008-12-02 17:40:48 UTC (rev 2445) @@ -0,0 +1,4 @@ +%var bitname package +%var pkgname CSWpackage +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKSRC}/LICENSE 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 Dec 2 19:04:36 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Dec 2008 18:04:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[2446] csw/mgar/pkg/mktemp/trunk Message-ID: Revision: 2446 http://gar.svn.sourceforge.net/gar/?rev=2446&view=rev Author: dmichelsen Date: 2008-12-02 18:04:36 +0000 (Tue, 02 Dec 2008) Log Message: ----------- mktemp: Update to 1.6 Modified Paths: -------------- csw/mgar/pkg/mktemp/trunk/Makefile csw/mgar/pkg/mktemp/trunk/checksums csw/mgar/pkg/mktemp/trunk/files/makefile-destdir.patch Modified: csw/mgar/pkg/mktemp/trunk/Makefile =================================================================== --- csw/mgar/pkg/mktemp/trunk/Makefile 2008-12-02 17:40:48 UTC (rev 2445) +++ csw/mgar/pkg/mktemp/trunk/Makefile 2008-12-02 18:04:36 UTC (rev 2446) @@ -1,8 +1,8 @@ GARNAME = mktemp -GARVERSION = 1.5 +GARVERSION = 1.6 CATEGORIES = utils -DESCRIPTION = A small program to allow safe temporary file creation from shell scripts. +DESCRIPTION = A small program to allow safe temporary file creation from shell scripts define BLURB The mktemp utility takes the given filename template and overwrites a portion of it to create a unique filename. The template may be any file- Modified: csw/mgar/pkg/mktemp/trunk/checksums =================================================================== --- csw/mgar/pkg/mktemp/trunk/checksums 2008-12-02 17:40:48 UTC (rev 2445) +++ csw/mgar/pkg/mktemp/trunk/checksums 2008-12-02 18:04:36 UTC (rev 2446) @@ -1,3 +1,3 @@ -9a35c59502a228c6ce2be025fc6e3ff2 download/mktemp-1.5.tar.gz +3e66f91f8a39c7dc0a67b158aeb9c2ac download/mktemp-1.6.tar.gz 2ec4d62640c1aec1a2fd0faead07de1f download/CSWmktemp.gspec -c7c80a55d51073e9a45cbac799e7968f download/makefile-destdir.patch +9e53911c3dce0236badb46a801a834f6 download/makefile-destdir.patch Modified: csw/mgar/pkg/mktemp/trunk/files/makefile-destdir.patch =================================================================== --- csw/mgar/pkg/mktemp/trunk/files/makefile-destdir.patch 2008-12-02 17:40:48 UTC (rev 2445) +++ csw/mgar/pkg/mktemp/trunk/files/makefile-destdir.patch 2008-12-02 18:04:36 UTC (rev 2446) @@ -1,7 +1,7 @@ -diff --speed-large-files --minimal -Nru mktemp-1.5.orig/Makefile.in mktemp-1.5/Makefile.in ---- mktemp-1.5.orig/Makefile.in 2003-03-24 02:09:56.000000000 +0100 -+++ mktemp-1.5/Makefile.in 2008-02-18 20:30:33.583292000 +0100 -@@ -65,12 +65,12 @@ +diff --speed-large-files --minimal -Nru mktemp-1.6.orig/Makefile.in mktemp-1.6/Makefile.in +--- mktemp-1.6.orig/Makefile.in 2008-08-17 17:38:34.000000000 +0200 ++++ mktemp-1.6/Makefile.in 2008-12-02 18:53:03.208788742 +0100 +@@ -65,13 +65,14 @@ mantype = @MANTYPE@ # Where to install things... @@ -11,21 +11,15 @@ -sbindir = @sbindir@ -sysconfdir = @sysconfdir@ -mandir = @mandir@ +-datarootdir = @datarootdir@ +prefix = $(DESTDIR)@prefix@ +exec_prefix = $(DESTDIR)@exec_prefix@ +bindir = $(DESTDIR)@bindir@ +sbindir = $(DESTDIR)@sbindir@ +sysconfdir = $(DESTDIR)@sysconfdir@ +mandir = $(DESTDIR)@mandir@ ++datarootdir = $(DESTDIR)@datarootdir@ ++ #### End of system configuration section. #### -@@ -98,7 +98,7 @@ - $(CC) -c $(CPPFLAGS) $(CFLAGS) $< - - $(PROG): $(OBJS) -- $(CC) -o $@ $(OBJS) $(LIBS) -+ $(CC) -o $@ $(OBJS) $(LDFLAGS) $(LIBS) - - $(OBJS): config.h - 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 Dec 2 22:31:25 2008 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 02 Dec 2008 21:31:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[2447] csw/mgar/pkg/synergy/trunk/Makefile Message-ID: Revision: 2447 http://gar.svn.sourceforge.net/gar/?rev=2447&view=rev Author: skayser Date: 2008-12-02 21:31:25 +0000 (Tue, 02 Dec 2008) Log Message: ----------- synergy: Fixed documentation folder path Modified Paths: -------------- csw/mgar/pkg/synergy/trunk/Makefile Modified: csw/mgar/pkg/synergy/trunk/Makefile =================================================================== --- csw/mgar/pkg/synergy/trunk/Makefile 2008-12-02 18:04:36 UTC (rev 2446) +++ csw/mgar/pkg/synergy/trunk/Makefile 2008-12-02 21:31:25 UTC (rev 2447) @@ -43,14 +43,19 @@ post-install: @ginstall -d $(DESTDIR)$(sysconfdir) - @ginstall -m 644 $(WORKSRC)/examples/synergy.conf \ + @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME)/images + @ginstall -m 644 \ + $(WORKSRC)/examples/synergy.conf \ $(DESTDIR)$(sysconfdir)/synergy.conf.example - @ginstall -d $(DESTDIR)$(docdir)/images - @ginstall -m 644 $(WORKSRC)/README $(DESTDIR)$(docdir) - @ginstall -m 644 $(WORKSRC)/AUTHORS $(DESTDIR)$(docdir) - @ginstall -m 644 $(WORKSRC)/NEWS $(DESTDIR)$(docdir) - @ginstall -m 644 $(WORKSRC)/doc/*.html $(DESTDIR)$(docdir) - @ginstall -m 644 $(WORKSRC)/doc/images/* $(DESTDIR)$(docdir)/images + @ginstall -m 644 \ + $(WORKSRC)/README \ + $(WORKSRC)/AUTHORS \ + $(WORKSRC)/NEWS \ + $(WORKSRC)/doc/*.html \ + $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 644 \ + $(WORKSRC)/doc/images/* \ + $(DESTDIR)$(docdir)/$(GARNAME)/images @$(MAKECOOKIE) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Dec 2 23:17:29 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 02 Dec 2008 22:17:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[2448] csw/mgar/gar/v1/gar.lib.mk Message-ID: Revision: 2448 http://gar.svn.sourceforge.net/gar/?rev=2448&view=rev Author: wbonnet Date: 2008-12-02 22:17:29 +0000 (Tue, 02 Dec 2008) Log Message: ----------- Add more verbose output Modified Paths: -------------- csw/mgar/gar/v1/gar.lib.mk Modified: csw/mgar/gar/v1/gar.lib.mk =================================================================== --- csw/mgar/gar/v1/gar.lib.mk 2008-12-02 21:31:25 UTC (rev 2447) +++ csw/mgar/gar/v1/gar.lib.mk 2008-12-02 22:17:29 UTC (rev 2448) @@ -142,17 +142,17 @@ echo "---"; \ echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ else \ - if [ ! -n '$(UFILES_REGEX)' ]; then \ - { echo ""; \ - echo "Hello dear $(GARNAME) maintainer,"; \ - echo ""; \ - echo "The upstream notification job has detected that $(GARNAME) is not configured for automatic upstream file update detection."; \ - echo ""; \ - echo "Please consider updating your package. Documentation is available from this link : http://www.opencsw.org" ; \ - echo ""; \ - echo "---"; \ - echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ - fi; \ +# if [ ! -n '$(UFILES_REGEX)' ]; then \ +# { echo ""; \ +# echo "Hello dear $(GARNAME) maintainer,"; \ +# echo ""; \ +# echo "The upstream notification job has detected that $(GARNAME) is not configured for automatic upstream file update detection."; \ +# echo ""; \ +# echo "Please consider updating your package. Documentation is available from this link : http://www.opencsw.org" ; \ +# echo ""; \ +# echo "---"; \ +# echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ +# fi; \ fi; \ fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Dec 2 23:25:06 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 02 Dec 2008 22:25:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[2449] csw/mgar/gar Message-ID: Revision: 2449 http://gar.svn.sourceforge.net/gar/?rev=2449&view=rev Author: wbonnet Date: 2008-12-02 22:25:06 +0000 (Tue, 02 Dec 2008) Log Message: ----------- Add bcc to uwatch at opencsw.org to keep a track of notification sent Port modification to gar V2 Modified Paths: -------------- csw/mgar/gar/v1/gar.lib.mk csw/mgar/gar/v2/bin/mail2maintainer csw/mgar/gar/v2/bin/upstream_watch csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v1/gar.lib.mk =================================================================== --- csw/mgar/gar/v1/gar.lib.mk 2008-12-02 22:17:29 UTC (rev 2448) +++ csw/mgar/gar/v1/gar.lib.mk 2008-12-02 22:25:06 UTC (rev 2449) @@ -140,7 +140,7 @@ echo "Please consider updating your package." ; \ echo ""; \ echo "---"; \ - echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ + echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -b uwatch at opencsw.org -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ else \ # if [ ! -n '$(UFILES_REGEX)' ]; then \ # { echo ""; \ @@ -151,7 +151,7 @@ # echo "Please consider updating your package. Documentation is available from this link : http://www.opencsw.org" ; \ # echo ""; \ # echo "---"; \ -# echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ +# echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -b uwatch at opencsw.org -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ # fi; \ fi; \ fi Modified: csw/mgar/gar/v2/bin/mail2maintainer =================================================================== --- csw/mgar/gar/v2/bin/mail2maintainer 2008-12-02 22:17:29 UTC (rev 2448) +++ csw/mgar/gar/v2/bin/mail2maintainer 2008-12-02 22:25:06 UTC (rev 2449) @@ -23,7 +23,7 @@ function get_package_maintainer { _PACKAGE="$1" - _MAINTAINER="`wget -q http://securebar.secure-tunnel.com/cgi-bin/nph-freebar.cgi/110110/http/www.blastwave.org/packages.php/$_PACKAGE -O- | grep Maintainer | sed -e "s,.*/maintainers/\([^\'\\\"]*\).*,\1,g"`" + _MAINTAINER="`wget -q http://www.opencsw.org/packages.php/$_PACKAGE -O- | grep Maintainer | sed -e "s,.*/maintainers/\([^\'\\\"]*\).*,\1,g"`" echo "$_MAINTAINER" } @@ -38,7 +38,7 @@ function maintainer2mail { _MAINTAINER="$1" - echo "$_MAINTAINER at blastwave.org" + echo "$_MAINTAINER at opencsw.org" } PATH=$PATH:/opt/csw/bin:/usr/sfw/bin @@ -46,7 +46,7 @@ if [[ -z "$1" ]]; then cat </dev/null |"); + open (FH, "lftp -q -c \"set net:timeout 10; set net:max-retries 16; $ftp_proxy_cmd $http_proxy_cmd open $url/ && ls\" 2>/dev/null |"); while (my $line = ) { my @cols = split (/\s+/, $line); Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2008-12-02 22:17:29 UTC (rev 2448) +++ csw/mgar/gar/v2/gar.lib.mk 2008-12-02 22:25:06 UTC (rev 2449) @@ -103,11 +103,10 @@ #################### CHECKNEW RULES #################### -# check a new upstream files are available - -UW_ARGS = $(addprefix -u ,$(MASTER_SITES)) -ifneq ($(UFILES_REGEX),) - FILES2CHECK = $(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/upstream_watch $(UW_ARGS) $(addsuffix ',$(addprefix ',$(UFILES_REGEX)))) +UPSTREAM_MASTER_SITES ?= $(MASTER_SITES) +UW_ARGS = $(addprefix -u ,$(UPSTREAM_MASTER_SITES)) +ifneq ($(UFILES_REGEX), "") + FILES2CHECK = $(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/upstream_watch $(UW_ARGS) $(addsuffix ',$(addprefix ',$(UFILES_REGEX)))) else FILES2CHECK = "" endif @@ -124,7 +123,7 @@ fi; \ $(MAKE) checknew-$$FILE >/dev/null; \ done; \ - if [ -n "$$NEW_FILES" ]; then \ + if test -z "$$NEW_FILES" ; then \ { echo ""; \ echo "Hello dear $(GARNAME) maintainer,"; \ echo ""; \ @@ -134,31 +133,60 @@ echo " $$NEW_FILES"; \ echo ""; \ echo "is/are available at the following url(s):"; \ - echo " $(MASTER_SITES)"; \ + echo " $(UPSTREAM_MASTER_SITES)"; \ echo ""; \ echo "Please consider updating your package." ; \ echo ""; \ echo "---"; \ - echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '$(GARNAME) upstream update notification' $(GARNAME); \ - fi; \ + echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -b uwatch at opencsw.org -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ + else \ +# if [ ! -n '$(UFILES_REGEX)' ]; then \ +# { echo ""; \ +# echo "Hello dear $(GARNAME) maintainer,"; \ +# echo ""; \ +# echo "The upstream notification job has detected that $(GARNAME) is not configured for automatic upstream file update detection."; \ +# echo ""; \ +# echo "Please consider updating your package. Documentation is available from this link : http://www.opencsw.org" ; \ +# echo ""; \ +# echo "---"; \ +# echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -b uwatch at opencsw.org -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ +# fi; \ + fi; \ fi - check-upstream: @if [ -n '$(FILES2CHECK)' ]; then \ NEW_FILES=""; \ + PACKAGE_UP_TO_DATE=0; \ for FILE in $(FILES2CHECK) ""; do \ [ -n "$$FILE" ] || continue; \ - if test -f $(COOKIEDIR)/checknew-$$FILE || echo $(DISTFILES) | grep -w $$FILE >/dev/null; then \ - : ; \ + if test -f $(COOKIEDIR)/checknew-$$FILE ; then \ + PACKAGE_UP_TO_DATE=1; \ else \ - NEW_FILES="$$FILE $$NEW_FILES"; \ + if echo $(DISTFILES) | grep -w $$FILE >/dev/null; then \ + PACKAGE_UP_TO_DATE=1; \ + echo "$(GARNAME) : Package is up-to-date. Current version is $$FILE" ; \ + else \ + NEW_FILES="$$FILE $$NEW_FILES"; \ + fi; \ fi; \ $(MAKE) checknew-$$FILE >/dev/null; \ done; \ - if [ -n "$$NEW_FILES" ]; then \ - echo "$(GARNAME): new upstream files available: $$NEW_FILES"; \ - fi; \ + if test -z "$$NEW_FILES" ; then \ + if [ ! -n '$(UFILES_REGEX)' ]; then \ + echo "$(GARNAME) : Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \ + else \ + if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ + echo "$(GARNAME) : Warning no files to check ! $(FILES2CHECK)" ; \ + echo "$(GARNAME) : UPSTREAM_MASTER_SITES is $(UPSTREAM_MASTER_SITES)" ; \ + echo "$(GARNAME) : DISTNAME is $(DISTNAME)" ; \ + echo "$(GARNAME) : UFILES_REGEX is : $(UFILES_REGEX)" ; \ + echo "$(GARNAME) : Please check configuration" ; \ + fi; \ + fi; \ + else \ + echo "$(GARNAME) : new upstream files available: $$NEW_FILES"; \ + fi; \ fi checknew-%: 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 Dec 2 23:37:48 2008 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 02 Dec 2008 22:37:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[2450] csw/mgar/pkg/pv/trunk Message-ID: Revision: 2450 http://gar.svn.sourceforge.net/gar/?rev=2450&view=rev Author: skayser Date: 2008-12-02 22:37:48 +0000 (Tue, 02 Dec 2008) Log Message: ----------- pv: Updated to 1.1.4 Modified Paths: -------------- csw/mgar/pkg/pv/trunk/Makefile csw/mgar/pkg/pv/trunk/checksums csw/mgar/pkg/pv/trunk/files/CSWpv.gspec Added Paths: ----------- csw/mgar/pkg/pv/trunk/files/fix-test-010.diff Removed Paths: ------------- csw/mgar/pkg/pv/trunk/files/CSWpv.depend csw/mgar/pkg/pv/trunk/files/CSWpv.prototype Modified: csw/mgar/pkg/pv/trunk/Makefile =================================================================== --- csw/mgar/pkg/pv/trunk/Makefile 2008-12-02 22:25:06 UTC (rev 2449) +++ csw/mgar/pkg/pv/trunk/Makefile 2008-12-02 22:37:48 UTC (rev 2450) @@ -1,8 +1,8 @@ GARNAME = pv -GARVERSION = 0.9.2 +GARVERSION = 1.1.4 CATEGORIES = utils -DESCRIPTION = pipeviewer, like cat with progress indications +DESCRIPTION = Monitor the progress of data through a pipe define BLURB Pipe Viewer is a terminal-based tool for monitoring the progress of data through a pipeline. It can be inserted into any normal @@ -16,17 +16,23 @@ SPKG_SOURCEURL = http://www.ivarch.com/programs/pv.shtml # Source files -MASTER_SITES = http://unc.dl.sourceforge.net/sourceforge/pipeviewer/ +MASTER_SITES = http://pipeviewer.googlecode.com/files/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += CSWpv.gspec CSWpv.depend CSWpv.prototype +DISTFILES += $(call admfiles,CSWpv) # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +# Trim extra whitespaces from Solaris wc +PATCHFILES = fix-test-010.diff + CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk post-install: - @gunzip $(DESTDIR)$(infodir)/pv.info.gz $(DESTDIR)$(mandir)/man1/pv.1.gz - + @gunzip $(DESTDIR)$(mandir)/man1/pv.1.gz + @ginstall -d -m 755 $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 644 \ + $(WORKSRC)/doc/NEWS \ + $(DESTDIR)$(docdir)/$(GARNAME) Modified: csw/mgar/pkg/pv/trunk/checksums =================================================================== --- csw/mgar/pkg/pv/trunk/checksums 2008-12-02 22:25:06 UTC (rev 2449) +++ csw/mgar/pkg/pv/trunk/checksums 2008-12-02 22:37:48 UTC (rev 2450) @@ -1,4 +1,3 @@ -a8e31f4e38088b905f5d4f13c670315c download/pv-0.9.2.tar.gz -21a2120662bb32256fe233ba6a982168 download/CSWpv.gspec -573b8784f4f5f70bb86196a72b0979b6 download/CSWpv.depend -c4ee27ed85a7e450a84757e5cf6fd617 download/CSWpv.prototype +8d0eda2182640919daaf6186cd816a13 download/pv-1.1.4.tar.gz +6e307b98bc517acb6353981bee5e686c download/CSWpv.gspec +0ea366b818f877857288b2a9a732a6d4 download/fix-test-010.diff Deleted: csw/mgar/pkg/pv/trunk/files/CSWpv.depend =================================================================== --- csw/mgar/pkg/pv/trunk/files/CSWpv.depend 2008-12-02 22:25:06 UTC (rev 2449) +++ csw/mgar/pkg/pv/trunk/files/CSWpv.depend 2008-12-02 22:37:48 UTC (rev 2450) @@ -1,2 +0,0 @@ -P CSWggettext ggettext - GNU gettext -P CSWiconv libiconv - GNU iconv library Modified: csw/mgar/pkg/pv/trunk/files/CSWpv.gspec =================================================================== --- csw/mgar/pkg/pv/trunk/files/CSWpv.gspec 2008-12-02 22:25:06 UTC (rev 2449) +++ csw/mgar/pkg/pv/trunk/files/CSWpv.gspec 2008-12-02 22:37:48 UTC (rev 2450) @@ -1,6 +1,4 @@ %var bitname pv %var pkgname CSWpv %include url file://%{PKGLIB}/csw_dyndepend.gspec -%postinstall url file://%{PKGLIB}/csw/geninfodir -%postremove url file://%{PKGLIB}/csw/geninfodir %copyright url file://%{WORKSRC}/doc/COPYING Deleted: csw/mgar/pkg/pv/trunk/files/CSWpv.prototype =================================================================== --- csw/mgar/pkg/pv/trunk/files/CSWpv.prototype 2008-12-02 22:25:06 UTC (rev 2449) +++ csw/mgar/pkg/pv/trunk/files/CSWpv.prototype 2008-12-02 22:37:48 UTC (rev 2450) @@ -1,21 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/pv 0755 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/info 0755 root bin -f none /opt/csw/share/info/pv.info 0644 root bin -d none /opt/csw/share/locale 0755 root bin -d none /opt/csw/share/locale/de 0755 root bin -d none /opt/csw/share/locale/de/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/de/LC_MESSAGES/pv.mo 0644 root bin -d none /opt/csw/share/locale/fr 0755 root bin -d none /opt/csw/share/locale/fr/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/fr/LC_MESSAGES/pv.mo 0644 root bin -d none /opt/csw/share/locale/pl 0755 root bin -d none /opt/csw/share/locale/pl/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/pl/LC_MESSAGES/pv.mo 0644 root bin -d none /opt/csw/share/locale/pt 0755 root bin -d none /opt/csw/share/locale/pt/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/pt/LC_MESSAGES/pv.mo 0644 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man1 0755 root bin -f none /opt/csw/share/man/man1/pv.1 0644 root bin Added: csw/mgar/pkg/pv/trunk/files/fix-test-010.diff =================================================================== --- csw/mgar/pkg/pv/trunk/files/fix-test-010.diff (rev 0) +++ csw/mgar/pkg/pv/trunk/files/fix-test-010.diff 2008-12-02 22:37:48 UTC (rev 2450) @@ -0,0 +1,12 @@ +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-01 15:02:00.375332231 +0100 +@@ -5,7 +5,7 @@ + #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` ++COUNT2=`$PROG -B 100000 -q /dev/zero | dd bs=100000 count=1000 2>/dev/null | wc -c | tr -d ' '` + + #echo "[$COUNT1] [$COUNT2]" + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Dec 3 00:10:55 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 02 Dec 2008 23:10:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[2451] csw/mgar/gar Message-ID: Revision: 2451 http://gar.svn.sourceforge.net/gar/?rev=2451&view=rev Author: wbonnet Date: 2008-12-02 23:10:55 +0000 (Tue, 02 Dec 2008) Log Message: ----------- Add default upstream master site and regexp for cpan modules Modified Paths: -------------- csw/mgar/gar/v1/categories/cpan/category.mk csw/mgar/gar/v2/categories/cpan/category.mk Modified: csw/mgar/gar/v1/categories/cpan/category.mk =================================================================== --- csw/mgar/gar/v1/categories/cpan/category.mk 2008-12-02 22:37:48 UTC (rev 2450) +++ csw/mgar/gar/v1/categories/cpan/category.mk 2008-12-02 23:10:55 UTC (rev 2451) @@ -26,6 +26,11 @@ TOLOWER = $(shell echo $(1) | tr '[A-Z]' '[a-z]') SPKG_SOURCEURL = http://search.cpan.org SPKG_SOURCEURL := $(SPKG_SOURCEURL)/~$(call TOLOWER,$(AUTHOR)) + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +USTREAM_MASTER_SITE = $(SPKG_SOURCEURL) + SPKG_SOURCEURL := $(SPKG_SOURCEURL)/$(GARNAME) _PREREQUISITE_BASE_PKGS += CSWperl Modified: csw/mgar/gar/v2/categories/cpan/category.mk =================================================================== --- csw/mgar/gar/v2/categories/cpan/category.mk 2008-12-02 22:37:48 UTC (rev 2450) +++ csw/mgar/gar/v2/categories/cpan/category.mk 2008-12-02 23:10:55 UTC (rev 2451) @@ -26,6 +26,11 @@ TOLOWER = $(shell echo $(1) | tr '[A-Z]' '[a-z]') SPKG_SOURCEURL = http://search.cpan.org SPKG_SOURCEURL := $(SPKG_SOURCEURL)/~$(call TOLOWER,$(AUTHOR)) + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +USTREAM_MASTER_SITE = $(SPKG_SOURCEURL) + SPKG_SOURCEURL := $(SPKG_SOURCEURL)/$(GARNAME) include gar/gar.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 Dec 3 12:15:29 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 03 Dec 2008 11:15:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[2452] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 2452 http://gar.svn.sourceforge.net/gar/?rev=2452&view=rev Author: dmichelsen Date: 2008-12-03 11:15:28 +0000 (Wed, 03 Dec 2008) Log Message: ----------- mGAR v2: Remove old -isa comments Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2008-12-02 23:10:55 UTC (rev 2451) +++ csw/mgar/gar/v2/gar.mk 2008-12-03 11:15:28 UTC (rev 2452) @@ -199,13 +199,6 @@ @echo "Modulations: $(MODULATIONS)" @echo "M: $(call expand_modulator_1,ISA)" -#patch-isa-%: -# @echo " ==> Patching for ISA $*" -# @$(MAKE) ISA=$* pre-patch-isa-$* patch-isa post-patch-isa-$* -# @$(DONADA) - - - # ========================= MAIN RULES ========================= # The main rules are the ones that the user can specify as a # target on the "make" command-line. Currently, they are: @@ -230,9 +223,6 @@ announce: @echo "[===== NOW BUILDING: $(DISTNAME) =====]" -#announce-isa: -# @echo "[===== NOW BUILDING: $(DISTNAME) ISA: $(ISA) =====]" - announce-modulation: @echo "[===== NOW BUILDING: $(DISTNAME) MODULATION $(MODULATION): $(foreach M,$(MODULATORS),$M=$($M)) =====]" @@ -309,7 +299,6 @@ # We call an additional extract-modulated without resetting any variables so # a complete unpacked set goes to the global dir for packaging (like gspec) -#extract: checksum $(COOKIEDIR) pre-extract extract-isa $(addprefix extract-isa-,$(BUILD_ISAS)) post-extract extract: checksum $(COOKIEDIR) pre-extract extract-modulated $(addprefix extract-,$(MODULATIONS)) post-extract @$(DONADA) @@ -319,10 +308,6 @@ pre-extract-modulated $(EXTRACT_TARGETS) post-extract-modulated @$(DONADA) -#extract-isa-%: -# @$(MAKE) ISA=$* pre-extract-isa-$* extract-isa post-extract-isa-$* -# @$(MAKECOOKIE) - # returns true if extract has completed successfully, false # otherwise extract-p: @@ -338,18 +323,11 @@ # patch - Apply any provided patches to the source. PATCH_TARGETS = $(addprefix patch-extract-,$(PATCHFILES)) -#patch: pre-patch $(addprefix patch-isa-,$(BUILD_ISAS)) post-patch patch: pre-patch $(addprefix patch-,$(MODULATIONS)) post-patch @$(DONADA) -#patch-isa: extract-isa $(WORKSRC) pre-patch-isa $(PATCH_TARGETS) post-patch-isa patch-modulated: extract-modulated $(WORKSRC) pre-patch-modulated $(PATCH_TARGETS) post-patch-modulated -#patch-isa-%: -# @echo " ==> Patching for ISA $*" -# @$(MAKE) ISA=$* pre-patch-isa-$* patch-isa post-patch-isa-$* -# @$(DONADA) - # returns true if patch has completed successfully, false # otherwise patch-p: @@ -395,36 +373,21 @@ configure: pre-configure $(addprefix configure-,$(MODULATIONS)) post-configure $(DONADA) -#configure-isa: patch-isa $(CONFIGURE_IMGDEPS) $(CONFIGURE_BUILDDEPS) $(CONFIGURE_DEPS) \ -# $(addprefix srcdep-$(GARDIR)/,$(SOURCEDEPS)) \ -# pre-configure-isa $(CONFIGURE_TARGETS) post-configure-isa configure-modulated: verify-isa patch-modulated $(CONFIGURE_IMGDEPS) $(CONFIGURE_BUILDDEPS) $(CONFIGURE_DEPS) \ $(addprefix srcdep-$(GARDIR)/,$(SOURCEDEPS)) \ pre-configure-modulated $(CONFIGURE_TARGETS) post-configure-modulated -#configure-isa-%: -# @echo " ==> Configuring for ISA $*" -# @$(MAKE) ISA=$* pre-configure-isa-$* configure-isa post-configure-isa-$* -# @$(DONADA) - .PHONY: reset-configure reset-configure-modulated reconfigure: reset-configure configure -reset-configure: +reset-configure-isa: -reconfigure-isa-%: - reset-configure: @$(foreach ISA,$(NEEDED_ISAS),$(MAKE) -s ISA=$(ISA) reset-configure-isa;) reconfigure-isa-%: @$(MAKE) -s ISA=$* reset-configure-isa configure-isa -#reset-configure-isa: -# @echo " ==> Reset configure state for ISA $(ISA)" -# @rm -rf xxx -# @$(MAKE) -s ISA=$* reset-configure-isa - # returns true if configure has completed successfully, false # otherwise configure-p: @@ -437,8 +400,6 @@ $(DONADA) # Build for a specific architecture -#build-isa: configure-isa pre-build-isa $(BUILD_TARGETS) post-build-isa -# @$(MAKECOOKIE) build-modulated-check: $(if $(filter ERROR,$(ARCHFLAGS_$(GARCOMPILER)_$*)), \ $(error Code for the architecture $* can not be produced with the compiler $(GARCOMPILER)) \ @@ -447,15 +408,6 @@ build-modulated: verify-isa configure-modulated pre-build-modulated $(BUILD_TARGETS) post-build-modulated @$(MAKECOOKIE) -# Build for a certain architecture -#build-isa-%: -# @echo " ==> Building for ISA $*" -# $(if $(filter ERROR,$(ARCHFLAGS_$(GARCOMPILER)_$*)), \ -# $(error Code for the architecture $* can not be produced with the compiler $(GARCOMPILER)) \ -# ) -# @$(MAKE) ISA=$* pre-build-isa-$* build-isa post-build-isa-$* -# @$(MAKECOOKIE) - # returns true if build has completed successfully, false # otherwise build-p: @@ -469,11 +421,6 @@ test-modulated: build-modulated pre-test $(TEST_TARGETS) post-test $(DONADA) -#test-isa-%: -# @echo " ==> Testing for ISA $*" -# @$(MAKE) ISA=$* test-isa -# @$(MAKECOOKIE) - # strip - Strip executables POST_INSTALL_TARGETS := strip $(POST_INSTALL_TARGETS) strip: 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 Dec 3 13:45:05 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 03 Dec 2008 12:45:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[2453] csw/mgar/gar/v1/gar.pkg.mk Message-ID: Revision: 2453 http://gar.svn.sourceforge.net/gar/?rev=2453&view=rev Author: dmichelsen Date: 2008-12-03 12:45:04 +0000 (Wed, 03 Dec 2008) Log Message: ----------- mGAR v1: Fix revision in PSTAMP regarding external references Modified Paths: -------------- csw/mgar/gar/v1/gar.pkg.mk Modified: csw/mgar/gar/v1/gar.pkg.mk =================================================================== --- csw/mgar/gar/v1/gar.pkg.mk 2008-12-03 11:15:28 UTC (rev 2452) +++ csw/mgar/gar/v1/gar.pkg.mk 2008-12-03 12:45:04 UTC (rev 2453) @@ -17,30 +17,15 @@ GAWK ?= /opt/csw/bin/gawk # We have to deal with four cases here: -# 1. There is no svn binary -# 2. There is a svn binary, but the directory does not belong to a repository -# 3. There is a svn binary, but not everything was committed properly -# 4. There is a svn binary and everything was committed +# 1. There is no svn binary -> NOSVN +# 2. There is a svn binary, but the directory does not belong to a repository -> NOTVERSIONED +# 3. There is a svn binary, but not everything was committed properly -> UNCOMMITTED +# 4. There is a svn binary and everything was committed -> r -_HAS_SVN = $(shell if test -x $(SVN); then echo yes; fi) -ifneq ($(_HAS_SVN),yes) - # Case 1: There is no svn binary - SVN_REV = NOSVN -else - ifneq ($(shell $(SVN) info >/dev/null 2>&1; echo $$?),0) - # Case 2: The directory does not belong to a repository - SVN_REV = NOTVERSIONED - else - # Case 3+4: The directory belongs to a repository - ifneq ($(shell $(SVN) status 2>/dev/null),) - # Case 3: Not everything was committed properly - _SVN_UNCOMMITTED = UNCOMMITTED - endif - SVN_REV = $(shell $(SVN) info --recursive 2>/dev/null | \ - $(GAWK) '$$1 == "Revision:" && MAX < $$2 { MAX = $$2 } \ - END { print "r" MAX }')$(_SVN_UNCOMMITTED) - endif -endif +# Calculating the revision can be time consuming, so we do this on demand +define _REVISION +$(if $(shell if test -x $(SVN); then echo yes; fi),$(if $(shell $(SVN) info >/dev/null 2>&1; if test $$? -eq 0; then echo YES; fi),$(if $(shell $(SVN) status --ignore-externals 2>/dev/null | grep -v '^X'),UNCOMMITTED,$(shell $(SVN) info --recursive 2>/dev/null | $(GAWK) '$$1 == "Revision:" && MAX < $$2 { MAX = $$2 } END {print "r" MAX }')),NOTVERSIONED),NOSVN) +endef SPKG_DESC ?= $(DESCRIPTION) SPKG_VERSION ?= $(GARVERSION) @@ -49,7 +34,7 @@ SPKG_PACKAGER ?= Unknown SPKG_VENDOR ?= $(SPKG_SOURCEURL) packaged for CSW by $(SPKG_PACKAGER) SPKG_EMAIL ?= Unknown -SPKG_PSTAMP ?= $(LOGNAME)@$(shell hostname)-$(SVN_REV)-$(shell date '+%Y%m%d%H%M%S') +SPKG_PSTAMP ?= $(LOGNAME)@$(shell hostname)-$(call _REVISION)-$(shell date '+%Y%m%d%H%M%S') SPKG_BASEDIR ?= $(prefix) SPKG_CLASSES ?= none SPKG_OSNAME ?= $(shell uname -s)$(shell uname -r) 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 Dec 3 19:16:48 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 03 Dec 2008 18:16:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[2454] csw/mgar/pkg/Makefile Message-ID: Revision: 2454 http://gar.svn.sourceforge.net/gar/?rev=2454&view=rev Author: dmichelsen Date: 2008-12-03 18:16:48 +0000 (Wed, 03 Dec 2008) Log Message: ----------- mGAR: Add target 'garlinks' to use symlinks instead of externals Modified Paths: -------------- csw/mgar/pkg/Makefile Modified: csw/mgar/pkg/Makefile =================================================================== --- csw/mgar/pkg/Makefile 2008-12-03 12:45:04 UTC (rev 2453) +++ csw/mgar/pkg/Makefile 2008-12-03 18:16:48 UTC (rev 2454) @@ -2,28 +2,47 @@ # This makefile is to be included from Makefiles in each category # directory. +# This contains all directories containing packages +SUBDIRS = cpan xfce + +FILTER_DIRS = CVS/ + default: @echo "You are in the pkg/ directory." %: - @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + @for i in $(filter-out $(FILTER_DIRS),$(wildcard */)) ; do \ $(MAKE) -C $$i $* ; \ done paranoid-%: - @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + @for i in $(filter-out $(FILTER_DIRS),$(wildcard */)) ; do \ $(MAKE) -C $$i $* || exit 2; \ done export BUILDLOG ?= $(shell pwd)/buildlog.txt report-%: - @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + @for i in $(filter-out $(FILTER_DIRS),$(wildcard */)) ; do \ $(MAKE) -C $$i $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG); \ done +# When the complete package tree is checked out there would be literally hundreds +# of instances of GAR as they are referenced as external references. Alternatively +# you can check out the tree with +# svn co --ignore-externals https://.../pkg +# and then run +# gmake garlinks +# to generate symbolic links instead of externally checked out dirs + +# Lines returned by 'svn propget -R' look like this: +# cpan/Test-Memory-Cycle/trunk - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + +garlinks: + @(svn propget svn:externals -R | perl -ane 'next if( /^$$/ );($$path,$$sep,$$dir,$$link)=@F;($$upsteps=$$path)=~s![^/]+!..!g;(($$linkdest=$$link))=~ s!https://gar.svn.sf.net/svnroot/gar/csw/mgar!$$upsteps!;print "Linking $$path/$$dir to ../$$linkdest", symlink("../$$linkdest","$$path/$$dir") ? "" : " failed", "\n";') + pkglist: - @for i in $(filter-out $(FILTER_DIRS),$(wildcard */)) ; do \ + @for i in $(filter-out $(FILTER_DIRS),$(foreach D,. $(SUBDIRS),$(wildcard $D/*/))) ; do \ $(MAKE) -s -C $$i/trunk pkglist ; \ 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 Wed Dec 3 20:44:49 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 03 Dec 2008 19:44:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[2455] csw/mgar/pkg/openjade/trunk Message-ID: Revision: 2455 http://gar.svn.sourceforge.net/gar/?rev=2455&view=rev Author: bdwalton Date: 2008-12-03 19:44:48 +0000 (Wed, 03 Dec 2008) Log Message: ----------- First working package run for openjade. Still needs the postinstall preuninstall scripts added. Modified Paths: -------------- csw/mgar/pkg/openjade/trunk/Makefile csw/mgar/pkg/openjade/trunk/files/CSWopenjade.gspec Added Paths: ----------- csw/mgar/pkg/openjade/trunk/checksums csw/mgar/pkg/openjade/trunk/files/CSWopenjade.depend csw/mgar/pkg/openjade/trunk/files/openjade-1.3.1-nsl.patch csw/mgar/pkg/openjade/trunk/files/openjade.spec Modified: csw/mgar/pkg/openjade/trunk/Makefile =================================================================== --- csw/mgar/pkg/openjade/trunk/Makefile 2008-12-03 18:16:48 UTC (rev 2454) +++ csw/mgar/pkg/openjade/trunk/Makefile 2008-12-03 19:44:48 UTC (rev 2455) @@ -1,16 +1,68 @@ -GARNAME = package -GARVERSION = 1.0 -CATEGORIES = category +GARNAME = openjade +GARVERSION = 1.3.2 +PATCHLEVEL = 27 +CATEGORIES = apps -DESCRIPTION = Brief description +PREREQUISITES = CSWopensp + +DESCRIPTION = A DSSSL implementation. define BLURB - Long description + OpenJade is an implementation of the ISO/IEC 10179:1996 standard DSSSL + (Document Style Semantics and Specification Language). OpenJade is + based on James Clark's Jade implementation of DSSSL. OpenJade is a + command-line application and a set of components. The DSSSL engine + inputs an SGML or XML document and can output a variety of formats: + XML, RTF, TeX, MIF (FrameMaker), SGML, or XML. endef -MASTER_SITES = +MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWpackage,) +DISTFILES += $(call admfiles,CSWopenjade,depend) -CONFIGURE_ARGS = $(DIRPATHS) +PATCHFILES = openjade-1.3.1-nsl.patch +# use gnu c/c++ for this one...(matches opensp and the c++ doesn't want to +# play with sun_cc...) +GARCOMPILER = GNU +GNU_CC_HOME = /opt/csw/gcc3 + +CONFIGURE_ARGS = $(DIRPATHS) --disable-static +CONFIGURE_ARGS += --datadir=$(datadir)/sgml/$(GARNAME)-$(GARVERSION) +CONFIGURE_ARGS += --enable-splibdir=$(libdir) + +TEST_SCRIPTS = + +INSTALL_ARGS = install install-man + include gar/category.mk + +sgmldir = $(DESTDIR)/$(datadir)/sgml/$(GARNAME)-$(GARVERSION) +sgmldoc = $(DESTDIR)/$(docdir)/$(GARNAME) +INSTALL = /opt/csw/bin/ginstall -c +INSTALL_DATA = $(INSTALL) -m 0644 +INSTALL_DIR = $(INSTALL) -m 0755 -d + +post-install: + @echo Installing catalog files. + @( cd $(WORKSRC); \ + $(INSTALL_DIR) $(sgmldir)/; \ + $(INSTALL_DATA) dsssl/catalog $(sgmldir)/; \ + $(INSTALL_DATA) dsssl/dsssl.dtd $(sgmldir)/; \ + $(INSTALL_DATA) dsssl/fot.dtd $(sgmldir)/; \ + $(INSTALL_DATA) dsssl/style-sheet.dtd $(sgmldir); \ + $(INSTALL_DIR) $(DESTDIR)/$(sysconfdir)/sgml; \ + cd $(DESTDIR)/$(sysconfdir)/sgml; \ + touch $(GARNAME)-$(GARVERSION)-$(PATCHLEVEL).soc; \ + ln -s $(GARNAME)-$(GARVERSION)-$(PATCHLEVEL).soc $(GARNAME).soc; \ + ) + + @echo Installing docs. + @( cd $(WORKSRC); \ + $(INSTALL_DIR) $(sgmldoc); \ + $(INSTALL_DATA) jadedoc/*htm jadedoc/*txt $(sgmldoc)/; \ + $(INSTALL_DIR) $(sgmldoc)/images; \ + $(INSTALL_DATA) jadedoc/images/* $(sgmldoc)/images/; \ + $(INSTALL_DATA) dsssl/README.jadetex $(sgmldoc)/; \ + $(INSTALL_DATA) README COPYING VERSION $(sgmldoc)/; \ + ) + @$(MAKECOOKIE) \ No newline at end of file Added: csw/mgar/pkg/openjade/trunk/checksums =================================================================== --- csw/mgar/pkg/openjade/trunk/checksums (rev 0) +++ csw/mgar/pkg/openjade/trunk/checksums 2008-12-03 19:44:48 UTC (rev 2455) @@ -0,0 +1,4 @@ +7df692e3186109cc00db6825b777201e download/openjade-1.3.2.tar.gz +3bceb78eeb9bdb38e98e75c6fb20714e download/CSWopenjade.gspec +ea3dd2c469bf7e8efd183f82b743c90f download/CSWopenjade.depend +ca3a0ff43d8ed182f432d723927cd2e9 download/openjade-1.3.1-nsl.patch Added: csw/mgar/pkg/openjade/trunk/files/CSWopenjade.depend =================================================================== --- csw/mgar/pkg/openjade/trunk/files/CSWopenjade.depend (rev 0) +++ csw/mgar/pkg/openjade/trunk/files/CSWopenjade.depend 2008-12-03 19:44:48 UTC (rev 2455) @@ -0,0 +1,12 @@ +P CSWcommon common - common files and dirs for CSW packages +P CSWgcc3core gcc3core - GNU C Compiler +P CSWgcc3corert gcc3corert - GNU C Compiler Run Time +P CSWgcc3g++ gcc3g++ - GNU C++ Compiler +P CSWgcc3g++rt gcc3g++rt - GNU C++ Compiler Run Time +P CSWgcc4corert gcc4corert - GNU C Compiler Run Time +P CSWgcc4g++rt gcc4g++rt - GNU C++ Compiler Run Time +P CSWggettext ggettext - GNU gettext +P CSWiconv libiconv - GNU iconv library +P CSWopensp opensp - a SGML parser called OpenSP +P CSWsgmlcommon sgmlcommon - A collection of entities and DTDs +P CSWxmlcommon xmlcommon - A collection of entities and DTDs Modified: csw/mgar/pkg/openjade/trunk/files/CSWopenjade.gspec =================================================================== --- csw/mgar/pkg/openjade/trunk/files/CSWopenjade.gspec 2008-12-03 18:16:48 UTC (rev 2454) +++ csw/mgar/pkg/openjade/trunk/files/CSWopenjade.gspec 2008-12-03 19:44:48 UTC (rev 2455) @@ -1,4 +1,4 @@ -%var bitname package -%var pkgname CSWpackage +%var bitname openjade +%var pkgname CSWopenjade %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/LICENSE +%copyright url file://%{WORKSRC}/COPYING Added: csw/mgar/pkg/openjade/trunk/files/openjade-1.3.1-nsl.patch =================================================================== --- csw/mgar/pkg/openjade/trunk/files/openjade-1.3.1-nsl.patch (rev 0) +++ csw/mgar/pkg/openjade/trunk/files/openjade-1.3.1-nsl.patch 2008-12-03 19:44:48 UTC (rev 2455) @@ -0,0 +1,21 @@ +--- openjade-1.3.1/config/configure.in.lr 2003-09-12 08:03:22.000000000 -0600 ++++ openjade-1.3.1/config/configure.in 2003-09-12 08:03:44.000000000 -0600 +@@ -156,7 +156,6 @@ + then + AC_MSG_RESULT(yes) + AC_DEFINE(SP_HAVE_SOCKET) +- AC_CHECK_LIB(nsl,main,LIBS="$LIBS -lnsl") + AC_CHECK_LIB(socket,main,LIBS="$LIBS -lsocket") + AC_MSG_CHECKING(h_errno in netdb.h) + AC_EGREP_HEADER(h_errno,netdb.h, +--- openjade-1.3.1/configure.lr 2003-09-12 08:35:55.000000000 -0600 ++++ openjade-1.3.1/configure 2003-09-12 08:36:07.000000000 -0600 +@@ -5530,7 +5530,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lnsl $LIBS" ++LIBS="-lXXXnsl $LIBS" + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" + #include "confdefs.h" Added: csw/mgar/pkg/openjade/trunk/files/openjade.spec =================================================================== --- csw/mgar/pkg/openjade/trunk/files/openjade.spec (rev 0) +++ csw/mgar/pkg/openjade/trunk/files/openjade.spec 2008-12-03 19:44:48 UTC (rev 2455) @@ -0,0 +1,348 @@ +Summary: A DSSSL implementation. +Name: openjade +Version: 1.3.2 +Release: 27 +Prereq: sgml-common >= 0.5 +Source: http://download.sourceforge.net/openjade/openjade-%{version}.tar.gz +Patch0: openjade-ppc64.patch +Patch1: openjade-1.3.1-nsl.patch +Patch2: openjade-deplibs.patch +License: Distributable +Group: Applications/Text +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Prefix: /usr +Obsoletes: openjade-devel < 1.3.2-17 +Obsoletes: jade +Provides: jade + +BuildRequires: opensp-devel + +%description +OpenJade is an implementation of the ISO/IEC 10179:1996 standard DSSSL +(Document Style Semantics and Specification Language). OpenJade is +based on James Clark's Jade implementation of DSSSL. OpenJade is a +command-line application and a set of components. The DSSSL engine +inputs an SGML or XML document and can output a variety of formats: +XML, RTF, TeX, MIF (FrameMaker), SGML, or XML. + + +%prep +%setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 -b .deplibs + + +%build +%configure --disable-static --datadir=%{_datadir}/sgml/%{name}-%{version} \ + --enable-splibdir=%{_libdir} +make %{?_smp_mflags} + + +%install +rm -rf $RPM_BUILD_ROOT + +make install install-man DESTDIR=$RPM_BUILD_ROOT + +# Fix up libtool libraries +find $RPM_BUILD_ROOT -name '*.la' | \ + xargs perl -p -i -e "s|-L$RPM_BUILD_DIR[\w/.-]*||g" + +# oMy, othis ois osilly. +ln -s openjade $RPM_BUILD_ROOT/%{prefix}/bin/jade +echo ".so man1/openjade.1" > $RPM_BUILD_ROOT/%{_mandir}/man1/jade.1 + +# install jade/jade $RPM_BUILD_ROOT/%{prefix}/bin/jade +cp dsssl/catalog $RPM_BUILD_ROOT/%{_datadir}/sgml/%{name}-%{version}/ +cp dsssl/{dsssl,style-sheet,fot}.dtd $RPM_BUILD_ROOT/%{_datadir}/sgml/%{name}-%{version}/ + +# add unversioned/versioned catalog and symlink +mkdir -p $RPM_BUILD_ROOT/etc/sgml +cd $RPM_BUILD_ROOT/etc/sgml +touch %{name}-%{version}-%{release}.soc +ln -s %{name}-%{version}-%{release}.soc %{name}.soc +cd - + + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +/sbin/ldconfig +/usr/bin/install-catalog --add /etc/sgml/%{name}-%{version}-%{release}.soc \ + %{_datadir}/sgml/%{name}-%{version}/catalog >/dev/null 2>/dev/null || : + +%preun +/usr/bin/install-catalog --remove /etc/sgml/%{name}-%{version}-%{release}.soc \ + %{_datadir}/sgml/%{name}-%{version}/catalog >/dev/null 2>/dev/null || : + +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root) +%doc jadedoc/* dsssl/README.jadetex +%doc README COPYING VERSION +%ghost /etc/sgml/%{name}-%{version}-%{release}.soc +/etc/sgml/%{name}.soc +%{_bindir}/* +%{_libdir}/*.so +%{_libdir}/*.so.* +%{_mandir}/*/* +%{_datadir}/sgml/%{name}-%{version} +%{_libdir}/*.la + +%changelog +* Mon Jul 17 2006 Tim Waugh 1.3.2-27 +- Rebuilt. + +* Mon Jul 10 2006 Tim Waugh 1.3.2-26 +- Fix dependent libs for libogrove (bug #198232). + +* Mon Jun 26 2006 Florian La Roche 1.3.2-25 +- add redirection to /dev/null for preun + +* Tue Jun 13 2006 Tim Waugh 1.3.2-24 +- Rebuild against opensp. + +* Fri Feb 10 2006 Jesse Keating - 1.3.2-23.2 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 1.3.2-23.1 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Fri Jan 6 2006 Tim Waugh 1.3.2-23 +- Rebuild against new opensp. + +* Mon Dec 19 2005 Tim Waugh 1.3.2-22 +- Fix SOC files. +- Quieten scriptlets. + +* Mon Dec 19 2005 Tim Waugh 1.3.2-21 +- Fix location of catalog. + +* Tue Dec 13 2005 Tim Waugh 1.3.2-20 +- Use --enable-splibdir to prevent ambiguity. +- Move 'install-catalog --remove' to %%preun section (bug #60409). + +* Thu Dec 8 2005 Terje Bless - 1.3.2-19 +- Drop -devel subpackage. + +* Sun Dec 4 2005 Ville Skytt? - 1.3.2-18 +- Really BuildRequire opensp-devel. +- Clean up unneeded build dependencies and configure options. +- Drop dependency on docbook-dtds. +- Fix %%post(un) syntax and catalog installation. + +* Wed Nov 30 2005 Terje Bless 1.3.2-17 +- Split opensp out into its own package. +- BuildRequire OpenSP-devel, Require OpenSP. +- Drop openjade-1.3.1-manpage.patch (it patches opensp, not openjade, and is + obsolete with external opensp). + +* Tue Mar 1 2005 Tim Waugh 1.3.2-16 +- Rebuilt for new GCC. + +* Wed Feb 9 2005 Tim Waugh 1.3.2-15 +- Rebuilt. + +* Tue Oct 5 2004 Tim Waugh 1.3.2-14 +- Build requires gettext-devel (bug #134672). + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Fri Mar 19 2004 Tim Waugh 1.3.2-11.2 +- Rebuilt. + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Sat Jan 31 2004 Tim Waugh 1.3.2-10 +- More C++ fixes (for GCC 3.4). + +* Thu Dec 4 2003 Tim Waugh 1.3.2-9 +- No longer need httphost patch. + +* Mon Oct 20 2003 Tim Waugh 1.3.2-8 +- Rebuilt. + +* Tue Sep 23 2003 Florian La Roche 1.3.2-7 +- do not link against -lnsl + +* Thu Aug 7 2003 Tim Waugh 1.3.2-6 +- Rebootstrap to create a libtool that actually works. + +* Wed Aug 6 2003 Tim Waugh 1.3.2-5 +- Rebuilt. + +* Wed Jun 04 2003 Elliot Lee 1.3.2-4 +- rebuilt + +* Thu May 22 2003 Tim Waugh 1.3.2-3 +- Fixes for GCC 3.3. +- Use --parents for %doc. + +* Tue Mar 18 2003 Tim Waugh 1.3.2-2 +- Provide sgml2xml man page (bug #83759). +- Add devel subpackage. + +* Fri Mar 14 2003 Tim Waugh 1.3.2-1 +- OpenSP 1.5, openjade 1.3.2. +- Renumber patches. + +* Thu Feb 13 2003 Elliot Lee 1.3.1-13 +- Add openjade-ppc64.patch + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Tue Jan 7 2003 Jeff Johnson 1.3.1-11 +- don't include -debuginfo files in package. + +* Thu Dec 12 2002 Tim Waugh +- Fix typo in description (bug #79395). + +* Mon Nov 4 2002 Tim Waugh 1.3.1-10 +- Fix DTD retrieval from virtual hosts (bug #77137). + +* Sat Aug 10 2002 Elliot Lee +- rebuilt with gcc-3.2 (we hope) + +* Mon Jul 22 2002 Tim Powers 1.3.1-8 +- rebuild using gcc-3.2-0.1 + +* Fri Jun 21 2002 Tim Powers 1.3.1-7 +- automated rebuild + +* Thu Jun 13 2002 Tim Waugh 1.3.1-6 +- Fix sgmlnorm(1) man page (bug #64136). +- Fix %%files list (bug #64323). + +* Thu May 23 2002 Tim Powers 1.3.1-5 +- automated rebuild + +* Thu Feb 21 2002 Tim Waugh 1.3.1-4 +- Avoid bad triggers. + +* Thu Feb 21 2002 Tim Waugh 1.3.1-3 +- Rebuild in new environment. + +* Mon Jan 28 2002 Tim Waugh 1.3.1-2 +- Ship man pages. + +* Mon Jan 28 2002 Tim Waugh 1.3.1-1 +- 1.3.1. +- Patches no longer needed: decl, strdup, foo, size_t, 31525, indev, + ligature, twosidestartonright. +- Updated lt patch. + +* Mon Jan 14 2002 Tim Waugh 1.3-22 +- Enable build on GCC 3.0 onwards. +- Run libtoolize. + +* Fri Nov 2 2001 Tim Waugh 1.3-21 +- Enable HTTP support. Now a DocBook XML document can be processed by + either xsltproc or openjade. + +* Tue Oct 30 2001 Tim Waugh 1.3-20 +- Apply twosidestartonright patch from Ian Castle. + +* Thu Oct 11 2001 Tim Waugh 1.3-19 +- s/Copyright:/License:/ +- Use %%{_tmppath}. +- Fix up libtool libraries (bug #46212). + +* Wed Sep 12 2001 Tim Powers 1.3-18 +- rebuild with new gcc and binutils + +* Fri Jun 15 2001 Tim Waugh 1.3-17 +- Apply patch from CVS to break up unintentional ligatures (bugs #11497, + #11779) + +* Mon Jun 4 2001 Tim Waugh 1.3-16 +- Apply the iNdev openjade-1.3.patch patch. + +* Tue May 29 2001 Tim Waugh 1.3-15 +- ldconfig (bug #32824). +- Fix up some libtool problems. + +* Fri Apr 27 2001 Bill Nottingham 1.3-14 +- rebuild for C++ exception handling on ia64 +- build with optimization on ia64 + +* Tue Mar 13 2001 Tim Waugh +- Avoid creating bogus TeX output for section headings containing + special characters (#bug 31525). + +* Mon Jan 22 2001 Florian La Roche +- Apply original autoconf patch to s390 s390x only. This patch can + be deleted once s390* uses a current compiler. + +* Thu Jan 19 2001 Tim Waugh +- Don't conflict with stylesheets; require sgml-common >= 0.5 instead. +- Revert autoconf change, as it's still broken. + +* Wed Jan 17 2001 Florian La Roche +- fix this autoconf macro to work on all archs :-) + +* Wed Jan 17 2001 Florian La Roche +- apply patch from Fritz Elfert + - removed explicit stripping + - Added autoconf macro for correctly recognizing if size_t + is unsigned int + +* Tue Jan 16 2001 Tim Waugh +- Default catalog file is /etc/sgml/catalog. + +* Mon Jan 08 2001 Tim Waugh +- Conflict with stylesheets (new-trials location changes). +- /usr/lib/sgml -> /usr/share/sgml/%%{name}-%%{version}. +- Remove %%post and %%postun. + +* Wed Oct 18 2000 Matt Wilson +- rebuilt against g++-2.96-60, fixes jade on alpha + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Tue Jul 4 2000 Jakub Jelinek +- Rebuild with new C++ + +* Wed May 31 2000 Matt Wilson +- fix several C++ build problems (declarations) +- build against new libstdc++ + +* Wed May 17 2000 Matt Wilson +- build with -O0 on alpha +- fix -j testing + +* Thu May 5 2000 Bill Nottingham +- openjade is maintained, and actually builds. Let's try that. + +* Thu Mar 9 2000 Bill Nottingham +- this package is way too huge. strip *everything* + +* Mon Feb 21 2000 Matt Wilson +- build with CXXFLAGS="-O2 -ggdb" to work around segfault on alpha + +* Thu Feb 3 2000 Bill Nottingham +- strip binaries + +* Wed Jan 5 2000 Bill Nottingham +- sanitize spec file some + +* Tue Aug 17 1999 Tim Powers +- fixed conflict problem with sgml-tools + +* Sat Jul 17 1999 Tim Powers +- changed buildroot path to /var/tmp +- rebuilt for 6.1 + +* Fri Apr 23 1999 Michael K. Johnson +- quiet scripts + +* Thu Apr 23 1999 Owen Taylor +- Made requires for sgml-common into prereq This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From william at wbonnet.net Wed Dec 3 21:32:50 2008 From: william at wbonnet.net (William Bonnet) Date: Wed, 03 Dec 2008 21:32:50 +0100 Subject: [csw-devel] External dependencies Message-ID: <4936ECF2.4080403@wbonnet.net> Hi In the GAR tree, each package has under its trunk an external dependencies linking to gar scripts. On my different boxes svn update process is really slow because of the update of this dependencies. Is there a way to it up ? I guess that each package use the same version of gar since it is link to the same external think. Isn't there a way to have a single external reference for all the package instead of having one per package ? Actually it looks like if it is running on svn update for each package. cheers -- William http://www.wbonnet.net http://www.sunwizard.net Le site fran?ais des amateurs de stations Unix http://www.blastwave.org An OpenSolaris Community Site http://www.opencsw.org Community SoftWare for Solaris http://www.guses.org French speaking Solaris User Group From dam at opencsw.org Wed Dec 3 22:27:45 2008 From: dam at opencsw.org (Dagobert Michelsen) Date: Wed, 3 Dec 2008 22:27:45 +0100 Subject: [csw-devel] External dependencies In-Reply-To: <4936ECF2.4080403@wbonnet.net> References: <4936ECF2.4080403@wbonnet.net> Message-ID: <60E6EB6A-EDA9-46A1-9DAC-0F07E61C65D6@opencsw.org> Hi William, Am 03.12.2008 um 21:32 schrieb William Bonnet: > In the GAR tree, each package has under its trunk an external > dependencies linking to gar scripts. On my different boxes svn update > process is really slow because of the update of this dependencies. Is > there a way to it up ? I guess that each package use the same > version of > gar since it is link to the same external think. No, it is not. Especially my packages use gar/v2 and more will follow when I fixed the open issues. This way the packages can be transitioned one-at-a-time. > Isn't there a way to have a single external reference for all the > package instead of having one per package ? Actually it looks like > if it > is running on svn update for each package. William, my friend, this is exactly what I have implemented today during an otherwise unproductive traintrip: What you do now is ? svn co --ignore-externals https://gar.svn.sf.net/svnroot/gar/csw/mgar ? cd mgar/pkg; gmake garlinks This reads all the external references from GAR and makes symbolic links instead. Best regards -- Dago From william at wbonnet.net Wed Dec 3 22:34:02 2008 From: william at wbonnet.net (William Bonnet) Date: Wed, 03 Dec 2008 22:34:02 +0100 Subject: [csw-devel] External dependencies In-Reply-To: <60E6EB6A-EDA9-46A1-9DAC-0F07E61C65D6@opencsw.org> References: <4936ECF2.4080403@wbonnet.net> <60E6EB6A-EDA9-46A1-9DAC-0F07E61C65D6@opencsw.org> Message-ID: <4936FB4A.7070907@wbonnet.net> Hi > No, it is not. Especially my packages use gar/v2 and more > will follow when I fixed the open issues. This way the > packages can be transitioned one-at-a-time. > humm... ok :) > William, my friend, this is exactly what I have implemented > today during an otherwise unproductive traintrip: > > > > What you do now is > > ? svn co --ignore-externals https://gar.svn.sf.net/svnroot/gar/csw/mgar > ? cd mgar/pkg; gmake garlinks > > This reads all the external references from GAR and makes symbolic > links instead. > Great ! :) Thanks, I am going to test it Cheers -- William http://www.wbonnet.net http://www.sunwizard.net Le site fran?ais des amateurs de stations Unix http://www.blastwave.org An OpenSolaris Community Site http://www.opencsw.org Community SoftWare for Solaris http://www.guses.org French speaking Solaris User Group From william at wbonnet.net Wed Dec 3 22:33:52 2008 From: william at wbonnet.net (William Bonnet) Date: Wed, 03 Dec 2008 22:33:52 +0100 Subject: [csw-devel] External dependencies In-Reply-To: <60E6EB6A-EDA9-46A1-9DAC-0F07E61C65D6@opencsw.org> References: <4936ECF2.4080403@wbonnet.net> <60E6EB6A-EDA9-46A1-9DAC-0F07E61C65D6@opencsw.org> Message-ID: <4936FB40.9020609@wbonnet.net> Hi > No, it is not. Especially my packages use gar/v2 and more > will follow when I fixed the open issues. This way the > packages can be transitioned one-at-a-time. > humm... ok :) > William, my friend, this is exactly what I have implemented > today during an otherwise unproductive traintrip: > > > > What you do now is > > ? svn co --ignore-externals https://gar.svn.sf.net/svnroot/gar/csw/mgar > ? cd mgar/pkg; gmake garlinks > > This reads all the external references from GAR and makes symbolic > links instead. > Great ! :) I am going to test it Cheers -- William http://www.wbonnet.net http://www.sunwizard.net Le site fran?ais des amateurs de stations Unix http://www.blastwave.org An OpenSolaris Community Site http://www.opencsw.org Community SoftWare for Solaris http://www.guses.org French speaking Solaris User Group From william at wbonnet.net Thu Dec 4 00:23:56 2008 From: william at wbonnet.net (William Bonnet) Date: Thu, 04 Dec 2008 00:23:56 +0100 Subject: [csw-devel] Packages age Message-ID: <4937150C.6080907@wbonnet.net> Hi You'll find attached an ordered by date list of package for the three sources, stable, unstable, testing. This list includes only packages with "REV=" in file name. Details are in attached files, number of package per year of genera are Stable source : 1997 1 1998 1 2001 3 2002 3 2003 27 2004 101 2005 179 2006 211 2007 288 2008 177 Unstable source 1997 1 1998 1 2001 3 2002 4 2003 26 2004 107 2005 184 2006 208 2007 207 2008 395 testing source (all from 2008, display months) 09 9 10 4 11 42 12 5 Which is pretty good for testing packages. But it is clear that many stable and unstable package have to be updated Cheers -- William http://www.wbonnet.net http://www.sunwizard.net Le site fran?ais des amateurs de stations Unix http://www.blastwave.org An OpenSolaris Community Site http://www.opencsw.org Community SoftWare for Solaris http://www.guses.org French speaking Solaris User Group -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: stable.package.age Url: http://lists.opencsw.org/pipermail/devel/attachments/20081204/7d476754/attachment-0003.pl -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: testing.package.age Url: http://lists.opencsw.org/pipermail/devel/attachments/20081204/7d476754/attachment-0004.pl -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: unstable.package.age Url: http://lists.opencsw.org/pipermail/devel/attachments/20081204/7d476754/attachment-0005.pl From trygvel at opencsw.org Thu Dec 4 08:23:42 2008 From: trygvel at opencsw.org (=?windows-1252?Q?Trygve_Laugst=F8l?=) Date: Thu, 04 Dec 2008 08:23:42 +0100 Subject: [csw-devel] External dependencies In-Reply-To: <60E6EB6A-EDA9-46A1-9DAC-0F07E61C65D6@opencsw.org> References: <4936ECF2.4080403@wbonnet.net> <60E6EB6A-EDA9-46A1-9DAC-0F07E61C65D6@opencsw.org> Message-ID: <4937857E.1060801@opencsw.org> Dagobert Michelsen wrote: > Hi William, > > Am 03.12.2008 um 21:32 schrieb William Bonnet: >> In the GAR tree, each package has under its trunk an external >> dependencies linking to gar scripts. On my different boxes svn update >> process is really slow because of the update of this dependencies. Is >> there a way to it up ? I guess that each package use the same >> version of >> gar since it is link to the same external think. > > No, it is not. Especially my packages use gar/v2 and more > will follow when I fixed the open issues. This way the > packages can be transitioned one-at-a-time. > >> Isn't there a way to have a single external reference for all the >> package instead of having one per package ? Actually it looks like >> if it >> is running on svn update for each package. > > William, my friend, this is exactly what I have implemented > today during an otherwise unproductive traintrip: > References: <4936ECF2.4080403@wbonnet.net> <60E6EB6A-EDA9-46A1-9DAC-0F07E61C65D6@opencsw.org> <4937857E.1060801@opencsw.org> Message-ID: <625385e30812032359xeb9cc4akd89c6a9c54eca97d@mail.gmail.com> On Thu, Dec 4, 2008 at 8:23 AM, Trygve Laugst?l wrote: >> William, my friend, this is exactly what I have implemented >> today during an otherwise unproductive traintrip: >> > Hm, why is this not at wiki.opencsw.org? Dagobert wanted to keep everything GAR related on SF. Maybe we should set up a GAR page on the wiki linking to SF so people can find the documentation from there too? -- /peter From dam at opencsw.org Thu Dec 4 09:14:01 2008 From: dam at opencsw.org (Dagobert Michelsen) Date: Thu, 4 Dec 2008 09:14:01 +0100 Subject: [csw-devel] External dependencies In-Reply-To: <625385e30812032359xeb9cc4akd89c6a9c54eca97d@mail.gmail.com> References: <4936ECF2.4080403@wbonnet.net> <60E6EB6A-EDA9-46A1-9DAC-0F07E61C65D6@opencsw.org> <4937857E.1060801@opencsw.org> <625385e30812032359xeb9cc4akd89c6a9c54eca97d@mail.gmail.com> Message-ID: Hi, Am 04.12.2008 um 08:59 schrieb Peter Bonivart: > On Thu, Dec 4, 2008 at 8:23 AM, Trygve Laugst?l > wrote: >>> William, my friend, this is exactly what I have implemented >>> today during an otherwise unproductive traintrip: >>> >> #Checking_out_all_packages >> >> Hm, why is this not at wiki.opencsw.org? > > Dagobert wanted to keep everything GAR related on SF. Mainly to have some neutral ground which makes it easy for other packaging projects to join in. > Maybe we should > set up a GAR page on the wiki linking to SF so people can find the > documentation from there too? Yes. Just a stub? Best regards -- Dago From bonivart at opencsw.org Thu Dec 4 09:33:03 2008 From: bonivart at opencsw.org (Peter Bonivart) Date: Thu, 4 Dec 2008 09:33:03 +0100 Subject: [csw-devel] External dependencies In-Reply-To: References: <4936ECF2.4080403@wbonnet.net> <60E6EB6A-EDA9-46A1-9DAC-0F07E61C65D6@opencsw.org> <4937857E.1060801@opencsw.org> <625385e30812032359xeb9cc4akd89c6a9c54eca97d@mail.gmail.com> Message-ID: <625385e30812040033o33538b28g9710be68add2c652@mail.gmail.com> On Thu, Dec 4, 2008 at 9:14 AM, Dagobert Michelsen wrote: >> Maybe we should >> set up a GAR page on the wiki linking to SF so people can find the >> documentation from there too? > > Yes. Just a stub? I have added a Build info-link under the Tech-section. :-) I started with a link to the official OpenCSW standard and one to your GAR documentation. -- /peter From trygvel at opencsw.org Thu Dec 4 09:34:46 2008 From: trygvel at opencsw.org (=?ISO-8859-1?Q?Trygve_Laugst=F8l?=) Date: Thu, 04 Dec 2008 09:34:46 +0100 Subject: [csw-devel] External dependencies In-Reply-To: <625385e30812032359xeb9cc4akd89c6a9c54eca97d@mail.gmail.com> References: <4936ECF2.4080403@wbonnet.net> <60E6EB6A-EDA9-46A1-9DAC-0F07E61C65D6@opencsw.org> <4937857E.1060801@opencsw.org> <625385e30812032359xeb9cc4akd89c6a9c54eca97d@mail.gmail.com> Message-ID: <49379626.4010806@opencsw.org> Peter Bonivart wrote: > On Thu, Dec 4, 2008 at 8:23 AM, Trygve Laugst?l wrote: >>> William, my friend, this is exactly what I have implemented >>> today during an otherwise unproductive traintrip: >>> > Hm, why is this not at wiki.opencsw.org? > > Dagobert wanted to keep everything GAR related on SF. Maybe we should > set up a GAR page on the wiki linking to SF so people can find the > documentation from there too? Yeah, they should certainly be linked together. -- Trygve From dam at opencsw.org Thu Dec 4 12:14:49 2008 From: dam at opencsw.org (Dagobert Michelsen) Date: Thu, 4 Dec 2008 12:14:49 +0100 Subject: [csw-devel] Fwd: CSWrrd References: <4937A430.4090702@opencsw.org> Message-ID: <3E0A424E-2071-4EE4-8EF9-0FB1CDA960B9@opencsw.org> Hi Ihsan, Anfang der weitergeleiteten E-Mail: > K?nntest du nicht auf den Buildserver CSWrrd deinstallieren? CSWrrd has been deinstalled on all buildservers. Best regards -- Dago From bdwalton at users.sourceforge.net Thu Dec 4 17:56:20 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 04 Dec 2008 16:56:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[2456] csw/mgar/pkg/sgml-xml-common/trunk Message-ID: Revision: 2456 http://gar.svn.sourceforge.net/gar/?rev=2456&view=rev Author: bdwalton Date: 2008-12-04 16:56:18 +0000 (Thu, 04 Dec 2008) Log Message: ----------- Explicitly set the PATH in install-catalog as we can't assume that /opt/csw/bin is on the path like the linux version can (safely) assume /usr/bin is available. This was breaking the preremove script in openjade. Modified Paths: -------------- csw/mgar/pkg/sgml-xml-common/trunk/checksums csw/mgar/pkg/sgml-xml-common/trunk/files/install-catalog-sanity.patch Modified: csw/mgar/pkg/sgml-xml-common/trunk/checksums =================================================================== --- csw/mgar/pkg/sgml-xml-common/trunk/checksums 2008-12-03 19:44:48 UTC (rev 2455) +++ csw/mgar/pkg/sgml-xml-common/trunk/checksums 2008-12-04 16:56:18 UTC (rev 2456) @@ -13,7 +13,7 @@ 24ff49d6310889d0f423b35893623151 download/sgml-common-quotes.patch b51552a733ae70753b6e7ea997a4e482 download/sgml-common-umask.patch d36dcc47efa67f41d7e406386754bb67 download/sgml-common-xmldir.patch -c88f3684fc232953555393fb8e0de9e4 download/install-catalog-sanity.patch +78febdc7f5b8535ef5e90e2c94a6e804 download/install-catalog-sanity.patch b35d53333ca6dbc6cd96f0135cd4f85d download/sgmlwhich-sanity.patch 99ac766ea29643aa33236a39596d943c download/configure-man.patch 12b32f2a5ad0ab2edb70bfb83f3aecd6 download/install-catalog-man.patch Modified: csw/mgar/pkg/sgml-xml-common/trunk/files/install-catalog-sanity.patch =================================================================== --- csw/mgar/pkg/sgml-xml-common/trunk/files/install-catalog-sanity.patch 2008-12-03 19:44:48 UTC (rev 2455) +++ csw/mgar/pkg/sgml-xml-common/trunk/files/install-catalog-sanity.patch 2008-12-04 16:56:18 UTC (rev 2456) @@ -1,8 +1,11 @@ --- sgml-common-0.6.3/bin/install-catalog.in.orig 2008-11-28 19:54:27.707251610 +0100 +++ sgml-common-0.6.3/bin/install-catalog.in 2008-11-28 21:43:50.645887927 +0100 -@@ -1,4 +1,4 @@ +@@ -1,4 +1,7 @@ -#!/bin/sh +#!/opt/csw/bin/bash ++ ++# make sure we can find ggrep and gsed ++PATH=/opt/csw/bin:$PATH # Script to install a catalog in the centralized SGML catalog # Send any comments to Eric Bischoff # This program is under GPL license. See LICENSE file for details. 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 Dec 4 19:01:13 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 04 Dec 2008 18:01:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[2457] csw/mgar/pkg/sgml-xml-common/trunk Message-ID: Revision: 2457 http://gar.svn.sourceforge.net/gar/?rev=2457&view=rev Author: bdwalton Date: 2008-12-04 18:01:12 +0000 (Thu, 04 Dec 2008) Log Message: ----------- Depend on gsed. Modified Paths: -------------- csw/mgar/pkg/sgml-xml-common/trunk/checksums csw/mgar/pkg/sgml-xml-common/trunk/files/CSWsgmlcommon.depend Modified: csw/mgar/pkg/sgml-xml-common/trunk/checksums =================================================================== --- csw/mgar/pkg/sgml-xml-common/trunk/checksums 2008-12-04 16:56:18 UTC (rev 2456) +++ csw/mgar/pkg/sgml-xml-common/trunk/checksums 2008-12-04 18:01:12 UTC (rev 2457) @@ -1,7 +1,7 @@ 103c9828f24820df86e55e7862e28974 download/sgml-common-0.6.3.tgz 8344f78748603b2870f2d7f401ef49eb download/CSWsgmlcommon.gspec fc5cd6cb77e22b8a1e21d0d9f662f891 download/CSWsgmlcommon.prototype -a4bb3b3487dcd7f6c16ec4ecb799253b download/CSWsgmlcommon.depend +48a802f691734579ef4afefaad1a5423 download/CSWsgmlcommon.depend f68c56d0904b311d4d254130a63eeee6 download/CSWxmlcommon.gspec cd5928d3ad12438a4725b3469a6b98fd download/CSWxmlcommon.prototype 9ef2e183281920ecced665a3f644bace download/xml.dcl Modified: csw/mgar/pkg/sgml-xml-common/trunk/files/CSWsgmlcommon.depend =================================================================== --- csw/mgar/pkg/sgml-xml-common/trunk/files/CSWsgmlcommon.depend 2008-12-04 16:56:18 UTC (rev 2456) +++ csw/mgar/pkg/sgml-xml-common/trunk/files/CSWsgmlcommon.depend 2008-12-04 18:01:12 UTC (rev 2457) @@ -1,3 +1,5 @@ P CSWbash bash - A sh-compatible command language interpreter P CSWggrep ggrep - GNU grep +P CSWgsed gsed - The GNU non-interactive text Stream-oriented EDitor (sed) + 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 Dec 4 21:32:13 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 04 Dec 2008 20:32:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[2458] csw/mgar/pkg/openjade/trunk Message-ID: Revision: 2458 http://gar.svn.sourceforge.net/gar/?rev=2458&view=rev Author: bdwalton Date: 2008-12-04 20:32:11 +0000 (Thu, 04 Dec 2008) Log Message: ----------- Added postinstall and preremove scripts to register/unregister the sgml/xml stuff that gets installed. chroot is used to handle the case where PKG_INSTALL_ROOT is set and isn't '/'. Modified Paths: -------------- csw/mgar/pkg/openjade/trunk/Makefile csw/mgar/pkg/openjade/trunk/checksums Added Paths: ----------- csw/mgar/pkg/openjade/trunk/files/CSWopenjade.postinstall csw/mgar/pkg/openjade/trunk/files/CSWopenjade.preremove Modified: csw/mgar/pkg/openjade/trunk/Makefile =================================================================== --- csw/mgar/pkg/openjade/trunk/Makefile 2008-12-04 18:01:12 UTC (rev 2457) +++ csw/mgar/pkg/openjade/trunk/Makefile 2008-12-04 20:32:11 UTC (rev 2458) @@ -17,7 +17,7 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWopenjade,depend) +DISTFILES += $(call admfiles,CSWopenjade,depend postinstall preremove) PATCHFILES = openjade-1.3.1-nsl.patch Modified: csw/mgar/pkg/openjade/trunk/checksums =================================================================== --- csw/mgar/pkg/openjade/trunk/checksums 2008-12-04 18:01:12 UTC (rev 2457) +++ csw/mgar/pkg/openjade/trunk/checksums 2008-12-04 20:32:11 UTC (rev 2458) @@ -1,4 +1,6 @@ 7df692e3186109cc00db6825b777201e download/openjade-1.3.2.tar.gz 3bceb78eeb9bdb38e98e75c6fb20714e download/CSWopenjade.gspec ea3dd2c469bf7e8efd183f82b743c90f download/CSWopenjade.depend +a31c09c1e08da2712e87446762d9fcdc download/CSWopenjade.postinstall +b35aca62389881efb0c0ebb296d9ae14 download/CSWopenjade.preremove ca3a0ff43d8ed182f432d723927cd2e9 download/openjade-1.3.1-nsl.patch Added: csw/mgar/pkg/openjade/trunk/files/CSWopenjade.postinstall =================================================================== --- csw/mgar/pkg/openjade/trunk/files/CSWopenjade.postinstall (rev 0) +++ csw/mgar/pkg/openjade/trunk/files/CSWopenjade.postinstall 2008-12-04 20:32:11 UTC (rev 2458) @@ -0,0 +1,29 @@ +#!/bin/sh + +CONFCAT=/opt/csw/etc/sgml/openjade-1.3.2-27.soc +CATALOG=/opt/csw/share/sgml/openjade-1.3.2/catalog + +insterror() +{ + cat < Revision: 2459 http://gar.svn.sourceforge.net/gar/?rev=2459&view=rev Author: dmichelsen Date: 2008-12-05 07:39:49 +0000 (Fri, 05 Dec 2008) Log Message: ----------- mGAR v2: Merge [2428] 'new target pkglist' Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2008-12-04 20:32:11 UTC (rev 2458) +++ csw/mgar/gar/v2/gar.pkg.mk 2008-12-05 07:39:49 UTC (rev 2459) @@ -243,3 +243,22 @@ pkgenv: @$(PKG_ENV) env + +# pkglist - list the packages to be built with GAR pathname, catalog name and package name +# + +define _pkglist_pkgname +$(shell perl -F'\s+' -ane 'print "$$F[2]" if( $$F[0] eq "%var" && $$F[1] eq "pkgname")' files/$(1).gspec) +endef + +define _pkglist_catalogname +$(shell perl -F'\s+' -ane 'print "$$F[2]" if( $$F[0] eq "%var" && $$F[1] eq "bitname")' files/$(1).gspec) +endef + +define _pkglist_one +$(shell /usr/bin/echo "$(patsubst $(realpath $(shell pwd)/$(GARDIR))/%,%,$(realpath .))\t$(call _pkglist_catalogname,$(1))\t$(call _pkglist_pkgname,$(1))") +endef + +pkglist: + @echo "G: $(GARDIR) - $(shell pwd) - $(realpath $(shell pwd)/$(GARDIR)) - $(realpath .)" + @$(foreach SPEC,$(SPKG_SPECS),echo "$(call _pkglist_one,$(SPEC))";) 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 Dec 5 09:06:08 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 05 Dec 2008 08:06:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[2460] csw/mgar/pkg/jdk6/trunk Message-ID: Revision: 2460 http://gar.svn.sourceforge.net/gar/?rev=2460&view=rev Author: dmichelsen Date: 2008-12-05 08:06:08 +0000 (Fri, 05 Dec 2008) Log Message: ----------- jdk6: Unified JDK/JRE package Modified Paths: -------------- csw/mgar/pkg/jdk6/trunk/Makefile csw/mgar/pkg/jdk6/trunk/checksums Added Paths: ----------- csw/mgar/pkg/jdk6/trunk/files/CSWjdk.depend csw/mgar/pkg/jdk6/trunk/files/CSWjdk.gspec csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.depend csw/mgar/pkg/jdk6/trunk/files/CSWjre.depend csw/mgar/pkg/jdk6/trunk/files/CSWjre.gspec csw/mgar/pkg/jdk6/trunk/files/CSWjre6.gspec Modified: csw/mgar/pkg/jdk6/trunk/Makefile =================================================================== --- csw/mgar/pkg/jdk6/trunk/Makefile 2008-12-05 07:39:49 UTC (rev 2459) +++ csw/mgar/pkg/jdk6/trunk/Makefile 2008-12-05 08:06:08 UTC (rev 2460) @@ -18,15 +18,33 @@ DISTNAME = jdk$(SPKG_VERSION) DISTFILES = $(foreach S,$(SUFFIXES),jdk-$(GARVERSION)-solaris-$S.sh) NOEXTRACT = $(foreach S,$(filter-out $(SUFFIXES_$(GARCH)),$(SUFFIXES)),jdk-$(GARVERSION)-solaris-$S.sh) -DISTFILES += $(call admfiles,CSWjdk6) +DISTFILES += $(call admfiles,CSWjdk6,depend) +DISTFILES += $(call admfiles,CSWjre6) +DISTFILES += $(call admfiles,CSWjdk,depend) +DISTFILES += $(call admfiles,CSWjre,depend) -SPKG_SOURCEURL = http://java.sun.com/products/archive/ +SPKG_SOURCEURL = http://java.sun.com/javase/downloads/index.jsp +MANPAGES_JRE = java.1 javaws.1 keytool.1 orbd.1 pack200.1 policytool.1 rmid.1 rmiregistry.1 +MANPAGES_JRE += servertool.1 tnameserv.1 unpack200.1 + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = INSTALL_SCRIPTS = custom +PKGFILES_CSWjdk = $(prefix)/java/jdk/latest + +PKGFILES_CSWjre = $(prefix)/java/jre/latest +PKGFILES_CSWjre += $(prefix)/java/man + +PKGFILES_CSWjre6 = $(prefix)/java/jdk/$(DISTNAME)/jre/.* +PKGFILES_CSWjre6 += $(prefix)/java/jdk/$(DISTNAME)/man/.*/(java|javaws|keytool|orbd|pack200|policytool|rmid|rmiregistry|servertool|tnameserv|unpack200)\.1 +PKGFILES_CSWjre6 += $(prefix)/java/jre/jre$(SPKG_VERSION) +PKGFILES_CSWjre6 += $(prefix)/java/jre/jre6 + +# CSWjdk6 gets all the rest + # Tell the user to download the file manually manual//%: @echo @@ -39,21 +57,34 @@ @echo # rule to extract files with shell -shell-extract-%: +shell-extract-archive-%: @echo " ==> Extracting $(DOWNLOADDIR)/$*" @echo "yes" | (D=$(abspath $(DOWNLOADDIR)/$*); cd $(EXTRACTDIR); MORE="-10000" sh $$D) @$(MAKECOOKIE) -extract-%.sh: shell-extract-%.sh +extract-archive-%.sh: shell-extract-archive-%.sh @$(MAKECOOKIE) include gar/category.mk install-custom: @echo " ==> Installing $(GARNAME)" - @rm -rf $(DESTDIR)$(prefix)/$(DISTNAME) - @ginstall -d $(DESTDIR)$(prefix) - @(cd $(WORKDIR); pax -r -w -v $(DISTNAME) $(DESTDIR)$(prefix)) - @rm -f $(DESTDIR)$(prefix)/$(GARNAME) - @gln -sf $(DISTNAME) $(DESTDIR)$(prefix)/$(GARNAME) + + @rm -rf $(DESTDIR)$(prefix)/java + @ginstall -d $(DESTDIR)$(prefix)/java/jdk + @(cd $(WORKDIR); pax -r -w $(DISTNAME) $(DESTDIR)$(prefix)/java/jdk) + @rm -f $(DESTDIR)$(prefix)/java/jdk/latest + @gln -sf jdk6 $(DESTDIR)$(prefix)/java/jdk/latest + @rm -f $(DESTDIR)$(prefix)/java/jdk/jdk6 + @gln -sf $(DISTNAME) $(DESTDIR)$(prefix)/java/jdk/jdk6 + + @ginstall -d $(DESTDIR)$(prefix)/java/jre + @rm -f $(DESTDIR)$(prefix)/java/jre/jre$(SPKG_VERSION) + @gln -sf ../jdk/$(DISTNAME)/jre $(DESTDIR)$(prefix)/java/jre/jre$(SPKG_VERSION) + @rm -f $(DESTDIR)$(prefix)/java/jre/latest + @gln -sf jre6 $(DESTDIR)$(prefix)/java/jre/latest + @rm -f $(DESTDIR)$(prefix)/java/jre/jre6 + @gln -sf jre$(SPKG_VERSION) $(DESTDIR)$(prefix)/java/jre/jre6 + + @gln -sf ../man $(DESTDIR)$(prefix)/java/jdk/$(DISTNAME)/jre/man @$(MAKECOOKIE) Modified: csw/mgar/pkg/jdk6/trunk/checksums =================================================================== --- csw/mgar/pkg/jdk6/trunk/checksums 2008-12-05 07:39:49 UTC (rev 2459) +++ csw/mgar/pkg/jdk6/trunk/checksums 2008-12-05 08:06:08 UTC (rev 2460) @@ -3,3 +3,9 @@ e31c6cf8ada23cde243656f7ef435ce3 download/jdk-6u10-solaris-i586.sh c837fbdd49b772255a255802552c8da6 download/jdk-6u10-solaris-x64.sh d2ea0d736a7cf088ed9d452f3b1ecb1d download/CSWjdk6.gspec +a077039adebc66db2f7316e387ba13eb download/CSWjdk6.depend +d085818ed2ca9c777c85b3c9553a41f5 download/CSWjre6.gspec +8b98539f0a2211e965cc9bb2d42024f3 download/CSWjdk.gspec +e1aeb08d2dbb21e9b61598bc1dde0094 download/CSWjdk.depend +873b8c1f59485f78eb87ad67fe4c4dc4 download/CSWjre.gspec +a077039adebc66db2f7316e387ba13eb download/CSWjre.depend Added: csw/mgar/pkg/jdk6/trunk/files/CSWjdk.depend =================================================================== --- csw/mgar/pkg/jdk6/trunk/files/CSWjdk.depend (rev 0) +++ csw/mgar/pkg/jdk6/trunk/files/CSWjdk.depend 2008-12-05 08:06:08 UTC (rev 2460) @@ -0,0 +1 @@ +P CSWjdk6 jdk6 - Java Development Kit 6 Copied: csw/mgar/pkg/jdk6/trunk/files/CSWjdk.gspec (from rev 2353, csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.gspec) =================================================================== --- csw/mgar/pkg/jdk6/trunk/files/CSWjdk.gspec (rev 0) +++ csw/mgar/pkg/jdk6/trunk/files/CSWjdk.gspec 2008-12-05 08:06:08 UTC (rev 2460) @@ -0,0 +1,4 @@ +%var bitname jdk +%var pkgname CSWjdk +%include url file://%{PKGLIB}/csw_standard.gspec +%copyright url file://%{WORKSRC}/LICENSE Added: csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.depend =================================================================== --- csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.depend (rev 0) +++ csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.depend 2008-12-05 08:06:08 UTC (rev 2460) @@ -0,0 +1 @@ +P CSWjre6 jre6 - Java Runtime Environment 6 Added: csw/mgar/pkg/jdk6/trunk/files/CSWjre.depend =================================================================== --- csw/mgar/pkg/jdk6/trunk/files/CSWjre.depend (rev 0) +++ csw/mgar/pkg/jdk6/trunk/files/CSWjre.depend 2008-12-05 08:06:08 UTC (rev 2460) @@ -0,0 +1 @@ +P CSWjre6 jre6 - Java Runtime Environment 6 Copied: csw/mgar/pkg/jdk6/trunk/files/CSWjre.gspec (from rev 2353, csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.gspec) =================================================================== --- csw/mgar/pkg/jdk6/trunk/files/CSWjre.gspec (rev 0) +++ csw/mgar/pkg/jdk6/trunk/files/CSWjre.gspec 2008-12-05 08:06:08 UTC (rev 2460) @@ -0,0 +1,4 @@ +%var bitname jre +%var pkgname CSWjre +%include url file://%{PKGLIB}/csw_standard.gspec +%copyright url file://%{WORKSRC}/LICENSE Copied: csw/mgar/pkg/jdk6/trunk/files/CSWjre6.gspec (from rev 2353, csw/mgar/pkg/jre6/trunk/files/CSWjre6.gspec) =================================================================== --- csw/mgar/pkg/jdk6/trunk/files/CSWjre6.gspec (rev 0) +++ csw/mgar/pkg/jdk6/trunk/files/CSWjre6.gspec 2008-12-05 08:06:08 UTC (rev 2460) @@ -0,0 +1,4 @@ +%var bitname jre6 +%var pkgname CSWjre6 +%include url file://%{PKGLIB}/csw_standard.gspec +%copyright url file://%{WORKSRC}/LICENSE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Fri Dec 5 11:46:45 2008 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Fri, 05 Dec 2008 10:46:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[2461] csw/mgar/pkg/rrdtool/trunk Message-ID: Revision: 2461 http://gar.svn.sourceforge.net/gar/?rev=2461&view=rev Author: idogan23 Date: 2008-12-05 10:46:44 +0000 (Fri, 05 Dec 2008) Log Message: ----------- rrdtool: changed package name to CSWrrd Modified Paths: -------------- csw/mgar/pkg/rrdtool/trunk/checksums csw/mgar/pkg/rrdtool/trunk/files/CSWrrdtool.gspec Modified: csw/mgar/pkg/rrdtool/trunk/checksums =================================================================== --- csw/mgar/pkg/rrdtool/trunk/checksums 2008-12-05 08:06:08 UTC (rev 2460) +++ csw/mgar/pkg/rrdtool/trunk/checksums 2008-12-05 10:46:44 UTC (rev 2461) @@ -1,4 +1,4 @@ 7db3bffc3f3b24e828a88fe02165266f download/rrdtool-1.3.4.tar.gz -b91af3ac17057e09f6a0fdc1a3edbe86 download/CSWrrdtool.gspec +52bb91d1dad69b8911e787e9347b4e8a download/CSWrrdtool.gspec 9be46cfbb1068056b1466d79cbebbff6 download/CSWrrdtool.prototype 6d78fae545c47faa61f37b216eeeda90 download/rrd_config.diff Modified: csw/mgar/pkg/rrdtool/trunk/files/CSWrrdtool.gspec =================================================================== --- csw/mgar/pkg/rrdtool/trunk/files/CSWrrdtool.gspec 2008-12-05 08:06:08 UTC (rev 2460) +++ csw/mgar/pkg/rrdtool/trunk/files/CSWrrdtool.gspec 2008-12-05 10:46:44 UTC (rev 2461) @@ -1,4 +1,4 @@ %var bitname rrdtool -%var pkgname CSWrrdtool +%var pkgname CSWrrd %include url file://%{GARDIR}/pkglib/csw_dyndepend.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 chninkel at users.sourceforge.net Sat Dec 6 15:57:20 2008 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 06 Dec 2008 14:57:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[2462] csw/mgar/pkg/openssh/trunk Message-ID: Revision: 2462 http://gar.svn.sourceforge.net/gar/?rev=2462&view=rev Author: chninkel Date: 2008-12-06 14:57:20 +0000 (Sat, 06 Dec 2008) Log Message: ----------- openssh: added test for configuration file existence in sysV init script (Closes: #2878) Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/checksums csw/mgar/pkg/openssh/trunk/files/changelog.CSW csw/mgar/pkg/openssh/trunk/files/cswopenssh Modified: csw/mgar/pkg/openssh/trunk/checksums =================================================================== --- csw/mgar/pkg/openssh/trunk/checksums 2008-12-05 10:46:44 UTC (rev 2461) +++ csw/mgar/pkg/openssh/trunk/checksums 2008-12-06 14:57:20 UTC (rev 2462) @@ -5,9 +5,9 @@ 0993813fa5c752215f892cb67c86816f download/CSWossh.preinstall e9e93bfda8a883bca632c712d9c359f6 download/CSWossh.postinstall 25f7a58f2a19feb40811e9d7df5bca26 download/CSWossh.prototype -4c0b25ac3197b44664ce7978203a3e2d download/changelog.CSW +7614576845be17fc3ee2f6fea7b83695 download/changelog.CSW 0c7fca2f4bee3ecd489ebd85fdd8cdee download/sshd_config -c4aef2f34e6c249a06e2ef9603047652 download/cswopenssh +73416a82ca98ba40e7b86ea94d0339cf download/cswopenssh 8e23e1f856f36e8e084a9283d22a7cbf download/svc-cswopenssh 547a915f1712c35dc79dc41378001ca9 download/cswopenssh.xml dc212745af1f549ce2a236401bf97c1b download/i.conf Modified: csw/mgar/pkg/openssh/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2008-12-05 10:46:44 UTC (rev 2461) +++ csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2008-12-06 14:57:20 UTC (rev 2462) @@ -1,3 +1,10 @@ +openssh (5.1,REV=2008.12.06_rev=p1) unstable + + * Added test for configuration file existence in sysV init script + (Closes: #2878) + + -- Yann Rouillard Sat, 06 Dec 2008 15:36:48 +0100 + openssh (5.1,REV=2008.10.04_rev=p1) unstable * New upstream version. Modified: csw/mgar/pkg/openssh/trunk/files/cswopenssh =================================================================== --- csw/mgar/pkg/openssh/trunk/files/cswopenssh 2008-12-05 10:46:44 UTC (rev 2461) +++ csw/mgar/pkg/openssh/trunk/files/cswopenssh 2008-12-06 14:57:20 UTC (rev 2462) @@ -20,7 +20,7 @@ fi fi - [ -x /opt/csw/sbin/sshd ] && /opt/csw/sbin/sshd & + [ -x /opt/csw/sbin/sshd ] && [ -f /opt/csw/etc/ssh/sshd_config ] && /opt/csw/sbin/sshd & ;; 'stop') # This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Dec 6 16:03:15 2008 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 06 Dec 2008 15:03:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[2463] csw/mgar/pkg/vsftpd/trunk/Makefile Message-ID: Revision: 2463 http://gar.svn.sourceforge.net/gar/?rev=2463&view=rev Author: chninkel Date: 2008-12-06 15:03:15 +0000 (Sat, 06 Dec 2008) Log Message: ----------- vsftpd: verbose pre-install step in Makefile Modified Paths: -------------- csw/mgar/pkg/vsftpd/trunk/Makefile Modified: csw/mgar/pkg/vsftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/vsftpd/trunk/Makefile 2008-12-06 14:57:20 UTC (rev 2462) +++ csw/mgar/pkg/vsftpd/trunk/Makefile 2008-12-06 15:03:15 UTC (rev 2463) @@ -89,7 +89,8 @@ # we create the csw directory hierarchy pre-install: - @( install -d $(DESTDIR)$(sbindir); \ + @echo "Creating csw directories" + ( install -d $(DESTDIR)$(sbindir); \ install -d $(DESTDIR)$(mandir)/man5; \ install -d $(DESTDIR)$(mandir)/man8; \ ln -sf $(DESTDIR)$(mandir) $(DESTDIR)$(prefix)/man; \ 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 Dec 6 19:07:57 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 06 Dec 2008 18:07:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[2464] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 2464 http://gar.svn.sourceforge.net/gar/?rev=2464&view=rev Author: bonivart Date: 2008-12-06 18:07:57 +0000 (Sat, 06 Dec 2008) Log Message: ----------- pkgutil: updates to prepare for 1.3 Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile csw/mgar/pkg/pkgutil/trunk/checksums csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype Removed Paths: ------------- csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.copyright Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2008-12-06 15:03:15 UTC (rev 2463) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2008-12-06 18:07:57 UTC (rev 2464) @@ -1,8 +1,8 @@ GARNAME = pkgutil -GARVERSION = 1.2.1 +GARVERSION = 1.3b2 CATEGORIES = utils -DESCRIPTION = install Solaris packages the easy way +DESCRIPTION = Installs Solaris packages easily define BLURB Pkgutil, written in Perl and licensed under GPL, is a tool to make installation of packages in Solaris easier. It handles package @@ -25,28 +25,29 @@ include gar/category.mk WORKSRC = $(WORKDIR) -SPKG_SOURCEURL = http://wiki.opencsw.org/pkgutil/ -SPKG_CLASSES = none cswpkgutil +SPKG_SOURCEURL = http://pkgutil.wikidot.com/ +#SPKG_CLASSES = none cswpkgutil install-custom: @echo " ==> Installing $(GARNAME) (custom)" @rm -rf $(DESTDIR) - @ginstall -d $(DESTDIR)/etc/opt/csw +# @ginstall -d $(DESTDIR)/etc/opt/csw @ginstall -d $(DESTDIR)/opt/csw/bin @ginstall -d $(DESTDIR)/opt/csw/etc @ginstall -d $(DESTDIR)/opt/csw/libexec/pkgutil @ginstall -d $(DESTDIR)/opt/csw/share/doc/pkgutil @ginstall -d $(DESTDIR)$(mandir)/man1 - @ginstall -d $(DESTDIR)/usr/sadm/install/scripts +# @ginstall -d $(DESTDIR)/usr/sadm/install/scripts @ginstall -d $(DESTDIR)/var/opt/csw/pkgutil/packages @pod2man --section=1 $(WORKSRC)/$(GARNAME) > $(DESTDIR)$(mandir)/man1/pkgutil.1 - @cp -r $(WORKSRC)/$(GARNAME).conf $(DESTDIR)/etc/opt/csw/$(GARNAME).conf.CSW -# @cp -r $(WORKSRC)/$(GARNAME).conf $(DESTDIR)/opt/csw/etc/$(GARNAME).conf.CSW +# @cp -r $(WORKSRC)/$(GARNAME).conf $(DESTDIR)/etc/opt/csw/$(GARNAME).conf.CSW + @cp -r $(WORKSRC)/$(GARNAME).conf $(DESTDIR)/opt/csw/etc/$(GARNAME).conf.CSW @cp -r $(WORKSRC)/$(GARNAME) $(DESTDIR)/opt/csw/bin/ @cp -r $(WORKSRC)/bldcat $(DESTDIR)/opt/csw/bin/ @cp -r $(WORKSRC)/chkcat $(DESTDIR)/opt/csw/bin/ @cp -r $(WORKSRC)/readme $(DESTDIR)/opt/csw/share/doc/pkgutil/ - @cp -r $(FILEDIR)/CSWpkgutil.copyright $(DESTDIR)/opt/csw/share/doc/pkgutil/LICENSE +# @cp -r $(FILEDIR)/CSWpkgutil.copyright $(DESTDIR)/opt/csw/share/doc/pkgutil/LICENSE + @cp -r $(WORKSRC)/copyright $(DESTDIR)$(docdir)/pkgutil/LICENSE # @cp -r $(FILEDIR)/CSWpkgutil.i.cswpkgutil $(DESTDIR)/usr/sadm/install/scripts/i.cswpkgutil # @cp -r $(FILEDIR)/CSWpkgutil.r.cswpkgutil $(DESTDIR)/usr/sadm/install/scripts/r.cswpkgutil @cp -r $(WORKSRC)/admin $(DESTDIR)/var/opt/csw/pkgutil/admin.CSW Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2008-12-06 15:03:15 UTC (rev 2463) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2008-12-06 18:07:57 UTC (rev 2464) @@ -1,5 +1,5 @@ -0a6b4b39688a67617ffa39eb4ec2e8d0 download/pkgutil-1.2.1.zip +3973b2172d45390dc9884f83109671a8 download/pkgutil-1.3b2.zip 805cd30ad9f21cb1167d166fa99b5891 download/CSWpkgutil.gspec -0633b5672d89536454f92b8e8c40eabf download/CSWpkgutil.prototype +2f561d7f40289fac9bd02d2504b73693 download/CSWpkgutil.prototype bea1e5ef39a8389b9feaa18938993205 download/CSWpkgutil.postinstall 5b83368c47fc309a69a1a5020d55385b download/CSWpkgutil.preremove Deleted: csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.copyright =================================================================== --- csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.copyright 2008-12-06 15:03:15 UTC (rev 2463) +++ csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.copyright 2008-12-06 18:07:57 UTC (rev 2464) @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU 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. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), 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 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 show them these terms so they know 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. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - 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 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 derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 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 License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -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. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary 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 - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 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 Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing 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 for copying, distributing or modifying -the Program or works based on it. - - 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. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. 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 this 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 -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. 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 - - 11. 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. - - 12. 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 - - 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 the public, 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 2 of the License, 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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) 19yy 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 is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. Modified: csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype =================================================================== --- csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype 2008-12-06 15:03:15 UTC (rev 2463) +++ csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype 2008-12-06 18:07:57 UTC (rev 2464) @@ -2,13 +2,13 @@ i copyright=CSWpkgutil.copyright i postinstall=CSWpkgutil.postinstall i preremove=CSWpkgutil.preremove -d none /etc/opt/csw 0755 root bin -f none /etc/opt/csw/pkgutil.conf.CSW 644 root bin d none /opt/csw 0755 root bin d none /opt/csw/bin 0755 root bin f none /opt/csw/bin/pkgutil 755 root bin f none /opt/csw/bin/bldcat 755 root bin f none /opt/csw/bin/chkcat 755 root bin +d none /opt/csw/etc 0755 root bin +f none /opt/csw/etc/pkgutil.conf.CSW 644 root bin d none /opt/csw/libexec 0755 root bin d none /opt/csw/libexec/pkgutil 0755 root bin f none /opt/csw/libexec/pkgutil/wget 755 root bin 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 Dec 7 02:29:43 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 07 Dec 2008 01:29:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[2465] csw/mgar/pkg Message-ID: Revision: 2465 http://gar.svn.sourceforge.net/gar/?rev=2465&view=rev Author: bonivart Date: 2008-12-07 01:29:43 +0000 (Sun, 07 Dec 2008) Log Message: ----------- clamav: initial commit Added Paths: ----------- csw/mgar/pkg/clamav/ csw/mgar/pkg/clamav/branches/ csw/mgar/pkg/clamav/tags/ csw/mgar/pkg/clamav/trunk/ csw/mgar/pkg/clamav/trunk/Makefile csw/mgar/pkg/clamav/trunk/checksums csw/mgar/pkg/clamav/trunk/files/ csw/mgar/pkg/clamav/trunk/files/CSWclamav.copyright csw/mgar/pkg/clamav/trunk/files/CSWclamav.gspec csw/mgar/pkg/clamav/trunk/files/CSWlibclamav.copyright csw/mgar/pkg/clamav/trunk/files/CSWlibclamav.gspec Property changes on: csw/mgar/pkg/clamav/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 Added: csw/mgar/pkg/clamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamav/trunk/Makefile (rev 0) +++ csw/mgar/pkg/clamav/trunk/Makefile 2008-12-07 01:29:43 UTC (rev 2465) @@ -0,0 +1,41 @@ +GARNAME = clamav +GARVERSION = 0.94.2 +CATEGORIES = apps + +DESCRIPTION = Clam AntiVirus +define BLURB + Clam AntiVirus is an open source (GPL) anti-virus toolkit for UNIX, designed + especially for e-mail scanning on mail gateways. It provides a number of + utilities including a flexible and scalable multi-threaded daemon, a command + line scanner and advanced tool for automatic database updates. The core of + the package is an anti-virus engine available in a form of shared library. +endef + +MASTER_SITES = http://freshmeat.net/redir/clamav/29355/url_tgz/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWclamav,) +#DISTFILES += $(call admfiles,CSWlibclamav,) + +GARCOMPILER = GNU +GNU_CC_HOME = /opt/csw/gcc3 + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-user=nobody +CONFIGURE_ARGS += --with-group=nobody +CONFIGURE_ARGS += --enable-milter +CONFIGURE_ARGS += --with-sendmail=/opt/csw/lib/sendmail +CONFIGURE_ARGS += --with-dbdir=/var/opt/csw/$(GARNAME)/db +CONFIGURE_ARGS += --localstatedir=/var/opt/csw/$(GARNAME) + +include gar/category.mk + +pre-package: + @echo " ==> Pre-package for $(GARNAME)" + @find $(DESTDIR) -type f -name "*~" -exec rm {} \; + @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 644 $(WORKSRC)/AUTHORS $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 644 $(WORKSRC)/COPYING $(DESTDIR)$(docdir)/$(GARNAME)/LICENSE + @ginstall -m 644 $(WORKSRC)/FAQ $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 644 $(WORKSRC)/NEWS $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 644 $(WORKSRC)/README $(DESTDIR)$(docdir)/$(GARNAME) + @$(MAKECOOKIE) Added: csw/mgar/pkg/clamav/trunk/checksums =================================================================== --- csw/mgar/pkg/clamav/trunk/checksums (rev 0) +++ csw/mgar/pkg/clamav/trunk/checksums 2008-12-07 01:29:43 UTC (rev 2465) @@ -0,0 +1,2 @@ +1181e6d62341b84708f126cc353f7ebf download/clamav-0.94.2.tar.gz +df9572dc44907a1ceff3561f9b834e20 download/CSWclamav.gspec Added: csw/mgar/pkg/clamav/trunk/files/CSWclamav.copyright =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWclamav.copyright (rev 0) +++ csw/mgar/pkg/clamav/trunk/files/CSWclamav.copyright 2008-12-07 01:29:43 UTC (rev 2465) @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU 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. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), 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 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 show them these terms so they know 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. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + 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 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 derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 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 License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +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. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary 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 + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 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 Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing 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 for copying, distributing or modifying +the Program or works based on it. + + 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. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. 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 this 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 +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. 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 + + 11. 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. + + 12. 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 + + 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 the public, 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 2 of the License, 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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) 19yy 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 is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. Added: csw/mgar/pkg/clamav/trunk/files/CSWclamav.gspec =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWclamav.gspec (rev 0) +++ csw/mgar/pkg/clamav/trunk/files/CSWclamav.gspec 2008-12-07 01:29:43 UTC (rev 2465) @@ -0,0 +1,7 @@ +%var bitname clamav +%var pkgname CSWclamav +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/clamav/copyright for license information. + Added: csw/mgar/pkg/clamav/trunk/files/CSWlibclamav.copyright =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWlibclamav.copyright (rev 0) +++ csw/mgar/pkg/clamav/trunk/files/CSWlibclamav.copyright 2008-12-07 01:29:43 UTC (rev 2465) @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU 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. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), 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 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 show them these terms so they know 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. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + 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 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 derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 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 License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +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. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary 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 + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 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 Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing 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 for copying, distributing or modifying +the Program or works based on it. + + 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. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. 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 this 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 +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. 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 + + 11. 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. + + 12. 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 + + 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 the public, 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 2 of the License, 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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) 19yy 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 is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. Added: csw/mgar/pkg/clamav/trunk/files/CSWlibclamav.gspec =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWlibclamav.gspec (rev 0) +++ csw/mgar/pkg/clamav/trunk/files/CSWlibclamav.gspec 2008-12-07 01:29:43 UTC (rev 2465) @@ -0,0 +1,7 @@ +%var bitname libclamav +%var pkgname CSWlibclamav +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/libclamav/copyright for license information. + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Sun Dec 7 13:03:14 2008 From: dam at opencsw.org (Dagobert Michelsen) Date: Sun, 7 Dec 2008 13:03:14 +0100 Subject: [csw-devel] libtool reordering runpath and LD_OPTIONS Message-ID: <627731CF-D4B6-4319-9B92-63BBD440C4D7@opencsw.org> Hi, I'm still working on automated 32/64 bit builds and still encounter new strange things. This time I have an issue with libtool. This command is issues during make when comiling libvorbis/trunk/work/build-isa-amd64/libvorbis-1.2.0/examples opencsw# /bin/bash ../libtool --tag=CC --mode=link /opt/studio/SOS11/ SUNWspro/bin/cc -O -xO3 -xarch=amd64 -I/opt/csw/include - DUSE_MEMORY_H -xarch=amd64 -L/opt/csw/lib/64 -R/opt/csw/lib/\\\ $ISALIST -R/opt/csw/lib/64 -o seeking_example seeking_example.o ../lib/ libvorbisfile.la ../lib/libvorbis.la This looks good, but libtool reorders the runpath: /opt/studio/SOS11/SUNWspro/bin/cc -O -xO3 -xarch=amd64 -I/opt/csw/ include -DUSE_MEMORY_H -xarch=amd64 -o .libs/seeking_example seeking_example.o -L/opt/csw/lib/64 ../lib/.libs/libvorbisfile.so / root/mgar/pkg/libvorbis/trunk/work/build-isa-amd64/libvorbis-1.2.0/ lib/.libs/libvorbis.so ../lib/.libs/libvorbis.so /opt/csw/lib/64/ libogg.so -lm -R/opt/csw/lib/64 -R/opt/csw/lib/\$ISALIST ld: warning: file ../lib/.libs/libvorbis.so: linked to /root/mgar/pkg/ libvorbis/trunk/work/build-isa-amd64/libvorbis-1.2.0/lib/.libs/ libvorbis.so: attempted multiple inclusion of file creating seeking_example Putting -R/opt/csw/lib/64 before $ISALIST is pretty pointless as $ISALIST then never will be used as the library is found earlier. Debugging the libtool-shellscript, umh, does not reveal any secrets. It looks like libtool assembles the runpath dynamically from all runpathes from libraries the to be linked lib depends on and than reorders it somehow. If I use LD_OPTIONS I can get it to work, but I understood from the past discussions that LD_OPTIONS is a Bad Thing(tm). Any libtool experts around who can enlighten me how to do this right? Best regards -- Dago From bonivart at users.sourceforge.net Sun Dec 7 13:47:24 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 07 Dec 2008 12:47:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[2466] csw/mgar/pkg/clamav/trunk Message-ID: Revision: 2466 http://gar.svn.sourceforge.net/gar/?rev=2466&view=rev Author: bonivart Date: 2008-12-07 12:47:24 +0000 (Sun, 07 Dec 2008) Log Message: ----------- clamav: more stuff added Modified Paths: -------------- csw/mgar/pkg/clamav/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/clamav/trunk/files/CSWclamav.copyright csw/mgar/pkg/clamav/trunk/files/CSWlibclamav.copyright Modified: csw/mgar/pkg/clamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamav/trunk/Makefile 2008-12-07 01:29:43 UTC (rev 2465) +++ csw/mgar/pkg/clamav/trunk/Makefile 2008-12-07 12:47:24 UTC (rev 2466) @@ -1,3 +1,17 @@ +# add re for update notification +# split into multiple packages: clamav, libclamav +# put libs in lib/32? +# add depend files +# add rc/smf support +# add pre/post scripts +# add etc/clamav-milter +# add etc/clamd? +# add doc/README.CSW, INSTALL.clamav-milter.CSW +# check mantis bugs +# + add contrib +# + add html docs and some pdf:s +# + remove *.a, *.la from libs + GARNAME = clamav GARVERSION = 0.94.2 CATEGORIES = apps @@ -29,13 +43,31 @@ include gar/category.mk +SPKG_SOURCEURL = http://www.clamav.net/ + pre-package: - @echo " ==> Pre-package for $(GARNAME)" + @echo " ==> Pre-package for $(GARNAME)" @find $(DESTDIR) -type f -name "*~" -exec rm {} \; - @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) + @find $(DESTDIR)/opt/csw/lib -type f -name "*.a" -exec rm {} \; + @find $(DESTDIR)/opt/csw/lib -type f -name "*.la" -exec rm {} \; + @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME)/html + @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME)/contrib @ginstall -m 644 $(WORKSRC)/AUTHORS $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 644 $(WORKSRC)/BUGS $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 644 $(WORKSRC)/ChangeLog $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 644 $(WORKSRC)/docs/clamav-mirror-howto.pdf $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 644 $(WORKSRC)/docs/clamdoc.pdf $(DESTDIR)$(docdir)/$(GARNAME) @ginstall -m 644 $(WORKSRC)/COPYING $(DESTDIR)$(docdir)/$(GARNAME)/LICENSE @ginstall -m 644 $(WORKSRC)/FAQ $(DESTDIR)$(docdir)/$(GARNAME) @ginstall -m 644 $(WORKSRC)/NEWS $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 644 $(WORKSRC)/docs/phishsigs_howto.pdf $(DESTDIR)$(docdir)/$(GARNAME) @ginstall -m 644 $(WORKSRC)/README $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 644 $(WORKSRC)/docs/signatures.pdf $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 644 $(WORKSRC)/UPGRADE $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 644 $(WORKSRC)/contrib/clamdwatch/* $(DESTDIR)$(docdir)/$(GARNAME)/contrib + @ginstall -m 644 $(WORKSRC)/contrib/init/Solaris10/* $(DESTDIR)$(docdir)/$(GARNAME)/contrib + @ginstall -m 644 $(WORKSRC)/contrib/cleanup-partial.pl $(DESTDIR)$(docdir)/$(GARNAME)/contrib + @for file in $(WORKSRC)/docs/html/*; do \ + cp $$file $(DESTDIR)$(docdir)/$(GARNAME)/html ; \ + done @$(MAKECOOKIE) Deleted: csw/mgar/pkg/clamav/trunk/files/CSWclamav.copyright =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWclamav.copyright 2008-12-07 01:29:43 UTC (rev 2465) +++ csw/mgar/pkg/clamav/trunk/files/CSWclamav.copyright 2008-12-07 12:47:24 UTC (rev 2466) @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU 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. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), 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 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 show them these terms so they know 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. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - 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 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 derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 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 License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -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. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary 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 - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 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 Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing 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 for copying, distributing or modifying -the Program or works based on it. - - 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. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. 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 this 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 -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. 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 - - 11. 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. - - 12. 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 - - 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 the public, 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 2 of the License, 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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) 19yy 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 is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. Deleted: csw/mgar/pkg/clamav/trunk/files/CSWlibclamav.copyright =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWlibclamav.copyright 2008-12-07 01:29:43 UTC (rev 2465) +++ csw/mgar/pkg/clamav/trunk/files/CSWlibclamav.copyright 2008-12-07 12:47:24 UTC (rev 2466) @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU 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. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), 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 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 show them these terms so they know 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. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - 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 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 derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 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 License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -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. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary 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 - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 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 Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing 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 for copying, distributing or modifying -the Program or works based on it. - - 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. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. 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 this 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 -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. 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 - - 11. 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. - - 12. 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 - - 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 the public, 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 2 of the License, 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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) 19yy 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 is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. 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 Dec 7 14:33:01 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 07 Dec 2008 13:33:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[2467] csw/mgar/pkg/clamav/trunk Message-ID: Revision: 2467 http://gar.svn.sourceforge.net/gar/?rev=2467&view=rev Author: bonivart Date: 2008-12-07 13:33:00 +0000 (Sun, 07 Dec 2008) Log Message: ----------- clamav: multiple packages Modified Paths: -------------- csw/mgar/pkg/clamav/trunk/Makefile csw/mgar/pkg/clamav/trunk/checksums Modified: csw/mgar/pkg/clamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamav/trunk/Makefile 2008-12-07 12:47:24 UTC (rev 2466) +++ csw/mgar/pkg/clamav/trunk/Makefile 2008-12-07 13:33:00 UTC (rev 2467) @@ -1,5 +1,6 @@ -# add re for update notification -# split into multiple packages: clamav, libclamav +# clamav, Peter Bonivart +# files outside /opt/csw are not included, need to fix gspec and cswproto +# split into multiple packages: clamav, libclamav, clamavdb? # put libs in lib/32? # add depend files # add rc/smf support @@ -8,6 +9,7 @@ # add etc/clamd? # add doc/README.CSW, INSTALL.clamav-milter.CSW # check mantis bugs +# + add re for update notification # + add contrib # + add html docs and some pdf:s # + remove *.a, *.la from libs @@ -27,9 +29,12 @@ MASTER_SITES = http://freshmeat.net/redir/clamav/29355/url_tgz/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWlibclamav,) DISTFILES += $(call admfiles,CSWclamav,) -#DISTFILES += $(call admfiles,CSWlibclamav,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + GARCOMPILER = GNU GNU_CC_HOME = /opt/csw/gcc3 @@ -43,6 +48,9 @@ include gar/category.mk +PKGFILE_CSWlibclamav_EXCLUSIVE = $(libdir)/.* +PKGFILE_CSWlibclamav_EXCLUSIVE += $(includedir)/.* + SPKG_SOURCEURL = http://www.clamav.net/ pre-package: Modified: csw/mgar/pkg/clamav/trunk/checksums =================================================================== --- csw/mgar/pkg/clamav/trunk/checksums 2008-12-07 12:47:24 UTC (rev 2466) +++ csw/mgar/pkg/clamav/trunk/checksums 2008-12-07 13:33:00 UTC (rev 2467) @@ -1,2 +1,3 @@ 1181e6d62341b84708f126cc353f7ebf download/clamav-0.94.2.tar.gz df9572dc44907a1ceff3561f9b834e20 download/CSWclamav.gspec +6edc8660bde0b27d3676699eacb51884 download/CSWlibclamav.gspec This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Dec 7 16:36:30 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 07 Dec 2008 15:36:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[2468] csw/mgar/pkg/libxml2/trunk/Makefile Message-ID: Revision: 2468 http://gar.svn.sourceforge.net/gar/?rev=2468&view=rev Author: dmichelsen Date: 2008-12-07 15:36:30 +0000 (Sun, 07 Dec 2008) Log Message: ----------- libxml2: Fix PKGFILES for new mGAR v2 syntax Modified Paths: -------------- csw/mgar/pkg/libxml2/trunk/Makefile Modified: csw/mgar/pkg/libxml2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxml2/trunk/Makefile 2008-12-07 13:33:00 UTC (rev 2467) +++ csw/mgar/pkg/libxml2/trunk/Makefile 2008-12-07 15:36:30 UTC (rev 2468) @@ -27,14 +27,14 @@ NO_ISAEXEC = 1 MERGE_EXCLUDE_FILES = .*\.la -PKGFILES_CSWlibxml2devel_EXCLUSIVE = $(PKGFILES_DEVEL) -PKGFILES_CSWlibxml2devel_EXCLUSIVE += $(docdir)/libxml2-$(GARVERSION)/.* -PKGFILES_CSWlibxml2devel_EXCLUSIVE += $(sharedstatedir)/gtk-doc/.* -PKGFILES_CSWlibxml2devel_EXCLUSIVE += $(libdir)/xml2Conf.sh -PKGFILES_CSWlibxml2devel_EXCLUSIVE += $(call isadirs,$(libdir),xml2Conf.sh) +PKGFILES_CSWlibxml2devel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibxml2devel += $(docdir)/libxml2-$(GARVERSION)/.* +PKGFILES_CSWlibxml2devel += $(sharedstatedir)/gtk-doc/.* +PKGFILES_CSWlibxml2devel += $(libdir)/xml2Conf.sh +PKGFILES_CSWlibxml2devel += $(call isadirs,$(libdir),xml2Conf.sh) -PKGFILES_CSWpylibxml2_EXCLUSIVE = $(libdir)/python/.* -PKGFILES_CSWpylibxml2_EXCLUSIVE += $(docdir)/libxml2-python-$(GARVERSION)/.* +PKGFILES_CSWpylibxml2 = $(libdir)/python/.* +PKGFILES_CSWpylibxml2 += $(docdir)/libxml2-python-$(GARVERSION)/.* 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 Sun Dec 7 17:11:54 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 07 Dec 2008 16:11:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[2469] csw/mgar/pkg/jdk6/trunk Message-ID: Revision: 2469 http://gar.svn.sourceforge.net/gar/?rev=2469&view=rev Author: dmichelsen Date: 2008-12-07 16:11:54 +0000 (Sun, 07 Dec 2008) Log Message: ----------- jdk6: Update to u11 Modified Paths: -------------- csw/mgar/pkg/jdk6/trunk/Makefile csw/mgar/pkg/jdk6/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/jdk6/trunk/ Property changes on: csw/mgar/pkg/jdk6/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/jdk6/trunk/Makefile =================================================================== --- csw/mgar/pkg/jdk6/trunk/Makefile 2008-12-07 15:36:30 UTC (rev 2468) +++ csw/mgar/pkg/jdk6/trunk/Makefile 2008-12-07 16:11:54 UTC (rev 2469) @@ -1,6 +1,6 @@ GARNAME = jdk6 -SPKG_VERSION = 1.6.0_10 -GARVERSION = 6u10 +SPKG_VERSION = 1.6.0_11 +GARVERSION = 6u11 CATEGORIES = lang DESCRIPTION = Java Development Kit 6 Modified: csw/mgar/pkg/jdk6/trunk/checksums =================================================================== --- csw/mgar/pkg/jdk6/trunk/checksums 2008-12-07 15:36:30 UTC (rev 2468) +++ csw/mgar/pkg/jdk6/trunk/checksums 2008-12-07 16:11:54 UTC (rev 2469) @@ -1,7 +1,7 @@ -ae351518b83f44f0a947dd0d7be96e15 download/jdk-6u10-solaris-sparc.sh -d1841c956f43bb3a7bf53d7721d82833 download/jdk-6u10-solaris-sparcv9.sh -e31c6cf8ada23cde243656f7ef435ce3 download/jdk-6u10-solaris-i586.sh -c837fbdd49b772255a255802552c8da6 download/jdk-6u10-solaris-x64.sh +ab4534bfca054a3fffebc384390ad54a download/jdk-6u11-solaris-sparc.sh +2f5b20118c85533854720ebbfb428758 download/jdk-6u11-solaris-sparcv9.sh +e460101ca2d718b98a65c432753e9684 download/jdk-6u11-solaris-i586.sh +c103e6c5d4d42a8ab162804a7b01c3c2 download/jdk-6u11-solaris-x64.sh d2ea0d736a7cf088ed9d452f3b1ecb1d download/CSWjdk6.gspec a077039adebc66db2f7316e387ba13eb download/CSWjdk6.depend d085818ed2ca9c777c85b3c9553a41f5 download/CSWjre6.gspec This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Dec 7 17:35:37 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 07 Dec 2008 16:35:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[2470] csw/mgar/pkg/libogg/trunk Message-ID: Revision: 2470 http://gar.svn.sourceforge.net/gar/?rev=2470&view=rev Author: dmichelsen Date: 2008-12-07 16:35:37 +0000 (Sun, 07 Dec 2008) Log Message: ----------- libogg: Update to mGAR v2 Modified Paths: -------------- csw/mgar/pkg/libogg/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/libogg/trunk/ Property changes on: csw/mgar/pkg/libogg/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/libogg/trunk/Makefile =================================================================== --- csw/mgar/pkg/libogg/trunk/Makefile 2008-12-07 16:11:54 UTC (rev 2469) +++ csw/mgar/pkg/libogg/trunk/Makefile 2008-12-07 16:35:37 UTC (rev 2470) @@ -15,8 +15,11 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +BUILD64 = 1 + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check +SKIPTEST = 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 Sun Dec 7 17:45:33 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 07 Dec 2008 16:45:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[2471] csw/mgar/gar/v2 Message-ID: Revision: 2471 http://gar.svn.sourceforge.net/gar/?rev=2471&view=rev Author: dmichelsen Date: 2008-12-07 16:45:33 +0000 (Sun, 07 Dec 2008) Log Message: ----------- mGAR v2: Adjust ISA installation pathes and other fixes Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk csw/mgar/gar/v2/gar.mk csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2008-12-07 16:35:37 UTC (rev 2470) +++ csw/mgar/gar/v2/gar.conf.mk 2008-12-07 16:45:33 UTC (rev 2471) @@ -17,7 +17,6 @@ DOWNLOADDIR ?= download PARTIALDIR ?= $(DOWNLOADDIR)/partial WORKROOTDIR ?= work -#WORKDIR ?= $(WORKROOTDIR)/build-$(ISA) WORKDIR ?= $(WORKROOTDIR)/build-$(MODULATION) COOKIEROOTDIR ?= cookies COOKIEDIR ?= $(COOKIEROOTDIR)/$(MODULATION) @@ -31,8 +30,8 @@ LOGDIR ?= log # Outbound proxies -http_proxy ?= http://svn:8080 -ftp_proxy ?= http://svn:8080 +http_proxy ?= +ftp_proxy ?= export http_proxy ftp_proxy # Don't do full-dependency builds by default @@ -41,10 +40,10 @@ # A directory containing cached files. It can be created # manually, or with 'make garchive' once you've started # downloading required files (say with 'make paranoid-checksum'. -GARCHIVEDIR ?= /export/medusa/src +GARCHIVEDIR ?= /home/src # Space separated list of paths to search for DISTFILES. -GARCHIVEPATH ?= /export/medusa/src +GARCHIVEPATH ?= $(GARCHIVEDIR) # Select compiler # GARCOMPILER can be either GNU/SUN which selects the default @@ -78,30 +77,34 @@ # These are the standard directory name variables from all GNU # makefiles. They're also used by autoconf, and can be adapted # for a variety of build systems. -BUILD_PREFIX ?= /opt/csw +BUILD_PREFIX ?= /opt/csw -prefix ?= $(BUILD_PREFIX) -exec_prefix ?= $(prefix) -bindir ?= $(exec_prefix)/bin -gnudir ?= $(exec_prefix)/gnu -sbindir ?= $(exec_prefix)/sbin -libexecdir ?= $(exec_prefix)/libexec -datadir ?= $(prefix)/share -sysconfdir ?= $(prefix)/etc -sharedstatedir ?= $(prefix)/share -localstatedir ?= $(prefix)/var -libdir ?= $(exec_prefix)/lib -infodir ?= $(sharedstatedir)/info -lispdir ?= $(sharedstatedir)/emacs/site-lisp -includedir ?= $(prefix)/include -mandir ?= $(sharedstatedir)/man -docdir ?= $(sharedstatedir)/doc -sourcedir ?= $(prefix)/src -licensedir ?= $(prefix)/licenses -sharedperl ?= $(sharedstatedir)/perl -perllib ?= $(libdir)/perl -perlcswlib ?= $(perllib)/csw -perlpackroot ?= $(perlcswlib)/auto +prefix ?= $(BUILD_PREFIX) +exec_prefix ?= $(prefix) +bindir_install ?= $(exec_prefix)/bin +bindir ?= $(abspath $(bindir_install)/$(MM_BINDIR)) +gnudir ?= $(exec_prefix)/gnu +sbindir_install ?= $(exec_prefix)/sbin +sbindir ?= $(abspath $(sbindir_install)/$(MM_BINDIR)) +libexecdir_install ?= $(exec_prefix)/libexec +libexecdir ?= $(abspath $(libexecdir_install)/$(MM_BINDIR)) +datadir ?= $(prefix)/share +sysconfdir ?= $(prefix)/etc +sharedstatedir ?= $(prefix)/share +localstatedir ?= $(prefix)/var +libdir_install ?= $(exec_prefix)/lib +libdir ?= $(abspath $(libdir_install)/$(MM_LIBDIR)) +infodir ?= $(sharedstatedir)/info +lispdir ?= $(sharedstatedir)/emacs/site-lisp +includedir ?= $(prefix)/include +mandir ?= $(sharedstatedir)/man +docdir ?= $(sharedstatedir)/doc +sourcedir ?= $(prefix)/src +licensedir ?= $(prefix)/licenses +sharedperl ?= $(sharedstatedir)/perl +perllib ?= $(libdir)/perl +perlcswlib ?= $(perllib)/csw +perlpackroot ?= $(perlcswlib)/auto # DESTDIR is used at INSTALL TIME ONLY to determine what the # filesystem root should be. @@ -415,14 +418,16 @@ # the links 32 and 64. ifeq ($(origin LINKER_FLAGS), undefined) ifdef NOISALIST -LINKER_FLAGS = $(foreach ELIB,$(libdir) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR)) -R$(abspath $(ELIB)/$(MM_LIBDIR)) +LINKER_FLAGS = $(foreach ELIB,$(libdir_install) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR)) -R$(abspath $(ELIB)/$(MM_LIBDIR)) else # If we use $ISALIST it is a good idea to also add $MM_LIBDIR as there # may not be a subdirectory for the 32-bit standard case (this would normally # be a symlink of the form lib/sparcv8 -> . and lib/i386 -> .). This is most likely # the case for libraries in $(EXTRA_LIBS) for which no links generated in CSWcommon. -LINKER_FLAGS = $(foreach ELIB,$(libdir) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR)) -R$(ELIB)/\\\\\\\$$\$$ISALIST -R$(abspath $(ELIB)/$(MM_LIBDIR))) -#LINKER_FLAGS = $(foreach ELIB,$(libdir) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR)) -R'$(abspath $(ELIB)/\$$ISALIST)' -R$(abspath $(ELIB)/$(MM_LIBDIR))) +# The quoting of $ISALIST is unfortunately dependend on how often the linker flags +# are expanded until execution. The definition here is suitable for autotools. +# For other buildtools it may be suitable to add definitions with other quotings. +LINKER_FLAGS = $(foreach ELIB,$(libdir_install) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR)) -R$(ELIB)/\\\\\\\$$\$$ISALIST -R$(abspath $(ELIB)/$(MM_LIBDIR))) endif endif @@ -454,12 +459,11 @@ # 1. Make sure everything works fine for SOS12 # 2. Allow us to use programs we just built. This is a bit complicated, # but we want PATH to be a recursive variable, or 'gmake isaenv' won't work -PATH = $(if $(filter SOS12,$(GARCOMPILER)),$(abspath $(GARBIN)/sos12-wrappers):)$(if $(IGNORE_DESTDIR),,$(abspath $(DESTDIR)$(bindir)/$(MM_BINDIR)):$(DESTDIR)$(bindir):$(abspath $(DESTDIR)$(sbindir)/$(MM_BINDIR)):$(DESTDIR)$(sbindir):)$(abspath $(bindir)/$(MM_BINDIR)):$(bindir):$(abspath $(sbindir)/$(MM_BINDIR)):$(sbindir):$(CC_HOME)/bin:$(abspath $(GARBIN)):/usr/bin:/usr/sbin:/usr/java/bin:/usr/ccs/bin +PATH = $(if $(filter SOS12,$(GARCOMPILER)),$(abspath $(GARBIN)/sos12-wrappers):)$(if $(IGNORE_DESTDIR),,$(abspath $(DESTDIR)$(bindir_install)/$(MM_BINDIR)):$(DESTDIR)$(bindir_install):$(abspath $(DESTDIR)$(sbindir_install)/$(MM_BINDIR)):$(DESTDIR)$(sbindir_install):)$(abspath $(bindir_install)/$(MM_BINDIR)):$(bindir_install):$(abspath $(sbindir_install)/$(MM_BINDIR)):$(sbindir_install):$(CC_HOME)/bin:$(abspath $(GARBIN)):/usr/bin:/usr/sbin:/usr/java/bin:/usr/ccs/bin # This is for foo-config chaos -#PKG_CONFIG_PATH := $(abspath $(libdir)/$(MM_LIBDIR)/pkgconfig):$(libdir)/pkgconfig:$(PKG_CONFIG_PATH) -PKG_CONFIG_DIRS ?= $(libdir) $(EXTRA_PKG_CONFIG_DIRS) -PKG_CONFIG_PATH ?= $(foreach D,$(PKG_CONFIG_DIRS),$(abspath $D/$(MM_LIBDIR)/pkgconfig)) +PKG_CONFIG_DIRS ?= $(libdir_install) $(EXTRA_PKG_CONFIG_DIRS) +PKG_CONFIG_PATH ?= $(call MAKEPATH,$(foreach D,$(PKG_CONFIG_DIRS),$(abspath $D/$(MM_LIBDIR)/pkgconfig)) $(EXTRA_PKGCONFIG_PATH)) # # Mirror Sites @@ -521,6 +525,9 @@ COMMON_EXPORTS ?= $(DIRECTORY_EXPORTS) $(COMPILER_EXPORTS) $(GARPKG_EXPORTS) $(EXTRA_COMMON_EXPORTS) +# LD_OPTIONS = $(LINKER_FLAGS) +# COMMON_EXPORTS += LD_OPTIONS + CONFIGURE_EXPORTS ?= $(COMMON_EXPORTS) $(EXTRA_CONFIGURE_EXPORTS) PKG_CONFIG_PATH DESTDIR BUILD_EXPORTS ?= $(COMMON_EXPORTS) $(EXTRA_BUILD_EXPORTS) TEST_EXPORTS ?= $(COMMON_EXPORTS) $(EXTRA_TEST_EXPORTS) @@ -531,6 +538,7 @@ TEST_ENV ?= $(foreach TTT,$(TEST_EXPORTS),$(TTT)="$($(TTT))") INSTALL_ENV ?= $(foreach TTT,$(INSTALL_EXPORTS),$(TTT)="$($(TTT))") + # Standard Scripts CONFIGURE_SCRIPTS ?= $(WORKSRC)/configure BUILD_CHECK_SCRIPTS ?= modulated-check @@ -544,7 +552,8 @@ INSTALL_SCRIPTS ?= $(WORKSRC)/Makefile # Global environment -export PATH PKG_CONFIG_PATH +#export PATH PKG_CONFIG_PATH +export PATH # prepend the local file listing FILE_SITES = $(foreach DIR,$(FILEDIR) $(GARCHIVEPATH),file://$(DIR)/) @@ -599,11 +608,11 @@ _isaenv: @echo; \ echo "* ISA $(ISA)"; \ - echo " PATH = $(PATH)"; \ - echo " CFLAGS = $(CFLAGS)"; \ - echo " CXXFLAGS = $(CXXFLAGS)"; \ - echo " CPPFLAGS = $(CPPFLAGS)"; \ - echo " LDFLAGS = $(LDFLAGS)"; \ - #echo " LD_OPTIONS = $(LD_OPTIONS)"; \ - echo " ASFLAGS = $(ASFLAGS)"; \ - echo " OPTFLAGS = $(OPTFLAGS)" + echo " PATH = $(PATH)"; \ + echo "PKG_CONFIG_PATH = $(PKG_CONFIG_PATH)"; \ + echo " CFLAGS = $(CFLAGS)"; \ + echo " CXXFLAGS = $(CXXFLAGS)"; \ + echo " CPPFLAGS = $(CPPFLAGS)"; \ + echo " LDFLAGS = $(LDFLAGS)"; \ + echo " ASFLAGS = $(ASFLAGS)"; \ + echo " OPTFLAGS = $(OPTFLAGS)" Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2008-12-07 16:35:37 UTC (rev 2470) +++ csw/mgar/gar/v2/gar.mk 2008-12-07 16:45:33 UTC (rev 2471) @@ -546,6 +546,24 @@ # Replace files by itself terminating on first match _INC_EXT_RULE += $(foreach F,$(_MERGE_INCLUDE_FILES),-s ",^\(\.$F\)\$,\1,") +# These are used during merge phase to determine the base installation directory +MERGEBASE_$(bindir) ?= $(bindir_install) +MERGEBASE_$(sbindir) ?= $(sbindir_install) +MERGEBASE_$(libexecdir) ?= $(libexecdir_install) +MERGEBASE_$(libdir) ?= $(libdir_install) + +define mergebase +$(if $(MERGEBASE_$(1)),$(MERGEBASE_$(1)),$(1)) +endef + +# A package is compiled for the pathes defined in $(bindir), $(libdir), etc. +# These may not be the standard pathes, because specific ISA compilation +# could have appended e. g. /64 for .pc-pathes to be correct. Anyway these +# pathes may need to be rewritten e. g. from lib/64 to lib/amd64. Here, +# $(libdir) has the memorymodel-directory appended, whereas $(libdir_install) +# has not, so we use this one for appending. + + _PAX_ARGS = $(_INC_EXT_RULE) $(EXTRA_PAX_ARGS) # The basic merge merges the compiles for all ISAs on the current architecture @@ -558,13 +576,15 @@ # Copy the whole tree verbatim merge-copy-all: $(PKGROOT) $(INSTALLISADIR) - @(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) . $(PKGROOT)) + @(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \ + $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/,p") \ + . $(PKGROOT)) @$(MAKECOOKIE) # Copy only the merge directories merge-copy-only: $(PKGROOT) @(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \ - $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),\1,p") -s ",.*,," \ + $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/,p") -s ",.*,," \ . $(PKGROOT) \ ) @$(MAKECOOKIE) @@ -572,7 +592,7 @@ # Copy the whole tree and relocate the directories in $(MERGE_DIRS) merge-copy-relocate: $(PKGROOT) $(INSTALLISADIR) @(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \ - $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),\1$(ISA)/,p") \ + $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/$(ISA)/,p") \ . $(PKGROOT) \ ) @$(MAKECOOKIE) @@ -580,7 +600,7 @@ # Copy only the relocated directories merge-copy-relocated-only: $(PKGROOT) $(INSTALLISADIR) @(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \ - $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),\1$(ISA)/,p") -s ",.*,," \ + $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/$(ISA)/,p") -s ",.*,," \ . $(PKGROOT) \ ) @$(MAKECOOKIE) Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2008-12-07 16:35:37 UTC (rev 2470) +++ csw/mgar/gar/v2/gar.pkg.mk 2008-12-07 16:45:33 UTC (rev 2471) @@ -132,6 +132,9 @@ # This can be used to automatically distribute the files to different packages # +$(foreach SPEC,$(_PKG_SPECS),$(eval _PROTOTYPE_FILTER_$(SPEC) ?= | $(PROTOTYPE_FILTER_$(SPEC)))) +$(foreach SPEC,$(_PKG_SPECS),$(eval _PROTOTYPE_FILTER_$(SPEC) ?= | $(PROTOTYPE_FILTER))) + # This file contains all installed pathes. This can be used as a starting point # for distributing files to individual packages. PROTOTYPE = $(WORKDIR)/prototype @@ -154,14 +157,19 @@ ) \ <$(PROTOTYPE); \ if [ -n "$(EXTRA_PKGFILES_$*)" ]; then echo "$(EXTRA_PKGFILES_$*)"; fi \ - ) >$@; \ + ) $(_PROTOTYPE_FILTER_$*) >$@; \ else \ - cp $(PROTOTYPE) $@; \ + cat $(PROTOTYPE) $(_PROTOTYPE_FILTER_$*) >$@; \ fi $(WORKDIR)/%.prototype-$(GARCH): | $(WORKDIR)/%.prototype - @cp $(WORKDIR)/$*.prototype $@ + @cat $(WORKDIR)/$*.prototype $(_PROTOTYPE_FILTER_$*) >$@ +# This is a target used to generate all prototypes for debugging purposes. +# On a normal packaging workflow this is not used. +prototypes: extract merge $(SPKG_DESTDIRS) pre-package $(foreach S,$(_PKG_SPECS),$(WORKDIR)/$S.prototype-$(GARCH)) + @$(DONADA) + # $_EXTRA_GAR_PKGS is for dynamic dependencies added by GAR itself (like CSWisaexec or CSWcswclassutils) .PRECIOUS: $(WORKDIR)/%.depend $(WORKDIR)/%.depend: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Dec 7 17:46:25 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 07 Dec 2008 16:46:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[2472] csw/mgar/gar/v1/gar.pkg.mk Message-ID: Revision: 2472 http://gar.svn.sourceforge.net/gar/?rev=2472&view=rev Author: dmichelsen Date: 2008-12-07 16:46:25 +0000 (Sun, 07 Dec 2008) Log Message: ----------- mGAR v1: First commit towards source packages Modified Paths: -------------- csw/mgar/gar/v1/gar.pkg.mk Modified: csw/mgar/gar/v1/gar.pkg.mk =================================================================== --- csw/mgar/gar/v1/gar.pkg.mk 2008-12-07 16:45:33 UTC (rev 2471) +++ csw/mgar/gar/v1/gar.pkg.mk 2008-12-07 16:46:25 UTC (rev 2472) @@ -199,3 +199,14 @@ pkglist: @echo "G: $(GARDIR) - $(shell pwd) - $(realpath $(shell pwd)/$(GARDIR)) - $(realpath .)" @$(foreach SPEC,$(SPKG_SPECS),echo "$(call _pkglist_one,$(SPEC))";) + +srcpack: + @echo "*** Files" + @$(foreach S,$(SPKG_SPECS),echo "Spec $S";$(foreach F,$(filter $S.%,$(DISTFILES)),echo " $F";)) + @$(foreach F,$(filter-out $(foreach S,$(SPKG_SPECS),$S.%),$(DISTFILES)),echo "File $F";) + @$(foreach P,$(PATCHFILES),echo "Patch $P";) + + @echo + @echo "*** Dependencies" + + @$(foreach P,$(PREREQUISITE_PKGS),echo "$P";) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Dec 7 18:33:28 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 07 Dec 2008 17:33:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[2473] csw/mgar/pkg/xmlstarlet/trunk Message-ID: Revision: 2473 http://gar.svn.sourceforge.net/gar/?rev=2473&view=rev Author: dmichelsen Date: 2008-12-07 17:33:28 +0000 (Sun, 07 Dec 2008) Log Message: ----------- xmlstarlet: Update to mGAR v2 Modified Paths: -------------- csw/mgar/pkg/xmlstarlet/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/xmlstarlet/trunk/files/CSWxmlstarlet.depend csw/mgar/pkg/xmlstarlet/trunk/files/CSWxmlstarlet.prototype Property Changed: ---------------- csw/mgar/pkg/xmlstarlet/trunk/ Property changes on: csw/mgar/pkg/xmlstarlet/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/xmlstarlet/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlstarlet/trunk/Makefile 2008-12-07 16:46:25 UTC (rev 2472) +++ csw/mgar/pkg/xmlstarlet/trunk/Makefile 2008-12-07 17:33:28 UTC (rev 2473) @@ -14,8 +14,10 @@ SF_PROJ = xmlstar MASTER_SITES += $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWxmlstarlet,depend prototype) +DISTFILES += $(call admfiles,CSWxmlstarlet,) +REQUIRED_PKGS = CSWgcrypt CSWggettext CSWgpgerr CSWiconv CSWlibxml2 CSWlibxslt CSWzlib + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Deleted: csw/mgar/pkg/xmlstarlet/trunk/files/CSWxmlstarlet.depend =================================================================== --- csw/mgar/pkg/xmlstarlet/trunk/files/CSWxmlstarlet.depend 2008-12-07 16:46:25 UTC (rev 2472) +++ csw/mgar/pkg/xmlstarlet/trunk/files/CSWxmlstarlet.depend 2008-12-07 17:33:28 UTC (rev 2473) @@ -1,7 +0,0 @@ -P CSWgcrypt libgcrypt - GNU libcrypt -P CSWggettext ggettext - GNU gettext -P CSWgpgerr libgpg_error - GNU gpg related library -P CSWiconv libiconv - GNU iconv library -P CSWlibxml2 libxml2 - XML Parser Library -P CSWlibxslt libxslt - XSLT engine for the XML Toolkit -P CSWzlib zlib - Zlib Data Compression Library Deleted: csw/mgar/pkg/xmlstarlet/trunk/files/CSWxmlstarlet.prototype =================================================================== --- csw/mgar/pkg/xmlstarlet/trunk/files/CSWxmlstarlet.prototype 2008-12-07 16:46:25 UTC (rev 2472) +++ csw/mgar/pkg/xmlstarlet/trunk/files/CSWxmlstarlet.prototype 2008-12-07 17:33:28 UTC (rev 2473) @@ -1,9 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/xmlstarlet 0755 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man1 0755 root bin -f none /opt/csw/share/man/man1/xmlstarlet.1 0644 root bin -i copyright=CSWxmlstarlet.copyright -i depend=CSWxmlstarlet.depend -i pkginfo=CSWxmlstarlet.pkginfo This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Dec 7 23:31:33 2008 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 07 Dec 2008 22:31:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[2474] csw/mgar/pkg/openssl/trunk Message-ID: Revision: 2474 http://gar.svn.sourceforge.net/gar/?rev=2474&view=rev Author: chninkel Date: 2008-12-07 22:31:33 +0000 (Sun, 07 Dec 2008) Log Message: ----------- openssl: update to mGAR v2 Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile csw/mgar/pkg/openssl/trunk/checksums csw/mgar/pkg/openssl/trunk/files/CSWossl.gspec csw/mgar/pkg/openssl/trunk/files/changelog.CSW csw/mgar/pkg/openssl/trunk/files/i.conf csw/mgar/pkg/openssl/trunk/files/oldlibs.0.9.7m-sparc.tar.gz csw/mgar/pkg/openssl/trunk/files/openssl.0.9.8.patch csw/mgar/pkg/openssl/trunk/files/r.conf Added Paths: ----------- csw/mgar/pkg/openssl/trunk/files/certs.tar.gz Removed Paths: ------------- csw/mgar/pkg/openssl/trunk/checksums.0.9.7m Property Changed: ---------------- csw/mgar/pkg/openssl/trunk/ Property changes on: csw/mgar/pkg/openssl/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2008-12-07 17:33:28 UTC (rev 2473) +++ csw/mgar/pkg/openssl/trunk/Makefile 2008-12-07 22:31:33 UTC (rev 2474) @@ -1,29 +1,5 @@ -# Beware, this Makefile is complex because: -# - we must also build and include in the package the -# libraries of the previous version for comptability reason -# -# - we also build optimized libraries (amd64, pentium_pro, sparcv9, ...) -# -# -# On x86, amd64 libraries/binaries must be build on Solaris 10 whereas the -# other ones must be built on Solaris 8, so the packaging process must be -# split in two steps and must use a nfs shared directory. -# -# - first, on Solaris 10, build only the amd64 optimized binaries/libraries: -# -# gmake COOKIEROOTDIR="$NFS_SHARED_DIR/cookie" DESTROOT="$NFS_SHARED_DIR" DESTIMG=$LOGNAME-$HOST8 GAROSREL=5.8 ISA=amd64 install-libs install-bin -# -# - then on solaris 8, finish the build and packaging process: -# -# gmake COOKIEROOTDIR="$NFS_SHARED_DIR/cookie" DESTROOT="$NFS_SHARED_DIR" package -# -# NFS_SHARED_DIR is the path of the directory nfs shared between the solaris 10 -# and the solaris 8 host -# HOST8 is the hostname of the Solaris 8 host -# -# GARNAME = openssl -GARVERSION = 0.9.8g +GARVERSION = 0.9.8i CATEGORIES = lib OPENSSL_VERSION := $(shell echo $(GARVERSION) | sed -e 's/[a-z]//g') @@ -53,25 +29,24 @@ SPKG_CLASSES = none conf -# We will include the following previous versions of libraries -# for comptatibility reasons -OLDLIBS = 0.9.7m -DISTFILES += oldlibs.list.0.9.7m-i386 -DISTFILES += oldlibs.list.0.9.7m-sparc -0.9.7m_i386_ISALIST = pentium_pro -0.9.7m_sparc_ISALIST = sparcv8plus+vis sparcv9 - PATCHFILES = openssl.$(OPENSSL_VERSION).patch +GARCOMPILER = SOS11 + # The list of instructions set for which we will # provide optimized libraries and binaries -i386_ISALIST = pentium_pro amd64 -sparc_ISALIST = sparcv8plus+vis sparcv9 +EXTRA_BUILD_ISAS_i386 = pentium_pro amd64 +EXTRA_BUILD_ISAS_sparc = sparcv8plus+vis sparcv9 -ifdef OLDLIB -i386_ISALIST = pentium_pro -endif +# we don't yet use isaexec support so we disable +# isa relocation for default isa +NO_ISAEXEC = 1 +#ISA_RELOCATE_DIRS_i386 = +#ISA_RELOCATE_DIRS_sparcv8 = +# we redefine the default merge exclude so *.a files are not excluded +MERGE_EXCLUDE_DEFAULT = $(MERGE_EXCLUDE_INFODIR) + # The corresponding os/compiler to pass to the # openssl Configure script i386_OS_COMPILER = solaris-386-cc @@ -79,104 +54,39 @@ pentium_pro_OS_COMPILER = solaris-pentium_pro-cc amd64_OS_COMPILER = solaris64-x86_64-cc -sparc_OS_COMPILER = solaris-sparcv8-cc +sparcv8_OS_COMPILER = solaris-sparcv8-cc sparcv8plus_OS_COMPILER = solaris-sparcv9-cc sparcv8plus+vis_OS_COMPILER = solaris-sparcv9+vis-cc sparcv9_OS_COMPILER = solaris64-sparcv9-cc -# Let's determine the appropriate os/compiler couple -# to pass to the openssl Configure script -ifndef ISA -OS_COMPILER = $($(GARCH)_OS_COMPILER) -else -OS_COMPILER = $($(ISA)_OS_COMPILER) -endif +CONFIGURE_ARGS = --prefix=$(prefix) shared $($(ISA)_OS_COMPILER) --install_prefix=$(DESTDIR) -CONFIGURE_ARGS = --prefix=$(prefix) shared $(OS_COMPILER) --install_prefix=$(DESTDIR) - # We want the csw perl to be used #CONFIGURE_ENV += PERL="/opt/csw/bin/perl" # For now we want the sun perl to be used CONFIGURE_ENV += PERL="/usr/bin/perl" +# Some optimization EXT_CFLAGS += -mt -xstrconst EXT_CXXFLAGS += -noex -mt -# + # By default, the install target put man pages under # /opt/csw/ssl/man, but we want them under /opt/csw/share/man INSTALL_ARGS += MANDIR=$(mandir) -POST_INSTALL_TARGETS := striplib +# we include previous release of libraries file for comptability purpose +OLDLIBS = 0.9.7m -######################################################################### -# Makefile instructions to handle additional optimized libraries and binaries (part I) -# -# To enable optimized libraries/binaries: -# - define the i386_ISALIST and sparc_ISALIST with the instructions -# sets additionnal binaries and librairies should be optimized for -# - define the install-libs and install-bin targets which should -# install binaries and libraries in $(bindir)/$(ISA) and $(libdir)/$(ISA) -# -# To just build the non-optimized binaries/libraries: -# gmake ISALIST="" build -# -# To just build specific optimized binaries/libraries: -# gmake ISA=instruction_set build -# -# This code could be added in the common gar scripts. -# -######################################################################### +SKIPTEST = 1 -ifndef ISA -ISALIST=$($(GARCH)_ISALIST) -ifdef ISALIST -CONFIGURE_SCRIPTS = $(WORKSRC)/configure isa -BUILD_SCRIPTS = $(WORKSRC)/Makefile isa -INSTALL_SCRIPTS = $(WORKSRC)/Makefile isa -TEST_SCRIPTS = $(WORKSRC)/Makefile isa -CLEAN_SCRIPTS = all isa -endif -else -# We want a separate work and cookie directory -# for each optimized build -WORKDIR = $(WORKROOTDIR)/$(DESTIMG).$(ISA).d -COOKIEDIR = $(COOKIEROOTDIR)/$(DESTIMG).$(ISA).d -endif - -######################################################################### - -######################################################################### -# Makefile instructions to handle old libraries inclusion (part I) -# -# This should rather be handled by making a distinct package for each -# incompatible library version. -######################################################################### - -ifdef OLDLIB -CHECKSUM_FILE = checksums.$(GARVERSION) -ifdef ISA -WORKDIR = $(WORKROOTDIR)/$(DESTIMG).$(ISA).$(GARVERSION).d -COOKIEDIR = $(COOKIEROOTDIR)/$(DESTIMG).$(ISA).$(GARVERSION).d -else -WORKDIR = $(WORKROOTDIR)/$(DESTIMG).$(GARVERSION).d -COOKIEDIR = $(COOKIEROOTDIR)/$(DESTIMG).$(GARVERSION).d -endif -endif - -ifdef OLDLIBS -ifndef ISA -INSTALL_SCRIPTS += oldlibs -endif -endif - -######################################################################### - - include gar/category.mk +# we redefine the timestamp to fulfill opencsw standard +SPKG_VERSION := $(OPENSSL_VERSION) SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(OPENSSL_RELEASE) -pre-configure: + +pre-configure-modulated: echo " ==> Creating configure script" cd $(WORKSRC) && ln -nf Configure configure $(MAKECOOKIE) @@ -184,104 +94,21 @@ # we remove every debug information except symbol table # (should rather be done in the gar scripts) striplib: - chmod -R u+w $(DESTDIR)$(libdir) - strip -x $(DESTDIR)$(libdir)/*.so* - ( for ISA in $($(GARCH)_ISALIST); do \ - strip -x $(DESTDIR)$(libdir)/$$ISA/*.so*; \ - done ) - chmod -R u+w $(DESTDIR)$(libdir)/engines - strip -x $(DESTDIR)$(libdir)/engines/*.so* + chmod -R u+w $(PKGROOT)$(libdir) + find $(PKGROOT)$(libdir) -name "*.so*" -exec strip -x '{}' ';' -post-install: - [ -f $(DESTDIR)$(prefix)/ssl/openssl.cnf ] && \ - ginstall -D $(DESTDIR)$(prefix)/ssl/openssl.cnf $(DESTDIR)$(sysconfdir)/ssl/openssl.cnf - cp -r $(WORKSRC)/certs/* $(DESTDIR)$(prefix)/ssl/certs +install-certs: + [ -f $(PKGROOT)$(prefix)/ssl/openssl.cnf ] && \ + ginstall -D $(PKGROOT)$(prefix)/ssl/openssl.cnf $(PKGROOT)$(sysconfdir)/ssl/openssl.cnf + gunzip --stdout $(CURDIR)/$(FILEDIR)/certs.tar.gz | (cd $(PKGROOT)$(prefix)/ssl/certs && tar xf -) + cp -r $(WORKSRC)/certs/* $(PKGROOT)$(prefix)/ssl/certs + OPENSSL=$(PKGROOT)/$(bindir)/openssl $(PKGROOT)/$(bindir)/c_rehash $(PKGROOT)/$(prefix)/ssl/certs/ $(MAKECOOKIE) - -# These targets are required to provide optimized binaries/libraries - -install-libs: install-static-libs install-dynamic-libs - -install-static-libs: build - @if test ! -f "$(COOKIEDIR)/install-static-libs"; then \ - echo " ==> Installing libraries from $(WORKSRC)"; \ - ginstall -d $(DESTDIR)$(libdir)/$(ISA); \ - cd $(WORKSRC) && ginstall libcrypto.a libssl.a $(DESTDIR)$(libdir)/$(ISA); \ - $(MAKECOOKIE); \ - fi - -install-dynamic-libs: build - @if test ! -f $(COOKIEDIR)/install-dynamic-libs; then \ - echo " ==> Installing libraries from $(WORKSRC)"; \ - ginstall -d $(DESTDIR)$(libdir)/$(ISA); \ - cd $(WORKSRC) && ginstall libcrypto.so.$(OPENSSL_VERSION) libssl.so.$(OPENSSL_VERSION) $(DESTDIR)$(libdir)/$(ISA); \ - $(MAKECOOKIE); \ - fi - -install-bin: build - @if test ! -f $(COOKIEDIR)/install-bin; then \ - echo " ==> Installing binaries from $(WORKSRC)"; \ - ginstall -d $(DESTDIR)$(bindir)/$(ISA); \ - cd $(WORKSRC) && ginstall apps/openssl $(DESTDIR)$(bindir)/$(ISA); \ - $(MAKECOOKIE); \ - fi - - - -######################################################################### -# Makefile instructions to handle additional optimized libraries and binaries (part II) -# -######################################################################### - -configure-isa: $(addprefix configure-isa-,$(ISALIST)) -configure-isa-%: - @$(MAKE) ISA=$* configure - -build-isa: $(addprefix build-isa-,$(ISALIST)) -build-isa-%: - @$(MAKE) ISA=$* build - -test-isa: $(addprefix test-isa-,$(ISALIST)) -test-isa-%: - @$(MAKE) ISA=$* test - -install-isa: $(addprefix install-isa-,$(ISALIST)) -install-isa-%: - @$(MAKE) ISA=$* test install-libs install-bin - -clean-isa: $(addprefix clean-isa-,$(ISALIST)) -clean-isa-%: - @$(MAKE) ISA=$* clean - -######################################################################### -# Makefile instructions to handle old libraries inclusion (part II) -# -# This should rather be handled by making a distinct package for each -# incompatible library version. -######################################################################### - -update-oldlibs-archive: $(addprefix update-oldlibs-archive-,$(OLDLIBS)) -update-oldlibs-archive-%: clean-oldlibs-archive-% install-oldlibs-% - @echo " ==> Creating old libraries archive oldlibs.$*-$(GARCH).tar.gz" - @cd $(DESTDIR) && tar cvf - `cat $(CURDIR)/$(DOWNLOADDIR)/oldlibs.list.$*-$(GARCH)` | gzip > $(CURDIR)/$(FILEDIR)/oldlibs.$*-$(GARCH).tar.gz - -clean-oldlibs-archive: $(addprefix clean-oldlibs-archive,$(OLDLIBS)) -clean-oldlibs-archive-%: - @echo " ==> Removing old libraries archive oldlibs.$*-$(GARCH).tar.gz" - @rm -f $(FILEDIR)/oldlibs.$*-$(GARCH).tar.gz - @rm -f $(COOKIEDIR)/install-oldlibs* - install-oldlibs: $(addprefix install-oldlibs-,$(OLDLIBS)) -install-oldlibs-%: - @if [ -f $(FILEDIR)/oldlibs.$*-$(GARCH).tar.gz ]; then \ - echo " ==> Installing old libraries $* from existing old libraries archive oldlibs.$*-$(GARCH).tar.gz"; \ - cd $(DESTDIR) && gunzip -c $(CURDIR)/$(FILEDIR)/oldlibs.$*-$(GARCH).tar.gz | tar xvf -; \ - else \ - echo " ==> Build old libraries $*"; \ - $(MAKE) GARVERSION=$* OLDLIB=1 build; \ - for ISA in "" $($(*)_$(GARCH)_ISALIST); do \ - $(MAKE) GARVERSION=$* OLDLIB=1 ISA=$$ISA install-dynamic-libs; \ - done; \ - fi - @$(MAKECOOKIE) +install-oldlibs-%: + echo " ==> Installing old libraries $* from archive oldlibs.$*-$(GARCH).tar.gz"; \ + cd $(PKGROOT) && gunzip -c $(CURDIR)/$(FILEDIR)/oldlibs.$*-$(GARCH).tar.gz | tar xvf - && \ + $(MAKECOOKIE) + +pre-package: striplib install-certs install-oldlibs Modified: csw/mgar/pkg/openssl/trunk/checksums =================================================================== --- csw/mgar/pkg/openssl/trunk/checksums 2008-12-07 17:33:28 UTC (rev 2473) +++ csw/mgar/pkg/openssl/trunk/checksums 2008-12-07 22:31:33 UTC (rev 2474) @@ -1,5 +1,5 @@ -acf70a16359bf3658bdfb74bda1c4419 download/openssl-0.9.8g.tar.gz -3b17df33844577c449027ef309157fe7 download/CSWossl.gspec +561e00f18821c74b2b86c8c7786f9d8b download/openssl-0.9.8i.tar.gz +bc7aa9d2ea44e9ac28b11db12402024e download/CSWossl.gspec 05b45e7124833dee48e5f3c45591e95b download/CSWossl.depend 7fe01ca4ef9d0e971d57b00f4d0b168b download/CSWossl.prototype cf0fa997cc719009991e67b4264caeed download/CSWosslrt.gspec @@ -14,9 +14,7 @@ 0d55e4c93c94a1a72fb295d0ee6225d4 download/CSWosslutils.gspec 37995caa7f4155066b00fb7503e853da download/CSWosslutils.depend 6e0c86ddc23d044757810cca6f31f017 download/CSWosslutils.prototype -f49c762973d9955b310be948900de148 download/changelog.CSW -9b2ae27f98333b73ff2b16ed98ee896a download/i.conf -5d9e9fb1a5b6af82ce915f72ebc5e3b7 download/r.conf -1b1b1aa37d3827f03320dc7c6b2d54ae download/oldlibs.list.0.9.7m-i386 -ba0db139be0aeecdce5668d2de475a4d download/oldlibs.list.0.9.7m-sparc -a6475f97d8b1152e06679ba6ec463536 download/openssl.0.9.8.patch +e3f149dea30df046b9042a69639bcf3b download/changelog.CSW +7fdc09cd3c11db459c83c8946f7872f6 download/i.conf +a454ac09091085813ec8900f5a0c917c download/r.conf +64f7c3f3a6cae483209b69c31c82557d download/openssl.0.9.8.patch Deleted: csw/mgar/pkg/openssl/trunk/checksums.0.9.7m =================================================================== --- csw/mgar/pkg/openssl/trunk/checksums.0.9.7m 2008-12-07 17:33:28 UTC (rev 2473) +++ csw/mgar/pkg/openssl/trunk/checksums.0.9.7m 2008-12-07 22:31:33 UTC (rev 2474) @@ -1,22 +0,0 @@ -74a4d1b87e1e6e1ec95dbe58cb4c5b9a download/openssl-0.9.7m.tar.gz -3b17df33844577c449027ef309157fe7 download/CSWossl.gspec -05b45e7124833dee48e5f3c45591e95b download/CSWossl.depend -7fe01ca4ef9d0e971d57b00f4d0b168b download/CSWossl.prototype -cf0fa997cc719009991e67b4264caeed download/CSWosslrt.gspec -78c26f65b14f3ebf4a29069a3f675285 download/CSWosslrt.checkinstall -d41d8cd98f00b204e9800998ecf8427e download/CSWosslrt.depend -cba143e52cb08dd3ee39f275aefa075d download/CSWosslrt.prototype-i386 -ceeb4a59f1c31ae4deac9f2b61dadca2 download/CSWosslrt.prototype-sparc -1791edde7bf1bce62ac799852459dc47 download/CSWossldevel.gspec -37995caa7f4155066b00fb7503e853da download/CSWossldevel.depend -45161ff3a5b00fd6942f63b77c0b0ed1 download/CSWossldevel.prototype-i386 -7b1dd2e8c78b033ca2a8be4de097b147 download/CSWossldevel.prototype-sparc -0d55e4c93c94a1a72fb295d0ee6225d4 download/CSWosslutils.gspec -37995caa7f4155066b00fb7503e853da download/CSWosslutils.depend -6e0c86ddc23d044757810cca6f31f017 download/CSWosslutils.prototype -f49c762973d9955b310be948900de148 download/changelog.CSW -9b2ae27f98333b73ff2b16ed98ee896a download/i.conf -5d9e9fb1a5b6af82ce915f72ebc5e3b7 download/r.conf -1b1b1aa37d3827f03320dc7c6b2d54ae download/oldlibs.list.0.9.7m-i386 -ba0db139be0aeecdce5668d2de475a4d download/oldlibs.list.0.9.7m-sparc -45f0944761a63ba5211987dbfbfdfc42 download/openssl.0.9.7.patch Modified: csw/mgar/pkg/openssl/trunk/files/CSWossl.gspec =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWossl.gspec 2008-12-07 17:33:28 UTC (rev 2473) +++ csw/mgar/pkg/openssl/trunk/files/CSWossl.gspec 2008-12-07 22:31:33 UTC (rev 2474) @@ -1,5 +1,6 @@ %var bitname openssl %var pkgname CSWossl +%var arch all %var desc Openssl meta package %var pkgfile %{bitname}-%{SPKG_VERSION}%{SPKG_REVSTAMP}-%{SPKG_OSNAME}-all-CSW.pkg %include url file://%{PKGLIB}/csw_dyndepend.gspec Added: csw/mgar/pkg/openssl/trunk/files/certs.tar.gz =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/openssl/trunk/files/certs.tar.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: csw/mgar/pkg/openssl/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssl/trunk/files/changelog.CSW 2008-12-07 17:33:28 UTC (rev 2473) +++ csw/mgar/pkg/openssl/trunk/files/changelog.CSW 2008-12-07 22:31:33 UTC (rev 2474) @@ -1,3 +1,11 @@ +openssl (0.9.8,REV=2008.10.05_rev=i) unstable + + * New upstream version. + * Added CA certs that were removed in 0.9.8h. + * Fixed ARCH in openssl meta-package. + + -- Yann Rouillard Fri, 05 Oct 2008 21:25:09 +0200 + openssl (0.9.8,REV=2007.12.26_rev=g) unstable * Fixed inconsistency between headers and libraries. Modified: csw/mgar/pkg/openssl/trunk/files/i.conf =================================================================== --- csw/mgar/pkg/openssl/trunk/files/i.conf 2008-12-07 17:33:28 UTC (rev 2473) +++ csw/mgar/pkg/openssl/trunk/files/i.conf 2008-12-07 22:31:33 UTC (rev 2474) @@ -1,5 +1,5 @@ # -# Copyright 2006 Yann Rouillard +# Copyright 2006 Yann Rouillard # All rights reserved. Use is subject to license terms. # # Redistribution and/or use, with or without modification, is @@ -15,7 +15,7 @@ # with .CSW # except for service configuration files which are always installed # CSW suffixed under Solaris 9 as they are used to enable/disable -# a service according to blastwave standards. +# a service according to opencsw standards. # umask 0022 Modified: csw/mgar/pkg/openssl/trunk/files/oldlibs.0.9.7m-sparc.tar.gz =================================================================== (Binary files differ) Modified: csw/mgar/pkg/openssl/trunk/files/openssl.0.9.8.patch =================================================================== --- csw/mgar/pkg/openssl/trunk/files/openssl.0.9.8.patch 2008-12-07 17:33:28 UTC (rev 2473) +++ csw/mgar/pkg/openssl/trunk/files/openssl.0.9.8.patch 2008-12-07 22:31:33 UTC (rev 2474) @@ -1,7 +1,7 @@ -diff --speed-large-files --minimal -Nru openssl-0.9.8e.orig/Configure openssl-0.9.8e/Configure ---- openssl-0.9.8e.orig/Configure 2006-11-30 09:01:38.000000000 -0500 -+++ openssl-0.9.8e/Configure 2007-05-08 10:27:21.506853000 -0400 -@@ -194,8 +194,12 @@ +diff -ur openssl-0.9.8i.orig/Configure openssl-0.9.8i/Configure +--- openssl-0.9.8i.orig/Configure 2008-09-12 16:47:00.000000000 +0200 ++++ openssl-0.9.8i/Configure 2008-09-26 21:39:48.373741600 +0200 +@@ -199,8 +199,12 @@ "solaris64-x86_64-gcc","gcc:-m64 -O3 -Wall -DL_ENDIAN -DMD32_REG_T=int::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-fPIC:-m64 -shared -static-libgcc:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", #### Solaris x86 with Sun C setups @@ -16,12 +16,11 @@ #### SPARC Solaris with GNU C setups "solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -@@ -214,6 +218,7 @@ +@@ -219,6 +223,7 @@ "solaris-sparcv7-cc","cc:-xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "solaris-sparcv8-cc","cc:-xarch=v8 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "solaris-sparcv9-cc","cc:-xtarget=ultra -xarch=v8plus -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::md5-sparcv8plus.o::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"solaris-sparcv9+vis-cc","cc:-xtarget=ultra -xarch=v8plusa -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::md5-sparcv8plus.o::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "solaris64-sparcv9-cc","cc:-xtarget=ultra -xarch=v9 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:::des_enc-sparc.o fcrypt_b.o:::md5-sparcv9.o::::::dlfcn:solaris-shared:-KPIC:-xarch=v9 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs", + "solaris-sparcv9-cc","cc:-xtarget=ultra -xarch=v8plus -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"solaris-sparcv9+vis-cc","cc:-xtarget=ultra -xarch=v8plusa -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "solaris64-sparcv9-cc","cc:-xtarget=ultra -xarch=v9 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:::des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-KPIC:-xarch=v9 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs", #### "debug-solaris-sparcv8-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG_ALL -xarch=v8 -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::sparcv8.o::::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -set Modified: csw/mgar/pkg/openssl/trunk/files/r.conf =================================================================== --- csw/mgar/pkg/openssl/trunk/files/r.conf 2008-12-07 17:33:28 UTC (rev 2473) +++ csw/mgar/pkg/openssl/trunk/files/r.conf 2008-12-07 22:31:33 UTC (rev 2474) @@ -1,5 +1,5 @@ # -# Copyright 2006 Yann Rouillard +# Copyright 2006 Yann Rouillard # All rights reserved. Use is subject to license terms. # # Redistribution and/or use, with or without modification, is This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dlaigle at opencsw.org Mon Dec 8 11:44:49 2008 From: dlaigle at opencsw.org (dlaigle) Date: Mon, 08 Dec 2008 11:44:49 +0100 Subject: [csw-devel] =?utf-8?q?libtool_reordering_runpath_and_LD=5FOPTIONS?= In-Reply-To: <627731CF-D4B6-4319-9B92-63BBD440C4D7@opencsw.org> References: <627731CF-D4B6-4319-9B92-63BBD440C4D7@opencsw.org> Message-ID: <0e5fc9b305d125ad8a95423baab013e0@localhost> Dago, You should have a look at the related "libtool library file", which name is ".la". In there, you will have an entry which looks like the following: "dependency_libs='-L ... -l ...' : this is those options which are expanded directly when you build a library using libtool. You can either hack this entry directly to solve your problem... or use LD_OPTIONS ! BTW, it is this entry which is almost everytime responsible of the insertion of the building paths into the RPATH of the binaries we build: we should have an ".la cleaner" script be part of the packages creation process, to remove thatn but this is another topic :-) - Dominique On Sun, 7 Dec 2008 13:03:14 +0100, Dagobert Michelsen wrote: > Hi, > > I'm still working on automated 32/64 bit builds and still encounter > new strange things. This time I have an issue with libtool. This > command is issues during make when comiling > libvorbis/trunk/work/build-isa-amd64/libvorbis-1.2.0/examples > > opencsw# /bin/bash ../libtool --tag=CC --mode=link /opt/studio/SOS11/ > SUNWspro/bin/cc -O -xO3 -xarch=amd64 -I/opt/csw/include - > DUSE_MEMORY_H -xarch=amd64 -L/opt/csw/lib/64 -R/opt/csw/lib/\\\ > $ISALIST -R/opt/csw/lib/64 -o seeking_example seeking_example.o ../lib/ > libvorbisfile.la ../lib/libvorbis.la > > This looks good, but libtool reorders the runpath: > > /opt/studio/SOS11/SUNWspro/bin/cc -O -xO3 -xarch=amd64 -I/opt/csw/ > include -DUSE_MEMORY_H -xarch=amd64 -o .libs/seeking_example > seeking_example.o -L/opt/csw/lib/64 ../lib/.libs/libvorbisfile.so / > root/mgar/pkg/libvorbis/trunk/work/build-isa-amd64/libvorbis-1.2.0/ > lib/.libs/libvorbis.so ../lib/.libs/libvorbis.so /opt/csw/lib/64/ > libogg.so -lm -R/opt/csw/lib/64 -R/opt/csw/lib/\$ISALIST > ld: warning: file ../lib/.libs/libvorbis.so: linked to /root/mgar/pkg/ > libvorbis/trunk/work/build-isa-amd64/libvorbis-1.2.0/lib/.libs/ > libvorbis.so: attempted multiple inclusion of file > creating seeking_example > > Putting -R/opt/csw/lib/64 before $ISALIST is pretty pointless as > $ISALIST then never will be used as the library is found earlier. > Debugging the libtool-shellscript, umh, does not reveal any secrets. > It looks like libtool assembles the runpath dynamically from all > runpathes from libraries the to be linked lib depends on and > than reorders it somehow. If I use LD_OPTIONS I can get it > to work, but I understood from the past discussions that > LD_OPTIONS is a Bad Thing(tm). > > Any libtool experts around who can enlighten me how to do this right? > > > Best regards > > -- Dago > _______________________________________________ > devel mailing list > devel at lists.opencsw.org > https://lists.opencsw.org/mailman/listinfo/devel > From bdwalton at users.sourceforge.net Mon Dec 8 15:22:03 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 08 Dec 2008 14:22:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[2475] csw/mgar/pkg/opensp/ Message-ID: Revision: 2475 http://gar.svn.sourceforge.net/gar/?rev=2475&view=rev Author: bdwalton Date: 2008-12-08 14:22:03 +0000 (Mon, 08 Dec 2008) Log Message: ----------- Removed stub package for opensp (an erroneous creation). Removed Paths: ------------- csw/mgar/pkg/opensp/ 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 Dec 8 16:12:46 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 08 Dec 2008 15:12:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[2476] csw/mgar/pkg/docbook-dtds/trunk Message-ID: Revision: 2476 http://gar.svn.sourceforge.net/gar/?rev=2476&view=rev Author: bdwalton Date: 2008-12-08 15:12:46 +0000 (Mon, 08 Dec 2008) Log Message: ----------- Package builds and installs 'fine', including postinstall/preremove scripts. The scripts may need to be changed if we leave libxml2 pointing to /etc/sgml/catalog by default though, since the we're expecting them in /opt/csw/etc/sgml/catalog for the preremove portion. Modified Paths: -------------- csw/mgar/pkg/docbook-dtds/trunk/Makefile csw/mgar/pkg/docbook-dtds/trunk/checksums csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.gspec csw/mgar/pkg/docbook-dtds/trunk/files/Makefile Added Paths: ----------- csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.depend csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.preremove Modified: csw/mgar/pkg/docbook-dtds/trunk/Makefile =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/Makefile 2008-12-08 14:22:03 UTC (rev 2475) +++ csw/mgar/pkg/docbook-dtds/trunk/Makefile 2008-12-08 15:12:46 UTC (rev 2476) @@ -1,6 +1,12 @@ # Replicate the RHEL5 docbook-dtds-1.0.30.1 rpm for CSW. Patches are taken # from that srpm and modified (so paths work for GAR). +# NOTE NOTE NOTE +# If these version numbers change, you'll need to update the postinstall +# and preremove scripts also. +# 20081204 -bw +# NOTE NOTE NOTE + GARNAME = docbookdtds GARVERSION = 1.0 PATCHLEVEL = 30.1 @@ -50,6 +56,7 @@ MASTER_SITES = $(O_SRC) $(D_SRC) DISTFILES = $(DBFILES) Makefile +DISTFILES += $(call admfiles,CSWdocbookdtds,depend postinstall preremove) PATCHFILES = docbook-4.2-euro.patch docbook-dtd30-sgml-1.0.catalog.patch PATCHFILES += docbook-dtd31-sgml-1.0.catalog.patch Modified: csw/mgar/pkg/docbook-dtds/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/checksums 2008-12-08 14:22:03 UTC (rev 2475) +++ csw/mgar/pkg/docbook-dtds/trunk/checksums 2008-12-08 15:12:46 UTC (rev 2476) @@ -9,7 +9,11 @@ ab200202b9e136a144db1e0864c45074 download/docbook-xml-4.3.zip f89e1bd0b2c7a361e3f1f739e16b5d0d download/docbook-4.4.zip cbb04e9a700955d88c50962ef22c1634 download/docbook-xml-4.4.zip -9f1b87ab4fa6da7b7284a1c7edd1e3da download/Makefile +2479ac1e7b4a43d3618ca16237aaa85d download/Makefile +536104a1ab1e8eac583cf27f4f8844a4 download/CSWdocbookdtds.gspec +cb6dbfe9f6184a9de0725c0a61adc57b download/CSWdocbookdtds.depend +5cb8ab501683e226c5b34fac2dc66076 download/CSWdocbookdtds.postinstall +9035c448e6480f6e916084fea388b512 download/CSWdocbookdtds.preremove 318742d3a6648a6905727f071cbc9847 download/docbook-4.2-euro.patch e3067045964536cc7445d5c3f1e99916 download/docbook-dtd30-sgml-1.0.catalog.patch 856d40f5d1e3fc8fd939b88bf5fedc87 download/docbook-dtd31-sgml-1.0.catalog.patch Added: csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.depend =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.depend (rev 0) +++ csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.depend 2008-12-08 15:12:46 UTC (rev 2476) @@ -0,0 +1,6 @@ +P CSWcommon common - common files and dirs for CSW packages +P CSWsgmlcommon sgmlcommon - A collection of entities and DTDs +P CSWxmlcommon xmlcommon - A collection of entities and DTDs +P CSWopenjade openjade - A DSSSL implementation +P CSWlibxml2 libxml2 - A library providing XML and HTML support + Modified: csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.gspec =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.gspec 2008-12-08 14:22:03 UTC (rev 2475) +++ csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.gspec 2008-12-08 15:12:46 UTC (rev 2476) @@ -1,4 +1,4 @@ -%var bitname package -%var pkgname CSWpackage +%var bitname docbookdtds +%var pkgname CSWdocbookdtds +%var arch all %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/LICENSE Added: csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall (rev 0) +++ csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall 2008-12-08 15:12:46 UTC (rev 2476) @@ -0,0 +1,597 @@ +#!/bin/sh + +# NOTE: This script is a lightly modified version of the one included in the +# rhel5 docbook-dtds rpm spec. +# 20081204 -bw + +if [ -n "$PKG_INSTALL_ROOT" -a "$PKG_INSTALL_ROOT" != "/" ]; then + chroot $PKG_INSTALL_ROOT +fi + +XMLCAT=/opt/csw/bin/xmlcatalog +INSTCAT=/opt/csw/bin/install-catalog +CSWSGMLCNF=/opt/csw/etc/sgml +CSWSGML=/opt/csw/share/sgml + +VERSION=1.0 +RELEASE=30.1 + +OPENJADEVER=1.3.2 + +## +## SGML catalog +## + +# Update the centralized catalog corresponding to this version of the DTD +# DocBook V3.0 +$XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-3.0-$VERSION-$RELEASE.cat \ + $CSWSGML/sgml-iso-entities-8879.1986/catalog +$XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-3.0-$VERSION-$RELEASE.cat \ + $CSWSGML/docbook/sgml-dtd-3.0-$VERSION-$RELEASE/catalog + +# DocBook V3.1 +$XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-3.1-$VERSION-$RELEASE.cat \ + $CSWSGML/sgml-iso-entities-8879.1986/catalog +$XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-3.1-$VERSION-$RELEASE.cat \ + $CSWSGML/docbook/sgml-dtd-3.1-$VERSION-$RELEASE/catalog + +# DocBook V4.0 +$XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-4.0-$VERSION-$RELEASE.cat \ + $CSWSGML/sgml-iso-entities-8879.1986/catalog +$XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-4.0-$VERSION-$RELEASE.cat \ + $CSWSGML/docbook/sgml-dtd-4.0-$VERSION-$RELEASE/catalog + +# DocBook V4.1 +$XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-4.1-$VERSION-$RELEASE.cat \ + $CSWSGML/sgml-iso-entities-8879.1986/catalog +$XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-4.1-$VERSION-$RELEASE.cat \ + $CSWSGML/docbook/sgml-dtd-4.1-$VERSION-$RELEASE/catalog + +# DocBook XML V4.1.2 +$XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/xml-docbook-4.1.2-$VERSION-$RELEASE.cat \ + $CSWSGML/sgml-iso-entities-8879.1986/catalog +$XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/xml-docbook-4.1.2-$VERSION-$RELEASE.cat \ + $CSWSGML/docbook/xml-dtd-4.1.2-$VERSION-$RELEASE/catalog + +# DocBook V4.2 +$XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-4.2-$VERSION-$RELEASE.cat \ + $CSWSGML/sgml-iso-entities-8879.1986/catalog +$XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-4.2-$VERSION-$RELEASE.cat \ + $CSWSGML/docbook/sgml-dtd-4.2-$VERSION-$RELEASE/catalog + +# DocBook XML V4.2 +$XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/xml-docbook-4.2-$VERSION-$RELEASE.cat \ + $CSWSGML/sgml-iso-entities-8879.1986/catalog +$XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/xml-docbook-4.2-$VERSION-$RELEASE.cat \ + $CSWSGML/docbook/xml-dtd-4.2-$VERSION-$RELEASE/catalog + +# DocBook V4.3 +$XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-4.3-$VERSION-$RELEASE.cat \ + $CSWSGML/sgml-iso-entities-8879.1986/catalog +$XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-4.3-$VERSION-$RELEASE.cat \ + $CSWSGML/docbook/sgml-dtd-4.3-$VERSION-$RELEASE/catalog + +# DocBook XML V4.3 +$XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/xml-docbook-4.3-$VERSION-$RELEASE.cat \ + $CSWSGML/sgml-iso-entities-8879.1986/catalog +$XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/xml-docbook-4.3-$VERSION-$RELEASE.cat \ + $CSWSGML/docbook/xml-dtd-4.3-$VERSION-$RELEASE/catalog + +# DocBook V4.4 +$XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-4.4-$VERSION-$RELEASE.cat \ + $CSWSGML/sgml-iso-entities-8879.1986/catalog +$XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-4.4-$VERSION-$RELEASE.cat \ + $CSWSGML/docbook/sgml-dtd-4.4-$VERSION-$RELEASE/catalog + +# DocBook XML V4.4 +$XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/xml-docbook-4.4-$VERSION-$RELEASE.cat \ + $CSWSGML/sgml-iso-entities-8879.1986/catalog +$XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/xml-docbook-4.4-$VERSION-$RELEASE.cat \ + $CSWSGML/docbook/xml-dtd-4.4-$VERSION-$RELEASE/catalog + +# The following lines are for the case in which the style sheets +# were installed after another DTD but before this DTD +STYLESHEETS=`echo $CSWSGML/docbook/dsssl-stylesheets-*` +#STYLESHEETS=${STYLESHEETS##*/dsssl-stylesheets-} +STYLESHEETS=`echo $STYLESHEETS | sed 's#[^ ]*/dsssl-stylesheets-##g'` +if [ "$STYLESHEETS" != "*" ]; then + # DocBook V3.0 + $XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-3.0-$VERSION-$RELEASE.cat \ + $CSWSGML/openjade-$OPENJADEVER/catalog + $XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-3.0-$VERSION-$RELEASE.cat \ + $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog + + # DocBook V3.1 + $XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-3.1-$VERSION-$RELEASE.cat \ + $CSWSGML/openjade-$OPENJADEVER/catalog + $XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-3.1-$VERSION-$RELEASE.cat \ + $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog + + # DocBook V4.0 + $XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-4.0-$VERSION-$RELEASE.cat \ + $CSWSGML/openjade-$OPENJADEVER/catalog + $XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-4.0-$VERSION-$RELEASE.cat \ + $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog + + # DocBook V4.1 + $XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-4.1-$VERSION-$RELEASE.cat \ + $CSWSGML/openjade-$OPENJADEVER/catalog + $XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-4.1-$VERSION-$RELEASE.cat \ + $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog + + # DocBook XML V4.1.2 + $XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/xml-docbook-4.1.2-$VERSION-$RELEASE.cat \ + $CSWSGML/openjade-$OPENJADEVER/catalog + $XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/xml-docbook-4.1.2-$VERSION-$RELEASE.cat \ + $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog + + # DocBook V4.2 + $XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-4.2-$VERSION-$RELEASE.cat \ + $CSWSGML/openjade-$OPENJADEVER/catalog + $XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-4.2-$VERSION-$RELEASE.cat \ + $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog + + # DocBook XML V4.2 + $XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/xml-docbook-4.2-$VERSION-$RELEASE.cat \ + $CSWSGML/openjade-$OPENJADEVER/catalog + $XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/xml-docbook-4.2-$VERSION-$RELEASE.cat \ + $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog + + # DocBook V4.3 + $XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-4.3-$VERSION-$RELEASE.cat \ + $CSWSGML/openjade-$OPENJADEVER/catalog + $XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-4.3-$VERSION-$RELEASE.cat \ + $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog + + # DocBook XML V4.3 + $XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/xml-docbook-4.3-$VERSION-$RELEASE.cat \ + $CSWSGML/openjade-$OPENJADEVER/catalog + $XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/xml-docbook-4.3-$VERSION-$RELEASE.cat \ + $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog + + # DocBook V4.4 + $XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-4.4-$VERSION-$RELEASE.cat \ + $CSWSGML/openjade-$OPENJADEVER/catalog + $XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-4.4-$VERSION-$RELEASE.cat \ + $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog + + # DocBook XML V4.4 + $XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/xml-docbook-4.4-$VERSION-$RELEASE.cat \ + $CSWSGML/openjade-$OPENJADEVER/catalog + $XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/xml-docbook-4.4-$VERSION-$RELEASE.cat \ + $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog +fi + +# Fix up SGML super catalog so that there isn't an XML DTD before an +# SGML one. We need to do this (*sigh*) because xmlcatalog messes up +# the order of the lines, and SGML tools don't like to see XML things +# they aren't expecting. +CATALOG=$CSWSGMLCNF/catalog +SGML=`cat -n ${CATALOG} | grep sgml-docbook | head -1 | awk '{print $1}'` +XML=`cat -n ${CATALOG} | grep xml-docbook | head -1 | awk '{print $1}'` + +# Do they need switching around? +if [ -n "${XML}" ] && [ -n "${SGML}" ] && [ "${XML}" -lt "${SGML}" ] +then + XML=`expr $XML - 1` + SGML=`expr $SGML - 1` + + # make sure we're using the system perl, as we know for sure that it + # can handle this operation correctly. + /usr/bin/perl -e "@_=<>;@_[$XML,$SGML]=@_[$SGML,$XML];print @_" \ + ${CATALOG} > ${CATALOG}.tmp + + mv ${CATALOG}.tmp ${CATALOG}.new +fi + +## +## XML catalog +## + +CATALOG=$CSWSGML/docbook/xmlcatalog + +if [ -w $CATALOG ] +then + # DocBook XML V4.1.2 + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Publishing//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-pub.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Greek Letters//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-grk1.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/dbpoolx.mod" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-box.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//DTD DocBook XML V4.1.2//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/docbookx.dtd" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Greek Symbols//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-grk3.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amsn.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-num.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/dbcentx.mod" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-grk4.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/dbnotnx.mod" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-dia.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-grk2.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/dbgenent.mod" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/dbhierx.mod" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amsa.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amso.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-cyrl.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES General Technical//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-tech.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amsc.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/soextblx.dtd" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/calstblx.dtd" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Latin 1//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-lat1.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amsb.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Latin 2//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-lat2.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amsr.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-cyr2.ent" $CATALOG + $XMLCAT --noout --add "rewriteSystem" \ + "http://www.oasis-open.org/docbook/xml/4.1.2" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE" $CATALOG + $XMLCAT --noout --add "rewriteURI" \ + "http://www.oasis-open.org/docbook/xml/4.1.2" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE" $CATALOG + + # DocBook XML V4.2 + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Publishing//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-pub.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Greek Letters//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-grk1.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook XML Information Pool V4.2//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/dbpoolx.mod" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-box.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//DTD DocBook XML V4.2//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/docbookx.dtd" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Greek Symbols//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-grk3.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amsn.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-num.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Character Entities V4.2//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/dbcentx.mod" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-grk4.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Notations V4.2//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/dbnotnx.mod" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-dia.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-grk2.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.2//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/dbgenent.mod" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.2//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/dbhierx.mod" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amsa.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amso.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-cyrl.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES General Technical//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-tech.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amsc.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/soextblx.dtd" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//DTD DocBook XML CALS Table Model V4.2//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/calstblx.dtd" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Latin 1//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-lat1.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amsb.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Latin 2//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-lat2.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amsr.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-cyr2.ent" $CATALOG + $XMLCAT --noout --add "rewriteSystem" \ + "http://www.oasis-open.org/docbook/xml/4.2" \ + "xml-dtd-4.2-$VERSION-$RELEASE" $CATALOG + $XMLCAT --noout --add "rewriteURI" \ + "http://www.oasis-open.org/docbook/xml/4.2" \ + "xml-dtd-4.2-$VERSION-$RELEASE" $CATALOG + + # DocBook XML V4.3 + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Publishing//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-pub.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Greek Letters//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-grk1.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook XML Information Pool V4.3//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/dbpoolx.mod" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-box.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//DTD DocBook XML V4.3//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/docbookx.dtd" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Greek Symbols//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-grk3.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amsn.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-num.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Character Entities V4.3//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/dbcentx.mod" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-grk4.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Notations V4.3//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/dbnotnx.mod" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-dia.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-grk2.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.3//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/dbgenent.mod" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.3//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/dbhierx.mod" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amsa.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amso.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-cyrl.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES General Technical//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-tech.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amsc.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/soextblx.dtd" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//DTD DocBook XML CALS Table Model V4.3//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/calstblx.dtd" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Latin 1//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-lat1.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amsb.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Latin 2//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-lat2.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amsr.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-cyr2.ent" $CATALOG + $XMLCAT --noout --add "rewriteSystem" \ + "http://www.oasis-open.org/docbook/xml/4.3" \ + "xml-dtd-4.3-$VERSION-$RELEASE" $CATALOG + $XMLCAT --noout --add "rewriteURI" \ + "http://www.oasis-open.org/docbook/xml/4.3" \ + "xml-dtd-4.3-$VERSION-$RELEASE" $CATALOG + + # DocBook XML V4.4 + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Publishing//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-pub.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Greek Letters//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-grk1.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook XML Information Pool V4.4//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/dbpoolx.mod" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-box.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//DTD DocBook XML V4.4//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/docbookx.dtd" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Greek Symbols//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-grk3.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amsn.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-num.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Character Entities V4.4//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/dbcentx.mod" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-grk4.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Notations V4.4//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/dbnotnx.mod" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-dia.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-grk2.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.4//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/dbgenent.mod" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.4//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/dbhierx.mod" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amsa.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amso.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-cyrl.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES General Technical//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-tech.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amsc.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/soextblx.dtd" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//DTD DocBook XML CALS Table Model V4.4//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/calstblx.dtd" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Latin 1//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-lat1.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amsb.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Latin 2//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-lat2.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amsr.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-cyr2.ent" $CATALOG + $XMLCAT --noout --add "rewriteSystem" \ + "http://www.oasis-open.org/docbook/xml/4.4" \ + "xml-dtd-4.4-$VERSION-$RELEASE" $CATALOG + $XMLCAT --noout --add "rewriteURI" \ + "http://www.oasis-open.org/docbook/xml/4.4" \ + "xml-dtd-4.4-$VERSION-$RELEASE" $CATALOG +fi + +# Finally, make sure everything in $CSWSGMLCNF is readable! +/bin/chmod a+r $CSWSGMLCNF/* Added: csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.preremove =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.preremove (rev 0) +++ csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.preremove 2008-12-08 15:12:46 UTC (rev 2476) @@ -0,0 +1,337 @@ +#!/bin/sh + +# NOTE: This script is a lightly modified version of the one included in the +# rhel5 docbook-dtds rpm spec. +# 20081204 -bw + +if [ -n "$PKG_INSTALL_ROOT" -a "$PKG_INSTALL_ROOT" != "/" ]; then + chroot $PKG_INSTALL_ROOT +fi + +XMLCAT=/opt/csw/bin/xmlcatalog +CSWSGMLCNF=/opt/csw/etc/sgml +CSWSGML=/opt/csw/share/sgml + +VERSION=1.0 +RELEASE=30.1 + +OPENJADEVER=1.3.2 + +## +## SGML catalog +## + +# Update the centralized catalog corresponding to this version of the DTD +# DocBook V3.0 +$XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ + $CSWSGMLCNF/sgml-docbook-3.0-$VERSION-$RELEASE.cat +rm -f $CSWSGMLCNF/sgml-docbook-3.0-$VERSION-$RELEASE.cat + +# DocBook V3.1 +$XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ + $CSWSGMLCNF/sgml-docbook-3.1-$VERSION-$RELEASE.cat +rm -f $CSWSGMLCNF/sgml-docbook-3.1-$VERSION-$RELEASE.cat + +# DocBook V4.0 +$XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ + $CSWSGMLCNF/sgml-docbook-4.0-$VERSION-$RELEASE.cat +rm -f $CSWSGMLCNF/sgml-docbook-4.0-$VERSION-$RELEASE.cat + +# DocBook V4.1 +$XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ + $CSWSGMLCNF/sgml-docbook-4.1-$VERSION-$RELEASE.cat +rm -f $CSWSGMLCNF/sgml-docbook-4.1-$VERSION-$RELEASE.cat + +# DocBook XML V4.1.2 +$XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ + $CSWSGMLCNF/xml-docbook-4.1.2-$VERSION-$RELEASE.cat +rm -f $CSWSGMLCNF/xml-docbook-4.1.2-$VERSION-$RELEASE.cat + +# DocBook V4.2 +$XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ + $CSWSGMLCNF/sgml-docbook-4.2-$VERSION-$RELEASE.cat +rm -f $CSWSGMLCNF/sgml-docbook-4.2-$VERSION-$RELEASE.cat + +# DocBook XML V4.2 +$XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ + $CSWSGMLCNF/xml-docbook-4.2-$VERSION-$RELEASE.cat +rm -f $CSWSGMLCNF/xml-docbook-4.2-$VERSION-$RELEASE.cat + +# DocBook V4.3 +$XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ + $CSWSGMLCNF/sgml-docbook-4.3-$VERSION-$RELEASE.cat +rm -f $CSWSGMLCNF/sgml-docbook-4.3-$VERSION-$RELEASE.cat + +# DocBook XML V4.3 +$XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ + $CSWSGMLCNF/xml-docbook-4.3-$VERSION-$RELEASE.cat +rm -f $CSWSGMLCNF/xml-docbook-4.3-$VERSION-$RELEASE.cat + +# DocBook V4.4 +$XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ + $CSWSGMLCNF/sgml-docbook-4.4-$VERSION-$RELEASE.cat +rm -f $CSWSGMLCNF/sgml-docbook-4.4-$VERSION-$RELEASE.cat + +# DocBook XML V4.4 +$XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ + $CSWSGMLCNF/xml-docbook-4.4-$VERSION-$RELEASE.cat +rm -f $CSWSGMLCNF/xml-docbook-4.4-$VERSION-$RELEASE.cat + +# Fix up SGML super catalog so that there isn't an XML DTD before an +# SGML one. We need to do this (*sigh*) because xmlcatalog messes up +# the order of the lines, and SGML tools don't like to see XML things +# they aren't expecting. +CATALOG=$CSWSGMLCNF/catalog +SGML=`cat -n ${CATALOG} | grep sgml-docbook | head -1 | awk '{print $1}'` +XML=`cat -n ${CATALOG} | grep xml-docbook | head -1 | awk '{print $1}'` +# Do they need switching around? +if [ -n "${XML}" ] && [ -n "${SGML}" ] && [ "${XML}" -lt "${SGML}" ] +then + # Switch those two lines around. + XML=`expr $XML - 1` + SGML=`expr $SGML - 1` + /usr/bin/perl -e "@_=<>;@_[$XML, $SGML]=@_[$SGML, $XML];print @_" \ + ${CATALOG} > ${CATALOG}.tmp + mv -f ${CATALOG}.tmp ${CATALOG} +fi + +## +## XML catalog +## + +CATALOG=$CSWSGML/docbook/xmlcatalog + +if [ -w $CATALOG ] +then + # DocBook XML V4.1.2 + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-pub.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-grk1.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/dbpoolx.mod" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-box.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/docbookx.dtd" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-grk3.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amsn.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-num.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/dbcentx.mod" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-grk4.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/dbnotnx.mod" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-dia.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-grk2.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/dbgenent.mod" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/dbhierx.mod" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amsa.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amso.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-cyrl.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-tech.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amsc.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/soextblx.dtd" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/calstblx.dtd" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-lat1.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amsb.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-lat2.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amsr.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-cyr2.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE" $CATALOG + + # DocBook XML V4.2 + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-pub.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-grk1.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/dbpoolx.mod" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-box.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/docbookx.dtd" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-grk3.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amsn.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-num.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/dbcentx.mod" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-grk4.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/dbnotnx.mod" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-dia.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-grk2.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/dbgenent.mod" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/dbhierx.mod" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amsa.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amso.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-cyrl.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-tech.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amsc.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/soextblx.dtd" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/calstblx.dtd" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-lat1.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amsb.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-lat2.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amsr.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-cyr2.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE" $CATALOG + + # DocBook XML V4.3 + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-pub.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-grk1.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/dbpoolx.mod" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-box.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/docbookx.dtd" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-grk3.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amsn.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-num.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/dbcentx.mod" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-grk4.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/dbnotnx.mod" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-dia.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-grk2.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/dbgenent.mod" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/dbhierx.mod" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amsa.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amso.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-cyrl.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-tech.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amsc.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/soextblx.dtd" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/calstblx.dtd" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-lat1.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amsb.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-lat2.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amsr.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-cyr2.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE" $CATALOG + + # DocBook XML V4.4 + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-pub.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-grk1.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/dbpoolx.mod" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-box.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/docbookx.dtd" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-grk3.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amsn.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-num.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/dbcentx.mod" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-grk4.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/dbnotnx.mod" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-dia.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-grk2.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/dbgenent.mod" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/dbhierx.mod" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amsa.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amso.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-cyrl.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-tech.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amsc.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/soextblx.dtd" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/calstblx.dtd" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-lat1.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amsb.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-lat2.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amsr.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-cyr2.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE" $CATALOG +fi Modified: csw/mgar/pkg/docbook-dtds/trunk/files/Makefile =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/Makefile 2008-12-08 14:22:03 UTC (rev 2475) +++ csw/mgar/pkg/docbook-dtds/trunk/files/Makefile 2008-12-08 15:12:46 UTC (rev 2476) @@ -1,11 +1,14 @@ prefix = /opt/csw +sysconfdir = $(prefix)/etc datadir = $(prefix)/share + INSTALL = /opt/csw/bin/ginstall -c INSTALL_DATA = $(INSTALL) -m 0644 INSTALL_DIR = $(INSTALL) -m 0755 -d docbookdir = $(datadir)/sgml/docbook +docdir = $(datadir)/doc/docbookdtds SGML = $(wildcard *-sgml) XML = $(wildcard *-xml) @@ -17,8 +20,34 @@ all: build -install: $(SGMLTARG) $(XMLTARG) +install: $(SGMLTARG) $(XMLTARG) links docs +links: $(SGMLTARG) $(XMLTARG) + @echo Installing links to most current SGML and XML catalogs + @( $(INSTALL_DIR) $(DESTDIR)/$(sysconfdir)/sgml; \ + cd $(DESTDIR)/$(sysconfdir)/sgml; \ + [ -h $(DESTDIR)/$(sysconfdir)/sgml/sgml-docbook.cat ] || \ + ln -s sgml-docbook-4.4-$(GARVERSION)-$(PATCHLEVEL).cat \ + $(DESTDIR)/$(sysconfdir)/sgml/sgml-docbook.cat; \ + [ -h $(DESTDIR)/$(sysconfdir)/sgml/xml-docbook.cat ] || \ + ln -s xml-docbook-4.4-$(GARVERSION)-$(PATCHLEVEL).cat \ + $(DESTDIR)/$(sysconfdir)/sgml/xml-docbook.cat ) + +docs: + @echo Installing docs + $(INSTALL_DIR) $(DESTDIR)/$(docdir)/ + for d in *; do \ + if [ "`echo $$d/*txt`" != "$$d/*txt" ]; then \ + $(INSTALL_DIR) $(DESTDIR)/$(docdir)/$$d; \ + $(INSTALL_DATA) $$d/*txt $(DESTDIR)/$(docdir)/$$d/; \ + fi \ + done + for x in 3 4; do \ + dir=$(DESTDIR)/$(docdir)/$$x.1-sgml; \ + [ -d $$dir ] || $(INSTALL_DIR) $$dir; \ + $(INSTALL_DATA) $$x.1-sgml/ChangeLog $$dir/; \ + done + inst-%-sgml: DD=$(DESTDIR)/$(docbookdir)/sgml-dtd-$*$(GARVERSION)-$(PATCHLEVEL) inst-%-sgml: @echo Installing $*-sgml This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvel at opencsw.org Mon Dec 8 19:47:27 2008 From: trygvel at opencsw.org (=?ISO-8859-1?Q?Trygve_Laugst=F8l?=) Date: Mon, 08 Dec 2008 19:47:27 +0100 Subject: [csw-devel] SF.net SVN: gar:[2467] csw/mgar/pkg/clamav/trunk In-Reply-To: References: Message-ID: <493D6BBF.6060305@opencsw.org> Hi Peter You might want to look into Dago's v2 of GAR to handle the splitting of packages. ClamAV should be a good example project for others to look at from what I can see. -- Trygve bonivart at users.sourceforge.net wrote: > Revision: 2467 > http://gar.svn.sourceforge.net/gar/?rev=2467&view=rev > Author: bonivart > Date: 2008-12-07 13:33:00 +0000 (Sun, 07 Dec 2008) > > Log Message: > ----------- > clamav: multiple packages > > Modified Paths: > -------------- > csw/mgar/pkg/clamav/trunk/Makefile > csw/mgar/pkg/clamav/trunk/checksums > > Modified: csw/mgar/pkg/clamav/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/clamav/trunk/Makefile 2008-12-07 12:47:24 UTC (rev 2466) > +++ csw/mgar/pkg/clamav/trunk/Makefile 2008-12-07 13:33:00 UTC (rev 2467) > @@ -1,5 +1,6 @@ > -# add re for update notification > -# split into multiple packages: clamav, libclamav > +# clamav, Peter Bonivart > +# files outside /opt/csw are not included, need to fix gspec and cswproto > +# split into multiple packages: clamav, libclamav, clamavdb? > # put libs in lib/32? > # add depend files > # add rc/smf support > @@ -8,6 +9,7 @@ > # add etc/clamd? > # add doc/README.CSW, INSTALL.clamav-milter.CSW > # check mantis bugs > +# + add re for update notification > # + add contrib > # + add html docs and some pdf:s > # + remove *.a, *.la from libs > @@ -27,9 +29,12 @@ > > MASTER_SITES = http://freshmeat.net/redir/clamav/29355/url_tgz/ > DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz > +DISTFILES += $(call admfiles,CSWlibclamav,) > DISTFILES += $(call admfiles,CSWclamav,) > -#DISTFILES += $(call admfiles,CSWlibclamav,) > > +# We define upstream file regex so we can be notifed of new upstream software release > +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz > + > GARCOMPILER = GNU > GNU_CC_HOME = /opt/csw/gcc3 > > @@ -43,6 +48,9 @@ > > include gar/category.mk > > +PKGFILE_CSWlibclamav_EXCLUSIVE = $(libdir)/.* > +PKGFILE_CSWlibclamav_EXCLUSIVE += $(includedir)/.* > + > SPKG_SOURCEURL = http://www.clamav.net/ > > pre-package: > > Modified: csw/mgar/pkg/clamav/trunk/checksums > =================================================================== > --- csw/mgar/pkg/clamav/trunk/checksums 2008-12-07 12:47:24 UTC (rev 2466) > +++ csw/mgar/pkg/clamav/trunk/checksums 2008-12-07 13:33:00 UTC (rev 2467) > @@ -1,2 +1,3 @@ > 1181e6d62341b84708f126cc353f7ebf download/clamav-0.94.2.tar.gz > df9572dc44907a1ceff3561f9b834e20 download/CSWclamav.gspec > +6edc8660bde0b27d3676699eacb51884 download/CSWlibclamav.gspec > > > 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 trygvel at opencsw.org Mon Dec 8 19:57:11 2008 From: trygvel at opencsw.org (=?ISO-8859-1?Q?Trygve_Laugst=F8l?=) Date: Mon, 08 Dec 2008 19:57:11 +0100 Subject: [csw-devel] GAR v2 and merging stuff Message-ID: <493D6E07.70501@opencsw.org> Hi (Dago) Shouldn't this build actually work as the build machine support amd64? http://buildfarm.opencsw.org/hudson/job/libogg-i386-pc-solaris2.8/0/console What where the goals to dump the configuration/possible settings available? I'd like to have each build dump that before building, should make it easier to find discrepancies between what you have at home and what the build farm uses. -- Trygve From bonivart at opencsw.org Mon Dec 8 21:01:48 2008 From: bonivart at opencsw.org (Peter Bonivart) Date: Mon, 8 Dec 2008 21:01:48 +0100 Subject: [csw-devel] SF.net SVN: gar:[2467] csw/mgar/pkg/clamav/trunk In-Reply-To: <493D6BBF.6060305@opencsw.org> References: <493D6BBF.6060305@opencsw.org> Message-ID: <625385e30812081201s24cb11bl59a46802056156a8@mail.gmail.com> On Mon, Dec 8, 2008 at 7:47 PM, Trygve Laugst?l wrote: > Hi Peter > > You might want to look into Dago's v2 of GAR to handle the splitting of > packages. ClamAV should be a good example project for others to look at > from what I can see. Yes, I figured out that only v2 supports the easy splitting, I have now switched to v2 but ran into other weird problems that I have mailed Dago about. In the meantime I'm testing my first all-in-one build and it seems to work which is good. :-) -- /peter From trygvel at opencsw.org Mon Dec 8 22:11:58 2008 From: trygvel at opencsw.org (=?ISO-8859-1?Q?Trygve_Laugst=F8l?=) Date: Mon, 08 Dec 2008 22:11:58 +0100 Subject: [csw-devel] SF.net SVN: gar:[2467] csw/mgar/pkg/clamav/trunk In-Reply-To: <625385e30812081201s24cb11bl59a46802056156a8@mail.gmail.com> References: <493D6BBF.6060305@opencsw.org> <625385e30812081201s24cb11bl59a46802056156a8@mail.gmail.com> Message-ID: <493D8D9E.3070506@opencsw.org> Peter Bonivart wrote: > On Mon, Dec 8, 2008 at 7:47 PM, Trygve Laugst?l wrote: >> Hi Peter >> >> You might want to look into Dago's v2 of GAR to handle the splitting of >> packages. ClamAV should be a good example project for others to look at >> from what I can see. > > Yes, I figured out that only v2 supports the easy splitting, I have > now switched to v2 but ran into other weird problems that I have > mailed Dago about. In the meantime I'm testing my first all-in-one > build and it seems to work which is good. :-) Cool :) I just added the builds to Hudson as well: http://buildfarm.opencsw.org/hudson/job/clamav-sparc-sun-solaris2.8/0/console It actually did build, but I'm not sure why the last step failed. -- Trygve From bonivart at opencsw.org Mon Dec 8 22:32:38 2008 From: bonivart at opencsw.org (Peter Bonivart) Date: Mon, 8 Dec 2008 22:32:38 +0100 Subject: [csw-devel] SF.net SVN: gar:[2467] csw/mgar/pkg/clamav/trunk In-Reply-To: <493D8D9E.3070506@opencsw.org> References: <493D6BBF.6060305@opencsw.org> <625385e30812081201s24cb11bl59a46802056156a8@mail.gmail.com> <493D8D9E.3070506@opencsw.org> Message-ID: <625385e30812081332v35eeb8d9ja4886985f6dde736@mail.gmail.com> On Mon, Dec 8, 2008 at 10:11 PM, Trygve Laugst?l wrote: > It actually did build, but I'm not sure why the last step failed. Looks like it couldn't create the temporary gz-file in /tmp..? -- /peter From trygvel at opencsw.org Mon Dec 8 22:54:41 2008 From: trygvel at opencsw.org (=?ISO-8859-1?Q?Trygve_Laugst=F8l?=) Date: Mon, 08 Dec 2008 22:54:41 +0100 Subject: [csw-devel] SF.net SVN: gar:[2467] csw/mgar/pkg/clamav/trunk In-Reply-To: <625385e30812081332v35eeb8d9ja4886985f6dde736@mail.gmail.com> References: <493D6BBF.6060305@opencsw.org> <625385e30812081201s24cb11bl59a46802056156a8@mail.gmail.com> <493D8D9E.3070506@opencsw.org> <625385e30812081332v35eeb8d9ja4886985f6dde736@mail.gmail.com> Message-ID: <493D97A1.7050405@opencsw.org> Peter Bonivart wrote: > On Mon, Dec 8, 2008 at 10:11 PM, Trygve Laugst?l wrote: >> It actually did build, but I'm not sure why the last step failed. > > Looks like it couldn't create the temporary gz-file in /tmp..? > Aha, look here: [22:53:20][hudson at build8s:~]$ ls -l /tmp/clamav-* -rw-r--r-- 1 hudson csw 3075072 Dec 8 22:11 /tmp/clamav-0.94.2,REV=2008.12.08-SunOS5.8-sparc-CSW.pkg -rw-r--r-- 1 bonivart csw 17617 Dec 8 17:50 /tmp/clamav-0.94.2,REV=2008.12.08-SunOS5.8-sparc-CSW.pkg.gz I guess this can be considered a bug in GAR that those files are not cleaned up, but I was sure they where after the .gz was built. Dago? http://buildfarm.opencsw.org/hudson/job/clamav-i386-pc-solaris2.8/0/console -- Trygve From dam at opencsw.org Mon Dec 8 23:56:54 2008 From: dam at opencsw.org (Dagobert Michelsen) Date: Mon, 8 Dec 2008 23:56:54 +0100 Subject: [csw-devel] GAR v2 and merging stuff In-Reply-To: <493D6E07.70501@opencsw.org> References: <493D6E07.70501@opencsw.org> Message-ID: <0DDCD941-2F2A-4212-8E2D-36A91A3D7766@opencsw.org> Hi Trygve, Am 08.12.2008 um 19:57 schrieb Trygve Laugst?l: > Hi (Dago) > > Shouldn't this build actually work as the build machine support amd64? No, it does not. Solaris 8 x86 supports only 32 bit. That's what I talked about: GAR should ssh over to Solaris 10 x86 and build amd64 there. > http://buildfarm.opencsw.org/hudson/job/libogg-i386-pc-solaris2.8/0/console > > What where the goals to dump the configuration/possible settings > available? I'm sorry, I don't understand what you are talking about. Shell environment? > I'd like to have each build dump that before building, should > make it easier to find discrepancies between what you have at home and > what the build farm uses. ?hm, what dump? Best regards -- Dago From dam at opencsw.org Mon Dec 8 23:59:16 2008 From: dam at opencsw.org (Dagobert Michelsen) Date: Mon, 8 Dec 2008 23:59:16 +0100 Subject: [csw-devel] SF.net SVN: gar:[2467] csw/mgar/pkg/clamav/trunk In-Reply-To: <493D97A1.7050405@opencsw.org> References: <493D6BBF.6060305@opencsw.org> <625385e30812081201s24cb11bl59a46802056156a8@mail.gmail.com> <493D8D9E.3070506@opencsw.org> <625385e30812081332v35eeb8d9ja4886985f6dde736@mail.gmail.com> <493D97A1.7050405@opencsw.org> Message-ID: <1B6136FD-1A37-4A57-B1AD-53BE2DA3E66A@opencsw.org> Hi Trygve, Am 08.12.2008 um 22:54 schrieb Trygve Laugst?l: > Aha, look here: > > [22:53:20][hudson at build8s:~]$ ls -l /tmp/clamav-* > -rw-r--r-- 1 hudson csw 3075072 Dec 8 22:11 > /tmp/clamav-0.94.2,REV=2008.12.08-SunOS5.8-sparc-CSW.pkg > -rw-r--r-- 1 bonivart csw 17617 Dec 8 17:50 > /tmp/clamav-0.94.2,REV=2008.12.08-SunOS5.8-sparc-CSW.pkg.gz > > I guess this can be considered a bug in GAR that those files are not > cleaned up, but I was sure they where after the .gz was built. Dago? > > http://buildfarm.opencsw.org/hudson/job/clamav-i386-pc-solaris2.8/0/console I'd say Peter copied the package to tmp manually and GAR couldn't overwrite it. Correct, Peter? ;-) Best regards -- Dago From dam at opencsw.org Tue Dec 9 00:01:04 2008 From: dam at opencsw.org (Dagobert Michelsen) Date: Tue, 9 Dec 2008 00:01:04 +0100 Subject: [csw-devel] SF.net SVN: gar:[2467] csw/mgar/pkg/clamav/trunk In-Reply-To: References: Message-ID: Hi Peter, Am 07.12.2008 um 14:33 schrieb bonivart at users.sourceforge.net: > +PKGFILE_CSWlibclamav_EXCLUSIVE = $(libdir)/.* > +PKGFILE_CSWlibclamav_EXCLUSIVE += $(includedir)/.* Well, that's another thing I have changed: This is now called PKGFILE_CSWlibclamav = ... (that is, files are now exclusively in one package by default and _SHARED otherwise). Sorry for the inconvenience. Best regards -- Dago From wbonnet at users.sourceforge.net Tue Dec 9 00:08:00 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 08 Dec 2008 23:08:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[2477] csw/mgar/gar Message-ID: Revision: 2477 http://gar.svn.sourceforge.net/gar/?rev=2477&view=rev Author: wbonnet Date: 2008-12-08 23:07:54 +0000 (Mon, 08 Dec 2008) Log Message: ----------- lftp timeout raised from 10 to 30 seconds Modified Paths: -------------- csw/mgar/gar/v1/bin/upstream_watch csw/mgar/gar/v2/bin/upstream_watch Modified: csw/mgar/gar/v1/bin/upstream_watch =================================================================== --- csw/mgar/gar/v1/bin/upstream_watch 2008-12-08 15:12:46 UTC (rev 2476) +++ csw/mgar/gar/v1/bin/upstream_watch 2008-12-08 23:07:54 UTC (rev 2477) @@ -90,7 +90,7 @@ $http_proxy_cmd = "set http:proxy $ENV{HTTP_PROXY};" if exists $ENV{HTTP_PROXY}; $http_proxy_cmd = "set http:proxy $ENV{http_proxy};" if exists $ENV{http_proxy}; - open (FH, "lftp -q -c \"set net:timeout 10; set net:max-retries 16; $ftp_proxy_cmd $http_proxy_cmd open $url/ && ls\" 2>/dev/null |"); + open (FH, "lftp -q -c \"set net:timeout 30; set net:max-retries 16; $ftp_proxy_cmd $http_proxy_cmd open $url/ && ls\" 2>/dev/null |"); while (my $line = ) { my @cols = split (/\s+/, $line); Modified: csw/mgar/gar/v2/bin/upstream_watch =================================================================== --- csw/mgar/gar/v2/bin/upstream_watch 2008-12-08 15:12:46 UTC (rev 2476) +++ csw/mgar/gar/v2/bin/upstream_watch 2008-12-08 23:07:54 UTC (rev 2477) @@ -90,7 +90,7 @@ $http_proxy_cmd = "set http:proxy $ENV{HTTP_PROXY};" if exists $ENV{HTTP_PROXY}; $http_proxy_cmd = "set http:proxy $ENV{http_proxy};" if exists $ENV{http_proxy}; - open (FH, "lftp -q -c \"set net:timeout 10; set net:max-retries 16; $ftp_proxy_cmd $http_proxy_cmd open $url/ && ls\" 2>/dev/null |"); + open (FH, "lftp -q -c \"set net:timeout 30; set net:max-retries 16; $ftp_proxy_cmd $http_proxy_cmd open $url/ && ls\" 2>/dev/null |"); while (my $line = ) { my @cols = split (/\s+/, $line); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From william at wbonnet.net Mon Dec 8 23:13:14 2008 From: william at wbonnet.net (William Bonnet) Date: Mon, 08 Dec 2008 23:13:14 +0100 Subject: [csw-devel] X11 path in svn Message-ID: <493D9BFA.1000001@wbonnet.net> Hi I plan to create a directory called x11 under svn/pkgs. At the same level as cpan or xfce. Any objection ? cheers W. -- William http://www.wbonnet.net http://www.sunwizard.net Le site fran?ais des amateurs de stations Unix http://www.blastwave.org An OpenSolaris Community Site http://www.opencsw.org Community SoftWare for Solaris http://www.guses.org French speaking Solaris User Group From bonivart at opencsw.org Tue Dec 9 00:14:27 2008 From: bonivart at opencsw.org (Peter Bonivart) Date: Tue, 9 Dec 2008 00:14:27 +0100 Subject: [csw-devel] SF.net SVN: gar:[2467] csw/mgar/pkg/clamav/trunk In-Reply-To: <1B6136FD-1A37-4A57-B1AD-53BE2DA3E66A@opencsw.org> References: <493D6BBF.6060305@opencsw.org> <625385e30812081201s24cb11bl59a46802056156a8@mail.gmail.com> <493D8D9E.3070506@opencsw.org> <625385e30812081332v35eeb8d9ja4886985f6dde736@mail.gmail.com> <493D97A1.7050405@opencsw.org> <1B6136FD-1A37-4A57-B1AD-53BE2DA3E66A@opencsw.org> Message-ID: <625385e30812081514x44dd67fcq6ddca33cd0adc114@mail.gmail.com> On Mon, Dec 8, 2008 at 11:59 PM, Dagobert Michelsen wrote: > I'd say Peter copied the package to tmp manually and GAR couldn't > overwrite > it. Correct, Peter? ;-) No, but I aborted some builds so they may have left debris. -- /peter From trygvel at opencsw.org Tue Dec 9 00:16:56 2008 From: trygvel at opencsw.org (=?ISO-8859-1?Q?Trygve_Laugst=F8l?=) Date: Tue, 09 Dec 2008 00:16:56 +0100 Subject: [csw-devel] X11 path in svn In-Reply-To: <493D9BFA.1000001@wbonnet.net> References: <493D9BFA.1000001@wbonnet.net> Message-ID: <493DAAE8.6080005@opencsw.org> William Bonnet wrote: > Hi > > I plan to create a directory called x11 under svn/pkgs. At the same > level as cpan or xfce. Any objection ? +1 -- Trygve From bonivart at opencsw.org Tue Dec 9 00:18:06 2008 From: bonivart at opencsw.org (Peter Bonivart) Date: Tue, 9 Dec 2008 00:18:06 +0100 Subject: [csw-devel] SF.net SVN: gar:[2467] csw/mgar/pkg/clamav/trunk In-Reply-To: References: Message-ID: <625385e30812081518k2c42ea59l7aff6a34554daf64@mail.gmail.com> On Tue, Dec 9, 2008 at 12:01 AM, Dagobert Michelsen wrote: > Hi Peter, > > Am 07.12.2008 um 14:33 schrieb bonivart at users.sourceforge.net: >> +PKGFILE_CSWlibclamav_EXCLUSIVE = $(libdir)/.* >> +PKGFILE_CSWlibclamav_EXCLUSIVE += $(includedir)/.* > > Well, that's another thing I have changed: This is now called > PKGFILE_CSWlibclamav = ... > (that is, files are now exclusively in one package by default > and _SHARED otherwise). Sorry for the inconvenience. Hudson builds from what I last commited. Locally I have now switched to GAR v2 and removed the _EXCLUSIVE-part. I sent you a mail with the problems I got then. I'm sure I have missed something, maybe it's easiest if you look in my home dir or should I commit again? -- /peter From dam at opencsw.org Tue Dec 9 00:21:36 2008 From: dam at opencsw.org (Dagobert Michelsen) Date: Tue, 9 Dec 2008 00:21:36 +0100 Subject: [csw-devel] X11 path in svn In-Reply-To: <493D9BFA.1000001@wbonnet.net> References: <493D9BFA.1000001@wbonnet.net> Message-ID: <04477B6F-78CC-4317-8C49-CDB352FD34C5@opencsw.org> Hi William, Am 08.12.2008 um 23:13 schrieb William Bonnet: > I plan to create a directory called x11 under svn/pkgs. At the same > level as cpan or xfce. Any objection ? If this grouping makes sense for you please go ahead. Best regards -- Dago From william at wbonnet.net Mon Dec 8 23:23:53 2008 From: william at wbonnet.net (William Bonnet) Date: Mon, 08 Dec 2008 23:23:53 +0100 Subject: [csw-devel] X11 path in svn In-Reply-To: <493DAAE8.6080005@opencsw.org> References: <493D9BFA.1000001@wbonnet.net> <493DAAE8.6080005@opencsw.org> Message-ID: <493D9E79.1070904@wbonnet.net> Hi Trygve > William Bonnet wrote: > >> Hi >> >> I plan to create a directory called x11 under svn/pkgs. At the same >> level as cpan or xfce. Any objection ? >> > > +1 > BTW Same question for creating a java dir and move all jboss tomcat* log4g and other java libs like apache commons to this dir. Cheers -- William http://www.wbonnet.net http://www.sunwizard.net Le site fran?ais des amateurs de stations Unix http://www.blastwave.org An OpenSolaris Community Site http://www.opencsw.org Community SoftWare for Solaris http://www.guses.org French speaking Solaris User Group From dam at opencsw.org Tue Dec 9 00:25:26 2008 From: dam at opencsw.org (Dagobert Michelsen) Date: Tue, 9 Dec 2008 00:25:26 +0100 Subject: [csw-devel] X11 path in svn In-Reply-To: <493D9E79.1070904@wbonnet.net> References: <493D9BFA.1000001@wbonnet.net> <493DAAE8.6080005@opencsw.org> <493D9E79.1070904@wbonnet.net> Message-ID: Hi William, Am 08.12.2008 um 23:23 schrieb William Bonnet: > Hi Trygve >> William Bonnet wrote: >>> I plan to create a directory called x11 under svn/pkgs. At the same >>> level as cpan or xfce. Any objection ? >> >> +1 >> > BTW Same question for creating a java dir and move all jboss tomcat* > log4g and other java libs like apache commons to this dir. I planned to use /java for JDK/JRE stuff. Do you think it is a good idea to mix in real applications like tomcat? Which already have a userbase? Best regards -- Dago From william at wbonnet.net Mon Dec 8 23:25:39 2008 From: william at wbonnet.net (William Bonnet) Date: Mon, 08 Dec 2008 23:25:39 +0100 Subject: [csw-devel] X11 path in svn In-Reply-To: <04477B6F-78CC-4317-8C49-CDB352FD34C5@opencsw.org> References: <493D9BFA.1000001@wbonnet.net> <04477B6F-78CC-4317-8C49-CDB352FD34C5@opencsw.org> Message-ID: <493D9EE3.2090605@wbonnet.net> Hi > If this grouping makes sense for you please go ahead. > It does, it will contains all libs from Xorg. They share some compilation options, like prefix. Cheers -- William http://www.wbonnet.net http://www.sunwizard.net Le site fran?ais des amateurs de stations Unix http://www.blastwave.org An OpenSolaris Community Site http://www.opencsw.org Community SoftWare for Solaris http://www.guses.org French speaking Solaris User Group From trygvel at opencsw.org Tue Dec 9 05:17:07 2008 From: trygvel at opencsw.org (=?ISO-8859-1?Q?Trygve_Laugst=F8l?=) Date: Tue, 09 Dec 2008 05:17:07 +0100 Subject: [csw-devel] SF.net SVN: gar:[2467] csw/mgar/pkg/clamav/trunk In-Reply-To: <625385e30812081518k2c42ea59l7aff6a34554daf64@mail.gmail.com> References: <625385e30812081518k2c42ea59l7aff6a34554daf64@mail.gmail.com> Message-ID: <493DF143.1010103@opencsw.org> Peter Bonivart wrote: > On Tue, Dec 9, 2008 at 12:01 AM, Dagobert Michelsen wrote: >> Hi Peter, >> >> Am 07.12.2008 um 14:33 schrieb bonivart at users.sourceforge.net: >>> +PKGFILE_CSWlibclamav_EXCLUSIVE = $(libdir)/.* >>> +PKGFILE_CSWlibclamav_EXCLUSIVE += $(includedir)/.* >> Well, that's another thing I have changed: This is now called >> PKGFILE_CSWlibclamav = ... >> (that is, files are now exclusively in one package by default >> and _SHARED otherwise). Sorry for the inconvenience. > > Hudson builds from what I last commited. Locally I have now switched > to GAR v2 and removed the _EXCLUSIVE-part. I sent you a mail with the > problems I got then. I'm sure I have missed something, maybe it's > easiest if you look in my home dir or should I commit again? I would say that normally you should commit stuff if it work locally. If what you did can be done in a more optimal way, people will most likely let you know (or you can ask of course if you are really uncertain). -- Trygve From dmichelsen at users.sourceforge.net Tue Dec 9 09:53:59 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 08:53:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[2478] csw/mgar/gar/v2 Message-ID: Revision: 2478 http://gar.svn.sourceforge.net/gar/?rev=2478&view=rev Author: dmichelsen Date: 2008-12-09 08:53:59 +0000 (Tue, 09 Dec 2008) Log Message: ----------- mGAR v2: Use inline dynamic dependencies, prototypes target, prototype filter now work Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk csw/mgar/gar/v2/gar.mk csw/mgar/gar/v2/gar.pkg.mk Removed Paths: ------------- csw/mgar/gar/v2/bin/dependon Deleted: csw/mgar/gar/v2/bin/dependon =================================================================== --- csw/mgar/gar/v2/bin/dependon 2008-12-08 23:07:54 UTC (rev 2477) +++ csw/mgar/gar/v2/bin/dependon 2008-12-09 08:53:59 UTC (rev 2478) @@ -1,3 +0,0 @@ -#!/bin/sh - -/usr/bin/pkginfo "$@" | awk '{ $1 = "P"; print }' Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2008-12-08 23:07:54 UTC (rev 2477) +++ csw/mgar/gar/v2/gar.conf.mk 2008-12-09 08:53:59 UTC (rev 2478) @@ -22,6 +22,7 @@ COOKIEDIR ?= $(COOKIEROOTDIR)/$(MODULATION) EXTRACTDIR ?= $(WORKDIR) WORKSRC ?= $(WORKDIR)/$(DISTNAME) +WORKSRC_DEFAULT ?= $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/$(DISTNAME) INSTALLISADIR ?= $(WORKROOTDIR)/install-$(MODULATION) PKGDIR ?= $(WORKROOTDIR)/package SCRATCHDIR ?= tmp Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2008-12-08 23:07:54 UTC (rev 2477) +++ csw/mgar/gar/v2/gar.mk 2008-12-09 08:53:59 UTC (rev 2478) @@ -295,7 +295,8 @@ garchive: checksum $(GARCHIVE_TARGETS) ; # extract - Unpacks $(DISTFILES) into $(EXTRACTDIR) (patches are "zcatted" into the patch program) -EXTRACT_TARGETS = $(addprefix extract-archive-,$(filter-out $(NOEXTRACT),$(DISTFILES))) +EXTRACT_TARGETS-global ?= $(foreach SPEC,$(SPKG_SPECS),$(filter $(SPEC).%,$(DISTFILES))) +EXTRACT_TARGETS = $(addprefix extract-archive-,$(filter-out $(NOEXTRACT),$(if $(EXTRACT_TARGETS-$(MODULATION)),$(EXTRACT_TARGETS-$(MODULATION)),$(DISTFILES)))) # We call an additional extract-modulated without resetting any variables so # a complete unpacked set goes to the global dir for packaging (like gspec) Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2008-12-08 23:07:54 UTC (rev 2477) +++ csw/mgar/gar/v2/gar.pkg.mk 2008-12-09 08:53:59 UTC (rev 2478) @@ -61,7 +61,7 @@ PKGLIB = $(CURDIR)/$(GARDIR)/pkglib PKG_EXPORTS = GARNAME GARVERSION DESCRIPTION CATEGORIES GARCH GARDIR GARBIN -PKG_EXPORTS += CURDIR WORKDIR WORKSRC +PKG_EXPORTS += CURDIR WORKDIR WORKSRC WORKSRC_DEFAULT PKGROOT PKG_EXPORTS += SPKG_REVSTAMP SPKG_PKGNAME SPKG_DESC SPKG_VERSION SPKG_CATEGORY PKG_EXPORTS += SPKG_VENDOR SPKG_EMAIL SPKG_PSTAMP SPKG_BASEDIR SPKG_CLASSES PKG_EXPORTS += SPKG_OSNAME SPKG_SOURCEURL SPKG_PACKAGER TIMESTAMP @@ -107,7 +107,6 @@ PKGFILES_DEVEL += $(mandir)/man1/.*-config\.1.* PKGFILES_DEVEL += $(mandir)/man3/.* - # PKGFILES_DOC selects files beloging to a documentation package PKGFILES_DOC = $(docdir)/.* @@ -132,8 +131,8 @@ # This can be used to automatically distribute the files to different packages # -$(foreach SPEC,$(_PKG_SPECS),$(eval _PROTOTYPE_FILTER_$(SPEC) ?= | $(PROTOTYPE_FILTER_$(SPEC)))) -$(foreach SPEC,$(_PKG_SPECS),$(eval _PROTOTYPE_FILTER_$(SPEC) ?= | $(PROTOTYPE_FILTER))) +$(foreach SPEC,$(_PKG_SPECS),$(if $(PROTOTYPE_FILTER_$(SPEC)),$(eval _PROTOTYPE_FILTER_$(SPEC) ?= | $(PROTOTYPE_FILTER_$(SPEC))))) +$(foreach SPEC,$(_PKG_SPECS),$(if $(PROTOTYPE_FILTER),$(eval _PROTOTYPE_FILTER_$(SPEC) ?= | $(PROTOTYPE_FILTER)))) # This file contains all installed pathes. This can be used as a starting point # for distributing files to individual packages. @@ -165,16 +164,18 @@ $(WORKDIR)/%.prototype-$(GARCH): | $(WORKDIR)/%.prototype @cat $(WORKDIR)/$*.prototype $(_PROTOTYPE_FILTER_$*) >$@ -# This is a target used to generate all prototypes for debugging purposes. -# On a normal packaging workflow this is not used. -prototypes: extract merge $(SPKG_DESTDIRS) pre-package $(foreach S,$(_PKG_SPECS),$(WORKDIR)/$S.prototype-$(GARCH)) - @$(DONADA) - # $_EXTRA_GAR_PKGS is for dynamic dependencies added by GAR itself (like CSWisaexec or CSWcswclassutils) .PRECIOUS: $(WORKDIR)/%.depend $(WORKDIR)/%.depend: - $(GARDIR)/bin/dependon $(_EXTRA_GAR_PKGS) $(REQUIRED_PKGS_$*) $(REQUIRED_PKGS) > $@ + $(if $(_EXTRA_GAR_PKGS)$(REQUIRED_PKGS_$*)$(REQUIRED_PKGS), \ + ($(foreach PKG,$(_EXTRA_GAR_PKGS) $(REQUIRED_PKGS_$*) $(REQUIRED_PKGS),\ + $(if $(SPKG_DESC_$(PKG)), \ + echo "P $(PKG) $(call _pkglist_catalogname,$(PKG)) - $(SPKG_DESC_$(PKG))";, \ + echo "$(shell /usr/bin/pkginfo $(PKG) | awk '{ $$1 = \"P\"; print }')"; \ + ) \ + )) >$@) + # package - Use the mkpackage utility to create Solaris packages # @@ -189,6 +190,10 @@ $(SPKG_DESTDIRS): ginstall -d $@ +# This is a target used to generate all prototypes for debugging purposes. +# On a normal packaging workflow this is not used. +prototypes: extract merge $(SPKG_DESTDIRS) pre-package $(foreach SPEC,$(_PKG_SPECS),$(WORKDIR)/$(SPEC).prototype-$(GARCH)) + # We depend on extract as the additional package files (like .gspec) must be # unpacked to global/ for packaging. E. g. 'merge' depends only on the specific # modulations and does not fill global/. @@ -224,7 +229,7 @@ # pkgreset - reset working directory for repackaging # -pkgreset: $(addprefix pkgreset-,$(_PKG_SPECS)) +pkgreset: $(addprefix pkgreset-,$(SPKG_SPECS)) @rm -f $(COOKIEDIR)/extract @rm -f $(COOKIEDIR)/extract-archive-* $(DONADA) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Dec 9 10:00:16 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 09 Dec 2008 09:00:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[2479] csw/mgar/pkg/clamav/trunk Message-ID: Revision: 2479 http://gar.svn.sourceforge.net/gar/?rev=2479&view=rev Author: bonivart Date: 2008-12-09 09:00:16 +0000 (Tue, 09 Dec 2008) Log Message: ----------- clamav: more fixes Modified Paths: -------------- csw/mgar/pkg/clamav/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/clamav/trunk/ Property changes on: csw/mgar/pkg/clamav/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/clamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamav/trunk/Makefile 2008-12-09 08:53:59 UTC (rev 2478) +++ csw/mgar/pkg/clamav/trunk/Makefile 2008-12-09 09:00:16 UTC (rev 2479) @@ -1,6 +1,7 @@ # clamav, Peter Bonivart + # files outside /opt/csw are not included, need to fix gspec and cswproto -# split into multiple packages: clamav, libclamav, clamavdb? +# split into multiple packages: clamav, libclamav # put libs in lib/32? # add depend files # add rc/smf support @@ -29,13 +30,16 @@ MASTER_SITES = http://freshmeat.net/redir/clamav/29355/url_tgz/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWclamav,) DISTFILES += $(call admfiles,CSWlibclamav,) -DISTFILES += $(call admfiles,CSWclamav,) +PKGFILES_CSWlibclamav = $(libdir)/.* +PKGFILES_CSWlibclamav += $(includedir)/.* + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -GARCOMPILER = GNU +GARCOMPILER = GCC3 GNU_CC_HOME = /opt/csw/gcc3 CONFIGURE_ARGS = $(DIRPATHS) @@ -48,34 +52,34 @@ include gar/category.mk -PKGFILE_CSWlibclamav_EXCLUSIVE = $(libdir)/.* -PKGFILE_CSWlibclamav_EXCLUSIVE += $(includedir)/.* - SPKG_SOURCEURL = http://www.clamav.net/ pre-package: @echo " ==> Pre-package for $(GARNAME)" - @find $(DESTDIR) -type f -name "*~" -exec rm {} \; - @find $(DESTDIR)/opt/csw/lib -type f -name "*.a" -exec rm {} \; - @find $(DESTDIR)/opt/csw/lib -type f -name "*.la" -exec rm {} \; - @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME)/html - @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME)/contrib - @ginstall -m 644 $(WORKSRC)/AUTHORS $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 644 $(WORKSRC)/BUGS $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 644 $(WORKSRC)/ChangeLog $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 644 $(WORKSRC)/docs/clamav-mirror-howto.pdf $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 644 $(WORKSRC)/docs/clamdoc.pdf $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 644 $(WORKSRC)/COPYING $(DESTDIR)$(docdir)/$(GARNAME)/LICENSE - @ginstall -m 644 $(WORKSRC)/FAQ $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 644 $(WORKSRC)/NEWS $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 644 $(WORKSRC)/docs/phishsigs_howto.pdf $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 644 $(WORKSRC)/README $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 644 $(WORKSRC)/docs/signatures.pdf $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 644 $(WORKSRC)/UPGRADE $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 644 $(WORKSRC)/contrib/clamdwatch/* $(DESTDIR)$(docdir)/$(GARNAME)/contrib - @ginstall -m 644 $(WORKSRC)/contrib/init/Solaris10/* $(DESTDIR)$(docdir)/$(GARNAME)/contrib - @ginstall -m 644 $(WORKSRC)/contrib/cleanup-partial.pl $(DESTDIR)$(docdir)/$(GARNAME)/contrib + @echo "DESTDIR: $(DESTDIR)" + @echo "WORKSRC: $(WORKSRC)" + @echo "PKGROOT: $(PKGROOT)" + @find $(PKGROOT) -type f -name "*~" -exec rm {} \; + @find $(PKGROOT)/opt/csw/lib -type f -name "*.a" -exec rm {} \; + @find $(PKGROOT)/opt/csw/lib -type f -name "*.la" -exec rm {} \; + @ginstall -d $(PKGROOT)$(docdir)/$(GARNAME)/html + @ginstall -d $(PKGROOT)$(docdir)/$(GARNAME)/contrib + @ginstall -m 644 $(WORKSRC)/AUTHORS $(PKGROOT)$(docdir)/$(GARNAME) + @ginstall -m 644 $(WORKSRC)/BUGS $(PKGROOT)$(docdir)/$(GARNAME) + @ginstall -m 644 $(WORKSRC)/ChangeLog $(PKGROOT)$(docdir)/$(GARNAME) + @ginstall -m 644 $(WORKSRC)/docs/clamav-mirror-howto.pdf $(PKGROOT)$(docdir)/$(GARNAME) + @ginstall -m 644 $(WORKSRC)/docs/clamdoc.pdf $(PKGROOT)$(docdir)/$(GARNAME) + @ginstall -m 644 $(WORKSRC)/COPYING $(PKGROOT)$(docdir)/$(GARNAME)/LICENSE + @ginstall -m 644 $(WORKSRC)/FAQ $(PKGROOT)$(docdir)/$(GARNAME) + @ginstall -m 644 $(WORKSRC)/NEWS $(PKGROOT)$(docdir)/$(GARNAME) + @ginstall -m 644 $(WORKSRC)/docs/phishsigs_howto.pdf $(PKGROOT)$(docdir)/$(GARNAME) + @ginstall -m 644 $(WORKSRC)/README $(PKGROOT)$(docdir)/$(GARNAME) + @ginstall -m 644 $(WORKSRC)/docs/signatures.pdf $(PKGROOT)$(docdir)/$(GARNAME) + @ginstall -m 644 $(WORKSRC)/UPGRADE $(PKGROOT)$(docdir)/$(GARNAME) + @ginstall -m 644 $(WORKSRC)/contrib/clamdwatch/* $(PKGROOT)$(docdir)/$(GARNAME)/contrib + @ginstall -m 644 $(WORKSRC)/contrib/init/Solaris10/* $(PKGROOT)$(docdir)/$(GARNAME)/contrib + @ginstall -m 644 $(WORKSRC)/contrib/cleanup-partial.pl $(PKGROOT)$(docdir)/$(GARNAME)/contrib @for file in $(WORKSRC)/docs/html/*; do \ - cp $$file $(DESTDIR)$(docdir)/$(GARNAME)/html ; \ + cp $$file $(PKGROOT)$(docdir)/$(GARNAME)/html ; \ done @$(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 Tue Dec 9 10:13:58 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 09:13:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[2480] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 2480 http://gar.svn.sourceforge.net/gar/?rev=2480&view=rev Author: dmichelsen Date: 2008-12-09 09:13:56 +0000 (Tue, 09 Dec 2008) Log Message: ----------- mGAR v2: Fix CC_HOME and CC_VERSION Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2008-12-09 09:00:16 UTC (rev 2479) +++ csw/mgar/gar/v2/gar.conf.mk 2008-12-09 09:13:56 UTC (rev 2480) @@ -374,25 +374,21 @@ GCC4_AS_FLAGS ?= $(EXTRA_GCC4_AS_FLAGS) $(EXTRA_GCC_AS_FLAGS) $(EXTRA_AS_FLAGS) SOS11_AS_FLAGS ?= $(EXTRA_SOS11_AS_FLAGS) $(EXTRA_SOS_AS_FLAGS) $(EXTRA_AS_FLAGS) SOS12_AS_FLAGS ?= $(EXTRA_SOS12_AS_FLAGS) $(EXTRA_SOS_AS_FLAGS) $(EXTRA_AS_FLAGS) -GCC3_LD_FLAGS ?= -L$(GNU_CC_HOME)/lib $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS) -GCC4_LD_FLAGS ?= -L$(GNU_CC_HOME)/lib $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS) +GCC3_LD_FLAGS ?= -L$(GCC3_CC_HOME)/lib $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS) +GCC4_LD_FLAGS ?= -L$(GCC4_CC_HOME)/lib $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS) SOS11_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) SOS12_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) # Compiler version -GCC_CC_VERSION = $(shell $(CC_HOME)/bin/gcc -v 2>&1| ggrep version) -GCC_CXX_VERSION = $(CC_VERSION) -GCC3_CC_VERSION = $(GCC_CC_VERSION) -GCC3_CXX_VERSION = $(GCC_CXX_VERSION) -GCC4_CC_VERSION = $(GCC_CC_VERSION) -GCC4_CXX_VERSION = $(GCC_CXX_VERSION) +GCC3_CC_VERSION = $(shell $(GCC3_CC) -v 2>&1| ggrep version) +GCC3_CXX_VERSION = $(shell $(GCC3_CXX) -v 2>&1| ggrep version) +GCC4_CC_VERSION = $(shell $(GCC4_CC) -v 2>&1| ggrep version) +GCC4_CXX_VERSION = $(shell $(GCC4_CXX) -v 2>&1| ggrep version) -SOS_CC_VERSION = $(shell $(CC_HOME)/bin/cc -V 2>&1| ggrep cc: | gsed -e 's/cc: //') -SOS_CXX_VERSION = $(shell $(CC_HOME)/bin/CC -V 2>&1| ggrep CC: | gsed -e 's/CC: //') -SOS11_CC_VERSION = $(SOS_CC_VERSION) -SOS11_CXX_VERSION = $(SOS_CXX_VERSION) -SOS12_CC_VERSION = $(SOS_CC_VERSION) -SOS12_CXX_VERSION = $(SOS_CXX_VERSION) +SOS11_CC_VERSION = $(shell $(SOS11_CC) -V 2>&1| ggrep cc: | gsed -e 's/cc: //') +SOS11_CXX_VERSION = $(shell $(SOS11_CXX)/bin/CC -V 2>&1| ggrep CC: | gsed -e 's/CC: //') +SOS12_CC_VERSION = $(shell $(SOS11_CC) -V 2>&1| ggrep cc: | gsed -e 's/cc: //') +SOS12_CXX_VERSION = $(shell $(SOS11_CXX)/bin/CC -V 2>&1| ggrep CC: | gsed -e 's/CC: //') CC_VERSION = $($(GARCOMPILER)_CC_VERSION) CXX_VERSION = $($(GARCOMPILER)_CXX_VERSION) 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 Dec 9 10:45:39 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 09:45:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[2481] csw/mgar/pkg/libntlm/trunk Message-ID: Revision: 2481 http://gar.svn.sourceforge.net/gar/?rev=2481&view=rev Author: dmichelsen Date: 2008-12-09 09:45:39 +0000 (Tue, 09 Dec 2008) Log Message: ----------- libntlm: Update to 1.0 and mGAR v2 Modified Paths: -------------- csw/mgar/pkg/libntlm/trunk/Makefile csw/mgar/pkg/libntlm/trunk/checksums csw/mgar/pkg/libntlm/trunk/files/CSWlibntlm.gspec Property Changed: ---------------- csw/mgar/pkg/libntlm/trunk/ Property changes on: csw/mgar/pkg/libntlm/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/libntlm/trunk/Makefile =================================================================== --- csw/mgar/pkg/libntlm/trunk/Makefile 2008-12-09 09:13:56 UTC (rev 2480) +++ csw/mgar/pkg/libntlm/trunk/Makefile 2008-12-09 09:45:39 UTC (rev 2481) @@ -1,5 +1,5 @@ GARNAME = libntlm -GARVERSION = 0.4.2 +GARVERSION = 1.0 CATEGORIES = lib DESCRIPTION = Microsoft WinNT domain authentication library @@ -18,6 +18,8 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +BUILD64 = 1 + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/libntlm/trunk/checksums =================================================================== --- csw/mgar/pkg/libntlm/trunk/checksums 2008-12-09 09:13:56 UTC (rev 2480) +++ csw/mgar/pkg/libntlm/trunk/checksums 2008-12-09 09:45:39 UTC (rev 2481) @@ -1,2 +1,2 @@ -e68a4e20628de0259b54f59725b9c486 download/libntlm-0.4.2.tar.gz -88b460b4c08154149578f07b03e360f9 download/CSWlibntlm.gspec +83dc36023ce36de0f0d2f98294c040c1 download/libntlm-1.0.tar.gz +f2c4153eb60293c0c209044812c07cae download/CSWlibntlm.gspec Modified: csw/mgar/pkg/libntlm/trunk/files/CSWlibntlm.gspec =================================================================== --- csw/mgar/pkg/libntlm/trunk/files/CSWlibntlm.gspec 2008-12-09 09:13:56 UTC (rev 2480) +++ csw/mgar/pkg/libntlm/trunk/files/CSWlibntlm.gspec 2008-12-09 09:45:39 UTC (rev 2481) @@ -1,4 +1,4 @@ %var bitname libntlm %var pkgname CSWlibntlm %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING +%copyright url file://%{WORKSRC_DEFAULT}/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 Tue Dec 9 10:54:32 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 09:54:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[2482] csw/mgar/gar/v2 Message-ID: Revision: 2482 http://gar.svn.sourceforge.net/gar/?rev=2482&view=rev Author: dmichelsen Date: 2008-12-09 09:54:32 +0000 (Tue, 09 Dec 2008) Log Message: ----------- mGAR v2: Use WORKSRC for first modulation Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2008-12-09 09:45:39 UTC (rev 2481) +++ csw/mgar/gar/v2/gar.conf.mk 2008-12-09 09:54:32 UTC (rev 2482) @@ -21,8 +21,8 @@ COOKIEROOTDIR ?= cookies COOKIEDIR ?= $(COOKIEROOTDIR)/$(MODULATION) EXTRACTDIR ?= $(WORKDIR) -WORKSRC ?= $(WORKDIR)/$(DISTNAME) -WORKSRC_DEFAULT ?= $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/$(DISTNAME) +#WORKSRC ?= $(WORKDIR)/$(DISTNAME) +WORKSRC ?= $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/$(DISTNAME) INSTALLISADIR ?= $(WORKROOTDIR)/install-$(MODULATION) PKGDIR ?= $(WORKROOTDIR)/package SCRATCHDIR ?= tmp Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2008-12-09 09:45:39 UTC (rev 2481) +++ csw/mgar/gar/v2/gar.pkg.mk 2008-12-09 09:54:32 UTC (rev 2482) @@ -61,7 +61,7 @@ PKGLIB = $(CURDIR)/$(GARDIR)/pkglib PKG_EXPORTS = GARNAME GARVERSION DESCRIPTION CATEGORIES GARCH GARDIR GARBIN -PKG_EXPORTS += CURDIR WORKDIR WORKSRC WORKSRC_DEFAULT PKGROOT +PKG_EXPORTS += CURDIR WORKDIR WORKSRC PKGROOT PKG_EXPORTS += SPKG_REVSTAMP SPKG_PKGNAME SPKG_DESC SPKG_VERSION SPKG_CATEGORY PKG_EXPORTS += SPKG_VENDOR SPKG_EMAIL SPKG_PSTAMP SPKG_BASEDIR SPKG_CLASSES PKG_EXPORTS += SPKG_OSNAME SPKG_SOURCEURL SPKG_PACKAGER TIMESTAMP 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 Dec 9 10:55:49 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 09:55:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[2483] csw/mgar/pkg/libntlm/trunk Message-ID: Revision: 2483 http://gar.svn.sourceforge.net/gar/?rev=2483&view=rev Author: dmichelsen Date: 2008-12-09 09:55:49 +0000 (Tue, 09 Dec 2008) Log Message: ----------- libntlm: Readjust to WORKSRC Modified Paths: -------------- csw/mgar/pkg/libntlm/trunk/checksums csw/mgar/pkg/libntlm/trunk/files/CSWlibntlm.gspec Modified: csw/mgar/pkg/libntlm/trunk/checksums =================================================================== --- csw/mgar/pkg/libntlm/trunk/checksums 2008-12-09 09:54:32 UTC (rev 2482) +++ csw/mgar/pkg/libntlm/trunk/checksums 2008-12-09 09:55:49 UTC (rev 2483) @@ -1,2 +1,2 @@ 83dc36023ce36de0f0d2f98294c040c1 download/libntlm-1.0.tar.gz -f2c4153eb60293c0c209044812c07cae download/CSWlibntlm.gspec +88b460b4c08154149578f07b03e360f9 download/CSWlibntlm.gspec Modified: csw/mgar/pkg/libntlm/trunk/files/CSWlibntlm.gspec =================================================================== --- csw/mgar/pkg/libntlm/trunk/files/CSWlibntlm.gspec 2008-12-09 09:54:32 UTC (rev 2482) +++ csw/mgar/pkg/libntlm/trunk/files/CSWlibntlm.gspec 2008-12-09 09:55:49 UTC (rev 2483) @@ -1,4 +1,4 @@ %var bitname libntlm %var pkgname CSWlibntlm %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_DEFAULT}/COPYING +%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 Tue Dec 9 11:20:31 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 10:20:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[2484] csw/mgar/gar/v2/bin Message-ID: Revision: 2484 http://gar.svn.sourceforge.net/gar/?rev=2484&view=rev Author: dmichelsen Date: 2008-12-09 10:20:31 +0000 (Tue, 09 Dec 2008) Log Message: ----------- mGAR v2: Merge [2139] from v1 to v2 Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg csw/mgar/gar/v2/bin/gencatalog csw/mgar/gar/v2/bin/killdupes csw/mgar/gar/v2/bin/whoowns Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2008-12-09 09:55:49 UTC (rev 2483) +++ csw/mgar/gar/v2/bin/checkpkg 2008-12-09 10:20:31 UTC (rev 2484) @@ -2,10 +2,10 @@ # checkpkg 1.46a (diff to 1.46: modified errmsg -> warnmsg on two places) # This script examines a package that has been put together -# for submittal to the CSW archive at blastwave.org +# for submittal to the CSW archive # # It examines it for compliance with the packaging standards at -# http://www.blastwave.org/standards/ +# http://www.opencsw.org/standards/ # It DOES NOT CATCH EVERYTHING. However, the package will be # tested with this script before acceptance, so you may as well # save yourself some time, and run the script yourself! Modified: csw/mgar/gar/v2/bin/gencatalog =================================================================== --- csw/mgar/gar/v2/bin/gencatalog 2008-12-09 09:55:49 UTC (rev 2483) +++ csw/mgar/gar/v2/bin/gencatalog 2008-12-09 10:20:31 UTC (rev 2484) @@ -10,7 +10,7 @@ # author(s) shall not be liable in the event that use of the # software causes damage. # -# gencatalog - generate a blastwave v1 style catalog and description file. +# gencatalog - generate a v1 style catalog and description file. # cp catalog catalog.old Modified: csw/mgar/gar/v2/bin/killdupes =================================================================== --- csw/mgar/gar/v2/bin/killdupes 2008-12-09 09:55:49 UTC (rev 2483) +++ csw/mgar/gar/v2/bin/killdupes 2008-12-09 10:20:31 UTC (rev 2484) @@ -12,7 +12,7 @@ # # killdupes - Remove duplicate packages from a directory, with or # without user interaction. Note that this only works -# for packages named according to blastwave standards. +# for packages named according to package standards. # use strict; Modified: csw/mgar/gar/v2/bin/whoowns =================================================================== --- csw/mgar/gar/v2/bin/whoowns 2008-12-09 09:55:49 UTC (rev 2483) +++ csw/mgar/gar/v2/bin/whoowns 2008-12-09 10:20:31 UTC (rev 2484) @@ -2,9 +2,9 @@ for pkg in $@ do - owner=`curl -s http://www.blastwave.org/packages/$pkg | \ + owner=`curl -s http://www.opencsw.org/packages/$pkg | \ grep Maintainer: | cut -f5 -d'>' | cut -f1 -d'<'` - version=`curl -s http://www.blastwave.org/packages/$pkg | \ + version=`curl -s http://www.opencsw.org/packages/$pkg | \ grep Version: | cut -f4 -d'>' | cut -f1 -d' '` printf "%-20s %-30s %s\n" $pkg ${version:-Unknown} "${owner:-Nobody}" 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 Dec 9 11:42:41 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 10:42:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[2485] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 2485 http://gar.svn.sourceforge.net/gar/?rev=2485&view=rev Author: dmichelsen Date: 2008-12-09 10:42:41 +0000 (Tue, 09 Dec 2008) Log Message: ----------- mGAR v2: Fix dynamic depencies on foreign package Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2008-12-09 10:20:31 UTC (rev 2484) +++ csw/mgar/gar/v2/gar.pkg.mk 2008-12-09 10:42:41 UTC (rev 2485) @@ -171,7 +171,7 @@ ($(foreach PKG,$(_EXTRA_GAR_PKGS) $(REQUIRED_PKGS_$*) $(REQUIRED_PKGS),\ $(if $(SPKG_DESC_$(PKG)), \ echo "P $(PKG) $(call _pkglist_catalogname,$(PKG)) - $(SPKG_DESC_$(PKG))";, \ - echo "$(shell /usr/bin/pkginfo $(PKG) | awk '{ $$1 = \"P\"; print }')"; \ + echo "$(shell /usr/bin/pkginfo $(PKG) | awk '{ $$1 = "P"; print } ')"; \ ) \ )) >$@) 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 Dec 9 11:48:54 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 10:48:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[2486] csw/mgar/gar/v2 Message-ID: Revision: 2486 http://gar.svn.sourceforge.net/gar/?rev=2486&view=rev Author: dmichelsen Date: 2008-12-09 10:48:53 +0000 (Tue, 09 Dec 2008) Log Message: ----------- mGAR v2: Merge [2139] from v1 to v2, additional commit Modified Paths: -------------- csw/mgar/gar/v2/README csw/mgar/gar/v2/garrc.sample csw/mgar/gar/v2/pkglib/csw/pkginfo Modified: csw/mgar/gar/v2/README =================================================================== --- csw/mgar/gar/v2/README 2008-12-09 10:42:41 UTC (rev 2485) +++ csw/mgar/gar/v2/README 2008-12-09 10:48:53 UTC (rev 2486) @@ -3,16 +3,16 @@ Welcome to the CSW build system. Please visit: - http://svn.blastwave.org/wiki/GettingStarted + http://sourceforge.net/projects/gar For instructions on how to use this system. Copyrights -- -CSW is based on the GAR ports system, Copyright 2001 Nick Moffitt. All scripts -and add-on make modules are Copyright 2006 Cory Omand, except where otherwise -noted. Packaging content is Copyright 2006 Blastwave.org, except where -otherwise noted. Patches and source code are Copyright by their original -authors, which may or may not be members of the Blastwave project. +Copyright 2001 Nick Moffitt: GAR ports system +Copyright 2006 Cory Omand: Scripts and add-on make modules, except where otherwise noted. +Copyright 2006 Blastwave.org: Packaging content, except where otherwise noted. +Copyright 2008 Dagobert Michelsen (OpenCSW): Enhancements to the CSW GAR system +Patches and source code are Copyright by their original authors. Modified: csw/mgar/gar/v2/garrc.sample =================================================================== --- csw/mgar/gar/v2/garrc.sample 2008-12-09 10:42:41 UTC (rev 2485) +++ csw/mgar/gar/v2/garrc.sample 2008-12-09 10:48:53 UTC (rev 2486) @@ -1,19 +1,19 @@ # vim: ft=make # -# ~/.garrc - Local settings file for the Blastwave build system. +# ~/.garrc - Local settings file for the CSW build system. # # For the most part, any setting found in gar.conf.mk can be overridden by # setting (or unsetting) the variable in this file. The system gar.conf.mk # provides a reasonable set of defaults, but customizations may be required to -# build packages outside of the Blastwave build stack. +# build packages outside of the CSW build stack. # # Packaging information SPKG_PACKAGER = Joe Developer -SPKG_EMAIL = jdev at blastwave.org +SPKG_EMAIL = jdev at domain.org # Where to put finished packages -SPKG_EXPORT = /export/medusa/jdev/staging/build-$(shell date '+%d.%b.%Y') +SPKG_EXPORT = /export/home/jdev/staging/build-$(shell date '+%d.%b.%Y') # Proxy settings #http_proxy = Modified: csw/mgar/gar/v2/pkglib/csw/pkginfo =================================================================== --- csw/mgar/gar/v2/pkglib/csw/pkginfo 2008-12-09 10:42:41 UTC (rev 2485) +++ csw/mgar/gar/v2/pkglib/csw/pkginfo 2008-12-09 10:48:53 UTC (rev 2486) @@ -7,4 +7,4 @@ EMAIL=%{SPKG_EMAIL} PSTAMP=%{SPKG_PSTAMP} CLASSES=%{SPKG_CLASSES} -HOTLINE=http://www.blastwave.org/bugtrack/ +HOTLINE=http://www.opencsw.org/bugtrack/ 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 Dec 9 14:45:06 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 13:45:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[2487] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 2487 http://gar.svn.sourceforge.net/gar/?rev=2487&view=rev Author: dmichelsen Date: 2008-12-09 13:45:05 +0000 (Tue, 09 Dec 2008) Log Message: ----------- mGAR v2: Fixed typo in LINKER_FLAGS Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2008-12-09 10:48:53 UTC (rev 2486) +++ csw/mgar/gar/v2/gar.conf.mk 2008-12-09 13:45:05 UTC (rev 2487) @@ -415,7 +415,7 @@ # the links 32 and 64. ifeq ($(origin LINKER_FLAGS), undefined) ifdef NOISALIST -LINKER_FLAGS = $(foreach ELIB,$(libdir_install) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR)) -R$(abspath $(ELIB)/$(MM_LIBDIR)) +LINKER_FLAGS = $(foreach ELIB,$(libdir_install) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR)) -R$(abspath $(ELIB)/$(MM_LIBDIR))) else # If we use $ISALIST it is a good idea to also add $MM_LIBDIR as there # may not be a subdirectory for the 32-bit standard case (this would normally 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 Dec 9 15:19:03 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 14:19:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[2488] csw/mgar/gar/v2 Message-ID: Revision: 2488 http://gar.svn.sourceforge.net/gar/?rev=2488&view=rev Author: dmichelsen Date: 2008-12-09 14:19:03 +0000 (Tue, 09 Dec 2008) Log Message: ----------- mGAR v2: Must use WORKSRC_FIRSTMOD in .gspec for COPYRIGHT as sources are no longer unpacked to global modulation Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2008-12-09 13:45:05 UTC (rev 2487) +++ csw/mgar/gar/v2/gar.conf.mk 2008-12-09 14:19:03 UTC (rev 2488) @@ -21,8 +21,8 @@ COOKIEROOTDIR ?= cookies COOKIEDIR ?= $(COOKIEROOTDIR)/$(MODULATION) EXTRACTDIR ?= $(WORKDIR) -#WORKSRC ?= $(WORKDIR)/$(DISTNAME) -WORKSRC ?= $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/$(DISTNAME) +WORKSRC ?= $(WORKDIR)/$(DISTNAME) +WORKSRC_FIRSTMOD ?= $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/$(DISTNAME) INSTALLISADIR ?= $(WORKROOTDIR)/install-$(MODULATION) PKGDIR ?= $(WORKROOTDIR)/package SCRATCHDIR ?= tmp Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2008-12-09 13:45:05 UTC (rev 2487) +++ csw/mgar/gar/v2/gar.pkg.mk 2008-12-09 14:19:03 UTC (rev 2488) @@ -61,7 +61,7 @@ PKGLIB = $(CURDIR)/$(GARDIR)/pkglib PKG_EXPORTS = GARNAME GARVERSION DESCRIPTION CATEGORIES GARCH GARDIR GARBIN -PKG_EXPORTS += CURDIR WORKDIR WORKSRC PKGROOT +PKG_EXPORTS += CURDIR WORKDIR WORKSRC WORKSRC_FIRSTMOD PKGROOT PKG_EXPORTS += SPKG_REVSTAMP SPKG_PKGNAME SPKG_DESC SPKG_VERSION SPKG_CATEGORY PKG_EXPORTS += SPKG_VENDOR SPKG_EMAIL SPKG_PSTAMP SPKG_BASEDIR SPKG_CLASSES PKG_EXPORTS += SPKG_OSNAME SPKG_SOURCEURL SPKG_PACKAGER TIMESTAMP 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 Dec 9 15:19:37 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 14:19:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[2489] csw/mgar/pkg/sysstat/trunk Message-ID: Revision: 2489 http://gar.svn.sourceforge.net/gar/?rev=2489&view=rev Author: dmichelsen Date: 2008-12-09 14:19:37 +0000 (Tue, 09 Dec 2008) Log Message: ----------- sysstat: Update to 20081207 and latest mGAR v2 features Modified Paths: -------------- csw/mgar/pkg/sysstat/trunk/Makefile csw/mgar/pkg/sysstat/trunk/checksums csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.gspec csw/mgar/pkg/sysstat/trunk/files/patch-onlyisaexec-sysstatd.diff Removed Paths: ------------- csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.depend csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.prototype-i386 csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.prototype-sparc csw/mgar/pkg/sysstat/trunk/files/patch-isaexec-compat.diff csw/mgar/pkg/sysstat/trunk/files/patch-sysstat-shareman.diff Modified: csw/mgar/pkg/sysstat/trunk/Makefile =================================================================== --- csw/mgar/pkg/sysstat/trunk/Makefile 2008-12-09 14:19:03 UTC (rev 2488) +++ csw/mgar/pkg/sysstat/trunk/Makefile 2008-12-09 14:19:37 UTC (rev 2489) @@ -1,5 +1,5 @@ GARNAME = sysstat -GARVERSION = 20081125 +GARVERSION = 20081207 CATEGORIES = utils DESCRIPTION = Key system statistics at a glance @@ -18,8 +18,10 @@ MASTER_SITES = http://www.maier-komor.de/$(GARNAME)/ DISTFILES = $(GARNAME)-$(GARVERSION).tgz -DISTFILES += $(call admfiles,CSWsysstat,prototype-sparc prototype-i386 depend) +DISTFILES += $(call admfiles,CSWsysstat) +REQUIRED_PKGS = CSWncurses + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -53,6 +55,8 @@ # only done via sysstatd which uses isaexec. ISAEXEC_FILES = $(sbindir)/sysstatd +PROTOTYPE_FILTER = awk '$$$$3 ~ /\/sysstatd$$$$/ { $$$$4 = "4755" } { print }' + include gar/category.mk # We don't have a autoconf-style configure. The configure script Modified: csw/mgar/pkg/sysstat/trunk/checksums =================================================================== --- csw/mgar/pkg/sysstat/trunk/checksums 2008-12-09 14:19:03 UTC (rev 2488) +++ csw/mgar/pkg/sysstat/trunk/checksums 2008-12-09 14:19:37 UTC (rev 2489) @@ -1,6 +1,6 @@ -c634dc06c3c9211b1f63e0beeba7de64 download/sysstat-20081125.tgz -465eb128e17cb36e0e904fa759972283 download/CSWsysstat.gspec +7d5d5489a19119121b4bd53b85a91886 download/sysstat-20081207.tgz +c2be614c9715a73b469173e9888f1826 download/CSWsysstat.gspec e51f94d090618f19b854104291b10645 download/CSWsysstat.prototype-sparc 8c1dbc2e5fc16f16dbdfbe47b81e76f0 download/CSWsysstat.prototype-i386 2ba417371d006cee9ad62bf67252b05b download/CSWsysstat.depend -6c8b6d3c4a5b15157f02216b4ad2b459 download/patch-onlyisaexec-sysstatd.diff +7a7f0f67bb68484b56375d4a922fb63f download/patch-onlyisaexec-sysstatd.diff Deleted: csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.depend =================================================================== --- csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.depend 2008-12-09 14:19:03 UTC (rev 2488) +++ csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.depend 2008-12-09 14:19:37 UTC (rev 2489) @@ -1,2 +0,0 @@ -P CSWisaexec isaexec - sneaky wrapper around Sun isaexec -P CSWncurses ncurses - ncurses library and utilities Modified: csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.gspec =================================================================== --- csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.gspec 2008-12-09 14:19:03 UTC (rev 2488) +++ csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.gspec 2008-12-09 14:19:37 UTC (rev 2489) @@ -1,4 +1,4 @@ %var bitname sysstat %var pkgname CSWsysstat %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING +%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Deleted: csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.prototype-i386 =================================================================== --- csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.prototype-i386 2008-12-09 14:19:03 UTC (rev 2488) +++ csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.prototype-i386 2008-12-09 14:19:37 UTC (rev 2489) @@ -1,12 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/sysstat 0755 root bin -d none /opt/csw/sbin 0755 root bin -d none /opt/csw/sbin/amd64 0755 root bin -f none /opt/csw/sbin/amd64/sysstatd 4755 root bin -d none /opt/csw/sbin/i386 0755 root bin -f none /opt/csw/sbin/i386/sysstatd=/opt/csw/sbin/sysstatd 4755 root bin -l none /opt/csw/sbin/sysstatd=/opt/csw/bin/isaexec 0755 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man1 0755 root bin -f none /opt/csw/share/man/man1/sysstat.1m 0755 root bin Deleted: csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.prototype-sparc =================================================================== --- csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.prototype-sparc 2008-12-09 14:19:03 UTC (rev 2488) +++ csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.prototype-sparc 2008-12-09 14:19:37 UTC (rev 2489) @@ -1,12 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/sysstat 0755 root bin -d none /opt/csw/sbin 0755 root bin -d none /opt/csw/sbin/sparcv9 0755 root bin -f none /opt/csw/sbin/sparcv9/sysstatd 4755 root bin -d none /opt/csw/sbin/sparcv8 0755 root bin -f none /opt/csw/sbin/sparcv8/sysstatd=/opt/csw/sbin/sysstatd 4755 root bin -l none /opt/csw/sbin/sysstatd=/opt/csw/bin/isaexec 0755 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man1 0755 root bin -f none /opt/csw/share/man/man1/sysstat.1m 0755 root bin Deleted: csw/mgar/pkg/sysstat/trunk/files/patch-isaexec-compat.diff =================================================================== --- csw/mgar/pkg/sysstat/trunk/files/patch-isaexec-compat.diff 2008-12-09 14:19:03 UTC (rev 2488) +++ csw/mgar/pkg/sysstat/trunk/files/patch-isaexec-compat.diff 2008-12-09 14:19:37 UTC (rev 2489) @@ -1,24 +0,0 @@ -diff --speed-large-files --minimal -Nru sysstat-20080501.orig/client.c sysstat-20080501/client.c ---- sysstat-20080501.orig/client.c 2008-05-02 19:40:43.000000000 +0200 -+++ sysstat-20080501/client.c 2008-05-13 11:36:24.298053000 +0200 -@@ -71,7 +71,7 @@ - dbug("Execname %s\n",Execname); - strcpy(bin,dirname(Execname)); - dbug("Execdir %s\n",bin); -- strcat(bin,"/../sbin/sysstatd"); -+ strcat(bin,"/../../sbin/sysstatd"); - if (access(bin,X_OK) != 0) { - error("cannot find sysstatd at %s",bin); - return -1; -diff --speed-large-files --minimal -Nru sysstat-20080501.orig/sysstat.c sysstat-20080501/sysstat.c ---- sysstat-20080501.orig/sysstat.c 2008-05-02 19:40:43.000000000 +0200 -+++ sysstat-20080501/sysstat.c 2008-05-13 11:36:40.025857000 +0200 -@@ -490,7 +490,7 @@ - char *args[16]; - int num = 0; - strcpy(bin,dirname(Execname)); -- strcat(bin,"/../sbin/sysstatd"); -+ strcat(bin,"/../../sbin/sysstatd"); - args[num++] = bin; - args[num++] = "-v"; - if (port) { Modified: csw/mgar/pkg/sysstat/trunk/files/patch-onlyisaexec-sysstatd.diff =================================================================== --- csw/mgar/pkg/sysstat/trunk/files/patch-onlyisaexec-sysstatd.diff 2008-12-09 14:19:03 UTC (rev 2488) +++ csw/mgar/pkg/sysstat/trunk/files/patch-onlyisaexec-sysstatd.diff 2008-12-09 14:19:37 UTC (rev 2489) @@ -1,7 +1,7 @@ -diff --speed-large-files --minimal -Nru sysstat-20080704.orig/client.c sysstat-20080704/client.c ---- sysstat-20080704.orig/client.c 2008-07-06 23:55:52.000000000 +0200 -+++ sysstat-20080704/client.c 2008-07-07 14:31:22.791155000 +0200 -@@ -71,7 +71,7 @@ +diff -Naur sysstat-20081207.orig/client.c sysstat-20081207.patched/client.c +--- sysstat-20081207.orig/client.c 2008-12-07 23:24:38.000000000 +0100 ++++ sysstat-20081207.patched/client.c 2008-12-09 14:37:26.459180110 +0100 +@@ -81,7 +81,7 @@ dbug("Execname %s\n",Execname); strcpy(bin,dirname(Execname)); dbug("Execdir %s\n",bin); @@ -10,24 +10,24 @@ if (access(bin,X_OK) != 0) { error("cannot find sysstatd at %s",bin); return -1; -diff --speed-large-files --minimal -Nru sysstat-20080704.orig/sysstat.c sysstat-20080704/sysstat.c ---- sysstat-20080704.orig/sysstat.c 2008-07-06 23:55:52.000000000 +0200 -+++ sysstat-20080704/sysstat.c 2008-07-07 14:31:37.539418000 +0200 -@@ -485,7 +485,7 @@ +diff -Naur sysstat-20081207.orig/sysstat.c sysstat-20081207.patched/sysstat.c +--- sysstat-20081207.orig/sysstat.c 2008-12-07 23:24:38.000000000 +0100 ++++ sysstat-20081207.patched/sysstat.c 2008-12-09 14:37:51.199133788 +0100 +@@ -506,7 +506,7 @@ char cmd[PATH_MAX]; int ret = 0; strcpy(cmd,dirname(Execname)); - strcat(cmd,"/../../sbin/sysstatd -k"); + strcat(cmd,"/../sbin/sysstatd -k"); - if (verbose) - strcat(cmd," -v"); ret = system(cmd); -@@ -517,7 +517,7 @@ + if (ret == -1) { + error("could not execute '%s': %s\n",cmd,strerror(errno)); +@@ -554,7 +554,7 @@ char *args[16]; int num = 0; strcpy(bin,dirname(Execname)); - strcat(bin,"/../../sbin/sysstatd"); + strcat(bin,"/../sbin/sysstatd"); args[num++] = bin; - args[num++] = "-v"; - if (port) { + if (verbose) + args[num++] = "-v"; Deleted: csw/mgar/pkg/sysstat/trunk/files/patch-sysstat-shareman.diff =================================================================== --- csw/mgar/pkg/sysstat/trunk/files/patch-sysstat-shareman.diff 2008-12-09 14:19:03 UTC (rev 2488) +++ csw/mgar/pkg/sysstat/trunk/files/patch-sysstat-shareman.diff 2008-12-09 14:19:37 UTC (rev 2489) @@ -1,18 +0,0 @@ -diff --speed-large-files --minimal -Nru sysstat-20080501.orig/Makefile sysstat-20080501/Makefile ---- sysstat-20080501.orig/Makefile 2008-05-02 19:40:43.000000000 +0200 -+++ sysstat-20080501/Makefile 2008-05-13 06:12:48.272325000 +0200 -@@ -68,10 +68,10 @@ - -$(MKDIR) $(PREFIX)/bin - $(CP) $(CDIR)/sysstat $(PREFIX)/bin - -$(CHOWN) root:bin $(PREFIX)/bin/sysstat -- -$(MKDIR) $(PREFIX)/man/man1m -- $(CP) sysstat.1m $(PREFIX)/man/man1m -- -$(CHOWN) root:bin $(PREFIX)/man/man1m/sysstat.1m -- -$(CHMOD) 0644 $(PREFIX)/man/man1m/sysstat.1m -+ -$(MKDIR) $(PREFIX)/share/man/man1m -+ $(CP) sysstat.1m $(PREFIX)/share/man/man1m -+ -$(CHOWN) root:bin $(PREFIX)/share/man/man1m/sysstat.1m -+ -$(CHMOD) 0644 $(PREFIX)/share/man/man1m/sysstat.1m - - install_sysstatd: $(DDIR)/sysstatd - -$(MKDIR) $(PREFIX)/sbin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvel at opencsw.org Tue Dec 9 16:26:35 2008 From: trygvel at opencsw.org (=?ISO-8859-1?Q?Trygve_Laugst=F8l?=) Date: Tue, 09 Dec 2008 16:26:35 +0100 Subject: [csw-devel] GAR v2 and merging stuff In-Reply-To: <0DDCD941-2F2A-4212-8E2D-36A91A3D7766@opencsw.org> References: <493D6E07.70501@opencsw.org> <0DDCD941-2F2A-4212-8E2D-36A91A3D7766@opencsw.org> Message-ID: <493E8E2B.6040707@opencsw.org> Dagobert Michelsen wrote: > Hi Trygve, > > Am 08.12.2008 um 19:57 schrieb Trygve Laugst?l: >> Hi (Dago) >> >> Shouldn't this build actually work as the build machine support amd64? > > No, it does not. Solaris 8 x86 supports only 32 bit. That's what I > talked > about: GAR should ssh over to Solaris 10 x86 and build amd64 there. > >> http://buildfarm.opencsw.org/hudson/job/libogg-i386-pc-solaris2.8/0/console >> >> What where the goals to dump the configuration/possible settings >> available? > > I'm sorry, I don't understand what you are talking about. Shell > environment? > >> I'd like to have each build dump that before building, should >> make it easier to find discrepancies between what you have at home and >> what the build farm uses. > > ?hm, what dump? That's what you get when you write email too late; confustion. I meant the available compiler matrix vs supported CPU features. The thing you showed just before we went out to lunch on Sunday. -- Trygve From dam at opencsw.org Tue Dec 9 17:09:05 2008 From: dam at opencsw.org (Dagobert Michelsen) Date: Tue, 9 Dec 2008 17:09:05 +0100 Subject: [csw-devel] GAR v2 and merging stuff In-Reply-To: <493E8E2B.6040707@opencsw.org> References: <493D6E07.70501@opencsw.org> <0DDCD941-2F2A-4212-8E2D-36A91A3D7766@opencsw.org> <493E8E2B.6040707@opencsw.org> Message-ID: Hi Tragve, Am 09.12.2008 um 16:26 schrieb Trygve Laugst?l: >>> I'd like to have each build dump that before building, should >>> make it easier to find discrepancies between what you have at home >>> and >>> what the build farm uses. >> >> ?hm, what dump? > > That's what you get when you write email too late; confustion. I meant > the available compiler matrix vs supported CPU features. The thing you > showed just before we went out to lunch on Sunday. You mean the target 'ccenv' and 'isaenv'? Sure. But I would prefer if you would call them explicitly because otherwise the output may get too noisy. Best regards -- Dago From dmichelsen at users.sourceforge.net Tue Dec 9 17:11:21 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 16:11:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[2490] csw/mgar/pkg/Makefile Message-ID: Revision: 2490 http://gar.svn.sourceforge.net/gar/?rev=2490&view=rev Author: dmichelsen Date: 2008-12-09 16:11:20 +0000 (Tue, 09 Dec 2008) Log Message: ----------- mGAR: Fix target 'garlinks' if more than one external reference is given Modified Paths: -------------- csw/mgar/pkg/Makefile Modified: csw/mgar/pkg/Makefile =================================================================== --- csw/mgar/pkg/Makefile 2008-12-09 14:19:37 UTC (rev 2489) +++ csw/mgar/pkg/Makefile 2008-12-09 16:11:20 UTC (rev 2490) @@ -36,10 +36,15 @@ # to generate symbolic links instead of externally checked out dirs # Lines returned by 'svn propget -R' look like this: -# cpan/Test-Memory-Cycle/trunk - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 +# +# gar/trunk - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 +# gar-v1 https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 +# gar-v2 https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 +# +# ... garlinks: - @(svn propget svn:externals -R | perl -ane 'next if( /^$$/ );($$path,$$sep,$$dir,$$link)=@F;($$upsteps=$$path)=~s![^/]+!..!g;(($$linkdest=$$link))=~ s!https://gar.svn.sf.net/svnroot/gar/csw/mgar!$$upsteps!;print "Linking $$path/$$dir to ../$$linkdest", symlink("../$$linkdest","$$path/$$dir") ? "" : " failed", "\n";') + @(svn propget svn:externals -R | perl -ane 'next if( /^$$/ ); if( $$F[1] eq "-" ) { ($$path,$$sep,$$dir,$$link)=@F; } else { ($$dir,$$link) = @F; } ($$upsteps=$$path)=~s![^/]+!..!g;(($$linkdest=$$link))=~ s!https://gar.svn.sf.net/svnroot/gar/csw/mgar!$$upsteps!;print "Linking $$path/$$dir to ../$$linkdest", symlink("../$$linkdest","$$path/$$dir") ? "" : " failed", "\n";') pkglist: @for i in $(filter-out $(FILTER_DIRS),$(foreach D,. $(SUBDIRS),$(wildcard $D/*/))) ; do \ 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 Dec 9 17:14:22 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 16:14:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[2491] csw/branches/yann/ Message-ID: Revision: 2491 http://gar.svn.sourceforge.net/gar/?rev=2491&view=rev Author: dmichelsen Date: 2008-12-09 16:14:22 +0000 (Tue, 09 Dec 2008) Log Message: ----------- branches/yann: Deleted cin coordination with Yann Removed Paths: ------------- csw/branches/yann/ 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 Dec 9 17:17:34 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 16:17:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[2492] csw/branches/dam/automatic-multiarch-compile/lib/ neon Message-ID: Revision: 2492 http://gar.svn.sourceforge.net/gar/?rev=2492&view=rev Author: dmichelsen Date: 2008-12-09 16:17:34 +0000 (Tue, 09 Dec 2008) Log Message: ----------- multiISA neon: Move to mGAR v2 Modified Paths: -------------- csw/branches/dam/automatic-multiarch-compile/lib/neon/Makefile csw/branches/dam/automatic-multiarch-compile/lib/neon/checksums Removed Paths: ------------- csw/branches/dam/automatic-multiarch-compile/lib/neon/files/CSWneon-devel.prototype csw/branches/dam/automatic-multiarch-compile/lib/neon/files/CSWneon.prototype Modified: csw/branches/dam/automatic-multiarch-compile/lib/neon/Makefile =================================================================== --- csw/branches/dam/automatic-multiarch-compile/lib/neon/Makefile 2008-12-09 16:14:22 UTC (rev 2491) +++ csw/branches/dam/automatic-multiarch-compile/lib/neon/Makefile 2008-12-09 16:17:34 UTC (rev 2492) @@ -1,5 +1,10 @@ GARNAME = neon -GARVERSION = 0.26.3 +CURRENT_VERSION = 0.28.3 +LEGACY_VERSIONS = 0.25.4 0.26.4 0.27.2 +PKGVERSION ?= $(CURRENT_VERSION) +EXTRA_MODULATORS = PKGVERSION +MODULATIONS_PKGVERSION = $(LEGACY_VERSIONS) $(CURRENT_VERSION) +GARVERSION ?= $(PKGVERSION) CATEGORIES = lib DESCRIPTION = Neon HTTP and WebDAV client library @@ -10,31 +15,40 @@ be easily implemented. endef -# Compatibility libraries -LIBNAME = libneon.so -COMPATVERS = 24.0.7 25.0.5 -COMPATLIBS = $(foreach A,i386 sparc, \ - $(foreach V,$(COMPATVERS),$(LIBNAME).$(V).$(A).bz2)) - MASTER_SITES = http://www.webdav.org/$(GARNAME)/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWneon,$(ADMSTANDARD)) -DISTFILES += $(call admfiles,CSWneon-devel,$(ADMSTANDARD)) -#DISTFILES += $(COMPATLIBS) +SOURCEFILES = $(foreach VERSION,$(MODULATIONS_PKGVERSION),$(GARNAME)-$(GARVERSION).tar.gz) +DISTFILES = $(SOURCEFILES) +DISTFILES += $(call admfiles,CSWneon,depend) +DISTFILES += $(call admfiles,CSWneon-devel,depend) CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shared CONFIGURE_ARGS += --with-ssl=openssl CONFIGURE_ARGS += --with-expat -include ../category.mk +BUILD64 = 1 -#post-install: install-compat-libs +MERGE_SCRIPTS_isa-i386-pkgversion-0.25.4 = copy-only +MERGE_DIRS_isa-i386-pkgversion-0.25.4 = $(libdir) +MERGE_SCRIPTS_isa-amd64-pkgversion-0.25.4 = copy-relocated-only +MERGE_DIRS_isa-amd64-pkgversion-0.25.4 = $(libdir) -install-compat-libs: - @echo $(DISTFILES) - @for version in $(COMPATVERS) ; do \ - ginstall -m 755 $(WORKDIR)/$(LIBNAME).$$version.$(GARCH) \ - $(DESTDIR)$(libdir)/$(LIBNAME).$$version ; \ - done - @$(MAKECOOKIE) +MERGE_SCRIPTS_isa-i386-pkgversion-0.26.4 = copy-only +MERGE_DIRS_isa-i386-pkgversion-0.26.4 = $(libdir) +MERGE_SCRIPTS_isa-amd64-pkgversion-0.26.4 = copy-relocated-only +MERGE_DIRS_isa-amd64-pkgversion-0.26.4 = $(libdir) + +MERGE_SCRIPTS_isa-i386-pkgversion-0.27.2 = copy-only +MERGE_DIRS_isa-i386-pkgversion-0.27.2 = $(libdir) +MERGE_SCRIPTS_isa-amd64-pkgversion-0.27.2 = copy-relocated-only +MERGE_DIRS_isa-amd64-pkgversion-0.27.2 = $(libdir) + +MERGE_SCRIPTS_isa-i386-pkgversion-0.28.3 = copy-all +MERGE_SCRIPTS_isa-amd64-pkgversion-0.28.3 = copy-relocated-only +MERGE_DIRS_isa-amd64-pkgversion-0.28.3 = $(bindir) $(sbindir) $(libexecdir) $(libdir) + +# Move development stuff to CSWneon-devel and put the rest in CSWneon +PKGFILES_CSWneon-devel_EXCLUSIVE = $(PKGFILES_DEVEL) +PKGFILES_CSWneon-devel_EXCLUSIVE += $(docdir)/.* + +include ../category.mk Modified: csw/branches/dam/automatic-multiarch-compile/lib/neon/checksums =================================================================== --- csw/branches/dam/automatic-multiarch-compile/lib/neon/checksums 2008-12-09 16:14:22 UTC (rev 2491) +++ csw/branches/dam/automatic-multiarch-compile/lib/neon/checksums 2008-12-09 16:17:34 UTC (rev 2492) @@ -1,4 +1,7 @@ -6e52cd9c03e372026d6eccbfb80f09ef download/neon-0.26.3.tar.gz +4448c3a91e80429ea733aec8ce300009 download/neon-0.25.4.tar.gz +2d11fff51ffa856fc6b5d4bd801d6cc4 download/neon-0.26.4.tar.gz +24d434a4d5d4b6ce8f076039688f60ce download/neon-0.27.2.tar.gz +47599a328862ce64ac3c52726d6daa12 download/neon-0.28.3.tar.gz 643aa565e0d9f38f0153ab72b6dc5621 download/CSWneon.gspec cbce1c593467c9783a19b1a996cf5913 download/CSWneon.prototype 8d6f9c43747b4e4dee4ed216cd18a17b download/CSWneon.depend Deleted: csw/branches/dam/automatic-multiarch-compile/lib/neon/files/CSWneon-devel.prototype =================================================================== --- csw/branches/dam/automatic-multiarch-compile/lib/neon/files/CSWneon-devel.prototype 2008-12-09 16:14:22 UTC (rev 2491) +++ csw/branches/dam/automatic-multiarch-compile/lib/neon/files/CSWneon-devel.prototype 2008-12-09 16:17:34 UTC (rev 2492) @@ -1,171 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/neon-config 0755 root bin -d none /opt/csw/include 0755 root bin -d none /opt/csw/include/neon 0755 root bin -f none /opt/csw/include/neon/ne_207.h 0644 root bin -f none /opt/csw/include/neon/ne_acl.h 0644 root bin -f none /opt/csw/include/neon/ne_alloc.h 0644 root bin -f none /opt/csw/include/neon/ne_auth.h 0644 root bin -f none /opt/csw/include/neon/ne_basic.h 0644 root bin -f none /opt/csw/include/neon/ne_compress.h 0644 root bin -f none /opt/csw/include/neon/ne_dates.h 0644 root bin -f none /opt/csw/include/neon/ne_defs.h 0644 root bin -f none /opt/csw/include/neon/ne_i18n.h 0644 root bin -f none /opt/csw/include/neon/ne_locks.h 0644 root bin -f none /opt/csw/include/neon/ne_md5.h 0644 root bin -f none /opt/csw/include/neon/ne_props.h 0644 root bin -f none /opt/csw/include/neon/ne_redirect.h 0644 root bin -f none /opt/csw/include/neon/ne_request.h 0644 root bin -f none /opt/csw/include/neon/ne_session.h 0644 root bin -f none /opt/csw/include/neon/ne_socket.h 0644 root bin -f none /opt/csw/include/neon/ne_ssl.h 0644 root bin -f none /opt/csw/include/neon/ne_string.h 0644 root bin -f none /opt/csw/include/neon/ne_uri.h 0644 root bin -f none /opt/csw/include/neon/ne_utils.h 0644 root bin -f none /opt/csw/include/neon/ne_xml.h 0644 root bin -f none /opt/csw/include/neon/ne_xmlreq.h 0644 root bin -d none /opt/csw/lib 0755 root bin -f none /opt/csw/lib/libneon.a 0644 root bin -f none /opt/csw/lib/libneon.la 0755 root bin -d none /opt/csw/lib/pkgconfig 0755 root bin -f none /opt/csw/lib/pkgconfig/neon.pc 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/doc 0755 root bin -d none /opt/csw/share/doc/neon-0.26.3 0755 root bin -d none /opt/csw/share/doc/neon-0.26.3/html 0755 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/api.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/biblio.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/compliance.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/features.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/index.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/intro.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/ref.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refalloc.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refauth.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refbuf.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refbufapp.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refbufcr.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refbufdest.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refbufutil.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refcert.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refclicert.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refconfig.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/referr.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/reffeat.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refgetst.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refi18n.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refiaddr.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refneon.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refopts.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refreq.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refreqbody.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refreqhdr.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refreqopts.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refresolve.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refresphdr.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refsess.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refshave.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refsockinit.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refsslca.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refsslcert2.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refsslcertio.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refssldname.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refsslvfy.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refstatus.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/reftok.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refvers.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refxml.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/using.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/xml.html 0644 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man1 0755 root bin -f none /opt/csw/share/man/man1/neon-config.1 0644 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/ne_add_request_header.3 0644 root bin -f none /opt/csw/share/man/man3/ne_addr_destroy.3 0644 root bin -f none /opt/csw/share/man/man3/ne_addr_error.3 0644 root bin -f none /opt/csw/share/man/man3/ne_addr_first.3 0644 root bin -f none /opt/csw/share/man/man3/ne_addr_next.3 0644 root bin -f none /opt/csw/share/man/man3/ne_addr_resolve.3 0644 root bin -f none /opt/csw/share/man/man3/ne_addr_result.3 0644 root bin -f none /opt/csw/share/man/man3/ne_buffer.3 0644 root bin -f none /opt/csw/share/man/man3/ne_buffer_altered.3 0644 root bin -f none /opt/csw/share/man/man3/ne_buffer_append.3 0644 root bin -f none /opt/csw/share/man/man3/ne_buffer_clear.3 0644 root bin -f none /opt/csw/share/man/man3/ne_buffer_concat.3 0644 root bin -f none /opt/csw/share/man/man3/ne_buffer_create.3 0644 root bin -f none /opt/csw/share/man/man3/ne_buffer_destroy.3 0644 root bin -f none /opt/csw/share/man/man3/ne_buffer_finish.3 0644 root bin -f none /opt/csw/share/man/man3/ne_buffer_grow.3 0644 root bin -f none /opt/csw/share/man/man3/ne_buffer_ncreate.3 0644 root bin -f none /opt/csw/share/man/man3/ne_buffer_zappend.3 0644 root bin -f none /opt/csw/share/man/man3/ne_calloc.3 0644 root bin -f none /opt/csw/share/man/man3/ne_close_connection.3 0644 root bin -f none /opt/csw/share/man/man3/ne_forget_auth.3 0644 root bin -f none /opt/csw/share/man/man3/ne_get_error.3 0644 root bin -f none /opt/csw/share/man/man3/ne_get_response_header.3 0644 root bin -f none /opt/csw/share/man/man3/ne_get_scheme.3 0644 root bin -f none /opt/csw/share/man/man3/ne_get_server_hostport.3 0644 root bin -f none /opt/csw/share/man/man3/ne_has_support.3 0644 root bin -f none /opt/csw/share/man/man3/ne_get_status.3 0644 root bin -f none /opt/csw/share/man/man3/ne_i18n_init.3 0644 root bin -f none /opt/csw/share/man/man3/ne_iaddr_cmp.3 0644 root bin -f none /opt/csw/share/man/man3/ne_iaddr_free.3 0644 root bin -f none /opt/csw/share/man/man3/ne_iaddr_make.3 0644 root bin -f none /opt/csw/share/man/man3/ne_iaddr_print.3 0644 root bin -f none /opt/csw/share/man/man3/ne_iaddr_typeof.3 0644 root bin -f none /opt/csw/share/man/man3/ne_malloc.3 0644 root bin -f none /opt/csw/share/man/man3/ne_oom_callback.3 0644 root bin -f none /opt/csw/share/man/man3/ne_print_request_header.3 0644 root bin -f none /opt/csw/share/man/man3/ne_qtoken.3 0644 root bin -f none /opt/csw/share/man/man3/ne_realloc.3 0644 root bin -f none /opt/csw/share/man/man3/ne_request_create.3 0644 root bin -f none /opt/csw/share/man/man3/ne_request_destroy.3 0644 root bin -f none /opt/csw/share/man/man3/ne_request_dispatch.3 0644 root bin -f none /opt/csw/share/man/man3/ne_response_header_iterate.3 0644 root bin -f none /opt/csw/share/man/man3/ne_session_create.3 0644 root bin -f none /opt/csw/share/man/man3/ne_session_destroy.3 0644 root bin -f none /opt/csw/share/man/man3/ne_session_proxy.3 0644 root bin -f none /opt/csw/share/man/man3/ne_set_error.3 0644 root bin -f none /opt/csw/share/man/man3/ne_set_persist.3 0644 root bin -f none /opt/csw/share/man/man3/ne_set_proxy_auth.3 0644 root bin -f none /opt/csw/share/man/man3/ne_set_read_timeout.3 0644 root bin -f none /opt/csw/share/man/man3/ne_set_request_body_buffer.3 0644 root bin -f none /opt/csw/share/man/man3/ne_set_request_body_fd.3 0644 root bin -f none /opt/csw/share/man/man3/ne_set_request_body_fd64.3 0644 root bin -f none /opt/csw/share/man/man3/ne_set_request_expect100.3 0644 root bin -f none /opt/csw/share/man/man3/ne_set_server_auth.3 0644 root bin -f none /opt/csw/share/man/man3/ne_set_useragent.3 0644 root bin -f none /opt/csw/share/man/man3/ne_shave.3 0644 root bin -f none /opt/csw/share/man/man3/ne_sock_exit.3 0644 root bin -f none /opt/csw/share/man/man3/ne_sock_init.3 0644 root bin -f none /opt/csw/share/man/man3/ne_ssl_cert_cmp.3 0644 root bin -f none /opt/csw/share/man/man3/ne_ssl_cert_export.3 0644 root bin -f none /opt/csw/share/man/man3/ne_ssl_cert_free.3 0644 root bin -f none /opt/csw/share/man/man3/ne_ssl_cert_identity.3 0644 root bin -f none /opt/csw/share/man/man3/ne_ssl_cert_import.3 0644 root bin -f none /opt/csw/share/man/man3/ne_ssl_cert_issuer.3 0644 root bin -f none /opt/csw/share/man/man3/ne_ssl_cert_read.3 0644 root bin -f none /opt/csw/share/man/man3/ne_ssl_cert_signedby.3 0644 root bin -f none /opt/csw/share/man/man3/ne_ssl_cert_subject.3 0644 root bin -f none /opt/csw/share/man/man3/ne_ssl_cert_write.3 0644 root bin -f none /opt/csw/share/man/man3/ne_ssl_clicert_decrypt.3 0644 root bin -f none /opt/csw/share/man/man3/ne_ssl_clicert_encrypted.3 0644 root bin -f none /opt/csw/share/man/man3/ne_ssl_clicert_free.3 0644 root bin -f none /opt/csw/share/man/man3/ne_ssl_clicert_name.3 0644 root bin -f none /opt/csw/share/man/man3/ne_ssl_clicert_owner.3 0644 root bin -f none /opt/csw/share/man/man3/ne_ssl_clicert_read.3 0644 root bin -f none /opt/csw/share/man/man3/ne_ssl_dname_cmp.3 0644 root bin -f none /opt/csw/share/man/man3/ne_ssl_readable_dname.3 0644 root bin -f none /opt/csw/share/man/man3/ne_ssl_set_verify.3 0644 root bin -f none /opt/csw/share/man/man3/ne_ssl_trust_cert.3 0644 root bin -f none /opt/csw/share/man/man3/ne_ssl_trust_default_ca.3 0644 root bin -f none /opt/csw/share/man/man3/ne_status.3 0644 root bin -f none /opt/csw/share/man/man3/ne_strdup.3 0644 root bin -f none /opt/csw/share/man/man3/ne_strndup.3 0644 root bin -f none /opt/csw/share/man/man3/ne_token.3 0644 root bin -f none /opt/csw/share/man/man3/ne_version_match.3 0644 root bin -f none /opt/csw/share/man/man3/ne_version_string.3 0644 root bin -f none /opt/csw/share/man/man3/ne_xml_create.3 0644 root bin -f none /opt/csw/share/man/man3/ne_xml_destroy.3 0644 root bin -f none /opt/csw/share/man/man3/neon.3 0644 root bin Deleted: csw/branches/dam/automatic-multiarch-compile/lib/neon/files/CSWneon.prototype =================================================================== --- csw/branches/dam/automatic-multiarch-compile/lib/neon/files/CSWneon.prototype 2008-12-09 16:14:22 UTC (rev 2491) +++ csw/branches/dam/automatic-multiarch-compile/lib/neon/files/CSWneon.prototype 2008-12-09 16:17:34 UTC (rev 2492) @@ -1,30 +0,0 @@ -d none /opt/csw/lib 0755 root bin -f none /opt/csw/lib/libneon.so.26.0.3 0755 root bin -s none /opt/csw/lib/libneon.so.26=libneon.so.26.0.3 root bin -s none /opt/csw/lib/libneon.so=libneon.so.26.0.3 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/locale 0755 root bin -d none /opt/csw/share/locale/cs 0755 root bin -d none /opt/csw/share/locale/cs/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/cs/LC_MESSAGES/neon.mo 0644 root bin -d none /opt/csw/share/locale/de 0755 root bin -d none /opt/csw/share/locale/de/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/de/LC_MESSAGES/neon.mo 0644 root bin -d none /opt/csw/share/locale/fr 0755 root bin -d none /opt/csw/share/locale/fr/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/fr/LC_MESSAGES/neon.mo 0644 root bin -d none /opt/csw/share/locale/ja 0755 root bin -d none /opt/csw/share/locale/ja/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/ja/LC_MESSAGES/neon.mo 0644 root bin -d none /opt/csw/share/locale/nn 0755 root bin -d none /opt/csw/share/locale/nn/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/nn/LC_MESSAGES/neon.mo 0644 root bin -d none /opt/csw/share/locale/ru 0755 root bin -d none /opt/csw/share/locale/ru/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/ru/LC_MESSAGES/neon.mo 0644 root bin -d none /opt/csw/share/locale/tr 0755 root bin -d none /opt/csw/share/locale/tr/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/tr/LC_MESSAGES/neon.mo 0644 root bin -d none /opt/csw/share/locale/zh 0755 root bin -d none /opt/csw/share/locale/zh/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/zh/LC_MESSAGES/neon.mo 0644 root bin 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 Dec 9 17:18:17 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 16:18:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[2493] csw/branches/dam/automatic-multiarch-compile/lib/ expat Message-ID: Revision: 2493 http://gar.svn.sourceforge.net/gar/?rev=2493&view=rev Author: dmichelsen Date: 2008-12-09 16:18:16 +0000 (Tue, 09 Dec 2008) Log Message: ----------- multiISA expat: Move to mGAR v2 Modified Paths: -------------- csw/branches/dam/automatic-multiarch-compile/lib/expat/Makefile csw/branches/dam/automatic-multiarch-compile/lib/expat/checksums Added Paths: ----------- csw/branches/dam/automatic-multiarch-compile/lib/expat/files/patch-libexpat-1.95.8-destdir.diff Removed Paths: ------------- csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat-devel.depend csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat-devel.gspec csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat-devel.prototype csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat.depend csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat.prototype csw/branches/dam/automatic-multiarch-compile/lib/expat/files/libexpat.so.0.4.0 csw/branches/dam/automatic-multiarch-compile/lib/expat/files/libexpat.so.0.5.0 Modified: csw/branches/dam/automatic-multiarch-compile/lib/expat/Makefile =================================================================== --- csw/branches/dam/automatic-multiarch-compile/lib/expat/Makefile 2008-12-09 16:17:34 UTC (rev 2492) +++ csw/branches/dam/automatic-multiarch-compile/lib/expat/Makefile 2008-12-09 16:18:16 UTC (rev 2493) @@ -1,5 +1,8 @@ GARNAME = expat -GARVERSION = 2.0.0 +PKGVERSION ?= 2.0.1 +EXTRA_MODULATORS = PKGVERSION +MODULATIONS_PKGVERSION = 1.95.8 2.0.1 +GARVERSION ?= $(PKGVERSION) CATEGORIES = lib DESCRIPTION = XML Parser Toolkit @@ -10,15 +13,17 @@ endef MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWexpat,depend prototype) -DISTFILES += $(call admfiles,CSWexpat-devel,depend prototype) +DISTFILES = $(foreach VERSION,$(MODULATIONS_PKGVERSION),$(GARNAME)-$(VERSION).tar.gz) +DISTFILES += $(call admfiles,CSWexpat,) -# Compatibility libraries -EXTLIBS += libexpat.so.0.4.0 -EXTLIBS += libexpat.so.0.5.0 -DISTFILES += $(EXTLIBS) +# From +# https://sourceforge.net/tracker/?func=detail&atid=110127&aid=1217217&group_id=10127 +# http://expat.cvs.sourceforge.net/viewvc/expat/expat/Makefile.in?r1=1.47&r2=1.48 +PATCHFILES-pkgversion-1.95.8 = patch-libexpat-1.95.8-destdir.diff +PATCHFILES = $(PATCHFILES-pkgversion-$(PKGVERSION)) +BUILD64 = 1 + # The expat 'check' target tries to compile tests that use GCC # constructs -- won't compile under Forte without hackery. TEST_TARGET = check @@ -26,9 +31,13 @@ CONFIGURE_ARGS = $(DIRPATHS) +MERGE_SCRIPTS_isa-i386-pkgversion-1.95.8 = copy-only +MERGE_DIRS_isa-i386-pkgversion-1.95.8 = $(libdir) +MERGE_SCRIPTS_isa-amd64-pkgversion-1.95.8 = copy-relocated-only +MERGE_DIRS_isa-amd64-pkgversion-1.95.8 = $(libdir) + +MERGE_SCRIPTS_isa-i386-pkgversion-2.0.1 = copy-all +MERGE_SCRIPTS_isa-amd64-pkgversion-2.0.1 = copy-relocated-only +MERGE_DIRS_isa-amd64-pkgversion-2.0.1 = $(bindir) $(sbindir) $(libexecdir) $(libdir) + include ../category.mk - -post-install: - @for extlib in $(EXTLIBS) ; do \ - install -m 0755 $(WORKDIR)/$$extlib $(DESTDIR)$(libdir) ; \ - done Modified: csw/branches/dam/automatic-multiarch-compile/lib/expat/checksums =================================================================== --- csw/branches/dam/automatic-multiarch-compile/lib/expat/checksums 2008-12-09 16:17:34 UTC (rev 2492) +++ csw/branches/dam/automatic-multiarch-compile/lib/expat/checksums 2008-12-09 16:18:16 UTC (rev 2493) @@ -1,9 +1,9 @@ -d945df7f1c0868c5c73cf66ba9596f3f download/expat-2.0.0.tar.gz +aff487543845a82fe262e6e2922b4c8e download/expat-1.95.8.tar.gz +ee8b492592568805593f81f8cdf2a04c download/expat-2.0.1.tar.gz 7145f62799b8019b4636811f22eed0dc download/CSWexpat.gspec -8093298b67861e241b0d2499c9f2ff89 download/CSWexpat.depend -442c9a9124f9700d5156bf24baf8491b download/CSWexpat.prototype +d41d8cd98f00b204e9800998ecf8427e download/CSWexpat.depend +2ee9a8ce89f28371461302eea3a706ce download/CSWexpat.prototype 2fb9c175c9f5d1e21f0531c1cada0994 download/CSWexpat-devel.gspec -3dfca43e9c14ab646c8aadfc59093ba3 download/CSWexpat-devel.depend -7638ec36b2ae51da9b300bee9a18d349 download/CSWexpat-devel.prototype -0d36c0738fa471a0fcae0cd565016295 download/libexpat.so.0.4.0 -b52745e58a5dab5df7a459d25d54d65d download/libexpat.so.0.5.0 +9c8bed940180401cb0bfcd7761ad5c1a download/CSWexpat-devel.depend +d99c92a8836db5f6baedec6912a968fb download/CSWexpat-devel.prototype +da9dfd74eb2b44102d137ff1d0993842 download/patch-libexpat-1.95.8-destdir.diff Deleted: csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat-devel.depend =================================================================== --- csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat-devel.depend 2008-12-09 16:17:34 UTC (rev 2492) +++ csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat-devel.depend 2008-12-09 16:18:16 UTC (rev 2493) @@ -1 +0,0 @@ -P CSWexpat expat - XML Parser Toolkit Deleted: csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat-devel.gspec =================================================================== --- csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat-devel.gspec 2008-12-09 16:17:34 UTC (rev 2492) +++ csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat-devel.gspec 2008-12-09 16:18:16 UTC (rev 2493) @@ -1,5 +0,0 @@ -%var bitname expat_devel -%var pkgname CSWexpat-devel -%var desc XML Parsing Toolkit - Development Support -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING Deleted: csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat-devel.prototype =================================================================== --- csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat-devel.prototype 2008-12-09 16:17:34 UTC (rev 2492) +++ csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat-devel.prototype 2008-12-09 16:18:16 UTC (rev 2493) @@ -1,6 +0,0 @@ -d none /opt/csw/include 0755 root bin -f none /opt/csw/include/expat.h 0644 root bin -f none /opt/csw/include/expat_external.h 0644 root bin -d none /opt/csw/lib 0755 root bin -f none /opt/csw/lib/libexpat.a 0644 root bin -f none /opt/csw/lib/libexpat.la 0755 root bin Deleted: csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat.prototype =================================================================== --- csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat.prototype 2008-12-09 16:17:34 UTC (rev 2492) +++ csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat.prototype 2008-12-09 16:18:16 UTC (rev 2493) @@ -1,13 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/xmlwf 0755 root bin -d none /opt/csw/lib 0755 root bin -f none /opt/csw/lib/libexpat.so.0.4.0 0755 root bin -f none /opt/csw/lib/libexpat.so.0.5.0 0755 root bin -s none /opt/csw/lib/libexpat.so.0=libexpat.so.0.5.0 -f none /opt/csw/lib/libexpat.so.1.5.0 0755 root bin -s none /opt/csw/lib/libexpat.so.1=libexpat.so.1.5.0 -s none /opt/csw/lib/libexpat.so=libexpat.so.1.5.0 -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man1 0755 root bin -f none /opt/csw/share/man/man1/xmlwf.1 0644 root bin Deleted: csw/branches/dam/automatic-multiarch-compile/lib/expat/files/libexpat.so.0.4.0 =================================================================== (Binary files differ) Deleted: csw/branches/dam/automatic-multiarch-compile/lib/expat/files/libexpat.so.0.5.0 =================================================================== (Binary files differ) Added: csw/branches/dam/automatic-multiarch-compile/lib/expat/files/patch-libexpat-1.95.8-destdir.diff =================================================================== --- csw/branches/dam/automatic-multiarch-compile/lib/expat/files/patch-libexpat-1.95.8-destdir.diff (rev 0) +++ csw/branches/dam/automatic-multiarch-compile/lib/expat/files/patch-libexpat-1.95.8-destdir.diff 2008-12-09 16:18:16 UTC (rev 2493) @@ -0,0 +1,46 @@ +diff -Naur expat-1.95.8.orig/Makefile.in expat-1.95.8.patch/Makefile.in +--- expat-1.95.8.orig/Makefile.in 2004-05-07 22:00:48.000000000 +0200 ++++ expat-1.95.8.patch/Makefile.in 2008-10-08 21:37:37.308957000 +0200 +@@ -44,6 +44,9 @@ + APIHEADER = $(srcdir)/lib/expat.h $(srcdir)/lib/expat_external.h + LIBRARY = libexpat.la + ++ifndef INSTALL_ROOT ++INSTALL_ROOT=$(DESTDIR) ++endif + + default: buildlib xmlwf/xmlwf + +@@ -73,22 +76,22 @@ + tests/runtests + + install: xmlwf/xmlwf installlib +- $(mkinstalldirs) $(bindir) $(man1dir) +- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf $(bindir)/xmlwf +- $(INSTALL_DATA) $(MANFILE) $(man1dir) ++ $(mkinstalldirs) $(INSTALL_ROOT)$(bindir) $(INSTALL_ROOT)$(man1dir) ++ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf $(INSTALL_ROOT)$(bindir)/xmlwf ++ $(INSTALL_DATA) $(MANFILE) $(INSTALL_ROOT)$(man1dir) + + installlib: $(LIBRARY) $(APIHEADER) +- $(mkinstalldirs) $(libdir) $(includedir) +- $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(libdir)/$(LIBRARY) +- $(INSTALL_DATA) $(APIHEADER) $(includedir) ++ $(mkinstalldirs) $(INSTALL_ROOT)$(libdir) $(INSTALL_ROOT)$(includedir) ++ $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(INSTALL_ROOT)$(libdir)/$(LIBRARY) ++ for FN in $(APIHEADER) ; do $(INSTALL_DATA) $$FN $(INSTALL_ROOT)$(includedir) ; done + + uninstall: uninstalllib +- $(LIBTOOL) --mode=uninstall rm -f $(bindir)/xmlwf +- rm -f $(man1dir)/xmlwf.1 ++ $(LIBTOOL) --mode=uninstall rm -f $(INSTALL_ROOT)$(bindir)/xmlwf ++ rm -f $(INSTALL_ROOT)$(man1dir)/xmlwf.1 + + uninstalllib: +- $(LIBTOOL) --mode=uninstall rm -f $(libdir)/$(LIBRARY) +- rm -f $(includedir)/$(APIHEADER) ++ $(LIBTOOL) --mode=uninstall rm -f $(INSTALL_ROOT)$(libdir)/$(LIBRARY) ++ rm -f $(INSTALL_ROOT)$(includedir)/$(APIHEADER) + + # for VPATH builds (invoked by configure) + mkdir-init: 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 Dec 9 17:19:33 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 16:19:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[2494] csw/branches/dam/automatic-multiarch-compile/lib/ libsdl Message-ID: Revision: 2494 http://gar.svn.sourceforge.net/gar/?rev=2494&view=rev Author: dmichelsen Date: 2008-12-09 16:19:33 +0000 (Tue, 09 Dec 2008) Log Message: ----------- multiISA libsdl: Move to mGAR v2 Modified Paths: -------------- csw/branches/dam/automatic-multiarch-compile/lib/libsdl/Makefile csw/branches/dam/automatic-multiarch-compile/lib/libsdl/checksums csw/branches/dam/automatic-multiarch-compile/lib/libsdl/files/CSWlibsdl.depend Modified: csw/branches/dam/automatic-multiarch-compile/lib/libsdl/Makefile =================================================================== --- csw/branches/dam/automatic-multiarch-compile/lib/libsdl/Makefile 2008-12-09 16:18:16 UTC (rev 2493) +++ csw/branches/dam/automatic-multiarch-compile/lib/libsdl/Makefile 2008-12-09 16:19:33 UTC (rev 2494) @@ -1,17 +1,22 @@ GARNAME = SDL -GARVERSION = 1.2.11 +GARVERSION = 1.2.13 CATEGORIES = lib DESCRIPTION = Simple DirectMedia Layer library define BLURB - Simple DirectMedia Layer is a cross-platform multimedia library designed to provide low level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL, and 2D video framebuffer. It is used by MPEG playback software, emulators, and many popular games, including the award winning Linux port of "Civilization: Call To Power." + Simple DirectMedia Layer is a cross-platform multimedia library + designed to provide low level access to audio, keyboard, mouse, + joystick, 3D hardware via OpenGL, and 2D video framebuffer. endef MASTER_SITES = http://www.libsdl.org/release/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWlibsdl, depend ) +DISTFILES += $(call admfiles,CSWlibsdl) +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --disable-video-dga +EXTRA_BUILD_ISAS_i386 = amd64 + include ../category.mk Modified: csw/branches/dam/automatic-multiarch-compile/lib/libsdl/checksums =================================================================== --- csw/branches/dam/automatic-multiarch-compile/lib/libsdl/checksums 2008-12-09 16:18:16 UTC (rev 2493) +++ csw/branches/dam/automatic-multiarch-compile/lib/libsdl/checksums 2008-12-09 16:19:33 UTC (rev 2494) @@ -1,3 +1,2 @@ -dbe82ff408bccfd6992b4cf162538595 download/SDL-1.2.11.tar.gz +c6660feea2a6834de10bc71b2f8e4d88 download/SDL-1.2.13.tar.gz 60483a03ebdc960fc70c67cebc151245 download/CSWlibsdl.gspec -518f6003f41f94b4ff7c36c4df00853d download/CSWlibsdl.depend Modified: csw/branches/dam/automatic-multiarch-compile/lib/libsdl/files/CSWlibsdl.depend =================================================================== --- csw/branches/dam/automatic-multiarch-compile/lib/libsdl/files/CSWlibsdl.depend 2008-12-09 16:18:16 UTC (rev 2493) +++ csw/branches/dam/automatic-multiarch-compile/lib/libsdl/files/CSWlibsdl.depend 2008-12-09 16:19:33 UTC (rev 2494) @@ -1 +1 @@ -CSWiconv +P CSWiconv libiconv - GNU iconv library 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 Dec 9 17:20:15 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 16:20:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[2495] csw/branches/dam/automatic-multiarch-compile/lib/ libpopt/Makefile Message-ID: Revision: 2495 http://gar.svn.sourceforge.net/gar/?rev=2495&view=rev Author: dmichelsen Date: 2008-12-09 16:20:14 +0000 (Tue, 09 Dec 2008) Log Message: ----------- multiISA libpopt: Move to mGAR v2 Modified Paths: -------------- csw/branches/dam/automatic-multiarch-compile/lib/libpopt/Makefile Modified: csw/branches/dam/automatic-multiarch-compile/lib/libpopt/Makefile =================================================================== --- csw/branches/dam/automatic-multiarch-compile/lib/libpopt/Makefile 2008-12-09 16:19:33 UTC (rev 2494) +++ csw/branches/dam/automatic-multiarch-compile/lib/libpopt/Makefile 2008-12-09 16:20:14 UTC (rev 2495) @@ -12,8 +12,18 @@ CONFIGURE_ARGS = $(DIRPATHS) -ADDITIONAL_BUILD_ARCHS_sparc = sparcv9 +#EXTRA_BUILD_ISAS_i386 = amd64 +#EXTRA_BUILD_ISAS_sparc = sparcv9 +# Just do 64 bit build +#BUILD64 = 1 + +# Build all known ISAs (may not work with compiler) +#EXTRA_BUILD_ISAS = $(ISALIST) + +# Build all ISAs known to the chosen compiler +EXTRA_BUILD_ISAS = $(ISALIST_$(GARCOMPILER)) + TEST_TARGET = check include ../category.mk @@ -29,3 +39,6 @@ # Make sure xgettext we carefully linked just before is found before # other versions. PATH := .:$(PATH) + +env: + echo "I: $(ISALIST_$(GARCOMPILER)) 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 Dec 9 17:20:48 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 16:20:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[2496] csw/branches/dam/automatic-multiarch-compile/lib/ gtk2 Message-ID: Revision: 2496 http://gar.svn.sourceforge.net/gar/?rev=2496&view=rev Author: dmichelsen Date: 2008-12-09 16:20:48 +0000 (Tue, 09 Dec 2008) Log Message: ----------- multiISA gtk2: Move to mGAR v2 Modified Paths: -------------- csw/branches/dam/automatic-multiarch-compile/lib/gtk2/Makefile csw/branches/dam/automatic-multiarch-compile/lib/gtk2/checksums Modified: csw/branches/dam/automatic-multiarch-compile/lib/gtk2/Makefile =================================================================== --- csw/branches/dam/automatic-multiarch-compile/lib/gtk2/Makefile 2008-12-09 16:20:14 UTC (rev 2495) +++ csw/branches/dam/automatic-multiarch-compile/lib/gtk2/Makefile 2008-12-09 16:20:48 UTC (rev 2496) @@ -1,5 +1,5 @@ GARNAME = gtk2 -GARVERSION = 2.4.3 +GARVERSION = 2.14.4 CATEGORIES = lib DESCRIPTION = A library for creating graphical user interfaces. @@ -16,23 +16,20 @@ # # #if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP) -MASTER_SITES = ftp://ftp.gtk.org/pub/gtk/v2.4/ +MASTER_SITES = http://ftp.gnome.org/pub/gnome/sources/gtk+/2.14/ DISTFILES = gtk+-$(GARVERSION).tar.bz2 WORKSRC = $(WORKDIR)/gtk+-$(GARVERSION) -LIBDEPS += lib/atk -LIBDEPS += lib/pango -LIBDEPS += lib/xcursor -LIBDEPS += xtra/hicolor-icon-theme - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-debug=yes +BUILD64 = 1 + TEST_TARGET = check include ../category.mk -CFLAGS := -g $(CFLAGS) -CXXFLAGS := -g $(CXXFLAGS) -export CFLAGS CXXFLAGS +#CFLAGS := -g $(CFLAGS) +#CXXFLAGS := -g $(CXXFLAGS) +#export CFLAGS CXXFLAGS Modified: csw/branches/dam/automatic-multiarch-compile/lib/gtk2/checksums =================================================================== --- csw/branches/dam/automatic-multiarch-compile/lib/gtk2/checksums 2008-12-09 16:20:14 UTC (rev 2495) +++ csw/branches/dam/automatic-multiarch-compile/lib/gtk2/checksums 2008-12-09 16:20:48 UTC (rev 2496) @@ -1 +1 @@ -debfd0fcef08683c0761f13e1ba2dced download/gtk+-2.4.3.tar.bz2 +72bf65a54d2d29a6644dc0d28313ee67 download/gtk+-2.14.4.tar.bz2 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 Dec 9 17:21:34 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 16:21:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[2497] csw/branches/dam/automatic-multiarch-compile/lib/qt4 Message-ID: Revision: 2497 http://gar.svn.sourceforge.net/gar/?rev=2497&view=rev Author: dmichelsen Date: 2008-12-09 16:21:33 +0000 (Tue, 09 Dec 2008) Log Message: ----------- multiISA qt4: Move to mGAR v2 Modified Paths: -------------- csw/branches/dam/automatic-multiarch-compile/lib/qt4/Makefile csw/branches/dam/automatic-multiarch-compile/lib/qt4/checksums Modified: csw/branches/dam/automatic-multiarch-compile/lib/qt4/Makefile =================================================================== --- csw/branches/dam/automatic-multiarch-compile/lib/qt4/Makefile 2008-12-09 16:20:48 UTC (rev 2496) +++ csw/branches/dam/automatic-multiarch-compile/lib/qt4/Makefile 2008-12-09 16:21:33 UTC (rev 2497) @@ -1,5 +1,5 @@ GARNAME = qt4 -GARVERSION = 4.3.3 +GARVERSION = 4.4.0 CATEGORIES = lib DESCRIPTION = TrollTech C++ application framework @@ -9,58 +9,22 @@ http://doc.trolltech.com/4.3/qt4-intro.html for details. endef -sparc_ARCH = sparc -i386_ARCH = i386 -sparc_ARCH64 = sparcv9 -i386_ARCH64 = amd64 - -ARCH=$($(GARCH)_ARCH) -ARCH64=$($(GARCH)_ARCH64) - ifndef DO64 PLATFORM=solaris-cc else PLATFORM=solaris-cc-64 endif -ifdef ISA -ISALIST = $(ISA) -else -ifndef DO64 -ISA = $(ARCH) -else -ISA = $(ARCH64) -endif -endif - MASTER_SITES = ftp://ftp.trolltech.com/qt/source/ DISTFILES = qt-x11-opensource-src-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWqt4,depend prototype-sparc prototype-i386) DISTFILES += $(call admfiles,CSWqt4-devel,depend prototype-sparc prototype-i386) DISTFILES += $(call admfiles,CSWqt4-docs,prototype) -WORKDIR = $(WORKROOTDIR)/$(DESTIMG).d/$(PLATFORM) -COOKIEROOTDIR = cookies.$(PLATFORM) - WORKSRC = $(WORKDIR)/qt-x11-opensource-src-$(GARVERSION) PREREQUISITE_PKGS = CSWpkgconfig CSWfconfig CSWlibdbusdev -# Usually the pathes from already installed stuff at $DESTDIR is -# used before regular installed stuff. This leads to include errors -# if we already have a qt4 installed at $DESTDIR. -IGNORE_DESTDIR = 1 - -ifdef DO64 - bindir = $(exec_prefix)/bin/sparcv9 - libdir = $(exec_prefix)/lib/sparcv9 - docdir = $(prefix)/ignore/doc - includedir = $(prefix)/ignore/include - datadir = $(prefix)/ignore/data - sharedstatedir = $(prefix)/ignore/share - etcdir = $(prefix)/ignore/etc -endif - CONFIGURE_ARGS = -prefix $(prefix) \ -bindir $(bindir) \ -libdir $(libdir) \ @@ -78,82 +42,38 @@ -confirm-license \ -verbose +BUILD64 = 1 + SKIPTEST = 1 INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) SRC_CLEAN_TARGET = confclean -ifndef DO64 -CLEAN_SCRIPTS = all custom -endif - include ../category.mk -OPTARCH_sparc = v8 -OPTARCH_sparcv9 = v9 -OPTARCH_i386 = 386 -OPTARCH_amd64 = amd64 -OPTARCH = $(OPTARCH_$(ISA)) - -ifdef DO64 - # Do not use -xO3 as -xO2 is already set in the Makefile - SUN_CC_OPT = -xarch=$(OPTARCH) -xspace -xildoff - SUN_CXX_OPT = -xarch=$(OPTARCH) -xspace -xildoff - - # Do not include -I/-L here. These flags must be defined after - # local QT4 includes and need to be defined during configure. - CFLAGS = $($(GARCOMPILER)_CC_$(GARFLAVOR)) - CPPFLAGS = $($(GARCOMPILER)_CPP_FLAGS) - # -D_POSIX_PTHREAD_SEMANTICS needed, because getpwuid_r is used in the 4-arg-version - # (see getpwuid_r(3c) for details) - CXXFLAGS = $($(GARCOMPILER)_CXX_$(GARFLAVOR)) -D_POSIX_PTHREAD_SEMANTICS - LDFLAGS = $($(GARCOMPILER)_LD_FLAGS) $($(GARCOMPILER)_LD_$(GARFLAVOR)) -else - # Do not use -xO3 as -xO2 is already set in the Makefile - SUN_CC_OPT = -xarch=$(OPTARCH) -xspace -xildoff - SUN_CXX_OPT = -xarch=$(OPTARCH) -xspace -xildoff - - # Do not include -I/-L here. These flags must be defined after - # local QT4 includes and need to be defined during configure. - CFLAGS = $($(GARCOMPILER)_CC_$(GARFLAVOR)) - CPPFLAGS = $($(GARCOMPILER)_CPP_FLAGS) - CXXFLAGS = $($(GARCOMPILER)_CXX_$(GARFLAVOR)) - LDFLAGS = $($(GARCOMPILER)_LD_FLAGS) $($(GARCOMPILER)_LD_$(GARFLAVOR)) -endif - -pre-build: - @echo "ISA: $(ISA)" - @echo "XC: $(GARCOMPILER)_CC_$(GARFLAVOR)" - @echo "XC: $($(GARCOMPILER)_CC_$(GARFLAVOR))" - @echo "CFLAGS: $(CFLAGS)" - -build64: - @echo " ==> Building 64 bit version" - gmake DO64=1 build - -install64: build64 - @echo " ==> Installing 64 bit version" - gmake DO64=1 install - -pre-package: install64 - -pre-install: - @echo " ==> Install environment:" - @echo " bindir: $(bindir)" - @echo " libdir: $(libdir)" - @/usr/bin/env - -clean64: - gmake DO64=1 clean - -clean-custom: clean64 - -env: - @echo " GARCH = $(GARCH)" - @echo " GARVERSION = $(GARVERSION)" - @echo " ISA = $(ISA)" - @echo " CFLAGS = $(CFLAGS)" - @echo " OPTARCH = $(OPTARCH)" - @echo " OPTARCH_ISA = $(OPTARCH_$(ISA))" - @echo "CLEAN TARGETS = $(CLEAN_TARGETS)" +#ifdef DO64 +# # Do not use -xO3 as -xO2 is already set in the Makefile +# SUN_CC_OPT = -xarch=$(OPTARCH) -xspace -xildoff +# SUN_CXX_OPT = -xarch=$(OPTARCH) -xspace -xildoff +# +# # Do not include -I/-L here. These flags must be defined after +# # local QT4 includes and need to be defined during configure. +# CFLAGS = $($(GARCOMPILER)_CC_$(GARFLAVOR)) +# CPPFLAGS = $($(GARCOMPILER)_CPP_FLAGS) +# # -D_POSIX_PTHREAD_SEMANTICS needed, because getpwuid_r is used in the 4-arg-version +# # (see getpwuid_r(3c) for details) +# CXXFLAGS = $($(GARCOMPILER)_CXX_$(GARFLAVOR)) -D_POSIX_PTHREAD_SEMANTICS +# LDFLAGS = $($(GARCOMPILER)_LD_FLAGS) $($(GARCOMPILER)_LD_$(GARFLAVOR)) +#else +# # Do not use -xO3 as -xO2 is already set in the Makefile +# SUN_CC_OPT = -xarch=$(OPTARCH) -xspace -xildoff +# SUN_CXX_OPT = -xarch=$(OPTARCH) -xspace -xildoff +# +# # Do not include -I/-L here. These flags must be defined after +# # local QT4 includes and need to be defined during configure. +# CFLAGS = $($(GARCOMPILER)_CC_$(GARFLAVOR)) +# CPPFLAGS = $($(GARCOMPILER)_CPP_FLAGS) +# CXXFLAGS = $($(GARCOMPILER)_CXX_$(GARFLAVOR)) +# LDFLAGS = $($(GARCOMPILER)_LD_FLAGS) $($(GARCOMPILER)_LD_$(GARFLAVOR)) +#endif Modified: csw/branches/dam/automatic-multiarch-compile/lib/qt4/checksums =================================================================== --- csw/branches/dam/automatic-multiarch-compile/lib/qt4/checksums 2008-12-09 16:20:48 UTC (rev 2496) +++ csw/branches/dam/automatic-multiarch-compile/lib/qt4/checksums 2008-12-09 16:21:33 UTC (rev 2497) @@ -1,4 +1,4 @@ -19678fe35170559cd6a6fa531c57799c download/qt-x11-opensource-src-4.3.3.tar.gz +f13ad0aa75efad314715930e663bad55 download/qt-x11-opensource-src-4.4.0.tar.gz 1971c2c7513b65cd7a8d33b9a637a908 download/CSWqt4.gspec abca6ced15fc6cc1f47ca35ebe1af99b download/CSWqt4.depend 46107c5b0ec8d00a3a19008f251e98f3 download/CSWqt4.prototype-sparc 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 Dec 9 17:37:25 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 16:37:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[2498] csw/mgar/pkg/libxml2/trunk Message-ID: Revision: 2498 http://gar.svn.sourceforge.net/gar/?rev=2498&view=rev Author: dmichelsen Date: 2008-12-09 16:37:25 +0000 (Tue, 09 Dec 2008) Log Message: ----------- libxml2: Relocate catalog and small mGAR v2 fix Modified Paths: -------------- csw/mgar/pkg/libxml2/trunk/Makefile csw/mgar/pkg/libxml2/trunk/checksums csw/mgar/pkg/libxml2/trunk/files/CSWlibxml2.gspec csw/mgar/pkg/libxml2/trunk/files/CSWlibxml2devel.gspec csw/mgar/pkg/libxml2/trunk/files/CSWpylibxml2.gspec Modified: csw/mgar/pkg/libxml2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxml2/trunk/Makefile 2008-12-09 16:21:33 UTC (rev 2497) +++ csw/mgar/pkg/libxml2/trunk/Makefile 2008-12-09 16:37:25 UTC (rev 2498) @@ -20,6 +20,9 @@ CONFIGURE_ARGS_32 = --with-python=$(prefix) CONFIGURE_ARGS_64 = --without-python +EXTRA_CPPFLAGS = -DXML_XML_DEFAULT_CATALOG=\\\"$(sysconfdir)/xml/catalog\\\" +EXTRA_CPPFLAGS += -DXML_SGML_DEFAULT_CATALOG=\\\"$(sysconfdir)/sgml/catalog\\\" + CONFIGURE_ARGS = $(DIRPATHS) $(CONFIGURE_ARGS_$(MEMORYMODEL)) BUILD64 = 1 Modified: csw/mgar/pkg/libxml2/trunk/checksums =================================================================== --- csw/mgar/pkg/libxml2/trunk/checksums 2008-12-09 16:21:33 UTC (rev 2497) +++ csw/mgar/pkg/libxml2/trunk/checksums 2008-12-09 16:37:25 UTC (rev 2498) @@ -1,7 +1,7 @@ dc43ff7ae6aded45f578c87b7b0c8766 download/libxml2-2.7.2.tar.gz -893a9a9a73ffc96e1a44ca456e7014db download/CSWpylibxml2.gspec +590a7d5677be4f5c67a52b08eba6fb2b download/CSWpylibxml2.gspec dd8c26f51eb9a53545b4cd914b40675b download/CSWpylibxml2.depend -abd229e650e74b345c172079c0078f63 download/CSWlibxml2.gspec +f07ada794bee08b0d3ec7dcd68d1e0ac download/CSWlibxml2.gspec 115241717779eb81926e5ff971d7fbd7 download/CSWlibxml2.depend -da1d182aa18a0e7b5880897d1ed5afa8 download/CSWlibxml2devel.gspec +0633f70c4570a204284c219c02a3c00e download/CSWlibxml2devel.gspec 915b1265ec08b5efcfedb03ade19040f download/CSWlibxml2devel.depend Modified: csw/mgar/pkg/libxml2/trunk/files/CSWlibxml2.gspec =================================================================== --- csw/mgar/pkg/libxml2/trunk/files/CSWlibxml2.gspec 2008-12-09 16:21:33 UTC (rev 2497) +++ csw/mgar/pkg/libxml2/trunk/files/CSWlibxml2.gspec 2008-12-09 16:37:25 UTC (rev 2498) @@ -1,4 +1,4 @@ %var bitname libxml2 %var pkgname CSWlibxml2 %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING +%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Modified: csw/mgar/pkg/libxml2/trunk/files/CSWlibxml2devel.gspec =================================================================== --- csw/mgar/pkg/libxml2/trunk/files/CSWlibxml2devel.gspec 2008-12-09 16:21:33 UTC (rev 2497) +++ csw/mgar/pkg/libxml2/trunk/files/CSWlibxml2devel.gspec 2008-12-09 16:37:25 UTC (rev 2498) @@ -1,4 +1,4 @@ %var bitname libxml2_devel %var pkgname CSWlibxml2devel %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING +%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Modified: csw/mgar/pkg/libxml2/trunk/files/CSWpylibxml2.gspec =================================================================== --- csw/mgar/pkg/libxml2/trunk/files/CSWpylibxml2.gspec 2008-12-09 16:21:33 UTC (rev 2497) +++ csw/mgar/pkg/libxml2/trunk/files/CSWpylibxml2.gspec 2008-12-09 16:37:25 UTC (rev 2498) @@ -1,4 +1,4 @@ %var bitname pylibxml2 %var pkgname CSWpylibxml2 %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING +%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 bdwalton at users.sourceforge.net Tue Dec 9 18:48:51 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 09 Dec 2008 17:48:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[2499] csw/mgar/pkg/docbook-dtds/trunk Message-ID: Revision: 2499 http://gar.svn.sourceforge.net/gar/?rev=2499&view=rev Author: bdwalton Date: 2008-12-09 17:48:50 +0000 (Tue, 09 Dec 2008) Log Message: ----------- Corrected small glitch in postinstall script so that the catalog is reordered properly. Modified Paths: -------------- csw/mgar/pkg/docbook-dtds/trunk/checksums csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall Modified: csw/mgar/pkg/docbook-dtds/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/checksums 2008-12-09 16:37:25 UTC (rev 2498) +++ csw/mgar/pkg/docbook-dtds/trunk/checksums 2008-12-09 17:48:50 UTC (rev 2499) @@ -12,7 +12,7 @@ 2479ac1e7b4a43d3618ca16237aaa85d download/Makefile 536104a1ab1e8eac583cf27f4f8844a4 download/CSWdocbookdtds.gspec cb6dbfe9f6184a9de0725c0a61adc57b download/CSWdocbookdtds.depend -5cb8ab501683e226c5b34fac2dc66076 download/CSWdocbookdtds.postinstall +95eb4822347e50556398f4a11ee95097 download/CSWdocbookdtds.postinstall 9035c448e6480f6e916084fea388b512 download/CSWdocbookdtds.preremove 318742d3a6648a6905727f071cbc9847 download/docbook-4.2-euro.patch e3067045964536cc7445d5c3f1e99916 download/docbook-dtd30-sgml-1.0.catalog.patch Modified: csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall 2008-12-09 16:37:25 UTC (rev 2498) +++ csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall 2008-12-09 17:48:50 UTC (rev 2499) @@ -225,7 +225,7 @@ /usr/bin/perl -e "@_=<>;@_[$XML,$SGML]=@_[$SGML,$XML];print @_" \ ${CATALOG} > ${CATALOG}.tmp - mv ${CATALOG}.tmp ${CATALOG}.new + mv ${CATALOG}.tmp ${CATALOG} fi ## 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 Dec 9 21:23:44 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 20:23:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[2500] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 2500 http://gar.svn.sourceforge.net/gar/?rev=2500&view=rev Author: dmichelsen Date: 2008-12-09 20:23:44 +0000 (Tue, 09 Dec 2008) Log Message: ----------- mGAR v2: Exclude libtool files by default Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2008-12-09 17:48:50 UTC (rev 2499) +++ csw/mgar/gar/v2/gar.mk 2008-12-09 20:23:44 UTC (rev 2500) @@ -530,8 +530,7 @@ _MERGE_INCLUDE_FILES += $(EXTRA_MERGE_INCLUDE_FILES) $(EXTRA_MERGE_INCLUDE_FILES_$(MODULATION)) MERGE_EXCLUDE_INFODIR ?= $(sharedstatedir)/info/dir -#MERGE_EXCLUDE_DEFAULT ?= $(MERGE_EXCLUDE_INFODIR) $(libdir)/.*\.a $(libdir)/.*\.la -MERGE_EXCLUDE_DEFAULT ?= $(MERGE_EXCLUDE_INFODIR) $(libdir)/.*\.a +MERGE_EXCLUDE_DEFAULT ?= $(MERGE_EXCLUDE_INFODIR) $(libdir)/.*\.a $(libdir)/.*\.la # Exclude these files ifeq ($(origin MERGE_EXCLUDE_FILES_$(MODULATION)), undefined) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Dec 9 21:39:16 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 09 Dec 2008 20:39:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[2501] csw/mgar/gar/v2 Message-ID: Revision: 2501 http://gar.svn.sourceforge.net/gar/?rev=2501&view=rev Author: bonivart Date: 2008-12-09 20:39:16 +0000 (Tue, 09 Dec 2008) Log Message: ----------- mGAR v2: Allow /etc and /var in packages by default Modified Paths: -------------- csw/mgar/gar/v2/bin/cswproto csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/bin/cswproto =================================================================== --- csw/mgar/gar/v2/bin/cswproto 2008-12-09 20:23:44 UTC (rev 2500) +++ csw/mgar/gar/v2/bin/cswproto 2008-12-09 20:39:16 UTC (rev 2501) @@ -20,7 +20,7 @@ use POSIX; use vars qw/ - @XPATS @XFORMS @Common $StdOwn $StdGrp $StdDirPerm $stamp $root + @XFORMS @Common $StdOwn $StdGrp $StdDirPerm $stamp $root /; # atime=8,mtime=9,ctime=10 @@ -38,15 +38,6 @@ [ qr{^/opt/csw/info$}, q{/opt/csw/share/info} ], ); -# Standard exclusions - at XPATS = ( - qr{^/$}, - qr{^/opt$}, - qr{^/opt/csw$}, - qr{perllocal\.pod}, - qr{~$}, -); - # Print usage information and exit sub usage { print join(" ", @_) if @_; @@ -77,7 +68,7 @@ sub is_common { my $path = shift; foreach my $pat (@Common) { - return 1 if $path =~ /$pat$/; + return 1 if $path =~ m!^$pat$!; } return 0; } @@ -156,7 +147,7 @@ next unless $F[2]; # Then process any excludes - foreach my $pattern (@XPATS) { next SPECLINE if $F[2] =~ $pattern } + next SPECLINE if( is_common( $F[2] ) ); next if exclude($realpath); # Fix up dir permissions/file ownership. @@ -172,6 +163,10 @@ # Common directories (CSWcommon plus a few others) __DATA__ +/etc +/etc/opt +/etc/opt/csw +/opt /opt/csw /opt/csw/bin /opt/csw/bin/i386 @@ -348,3 +343,6 @@ /opt/csw/share/perl/csw/auto /opt/csw/share/perl/site_perl /opt/csw/var +/var +/var/opt +/var/opt/csw Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2008-12-09 20:23:44 UTC (rev 2500) +++ csw/mgar/gar/v2/gar.pkg.mk 2008-12-09 20:39:16 UTC (rev 2501) @@ -140,7 +140,7 @@ # Pulled in from pkglib/csw_prototype.gspec $(PROTOTYPE): $(WORKDIR) merge - @cswproto -r $(PKGROOT) $(PKGROOT)$(prefix) >$@ + @cswproto -r $(PKGROOT) $(PKGROOT) >$@ .PRECIOUS: $(WORKDIR)/%.prototype $(WORKDIR)/%.prototype-$(GARCH) $(WORKDIR)/%.prototype: | $(PROTOTYPE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Tue Dec 9 21:45:33 2008 From: dam at opencsw.org (Dagobert Michelsen) Date: Tue, 9 Dec 2008 21:45:33 +0100 Subject: [csw-devel] Putting /etc/opt/csw and /var/opt/csw in a package In-Reply-To: <625385e30812091122u75b59689m2f06a32da465d0f5@mail.gmail.com> References: <625385e30812081518k2c42ea59l7aff6a34554daf64@mail.gmail.com> <625385e30812081543p2c1709ach4a497174eb86cc62@mail.gmail.com> <6F86DE12-255A-4C09-9C5D-F3C22764CB32@opencsw.org> <625385e30812090842w509942bcre4cf85548e89082a@mail.gmail.com> <625385e30812091122u75b59689m2f06a32da465d0f5@mail.gmail.com> Message-ID: <6DA4F414-4A28-4F68-AC26-190B0F713C86@opencsw.org> Hi Peter, Am 09.12.2008 um 20:22 schrieb Peter Bonivart: >> So you use >>> >>> %prototype exec cswproto -r %{PKGROOT} %{PKGROOT} >> >> and it should work. > > For some reason this didn't change anything, it still skipped the /var > dir. I didn't have time to try any more, I had to leave but will > continue tomorrow. Forget my last mail, that didn't work out at all. I fixed this now in GAR: Starting from [2501] everything in $PKGROOT will be put in the package, where the pathes from CSWcommon are skipped. If you don't want to have something in there don't copy it to $PKGROOT in the first place by using EXTRA_MERGE_EXCLUDE_FILES. BTW: I removed the prototype line from your gspecs. Best regards -- Dago From dmichelsen at users.sourceforge.net Tue Dec 9 21:50:48 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 20:50:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[2502] csw/mgar/pkg/jdk6/trunk Message-ID: Revision: 2502 http://gar.svn.sourceforge.net/gar/?rev=2502&view=rev Author: dmichelsen Date: 2008-12-09 20:50:47 +0000 (Tue, 09 Dec 2008) Log Message: ----------- jdk6: Another step towards unified JDK/JRE Modified Paths: -------------- csw/mgar/pkg/jdk6/trunk/Makefile csw/mgar/pkg/jdk6/trunk/checksums csw/mgar/pkg/jdk6/trunk/files/CSWjdk.gspec csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.gspec csw/mgar/pkg/jdk6/trunk/files/CSWjre.gspec csw/mgar/pkg/jdk6/trunk/files/CSWjre6.gspec Removed Paths: ------------- csw/mgar/pkg/jdk6/trunk/files/CSWjdk.depend csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.depend csw/mgar/pkg/jdk6/trunk/files/CSWjre.depend Modified: csw/mgar/pkg/jdk6/trunk/Makefile =================================================================== --- csw/mgar/pkg/jdk6/trunk/Makefile 2008-12-09 20:39:16 UTC (rev 2501) +++ csw/mgar/pkg/jdk6/trunk/Makefile 2008-12-09 20:50:47 UTC (rev 2502) @@ -18,16 +18,27 @@ DISTNAME = jdk$(SPKG_VERSION) DISTFILES = $(foreach S,$(SUFFIXES),jdk-$(GARVERSION)-solaris-$S.sh) NOEXTRACT = $(foreach S,$(filter-out $(SUFFIXES_$(GARCH)),$(SUFFIXES)),jdk-$(GARVERSION)-solaris-$S.sh) -DISTFILES += $(call admfiles,CSWjdk6,depend) +DISTFILES += $(call admfiles,CSWjdk6) DISTFILES += $(call admfiles,CSWjre6) -DISTFILES += $(call admfiles,CSWjdk,depend) -DISTFILES += $(call admfiles,CSWjre,depend) +DISTFILES += $(call admfiles,CSWjdk) +DISTFILES += $(call admfiles,CSWjre) SPKG_SOURCEURL = http://java.sun.com/javase/downloads/index.jsp +SPKG_DESC_CSWjdk6 = Java Development Kit 6 +SPKG_DESC_CSWjre6 = Java Runtime Environment 6 +SPKG_DESC_CSWjdk = Java Delopment Kit - Latest Version (now CSWjdk6) +SPKG_DESC_CSWjre = Java Runtime Environment - Latest Version (now CSWjre6) + +REQUIRED_PKGS_CSWjdk6 = CSWjre6 +REQUIRED_PKGS_CSWjdk = CSWjdk6 +REQUIRED_PKGS_CSWjre = CSWjre6 + MANPAGES_JRE = java.1 javaws.1 keytool.1 orbd.1 pack200.1 policytool.1 rmid.1 rmiregistry.1 MANPAGES_JRE += servertool.1 tnameserv.1 unpack200.1 +MANPAGE_REGEX = ($(shell echo $(MANPAGES_JRE) | perl -lne 's/\./\\./g;print join("|",split)')) + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = @@ -39,7 +50,7 @@ PKGFILES_CSWjre += $(prefix)/java/man PKGFILES_CSWjre6 = $(prefix)/java/jdk/$(DISTNAME)/jre/.* -PKGFILES_CSWjre6 += $(prefix)/java/jdk/$(DISTNAME)/man/.*/(java|javaws|keytool|orbd|pack200|policytool|rmid|rmiregistry|servertool|tnameserv|unpack200)\.1 +PKGFILES_CSWjre6 += $(prefix)/java/jdk/$(DISTNAME)/man/.*/$(MANPAGE_REGEX) PKGFILES_CSWjre6 += $(prefix)/java/jre/jre$(SPKG_VERSION) PKGFILES_CSWjre6 += $(prefix)/java/jre/jre6 @@ -57,9 +68,10 @@ @echo # rule to extract files with shell +# Clear DISPLAY or the installer will bring up advertisement shell-extract-archive-%: @echo " ==> Extracting $(DOWNLOADDIR)/$*" - @echo "yes" | (D=$(abspath $(DOWNLOADDIR)/$*); cd $(EXTRACTDIR); MORE="-10000" sh $$D) + @echo "yes" | (D=$(abspath $(DOWNLOADDIR)/$*); cd $(EXTRACTDIR); DISPLAY= MORE="-10000" sh $$D -noregister) @$(MAKECOOKIE) extract-archive-%.sh: shell-extract-archive-%.sh Modified: csw/mgar/pkg/jdk6/trunk/checksums =================================================================== --- csw/mgar/pkg/jdk6/trunk/checksums 2008-12-09 20:39:16 UTC (rev 2501) +++ csw/mgar/pkg/jdk6/trunk/checksums 2008-12-09 20:50:47 UTC (rev 2502) @@ -2,10 +2,7 @@ 2f5b20118c85533854720ebbfb428758 download/jdk-6u11-solaris-sparcv9.sh e460101ca2d718b98a65c432753e9684 download/jdk-6u11-solaris-i586.sh c103e6c5d4d42a8ab162804a7b01c3c2 download/jdk-6u11-solaris-x64.sh -d2ea0d736a7cf088ed9d452f3b1ecb1d download/CSWjdk6.gspec -a077039adebc66db2f7316e387ba13eb download/CSWjdk6.depend -d085818ed2ca9c777c85b3c9553a41f5 download/CSWjre6.gspec -8b98539f0a2211e965cc9bb2d42024f3 download/CSWjdk.gspec -e1aeb08d2dbb21e9b61598bc1dde0094 download/CSWjdk.depend -873b8c1f59485f78eb87ad67fe4c4dc4 download/CSWjre.gspec -a077039adebc66db2f7316e387ba13eb download/CSWjre.depend +8e3e3bcebbbd14d16657d8a102c2ed3b download/CSWjdk6.gspec +a08a034895b0e77dd70df961d63ec1a1 download/CSWjre6.gspec +232933acc5ba9ac4fe72ed3cebdcb4d0 download/CSWjdk.gspec +8d4a797e73a0e4b6f17fcf0a99d9b6f0 download/CSWjre.gspec Deleted: csw/mgar/pkg/jdk6/trunk/files/CSWjdk.depend =================================================================== --- csw/mgar/pkg/jdk6/trunk/files/CSWjdk.depend 2008-12-09 20:39:16 UTC (rev 2501) +++ csw/mgar/pkg/jdk6/trunk/files/CSWjdk.depend 2008-12-09 20:50:47 UTC (rev 2502) @@ -1 +0,0 @@ -P CSWjdk6 jdk6 - Java Development Kit 6 Modified: csw/mgar/pkg/jdk6/trunk/files/CSWjdk.gspec =================================================================== --- csw/mgar/pkg/jdk6/trunk/files/CSWjdk.gspec 2008-12-09 20:39:16 UTC (rev 2501) +++ csw/mgar/pkg/jdk6/trunk/files/CSWjdk.gspec 2008-12-09 20:50:47 UTC (rev 2502) @@ -1,4 +1,4 @@ %var bitname jdk %var pkgname CSWjdk %include url file://%{PKGLIB}/csw_standard.gspec -%copyright url file://%{WORKSRC}/LICENSE +%copyright url file://%{WORKSRC_DEFAULT}/LICENSE Deleted: csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.depend =================================================================== --- csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.depend 2008-12-09 20:39:16 UTC (rev 2501) +++ csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.depend 2008-12-09 20:50:47 UTC (rev 2502) @@ -1 +0,0 @@ -P CSWjre6 jre6 - Java Runtime Environment 6 Modified: csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.gspec =================================================================== --- csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.gspec 2008-12-09 20:39:16 UTC (rev 2501) +++ csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.gspec 2008-12-09 20:50:47 UTC (rev 2502) @@ -1,4 +1,4 @@ %var bitname jdk6 %var pkgname CSWjdk6 %include url file://%{PKGLIB}/csw_standard.gspec -%copyright url file://%{WORKSRC}/LICENSE +%copyright url file://%{WORKSRC_DEFAULT}/LICENSE Deleted: csw/mgar/pkg/jdk6/trunk/files/CSWjre.depend =================================================================== --- csw/mgar/pkg/jdk6/trunk/files/CSWjre.depend 2008-12-09 20:39:16 UTC (rev 2501) +++ csw/mgar/pkg/jdk6/trunk/files/CSWjre.depend 2008-12-09 20:50:47 UTC (rev 2502) @@ -1 +0,0 @@ -P CSWjre6 jre6 - Java Runtime Environment 6 Modified: csw/mgar/pkg/jdk6/trunk/files/CSWjre.gspec =================================================================== --- csw/mgar/pkg/jdk6/trunk/files/CSWjre.gspec 2008-12-09 20:39:16 UTC (rev 2501) +++ csw/mgar/pkg/jdk6/trunk/files/CSWjre.gspec 2008-12-09 20:50:47 UTC (rev 2502) @@ -1,4 +1,4 @@ %var bitname jre %var pkgname CSWjre %include url file://%{PKGLIB}/csw_standard.gspec -%copyright url file://%{WORKSRC}/LICENSE +%copyright url file://%{WORKSRC_DEFAULT}/LICENSE Modified: csw/mgar/pkg/jdk6/trunk/files/CSWjre6.gspec =================================================================== --- csw/mgar/pkg/jdk6/trunk/files/CSWjre6.gspec 2008-12-09 20:39:16 UTC (rev 2501) +++ csw/mgar/pkg/jdk6/trunk/files/CSWjre6.gspec 2008-12-09 20:50:47 UTC (rev 2502) @@ -1,4 +1,4 @@ %var bitname jre6 %var pkgname CSWjre6 %include url file://%{PKGLIB}/csw_standard.gspec -%copyright url file://%{WORKSRC}/LICENSE +%copyright url file://%{WORKSRC_DEFAULT}/LICENSE 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 Dec 9 22:18:15 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 21:18:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[2503] csw/mgar/pkg/msmtp/trunk Message-ID: Revision: 2503 http://gar.svn.sourceforge.net/gar/?rev=2503&view=rev Author: dmichelsen Date: 2008-12-09 21:18:15 +0000 (Tue, 09 Dec 2008) Log Message: ----------- msmtp: Update to 1.4.16 and mGAR v2, waiting for libgsasl Modified Paths: -------------- csw/mgar/pkg/msmtp/trunk/Makefile csw/mgar/pkg/msmtp/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/msmtp/trunk/files/CSWmsmtp.depend Property Changed: ---------------- csw/mgar/pkg/msmtp/trunk/ Property changes on: csw/mgar/pkg/msmtp/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/msmtp/trunk/Makefile =================================================================== --- csw/mgar/pkg/msmtp/trunk/Makefile 2008-12-09 20:50:47 UTC (rev 2502) +++ csw/mgar/pkg/msmtp/trunk/Makefile 2008-12-09 21:18:15 UTC (rev 2503) @@ -1,5 +1,5 @@ GARNAME = msmtp -GARVERSION = 1.4.13 +GARVERSION = 1.4.16 CATEGORIES = net DESCRIPTION = SMTP client @@ -24,11 +24,14 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += $(call admfiles,CSWmsmtp,depend) +DISTFILES += $(call admfiles,CSWmsmtp) # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +REQUIRED_PKGS = CSWgcrypt CSWggettext CSWgnutls CSWgpgerr CSWiconv CSWkrb5lib +REQUIRED_PKGS += CSWlibgsasl CSWlibidn CSWlibntlm CSWzlib + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/msmtp/trunk/checksums =================================================================== --- csw/mgar/pkg/msmtp/trunk/checksums 2008-12-09 20:50:47 UTC (rev 2502) +++ csw/mgar/pkg/msmtp/trunk/checksums 2008-12-09 21:18:15 UTC (rev 2503) @@ -1,3 +1,2 @@ -021a91d7145100ad0f00c912c8104e03 download/msmtp-1.4.13.tar.bz2 +77a333601e9de03f695539498e678cc2 download/msmtp-1.4.16.tar.bz2 fe48f4e103c584120b79c5f4c0daed4e download/CSWmsmtp.gspec -0f1691a4cb0004a76a09b6a2b4e48ef1 download/CSWmsmtp.depend Deleted: csw/mgar/pkg/msmtp/trunk/files/CSWmsmtp.depend =================================================================== --- csw/mgar/pkg/msmtp/trunk/files/CSWmsmtp.depend 2008-12-09 20:50:47 UTC (rev 2502) +++ csw/mgar/pkg/msmtp/trunk/files/CSWmsmtp.depend 2008-12-09 21:18:15 UTC (rev 2503) @@ -1,10 +0,0 @@ -P CSWgcrypt libgcrypt - GNU libcrypt -P CSWggettext ggettext - GNU gettext -P CSWgnutls gnutls - GNU Transport Layer Security lib and tools -P CSWgpgerr libgpg_error - GNU gpg related library -P CSWiconv libiconv - GNU iconv library -P CSWkrb5lib krb5_lib - MIT Kerberos 5 core libraries -P CSWlibgsasl libgsasl - GNU SASL Library -P CSWlibidn libidn - Implementation of the Stringprep, Punycode and IDNA -P CSWlibntlm libntlm - libntlm - A library that implement Microsoft's NTLM authentication -P CSWzlib zlib - Zlib Data Compression Library 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 Dec 9 22:32:10 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 21:32:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[2504] csw/mgar/pkg/libgsasl/trunk Message-ID: Revision: 2504 http://gar.svn.sourceforge.net/gar/?rev=2504&view=rev Author: dmichelsen Date: 2008-12-09 21:32:10 +0000 (Tue, 09 Dec 2008) Log Message: ----------- libgsasl: Update to 0.2.29 and mGAR v2 Modified Paths: -------------- csw/mgar/pkg/libgsasl/trunk/Makefile csw/mgar/pkg/libgsasl/trunk/checksums csw/mgar/pkg/libgsasl/trunk/files/CSWlibgsasl.gspec Removed Paths: ------------- csw/mgar/pkg/libgsasl/trunk/files/CSWlibgsasl.depend Property Changed: ---------------- csw/mgar/pkg/libgsasl/trunk/ Property changes on: csw/mgar/pkg/libgsasl/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/libgsasl/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgsasl/trunk/Makefile 2008-12-09 21:18:15 UTC (rev 2503) +++ csw/mgar/pkg/libgsasl/trunk/Makefile 2008-12-09 21:32:10 UTC (rev 2504) @@ -1,5 +1,5 @@ GARNAME = libgsasl -GARVERSION = 0.2.24 +GARVERSION = 0.2.29 CATEGORIES = lib DESCRIPTION = GNU SASL Library @@ -12,16 +12,19 @@ MASTER_SITES = ftp://alpha.gnu.org/pub/gnu/gsasl/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWlibgsasl,depend) +DISTFILES += $(call admfiles,CSWlibgsasl) # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PREREQUISITE_PKGS = CSWkrb5libdev CSWlibntlm +PREREQUISITE_PKGS = CSWkrb5libdev +REQUIRED_PKGS = CSWggettext CSWiconv CSWkrb5lib CSWlibidn CSWlibntlm CONFIGURE_ARGS = $(DIRPATHS) -TEST_TARGET = check +# Test has compile errors +TEST_TARGET = +#TEST_TARGET = check include gar/category.mk Modified: csw/mgar/pkg/libgsasl/trunk/checksums =================================================================== --- csw/mgar/pkg/libgsasl/trunk/checksums 2008-12-09 21:18:15 UTC (rev 2503) +++ csw/mgar/pkg/libgsasl/trunk/checksums 2008-12-09 21:32:10 UTC (rev 2504) @@ -1,3 +1,2 @@ -cc1f0353af7ea66a1a8906eb482d8c70 download/libgsasl-0.2.24.tar.gz -2144a2dadd53211c3c08c1c0afe4c674 download/CSWlibgsasl.gspec -ddb88ec7950f85a5656c7ca36f3cd196 download/CSWlibgsasl.depend +c38f4bc5ab488a215a09f2d915942482 download/libgsasl-0.2.29.tar.gz +df91f3186953d3af4a42244e314ef803 download/CSWlibgsasl.gspec Deleted: csw/mgar/pkg/libgsasl/trunk/files/CSWlibgsasl.depend =================================================================== --- csw/mgar/pkg/libgsasl/trunk/files/CSWlibgsasl.depend 2008-12-09 21:18:15 UTC (rev 2503) +++ csw/mgar/pkg/libgsasl/trunk/files/CSWlibgsasl.depend 2008-12-09 21:32:10 UTC (rev 2504) @@ -1,5 +0,0 @@ -P CSWggettext ggettext - GNU gettext -P CSWiconv libiconv - GNU iconv library -P CSWkrb5lib krb5_lib - MIT Kerberos 5 core libraries -P CSWlibidn libidn - Implementation of the Stringprep, Punycode and IDNA -P CSWlibntlm libntlm - A library that implement Microsoft's NTLM authentication Modified: csw/mgar/pkg/libgsasl/trunk/files/CSWlibgsasl.gspec =================================================================== --- csw/mgar/pkg/libgsasl/trunk/files/CSWlibgsasl.gspec 2008-12-09 21:18:15 UTC (rev 2503) +++ csw/mgar/pkg/libgsasl/trunk/files/CSWlibgsasl.gspec 2008-12-09 21:32:10 UTC (rev 2504) @@ -1,4 +1,4 @@ %var bitname libgsasl %var pkgname CSWlibgsasl %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING +%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 chninkel at users.sourceforge.net Tue Dec 9 22:47:17 2008 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 09 Dec 2008 21:47:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[2505] csw/mgar/pkg/openssl/trunk/Makefile Message-ID: Revision: 2505 http://gar.svn.sourceforge.net/gar/?rev=2505&view=rev Author: chninkel Date: 2008-12-09 21:47:17 +0000 (Tue, 09 Dec 2008) Log Message: ----------- openssl: sparcv9 merge workaround Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2008-12-09 21:32:10 UTC (rev 2504) +++ csw/mgar/pkg/openssl/trunk/Makefile 2008-12-09 21:47:17 UTC (rev 2505) @@ -43,6 +43,8 @@ NO_ISAEXEC = 1 #ISA_RELOCATE_DIRS_i386 = #ISA_RELOCATE_DIRS_sparcv8 = +ISALIBDIR_sparcv9 = . +libdir = /opt/csw/lib # we redefine the default merge exclude so *.a files are not excluded MERGE_EXCLUDE_DEFAULT = $(MERGE_EXCLUDE_INFODIR) 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 Dec 10 00:00:07 2008 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 09 Dec 2008 23:00:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[2506] csw/mgar/pkg/pv/trunk Message-ID: Revision: 2506 http://gar.svn.sourceforge.net/gar/?rev=2506&view=rev Author: skayser Date: 2008-12-09 23:00:07 +0000 (Tue, 09 Dec 2008) Log Message: ----------- pv: Changed broken upstream test Modified Paths: -------------- csw/mgar/pkg/pv/trunk/checksums csw/mgar/pkg/pv/trunk/files/fix-test-010.diff Modified: csw/mgar/pkg/pv/trunk/checksums =================================================================== --- csw/mgar/pkg/pv/trunk/checksums 2008-12-09 21:47:17 UTC (rev 2505) +++ csw/mgar/pkg/pv/trunk/checksums 2008-12-09 23:00:07 UTC (rev 2506) @@ -1,3 +1,3 @@ 8d0eda2182640919daaf6186cd816a13 download/pv-1.1.4.tar.gz 6e307b98bc517acb6353981bee5e686c download/CSWpv.gspec -0ea366b818f877857288b2a9a732a6d4 download/fix-test-010.diff +f4de09711819fdb79aee3fa0c612caca download/fix-test-010.diff Modified: csw/mgar/pkg/pv/trunk/files/fix-test-010.diff =================================================================== --- csw/mgar/pkg/pv/trunk/files/fix-test-010.diff 2008-12-09 21:47:17 UTC (rev 2505) +++ csw/mgar/pkg/pv/trunk/files/fix-test-010.diff 2008-12-09 23:00:07 UTC (rev 2506) @@ -1,12 +1,50 @@ 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-01 15:02:00.375332231 +0100 -@@ -5,7 +5,7 @@ ++++ 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 +-COUNT1=100000000 -COUNT2=`$PROG -B 100000 -q /dev/zero | dd bs=100000 count=1000 2>/dev/null | wc -c` -+COUNT2=`$PROG -B 100000 -q /dev/zero | dd bs=100000 count=1000 2>/dev/null | wc -c | tr -d ' '` ++#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 Dec 10 00:09:34 2008 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 09 Dec 2008 23:09:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[2507] csw/mgar/pkg/pv/trunk/Makefile Message-ID: Revision: 2507 http://gar.svn.sourceforge.net/gar/?rev=2507&view=rev Author: skayser Date: 2008-12-09 23:09:34 +0000 (Tue, 09 Dec 2008) Log Message: ----------- pv: Changed broken upstream test Modified Paths: -------------- csw/mgar/pkg/pv/trunk/Makefile Modified: csw/mgar/pkg/pv/trunk/Makefile =================================================================== --- csw/mgar/pkg/pv/trunk/Makefile 2008-12-09 23:00:07 UTC (rev 2506) +++ csw/mgar/pkg/pv/trunk/Makefile 2008-12-09 23:09:34 UTC (rev 2507) @@ -23,7 +23,10 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -# Trim extra whitespaces from Solaris wc +# 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) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Dec 10 15:19:01 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 10 Dec 2008 14:19:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[2508] csw/mgar/pkg/clamav/trunk Message-ID: Revision: 2508 http://gar.svn.sourceforge.net/gar/?rev=2508&view=rev Author: bonivart Date: 2008-12-10 14:19:01 +0000 (Wed, 10 Dec 2008) Log Message: ----------- clamav: more fixes Modified Paths: -------------- csw/mgar/pkg/clamav/trunk/Makefile csw/mgar/pkg/clamav/trunk/checksums csw/mgar/pkg/clamav/trunk/files/CSWclamav.gspec Added Paths: ----------- csw/mgar/pkg/clamav/trunk/files/CSWclamav.INSTALL.clamav-milter.CSW csw/mgar/pkg/clamav/trunk/files/CSWclamav.README.CSW csw/mgar/pkg/clamav/trunk/files/CSWclamav.checkinstall csw/mgar/pkg/clamav/trunk/files/CSWclamav.cswclamav-milter csw/mgar/pkg/clamav/trunk/files/CSWclamav.cswclamd csw/mgar/pkg/clamav/trunk/files/CSWclamav.postinstall csw/mgar/pkg/clamav/trunk/files/CSWclamav.preinstall csw/mgar/pkg/clamav/trunk/files/CSWclamav.preremove Modified: csw/mgar/pkg/clamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamav/trunk/Makefile 2008-12-09 23:09:34 UTC (rev 2507) +++ csw/mgar/pkg/clamav/trunk/Makefile 2008-12-10 14:19:01 UTC (rev 2508) @@ -1,15 +1,14 @@ # clamav, Peter Bonivart # files outside /opt/csw are not included, need to fix gspec and cswproto -# split into multiple packages: clamav, libclamav # put libs in lib/32? -# add depend files -# add rc/smf support +# add rc/smf support. cswclassutils? # add pre/post scripts -# add etc/clamav-milter +# add etc/clamav-milter? # add etc/clamd? -# add doc/README.CSW, INSTALL.clamav-milter.CSW # check mantis bugs +# + add doc/README.CSW, INSTALL.clamav-milter.CSW +# + split into multiple packages: clamav, libclamav # + add re for update notification # + add contrib # + add html docs and some pdf:s @@ -28,58 +27,68 @@ the package is an anti-virus engine available in a form of shared library. endef -MASTER_SITES = http://freshmeat.net/redir/clamav/29355/url_tgz/ +SF_PROJ = clamav +MASTER_SITES = $(SF_MIRRORS) +#MASTER_SITES = http://freshmeat.net/redir/clamav/29355/url_tgz/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWclamav,) +DISTFILES += $(call admfiles,CSWclamav,checkinstall preinstall postinstall preremove) DISTFILES += $(call admfiles,CSWlibclamav,) -PKGFILES_CSWlibclamav = $(libdir)/.* -PKGFILES_CSWlibclamav += $(includedir)/.* +SPKG_DESC_CSWclamav = Clam AntiVirus +SPKG_DESC_CSWlibclamav = Clam AntiVirus Library +REQUIRED_PKGS_CSWclamav = CSWlibclamav CSWlibgmp CSWzlib CSWbzip2 CSWiconv CSWcswclassutils +REQUIRED_PKGS_CSWlibclamav = CSWlibgmp CSWzlib CSWbzip2 CSWiconv + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -GARCOMPILER = GCC3 -GNU_CC_HOME = /opt/csw/gcc3 +SPKG_CLASSES = none cswinitsmf +#GARCOMPILER = GCC3 + CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-user=nobody -CONFIGURE_ARGS += --with-group=nobody +#CONFIGURE_ARGS += --with-user=nobody +#CONFIGURE_ARGS += --with-group=nobody +CONFIGURE_ARGS += --disable-clamav CONFIGURE_ARGS += --enable-milter -CONFIGURE_ARGS += --with-sendmail=/opt/csw/lib/sendmail +CONFIGURE_ARGS += --with-sendmail=$(libdir)/sendmail CONFIGURE_ARGS += --with-dbdir=/var/opt/csw/$(GARNAME)/db CONFIGURE_ARGS += --localstatedir=/var/opt/csw/$(GARNAME) -include gar/category.mk +EXTRA_MERGE_EXCLUDE_FILES = .*~ $(libdir)/.*\.a $(libdir)/.*\.la +PKGFILES_CSWlibclamav = $(libdir)/.* +PKGFILES_CSWlibclamav += $(includedir)/.* + SPKG_SOURCEURL = http://www.clamav.net/ -pre-package: - @echo " ==> Pre-package for $(GARNAME)" - @echo "DESTDIR: $(DESTDIR)" - @echo "WORKSRC: $(WORKSRC)" - @echo "PKGROOT: $(PKGROOT)" - @find $(PKGROOT) -type f -name "*~" -exec rm {} \; - @find $(PKGROOT)/opt/csw/lib -type f -name "*.a" -exec rm {} \; - @find $(PKGROOT)/opt/csw/lib -type f -name "*.la" -exec rm {} \; - @ginstall -d $(PKGROOT)$(docdir)/$(GARNAME)/html - @ginstall -d $(PKGROOT)$(docdir)/$(GARNAME)/contrib - @ginstall -m 644 $(WORKSRC)/AUTHORS $(PKGROOT)$(docdir)/$(GARNAME) - @ginstall -m 644 $(WORKSRC)/BUGS $(PKGROOT)$(docdir)/$(GARNAME) - @ginstall -m 644 $(WORKSRC)/ChangeLog $(PKGROOT)$(docdir)/$(GARNAME) - @ginstall -m 644 $(WORKSRC)/docs/clamav-mirror-howto.pdf $(PKGROOT)$(docdir)/$(GARNAME) - @ginstall -m 644 $(WORKSRC)/docs/clamdoc.pdf $(PKGROOT)$(docdir)/$(GARNAME) - @ginstall -m 644 $(WORKSRC)/COPYING $(PKGROOT)$(docdir)/$(GARNAME)/LICENSE - @ginstall -m 644 $(WORKSRC)/FAQ $(PKGROOT)$(docdir)/$(GARNAME) - @ginstall -m 644 $(WORKSRC)/NEWS $(PKGROOT)$(docdir)/$(GARNAME) - @ginstall -m 644 $(WORKSRC)/docs/phishsigs_howto.pdf $(PKGROOT)$(docdir)/$(GARNAME) - @ginstall -m 644 $(WORKSRC)/README $(PKGROOT)$(docdir)/$(GARNAME) - @ginstall -m 644 $(WORKSRC)/docs/signatures.pdf $(PKGROOT)$(docdir)/$(GARNAME) - @ginstall -m 644 $(WORKSRC)/UPGRADE $(PKGROOT)$(docdir)/$(GARNAME) - @ginstall -m 644 $(WORKSRC)/contrib/clamdwatch/* $(PKGROOT)$(docdir)/$(GARNAME)/contrib - @ginstall -m 644 $(WORKSRC)/contrib/init/Solaris10/* $(PKGROOT)$(docdir)/$(GARNAME)/contrib - @ginstall -m 644 $(WORKSRC)/contrib/cleanup-partial.pl $(PKGROOT)$(docdir)/$(GARNAME)/contrib - @for file in $(WORKSRC)/docs/html/*; do \ - cp $$file $(PKGROOT)$(docdir)/$(GARNAME)/html ; \ - done +include gar/category.mk + +DOCS = AUTHORS BUGS ChangeLog +DOCS += FAQ NEWS README UPGRADE +DOCS += docs/clamav-mirror-howto.pdf +DOCS += docs/clamdoc.pdf +DOCS += docs/phishsigs_howto.pdf +DOCS += docs/signatures.pdf + +DOCDEST = $(DESTDIR)$(docdir)/$(GARNAME) + +post-install-modulated: + @echo " ==> Post-install for $(GARNAME)" + @ginstall -d $(DESTDIR)/etc/opt/csw/init.d + @ginstall -m 755 $(FILEDIR)/CSWclamav.cswclamd $(DESTDIR)/etc/opt/csw/init.d/cswclamd + @ginstall -d $(DOCDEST) + @$(foreach DOC,$(DOCS),ginstall -m 644 $(WORKSRC)/$(DOC) $(DOCDEST);) + @ginstall -m 644 $(WORKSRC)/COPYING $(DOCDEST)/LICENSE + @ginstall -m 644 $(FILEDIR)/CSWclamav.INSTALL.clamav-milter.CSW $(DOCDEST)/INSTALL.clamav-milter.CSW + @ginstall -m 644 $(FILEDIR)/CSWclamav.README.CSW $(DOCDEST)/README.CSW + @ginstall -d $(DOCDEST)/contrib + @ginstall -m 644 $(WORKSRC)/contrib/clamdwatch/* $(DOCDEST)/contrib + @ginstall -m 644 $(WORKSRC)/contrib/init/Solaris10/* $(DOCDEST)/contrib + @ginstall -m 644 $(WORKSRC)/contrib/cleanup-partial.pl $(DOCDEST)/contrib + @ginstall -d $(DOCDEST)/html + @ginstall -m 644 $(WORKSRC)/docs/html/* $(DOCDEST)/html + @ginstall -d $(DESTDIR)$(docdir)/libclamav + @ginstall -m 644 $(WORKSRC)/COPYING $(DESTDIR)$(docdir)/libclamav/LICENSE @$(MAKECOOKIE) Modified: csw/mgar/pkg/clamav/trunk/checksums =================================================================== --- csw/mgar/pkg/clamav/trunk/checksums 2008-12-09 23:09:34 UTC (rev 2507) +++ csw/mgar/pkg/clamav/trunk/checksums 2008-12-10 14:19:01 UTC (rev 2508) @@ -1,3 +1,7 @@ 1181e6d62341b84708f126cc353f7ebf download/clamav-0.94.2.tar.gz -df9572dc44907a1ceff3561f9b834e20 download/CSWclamav.gspec +7d36b4328fa73af2b109169b923bc127 download/CSWclamav.gspec +751ed376aeccb1664694b772c4b9640d download/CSWclamav.checkinstall +e355168073277baaf456eea620ff2760 download/CSWclamav.preinstall +a82b60e7ee99d6a4ac6e80351ce7bf81 download/CSWclamav.postinstall +526d5979cca3a3ebdf88c6ed33b8ec8d download/CSWclamav.preremove 6edc8660bde0b27d3676699eacb51884 download/CSWlibclamav.gspec Added: csw/mgar/pkg/clamav/trunk/files/CSWclamav.INSTALL.clamav-milter.CSW =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWclamav.INSTALL.clamav-milter.CSW (rev 0) +++ csw/mgar/pkg/clamav/trunk/files/CSWclamav.INSTALL.clamav-milter.CSW 2008-12-10 14:19:01 UTC (rev 2508) @@ -0,0 +1,124 @@ +INSTRUCTIONS + +Any references in this document made to /usr/local should be replaced with /opt/csw. References to /etc/sysconfig should be replaced with /opt/csw/etc. + +Clamav is built with milter support. For this to work, see the following notes from the INSTALL.clamav-milter document supplied with the clamav source. + +Solaris 8 doesn't have milter support so clamav-milter won't work unless you +rebuild sendmail from source or install the CSW sendmail package. +Solaris 9 has milter support in the supplied sendmail, but doesn't include +libmilter so you can't develop milter applications on it. Go to sendmail.org, +download the lastest sendmail, cd to libmilter and "make install" there. +Needs -lresolv + +INSTALLATION + +See http://www.nmt.edu/~wcolburn/sendmail-8.12.5/libmilter/docs/sample.html + +Installations for RedHat Linux and it's derivatives such as YellowDog: + Add to /etc/mail/sendmail.mc: + INPUT_MAIL_FILTER(`clamav', `S=local:/var/run/clamav.sock, F=, T=S:4m;R:4m')dnl + define(`confINPUT_MAIL_FILTERS', `clamav') + + Check entry in /usr/local/etc/clamav.conf of the form: + LocalSocket /var/run/clamd.sock + StreamSaveToDisk + + If you already have a filter (such as spamassassin-milter from + http://savannah.nongnu.org/projects/spamass-milt) add it thus: + INPUT_MAIL_FILTER(`clamav', `S=local:/var/run/clamav.sock, F=, T=S:4m;R:4m')dnl + INPUT_MAIL_FILTER(`spamassassin', `S=local:/var/run/spamass.sock, F=, T=C:15m;S:4m;R:4m;E:10m') + define(`confINPUT_MAIL_FILTERS', `spamassassin,clamav')dnl + +You may find INPUT_MAIL_FILTERS is not needed on your machine, however it +is recommended by the Sendmail documentation and I recommend going along +with that. + +I suggest putting SpamAssassin first since you're more likely to get spam +than a virus/worm sent to you. + +Add to /etc/sysconfig/clamav-milter + CLAMAV_FLAGS="--max-children=2 local:/var/run/clamav.sock" +or if clamd is on a different machine + CLAMAV_FLAGS="--max-children=2 --server=192.168.1.9 local:/var/run/clamav.sock" + +You should have received a script to put into /etc/init.d with this software. + +CHANGE HISTORY + +Changes +0.2: 4/3/03 clamfi_abort() now always calls pthread_mutex_unlock + 5/3/03 Only send a bounce if -b is set + Version now uses -v not -V + --config-file couldn't be set by -c +0.3 7/3/03 Enhanced the Solaris compile time comment + No need to save the return result of LogSyslog + Use LogVerbose +0.4 9/3/03 Initialise dataSocket/cmdSocket correctly + 10/3/03 Say why we don't connect() to clamd + Enhanced '-l' usage message +0.5 18/3/03 Ported to FreeBSD 4.7 + Source no longer in support, so remove one .. from + the build instructions + Corrected the use of strerror_r +0.51 20/3/03 Mention StreamSaveToDisk in the installation + Added -s option which allows clamd to run on a + different machine from the milter +0.52 20/3/03 -b flag now only stops the bounce, sends warning + to recipient and postmaster +0.53 24/3/03 %d->%u in syslog call + 27/3/03 tcpSocket is now of type in_port_t + 27/3/03 Use PING/PONG +0.54 23/5/03 Allow a range of IP addresses as outgoing ones + that need not be checked +0.55 24/5/03 Use inet_ntop() instead of inet_ntoa() + Thanks to Krzysztof Oldzki +0.60 11/7/03 Some TODOs done by Nigel Kukard + Should stop a couple of remote chances of crashes +0.60a 22/7/03 Tidied up message when sender is unknown +0.60b 17/8/03 Optionally set postmaster address. Usually one uses + /etc/aliases, but not everyone want's to... +0.60c 22/8/03 Another go at Solaris support +0.60d 26/8/03 Removed superflous buffer and unneeded strerror call + ETIMEDOUT isn't an error, but should give a warning +0.60e 09/9/03 Added -P and -q flags by "Nicholas M. Kirsch" +0.60f 17/9/03 Changed fprintf to fputs where possible + Redirect stdin from /dev/null, stdout&stderr to + /dev/console +0.60g 26/9/03 Handle sendmail calling abort after calling cleanup + (Should never happen - but it does) + Added -noxheader patch from dirk.meyer at dinoex.sub.org +0.60h 28/9/03 Support MaxThreads option in config file, + overriden by --max-children. + Patch from "Richard G. Roberto" +0.60i 30/9/03 clamfi_envfrom() now correctly returns SMFIS_TEMPFAIL, + in a few circumstances it used to return EX_TEMPFAIL + Patch from Matt Sullivan +0.60j 1/10/03 strerror_r doesn't work on Linux, attempting workaround + Added support for hard-coded list of email addresses + who's e-mail is not scanned +0.60k 5/10/03 Only remove old UNIX domain socket if FixStaleSocket + is set +0.60l 11/10/03 port is now unsigned + Removed remote possibility of crash if the target + e-mail address is very long + No longer calls clamdscan to get the version +0.60m 12/10/03 Now does sanity check if using localSocket + Gets version info from clamd + Only reset fd's 0/1/2 if !ForeGround +0.60n 22/10/03 Call pthread_cont_broadcast more often +0.60o 31/10/03 Optionally accept all mails if scanning procedure + fails (Joe Talbott ) +0.60p 5/11/03 Only call mutex_unlock when max_children is set + Tidy up the call to pthread_cond_timedwait +0.60q 11/11/03 Fixed handling of % characters in e-mail addresses + pointed out by dotslash at snosoft.com + +BUG REPORTS + +Please send bug reports and/or comments to Nigel Horne + +TODO + +There are several ideas marked as TODO in the source code. If anyone has +any other suggestions please feel free to contact me. Added: csw/mgar/pkg/clamav/trunk/files/CSWclamav.README.CSW =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWclamav.README.CSW (rev 0) +++ csw/mgar/pkg/clamav/trunk/files/CSWclamav.README.CSW 2008-12-10 14:19:01 UTC (rev 2508) @@ -0,0 +1,177 @@ +# 2008-12-10 +Version 0.94.2 is released. Packages CSWclamav and CSWlibclamav are now +maintained by Peter Bonivart. + +# 02Jun2007 +Version 0.90.3 is released. +Changes are made to the rc scripts to allow clmilter to not wait for clamd +when clmilter is configured without --external. PLEASE note that I have +not fully tested clmilter without clamd. If you are running Solaris 10 +or later, you will also need to create a custom version of the clamav-milter +service method file and remove the dependency for cswclamd. See my notes +below dated 05Feb2006 for instructions on creating a custom service method +file. + +# 16Feb2007 +Version 0.90 is released. +--enable-experimental is disabled due to a bug introduced after the last +release candidate. + +The rc script is changed to relocate the pid file to /opt/csw/var/clamav. +If you run clamav without root access, please run the following. +`chown : /opt/csw/var/clamav +The rc script is changed to allow the startup options and config file +to be located in /etc/opt/csw + +*** IMPORTANT *** +You must change clamd.conf to match the new syntax. Boolean options must +state yes or no and not be left blank. I recommend renaming your old +clamd.conf to old-clamd.conf; `cp clamd.conf.CSW clamd.conf` and making +your changes again. Note that the directory for the pid file and log files +now defaults to /opt/csw/var/clamav. +*** END OF IMPORTANT *** + +# 07Jan2007 +The 'specificdeamonname' for this package is changed to only clamav. +Please change any entries that you have made in csw.conf +The scripts determine whether or not a clamd and clamav-milter is needed. + +# 14Dec2006 +clamd.conf has a new option - MailMaxRecursion +Package installation is using csw.conf, if available, to determine whether + or not to start the daemons. +See http://www.blastwave.org/standards/csw.conf.html for details. +The 'specificdaemonname' for this package is clamd and clamav-milter. + +# 16Oct2006 +freshclam.conf has option OnOutdatedExecute command added. + +# 05Feb2006 +# IMPORTANT changes with the Feb 2006 revision to version 0.88 +# For Solaris 8 and 9: + If you are using clamd and/or clamav-milter, the daemons + are now stopped on subsequent package upgrades and started + with this package install. + +# For Solaris 10 and later: + SMF processing is added for clamd and clamav-milter + Configuration file /opt/csw/etc/clamd is used to determine + whether or not to run clamd. This feature has not changed. + The same is true for clamav-milter, except that the relevant + file is /opt/csw/etc/clamav-milter. + + There are two types of files used by SMF. The service + method file is located in /opt/csw/lib/svc/method. The + service manifest is located in /opt/csw/var/svc/manifest and + subdirectory application for clamav. + + Service method and manifest files are provided with the package. + If you want to do something different, create custom files with + specific names and the package scripts will use them instead. + If you do create custom versions of these files, please test + them before running pkg-get. If there is an error in a custom + file, pkgadd will fail. + + The custom files must be named: + /opt/csw/lib/svc/method/svc-clamd.custom + /opt/csw/lib/svc/method/svc-clamav-milter.custom + /opt/csw/var/svc/manifest/application/clamd.custom.xml + /opt/csw/var/svc/manifest/application/clamav-milter.custom.xml + + You may supply custom versions of any or all of these files. + If there is not a custom file available and a set of files are + needed because a service is activated, the package scripts will + use the standard files installed with the package and name them + accordingly. + + To remove the installed service defintion and replace with your + own, do the following (using the clamd manifest as the example). + Create: /opt/csw/var/svc/manifest/application/clamd.custom.xml + Permissions should be 0644 root bin: + chown root:bin \ + /opt/csw/var/svc/manifest/application/clamd.custom.xml + chmod 0644 \ + /opt/csw/var/svc/manifest/application/clamd.custom.xml + Copy: cp -p /opt/csw/var/svc/manifest/application/clamd.custom.xml \ + /opt/csw/var/svc/manifest/application/clamd.xml + Removal: svcadm disable cswclamd + svccfg delete cswclamd + Install: svccfg import /opt/csw/var/svc/manifest/application/clamd.xml + svcadm enable cswclamd + + The supplied manifests have clamav-milter depending on clamd. + If you need clamav-milter, this is the recommended usage and + requires /opt/csw/etc/clamav-milter to define the '--external' + switch. + + The FMRI for clamd is svc:/application/cswclamd (or cswclamd). + The FMRI for clamav-milter is svc/application/cswclamav-milter + (or cswclamav-milter). + +# TO DO: + I want to allow more flexibility with clamd and clamav-milter + option definition. Currently, you are limited to what you put + on a single line in clamd and/or clamav-milter in /opt/csw/etc. + This works, but it could be more flexible and readable. Maybe + next time:> + + +# 27Jan2005 +# IMPORTANT changes with version 0.81 +# There are a few changes in the configuration files. So please +# compare the /opt/csw/etc/*.CSW files with your working copies. +# clamav-milter now uses libclamav by default. This means that you +# do not need to have clamd running if you only use clamav-milter. +# The sample clamav-milter.CSW file is changed to the old behavior. +# You decide what you are comfortable with. I will be running the +# old method until maybe the next release or until I am more familiar +# with this new option. + +# 21Sep2004 +# IMPORTANT changes with version 0.80 +# /opt/csw/etc/clamav.conf is renamed to /opt/csw/etc/clamd.conf +# Postinstall will do the rename, if the file exists. +# +# If this is the first migration to 0.80 from a previous version: +# YOU MUST review the changes in clamd.conf.CSW. +# If you have StreamSaveToDisk enabled, it must be disabled or removed. +# +# YOU MUST review the changes in freshclam.conf.CSW. There are new options. + +# 15Jun2004 +# Please compare your configuration files with the *.CSW versions in + /opt/csw/etc/. There are some minor changes to the defaults. + The bad symlink for /etc/rc2.d/S77cswclamd is fixed. + The cswclamav-milter script now removes the old socket. Note + that clamd socket removal can be done by enabling the FixStaleSocket + option in clamav.conf. + There are several ways to use this pkg, i.e., with clamd, with + clamav-milter. Some options need to be changed to setup an + environment. Please click the 'View news and info' buttom at + http://www.blastwave.org/packages.php/clamav to review the setup + that I use to run clamd and clamav-milter with freshclam running + from crontab. + +# *** IMPORTANT *** +1) Freshclam is no longer run as a daemon. Please create a crontab entry + to run freshclam when you desire. +2) You MUST change /opt/csw/etc/freshclam.conf as needed for your installation + and run freshclam before proceeding. +3) There are different ways to run clamav. To use clamav as a sendmail + milter, copy the config files clamav.conf.CSW and clamav-milter.CSW + in /opt/csw/etc to the same names without the .CSW. Add the milter + setup to your sendmail configuration file. +4) Change the configuration files as required for your installation. + The configuration files that you create are not touched when a + new version of clamav is installed. Therefore remember to run + a diff between your version and the .CSW version, which is the + new version. There could be new features added and the config + files are normally the way these new features are activated. +5) Clamav should be run as a non-root user. Change the directory + /opt/csw/share/clamav and the *.cvd files in this directory to + be owned by this user. Also change /opt/csw/etc/clamav.conf + accordingly. +6) The startup scripts run clamd if the file /opt/csw/etc/clamd exists. + You can change the startup options by changing /opt/csw/etc/clamd. + A sample file is provided. The same is true for clamav-milter. +# See additional files README, FAQ, INSTALL for more information. Added: csw/mgar/pkg/clamav/trunk/files/CSWclamav.checkinstall =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWclamav.checkinstall (rev 0) +++ csw/mgar/pkg/clamav/trunk/files/CSWclamav.checkinstall 2008-12-10 14:19:01 UTC (rev 2508) @@ -0,0 +1,55 @@ +# checkinstall script for Clamav +# Verify that group and user clamav exists +# +ADDUSER=0 +ADDGROUP=0 +# Next, verify that group clamav exists. +# First check target machines group file, THEN check +# NIS/NIS+/whatever + +/usr/bin/grep '^clamav:' /etc/group >/dev/null +if [ $? -ne 0 ] ; then + /usr/bin/getent group clamav >/dev/null + if [ $? -ne 0 ] ; then + NEEDGROUP=1 + fi +fi + +if [ "$NEEDGROUP" = 1 ] ; then + echo "***" + echo "Group clamav must exist for this package install." + echo "clamav group will be added." + ADDGROUP=1 +else + echo "clamav group detected" +fi +# Next, verify that user clamav exists. +# First check target machines password file, THEN check +# NIS/NIS+/whatever + +/usr/bin/grep '^clamav:' /etc/passwd >/dev/null +if [ $? -ne 0 ] ; then + /usr/bin/getent passwd clamav >/dev/null + if [ $? -ne 0 ] ; then + NEEDUSER=1 + fi +fi + +if [ "$NEEDUSER" = 1 ] ; then + echo "***" + echo "User clamav must exist for this package install." + echo "clamav user will be added." + ADDUSER=1 +else + echo "clamav user detected" +fi + +# Make env variables available to other packaging scripts + +cat >$1 <&1 + else + /usr/sbin/svcadm enable svc:application/cswclamd 2>&1 + fi + fi + +fi + +# Display message +echo '***' +echo '*** See README.CSW in /opt/csw/share/doc/clamav for changes.**' +echo '*** For first time version 0.90 installs - Please see README.CSW.""' +echo '*** See http://www.blastwave.org/standards/csw.conf.html for' +echo ' details on using csw.conf to enable/disable daemons.**' +echo '***' Added: csw/mgar/pkg/clamav/trunk/files/CSWclamav.preinstall =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWclamav.preinstall (rev 0) +++ csw/mgar/pkg/clamav/trunk/files/CSWclamav.preinstall 2008-12-10 14:19:01 UTC (rev 2508) @@ -0,0 +1,23 @@ +# preinstall for clamav +# Add the user and group clamav if told to by checkinstall script. + +# If installing on a filesystem that is not running the OS, exit this script. +if [ ! x"$PKG_INSTALL_ROOT" = x"" -a ! x"$PKG_INSTALL_ROOT" = x"/" ] ; then exit 0 ; fi + +if [ x"$PKG_INSTALL_ROOT" = x"" ] ; then + PKG_INSTALL_ROOT="/" +fi + +MYHOME=/var/spool + +if [ "$ADDGROUP" = "1" ] ; then + chroot $PKG_INSTALL_ROOT /usr/sbin/groupadd clamav + echo "Added clamav group." +fi +if [ "$ADDUSER" = "1" ] ; then + chroot $PKG_INSTALL_ROOT /usr/sbin/useradd -g clamav clamav + chroot $PKG_INSTALL_ROOT /usr/sbin/usermod -c "Clamav user" -d $MYHOME -s /bin/false clamav + echo "Added clamav user." +fi + +exit 0 Added: csw/mgar/pkg/clamav/trunk/files/CSWclamav.preremove =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWclamav.preremove (rev 0) +++ csw/mgar/pkg/clamav/trunk/files/CSWclamav.preremove 2008-12-10 14:19:01 UTC (rev 2508) @@ -0,0 +1,27 @@ +# clamav - preremove script +# +# Stop clamav if it is running. + +# Determine whether or not clamd and clamav-milter is running +haveclamd=no +haveclmilter=no + +if [ -f /opt/csw/etc/clamd ] || [ -f /etc/opt/csw/clamd ] ; then haveclamd=yes ; fi +if [ -f /opt/csw/etc/clamav-milter ] || [ -f /etc/opt/csw/clamav-milter ] ; then haveclmilter=yes ; fi + +# Determine whether or not SMF is available +smf=no +if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ] ; then smf=yes ; fi + + if [ $haveclamd=yes ] ; then + echo "Shutting down clamd" + if [ $smf = yes ] + then + # Disable service + /usr/sbin/svcadm disable -s svc:application/cswclamd:default >/dev/null 2>&1 + else + /etc/init.d/cswclamd stop >/dev/null 2>&1 + fi + 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 Wed Dec 10 15:24:30 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 10 Dec 2008 14:24:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[2509] csw/mgar/pkg Message-ID: Revision: 2509 http://gar.svn.sourceforge.net/gar/?rev=2509&view=rev Author: bdwalton Date: 2008-12-10 14:24:29 +0000 (Wed, 10 Dec 2008) Log Message: ----------- First working package for CSWdocbookxsl. Added Paths: ----------- csw/mgar/pkg/docbook-style-xsl/ csw/mgar/pkg/docbook-style-xsl/branches/ csw/mgar/pkg/docbook-style-xsl/tags/ csw/mgar/pkg/docbook-style-xsl/trunk/ csw/mgar/pkg/docbook-style-xsl/trunk/Makefile csw/mgar/pkg/docbook-style-xsl/trunk/checksums csw/mgar/pkg/docbook-style-xsl/trunk/files/ csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.depend csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.gspec csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.postinstall csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.preremove csw/mgar/pkg/docbook-style-xsl/trunk/files/Makefile csw/mgar/pkg/docbook-style-xsl/trunk/files/docbook-xsl-lists.patch csw/mgar/pkg/docbook-style-xsl/trunk/files/docbook-xsl-marginleft.patch csw/mgar/pkg/docbook-style-xsl/trunk/files/docbook-xsl-pagesetup.patch csw/mgar/pkg/docbook-style-xsl/trunk/files/docbook-xsl-sp.patch Property changes on: csw/mgar/pkg/docbook-style-xsl/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 Added: csw/mgar/pkg/docbook-style-xsl/trunk/Makefile =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/Makefile (rev 0) +++ csw/mgar/pkg/docbook-style-xsl/trunk/Makefile 2008-12-10 14:24:29 UTC (rev 2509) @@ -0,0 +1,52 @@ +GARNAME = docbookxsl +GARVERSION = 1.69.1 +PATCHLEVEL = 5.1 +CATEGORIES = xtra + +# for our (modified from rhel) copied in Makefile. +PREREQUISITES = CSWgfile CSWbash + +DESCRIPTION = Norman Walsh's XSL stylesheets for DocBook XML. +define BLURB +The DocBook XSL stylesheets are a set of stylesheets for use with an +XSLT engine (such as xsltproc or Saxon) for transforming DocBook XML +documents into other DocBookOutputFormats, such as HTML, PDF, +Microsoft HTML Help, and man pages. +endef + +# docbook-xsl is housed in the docbook master project at SF. +SF_PROJ = docbook +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = docbook-xsl-$(GARVERSION).tar.bz2 +DISTFILES += docbook-xsl-doc-$(GARVERSION).tar.bz2 +DISTFILES += $(call admfiles,CSWdocbookxsl,depend postinstall preremove) +DISTFILES += Makefile + +# These are listed in the same order they'd be applied during the rpm build... +# They don't apply cleanly, otherwise. +PATCHFILES = docbook-xsl-pagesetup.patch docbook-xsl-marginleft.patch +PATCHFILES += docbook-xsl-lists.patch docbook-xsl-sp.patch + +CONFIGURE_SCRIPTS = + +BUILD_SCRIPTS = + +TEST_SCRIPTS = + +INSTALL_ARGS = DESTDIR=$(DESTDIR) GARVERSION=$(GARVERSION) \ + PATCHLEVEL=$(PATCHLEVEL) + +#to make the package extraction happy...(we don't use the - separator) +WORKSRC = $(WORKDIR)/docbook-xsl-$(GARVERSION) + +post-extract: + @( cd $(WORKSRC); cp ../Makefile . ) + @$(MAKECOOKIE) + +post-install: + @(cd $(DESTDIR)/opt/csw/share/sgml/docbook; \ + ln -s xsl-stylesheets-$(GARVERSION)-$(PATCHLEVEL) \ + xsl-stylesheets ) + @$(MAKECOOKIE) + +include gar/category.mk Added: csw/mgar/pkg/docbook-style-xsl/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/checksums (rev 0) +++ csw/mgar/pkg/docbook-style-xsl/trunk/checksums 2008-12-10 14:24:29 UTC (rev 2509) @@ -0,0 +1,11 @@ +6ebd29a67f2dcc3f2220f475ee6f6552 download/docbook-xsl-1.69.1.tar.bz2 +b3bf09a0b1a368a3490e68ffc695d290 download/docbook-xsl-doc-1.69.1.tar.bz2 +4120f10e50070dd8fc2284d5214bf51d download/CSWdocbookxsl.gspec +6d190471746a394df111025da3060868 download/CSWdocbookxsl.depend +626425bf8e0de42afd5781c2d63397fc download/CSWdocbookxsl.postinstall +9f98469194bd4c15bf6b3fc76514b406 download/CSWdocbookxsl.preremove +ae11620673a7144c4df9a6e408a3bcb1 download/Makefile +84b37b559cc95c747e39a5a8f79558a3 download/docbook-xsl-pagesetup.patch +1d1ff63f5ebd3527c925f68e55138b6f download/docbook-xsl-marginleft.patch +cec8c281ed1c9be99ad47a74362248d5 download/docbook-xsl-lists.patch +e7bbf777eadbb70aaed073006de0347e download/docbook-xsl-sp.patch Added: csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.depend =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.depend (rev 0) +++ csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.depend 2008-12-10 14:24:29 UTC (rev 2509) @@ -0,0 +1,6 @@ +P CSWcommon common - common files and dirs for CSW packages +P CSWsgmlcommon sgmlcommon - A collection of entities and DTDs +P CSWxmlcommon xmlcommon - A collection of entities and DTDs +P CSWlibxml2 libxml2 - A library providing XML and HTML support +P CSWdocbookdtds docbookdtds - SGML and XML document type definitions for DocBook. + Added: csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.gspec =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.gspec (rev 0) +++ csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.gspec 2008-12-10 14:24:29 UTC (rev 2509) @@ -0,0 +1,5 @@ +%var bitname docbookxsl +%var pkgname CSWdocbookxsl +%var arch all +%include url file://%{PKGLIB}/csw_dyndepend.gspec + Added: csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.postinstall =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.postinstall (rev 0) +++ csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.postinstall 2008-12-10 14:24:29 UTC (rev 2509) @@ -0,0 +1,27 @@ +#!/bin/sh + +if [ -n "$PKG_INSTALL_ROOT" -a "$PKG_INSTALL_ROOT" != "/" ]; then + chroot $PKG_INSTALL_ROOT +fi + +PATH=/opt/csw/bin:$PATH + +CATCMD=/opt/csw/bin/xmlcatalog + +VERSION=1.69.1 +RELEASE=5.1 +DBHOME=/opt/csw/share/sgml/docbook + +CATALOG=/opt/csw/etc/xml/catalog +$CATCMD --noout --add "rewriteSystem" \ + "http://docbook.sourceforge.net/release/xsl/$VERSION" \ + "file://$DBHOME/xsl-stylesheets-$VERSION-$RELEASE" $CATALOG +$CATCMD --noout --add "rewriteURI" \ + "http://docbook.sourceforge.net/release/xsl/$VERSION" \ + "file://$DBHOME/xsl-stylesheets-$VERSION-$RELEASE" $CATALOG +$CATCMD --noout --add "rewriteSystem" \ + "http://docbook.sourceforge.net/release/xsl/current" \ + "file://$DBHOME/xsl-stylesheets-$VERSION-$RELEASE" $CATALOG +$CATCMD --noout --add "rewriteURI" \ + "http://docbook.sourceforge.net/release/xsl/current" \ + "file://$DBHOME/xsl-stylesheets-$VERSION-$RELEASE" $CATALOG Added: csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.preremove =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.preremove (rev 0) +++ csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.preremove 2008-12-10 14:24:29 UTC (rev 2509) @@ -0,0 +1,16 @@ +#!/bin/sh + +if [ -n "$PKG_INSTALL_ROOT" -a "$PKG_INSTALL_ROOT" != "/" ]; then + chroot $PKG_INSTALL_ROOT +fi + +PATH=/opt/csw/bin:$PATH + +CATALOG=/opt/csw/etc/xml/catalog +XMLCAT=/opt/csw/bin/xmlcatalog +DBHOME=/opt/csw/share/sgml/docbook +VERSION=1.69.1 +RELEASE=5.1 + +$XMLCAT --noout --del \ + "file://$DBHOME/xsl-stylesheets-$VERSION-$RELEASE" $CATALOG \ No newline at end of file Added: csw/mgar/pkg/docbook-style-xsl/trunk/files/Makefile =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/files/Makefile (rev 0) +++ csw/mgar/pkg/docbook-style-xsl/trunk/files/Makefile 2008-12-10 14:24:29 UTC (rev 2509) @@ -0,0 +1,51 @@ + +DESTDIR ?= ... should be overridden by GAR ... +GARVERSION ?= ... should be overridden by GAR ... +PATCHLEVEL ?= ... should be overridden by GAR ... + +SHELL = /opt/csw/bin/bash + +prefix = $(DESTDIR)/opt/csw +bindir = $(prefix)/bin +datadir = $(prefix)/share + +instdir = $(datadir)/sgml/docbook/xsl-stylesheets-$(GARVERSION)-$(PATCHLEVEL) +docdir = $(datadir)/doc/docbookxsl-$(GARVERSION)-$(PATCHLEVEL) + +all: install + +install: install-xsl install-img install-misc install-docs + +install-xsl: + gmkdir -p $(instdir)/{common,fo,html,htmlhelp/doc,javahelp,lib,template,xhtml,manpages,profiling} + cp common/*.dtd $(instdir)/common + cp common/*.xml $(instdir)/common + cp common/*.xsl $(instdir)/common + cp fo/*.xml $(instdir)/fo + cp fo/*.xsl $(instdir)/fo + cp html/*.xml $(instdir)/html + cp html/*.xsl $(instdir)/html + cp htmlhelp/*.xsl $(instdir)/htmlhelp + cp javahelp/*.xsl $(instdir)/javahelp + cp lib/lib.xsl $(instdir)/lib + cp template/README $(instdir)/template + cp template/*.xml $(instdir)/template + cp template/*.xsl $(instdir)/template + cp xhtml/*.xsl $(instdir)/xhtml + cp manpages/README $(instdir)/manpages + cp manpages/*.xsl $(instdir)/manpages + cp profiling/*.xsl $(instdir)/profiling + +install-img: + gmkdir -p $(instdir)/images/callouts + cp images/*.gif $(instdir)/images + cp images/*.png $(instdir)/images + cp images/callouts/*.png $(instdir)/images/callouts + +install-misc: + cp VERSION $(instdir) + +install-docs: + gmkdir -p $(docdir) + cp BUGS ChangeLog README TODO $(docdir)/ + cp -R doc $(docdir)/ \ No newline at end of file Added: csw/mgar/pkg/docbook-style-xsl/trunk/files/docbook-xsl-lists.patch =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/files/docbook-xsl-lists.patch (rev 0) +++ csw/mgar/pkg/docbook-style-xsl/trunk/files/docbook-xsl-lists.patch 2008-12-10 14:24:29 UTC (rev 2509) @@ -0,0 +1,123 @@ +--- docbook-xsl-1.69.1/fo/lists.xsl.orig 2006-01-19 02:36:22.000000000 -0800 ++++ docbook-xsl-1.69.1/fo/lists.xsl 2006-01-19 02:34:54.000000000 -0800 +@@ -125,9 +130,18 @@ + + + ++ ++ ++ ++ ++ + +- ++ + ++ ++ + + + +@@ -287,9 +301,18 @@ + + + ++ ++ ++ ++ ++ + +- ++ + ++ ++ + + + +@@ -486,9 +509,18 @@ + + + ++ ++ ++ ++ ++ + +- ++ + ++ ++ + + + +@@ -906,9 +938,18 @@ + + + ++ ++ ++ ++ ++ + +- ++ + ++ ++ + + + +@@ -932,9 +973,18 @@ + + + ++ ++ ++ ++ ++ + +- ++ + ++ ++ + + + +@@ -1112,10 +1162,19 @@ + + + ++ ++ ++ ++ ++ + +- ++ + +- ++ ++ ++ + + Added: csw/mgar/pkg/docbook-style-xsl/trunk/files/docbook-xsl-marginleft.patch =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/files/docbook-xsl-marginleft.patch (rev 0) +++ csw/mgar/pkg/docbook-style-xsl/trunk/files/docbook-xsl-marginleft.patch 2008-12-10 14:24:29 UTC (rev 2509) @@ -0,0 +1,111 @@ +--- docbook-xsl-1.68.0/fo/pagesetup.xsl.marginleft 2005-02-09 12:09:37.000000000 +0000 ++++ docbook-xsl-1.68.0/fo/pagesetup.xsl 2005-02-09 14:53:59.088068221 +0000 +@@ -34,29 +34,11 @@ + margin-left="{$page.margin.outer} - {$title.margin.left}" + --> + +- +- +- +- +- +- +- - +- +- +- ++ + + + +- +- +- +- +- +- +- - +- +- +- ++ + + + +--- docbook-xsl-1.68.0/fo/lists.xsl.marginleft 2005-02-09 12:09:37.000000000 +0000 ++++ docbook-xsl-1.68.0/fo/lists.xsl 2005-02-09 14:55:06.682138599 +0000 +@@ -371,7 +371,7 @@ + + + +- ++ + + + +@@ -380,15 +380,7 @@ + + + +- +- +- +- em +- +- +- em * 0.60 +- +- ++ em + + + +@@ -397,15 +389,7 @@ + + + +- +- +- +- em +- +- +- em * 0.60 +- +- ++ em + + + +@@ -419,17 +403,7 @@ + + 1em + +- +- +- +- +- +- +- +- + +- +- +- ++ + + + +--- docbook-xsl-1.68.0/fo/param.xsl.marginleft 2005-02-09 12:20:55.000000000 +0000 ++++ docbook-xsl-1.68.0/fo/param.xsl 2005-02-09 14:53:59.115063057 +0000 +@@ -95,8 +95,8 @@ + + always + +- +- ++ ++ + false + 0pt + Added: csw/mgar/pkg/docbook-style-xsl/trunk/files/docbook-xsl-pagesetup.patch =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/files/docbook-xsl-pagesetup.patch (rev 0) +++ csw/mgar/pkg/docbook-style-xsl/trunk/files/docbook-xsl-pagesetup.patch 2008-12-10 14:24:29 UTC (rev 2509) @@ -0,0 +1,74 @@ +--- docbook-xsl-1.69.1/fo/pagesetup.xsl.orig 2005-12-10 14:08:28.000000000 -0600 ++++ docbook-xsl-1.69.1/fo/pagesetup.xsl 2006-01-01 19:49:28.000000000 -0600 +@@ -1491,32 +1491,29 @@ + + + +- proportional-column-width( + + header + + +- ) ++ % + + + + +- proportional-column-width( + + header + + +- ) ++ % + + + + +- proportional-column-width( + + header + + +- ) ++ % + + + +@@ -1812,32 +1809,29 @@ + + + +- proportional-column-width( + + footer + + +- ) ++ % + + + + +- proportional-column-width( + + footer + + +- ) ++ % + + + + +- proportional-column-width( + + footer + + +- ) ++ % + + + Added: csw/mgar/pkg/docbook-style-xsl/trunk/files/docbook-xsl-sp.patch =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/files/docbook-xsl-sp.patch (rev 0) +++ csw/mgar/pkg/docbook-style-xsl/trunk/files/docbook-xsl-sp.patch 2008-12-10 14:24:29 UTC (rev 2509) @@ -0,0 +1,11 @@ +--- docbook-xsl-1.69.1/manpages/block.xsl.sp 2005-08-09 10:11:02.000000000 +0100 ++++ docbook-xsl-1.69.1/manpages/block.xsl 2006-01-19 12:07:47.000000000 +0000 +@@ -37,7 +37,7 @@ + + + +- .sp ++ .sp + + + 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 Dec 10 19:14:23 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 10 Dec 2008 18:14:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[2510] csw/mgar/pkg/docbook-dtds/trunk Message-ID: Revision: 2510 http://gar.svn.sourceforge.net/gar/?rev=2510&view=rev Author: bdwalton Date: 2008-12-10 18:14:21 +0000 (Wed, 10 Dec 2008) Log Message: ----------- The destination directory for the xml dtds was missing a '-', which saw things like xmllint not pick up locally installed dtds, as the catalog reference was broken. Modified Paths: -------------- csw/mgar/pkg/docbook-dtds/trunk/checksums csw/mgar/pkg/docbook-dtds/trunk/files/Makefile Modified: csw/mgar/pkg/docbook-dtds/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/checksums 2008-12-10 14:24:29 UTC (rev 2509) +++ csw/mgar/pkg/docbook-dtds/trunk/checksums 2008-12-10 18:14:21 UTC (rev 2510) @@ -9,7 +9,7 @@ ab200202b9e136a144db1e0864c45074 download/docbook-xml-4.3.zip f89e1bd0b2c7a361e3f1f739e16b5d0d download/docbook-4.4.zip cbb04e9a700955d88c50962ef22c1634 download/docbook-xml-4.4.zip -2479ac1e7b4a43d3618ca16237aaa85d download/Makefile +e5318114e6c751a9e0835d7711275e13 download/Makefile 536104a1ab1e8eac583cf27f4f8844a4 download/CSWdocbookdtds.gspec cb6dbfe9f6184a9de0725c0a61adc57b download/CSWdocbookdtds.depend 95eb4822347e50556398f4a11ee95097 download/CSWdocbookdtds.postinstall Modified: csw/mgar/pkg/docbook-dtds/trunk/files/Makefile =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/Makefile 2008-12-10 14:24:29 UTC (rev 2509) +++ csw/mgar/pkg/docbook-dtds/trunk/files/Makefile 2008-12-10 18:14:21 UTC (rev 2510) @@ -61,7 +61,7 @@ $(INSTALL_DATA) ent/* $(DD)/ent/; \ fi ) -inst-%-xml: DD=$(DESTDIR)/$(docbookdir)/xml-dtd-$*$(GARVERSION)-$(PATCHLEVEL) +inst-%-xml: DD=$(DESTDIR)/$(docbookdir)/xml-dtd-$*-$(GARVERSION)-$(PATCHLEVEL) inst-%-xml: @echo Installing $*-xml @( cd $*-xml; \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From william at wbonnet.net Wed Dec 10 19:23:47 2008 From: william at wbonnet.net (William Bonnet) Date: Wed, 10 Dec 2008 19:23:47 +0100 Subject: [csw-devel] Update the pkg-get package from website Message-ID: <49400933.4090104@wbonnet.net> Hi all I just installed the package linked from http://opencsw.org/pkg-get ( http://opencsw.org/pkg_get-3.8.4-SunOS5.8-all-CSW.pkg ). The config file is broken since it point to http://ibiblio.org/pub/packages/solaris/csw/unstable This file also has blastwave mirrors in the comment. It should be removed and replaced by our mirrors cheers W. -- William http://www.wbonnet.net http://www.sunwizard.net Le site fran?ais des amateurs de stations Unix http://www.blastwave.org An OpenSolaris Community Site http://www.opencsw.org Community SoftWare for Solaris http://www.guses.org French speaking Solaris User Group From dmichelsen at users.sourceforge.net Wed Dec 10 20:30:50 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 10 Dec 2008 19:30:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[2511] csw/mgar/pkg/jdk6/trunk Message-ID: Revision: 2511 http://gar.svn.sourceforge.net/gar/?rev=2511&view=rev Author: dmichelsen Date: 2008-12-10 19:30:49 +0000 (Wed, 10 Dec 2008) Log Message: ----------- jdk6: Make meta-package arch=all Modified Paths: -------------- csw/mgar/pkg/jdk6/trunk/checksums csw/mgar/pkg/jdk6/trunk/files/CSWjdk.gspec csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.gspec csw/mgar/pkg/jdk6/trunk/files/CSWjre.gspec csw/mgar/pkg/jdk6/trunk/files/CSWjre6.gspec Modified: csw/mgar/pkg/jdk6/trunk/checksums =================================================================== --- csw/mgar/pkg/jdk6/trunk/checksums 2008-12-10 18:14:21 UTC (rev 2510) +++ csw/mgar/pkg/jdk6/trunk/checksums 2008-12-10 19:30:49 UTC (rev 2511) @@ -2,7 +2,7 @@ 2f5b20118c85533854720ebbfb428758 download/jdk-6u11-solaris-sparcv9.sh e460101ca2d718b98a65c432753e9684 download/jdk-6u11-solaris-i586.sh c103e6c5d4d42a8ab162804a7b01c3c2 download/jdk-6u11-solaris-x64.sh -8e3e3bcebbbd14d16657d8a102c2ed3b download/CSWjdk6.gspec -a08a034895b0e77dd70df961d63ec1a1 download/CSWjre6.gspec -232933acc5ba9ac4fe72ed3cebdcb4d0 download/CSWjdk.gspec -8d4a797e73a0e4b6f17fcf0a99d9b6f0 download/CSWjre.gspec +e97f304567b9a3504ed23ab5203b1d6a download/CSWjdk6.gspec +db63838ec6ecabef9af5dbaeece93854 download/CSWjre6.gspec +49e3f19f300f9634301324c66e9c538f download/CSWjdk.gspec +e8c5435c1ec2ee4b55bc64a7e43092f5 download/CSWjre.gspec Modified: csw/mgar/pkg/jdk6/trunk/files/CSWjdk.gspec =================================================================== --- csw/mgar/pkg/jdk6/trunk/files/CSWjdk.gspec 2008-12-10 18:14:21 UTC (rev 2510) +++ csw/mgar/pkg/jdk6/trunk/files/CSWjdk.gspec 2008-12-10 19:30:49 UTC (rev 2511) @@ -1,4 +1,5 @@ %var bitname jdk %var pkgname CSWjdk +%var arch all %include url file://%{PKGLIB}/csw_standard.gspec -%copyright url file://%{WORKSRC_DEFAULT}/LICENSE +%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Modified: csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.gspec =================================================================== --- csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.gspec 2008-12-10 18:14:21 UTC (rev 2510) +++ csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.gspec 2008-12-10 19:30:49 UTC (rev 2511) @@ -1,4 +1,4 @@ %var bitname jdk6 %var pkgname CSWjdk6 %include url file://%{PKGLIB}/csw_standard.gspec -%copyright url file://%{WORKSRC_DEFAULT}/LICENSE +%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Modified: csw/mgar/pkg/jdk6/trunk/files/CSWjre.gspec =================================================================== --- csw/mgar/pkg/jdk6/trunk/files/CSWjre.gspec 2008-12-10 18:14:21 UTC (rev 2510) +++ csw/mgar/pkg/jdk6/trunk/files/CSWjre.gspec 2008-12-10 19:30:49 UTC (rev 2511) @@ -1,4 +1,5 @@ %var bitname jre %var pkgname CSWjre +%var arch all %include url file://%{PKGLIB}/csw_standard.gspec -%copyright url file://%{WORKSRC_DEFAULT}/LICENSE +%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Modified: csw/mgar/pkg/jdk6/trunk/files/CSWjre6.gspec =================================================================== --- csw/mgar/pkg/jdk6/trunk/files/CSWjre6.gspec 2008-12-10 18:14:21 UTC (rev 2510) +++ csw/mgar/pkg/jdk6/trunk/files/CSWjre6.gspec 2008-12-10 19:30:49 UTC (rev 2511) @@ -1,4 +1,4 @@ %var bitname jre6 %var pkgname CSWjre6 %include url file://%{PKGLIB}/csw_standard.gspec -%copyright url file://%{WORKSRC_DEFAULT}/LICENSE +%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE 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 Dec 10 20:51:29 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 10 Dec 2008 19:51:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[2512] csw/mgar/pkg/mantis/trunk Message-ID: Revision: 2512 http://gar.svn.sourceforge.net/gar/?rev=2512&view=rev Author: dmichelsen Date: 2008-12-10 19:51:28 +0000 (Wed, 10 Dec 2008) Log Message: ----------- mantis: Update to 1.1.6 Modified Paths: -------------- csw/mgar/pkg/mantis/trunk/Makefile csw/mgar/pkg/mantis/trunk/checksums Modified: csw/mgar/pkg/mantis/trunk/Makefile =================================================================== --- csw/mgar/pkg/mantis/trunk/Makefile 2008-12-10 19:30:49 UTC (rev 2511) +++ csw/mgar/pkg/mantis/trunk/Makefile 2008-12-10 19:51:28 UTC (rev 2512) @@ -1,5 +1,5 @@ GARNAME = mantisbt -GARVERSION = 1.1.5 +GARVERSION = 1.1.6 CATEGORIES = apps DESCRIPTION = Mantis is a free popular web-based bugtracking system Modified: csw/mgar/pkg/mantis/trunk/checksums =================================================================== --- csw/mgar/pkg/mantis/trunk/checksums 2008-12-10 19:30:49 UTC (rev 2511) +++ csw/mgar/pkg/mantis/trunk/checksums 2008-12-10 19:51:28 UTC (rev 2512) @@ -1,4 +1,4 @@ -f1a03902fc598abd93edad3a0b39c7f9 download/mantisbt-1.1.5.tar.gz +2e0c6d3dd9ca7d16258fc2d86363a675 download/mantisbt-1.1.6.tar.gz d1789df1b666c1fead9fc492dd196711 download/CSWmantis.gspec 6342620e50a9c631c6fd46a86d6dc32b download/CSWmantis.depend 96401030529fc97656cf78d4f7b170e7 download/CSWmantis.preinstall This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Dec 10 21:10:11 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 10 Dec 2008 20:10:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[2513] csw/mgar/pkg/clamav/trunk Message-ID: Revision: 2513 http://gar.svn.sourceforge.net/gar/?rev=2513&view=rev Author: bonivart Date: 2008-12-10 20:10:10 +0000 (Wed, 10 Dec 2008) Log Message: ----------- clamav: even more fixes Modified Paths: -------------- csw/mgar/pkg/clamav/trunk/Makefile csw/mgar/pkg/clamav/trunk/checksums csw/mgar/pkg/clamav/trunk/files/CSWclamav.checkinstall csw/mgar/pkg/clamav/trunk/files/CSWclamav.cswclamd csw/mgar/pkg/clamav/trunk/files/CSWclamav.gspec csw/mgar/pkg/clamav/trunk/files/CSWclamav.postinstall csw/mgar/pkg/clamav/trunk/files/CSWclamav.preinstall csw/mgar/pkg/clamav/trunk/files/CSWlibclamav.gspec Removed Paths: ------------- csw/mgar/pkg/clamav/trunk/files/CSWclamav.preremove Modified: csw/mgar/pkg/clamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamav/trunk/Makefile 2008-12-10 19:51:28 UTC (rev 2512) +++ csw/mgar/pkg/clamav/trunk/Makefile 2008-12-10 20:10:10 UTC (rev 2513) @@ -1,18 +1,7 @@ # clamav, Peter Bonivart -# files outside /opt/csw are not included, need to fix gspec and cswproto -# put libs in lib/32? -# add rc/smf support. cswclassutils? -# add pre/post scripts -# add etc/clamav-milter? -# add etc/clamd? +# build with "ENABLE_CHECK=0 gmake package" # check mantis bugs -# + add doc/README.CSW, INSTALL.clamav-milter.CSW -# + split into multiple packages: clamav, libclamav -# + add re for update notification -# + add contrib -# + add html docs and some pdf:s -# + remove *.a, *.la from libs GARNAME = clamav GARVERSION = 0.94.2 @@ -29,9 +18,8 @@ SF_PROJ = clamav MASTER_SITES = $(SF_MIRRORS) -#MASTER_SITES = http://freshmeat.net/redir/clamav/29355/url_tgz/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWclamav,checkinstall preinstall postinstall preremove) +DISTFILES += $(call admfiles,CSWclamav,checkinstall preinstall postinstall) DISTFILES += $(call admfiles,CSWlibclamav,) SPKG_DESC_CSWclamav = Clam AntiVirus @@ -43,13 +31,9 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -SPKG_CLASSES = none cswinitsmf +SPKG_CLASSES = none cswcpsampleconf cswinitsmf -#GARCOMPILER = GCC3 - CONFIGURE_ARGS = $(DIRPATHS) -#CONFIGURE_ARGS += --with-user=nobody -#CONFIGURE_ARGS += --with-group=nobody CONFIGURE_ARGS += --disable-clamav CONFIGURE_ARGS += --enable-milter CONFIGURE_ARGS += --with-sendmail=$(libdir)/sendmail @@ -61,6 +45,8 @@ PKGFILES_CSWlibclamav = $(libdir)/.* PKGFILES_CSWlibclamav += $(includedir)/.* +PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswclamd$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/init.d\/cswclamav-milter$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/clamd.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } $$$$3 ~ /\/freshclam.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } { print }' + SPKG_SOURCEURL = http://www.clamav.net/ include gar/category.mk @@ -75,9 +61,12 @@ DOCDEST = $(DESTDIR)$(docdir)/$(GARNAME) post-install-modulated: - @echo " ==> Post-install for $(GARNAME)" + @echo " ==> Post-install for $(GARNAME) (custom)" @ginstall -d $(DESTDIR)/etc/opt/csw/init.d @ginstall -m 755 $(FILEDIR)/CSWclamav.cswclamd $(DESTDIR)/etc/opt/csw/init.d/cswclamd + @ginstall -m 755 $(FILEDIR)/CSWclamav.cswclamav-milter $(DESTDIR)/etc/opt/csw/init.d/cswclamav-milter + @mv $(DESTDIR)$(sysconfdir)/clamd.conf $(DESTDIR)$(sysconfdir)/clamd.conf.CSW + @mv $(DESTDIR)$(sysconfdir)/freshclam.conf $(DESTDIR)$(sysconfdir)/freshclam.conf.CSW @ginstall -d $(DOCDEST) @$(foreach DOC,$(DOCS),ginstall -m 644 $(WORKSRC)/$(DOC) $(DOCDEST);) @ginstall -m 644 $(WORKSRC)/COPYING $(DOCDEST)/LICENSE Modified: csw/mgar/pkg/clamav/trunk/checksums =================================================================== --- csw/mgar/pkg/clamav/trunk/checksums 2008-12-10 19:51:28 UTC (rev 2512) +++ csw/mgar/pkg/clamav/trunk/checksums 2008-12-10 20:10:10 UTC (rev 2513) @@ -1,7 +1,6 @@ 1181e6d62341b84708f126cc353f7ebf download/clamav-0.94.2.tar.gz -7d36b4328fa73af2b109169b923bc127 download/CSWclamav.gspec -751ed376aeccb1664694b772c4b9640d download/CSWclamav.checkinstall -e355168073277baaf456eea620ff2760 download/CSWclamav.preinstall -a82b60e7ee99d6a4ac6e80351ce7bf81 download/CSWclamav.postinstall -526d5979cca3a3ebdf88c6ed33b8ec8d download/CSWclamav.preremove -6edc8660bde0b27d3676699eacb51884 download/CSWlibclamav.gspec +dbb021404195c40d44dd61e9b0206634 download/CSWclamav.gspec +265f727008d1645114839cdbd9399be6 download/CSWclamav.checkinstall +03e2a2aaf95b2cd8497ad6742b9fbb46 download/CSWclamav.preinstall +574e50c4c06f22c928e1a48783490e26 download/CSWclamav.postinstall +8f6b719b38608d0f08ced7e556461c12 download/CSWlibclamav.gspec Modified: csw/mgar/pkg/clamav/trunk/files/CSWclamav.checkinstall =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWclamav.checkinstall 2008-12-10 19:51:28 UTC (rev 2512) +++ csw/mgar/pkg/clamav/trunk/files/CSWclamav.checkinstall 2008-12-10 20:10:10 UTC (rev 2513) @@ -1,6 +1,7 @@ # checkinstall script for Clamav # Verify that group and user clamav exists -# +# 2008-12-10 Peter Bonivart + ADDUSER=0 ADDGROUP=0 # Next, verify that group clamav exists. Modified: csw/mgar/pkg/clamav/trunk/files/CSWclamav.cswclamd =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWclamav.cswclamd 2008-12-10 19:51:28 UTC (rev 2512) +++ csw/mgar/pkg/clamav/trunk/files/CSWclamav.cswclamd 2008-12-10 20:10:10 UTC (rev 2513) @@ -5,9 +5,9 @@ # description: clamd is a standard UNIX program that scans for Viruses. # processname: clamd # config: /opt/csw/etc/clamd.conf -# pidfile: /opt/csw/share/clamav/clamd.pid +# pidfile: /var/opt/csw/clamav/clamd.pid # modified for CSW -# 2007-02-16 Note that the pid file is now in /opt/csw/var/clamav. So, you +# 2007-02-16 Note that the pid file is now in /var/opt/csw/clamav. So, you # may need to fix permissions on that directory. # The clamd file (used to send options to clamd) may now be in # /etc/opt/csw/. Using this file, you may specify a different location @@ -16,9 +16,8 @@ # 2007-04-14 PidFile name and User are obtained from clamd.conf. If # the directory does not exist, it is created by this script. # 2007-10-27 Fix restart script +# 2008-12-10 Peter Bonivart -. /lib/svc/share/smf_include.sh - prog="clamd" progdir="/opt/csw/sbin" @@ -30,57 +29,44 @@ chown $clamuser $piddir fi -OPTIONS_FILE="/etc/opt/csw/clamd" +OPTIONS_FILE="/etc/opt/csw/clamd.conf" if [ ! -f $OPTIONS_FILE ] ; then - OPTIONS_FILE="/opt/csw/etc/clamd" + OPTIONS_FILE="/opt/csw/etc/clamd.conf" fi if [ ! -f "$OPTIONS_FILE" ]; then exit 0 fi -# Local clamd config -if [ -f "$OPTIONS_FILE" ] ; then - CLAMD_FLAGS=`cat "$OPTIONS_FILE"` -fi - PATH=/usr/sbin:/usr/bin:/opt/csw/sbin:/opt/csw/bin -start() { - echo "Starting $prog " - $progdir/$prog ${CLAMD_FLAGS} -} - -stop() { - echo "Stopping $prog " - /usr/bin/kill `head -1 $pidfile` -} - -restart() { - /usr/bin/kill `head -1 $pidfile` - start -} - -reload() { - echo "Reloading clam daemon configuration: " - pkill -HUP $prog -} - case "$1" in start) - start + echo "Starting $prog " + $progdir/$prog & ;; stop) - stop + echo "Stopping $prog " + /usr/bin/pkill -x $prog ;; restart) - restart + $0 stop + echo "Waiting for $prog to stop.\c" + while ( /usr/bin/pgrep -x $prog > /dev/null ) + do + echo ".\c" + sleep 1 + done + echo + sleep 1 + $0 start ;; - reload) - reload + refresh|reload) + echo "Reloading clam daemon configuration: " + /usr/bin/pkill -x -HUP $prog ;; *) - echo $"Usage: $0 {start|stop|status|reload|restart}" + echo $"Usage: $0 { start|stop|refresh|reload|restart }" exit 1 esac -exit $? +exit 0 Modified: csw/mgar/pkg/clamav/trunk/files/CSWclamav.gspec =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWclamav.gspec 2008-12-10 19:51:28 UTC (rev 2512) +++ csw/mgar/pkg/clamav/trunk/files/CSWclamav.gspec 2008-12-10 20:10:10 UTC (rev 2513) @@ -1,9 +1,7 @@ %var bitname clamav %var pkgname CSWclamav %include url file://%{PKGLIB}/csw_dyndepend.gspec -%prototype:merge -f cswinitsmf /etc/opt/csw/init.d/cswclamd 0755 root bin %copyright -Please see /opt/csw/share/doc/clamav/copyright for license information. +Please see /opt/csw/share/doc/clamav/LICENSE for license information. Modified: csw/mgar/pkg/clamav/trunk/files/CSWclamav.postinstall =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWclamav.postinstall 2008-12-10 19:51:28 UTC (rev 2512) +++ csw/mgar/pkg/clamav/trunk/files/CSWclamav.postinstall 2008-12-10 20:10:10 UTC (rev 2513) @@ -1,74 +1,15 @@ # Postinstall script for clamav # 2007-01-07 Add csw.conf support -# The specific daemon name is clamav -# +# 2008-12-10 Peter Bonivart -# If /opt/csw/etc/clamav.conf exists, move it to /opt/csw/etc/clamd.conf +# if /opt/csw/etc/clamav.conf exists, move it to /opt/csw/etc/clamd.conf if [ -f /opt/csw/etc/clamav.conf ]; then /usr/bin/mv /opt/csw/etc/clamav.conf /opt/csw/etc/clamd.conf echo ' Moved /opt/csw/etc/clamav.conf to /opt/csw/etc/clamd.conf' fi -# Determine whether or not clamd and clamav-milter is needed -usingclamd=no -usingclmilter=no -if [ -f /opt/csw/etc/clamd ] -o [ -f /etc/opt/csw/clamd ] ; then usingclamd=yes ; fi -if [ -f /opt/csw/etc/clamav-milter ] -o [ -f /etc/opt/csw/clamav-milter ] ; then usingclmilter=yes ; fi +# assign user for /var/opt/csw/clamav directory +chown -R clamav /var/opt/csw/clamav -# Plug PKG_INSTALL_ROOT if not available -if [ "$PKG_INSTALL_ROOT" = "" ] ; then PKG_INSTALL_ROOT=/ ; fi - -# If available, assign user for /opt/csw/share/clamav directory -CONF_FILE="/etc/opt/csw/clamd.conf" -if [ ! -f "$CONF_FILE" ] ; then - CONF_FILE="/opt/csw/etc/clamd.conf" - if [ ! -f "$CONF_FILE" ] ; then - CONF_FILE="" - fi -fi -if [ x"$CONF_FILE" != x ] ; then - clamuser=`grep '^User' "$CONF_FILE" |awk '{print $2;}'` - if [ x$clamuser != x ] ; then - chown $clamuser /opt/csw/share/clamav - fi -fi - -# daemons are started by default -enable_daemon=yes - -# 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 - -# If defined, autoenable for the specific daemon name takes precedence -if [ "$autoenable_clamav" = "no" ] ; then - enable_daemon=no -elif [ "$autoenable_daemons" = "no" -a ! -n "$autoenable_clamav" ] ; then - enable_daemon=no -fi - -# Start selected daemons -if [ "$enable_daemon" = "yes" ] ; then - - # clamd is first - if [ $usingclamd = yes ] ; then - if [ $smf = no ] ; then - /etc/init.d/cswclamd start 2>&1 - else - /usr/sbin/svcadm enable svc:application/cswclamd 2>&1 - fi - fi - -fi - -# Display message -echo '***' +# display message echo '*** See README.CSW in /opt/csw/share/doc/clamav for changes.**' -echo '*** For first time version 0.90 installs - Please see README.CSW.""' -echo '*** See http://www.blastwave.org/standards/csw.conf.html for' -echo ' details on using csw.conf to enable/disable daemons.**' -echo '***' Modified: csw/mgar/pkg/clamav/trunk/files/CSWclamav.preinstall =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWclamav.preinstall 2008-12-10 19:51:28 UTC (rev 2512) +++ csw/mgar/pkg/clamav/trunk/files/CSWclamav.preinstall 2008-12-10 20:10:10 UTC (rev 2513) @@ -1,5 +1,6 @@ # preinstall for clamav # Add the user and group clamav if told to by checkinstall script. +# 2008-12-10 Peter Bonivart # If installing on a filesystem that is not running the OS, exit this script. if [ ! x"$PKG_INSTALL_ROOT" = x"" -a ! x"$PKG_INSTALL_ROOT" = x"/" ] ; then exit 0 ; fi Deleted: csw/mgar/pkg/clamav/trunk/files/CSWclamav.preremove =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWclamav.preremove 2008-12-10 19:51:28 UTC (rev 2512) +++ csw/mgar/pkg/clamav/trunk/files/CSWclamav.preremove 2008-12-10 20:10:10 UTC (rev 2513) @@ -1,27 +0,0 @@ -# clamav - preremove script -# -# Stop clamav if it is running. - -# Determine whether or not clamd and clamav-milter is running -haveclamd=no -haveclmilter=no - -if [ -f /opt/csw/etc/clamd ] || [ -f /etc/opt/csw/clamd ] ; then haveclamd=yes ; fi -if [ -f /opt/csw/etc/clamav-milter ] || [ -f /etc/opt/csw/clamav-milter ] ; then haveclmilter=yes ; fi - -# Determine whether or not SMF is available -smf=no -if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ] ; then smf=yes ; fi - - if [ $haveclamd=yes ] ; then - echo "Shutting down clamd" - if [ $smf = yes ] - then - # Disable service - /usr/sbin/svcadm disable -s svc:application/cswclamd:default >/dev/null 2>&1 - else - /etc/init.d/cswclamd stop >/dev/null 2>&1 - fi - fi - -exit 0 Modified: csw/mgar/pkg/clamav/trunk/files/CSWlibclamav.gspec =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWlibclamav.gspec 2008-12-10 19:51:28 UTC (rev 2512) +++ csw/mgar/pkg/clamav/trunk/files/CSWlibclamav.gspec 2008-12-10 20:10:10 UTC (rev 2513) @@ -3,5 +3,5 @@ %include url file://%{PKGLIB}/csw_dyndepend.gspec %copyright -Please see /opt/csw/share/doc/libclamav/copyright for license information. +Please see /opt/csw/share/doc/libclamav/LICENSE for license information. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Dec 10 23:34:47 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 10 Dec 2008 22:34:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[2514] csw/mgar/gar Message-ID: Revision: 2514 http://gar.svn.sourceforge.net/gar/?rev=2514&view=rev Author: wbonnet Date: 2008-12-10 22:34:46 +0000 (Wed, 10 Dec 2008) Log Message: ----------- Add more information to output Modified Paths: -------------- csw/mgar/gar/v1/gar.lib.mk csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v1/gar.lib.mk =================================================================== --- csw/mgar/gar/v1/gar.lib.mk 2008-12-10 20:10:10 UTC (rev 2513) +++ csw/mgar/gar/v1/gar.lib.mk 2008-12-10 22:34:46 UTC (rev 2514) @@ -116,16 +116,44 @@ check-upstream-and-mail: @if [ -n '$(FILES2CHECK)' ]; then \ NEW_FILES=""; \ + PACKAGE_UP_TO_DATE=0; \ for FILE in $(FILES2CHECK) ""; do \ [ -n "$$FILE" ] || continue; \ - if test -f $(COOKIEDIR)/checknew-$$FILE || echo $(DISTFILES) | grep -w $$FILE >/dev/null; then \ - : ; \ + if test -f $(COOKIEDIR)/checknew-$$FILE ; then \ + PACKAGE_UP_TO_DATE=1; \ else \ - NEW_FILES="$$FILE $$NEW_FILES"; \ + if echo $(DISTFILES) | grep -w $$FILE >/dev/null; then \ + PACKAGE_UP_TO_DATE=1; \ + echo "$(GARNAME) : Package is up-to-date. Current version is $$FILE" ; \ + else \ + NEW_FILES="$$FILE $$NEW_FILES"; \ + fi; \ fi; \ $(MAKE) checknew-$$FILE >/dev/null; \ done; \ if test -z "$$NEW_FILES" ; then \ + if [ ! -n '$(UFILES_REGEX)' ]; then \ + echo "$(GARNAME) : Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \ +# { echo ""; \ +# echo "Hello dear $(GARNAME) maintainer,"; \ +# echo ""; \ +# echo "The upstream notification job has detected that $(GARNAME) is not configured for automatic upstream file update detection."; \ +# echo ""; \ +# echo "Please consider updating your package. Documentation is available from this link : http://www.opencsw.org" ; \ +# echo ""; \ +# echo "---"; \ +# echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -b uwatch at opencsw.org -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ + else \ + if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ + echo "$(GARNAME) : Warning no files to check ! $(FILES2CHECK)" ; \ + echo "$(GARNAME) : UPSTREAM_MASTER_SITES is $(UPSTREAM_MASTER_SITES)" ; \ + echo "$(GARNAME) : DISTNAME is $(DISTNAME)" ; \ + echo "$(GARNAME) : UFILES_REGEX is : $(UFILES_REGEX)" ; \ + echo "$(GARNAME) : Please check configuration" ; \ + fi; \ + fi; \ + else \ + echo "$(GARNAME) : new upstream files available: $$NEW_FILES"; \ { echo ""; \ echo "Hello dear $(GARNAME) maintainer,"; \ echo ""; \ @@ -141,19 +169,7 @@ echo ""; \ echo "---"; \ echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -b uwatch at opencsw.org -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ - else \ -# if [ ! -n '$(UFILES_REGEX)' ]; then \ -# { echo ""; \ -# echo "Hello dear $(GARNAME) maintainer,"; \ -# echo ""; \ -# echo "The upstream notification job has detected that $(GARNAME) is not configured for automatic upstream file update detection."; \ -# echo ""; \ -# echo "Please consider updating your package. Documentation is available from this link : http://www.opencsw.org" ; \ -# echo ""; \ -# echo "---"; \ -# echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -b uwatch at opencsw.org -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ -# fi; \ - fi; \ + fi; \ fi check-upstream: Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2008-12-10 20:10:10 UTC (rev 2513) +++ csw/mgar/gar/v2/gar.lib.mk 2008-12-10 22:34:46 UTC (rev 2514) @@ -114,16 +114,44 @@ check-upstream-and-mail: @if [ -n '$(FILES2CHECK)' ]; then \ NEW_FILES=""; \ + PACKAGE_UP_TO_DATE=0; \ for FILE in $(FILES2CHECK) ""; do \ [ -n "$$FILE" ] || continue; \ - if test -f $(COOKIEDIR)/checknew-$$FILE || echo $(DISTFILES) | grep -w $$FILE >/dev/null; then \ - : ; \ + if test -f $(COOKIEDIR)/checknew-$$FILE ; then \ + PACKAGE_UP_TO_DATE=1; \ else \ - NEW_FILES="$$FILE $$NEW_FILES"; \ + if echo $(DISTFILES) | grep -w $$FILE >/dev/null; then \ + PACKAGE_UP_TO_DATE=1; \ + echo "$(GARNAME) : Package is up-to-date. Current version is $$FILE" ; \ + else \ + NEW_FILES="$$FILE $$NEW_FILES"; \ + fi; \ fi; \ $(MAKE) checknew-$$FILE >/dev/null; \ done; \ if test -z "$$NEW_FILES" ; then \ + if [ ! -n '$(UFILES_REGEX)' ]; then \ + echo "$(GARNAME) : Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \ +# { echo ""; \ +# echo "Hello dear $(GARNAME) maintainer,"; \ +# echo ""; \ +# echo "The upstream notification job has detected that $(GARNAME) is not configured for automatic upstream file update detection."; \ +# echo ""; \ +# echo "Please consider updating your package. Documentation is available from this link : http://www.opencsw.org" ; \ +# echo ""; \ +# echo "---"; \ +# echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -b uwatch at opencsw.org -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ + else \ + if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ + echo "$(GARNAME) : Warning no files to check ! $(FILES2CHECK)" ; \ + echo "$(GARNAME) : UPSTREAM_MASTER_SITES is $(UPSTREAM_MASTER_SITES)" ; \ + echo "$(GARNAME) : DISTNAME is $(DISTNAME)" ; \ + echo "$(GARNAME) : UFILES_REGEX is : $(UFILES_REGEX)" ; \ + echo "$(GARNAME) : Please check configuration" ; \ + fi; \ + fi; \ + else \ + echo "$(GARNAME) : new upstream files available: $$NEW_FILES"; \ { echo ""; \ echo "Hello dear $(GARNAME) maintainer,"; \ echo ""; \ @@ -139,21 +167,9 @@ echo ""; \ echo "---"; \ echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -b uwatch at opencsw.org -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ - else \ -# if [ ! -n '$(UFILES_REGEX)' ]; then \ -# { echo ""; \ -# echo "Hello dear $(GARNAME) maintainer,"; \ -# echo ""; \ -# echo "The upstream notification job has detected that $(GARNAME) is not configured for automatic upstream file update detection."; \ -# echo ""; \ -# echo "Please consider updating your package. Documentation is available from this link : http://www.opencsw.org" ; \ -# echo ""; \ -# echo "---"; \ -# echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -b uwatch at opencsw.org -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ -# fi; \ - fi; \ + fi; \ fi - + check-upstream: @if [ -n '$(FILES2CHECK)' ]; then \ NEW_FILES=""; \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Dec 10 23:56:06 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 10 Dec 2008 22:56:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[2515] csw/mgar/pkg/Makefile Message-ID: Revision: 2515 http://gar.svn.sourceforge.net/gar/?rev=2515&view=rev Author: wbonnet Date: 2008-12-10 22:56:06 +0000 (Wed, 10 Dec 2008) Log Message: ----------- Add the generation of the UFILES_REGEX in the Makefile Modified Paths: -------------- csw/mgar/pkg/Makefile Modified: csw/mgar/pkg/Makefile =================================================================== --- csw/mgar/pkg/Makefile 2008-12-10 22:34:46 UTC (rev 2514) +++ csw/mgar/pkg/Makefile 2008-12-10 22:56:06 UTC (rev 2515) @@ -53,28 +53,35 @@ newpkg-%: @svn mkdir $* $*/tags $*/branches $*/trunk $*/trunk/files - @(echo "GARNAME = package"; \ - echo "GARVERSION = 1.0"; \ - echo "CATEGORIES = category"; \ - echo ""; \ - echo "DESCRIPTION = Brief description"; \ - echo "define BLURB"; \ - echo " Long description"; \ - echo "endef"; \ - echo ""; \ - echo "MASTER_SITES = "; \ - echo "DISTFILES = $$(GARNAME)-$$(GARVERSION).tar.gz"; \ - echo "DISTFILES += $$(call admfiles,CSWpackage,)"; \ - echo ""; \ - echo "CONFIGURE_ARGS = $$(DIRPATHS)"; \ - echo ""; \ - echo "include gar/category.mk"; \ + @(echo "GARNAME = package"; \ + echo "GARVERSION = 1.0"; \ + echo "CATEGORIES = category"; \ + echo ""; \ + echo "DESCRIPTION = Brief description"; \ + echo "define BLURB"; \ + echo " Long description"; \ + echo "endef"; \ + echo ""; \ + echo "MASTER_SITES = "; \ + echo "DISTFILES = $$(GARNAME)-$$(GARVERSION).tar.gz"; \ + echo "DISTFILES += $$(call admfiles,CSWpackage,)"; \ + echo ""; \ + echo "# We define upstream file regex so we can be notifed of new upstream software release"; \ + echo "UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz"; \ + echo ""; \ + echo "# If the url used to check for software update is different of MASTER_SITES, then "; \ + echo "# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES"; \ + echo "# UPSTREAM_MASTER_SITES = "; \ + echo ""; \ + echo "CONFIGURE_ARGS = $$(DIRPATHS)"; \ + echo ""; \ + echo "include gar/category.mk"; \ ) > $*/trunk/Makefile @svn add $*/trunk/Makefile - @(echo "%var bitname package"; \ - echo "%var pkgname CSWpackage"; \ - echo "%include url file://%{PKGLIB}/csw_dyndepend.gspec";\ - echo "%copyright url file://%{WORKSRC}/LICENSE"; \ + @(echo "%var bitname package"; \ + echo "%var pkgname CSWpackage"; \ + echo "%include url file://%{PKGLIB}/csw_dyndepend.gspec"; \ + echo "%copyright url file://%{WORKSRC}/LICENSE"; \ ) > $*/trunk/files/CSWpackage.gspec @echo "cookies\ndownload\nwork\n" | svn propset svn:ignore -F /dev/fd/0 $*/trunk @echo "gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1" | svn propset svn:externals -F /dev/fd/0 $*/trunk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 11 00:05:57 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 10 Dec 2008 23:05:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[2516] csw/mgar/gar Message-ID: Revision: 2516 http://gar.svn.sourceforge.net/gar/?rev=2516&view=rev Author: wbonnet Date: 2008-12-10 23:05:56 +0000 (Wed, 10 Dec 2008) Log Message: ----------- Make the script be a bit more polite :) Modified Paths: -------------- csw/mgar/gar/v1/gar.lib.mk csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v1/gar.lib.mk =================================================================== --- csw/mgar/gar/v1/gar.lib.mk 2008-12-10 22:56:06 UTC (rev 2515) +++ csw/mgar/gar/v1/gar.lib.mk 2008-12-10 23:05:56 UTC (rev 2516) @@ -141,8 +141,9 @@ # echo ""; \ # echo "Please consider updating your package. Documentation is available from this link : http://www.opencsw.org" ; \ # echo ""; \ -# echo "---"; \ -# echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -b uwatch at opencsw.org -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ +# echo "--"; \ +# echo "Kindest regards"; \ +# echo "The upstream notification job"; } | $(GARBIN)/mail2maintainer -b uwatch at opencsw.org -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ else \ if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ echo "$(GARNAME) : Warning no files to check ! $(FILES2CHECK)" ; \ @@ -167,8 +168,9 @@ echo ""; \ echo "Please consider updating your package." ; \ echo ""; \ - echo "---"; \ - echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -b uwatch at opencsw.org -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ + echo "--"; \ + echo "Kindest regards"; \ + echo "The upstream notification job"; } | $(GARBIN)/mail2maintainer -b uwatch at opencsw.org -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ fi; \ fi Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2008-12-10 22:56:06 UTC (rev 2515) +++ csw/mgar/gar/v2/gar.lib.mk 2008-12-10 23:05:56 UTC (rev 2516) @@ -139,7 +139,8 @@ # echo ""; \ # echo "Please consider updating your package. Documentation is available from this link : http://www.opencsw.org" ; \ # echo ""; \ -# echo "---"; \ +# echo "--"; \ +# echo "Kindest regards"; \ # echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -b uwatch at opencsw.org -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ else \ if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ @@ -165,7 +166,8 @@ echo ""; \ echo "Please consider updating your package." ; \ echo ""; \ - echo "---"; \ + echo "--"; \ + echo "Kindest regards"; \ echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -b uwatch at opencsw.org -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ fi; \ fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 11 00:21:23 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 10 Dec 2008 23:21:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[2517] csw/mgar/gar Message-ID: Revision: 2517 http://gar.svn.sourceforge.net/gar/?rev=2517&view=rev Author: wbonnet Date: 2008-12-10 23:21:23 +0000 (Wed, 10 Dec 2008) Log Message: ----------- Add William Bonnet email in bcc of the reminder. It will be used at beginning to track errors Modified Paths: -------------- csw/mgar/gar/v1/bin/mail2maintainer csw/mgar/gar/v1/gar.lib.mk csw/mgar/gar/v2/bin/mail2maintainer csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v1/bin/mail2maintainer =================================================================== --- csw/mgar/gar/v1/bin/mail2maintainer 2008-12-10 23:05:56 UTC (rev 2516) +++ csw/mgar/gar/v1/bin/mail2maintainer 2008-12-10 23:21:23 UTC (rev 2517) @@ -62,5 +62,5 @@ shift done -eval mailx $MAIL_OPTIONS $EMAIL +eval mailx $MAIL_OPTIONS -b "william at wbonnet.net" $EMAIL Modified: csw/mgar/gar/v1/gar.lib.mk =================================================================== --- csw/mgar/gar/v1/gar.lib.mk 2008-12-10 23:05:56 UTC (rev 2516) +++ csw/mgar/gar/v1/gar.lib.mk 2008-12-10 23:21:23 UTC (rev 2517) @@ -143,7 +143,7 @@ # echo ""; \ # echo "--"; \ # echo "Kindest regards"; \ -# echo "The upstream notification job"; } | $(GARBIN)/mail2maintainer -b uwatch at opencsw.org -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ +# echo "The upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ else \ if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ echo "$(GARNAME) : Warning no files to check ! $(FILES2CHECK)" ; \ @@ -170,7 +170,7 @@ echo ""; \ echo "--"; \ echo "Kindest regards"; \ - echo "The upstream notification job"; } | $(GARBIN)/mail2maintainer -b uwatch at opencsw.org -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ + echo "The upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ fi; \ fi Modified: csw/mgar/gar/v2/bin/mail2maintainer =================================================================== --- csw/mgar/gar/v2/bin/mail2maintainer 2008-12-10 23:05:56 UTC (rev 2516) +++ csw/mgar/gar/v2/bin/mail2maintainer 2008-12-10 23:21:23 UTC (rev 2517) @@ -62,5 +62,5 @@ shift done -eval mailx $MAIL_OPTIONS $EMAIL +eval mailx $MAIL_OPTIONS -b "william at wbonnet.net" $EMAIL Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2008-12-10 23:05:56 UTC (rev 2516) +++ csw/mgar/gar/v2/gar.lib.mk 2008-12-10 23:21:23 UTC (rev 2517) @@ -141,7 +141,7 @@ # echo ""; \ # echo "--"; \ # echo "Kindest regards"; \ -# echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -b uwatch at opencsw.org -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ +# echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ else \ if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ echo "$(GARNAME) : Warning no files to check ! $(FILES2CHECK)" ; \ @@ -168,7 +168,7 @@ echo ""; \ echo "--"; \ echo "Kindest regards"; \ - echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -b uwatch at opencsw.org -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ + echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ fi; \ fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 11 00:34:42 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 10 Dec 2008 23:34:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[2518] csw/mgar/pkg/x11/ Message-ID: Revision: 2518 http://gar.svn.sourceforge.net/gar/?rev=2518&view=rev Author: wbonnet Date: 2008-12-10 23:34:42 +0000 (Wed, 10 Dec 2008) Log Message: ----------- Create directory for Xorg X11 components Added Paths: ----------- csw/mgar/pkg/x11/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 11 00:37:29 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 10 Dec 2008 23:37:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[2519] csw/mgar/pkg/x11/libX11/ Message-ID: Revision: 2519 http://gar.svn.sourceforge.net/gar/?rev=2519&view=rev Author: wbonnet Date: 2008-12-10 23:37:29 +0000 (Wed, 10 Dec 2008) Log Message: ----------- Move libX11 to x11 Added Paths: ----------- csw/mgar/pkg/x11/libX11/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 11 00:42:02 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 10 Dec 2008 23:42:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[2520] csw/mgar/pkg/libX11/ Message-ID: Revision: 2520 http://gar.svn.sourceforge.net/gar/?rev=2520&view=rev Author: wbonnet Date: 2008-12-10 23:42:01 +0000 (Wed, 10 Dec 2008) Log Message: ----------- Move libX11 to x11 subdir Removed Paths: ------------- csw/mgar/pkg/libX11/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 11 00:45:44 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 10 Dec 2008 23:45:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[2521] csw/mgar/pkg Message-ID: Revision: 2521 http://gar.svn.sourceforge.net/gar/?rev=2521&view=rev Author: wbonnet Date: 2008-12-10 23:45:44 +0000 (Wed, 10 Dec 2008) Log Message: ----------- Add UFILE_REGEX generation to xfce and cpan makefile Modified Paths: -------------- csw/mgar/pkg/cpan/Makefile csw/mgar/pkg/xfce/Makefile Modified: csw/mgar/pkg/cpan/Makefile =================================================================== --- csw/mgar/pkg/cpan/Makefile 2008-12-10 23:42:01 UTC (rev 2520) +++ csw/mgar/pkg/cpan/Makefile 2008-12-10 23:45:44 UTC (rev 2521) @@ -36,6 +36,13 @@ echo "MASTER_SITES = "; \ echo "DISTFILES = $$(GARNAME)-$$(GARVERSION).tar.gz"; \ echo "DISTFILES += $$(call admfiles,CSWpackage,)"; \ + echo ""; \ + echo "# We define upstream file regex so we can be notifed of new upstream software release"; \ + echo "UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz"; \ + echo ""; \ + echo "# If the url used to check for software update is different of MASTER_SITES, then "; \ + echo "# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES"; \ + echo "# UPSTREAM_MASTER_SITES = "; \ echo ""; \ echo "CONFIGURE_ARGS = $$(DIRPATHS)"; \ echo ""; \ Modified: csw/mgar/pkg/xfce/Makefile =================================================================== --- csw/mgar/pkg/xfce/Makefile 2008-12-10 23:42:01 UTC (rev 2520) +++ csw/mgar/pkg/xfce/Makefile 2008-12-10 23:45:44 UTC (rev 2521) @@ -36,6 +36,13 @@ echo "MASTER_SITES = "; \ echo "DISTFILES = $$(GARNAME)-$$(GARVERSION).tar.gz"; \ echo "DISTFILES += $$(call admfiles,CSWpackage,)"; \ + echo ""; \ + echo "# We define upstream file regex so we can be notifed of new upstream software release"; \ + echo "UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz"; \ + echo ""; \ + echo "# If the url used to check for software update is different of MASTER_SITES, then "; \ + echo "# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES"; \ + echo "# UPSTREAM_MASTER_SITES = "; \ echo ""; \ echo "CONFIGURE_ARGS = $$(DIRPATHS)"; \ echo ""; \ 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 Dec 11 08:15:13 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Dec 2008 07:15:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[2522] csw/mgar/pkg/pca/trunk/Makefile Message-ID: Revision: 2522 http://gar.svn.sourceforge.net/gar/?rev=2522&view=rev Author: dmichelsen Date: 2008-12-11 07:15:12 +0000 (Thu, 11 Dec 2008) Log Message: ----------- pca: Fix upstream watch version regex Modified Paths: -------------- csw/mgar/pkg/pca/trunk/Makefile Modified: csw/mgar/pkg/pca/trunk/Makefile =================================================================== --- csw/mgar/pkg/pca/trunk/Makefile 2008-12-10 23:45:44 UTC (rev 2521) +++ csw/mgar/pkg/pca/trunk/Makefile 2008-12-11 07:15:12 UTC (rev 2522) @@ -18,7 +18,7 @@ DISTFILES += $(call admfiles,CSWpca) # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*) +UFILES_REGEX = $(GARNAME)-(\d{8}-\d{2}) WORKSRC = $(WORKDIR) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvel at opencsw.org Thu Dec 11 08:51:55 2008 From: trygvel at opencsw.org (=?ISO-8859-1?Q?Trygve_Laugst=F8l?=) Date: Thu, 11 Dec 2008 08:51:55 +0100 Subject: [csw-devel] [Fwd: [svn] mercurial upstream update notification] Message-ID: <4940C69B.8040204@opencsw.org> Wow, this is great! Are you recording the data somewhere? I would like to create (yet) another RSS feed on the dev.opencsw.org page :) -- Trygve -------- Original Message -------- Subject: [svn] mercurial upstream update notification Date: Thu, 11 Dec 2008 05:27:26 +0100 (CET) From: Upstream Package Watch To: trygvel at opencsw.org Hello dear mercurial maintainer, The upstream notification job has detected the availability of new files for mercurial. The following upstream file(s): mercurial-1.1.tar.gz is/are available at the following url(s): http://www.selenic.com/mercurial/release Please consider updating your package. -- Kindest regards The upstream notification job From bonivart at users.sourceforge.net Thu Dec 11 10:05:46 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 11 Dec 2008 09:05:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[2523] csw/mgar/pkg/clamav/trunk Message-ID: Revision: 2523 http://gar.svn.sourceforge.net/gar/?rev=2523&view=rev Author: bonivart Date: 2008-12-11 09:05:46 +0000 (Thu, 11 Dec 2008) Log Message: ----------- clamav: fixed ownership issues, removed postinstall Modified Paths: -------------- csw/mgar/pkg/clamav/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/clamav/trunk/files/CSWclamav.postinstall Modified: csw/mgar/pkg/clamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamav/trunk/Makefile 2008-12-11 07:15:12 UTC (rev 2522) +++ csw/mgar/pkg/clamav/trunk/Makefile 2008-12-11 09:05:46 UTC (rev 2523) @@ -19,13 +19,13 @@ SF_PROJ = clamav MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWclamav,checkinstall preinstall postinstall) +DISTFILES += $(call admfiles,CSWclamav,checkinstall preinstall) DISTFILES += $(call admfiles,CSWlibclamav,) SPKG_DESC_CSWclamav = Clam AntiVirus SPKG_DESC_CSWlibclamav = Clam AntiVirus Library -REQUIRED_PKGS_CSWclamav = CSWlibclamav CSWlibgmp CSWzlib CSWbzip2 CSWiconv CSWcswclassutils +REQUIRED_PKGS_CSWclamav = CSWlibclamav CSWlibgmp CSWzlib CSWbzip2 CSWiconv CSWcswclassutils CSWtcpwrap REQUIRED_PKGS_CSWlibclamav = CSWlibgmp CSWzlib CSWbzip2 CSWiconv # We define upstream file regex so we can be notifed of new upstream software release @@ -45,7 +45,7 @@ PKGFILES_CSWlibclamav = $(libdir)/.* PKGFILES_CSWlibclamav += $(includedir)/.* -PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswclamd$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/init.d\/cswclamav-milter$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/clamd.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } $$$$3 ~ /\/freshclam.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } { print }' +PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswclamd$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/init.d\/cswclamav-milter$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/clamd.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } $$$$3 ~ /\/freshclam.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } $$$$3 ~ /\/var\/opt\/csw\/clamav/ { $$$$5 = "clamav" } { print }' SPKG_SOURCEURL = http://www.clamav.net/ Deleted: csw/mgar/pkg/clamav/trunk/files/CSWclamav.postinstall =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWclamav.postinstall 2008-12-11 07:15:12 UTC (rev 2522) +++ csw/mgar/pkg/clamav/trunk/files/CSWclamav.postinstall 2008-12-11 09:05:46 UTC (rev 2523) @@ -1,15 +0,0 @@ -# Postinstall script for clamav -# 2007-01-07 Add csw.conf support -# 2008-12-10 Peter Bonivart - -# if /opt/csw/etc/clamav.conf exists, move it to /opt/csw/etc/clamd.conf -if [ -f /opt/csw/etc/clamav.conf ]; then - /usr/bin/mv /opt/csw/etc/clamav.conf /opt/csw/etc/clamd.conf - echo ' Moved /opt/csw/etc/clamav.conf to /opt/csw/etc/clamd.conf' -fi - -# assign user for /var/opt/csw/clamav directory -chown -R clamav /var/opt/csw/clamav - -# display message -echo '*** See README.CSW in /opt/csw/share/doc/clamav for changes.**' 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 Dec 11 11:10:23 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Dec 2008 10:10:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[2524] csw/mgar/pkg/readline/trunk Message-ID: Revision: 2524 http://gar.svn.sourceforge.net/gar/?rev=2524&view=rev Author: dmichelsen Date: 2008-12-11 10:10:23 +0000 (Thu, 11 Dec 2008) Log Message: ----------- readline: Update to 5.2 and mGAR v2 Modified Paths: -------------- csw/mgar/pkg/readline/trunk/Makefile csw/mgar/pkg/readline/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/readline/trunk/ Property changes on: csw/mgar/pkg/readline/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/readline/trunk/Makefile =================================================================== --- csw/mgar/pkg/readline/trunk/Makefile 2008-12-11 09:05:46 UTC (rev 2523) +++ csw/mgar/pkg/readline/trunk/Makefile 2008-12-11 10:10:23 UTC (rev 2524) @@ -1,5 +1,5 @@ GARNAME = readline -GARVERSION = 4.3 +GARVERSION = 5.2 CATEGORIES = lib DESCRIPTION = GNU readline @@ -19,7 +19,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -LIBDEPS += lib/ncurses +BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-curses Modified: csw/mgar/pkg/readline/trunk/checksums =================================================================== --- csw/mgar/pkg/readline/trunk/checksums 2008-12-11 09:05:46 UTC (rev 2523) +++ csw/mgar/pkg/readline/trunk/checksums 2008-12-11 10:10:23 UTC (rev 2524) @@ -1,2 +1,2 @@ -f86f7cb717ab321fe15f1bbcb058c11e download/readline-4.3.tar.gz +e39331f32ad14009b9ff49cc10c5e751 download/readline-5.2.tar.gz ece4ee7c84df61c627f7bb07db207f59 download/CSWreadline.gspec 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 Dec 11 11:10:55 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Dec 2008 10:10:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[2525] csw/mgar/pkg/pcre/trunk Message-ID: Revision: 2525 http://gar.svn.sourceforge.net/gar/?rev=2525&view=rev Author: dmichelsen Date: 2008-12-11 10:10:54 +0000 (Thu, 11 Dec 2008) Log Message: ----------- pcre: Update to 7.8 and mGAR v2 Modified Paths: -------------- csw/mgar/pkg/pcre/trunk/Makefile csw/mgar/pkg/pcre/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/pcre/trunk/ Property changes on: csw/mgar/pkg/pcre/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/pcre/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcre/trunk/Makefile 2008-12-11 10:10:23 UTC (rev 2524) +++ csw/mgar/pkg/pcre/trunk/Makefile 2008-12-11 10:10:54 UTC (rev 2525) @@ -1,5 +1,5 @@ GARNAME = pcre -GARVERSION = 7.6 +GARVERSION = 7.8 CATEGORIES = lib DESCRIPTION = Perl-compatible regular expression tools @@ -15,9 +15,13 @@ DISTFILES += $(call admfiles,CSWpcrert,depend prototype) DISTFILES += $(call admfiles,CSWpcre,depend prototype) +PREREQUISITE_PKGS = CSWgnulinks + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +BUILD64 = 1 + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-unicode-properties CONFIGURE_ARGS += --enable-pcregrep-libz Modified: csw/mgar/pkg/pcre/trunk/checksums =================================================================== --- csw/mgar/pkg/pcre/trunk/checksums 2008-12-11 10:10:23 UTC (rev 2524) +++ csw/mgar/pkg/pcre/trunk/checksums 2008-12-11 10:10:54 UTC (rev 2525) @@ -1,4 +1,4 @@ -b94cce871f70734c2dfc47b52a3aa670 download/pcre-7.6.tar.gz +32fd7c7863b871d408d730e6ffa4aa71 download/pcre-7.8.tar.gz fa208f4292d0102dc5e87d81bed54af9 download/CSWpcrert.gspec b6471d1f8f8b32660529a389fa73bbf3 download/CSWpcrert.depend 99f231131bab4cb4c8dea955c6cd1236 download/CSWpcrert.prototype This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Thu Dec 11 11:15:28 2008 From: dam at opencsw.org (Dagobert Michelsen) Date: Thu, 11 Dec 2008 11:15:28 +0100 Subject: [csw-devel] [Fwd: [svn] mercurial upstream update notification] In-Reply-To: <4940C69B.8040204@opencsw.org> References: <4940C69B.8040204@opencsw.org> Message-ID: <802D1C8A-1E84-4EEA-95BD-2C3A4AFB9A3B@opencsw.org> Hi, Am 11.12.2008 um 08:51 schrieb Trygve Laugst?l: > Wow, this is great! Yesss!!1!! William, how about taking trunk, copying to branches/autoupdate-, rewrite GARVERSION and commit it? Trygve, then Hudson could pick this up automatically and build packages. I am aware that this doesn't in case of major upgrades, but on most packages it would help being real current. Best regards -- Dago From dmichelsen at users.sourceforge.net Thu Dec 11 11:41:18 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Dec 2008 10:41:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[2526] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 2526 http://gar.svn.sourceforge.net/gar/?rev=2526&view=rev Author: dmichelsen Date: 2008-12-11 10:41:13 +0000 (Thu, 11 Dec 2008) Log Message: ----------- mGAR v2: Merge [2453] SVN revision in PSTAMP Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2008-12-11 10:10:54 UTC (rev 2525) +++ csw/mgar/gar/v2/gar.pkg.mk 2008-12-11 10:41:13 UTC (rev 2526) @@ -18,6 +18,17 @@ SPKG_SPECS ?= $(basename $(filter %.gspec,$(DISTFILES))) _PKG_SPECS = $(filter-out $(NOPACKAGE),$(SPKG_SPECS)) +# We have to deal with four cases here: +# 1. There is no svn binary -> NOSVN +# 2. There is a svn binary, but the directory does not belong to a repository -> NOTVERSIONED +# 3. There is a svn binary, but not everything was committed properly -> UNCOMMITTED +# 4. There is a svn binary and everything was committed -> r + +# Calculating the revision can be time consuming, so we do this on demand +define _REVISION +$(if $(shell if test -x $(SVN); then echo yes; fi),$(if $(shell $(SVN) info >/dev/null 2>&1; if test $$? -eq 0; then echo YES; fi),$(if $(shell $(SVN) status --ignore-externals 2>/dev/null | grep -v '^X'),UNCOMMITTED,$(shell $(SVN) info --recursive 2>/dev/null | $(GAWK) '$$1 == "Revision:" && MAX < $$2 { MAX = $$2 } END {print "r" MAX }')),NOTVERSIONED),NOSVN) +endef + SPKG_DESC ?= $(DESCRIPTION) SPKG_VERSION ?= $(GARVERSION) SPKG_CATEGORY ?= application @@ -25,7 +36,7 @@ SPKG_PACKAGER ?= Unknown SPKG_VENDOR ?= $(SPKG_SOURCEURL) packaged for CSW by $(SPKG_PACKAGER) SPKG_EMAIL ?= Unknown -SPKG_PSTAMP ?= $(LOGNAME)@$(shell hostname)-$(shell date '+%Y%m%d%H%M%S') +SPKG_PSTAMP ?= $(LOGNAME)@$(shell hostname)-$(call _REVISION)-$(shell date '+%Y%m%d%H%M%S') SPKG_BASEDIR ?= $(prefix) SPKG_CLASSES ?= none SPKG_OSNAME ?= $(shell uname -s)$(shell uname -r) 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 Dec 11 11:56:20 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Dec 2008 10:56:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[2527] csw/mgar/pkg/readline/trunk Message-ID: Revision: 2527 http://gar.svn.sourceforge.net/gar/?rev=2527&view=rev Author: dmichelsen Date: 2008-12-11 10:56:20 +0000 (Thu, 11 Dec 2008) Log Message: ----------- readline: Small linker fix Modified Paths: -------------- csw/mgar/pkg/readline/trunk/Makefile csw/mgar/pkg/readline/trunk/checksums csw/mgar/pkg/readline/trunk/files/CSWreadline.gspec Modified: csw/mgar/pkg/readline/trunk/Makefile =================================================================== --- csw/mgar/pkg/readline/trunk/Makefile 2008-12-11 10:41:13 UTC (rev 2526) +++ csw/mgar/pkg/readline/trunk/Makefile 2008-12-11 10:56:20 UTC (rev 2527) @@ -31,3 +31,5 @@ post-install: @chmod 555 $(DESTDIR)$(libdir)/libhistory.* @chmod 555 $(DESTDIR)$(libdir)/libreadline.* + +LDFLAGS := $(filter-out -xarch=%,$(filter-out -m%,$(LDFLAGS))) Modified: csw/mgar/pkg/readline/trunk/checksums =================================================================== --- csw/mgar/pkg/readline/trunk/checksums 2008-12-11 10:41:13 UTC (rev 2526) +++ csw/mgar/pkg/readline/trunk/checksums 2008-12-11 10:56:20 UTC (rev 2527) @@ -1,2 +1,2 @@ e39331f32ad14009b9ff49cc10c5e751 download/readline-5.2.tar.gz -ece4ee7c84df61c627f7bb07db207f59 download/CSWreadline.gspec +9bb3360c0c8331df8143c7b8eac3ad5f download/CSWreadline.gspec Modified: csw/mgar/pkg/readline/trunk/files/CSWreadline.gspec =================================================================== --- csw/mgar/pkg/readline/trunk/files/CSWreadline.gspec 2008-12-11 10:41:13 UTC (rev 2526) +++ csw/mgar/pkg/readline/trunk/files/CSWreadline.gspec 2008-12-11 10:56:20 UTC (rev 2527) @@ -1,4 +1,4 @@ %var bitname readline %var pkgname CSWreadline %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYRIGHT +%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 dam at opencsw.org Thu Dec 11 12:02:36 2008 From: dam at opencsw.org (Dagobert Michelsen) Date: Thu, 11 Dec 2008 12:02:36 +0100 Subject: [csw-devel] FYI: Sun Studio 11 patched Message-ID: Hi, I just installed the latest Sun Studio 11 patches 121017-17 Sun Studio 11: Patch for Sun C++ 5.8 compiler 121018-17 Sun Studio 11_x86: Patch for Sun C++ 5.8 compiler Best regards -- Dago From william at wbonnet.net Thu Dec 11 12:02:34 2008 From: william at wbonnet.net (William Bonnet) Date: Thu, 11 Dec 2008 12:02:34 +0100 Subject: [csw-devel] [Fwd: [svn] mercurial upstream update notification] In-Reply-To: <4940C69B.8040204@opencsw.org> References: <4940C69B.8040204@opencsw.org> Message-ID: <4940F34A.5020306@wbonnet.net> Hi Trygve > Wow, this is great! > Thanks :) > Are you recording the data somewhere? I would like to create (yet) > another RSS feed on the dev.opencsw.org page :) > Acually i am in bcc of all sent emails. Mainly for debugging purpose ;) At the beginning i was thinking of adding a technical account in copy (let's say the account used to send the email). But i think it is better to have : . Information stored in mantis (new bug entry) . Information stored in a mysql databse (which i am creating right now) From the database, we can pull a rss feed. I still have a few bug to fix in this script. For instance about a hundred of email were not sent, mainy perl modules. This hapened because of a difference between names between gar and package list from the web site (sorry for your mail server Ihsan...). I'll fix this one tonight or tomorrow. I also have some url to fix in order to be able to find the upstream sources (don't worry i am the only to receive these errors). And last but not least, i have to write a documentation for the maintainers to help them setting the upstream regexp and sources Once fixed (at least let say 80% of url), i'll rewrite the script to insert information in the database. It should occur during Xmas break. Trygve, i'll send you the database model before Xmas, and some test data. So you'll be able to create this rss feed. Cheers, > -- > Trygve > > -------- Original Message -------- > Subject: [svn] mercurial upstream update notification > Date: Thu, 11 Dec 2008 05:27:26 +0100 (CET) > From: Upstream Package Watch > To: trygvel at opencsw.org > > > Hello dear mercurial maintainer, > > The upstream notification job has detected the availability of new files > for mercurial. > > The following upstream file(s): > mercurial-1.1.tar.gz > > is/are available at the following url(s): > http://www.selenic.com/mercurial/release > > Please consider updating your package. > > -- > Kindest regards > The upstream notification job > _______________________________________________ > devel mailing list > devel at lists.opencsw.org > https://lists.opencsw.org/mailman/listinfo/devel > From dmichelsen at users.sourceforge.net Thu Dec 11 12:32:11 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Dec 2008 11:32:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[2528] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 2528 http://gar.svn.sourceforge.net/gar/?rev=2528&view=rev Author: dmichelsen Date: 2008-12-11 11:32:11 +0000 (Thu, 11 Dec 2008) Log Message: ----------- mGAR v2: Fix defined for revision in PSTAMP Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2008-12-11 10:56:20 UTC (rev 2527) +++ csw/mgar/gar/v2/gar.pkg.mk 2008-12-11 11:32:11 UTC (rev 2528) @@ -18,6 +18,10 @@ SPKG_SPECS ?= $(basename $(filter %.gspec,$(DISTFILES))) _PKG_SPECS = $(filter-out $(NOPACKAGE),$(SPKG_SPECS)) +# Set this to your svn binary +SVN ?= /opt/csw/bin/svn +GAWK ?= /opt/csw/bin/gawk + # We have to deal with four cases here: # 1. There is no svn binary -> NOSVN # 2. There is a svn binary, but the directory does not belong to a repository -> NOTVERSIONED 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 Dec 11 12:32:42 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Dec 2008 11:32:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[2529] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 2529 http://gar.svn.sourceforge.net/gar/?rev=2529&view=rev Author: dmichelsen Date: 2008-12-11 11:32:42 +0000 (Thu, 11 Dec 2008) Log Message: ----------- mGAR v2: Add dependency to CSWisaexec only if it is actually used Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2008-12-11 11:32:11 UTC (rev 2528) +++ csw/mgar/gar/v2/gar.mk 2008-12-11 11:32:42 UTC (rev 2529) @@ -499,7 +499,6 @@ MERGE_DIRS_isa-$(ISA) ?= $(bindir) $(sbindir) $(libexecdir) $(libdir) MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= copy-relocate $(EXTRA_MERGE_SCRIPTS_isa-$(ISA)) $(EXTRA_MERGE_SCRIPTS) MERGE_SCRIPTS_isa-$(ISA) ?= copy-relocated-only $(EXTRA_MERGE_SCRIPTS_isa-$(ISA)) $(EXTRA_MERGE_SCRIPTS) -_EXTRA_GAR_PKGS += CSWisaexec endif # These directories get relocated into their ISA subdirectories @@ -513,6 +512,10 @@ if test -f "$$F"; then echo $$F; fi; \ done)),) +ifneq ($(ISAEXEC_FILES),) +_EXTRA_GAR_PKGS += CSWisaexec +endif + # These files get relocated. # MERGE_DIRS is expanded to individual files here. All further # processing is done using these files. 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 Dec 11 12:54:08 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Dec 2008 11:54:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[2530] csw/mgar/pkg/readline/trunk Message-ID: Revision: 2530 http://gar.svn.sourceforge.net/gar/?rev=2530&view=rev Author: dmichelsen Date: 2008-12-11 11:54:08 +0000 (Thu, 11 Dec 2008) Log Message: ----------- readline: Add legacy version 4.3 as shared lib Modified Paths: -------------- csw/mgar/pkg/readline/trunk/Makefile csw/mgar/pkg/readline/trunk/checksums Modified: csw/mgar/pkg/readline/trunk/Makefile =================================================================== --- csw/mgar/pkg/readline/trunk/Makefile 2008-12-11 11:32:42 UTC (rev 2529) +++ csw/mgar/pkg/readline/trunk/Makefile 2008-12-11 11:54:08 UTC (rev 2530) @@ -2,6 +2,9 @@ GARVERSION = 5.2 CATEGORIES = lib +EXTRA_MODULATORS = GARVERSION +MODULATIONS_GARVERSION = 4.3 5.2 + DESCRIPTION = GNU readline define BLURB The Readline library provides a set of functions for use by applications @@ -13,7 +16,7 @@ endef MASTER_SITES = $(GNU_MIRROR) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(foreach V,$(MODULATIONS_GARVERSION),$(GARNAME)-$(V).tar.gz) DISTFILES += $(call admfiles,CSWreadline,) # We define upstream file regex so we can be notifed of new upstream software release @@ -26,6 +29,24 @@ TEST_TARGET = check +MERGE_SCRIPTS_isa-i386-garversion-4.3 = copy-only +MERGE_DIRS_isa-i386-garversion-4.3 = $(libdir) +MERGE_SCRIPTS_isa-amd64-garversion-4.3 = copy-relocated-only +MERGE_DIRS_isa-amd64-garversion-4.3 = $(libdir) + +MERGE_SCRIPTS_isa-i386-garversion-5.2 = copy-all +MERGE_SCRIPTS_isa-amd64-garversion-5.2 = copy-relocated-only +MERGE_DIRS_isa-amd64-garversion-5.2 = $(bindir) $(sbindir) $(libexecdir) $(libdir) + +MERGE_SCRIPTS_isa-sparcv8-garversion-4.3 = copy-only +MERGE_DIRS_isa-sparcv8-garversion-4.3 = $(libdir) +MERGE_SCRIPTS_isa-sparcv9-garversion-4.3 = copy-relocated-only +MERGE_DIRS_isa-sparcv9-garversion-4.3 = $(libdir) + +MERGE_SCRIPTS_isa-sparcv8-garversion-5.2 = copy-all +MERGE_SCRIPTS_isa-sparcv9-garversion-5.2 = copy-relocated-only +MERGE_DIRS_isa-sparcv9-garversion-5.2 = $(bindir) $(sbindir) $(libexecdir) $(libdir) + include gar/category.mk post-install: Modified: csw/mgar/pkg/readline/trunk/checksums =================================================================== --- csw/mgar/pkg/readline/trunk/checksums 2008-12-11 11:32:42 UTC (rev 2529) +++ csw/mgar/pkg/readline/trunk/checksums 2008-12-11 11:54:08 UTC (rev 2530) @@ -1,2 +1,3 @@ +f86f7cb717ab321fe15f1bbcb058c11e download/readline-4.3.tar.gz e39331f32ad14009b9ff49cc10c5e751 download/readline-5.2.tar.gz 9bb3360c0c8331df8143c7b8eac3ad5f download/CSWreadline.gspec 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 Dec 11 14:03:11 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Dec 2008 13:03:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[2531] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 2531 http://gar.svn.sourceforge.net/gar/?rev=2531&view=rev Author: dmichelsen Date: 2008-12-11 13:03:11 +0000 (Thu, 11 Dec 2008) Log Message: ----------- mGAR v2: Runpath now optional with NORUNPATH=1 Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2008-12-11 11:54:08 UTC (rev 2530) +++ csw/mgar/gar/v2/gar.conf.mk 2008-12-11 13:03:11 UTC (rev 2531) @@ -413,9 +413,13 @@ # however not expanded during compilation, so linker-pathes must directly be accessible # without expansion and needs to be differentiated between 32 and 64 bit, therefore # the links 32 and 64. +ifndef NORUNPATH +_ADD_RUNPATH = 1 +endif + ifeq ($(origin LINKER_FLAGS), undefined) ifdef NOISALIST -LINKER_FLAGS = $(foreach ELIB,$(libdir_install) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR)) -R$(abspath $(ELIB)/$(MM_LIBDIR))) +LINKER_FLAGS = $(foreach ELIB,$(libdir_install) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR))$(if $(_ADD_RUNPATH), -R$(abspath $(ELIB)/$(MM_LIBDIR)))) else # If we use $ISALIST it is a good idea to also add $MM_LIBDIR as there # may not be a subdirectory for the 32-bit standard case (this would normally @@ -424,9 +428,15 @@ # The quoting of $ISALIST is unfortunately dependend on how often the linker flags # are expanded until execution. The definition here is suitable for autotools. # For other buildtools it may be suitable to add definitions with other quotings. -LINKER_FLAGS = $(foreach ELIB,$(libdir_install) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR)) -R$(ELIB)/\\\\\\\$$\$$ISALIST -R$(abspath $(ELIB)/$(MM_LIBDIR))) +RUNPATHQUOTE ?= 2 +ifeq ($(RUNPATHQUOTE),1) + _Q = \\\$$\$$ +else + _Q = \\\\\\\$$\$$ endif +LINKER_FLAGS = $(foreach ELIB,$(libdir_install) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR))$(if $(_ADD_RUNPATH), -R$(ELIB)/$(_Q)ISALIST -R$(abspath $(ELIB)/$(MM_LIBDIR)))) endif +endif CC_HOME = $($(GARCOMPILER)_CC_HOME) CC = $($(GARCOMPILER)_CC) 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 Dec 11 14:03:46 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Dec 2008 13:03:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[2532] csw/mgar/pkg/readline/trunk/Makefile Message-ID: Revision: 2532 http://gar.svn.sourceforge.net/gar/?rev=2532&view=rev Author: dmichelsen Date: 2008-12-11 13:03:45 +0000 (Thu, 11 Dec 2008) Log Message: ----------- readline: Don't set runpath in shared library Modified Paths: -------------- csw/mgar/pkg/readline/trunk/Makefile Modified: csw/mgar/pkg/readline/trunk/Makefile =================================================================== --- csw/mgar/pkg/readline/trunk/Makefile 2008-12-11 13:03:11 UTC (rev 2531) +++ csw/mgar/pkg/readline/trunk/Makefile 2008-12-11 13:03:45 UTC (rev 2532) @@ -24,6 +24,8 @@ BUILD64 = 1 +NORUNPATH = 1 + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-curses 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 Dec 11 14:47:58 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Dec 2008 13:47:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[2533] csw/mgar/pkg/msmtp/trunk Message-ID: Revision: 2533 http://gar.svn.sourceforge.net/gar/?rev=2533&view=rev Author: dmichelsen Date: 2008-12-11 13:47:58 +0000 (Thu, 11 Dec 2008) Log Message: ----------- msmtp: Fix copyright location Modified Paths: -------------- csw/mgar/pkg/msmtp/trunk/checksums csw/mgar/pkg/msmtp/trunk/files/CSWmsmtp.gspec Modified: csw/mgar/pkg/msmtp/trunk/checksums =================================================================== --- csw/mgar/pkg/msmtp/trunk/checksums 2008-12-11 13:03:45 UTC (rev 2532) +++ csw/mgar/pkg/msmtp/trunk/checksums 2008-12-11 13:47:58 UTC (rev 2533) @@ -1,2 +1,2 @@ 77a333601e9de03f695539498e678cc2 download/msmtp-1.4.16.tar.bz2 -fe48f4e103c584120b79c5f4c0daed4e download/CSWmsmtp.gspec +42e9683c63a21aeb281bbb72d9e4b527 download/CSWmsmtp.gspec Modified: csw/mgar/pkg/msmtp/trunk/files/CSWmsmtp.gspec =================================================================== --- csw/mgar/pkg/msmtp/trunk/files/CSWmsmtp.gspec 2008-12-11 13:03:45 UTC (rev 2532) +++ csw/mgar/pkg/msmtp/trunk/files/CSWmsmtp.gspec 2008-12-11 13:47:58 UTC (rev 2533) @@ -1,4 +1,4 @@ %var bitname msmtp %var pkgname CSWmsmtp %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING +%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 Thu Dec 11 15:20:51 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Dec 2008 14:20:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[2534] csw/mgar/pkg/libtool/trunk Message-ID: Revision: 2534 http://gar.svn.sourceforge.net/gar/?rev=2534&view=rev Author: dmichelsen Date: 2008-12-11 14:20:51 +0000 (Thu, 11 Dec 2008) Log Message: ----------- libtool: Standardize towards mGAR v2 Modified Paths: -------------- csw/mgar/pkg/libtool/trunk/Makefile csw/mgar/pkg/libtool/trunk/checksums csw/mgar/pkg/libtool/trunk/files/CSWlibtool.gspec csw/mgar/pkg/libtool/trunk/files/CSWlibtoolrt.gspec Modified: csw/mgar/pkg/libtool/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtool/trunk/Makefile 2008-12-11 13:47:58 UTC (rev 2533) +++ csw/mgar/pkg/libtool/trunk/Makefile 2008-12-11 14:20:51 UTC (rev 2534) @@ -1,11 +1,11 @@ -PKGVERSION ?= 2.2.4 -EXTRA_MODULATORS = PKGVERSION -MODULATIONS_PKGVERSION = 1.5.26 2.2.4 GARNAME = libtool -GARVERSION ?=$(PKGVERSION) +GARVERSION = 2.2.4 CATEGORIES = devel -DESCRIPTION = A generic library support tool. +EXTRA_MODULATORS = GARVERSION +MODULATIONS_GARVERSION = 1.5.26 2.2.4 + +DESCRIPTION = A generic library support tool define BLURB GNU libtool is a generic library support script. Libtool hides the complexity of using shared and static libraries behind a consistent, portable interface. @@ -13,51 +13,44 @@ endef MASTER_SITES = $(GNU_MIRROR) -SOURCEFILES = $(foreach VERSION, $(MODULATIONS_PKGVERSION), $(GARNAME)-$(VERSION).tar.gz) +SOURCEFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION), $(GARNAME)-$(VERSION).tar.gz) DISTFILES = $(SOURCEFILES) DISTFILES += $(call admfiles,CSWlibtool) DISTFILES += $(call admfiles,CSWlibtoolrt) -#NOEXTRACT = $(filter-out $(GARNAME)-$(GARVERSION).tar.gz, $(SOURCEFILES)) +SPKG_DESC_CSWlibtool = A generic library support tool +SPKG_DESC_CSWlibtoolrt = A Generic library support tool runtime libraries + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz CONFIGURE_ARGS = $(DIRPATHS) BUILD64 = 1 +NO_ISAEXEC = 1 SKIPTEST = 1 TEST_TARGET = check -MERGE_SCRIPTS_isa-i386-pkgversion-1.5.26 = copy-only -MERGE_DIRS_isa-i386-pkgversion-1.5.26 = $(libdir) -MERGE_SCRIPTS_isa-amd64-pkgversion-1.5.26 = copy-relocated-only -MERGE_DIRS_isa-amd64-pkgversion-1.5.26 = $(libdir) +MERGE_SCRIPTS_isa-i386-garversion-1.5.26 = copy-only +MERGE_DIRS_isa-i386-garversion-1.5.26 = $(libdir) +MERGE_SCRIPTS_isa-amd64-garversion-1.5.26 = copy-relocated-only +MERGE_DIRS_isa-amd64-garversion-1.5.26 = $(libdir) -MERGE_SCRIPTS_isa-i386-pkgversion-2.2.4 = copy-all -MERGE_SCRIPTS_isa-amd64-pkgversion-2.2.4 = copy-relocated-only -MERGE_DIRS_isa-amd64-pkgversion-2.2.4 = $(bindir) $(sbindir) $(libexecdir) $(libdir) +MERGE_SCRIPTS_isa-i386-garversion-2.2.4 = copy-all +MERGE_SCRIPTS_isa-amd64-garversion-2.2.4 = copy-relocated-only +MERGE_DIRS_isa-amd64-garversion-2.2.4 = $(bindir) $(sbindir) $(libexecdir) $(libdir) -MERGE_SCRIPTS_isa-sparcv8-pkgversion-1.5.26 = copy-only -MERGE_DIRS_isa-sparcv8-pkgversion-1.5.26 = $(libdir) -MERGE_SCRIPTS_isa-sparcv9-pkgversion-1.5.26 = copy-relocated-only -MERGE_DIRS_isa-sparcv9-pkgversion-1.5.26 = $(libdir) +MERGE_SCRIPTS_isa-sparcv8-garversion-1.5.26 = copy-only +MERGE_DIRS_isa-sparcv8-garversion-1.5.26 = $(libdir) +MERGE_SCRIPTS_isa-sparcv9-garversion-1.5.26 = copy-relocated-only +MERGE_DIRS_isa-sparcv9-garversion-1.5.26 = $(libdir) -MERGE_SCRIPTS_isa-sparcv8-pkgversion-2.2.4 = copy-all -MERGE_SCRIPTS_isa-sparcv9-pkgversion-2.2.4 = copy-relocated-only -MERGE_DIRS_isa-sparcv9-pkgversion-2.2.4 = $(bindir) $(sbindir) $(libexecdir) $(libdir) +MERGE_SCRIPTS_isa-sparcv8-garversion-2.2.4 = copy-all +MERGE_SCRIPTS_isa-sparcv9-garversion-2.2.4 = copy-relocated-only +MERGE_DIRS_isa-sparcv9-garversion-2.2.4 = $(bindir) $(sbindir) $(libexecdir) $(libdir) -# Move runtime stuff to CSWlibtoolrt and put the rest in CSWlibtool -PKGFILES_CSWlibtoolrt_EXCLUSIVE = $(PKGFILES_RT) +PKGFILES_CSWlibtoolrt = $(PKGFILES_RT) include gar/category.mk -#pre-package: -# @(for VERSION in $(OLD_VERSIONS); do gmake GARVERSION=$$VERSION install; done) -# @$(MAKECOOKIE) - -post-install: - @echo " ==> Fixing install anomalies" - @rm -f $(DESTDIR)$(prefix)/share/info/dir - @$(MAKECOOKIE) - Modified: csw/mgar/pkg/libtool/trunk/checksums =================================================================== --- csw/mgar/pkg/libtool/trunk/checksums 2008-12-11 13:47:58 UTC (rev 2533) +++ csw/mgar/pkg/libtool/trunk/checksums 2008-12-11 14:20:51 UTC (rev 2534) @@ -1,4 +1,4 @@ aa9c5107f3ec9ef4200eb6556f3b3c29 download/libtool-1.5.26.tar.gz 0b87e84c7aad3b5e979bbe35312fd4c1 download/libtool-2.2.4.tar.gz -f3775e02c6cf24fc34591608d0faafd7 download/CSWlibtool.gspec -782d7a7a7d60533728e6d5ee4477a8f6 download/CSWlibtoolrt.gspec +c8c05c4657da45bd2a70c0f1ed9b8ae5 download/CSWlibtool.gspec +66e02987d097403a1662be5af0800a25 download/CSWlibtoolrt.gspec Modified: csw/mgar/pkg/libtool/trunk/files/CSWlibtool.gspec =================================================================== --- csw/mgar/pkg/libtool/trunk/files/CSWlibtool.gspec 2008-12-11 13:47:58 UTC (rev 2533) +++ csw/mgar/pkg/libtool/trunk/files/CSWlibtool.gspec 2008-12-11 14:20:51 UTC (rev 2534) @@ -1,4 +1,4 @@ %var bitname libtool %var pkgname CSWlibtool %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING +%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Modified: csw/mgar/pkg/libtool/trunk/files/CSWlibtoolrt.gspec =================================================================== --- csw/mgar/pkg/libtool/trunk/files/CSWlibtoolrt.gspec 2008-12-11 13:47:58 UTC (rev 2533) +++ csw/mgar/pkg/libtool/trunk/files/CSWlibtoolrt.gspec 2008-12-11 14:20:51 UTC (rev 2534) @@ -1,5 +1,4 @@ %var bitname libtool_rt %var pkgname CSWlibtoolrt -%var desc Generic library support runtime libraries %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING +%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 Thu Dec 11 15:28:08 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Dec 2008 14:28:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[2535] csw/mgar/pkg/pcre/trunk Message-ID: Revision: 2535 http://gar.svn.sourceforge.net/gar/?rev=2535&view=rev Author: dmichelsen Date: 2008-12-11 14:28:08 +0000 (Thu, 11 Dec 2008) Log Message: ----------- pcre: Standardize towards mGAR v2, waiting for 64 bit libbz2 Modified Paths: -------------- csw/mgar/pkg/pcre/trunk/Makefile csw/mgar/pkg/pcre/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/pcre/trunk/files/CSWpcre.depend csw/mgar/pkg/pcre/trunk/files/CSWpcre.prototype csw/mgar/pkg/pcre/trunk/files/CSWpcrert.depend csw/mgar/pkg/pcre/trunk/files/CSWpcrert.prototype Modified: csw/mgar/pkg/pcre/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcre/trunk/Makefile 2008-12-11 14:20:51 UTC (rev 2534) +++ csw/mgar/pkg/pcre/trunk/Makefile 2008-12-11 14:28:08 UTC (rev 2535) @@ -12,11 +12,16 @@ MASTER_SITES = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWpcrert,depend prototype) -DISTFILES += $(call admfiles,CSWpcre,depend prototype) +DISTFILES += $(call admfiles,CSWpcre) +DISTFILES += $(call admfiles,CSWpcrert) PREREQUISITE_PKGS = CSWgnulinks +REQUIRED_PKGS_CSWpcre = CSWpcrert +REQUIRED_PKGS_CSWpcrert = CSWzlib CSWbzip2 CSWreadline +SPKG_DESC_CSWpcrert = Perl-compatible regular expression tools (runtime) +SPKG_DESC_CSWpcre = Perl-compatible regular expression tools + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/pcre/trunk/checksums =================================================================== --- csw/mgar/pkg/pcre/trunk/checksums 2008-12-11 14:20:51 UTC (rev 2534) +++ csw/mgar/pkg/pcre/trunk/checksums 2008-12-11 14:28:08 UTC (rev 2535) @@ -1,7 +1,3 @@ 32fd7c7863b871d408d730e6ffa4aa71 download/pcre-7.8.tar.gz -fa208f4292d0102dc5e87d81bed54af9 download/CSWpcrert.gspec -b6471d1f8f8b32660529a389fa73bbf3 download/CSWpcrert.depend -99f231131bab4cb4c8dea955c6cd1236 download/CSWpcrert.prototype dc5c2103dbbe39a0ffa06ff14b8760b7 download/CSWpcre.gspec -502d6610700f76b35a673aa1a24dd673 download/CSWpcre.depend -c5508817f6cb38d12faac881d393a8cd download/CSWpcre.prototype +fa208f4292d0102dc5e87d81bed54af9 download/CSWpcrert.gspec Deleted: csw/mgar/pkg/pcre/trunk/files/CSWpcre.depend =================================================================== --- csw/mgar/pkg/pcre/trunk/files/CSWpcre.depend 2008-12-11 14:20:51 UTC (rev 2534) +++ csw/mgar/pkg/pcre/trunk/files/CSWpcre.depend 2008-12-11 14:28:08 UTC (rev 2535) @@ -1,4 +0,0 @@ -P CSWzlib zlib - Zlib Data Compression Library -P CSWbzip2 bzip2 - a high-quality block-sorting file compressor -P CSWreadline readline - library to enable interactive line editing -P CSWpcrert pcre_rt - Perl-compatible regular expression runtime libraries Deleted: csw/mgar/pkg/pcre/trunk/files/CSWpcre.prototype =================================================================== --- csw/mgar/pkg/pcre/trunk/files/CSWpcre.prototype 2008-12-11 14:20:51 UTC (rev 2534) +++ csw/mgar/pkg/pcre/trunk/files/CSWpcre.prototype 2008-12-11 14:28:08 UTC (rev 2535) @@ -1,115 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/pcre-config 0755 root bin -f none /opt/csw/bin/pcregrep 0755 root bin -f none /opt/csw/bin/pcretest 0755 root bin -d none /opt/csw/include 0755 root bin -f none /opt/csw/include/pcre.h 0644 root bin -f none /opt/csw/include/pcre_scanner.h 0644 root bin -f none /opt/csw/include/pcre_stringpiece.h 0644 root bin -f none /opt/csw/include/pcrecpp.h 0644 root bin -f none /opt/csw/include/pcrecpparg.h 0644 root bin -f none /opt/csw/include/pcreposix.h 0644 root bin -d none /opt/csw/lib 0755 root bin -f none /opt/csw/lib/libpcre.a 0644 root bin -f none /opt/csw/lib/libpcre.la 0755 root bin -f none /opt/csw/lib/libpcrecpp.a 0644 root bin -f none /opt/csw/lib/libpcrecpp.la 0755 root bin -f none /opt/csw/lib/libpcreposix.a 0644 root bin -f none /opt/csw/lib/libpcreposix.la 0755 root bin -d none /opt/csw/lib/pkgconfig 0755 root bin -f none /opt/csw/lib/pkgconfig/libpcre.pc 0644 root bin -f none /opt/csw/lib/pkgconfig/libpcrecpp.pc 0644 root bin -d none /opt/csw/share/doc/pcre 0755 root bin -f none /opt/csw/share/doc/pcre/AUTHORS 0644 root bin -f none /opt/csw/share/doc/pcre/COPYING 0644 root bin -f none /opt/csw/share/doc/pcre/ChangeLog 0644 root bin -f none /opt/csw/share/doc/pcre/LICENCE 0644 root bin -f none /opt/csw/share/doc/pcre/NEWS 0644 root bin -f none /opt/csw/share/doc/pcre/README 0644 root bin -d none /opt/csw/share/doc/pcre/html 0755 root bin -f none /opt/csw/share/doc/pcre/html/index.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcre-config.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcre.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcre_compile.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcre_compile2.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcre_config.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcre_copy_named_substring.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcre_copy_substring.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcre_dfa_exec.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcre_exec.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcre_free_substring.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcre_free_substring_list.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcre_fullinfo.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcre_get_named_substring.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcre_get_stringnumber.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcre_get_stringtable_entries.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcre_get_substring.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcre_get_substring_list.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcre_info.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcre_maketables.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcre_refcount.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcre_study.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcre_version.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcreapi.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcrebuild.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcrecallout.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcrecompat.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcrecpp.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcregrep.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcrematching.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcrepartial.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcrepattern.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcreperform.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcreposix.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcreprecompile.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcresample.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcrestack.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcresyntax.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcretest.html 0644 root bin -f none /opt/csw/share/doc/pcre/pcre-config.txt 0644 root bin -f none /opt/csw/share/doc/pcre/pcre.txt 0644 root bin -f none /opt/csw/share/doc/pcre/pcregrep.txt 0644 root bin -f none /opt/csw/share/doc/pcre/pcretest.txt 0644 root bin -d none /opt/csw/share/man/man1 0755 root bin -f none /opt/csw/share/man/man1/pcre-config.1 0644 root bin -f none /opt/csw/share/man/man1/pcregrep.1 0644 root bin -f none /opt/csw/share/man/man1/pcretest.1 0644 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/pcre.3 0644 root bin -f none /opt/csw/share/man/man3/pcre_compile.3 0644 root bin -f none /opt/csw/share/man/man3/pcre_compile2.3 0644 root bin -f none /opt/csw/share/man/man3/pcre_config.3 0644 root bin -f none /opt/csw/share/man/man3/pcre_copy_named_substring.3 0644 root bin -f none /opt/csw/share/man/man3/pcre_copy_substring.3 0644 root bin -f none /opt/csw/share/man/man3/pcre_dfa_exec.3 0644 root bin -f none /opt/csw/share/man/man3/pcre_exec.3 0644 root bin -f none /opt/csw/share/man/man3/pcre_free_substring.3 0644 root bin -f none /opt/csw/share/man/man3/pcre_free_substring_list.3 0644 root bin -f none /opt/csw/share/man/man3/pcre_fullinfo.3 0644 root bin -f none /opt/csw/share/man/man3/pcre_get_named_substring.3 0644 root bin -f none /opt/csw/share/man/man3/pcre_get_stringnumber.3 0644 root bin -f none /opt/csw/share/man/man3/pcre_get_stringtable_entries.3 0644 root bin -f none /opt/csw/share/man/man3/pcre_get_substring.3 0644 root bin -f none /opt/csw/share/man/man3/pcre_get_substring_list.3 0644 root bin -f none /opt/csw/share/man/man3/pcre_info.3 0644 root bin -f none /opt/csw/share/man/man3/pcre_maketables.3 0644 root bin -f none /opt/csw/share/man/man3/pcre_refcount.3 0644 root bin -f none /opt/csw/share/man/man3/pcre_study.3 0644 root bin -f none /opt/csw/share/man/man3/pcre_version.3 0644 root bin -f none /opt/csw/share/man/man3/pcreapi.3 0644 root bin -f none /opt/csw/share/man/man3/pcrebuild.3 0644 root bin -f none /opt/csw/share/man/man3/pcrecallout.3 0644 root bin -f none /opt/csw/share/man/man3/pcrecompat.3 0644 root bin -f none /opt/csw/share/man/man3/pcrecpp.3 0644 root bin -f none /opt/csw/share/man/man3/pcrematching.3 0644 root bin -f none /opt/csw/share/man/man3/pcrepartial.3 0644 root bin -f none /opt/csw/share/man/man3/pcrepattern.3 0644 root bin -f none /opt/csw/share/man/man3/pcreperform.3 0644 root bin -f none /opt/csw/share/man/man3/pcreposix.3 0644 root bin -f none /opt/csw/share/man/man3/pcreprecompile.3 0644 root bin -f none /opt/csw/share/man/man3/pcresample.3 0644 root bin -f none /opt/csw/share/man/man3/pcrestack.3 0644 root bin -f none /opt/csw/share/man/man3/pcresyntax.3 0644 root bin -i copyright=CSWpcre.copyright -i depend=CSWpcre.depend -i pkginfo=CSWpcre.pkginfo Deleted: csw/mgar/pkg/pcre/trunk/files/CSWpcrert.depend =================================================================== --- csw/mgar/pkg/pcre/trunk/files/CSWpcrert.depend 2008-12-11 14:20:51 UTC (rev 2534) +++ csw/mgar/pkg/pcre/trunk/files/CSWpcrert.depend 2008-12-11 14:28:08 UTC (rev 2535) @@ -1,3 +0,0 @@ -P CSWzlib zlib - Zlib Data Compression Library -P CSWbzip2 bzip2 - a high-quality block-sorting file compressor -P CSWreadline readline - library to enable interactive line editing Deleted: csw/mgar/pkg/pcre/trunk/files/CSWpcrert.prototype =================================================================== --- csw/mgar/pkg/pcre/trunk/files/CSWpcrert.prototype 2008-12-11 14:20:51 UTC (rev 2534) +++ csw/mgar/pkg/pcre/trunk/files/CSWpcrert.prototype 2008-12-11 14:28:08 UTC (rev 2535) @@ -1,12 +0,0 @@ -f none /opt/csw/lib/libpcre.so.0.0.1 0755 root bin -s none /opt/csw/lib/libpcre.so.0=libpcre.so.0.0.1 -s none /opt/csw/lib/libpcre.so=libpcre.so.0.0.1 -f none /opt/csw/lib/libpcrecpp.so.0.0.0 0755 root bin -s none /opt/csw/lib/libpcrecpp.so.0=libpcrecpp.so.0.0.0 -s none /opt/csw/lib/libpcrecpp.so=libpcrecpp.so.0.0.0 -f none /opt/csw/lib/libpcreposix.so.0.0.0 0755 root bin -s none /opt/csw/lib/libpcreposix.so.0=libpcreposix.so.0.0.0 -s none /opt/csw/lib/libpcreposix.so=libpcreposix.so.0.0.0 -i copyright=CSWpcrert.copyright -i depend=CSWpcrert.depend -i pkginfo=CSWpcrert.pkginfo 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 Dec 11 15:38:29 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Dec 2008 14:38:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[2536] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 2536 http://gar.svn.sourceforge.net/gar/?rev=2536&view=rev Author: dmichelsen Date: 2008-12-11 14:38:29 +0000 (Thu, 11 Dec 2008) Log Message: ----------- mGAR v2: Fix SOSxx_CXX_VERSION Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2008-12-11 14:28:08 UTC (rev 2535) +++ csw/mgar/gar/v2/gar.conf.mk 2008-12-11 14:38:29 UTC (rev 2536) @@ -386,9 +386,9 @@ GCC4_CXX_VERSION = $(shell $(GCC4_CXX) -v 2>&1| ggrep version) SOS11_CC_VERSION = $(shell $(SOS11_CC) -V 2>&1| ggrep cc: | gsed -e 's/cc: //') -SOS11_CXX_VERSION = $(shell $(SOS11_CXX)/bin/CC -V 2>&1| ggrep CC: | gsed -e 's/CC: //') +SOS11_CXX_VERSION = $(shell $(SOS11_CXX) -V 2>&1| ggrep CC: | gsed -e 's/CC: //') SOS12_CC_VERSION = $(shell $(SOS11_CC) -V 2>&1| ggrep cc: | gsed -e 's/cc: //') -SOS12_CXX_VERSION = $(shell $(SOS11_CXX)/bin/CC -V 2>&1| ggrep CC: | gsed -e 's/CC: //') +SOS12_CXX_VERSION = $(shell $(SOS11_CXX) -V 2>&1| ggrep CC: | gsed -e 's/CC: //') CC_VERSION = $($(GARCOMPILER)_CC_VERSION) CXX_VERSION = $($(GARCOMPILER)_CXX_VERSION) 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 Dec 11 15:38:59 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Dec 2008 14:38:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[2537] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 2537 http://gar.svn.sourceforge.net/gar/?rev=2537&view=rev Author: dmichelsen Date: 2008-12-11 14:38:59 +0000 (Thu, 11 Dec 2008) Log Message: ----------- mGAR v2: Make all package variables overwritable per package Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2008-12-11 14:38:29 UTC (rev 2536) +++ csw/mgar/gar/v2/gar.pkg.mk 2008-12-11 14:38:59 UTC (rev 2537) @@ -82,8 +82,9 @@ PKG_EXPORTS += SPKG_OSNAME SPKG_SOURCEURL SPKG_PACKAGER TIMESTAMP PKG_EXPORTS += DEPMAKER_EXTRA_ARGS PKGLIB DESTDIR -PKG_ENV = $(BUILD_ENV) -PKG_ENV += $(foreach EXP,$(PKG_EXPORTS),$(EXP)="$($(EXP))") +define _PKG_ENV +$(BUILD_ENV) $(foreach EXP,$(PKG_EXPORTS),$(EXP)="$(if $($(EXP)_$1),$($(EXP)_$1),$($(EXP)))") +endef # Canned command for generating admin file names # Usage: $(call admfiles,SUNWpackage,depend copyright) @@ -217,7 +218,7 @@ package-%: $(WORKDIR)/%.prototype-$(GARCH) $(WORKDIR)/%.depend @echo " ==> Processing $*.gspec" - @( $(PKG_ENV) mkpackage --spec $(WORKDIR)/$*.gspec \ + @( $(call _PKG_ENV,$*) mkpackage --spec $(WORKDIR)/$*.gspec \ --spooldir $(SPKG_SPOOLDIR) \ --destdir $(SPKG_EXPORT) \ --workdir $(SPKG_WORKDIR) \ @@ -237,7 +238,7 @@ pkgcheck-%: @echo " ==> Checking compliance: $*" - @( checkpkg $(SPKG_EXPORT)/`$(PKG_ENV) mkpackage -qs $(WORKDIR)/$*.gspec -D pkgfile`.gz ) || exit 2 + @( checkpkg $(SPKG_EXPORT)/`$(call _PKG_ENV,$1) mkpackage -qs $(WORKDIR)/$*.gspec -D pkgfile`.gz ) || exit 2 pkgcheck-p: @$(foreach COOKIEFILE,$(PKGCHECK_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;) @@ -269,7 +270,7 @@ # pkgenv - dump the packaging environment # pkgenv: - @$(PKG_ENV) env + @$(foreach SPEC,$(_PKG_SPECS),echo "$(SPEC)";echo;$(call _PKG_ENV,$(SPEC)) env;) # pkglist - list the packages to be built with GAR pathname, catalog name and package name This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Dec 11 16:33:52 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 11 Dec 2008 15:33:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[2538] csw/mgar/pkg/clamav/trunk Message-ID: Revision: 2538 http://gar.svn.sourceforge.net/gar/?rev=2538&view=rev Author: bonivart Date: 2008-12-11 15:33:52 +0000 (Thu, 11 Dec 2008) Log Message: ----------- clamav: must use -xO2 to build on i386, fixed license file, ready for testing Modified Paths: -------------- csw/mgar/pkg/clamav/trunk/Makefile csw/mgar/pkg/clamav/trunk/checksums Modified: csw/mgar/pkg/clamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamav/trunk/Makefile 2008-12-11 14:38:59 UTC (rev 2537) +++ csw/mgar/pkg/clamav/trunk/Makefile 2008-12-11 15:33:52 UTC (rev 2538) @@ -33,6 +33,8 @@ SPKG_CLASSES = none cswcpsampleconf cswinitsmf +CFLAGS=-xO2 + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-clamav CONFIGURE_ARGS += --enable-milter @@ -44,6 +46,7 @@ PKGFILES_CSWlibclamav = $(libdir)/.* PKGFILES_CSWlibclamav += $(includedir)/.* +PKGFILES_CSWlibclamav += $(docdir)/libclamav/.* PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswclamd$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/init.d\/cswclamav-milter$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/clamd.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } $$$$3 ~ /\/freshclam.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } $$$$3 ~ /\/var\/opt\/csw\/clamav/ { $$$$5 = "clamav" } { print }' Modified: csw/mgar/pkg/clamav/trunk/checksums =================================================================== --- csw/mgar/pkg/clamav/trunk/checksums 2008-12-11 14:38:59 UTC (rev 2537) +++ csw/mgar/pkg/clamav/trunk/checksums 2008-12-11 15:33:52 UTC (rev 2538) @@ -2,5 +2,4 @@ dbb021404195c40d44dd61e9b0206634 download/CSWclamav.gspec 265f727008d1645114839cdbd9399be6 download/CSWclamav.checkinstall 03e2a2aaf95b2cd8497ad6742b9fbb46 download/CSWclamav.preinstall -574e50c4c06f22c928e1a48783490e26 download/CSWclamav.postinstall 8f6b719b38608d0f08ced7e556461c12 download/CSWlibclamav.gspec 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 Dec 11 16:34:10 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Dec 2008 15:34:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[2539] csw/mgar/pkg/qt4/trunk/Makefile Message-ID: Revision: 2539 http://gar.svn.sourceforge.net/gar/?rev=2539&view=rev Author: dmichelsen Date: 2008-12-11 15:34:10 +0000 (Thu, 11 Dec 2008) Log Message: ----------- qt4: First commit towards mGAR v2 Modified Paths: -------------- csw/mgar/pkg/qt4/trunk/Makefile Modified: csw/mgar/pkg/qt4/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4/trunk/Makefile 2008-12-11 15:33:52 UTC (rev 2538) +++ csw/mgar/pkg/qt4/trunk/Makefile 2008-12-11 15:34:10 UTC (rev 2539) @@ -9,30 +9,6 @@ http://doc.trolltech.com/4.3/qt4-intro.html for details. endef -sparc_ARCH = sparc -i386_ARCH = i386 -sparc_ARCH64 = sparcv9 -i386_ARCH64 = amd64 - -ARCH=$($(GARCH)_ARCH) -ARCH64=$($(GARCH)_ARCH64) - -ifndef DO64 -PLATFORM=solaris-cc -else -PLATFORM=solaris-cc-64 -endif - -ifdef ISA -ISALIST = $(ISA) -else -ifndef DO64 -ISA = $(ARCH) -else -ISA = $(ARCH64) -endif -endif - MASTER_SITES = ftp://ftp.trolltech.com/qt/source/ DISTFILES = qt-x11-opensource-src-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWqt4,depend prototype-sparc prototype-i386) @@ -42,28 +18,16 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = qt-x11-opensource-src-(\d+(?:\.\d+)*).tar.gz -WORKDIR = $(WORKROOTDIR)/$(DESTIMG).d/$(PLATFORM) -COOKIEROOTDIR = cookies.$(PLATFORM) +ifndef DO64 +PLATFORM=solaris-cc +else +PLATFORM=solaris-cc-64 +endif WORKSRC = $(WORKDIR)/qt-x11-opensource-src-$(GARVERSION) PREREQUISITE_PKGS = CSWpkgconfig CSWfconfig CSWlibdbusdev -# Usually the pathes from already installed stuff at $DESTDIR is -# used before regular installed stuff. This leads to include errors -# if we already have a qt4 installed at $DESTDIR. -IGNORE_DESTDIR = 1 - -ifdef DO64 - bindir = $(exec_prefix)/bin/sparcv9 - libdir = $(exec_prefix)/lib/sparcv9 - docdir = $(prefix)/ignore/doc - includedir = $(prefix)/ignore/include - datadir = $(prefix)/ignore/data - sharedstatedir = $(prefix)/ignore/share - etcdir = $(prefix)/ignore/etc -endif - CONFIGURE_ARGS = -prefix $(prefix) \ -bindir $(bindir) \ -libdir $(libdir) \ @@ -81,82 +45,36 @@ -confirm-license \ -verbose -SKIPTEST = 1 +# SKIPTEST = 1 INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) SRC_CLEAN_TARGET = confclean -ifndef DO64 -CLEAN_SCRIPTS = all custom -endif - include gar/category.mk -OPTARCH_sparc = v8 -OPTARCH_sparcv9 = v9 -OPTARCH_i386 = 386 -OPTARCH_amd64 = amd64 -OPTARCH = $(OPTARCH_$(ISA)) - -ifdef DO64 - # Do not use -xO3 as -xO2 is already set in the Makefile - SUN_CC_OPT = -xarch=$(OPTARCH) -xspace -xildoff - SUN_CXX_OPT = -xarch=$(OPTARCH) -xspace -xildoff - - # Do not include -I/-L here. These flags must be defined after - # local QT4 includes and need to be defined during configure. - CFLAGS = $($(GARCOMPILER)_CC_$(GARFLAVOR)) - CPPFLAGS = $($(GARCOMPILER)_CPP_FLAGS) - # -D_POSIX_PTHREAD_SEMANTICS needed, because getpwuid_r is used in the 4-arg-version - # (see getpwuid_r(3c) for details) - CXXFLAGS = $($(GARCOMPILER)_CXX_$(GARFLAVOR)) -D_POSIX_PTHREAD_SEMANTICS - LDFLAGS = $($(GARCOMPILER)_LD_FLAGS) $($(GARCOMPILER)_LD_$(GARFLAVOR)) -else - # Do not use -xO3 as -xO2 is already set in the Makefile - SUN_CC_OPT = -xarch=$(OPTARCH) -xspace -xildoff - SUN_CXX_OPT = -xarch=$(OPTARCH) -xspace -xildoff - - # Do not include -I/-L here. These flags must be defined after - # local QT4 includes and need to be defined during configure. - CFLAGS = $($(GARCOMPILER)_CC_$(GARFLAVOR)) - CPPFLAGS = $($(GARCOMPILER)_CPP_FLAGS) - CXXFLAGS = $($(GARCOMPILER)_CXX_$(GARFLAVOR)) - LDFLAGS = $($(GARCOMPILER)_LD_FLAGS) $($(GARCOMPILER)_LD_$(GARFLAVOR)) -endif - -pre-build: - @echo "ISA: $(ISA)" - @echo "XC: $(GARCOMPILER)_CC_$(GARFLAVOR)" - @echo "XC: $($(GARCOMPILER)_CC_$(GARFLAVOR))" - @echo "CFLAGS: $(CFLAGS)" - -build64: - @echo " ==> Building 64 bit version" - gmake DO64=1 build - -install64: build64 - @echo " ==> Installing 64 bit version" - gmake DO64=1 install - -pre-package: install64 - -pre-install: - @echo " ==> Install environment:" - @echo " bindir: $(bindir)" - @echo " libdir: $(libdir)" - @/usr/bin/env - -clean64: - gmake DO64=1 clean - -clean-custom: clean64 - -env: - @echo " GARCH = $(GARCH)" - @echo " GARVERSION = $(GARVERSION)" - @echo " ISA = $(ISA)" - @echo " CFLAGS = $(CFLAGS)" - @echo " OPTARCH = $(OPTARCH)" - @echo " OPTARCH_ISA = $(OPTARCH_$(ISA))" - @echo "CLEAN TARGETS = $(CLEAN_TARGETS)" +#ifdef DO64 +# # Do not use -xO3 as -xO2 is already set in the Makefile +# SUN_CC_OPT = -xarch=$(OPTARCH) -xspace -xildoff +# SUN_CXX_OPT = -xarch=$(OPTARCH) -xspace -xildoff +# +# # Do not include -I/-L here. These flags must be defined after +# # local QT4 includes and need to be defined during configure. +# CFLAGS = $($(GARCOMPILER)_CC_$(GARFLAVOR)) +# CPPFLAGS = $($(GARCOMPILER)_CPP_FLAGS) +# # -D_POSIX_PTHREAD_SEMANTICS needed, because getpwuid_r is used in the 4-arg-version +# # (see getpwuid_r(3c) for details) +# CXXFLAGS = $($(GARCOMPILER)_CXX_$(GARFLAVOR)) -D_POSIX_PTHREAD_SEMANTICS +# LDFLAGS = $($(GARCOMPILER)_LD_FLAGS) $($(GARCOMPILER)_LD_$(GARFLAVOR)) +#else +# # Do not use -xO3 as -xO2 is already set in the Makefile +# SUN_CC_OPT = -xarch=$(OPTARCH) -xspace -xildoff +# SUN_CXX_OPT = -xarch=$(OPTARCH) -xspace -xildoff +# +# # Do not include -I/-L here. These flags must be defined after +# # local QT4 includes and need to be defined during configure. +# CFLAGS = $($(GARCOMPILER)_CC_$(GARFLAVOR)) +# CPPFLAGS = $($(GARCOMPILER)_CPP_FLAGS) +# CXXFLAGS = $($(GARCOMPILER)_CXX_$(GARFLAVOR)) +# LDFLAGS = $($(GARCOMPILER)_LD_FLAGS) $($(GARCOMPILER)_LD_$(GARFLAVOR)) +#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 Thu Dec 11 18:33:40 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 11 Dec 2008 17:33:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[2540] csw/mgar/pkg/xmlto/trunk Message-ID: Revision: 2540 http://gar.svn.sourceforge.net/gar/?rev=2540&view=rev Author: bdwalton Date: 2008-12-11 17:33:39 +0000 (Thu, 11 Dec 2008) Log Message: ----------- commit in prep for building on host with new libxml2 Modified Paths: -------------- csw/mgar/pkg/xmlto/trunk/Makefile csw/mgar/pkg/xmlto/trunk/checksums csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.gspec Added Paths: ----------- csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.depend Modified: csw/mgar/pkg/xmlto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlto/trunk/Makefile 2008-12-11 15:34:10 UTC (rev 2539) +++ csw/mgar/pkg/xmlto/trunk/Makefile 2008-12-11 17:33:39 UTC (rev 2540) @@ -1,18 +1,30 @@ GARNAME = xmlto -GARVERSION = 0.0.20 +GARVERSION = 0.0.21 CATEGORIES = utils -DESCRIPTION = +PREREQUISITES = CSWmktemp CSWfindutils CSWdocbookxsl CSWlibxslt CSWflex + +DESCRIPTION = An XSL toolchain front end. define BLURB +xmlto is a front-end to an XSL toolchain. It chooses an appropriate stylesheet +for the conversion you want and applies it using an external XSL-T processor. +It also performs any necessary post-processing. endef -MASTER_SITES = http://cyberelk.net/tim/data/$(GARNAME)/stable/ +MASTER_SITES = https://fedorahosted.org/$(GARNAME)/export/1/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += $(call admfiles,CSWxmlto) +DISTFILES += $(call admfiles,CSWxmlto,depend) +TEST_ARGS = check + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +pre-configure: + @(cd $(WORKSRC); \ + touch doc/xmlto.xml doc/xmlif.xml ) + @$(MAKECOOKIE) + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-mktemp=/opt/csw/bin/mktemp CONFIGURE_ARGS += --with-find=/opt/csw/bin/gfind Modified: csw/mgar/pkg/xmlto/trunk/checksums =================================================================== --- csw/mgar/pkg/xmlto/trunk/checksums 2008-12-11 15:34:10 UTC (rev 2539) +++ csw/mgar/pkg/xmlto/trunk/checksums 2008-12-11 17:33:39 UTC (rev 2540) @@ -1,2 +1,3 @@ -ab814ae352fc028862cbea9d676ab93b download/xmlto-0.0.20.tar.bz2 -a93561a21c4b94bf0b53dd2bfeb876bc download/CSWxmlto.gspec +cc2039dedc81f1a56b06e5fdac6f7570 download/xmlto-0.0.21.tar.bz2 +07a55001f7ff0b35e22d45772ff66a57 download/CSWxmlto.gspec +492cea1bbf25f9ab97f43582e6bd429a download/CSWxmlto.depend Added: csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.depend =================================================================== --- csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.depend (rev 0) +++ csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.depend 2008-12-11 17:33:39 UTC (rev 2540) @@ -0,0 +1,12 @@ +P CSWcommon common - common files and dirs for CSW packages +P CSWsgmlcommon sgmlcommon - A collection of entities and DTDs +P CSWxmlcommon xmlcommon - A collection of entities and DTDs +P CSWlibxml2 libxml2 - A library providing XML and HTML support +P CSWdocbookdtds docbookdtds - SGML and XML document type definitions for DocBook. +P CSWdocbookxsl docbookxsl - Norman Walsh's XSL stylesheets for DocBook XML. +P CSWlibxslt libxslt - XSLT engine for the XML Toolkit +P CSWflex flex - A tool for generating text-scanning programs. +P CSWw3m w3m - Text-based web browser + + + Modified: csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.gspec =================================================================== --- csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.gspec 2008-12-11 15:34:10 UTC (rev 2539) +++ csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.gspec 2008-12-11 17:33:39 UTC (rev 2540) @@ -1,5 +1,4 @@ %var bitname xmlto %var pkgname CSWxmlto -%var arch all %include url file://%{PKGLIB}/csw_dyndepend.gspec %copyright url file://%{WORKSRC}/COPYRIGHT This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From william at wbonnet.net Thu Dec 11 19:08:34 2008 From: william at wbonnet.net (William Bonnet) Date: Thu, 11 Dec 2008 19:08:34 +0100 Subject: [csw-devel] Moving informations out of the .gspec file Message-ID: <49415722.4010709@wbonnet.net> Hi Dago, I believe you told me you have been working on a version of mgar which allow to move some information out of the .gspec file and put these into Makefile. Did i understood well ? :) If yes, it would help me for upstream watch. I am currently facing the a problem which is not blocking, but which would be solved in an elegant way by doing this. My problem is that same packages have a GARNAME differemnt from the package name. So it is not easy to make the link using only information from Makefile. Cheers -- William http://www.wbonnet.net http://www.sunwizard.net Le site fran?ais des amateurs de stations Unix http://www.blastwave.org An OpenSolaris Community Site http://www.opencsw.org Community SoftWare for Solaris http://www.guses.org French speaking Solaris User Group From wbonnet at users.sourceforge.net Thu Dec 11 21:03:54 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 11 Dec 2008 20:03:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[2541] csw/mgar/pkg/atk/trunk/Makefile Message-ID: Revision: 2541 http://gar.svn.sourceforge.net/gar/?rev=2541&view=rev Author: wbonnet Date: 2008-12-11 20:03:54 +0000 (Thu, 11 Dec 2008) Log Message: ----------- Regexp modified to detect Path This test is not 100% accurate since the url match a pattern upstream watch does not actually handle Warning : this Makefile is incomplete and package is not produced Modified Paths: -------------- csw/mgar/pkg/atk/trunk/Makefile Modified: csw/mgar/pkg/atk/trunk/Makefile =================================================================== --- csw/mgar/pkg/atk/trunk/Makefile 2008-12-11 17:33:39 UTC (rev 2540) +++ csw/mgar/pkg/atk/trunk/Makefile 2008-12-11 20:03:54 UTC (rev 2541) @@ -11,11 +11,12 @@ utilize all of the functionality of the GNOME user environment. endef -MASTER_SITES = http://ftp.gnome.org/pub/gnome/sources/atk/1.6/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +# UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +UFILES_REGEX = (\d+(?:\.\d+)*) +MASTER_SITES = http://ftp.gnome.org/pub/gnome/sources/atk/ LIBDEPS += lib/glib2 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 Dec 11 21:24:10 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Dec 2008 20:24:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[2542] csw/mgar/gar/v1/gar.lib.mk Message-ID: Revision: 2542 http://gar.svn.sourceforge.net/gar/?rev=2542&view=rev Author: dmichelsen Date: 2008-12-11 20:24:10 +0000 (Thu, 11 Dec 2008) Log Message: ----------- mGAR v1: Add https target and WGET_OPTS Modified Paths: -------------- csw/mgar/gar/v1/gar.lib.mk Modified: csw/mgar/gar/v1/gar.lib.mk =================================================================== --- csw/mgar/gar/v1/gar.lib.mk 2008-12-11 20:03:54 UTC (rev 2541) +++ csw/mgar/gar/v1/gar.lib.mk 2008-12-11 20:24:10 UTC (rev 2542) @@ -41,13 +41,16 @@ # download an http URL (colons omitted) http//%: - @wget -T 10 -c -P $(PARTIALDIR) http://$* + @wget $(WGET_OPTS) -T 10 -c -P $(PARTIALDIR) http://$* +https//%: + @wget $(WGET_OPTS) -T 10 -c -P $(PARTIALDIR) https://$* + # download an ftp URL (colons omitted) #ftp//%: # @wget -T 10 -c --passive-ftp -P $(PARTIALDIR) ftp://$* ftp//%: - @wget -T 10 -c -P $(PARTIALDIR) ftp://$* + @wget $(WGET_OPTS) -T 10 -c -P $(PARTIALDIR) ftp://$* # link to a local copy of the file # (absolute path) @@ -80,6 +83,9 @@ svn-http//%: @svn co $(SVNHTTP_CO_ARGS) http://$* $(PARTIALDIR)/$(notdir $*) +svn-https//%: + @svn co $(SVNHTTP_CO_ARGS) https://$* $(PARTIALDIR)/$(notdir $*) + #################### CHECKSUM RULES #################### # check a given file's checksum against $(CHECKSUM_FILE) and 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 Dec 11 21:25:28 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Dec 2008 20:25:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[2543] csw/mgar/gar/v2/gar.lib.mk Message-ID: Revision: 2543 http://gar.svn.sourceforge.net/gar/?rev=2543&view=rev Author: dmichelsen Date: 2008-12-11 20:25:26 +0000 (Thu, 11 Dec 2008) Log Message: ----------- mGAR v2: Merge [2542] from mGAR v1 Modified Paths: -------------- csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2008-12-11 20:24:10 UTC (rev 2542) +++ csw/mgar/gar/v2/gar.lib.mk 2008-12-11 20:25:26 UTC (rev 2543) @@ -41,13 +41,16 @@ # download an http URL (colons omitted) http//%: - @wget -T 10 -c -P $(PARTIALDIR) http://$* + @wget $(WGET_OPTS) -T 10 -c -P $(PARTIALDIR) http://$* +https//%: + @wget $(WGET_OPTS) -T 10 -c -P $(PARTIALDIR) https://$* + # download an ftp URL (colons omitted) #ftp//%: # @wget -T 10 -c --passive-ftp -P $(PARTIALDIR) ftp://$* ftp//%: - @wget -T 10 -c -P $(PARTIALDIR) ftp://$* + @wget $(WGET_OPTS) -T 10 -c -P $(PARTIALDIR) ftp://$* # link to a local copy of the file # (absolute path) @@ -80,6 +83,9 @@ svn-http//%: @svn co $(SVNHTTP_CO_ARGS) http://$* $(PARTIALDIR)/$(notdir $*) +svn-https//%: + @svn co $(SVNHTTP_CO_ARGS) https://$* $(PARTIALDIR)/$(notdir $*) + #################### CHECKSUM RULES #################### # check a given file's checksum against $(CHECKSUM_FILE) and 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 Dec 11 22:01:39 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Dec 2008 21:01:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[2544] csw/mgar/gar Message-ID: Revision: 2544 http://gar.svn.sourceforge.net/gar/?rev=2544&view=rev Author: dmichelsen Date: 2008-12-11 21:01:38 +0000 (Thu, 11 Dec 2008) Log Message: ----------- mGAR v1/v2: Adjust pkglist to be useful Modified Paths: -------------- csw/mgar/gar/v1/gar.pkg.mk csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v1/gar.pkg.mk =================================================================== --- csw/mgar/gar/v1/gar.pkg.mk 2008-12-11 20:25:26 UTC (rev 2543) +++ csw/mgar/gar/v1/gar.pkg.mk 2008-12-11 21:01:38 UTC (rev 2544) @@ -193,11 +193,10 @@ endef define _pkglist_one -$(shell /usr/bin/echo "$(patsubst $(realpath $(shell pwd)/$(GARDIR))/%,%,$(realpath .))\t$(call _pkglist_catalogname,$(1))\t$(call _pkglist_pkgname,$(1))") +$(shell /usr/bin/echo "$(shell pwd)\t$(call _pkglist_catalogname,$(1))\t$(call _pkglist_pkgname,$(1))") endef pkglist: - @echo "G: $(GARDIR) - $(shell pwd) - $(realpath $(shell pwd)/$(GARDIR)) - $(realpath .)" @$(foreach SPEC,$(SPKG_SPECS),echo "$(call _pkglist_one,$(SPEC))";) srcpack: Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2008-12-11 20:25:26 UTC (rev 2543) +++ csw/mgar/gar/v2/gar.pkg.mk 2008-12-11 21:01:38 UTC (rev 2544) @@ -285,9 +285,8 @@ endef define _pkglist_one -$(shell /usr/bin/echo "$(patsubst $(realpath $(shell pwd)/$(GARDIR))/%,%,$(realpath .))\t$(call _pkglist_catalogname,$(1))\t$(call _pkglist_pkgname,$(1))") +$(shell /usr/bin/echo "$(shell pwd)\t$(call _pkglist_catalogname,$(1))\t$(call _pkglist_pkgname,$(1))") endef pkglist: - @echo "G: $(GARDIR) - $(shell pwd) - $(realpath $(shell pwd)/$(GARDIR)) - $(realpath .)" @$(foreach SPEC,$(SPKG_SPECS),echo "$(call _pkglist_one,$(SPEC))";) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Thu Dec 11 22:02:26 2008 From: dam at opencsw.org (Dagobert Michelsen) Date: Thu, 11 Dec 2008 22:02:26 +0100 Subject: [csw-devel] Moving informations out of the .gspec file In-Reply-To: <49415722.4010709@wbonnet.net> References: <49415722.4010709@wbonnet.net> Message-ID: <5A4C2AED-2293-4C61-B45A-721A316BD097@opencsw.org> Hi William, Am 11.12.2008 um 19:08 schrieb William Bonnet: > I believe you told me you have been working on a version of mgar which > allow to move some information out of the .gspec file and put these > into > Makefile. Did i understood well ? :) If yes, it would help me for > upstream watch. I am currently facing the a problem which is not > blocking, but which would be solved in an elegant way by doing this. I hacked together gmake pkglist which prints " - - " Feel free to adjust it to be useful to you. > My problem is that same packages have a GARNAME differemnt from the > package name. So it is not easy to make the link using only > information > from Makefile. This is not solvable as a directory in GAR may result in multiple packages. Best regards -- Dago From bdwalton at users.sourceforge.net Thu Dec 11 22:06:06 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 11 Dec 2008 21:06:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[2545] csw/mgar/pkg/xmlto/trunk Message-ID: Revision: 2545 http://gar.svn.sourceforge.net/gar/?rev=2545&view=rev Author: bdwalton Date: 2008-12-11 21:06:06 +0000 (Thu, 11 Dec 2008) Log Message: ----------- first working build of xmlto Modified Paths: -------------- csw/mgar/pkg/xmlto/trunk/Makefile csw/mgar/pkg/xmlto/trunk/checksums csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.gspec Modified: csw/mgar/pkg/xmlto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlto/trunk/Makefile 2008-12-11 21:01:38 UTC (rev 2544) +++ csw/mgar/pkg/xmlto/trunk/Makefile 2008-12-11 21:06:06 UTC (rev 2545) @@ -2,7 +2,7 @@ GARVERSION = 0.0.21 CATEGORIES = utils -PREREQUISITES = CSWmktemp CSWfindutils CSWdocbookxsl CSWlibxslt CSWflex +PREREQUISITE_PKGS = CSWmktemp CSWfindutils CSWdocbookxsl CSWlibxslt CSWflex DESCRIPTION = An XSL toolchain front end. define BLURB @@ -15,11 +15,16 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWxmlto,depend) -TEST_ARGS = check +TEST_TARGET = check # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +GARCOMPILER = GNU + +# this ssl site has a cert we don't recognize +WGET_OPTS = --no-check-certificate + pre-configure: @(cd $(WORKSRC); \ touch doc/xmlto.xml doc/xmlif.xml ) @@ -35,3 +40,9 @@ # We need this for 'tail -n' PATH := /usr/xpg4/bin:/opt/csw/bin:$(PATH) + +#reset XML_CATALOG lookup (we rely on having packages that provide stylesheets +#etc). Having xsltproc not find them during build makes us blow up!! +XML_CATALOG_FILES = /opt/csw/etc/xml/catalog + + Modified: csw/mgar/pkg/xmlto/trunk/checksums =================================================================== --- csw/mgar/pkg/xmlto/trunk/checksums 2008-12-11 21:01:38 UTC (rev 2544) +++ csw/mgar/pkg/xmlto/trunk/checksums 2008-12-11 21:06:06 UTC (rev 2545) @@ -1,3 +1,3 @@ cc2039dedc81f1a56b06e5fdac6f7570 download/xmlto-0.0.21.tar.bz2 -07a55001f7ff0b35e22d45772ff66a57 download/CSWxmlto.gspec +3f51dd8ed4ca7795397702250254a6fb download/CSWxmlto.gspec 492cea1bbf25f9ab97f43582e6bd429a download/CSWxmlto.depend Modified: csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.gspec =================================================================== --- csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.gspec 2008-12-11 21:01:38 UTC (rev 2544) +++ csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.gspec 2008-12-11 21:06:06 UTC (rev 2545) @@ -1,4 +1,4 @@ %var bitname xmlto %var pkgname CSWxmlto %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYRIGHT +%copyright url file://%{WORKSRC}/COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Dec 11 22:08:05 2008 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 11 Dec 2008 21:08:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[2546] csw/mgar/pkg/synergy/trunk/Makefile Message-ID: Revision: 2546 http://gar.svn.sourceforge.net/gar/?rev=2546&view=rev Author: skayser Date: 2008-12-11 21:08:05 +0000 (Thu, 11 Dec 2008) Log Message: ----------- synergy: added SPKG_SOURCEURL Modified Paths: -------------- csw/mgar/pkg/synergy/trunk/Makefile Modified: csw/mgar/pkg/synergy/trunk/Makefile =================================================================== --- csw/mgar/pkg/synergy/trunk/Makefile 2008-12-11 21:06:06 UTC (rev 2545) +++ csw/mgar/pkg/synergy/trunk/Makefile 2008-12-11 21:08:05 UTC (rev 2546) @@ -10,6 +10,8 @@ on their desk since each system uses its own monitor(s). endef +SPKG_SOURCEURL = http://synergy2.sourceforge.net/ + MASTER_SITES = $(SF_MIRRORS) SF_PROJ = $(GARNAME)2 DISTFILES = synergy-$(GARVERSION).tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From william at wbonnet.net Thu Dec 11 21:09:37 2008 From: william at wbonnet.net (William Bonnet) Date: Thu, 11 Dec 2008 21:09:37 +0100 Subject: [csw-devel] Moving informations out of the .gspec file In-Reply-To: <5A4C2AED-2293-4C61-B45A-721A316BD097@opencsw.org> References: <49415722.4010709@wbonnet.net> <5A4C2AED-2293-4C61-B45A-721A316BD097@opencsw.org> Message-ID: <49417381.4030309@wbonnet.net> Hi Dago > I hacked together > gmake pkglist > which prints " - - " > Feel free to adjust it to be useful to you. > Thanks > This is not solvable as a directory in GAR may result in multiple > packages. > That's what i was affraid of. I did a QaD test. I use the first maintainer found in a files/*.gspec file. I assume if there are several packages in the same files subdir of a given dir, then all these package should have the same maintainer. Sounds not too risky cheers -- William http://www.wbonnet.net http://www.sunwizard.net Le site fran?ais des amateurs de stations Unix http://www.blastwave.org An OpenSolaris Community Site http://www.opencsw.org Community SoftWare for Solaris http://www.guses.org French speaking Solaris User Group From wbonnet at users.sourceforge.net Thu Dec 11 22:15:47 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 11 Dec 2008 21:15:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[2547] csw/mgar/gar Message-ID: Revision: 2547 http://gar.svn.sourceforge.net/gar/?rev=2547&view=rev Author: wbonnet Date: 2008-12-11 21:15:47 +0000 (Thu, 11 Dec 2008) Log Message: ----------- Add detection of invalid email address for maintainer (empty string may happen if package is not yet published) Add detection of the package using a GARNAME different from package name. In such cases, script try to retrive maintainer name from a gspec file Modified Paths: -------------- csw/mgar/gar/v1/bin/mail2maintainer csw/mgar/gar/v1/gar.lib.mk csw/mgar/gar/v2/bin/mail2maintainer Modified: csw/mgar/gar/v1/bin/mail2maintainer =================================================================== --- csw/mgar/gar/v1/bin/mail2maintainer 2008-12-11 21:08:05 UTC (rev 2546) +++ csw/mgar/gar/v1/bin/mail2maintainer 2008-12-11 21:15:47 UTC (rev 2547) @@ -23,8 +23,17 @@ function get_package_maintainer { _PACKAGE="$1" + + # This has to be improved. Maintainer is retrieved from the web page. It will be replaced by a sql query _MAINTAINER="`wget -q http://www.opencsw.org/packages.php/$_PACKAGE -O- | grep Maintainer | sed -e "s,.*/maintainers/\([^\'\\\"]*\).*,\1,g"`" - + + # In case Maintainer string is empty, try to find the maintainer from a gspec file + # It's a bit crappy, but it works in msot cases (but has to be replaced also) + if [ "$_MAINTAINER" -eq "" ] ; then + _PACKAGE="`grep bitname files/*.gspec | awk '{ print $3 }' | head -n 1`" + _MAINTAINER="`wget -q http://www.opencsw.org/packages.php/$_PACKAGE -O- | grep Maintainer | sed -e "s,.*/maintainers/\([^\'\\\"]*\).*,\1,g"`" + fi + echo "$_MAINTAINER" } @@ -62,5 +71,9 @@ shift done -eval mailx $MAIL_OPTIONS -b "william at wbonnet.net" $EMAIL - +if [ ! -n "$MAINTAINER" ] ; then + echo "No valid maintainer for package : $PACKAGE_NAME" + eval mailx "-s" "\"[svn] Invalid maintainer for package $PACKAGE_NAME\"" -b "william at wbonnet.net" uwatch at opencsw.org +else + eval mailx $MAIL_OPTIONS -b "william at wbonnet.net" $EMAIL +fi Modified: csw/mgar/gar/v1/gar.lib.mk =================================================================== --- csw/mgar/gar/v1/gar.lib.mk 2008-12-11 21:08:05 UTC (rev 2546) +++ csw/mgar/gar/v1/gar.lib.mk 2008-12-11 21:15:47 UTC (rev 2547) @@ -191,6 +191,7 @@ else \ if echo $(DISTFILES) | grep -w $$FILE >/dev/null; then \ PACKAGE_UP_TO_DATE=1; \ +echo DISTFILES : $(DISTFILES); \ echo "$(GARNAME) : Package is up-to-date. Current version is $$FILE" ; \ else \ NEW_FILES="$$FILE $$NEW_FILES"; \ @@ -211,6 +212,8 @@ fi; \ fi; \ else \ +echo GNU_MIRROR : $(GNU_MIRROR); \ +echo NEW_FILES : $$NEW_FILES; \ echo "$(GARNAME) : new upstream files available: $$NEW_FILES"; \ fi; \ fi Modified: csw/mgar/gar/v2/bin/mail2maintainer =================================================================== --- csw/mgar/gar/v2/bin/mail2maintainer 2008-12-11 21:08:05 UTC (rev 2546) +++ csw/mgar/gar/v2/bin/mail2maintainer 2008-12-11 21:15:47 UTC (rev 2547) @@ -23,8 +23,17 @@ function get_package_maintainer { _PACKAGE="$1" + + # This has to be improved. Maintainer is retrieved from the web page. It will be replaced by a sql query _MAINTAINER="`wget -q http://www.opencsw.org/packages.php/$_PACKAGE -O- | grep Maintainer | sed -e "s,.*/maintainers/\([^\'\\\"]*\).*,\1,g"`" - + + # In case Maintainer string is empty, try to find the maintainer from a gspec file + # It's a bit crappy, but it works in msot cases (but has to be replaced also) + if [ "$_MAINTAINER" -eq "" ] ; then + _PACKAGE="`grep bitname files/*.gspec | awk '{ print $3 }' | head -n 1`" + _MAINTAINER="`wget -q http://www.opencsw.org/packages.php/$_PACKAGE -O- | grep Maintainer | sed -e "s,.*/maintainers/\([^\'\\\"]*\).*,\1,g"`" + fi + echo "$_MAINTAINER" } @@ -62,5 +71,9 @@ shift done -eval mailx $MAIL_OPTIONS -b "william at wbonnet.net" $EMAIL - +if [ ! -n "$MAINTAINER" ] ; then + echo "No valid maintainer for package : $PACKAGE_NAME" + eval mailx "-s" "\"[svn] Invalid maintainer for package $PACKAGE_NAME\"" -b "william at wbonnet.net" uwatch at opencsw.org +else + eval mailx $MAIL_OPTIONS -b "william at wbonnet.net" $EMAIL +fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 11 23:42:43 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 11 Dec 2008 22:42:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[2548] csw/mgar/gar/v1/gar.lib.mk Message-ID: Revision: 2548 http://gar.svn.sourceforge.net/gar/?rev=2548&view=rev Author: wbonnet Date: 2008-12-11 22:42:43 +0000 (Thu, 11 Dec 2008) Log Message: ----------- Remove extra comments Modified Paths: -------------- csw/mgar/gar/v1/gar.lib.mk Modified: csw/mgar/gar/v1/gar.lib.mk =================================================================== --- csw/mgar/gar/v1/gar.lib.mk 2008-12-11 21:15:47 UTC (rev 2547) +++ csw/mgar/gar/v1/gar.lib.mk 2008-12-11 22:42:43 UTC (rev 2548) @@ -149,7 +149,7 @@ # echo ""; \ # echo "--"; \ # echo "Kindest regards"; \ -# echo "The upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ +# echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ else \ if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ echo "$(GARNAME) : Warning no files to check ! $(FILES2CHECK)" ; \ @@ -176,7 +176,8 @@ echo ""; \ echo "--"; \ echo "Kindest regards"; \ - echo "The upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ + echo "upstream notification job"; } ; \ +# echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ fi; \ fi @@ -212,8 +213,6 @@ fi; \ fi; \ else \ -echo GNU_MIRROR : $(GNU_MIRROR); \ -echo NEW_FILES : $$NEW_FILES; \ echo "$(GARNAME) : new upstream files available: $$NEW_FILES"; \ fi; \ fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 11 23:46:04 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 11 Dec 2008 22:46:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[2549] csw/mgar/gar/v1/gar.lib.mk Message-ID: Revision: 2549 http://gar.svn.sourceforge.net/gar/?rev=2549&view=rev Author: wbonnet Date: 2008-12-11 22:46:03 +0000 (Thu, 11 Dec 2008) Log Message: ----------- Modify email text Modified Paths: -------------- csw/mgar/gar/v1/gar.lib.mk Modified: csw/mgar/gar/v1/gar.lib.mk =================================================================== --- csw/mgar/gar/v1/gar.lib.mk 2008-12-11 22:42:43 UTC (rev 2548) +++ csw/mgar/gar/v1/gar.lib.mk 2008-12-11 22:46:03 UTC (rev 2549) @@ -149,7 +149,7 @@ # echo ""; \ # echo "--"; \ # echo "Kindest regards"; \ -# echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ +# echo "The upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ else \ if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ echo "$(GARNAME) : Warning no files to check ! $(FILES2CHECK)" ; \ @@ -176,8 +176,7 @@ echo ""; \ echo "--"; \ echo "Kindest regards"; \ - echo "upstream notification job"; } ; \ -# echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ + echo "The upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ fi; \ fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Fri Dec 12 00:02:13 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 11 Dec 2008 23:02:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[2550] csw/mgar/gar Message-ID: Revision: 2550 http://gar.svn.sourceforge.net/gar/?rev=2550&view=rev Author: wbonnet Date: 2008-12-11 23:02:13 +0000 (Thu, 11 Dec 2008) Log Message: ----------- Add detection of path in the the file name to check for updates If a web page contains filenames with directory path, only the filename is kept for comparison. Otherwise cookie cretion fails Modified Paths: -------------- csw/mgar/gar/v1/bin/upstream_watch csw/mgar/gar/v2/bin/upstream_watch Modified: csw/mgar/gar/v1/bin/upstream_watch =================================================================== --- csw/mgar/gar/v1/bin/upstream_watch 2008-12-11 22:46:03 UTC (rev 2549) +++ csw/mgar/gar/v1/bin/upstream_watch 2008-12-11 23:02:13 UTC (rev 2550) @@ -129,8 +129,14 @@ foreach my $url (@urls) { my $file_list = get_file_list ($url); - foreach my $file (@{$file_list}) { + foreach my $file (@{$file_list}) { if ($file =~ /^$file_pattern$/) { + my $char = '/'; + my $result = rindex($file, $char); + if ($result != -1) { + $file = substr $file , $result +1 ; + } + # we only keep the newest file for a given $file_pattern if (compare_versions ($1, $newest_version) > 0) { $newest_version = $1; Modified: csw/mgar/gar/v2/bin/upstream_watch =================================================================== --- csw/mgar/gar/v2/bin/upstream_watch 2008-12-11 22:46:03 UTC (rev 2549) +++ csw/mgar/gar/v2/bin/upstream_watch 2008-12-11 23:02:13 UTC (rev 2550) @@ -129,8 +129,14 @@ foreach my $url (@urls) { my $file_list = get_file_list ($url); - foreach my $file (@{$file_list}) { + foreach my $file (@{$file_list}) { if ($file =~ /^$file_pattern$/) { + my $char = '/'; + my $result = rindex($file, $char); + if ($result != -1) { + $file = substr $file , $result +1 ; + } + # we only keep the newest file for a given $file_pattern if (compare_versions ($1, $newest_version) > 0) { $newest_version = $1; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Fri Dec 12 00:04:13 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 11 Dec 2008 23:04:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[2551] csw/mgar/pkg/a52dec/trunk/Makefile Message-ID: Revision: 2551 http://gar.svn.sourceforge.net/gar/?rev=2551&view=rev Author: wbonnet Date: 2008-12-11 23:04:13 +0000 (Thu, 11 Dec 2008) Log Message: ----------- Fix upstream watch regexp Modified Paths: -------------- csw/mgar/pkg/a52dec/trunk/Makefile Modified: csw/mgar/pkg/a52dec/trunk/Makefile =================================================================== --- csw/mgar/pkg/a52dec/trunk/Makefile 2008-12-11 23:02:13 UTC (rev 2550) +++ csw/mgar/pkg/a52dec/trunk/Makefile 2008-12-11 23:04:13 UTC (rev 2551) @@ -7,12 +7,13 @@ liba52 is a free library for decoding ATSC A/52 streams. It is released under the terms of the GPL license. The A/52 standard is used in a variety of applications, including digital television and DVD. It is also known as AC-3. endef +UPSTREAM_MASTER_SITES = http://liba52.sourceforge.net/ MASTER_SITES = http://liba52.sourceforge.net/files/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWliba52, depend) # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = files/$(GARNAME)-(\d+(?:\.\d+)*).tar.gz CONFIGURE_ARGS = $(DIRPATHS) --enable-shared --disable-static This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Fri Dec 12 00:10:11 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 11 Dec 2008 23:10:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[2552] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 2552 http://gar.svn.sourceforge.net/gar/?rev=2552&view=rev Author: wbonnet Date: 2008-12-11 23:10:11 +0000 (Thu, 11 Dec 2008) Log Message: ----------- Add UFILES_REGEX Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2008-12-11 23:04:13 UTC (rev 2551) +++ csw/mgar/pkg/apache2/trunk/Makefile 2008-12-11 23:10:11 UTC (rev 2552) @@ -10,6 +10,9 @@ include files/config.mk +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = files/$(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # Dummy toplevel package DISTFILES += $(call admfiles,CSWapache2,depend prototype) # Runtime This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Fri Dec 12 00:12:15 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 11 Dec 2008 23:12:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[2553] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 2553 http://gar.svn.sourceforge.net/gar/?rev=2553&view=rev Author: wbonnet Date: 2008-12-11 23:12:14 +0000 (Thu, 11 Dec 2008) Log Message: ----------- Fix UFILEs_REGEX Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2008-12-11 23:10:11 UTC (rev 2552) +++ csw/mgar/pkg/apache2/trunk/Makefile 2008-12-11 23:12:14 UTC (rev 2553) @@ -11,7 +11,7 @@ include files/config.mk # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = files/$(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz # Dummy toplevel package DISTFILES += $(call admfiles,CSWapache2,depend prototype) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Fri Dec 12 00:20:10 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 11 Dec 2008 23:20:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[2554] csw/mgar/pkg/apg/trunk/Makefile Message-ID: Revision: 2554 http://gar.svn.sourceforge.net/gar/?rev=2554&view=rev Author: wbonnet Date: 2008-12-11 23:20:10 +0000 (Thu, 11 Dec 2008) Log Message: ----------- Fix UFILES_REGEX Modified Paths: -------------- csw/mgar/pkg/apg/trunk/Makefile Modified: csw/mgar/pkg/apg/trunk/Makefile =================================================================== --- csw/mgar/pkg/apg/trunk/Makefile 2008-12-11 23:12:14 UTC (rev 2553) +++ csw/mgar/pkg/apg/trunk/Makefile 2008-12-11 23:20:10 UTC (rev 2554) @@ -11,7 +11,8 @@ DISTFILES += $(call admfiles,CSWapg) # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = download/$(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UPSTREAM_MASTER_SITES = http://www.adel.nursat.kz/apg/download.shtml CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Fri Dec 12 00:24:43 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 11 Dec 2008 23:24:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[2555] csw/mgar/pkg/apr/trunk/Makefile Message-ID: Revision: 2555 http://gar.svn.sourceforge.net/gar/?rev=2555&view=rev Author: wbonnet Date: 2008-12-11 23:24:43 +0000 (Thu, 11 Dec 2008) Log Message: ----------- Fix MASTER_SITE (use mirror with directory mode access) Modified Paths: -------------- csw/mgar/pkg/apr/trunk/Makefile Modified: csw/mgar/pkg/apr/trunk/Makefile =================================================================== --- csw/mgar/pkg/apr/trunk/Makefile 2008-12-11 23:20:10 UTC (rev 2554) +++ csw/mgar/pkg/apr/trunk/Makefile 2008-12-11 23:24:43 UTC (rev 2555) @@ -9,7 +9,7 @@ interface to underlying platform-specific implementations. endef -MASTER_SITES = http://apache.mirrored.ca/apr/ +MASTER_SITES = http://apache.crihan.fr/dist/apr/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWapr,depend prototype) DISTFILES += $(call admfiles,CSWapr-devel,depend prototype) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Fri Dec 12 00:27:40 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 11 Dec 2008 23:27:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[2556] csw/mgar/pkg/apr-util/trunk/Makefile Message-ID: Revision: 2556 http://gar.svn.sourceforge.net/gar/?rev=2556&view=rev Author: wbonnet Date: 2008-12-11 23:27:40 +0000 (Thu, 11 Dec 2008) Log Message: ----------- Fix MASTER_SITE (use mirror with directory mode) Modified Paths: -------------- csw/mgar/pkg/apr-util/trunk/Makefile Modified: csw/mgar/pkg/apr-util/trunk/Makefile =================================================================== --- csw/mgar/pkg/apr-util/trunk/Makefile 2008-12-11 23:24:43 UTC (rev 2555) +++ csw/mgar/pkg/apr-util/trunk/Makefile 2008-12-11 23:27:40 UTC (rev 2556) @@ -9,7 +9,7 @@ interface to underlying platform-specific implementations. endef -MASTER_SITES = http://apache.mirrored.ca/apr/ +MASTER_SITES = http://apache.crihan.fr/dist/apr/ MASTER_SITES += http://apache.webthing.com/database/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz #DISTFILES += apr_dbd_mysql.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Fri Dec 12 00:31:09 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 11 Dec 2008 23:31:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[2557] csw/mgar/pkg/arpwatch/trunk/Makefile Message-ID: Revision: 2557 http://gar.svn.sourceforge.net/gar/?rev=2557&view=rev Author: wbonnet Date: 2008-12-11 23:31:08 +0000 (Thu, 11 Dec 2008) Log Message: ----------- Add UWATCH_REGEX Modified Paths: -------------- csw/mgar/pkg/arpwatch/trunk/Makefile Modified: csw/mgar/pkg/arpwatch/trunk/Makefile =================================================================== --- csw/mgar/pkg/arpwatch/trunk/Makefile 2008-12-11 23:27:40 UTC (rev 2556) +++ csw/mgar/pkg/arpwatch/trunk/Makefile 2008-12-11 23:31:08 UTC (rev 2557) @@ -13,6 +13,9 @@ # Smf/init stuffs DISTFILES += cswarpwatch.xml svc-cswarpwatch cswarpwatch arpwatch.conf +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # This patch add an system header include # in arpwatch.h so u_int32 is defined # TODO: this should be done in configure This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From william at wbonnet.net Thu Dec 11 23:42:31 2008 From: william at wbonnet.net (William Bonnet) Date: Thu, 11 Dec 2008 23:42:31 +0100 Subject: [csw-devel] Upstream Watch progress report Message-ID: <49419757.1030503@wbonnet.net> Hi all As some of you already noticed today, the "upstream watch" task is now running. Upstream watch, aka uwatch, is a task running every night, that check for each of the package present in GAR if a newer version of sources is available from the MASTER_SITE (GAR variable defining the site from which you download the sources). If a newer version is detected, the maintainer is warned. The notification email will be sent once a month. Soon a mantis entry will also be inserted. Declaring an "need for update bug". Since this script is still pretty new, it may have bugs. So feedback are welcomed :) I will add soon more features, like : . Sending email to maintainer with incomplete or invalid "upstream check information" in the makefile. So far i receive the email and will try to fix a few things in the coming days. This happens when either the MASTER_SITE or the regular expression used by uwatch are invalid . Sending an email asking the maintainer to configure uwatch information in the makefile (need to write some howtos before) . Sending an email asking the maintainer if they want to add there packages to gar if they are missing from svn . Sending an email to our beloved release master, notifying him that some package are in svn and GAR and have never been released :) Trygve, if you have time in the next weeks, we can look to a possibility of make this working together with Hudson. Cheers, -- William http://www.wbonnet.net http://www.sunwizard.net Le site fran?ais des amateurs de stations Unix http://www.blastwave.org An OpenSolaris Community Site http://www.opencsw.org Community SoftWare for Solaris http://www.guses.org French speaking Solaris User Group From bonivart at users.sourceforge.net Fri Dec 12 11:03:45 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 12 Dec 2008 10:03:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[2558] csw/mgar/pkg/cpan/DBD-SQLite/trunk/Makefile Message-ID: Revision: 2558 http://gar.svn.sourceforge.net/gar/?rev=2558&view=rev Author: bonivart Date: 2008-12-12 10:03:45 +0000 (Fri, 12 Dec 2008) Log Message: ----------- DBD-SQLite: updated Makefile version Modified Paths: -------------- csw/mgar/pkg/cpan/DBD-SQLite/trunk/Makefile Modified: csw/mgar/pkg/cpan/DBD-SQLite/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DBD-SQLite/trunk/Makefile 2008-12-11 23:31:08 UTC (rev 2557) +++ csw/mgar/pkg/cpan/DBD-SQLite/trunk/Makefile 2008-12-12 10:03:45 UTC (rev 2558) @@ -1,5 +1,5 @@ GARNAME = DBD-SQLite -GARVERSION = 1.13 +GARVERSION = 1.14 CATEGORIES = cpan AUTHOR = MSERGEANT 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 Dec 12 11:12:39 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 12 Dec 2008 10:12:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[2559] csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/ Makefile Message-ID: Revision: 2559 http://gar.svn.sourceforge.net/gar/?rev=2559&view=rev Author: bonivart Date: 2008-12-12 10:12:38 +0000 (Fri, 12 Dec 2008) Log Message: ----------- Module-Load-Conditional: updated Makefile version Modified Paths: -------------- csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile Modified: csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile 2008-12-12 10:03:45 UTC (rev 2558) +++ csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile 2008-12-12 10:12:38 UTC (rev 2559) @@ -1,5 +1,5 @@ GARNAME = Module-Load-Conditional -GARVERSION = 0.16 +GARVERSION = 0.26 CATEGORIES = cpan AUTHOR = KANE 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 Dec 12 15:03:50 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 12 Dec 2008 14:03:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[2560] csw/mgar/pkg/xmlto/trunk Message-ID: Revision: 2560 http://gar.svn.sourceforge.net/gar/?rev=2560&view=rev Author: bdwalton Date: 2008-12-12 14:03:50 +0000 (Fri, 12 Dec 2008) Log Message: ----------- cut external gar reference to mgar v2 Modified Paths: -------------- csw/mgar/pkg/xmlto/trunk/Makefile csw/mgar/pkg/xmlto/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/xmlto/trunk/ Property changes on: csw/mgar/pkg/xmlto/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/xmlto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlto/trunk/Makefile 2008-12-12 10:12:38 UTC (rev 2559) +++ csw/mgar/pkg/xmlto/trunk/Makefile 2008-12-12 14:03:50 UTC (rev 2560) @@ -3,6 +3,8 @@ CATEGORIES = utils PREREQUISITE_PKGS = CSWmktemp CSWfindutils CSWdocbookxsl CSWlibxslt CSWflex +REQUIRES_PKGS = CSWsgmlcommon CSWxmlcommon CSWlibxml2 CSWdocbookdtds +REQUIRES_PKGS += CSWdocbookxsl CSWlibxslt CSWflex CSWw3m DESCRIPTION = An XSL toolchain front end. define BLURB @@ -13,7 +15,7 @@ MASTER_SITES = https://fedorahosted.org/$(GARNAME)/export/1/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += $(call admfiles,CSWxmlto,depend) +#DISTFILES += $(call admfiles,CSWxmlto,depend) TEST_TARGET = check Modified: csw/mgar/pkg/xmlto/trunk/checksums =================================================================== --- csw/mgar/pkg/xmlto/trunk/checksums 2008-12-12 10:12:38 UTC (rev 2559) +++ csw/mgar/pkg/xmlto/trunk/checksums 2008-12-12 14:03:50 UTC (rev 2560) @@ -1,3 +1 @@ cc2039dedc81f1a56b06e5fdac6f7570 download/xmlto-0.0.21.tar.bz2 -3f51dd8ed4ca7795397702250254a6fb download/CSWxmlto.gspec -492cea1bbf25f9ab97f43582e6bd429a download/CSWxmlto.depend 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 Dec 12 16:53:02 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 12 Dec 2008 15:53:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[2561] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 2561 http://gar.svn.sourceforge.net/gar/?rev=2561&view=rev Author: bonivart Date: 2008-12-12 15:53:01 +0000 (Fri, 12 Dec 2008) Log Message: ----------- pkgutil: 1.3 release 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 2008-12-12 14:03:50 UTC (rev 2560) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2008-12-12 15:53:01 UTC (rev 2561) @@ -1,5 +1,5 @@ GARNAME = pkgutil -GARVERSION = 1.3b2 +GARVERSION = 1.3 CATEGORIES = utils DESCRIPTION = Installs Solaris packages easily Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2008-12-12 14:03:50 UTC (rev 2560) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2008-12-12 15:53:01 UTC (rev 2561) @@ -1,4 +1,4 @@ -3973b2172d45390dc9884f83109671a8 download/pkgutil-1.3b2.zip +1b930b0ac7aee3f9523a07ad27bdb211 download/pkgutil-1.3.zip 805cd30ad9f21cb1167d166fa99b5891 download/CSWpkgutil.gspec 2f561d7f40289fac9bd02d2504b73693 download/CSWpkgutil.prototype bea1e5ef39a8389b9feaa18938993205 download/CSWpkgutil.postinstall 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 Dec 12 18:15:38 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 12 Dec 2008 17:15:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[2562] csw/mgar/pkg/cpan/libwww-perl/trunk Message-ID: Revision: 2562 http://gar.svn.sourceforge.net/gar/?rev=2562&view=rev Author: bonivart Date: 2008-12-12 17:15:38 +0000 (Fri, 12 Dec 2008) Log Message: ----------- libwww-perl: switched to gar v2 Modified Paths: -------------- csw/mgar/pkg/cpan/libwww-perl/trunk/Makefile csw/mgar/pkg/cpan/libwww-perl/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/cpan/libwww-perl/trunk/ Property changes on: csw/mgar/pkg/cpan/libwww-perl/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/libwww-perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/libwww-perl/trunk/Makefile 2008-12-12 15:53:01 UTC (rev 2561) +++ csw/mgar/pkg/cpan/libwww-perl/trunk/Makefile 2008-12-12 17:15:38 UTC (rev 2562) @@ -1,5 +1,5 @@ GARNAME = libwww-perl -GARVERSION = 5.820 +GARVERSION = 5.822 CATEGORIES = cpan AUTHOR = GAAS @@ -11,9 +11,12 @@ used. endef -#DISTFILES += $(call admfiles,CSWpmlibwww,depend prototype) -DISTFILES += $(call admfiles,CSWpmlibwww,depend) +DISTFILES += $(call admfiles,CSWpmlibwww,) +REQUIRED_PKGS = CSWpmhtmltagset CSWpmuri CSWpmhtmlparser CSWpmcompresszlib CSWpmhtmlfmt CSWpmmimebase64 + +EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod + DEPENDS += cpan/URI DEPENDS += cpan/HTML-Parser DEPENDS += cpan/Crypt-SSLeay Modified: csw/mgar/pkg/cpan/libwww-perl/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/libwww-perl/trunk/checksums 2008-12-12 15:53:01 UTC (rev 2561) +++ csw/mgar/pkg/cpan/libwww-perl/trunk/checksums 2008-12-12 17:15:38 UTC (rev 2562) @@ -1,3 +1,2 @@ 7f2db1cb966b9260b395fdbc01b09fae download/CSWpmlibwww.gspec -71b8fe3c44d3bfaa7e8d1eaec794b24e download/CSWpmlibwww.depend -761f87c2e47f57633c9537f532f82e49 download/libwww-perl-5.820.tar.gz +5b5856e0d61abb75fb5f52ed1678161f download/libwww-perl-5.822.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvel at opencsw.org Fri Dec 12 19:09:03 2008 From: trygvel at opencsw.org (=?ISO-8859-1?Q?Trygve_Laugst=F8l?=) Date: Fri, 12 Dec 2008 19:09:03 +0100 Subject: [csw-devel] Upstream Watch progress report In-Reply-To: <49419757.1030503@wbonnet.net> References: <49419757.1030503@wbonnet.net> Message-ID: <4942A8BF.1010201@opencsw.org> William Bonnet wrote: [snip] > Trygve, if you have time in the next weeks, we can look to a possibility > of make this working together with Hudson. Let me know what you want and I can get it into Hudson. -- Trygve From bdwalton at users.sourceforge.net Fri Dec 12 19:18:45 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 12 Dec 2008 18:18:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[2563] csw/mgar/pkg/xmlto/trunk Message-ID: Revision: 2563 http://gar.svn.sourceforge.net/gar/?rev=2563&view=rev Author: bdwalton Date: 2008-12-12 18:18:44 +0000 (Fri, 12 Dec 2008) Log Message: ----------- updated xmlto description to get a license into the package. Modified Paths: -------------- csw/mgar/pkg/xmlto/trunk/Makefile csw/mgar/pkg/xmlto/trunk/checksums csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.gspec Added Paths: ----------- csw/mgar/pkg/xmlto/trunk/files/GPL Modified: csw/mgar/pkg/xmlto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlto/trunk/Makefile 2008-12-12 17:15:38 UTC (rev 2562) +++ csw/mgar/pkg/xmlto/trunk/Makefile 2008-12-12 18:18:44 UTC (rev 2563) @@ -15,7 +15,7 @@ MASTER_SITES = https://fedorahosted.org/$(GARNAME)/export/1/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -#DISTFILES += $(call admfiles,CSWxmlto,depend) +DISTFILES += $(call admfiles,CSWxmlto) GPL TEST_TARGET = check @@ -38,6 +38,8 @@ CONFIGURE_ARGS += --with-bash=/opt/csw/bin/bash CONFIGURE_ARGS += --with-getopt=/opt/csw/bin/ggetopt +EXTRACT_TARGETS-global = $(call admfiles,CSWxmlto) GPL + include gar/category.mk # We need this for 'tail -n' Modified: csw/mgar/pkg/xmlto/trunk/checksums =================================================================== --- csw/mgar/pkg/xmlto/trunk/checksums 2008-12-12 17:15:38 UTC (rev 2562) +++ csw/mgar/pkg/xmlto/trunk/checksums 2008-12-12 18:18:44 UTC (rev 2563) @@ -1 +1,3 @@ cc2039dedc81f1a56b06e5fdac6f7570 download/xmlto-0.0.21.tar.bz2 +ca57ac3300751be169587c70ee43d421 download/CSWxmlto.gspec +0636e73ff0215e8d672dc4c32c317bb3 download/GPL Modified: csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.gspec =================================================================== --- csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.gspec 2008-12-12 17:15:38 UTC (rev 2562) +++ csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.gspec 2008-12-12 18:18:44 UTC (rev 2563) @@ -1,4 +1,4 @@ %var bitname xmlto %var pkgname CSWxmlto %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING +%copyright url file://%{WORKDIR}/GPL Added: csw/mgar/pkg/xmlto/trunk/files/GPL =================================================================== --- csw/mgar/pkg/xmlto/trunk/files/GPL (rev 0) +++ csw/mgar/pkg/xmlto/trunk/files/GPL 2008-12-12 18:18:44 UTC (rev 2563) @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU 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. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), 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 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 show them these terms so they know 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. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + 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 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 derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 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 License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +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. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary 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 + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 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 Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing 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 for copying, distributing or modifying +the Program or works based on it. + + 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. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. 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 this 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 +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. 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 + + 11. 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. + + 12. 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 + + 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 the public, 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 2 of the License, 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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) 19yy 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 is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. 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 Dec 12 19:36:41 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 12 Dec 2008 18:36:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[2564] csw/mgar/pkg/openjade/trunk/ Message-ID: Revision: 2564 http://gar.svn.sourceforge.net/gar/?rev=2564&view=rev Author: bdwalton Date: 2008-12-12 18:36:41 +0000 (Fri, 12 Dec 2008) Log Message: ----------- switch to gar v2 Property Changed: ---------------- csw/mgar/pkg/openjade/trunk/ Property changes on: csw/mgar/pkg/openjade/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 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 Dec 12 21:55:07 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 12 Dec 2008 20:55:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[2565] csw/mgar/pkg/libpopt/trunk Message-ID: Revision: 2565 http://gar.svn.sourceforge.net/gar/?rev=2565&view=rev Author: dmichelsen Date: 2008-12-12 20:55:07 +0000 (Fri, 12 Dec 2008) Log Message: ----------- libpopt: Update to 1.14 and mGAR v2 Modified Paths: -------------- csw/mgar/pkg/libpopt/trunk/Makefile csw/mgar/pkg/libpopt/trunk/checksums csw/mgar/pkg/libpopt/trunk/files/CSWlibpopt.gspec Removed Paths: ------------- csw/mgar/pkg/libpopt/trunk/files/CSWlibpopt.depend Property Changed: ---------------- csw/mgar/pkg/libpopt/trunk/ Property changes on: csw/mgar/pkg/libpopt/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/libpopt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libpopt/trunk/Makefile 2008-12-12 18:36:41 UTC (rev 2564) +++ csw/mgar/pkg/libpopt/trunk/Makefile 2008-12-12 20:55:07 UTC (rev 2565) @@ -1,5 +1,5 @@ GARNAME = popt -GARVERSION = 1.13 +GARVERSION = 1.14 CATEGORIES = lib DESCRIPTION = Popt is a C library for parsing command line parameters @@ -8,14 +8,17 @@ MASTER_SITES = http://rpm5.org/files/$(GARNAME)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWlibpopt,depend) +DISTFILES += $(call admfiles,CSWlibpopt) UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +REQUIRED_PKGS = CSWggettext CSWiconv + +BUILD64 = 1 +NORUNPATH = 1 + CONFIGURE_ARGS = $(DIRPATHS) -EXTRA_BUILD_ISAS_sparc = sparcv9 - TEST_TARGET = check include gar/category.mk Modified: csw/mgar/pkg/libpopt/trunk/checksums =================================================================== --- csw/mgar/pkg/libpopt/trunk/checksums 2008-12-12 18:36:41 UTC (rev 2564) +++ csw/mgar/pkg/libpopt/trunk/checksums 2008-12-12 20:55:07 UTC (rev 2565) @@ -1,3 +1,2 @@ -b5c47ce0185c83f947953c77000533bf download/popt-1.13.tar.gz -d20ca7ebe60fd59a2b771186ae97d474 download/CSWlibpopt.gspec -fecba5106ba279bc0c6279dbe23c33d4 download/CSWlibpopt.depend +4f90a07316eb825604dd10ae4f9f3f04 download/popt-1.14.tar.gz +ee4e9a79a4e5dc3ccc90413ec229e51a download/CSWlibpopt.gspec Deleted: csw/mgar/pkg/libpopt/trunk/files/CSWlibpopt.depend =================================================================== --- csw/mgar/pkg/libpopt/trunk/files/CSWlibpopt.depend 2008-12-12 18:36:41 UTC (rev 2564) +++ csw/mgar/pkg/libpopt/trunk/files/CSWlibpopt.depend 2008-12-12 20:55:07 UTC (rev 2565) @@ -1,2 +0,0 @@ -system CSWggettext ggettext - GNU gettext -system CSWiconv libiconv - GNU iconv library Modified: csw/mgar/pkg/libpopt/trunk/files/CSWlibpopt.gspec =================================================================== --- csw/mgar/pkg/libpopt/trunk/files/CSWlibpopt.gspec 2008-12-12 18:36:41 UTC (rev 2564) +++ csw/mgar/pkg/libpopt/trunk/files/CSWlibpopt.gspec 2008-12-12 20:55:07 UTC (rev 2565) @@ -1,4 +1,4 @@ %var bitname libpopt %var pkgname CSWlibpopt %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING +%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 Dec 12 22:07:36 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 12 Dec 2008 21:07:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[2566] csw/mgar/pkg/readline/trunk Message-ID: Revision: 2566 http://gar.svn.sourceforge.net/gar/?rev=2566&view=rev Author: dmichelsen Date: 2008-12-12 21:07:36 +0000 (Fri, 12 Dec 2008) Log Message: ----------- readline: Add legacy build description for reference Added Paths: ----------- csw/mgar/pkg/readline/trunk/legacy/ csw/mgar/pkg/readline/trunk/legacy/readline/ csw/mgar/pkg/readline/trunk/legacy/readline/build.sparc csw/mgar/pkg/readline/trunk/legacy/readline/build.x86 csw/mgar/pkg/readline/trunk/legacy/readline/copyright csw/mgar/pkg/readline/trunk/legacy/readline/pkginfo csw/mgar/pkg/readline/trunk/legacy/readline/prototype Added: csw/mgar/pkg/readline/trunk/legacy/readline/build.sparc =================================================================== --- csw/mgar/pkg/readline/trunk/legacy/readline/build.sparc (rev 0) +++ csw/mgar/pkg/readline/trunk/legacy/readline/build.sparc 2008-12-12 21:07:36 UTC (rev 2566) @@ -0,0 +1,74 @@ +#!/bin/sh + +VERSION=5.1 +BASE=/export/medusa/mark +HOST=ra + +cd $BASE/build-$HOST +rm -rf readline-$VERSION +gtar xzvf /export/medusa/src/readline-$VERSION.tar.gz +cd readline-$VERSION + +# First, make 64-bit version + +LD_OPTIONS="-R/opt/csw/lib/64 -L/opt/csw/lib/64 -z defs -lc -lcurses" CC="cc -fast -xtarget=ultra -xarch=v9" ./configure --prefix=/opt/csw + +LD_OPTIONS="-R/opt/csw/lib/64 -L/opt/csw/lib/64 -z defs -lc -lcurses" CC="cc -fast -xtarget=ultra -xarch=v9" gmake + +gmake prefix=$BASE/build-$HOST/readline-$VERSION/cswstage/opt/csw install +LD_OPTIONS="-R/opt/csw/lib/64 -L/opt/csw/lib/64 -z defs -lc -lcurses" CC="cc -fast -xtarget=ultra -xarch=v9" gmake shared +gmake prefix=$BASE/build-$HOST/readline-$VERSION/cswstage/opt/csw install-shared + +cd cswstage/opt/csw/lib +mkdir sparcv9 +mv *.so* *.a* sparcv9/ + + + +# Now, build the 32-bit version + +cd ../../../../ +gmake distclean + +LD_OPTIONS="-R/opt/csw/lib -L/opt/csw/lib -z defs -lc -lcurses" CC="cc -fast -xarch=v8" ./configure --prefix=/opt/csw +LD_OPTIONS="-R/opt/csw/lib -L/opt/csw/lib -z defs -lc -lcurses" CC="cc -fast -xarch=v8" gmake +gmake prefix=$BASE/build-$HOST/readline-$VERSION/cswstage/opt/csw install +LD_OPTIONS="-R/opt/csw/lib -L/opt/csw/lib -z defs -lc -lcurses" CC="cc -fast -xarch=v8" gmake shared +gmake prefix=$BASE/build-$HOST/readline-$VERSION/cswstage/opt/csw install-shared + + +echo "Waiting for input - do any additional stuff now..." +read input + +# Clean up according to CSW standards +cd cswstage/opt/csw +[ ! -d share ] && mkdir share +for dir in man doc info; do + [ -d $dir ] && mv $dir share/ && ln -s share/$dir $dir +done + + +cd ../../ + +# Bug in the makefiles... +find . -name '*.old' -exec rm {} + + +pkgproto . | sed "s/e opt/e \/opt/" | sed "s/mark csw/root bin/" > prototype.full +echo "i pkginfo" > prototype.tmp +echo "i copyright" >> prototype.tmp +cat prototype.full >> prototype.tmp +rm prototype.full + +cat prototype.tmp | sed "/info\/dir 0644/d" | sed "/info=share/d" | sed "/man=share/d" | sed "/doc=share/d" | sed "/opt 0755/d" | sed "/prototype.full/d" > prototype +rm prototype.tmp + + +for file in copyright pkginfo; do + cp /export/home/mark/pkgs/readline/$file . +done + +createpkg -r . + +mv *.gz /export/home/mark/pkgs/readline/ + +echo "All done!" Property changes on: csw/mgar/pkg/readline/trunk/legacy/readline/build.sparc ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/readline/trunk/legacy/readline/build.x86 =================================================================== --- csw/mgar/pkg/readline/trunk/legacy/readline/build.x86 (rev 0) +++ csw/mgar/pkg/readline/trunk/legacy/readline/build.x86 2008-12-12 21:07:36 UTC (rev 2566) @@ -0,0 +1,51 @@ +#!/bin/sh + +VERSION=5.1 +BASE=/export/medusa/mark +HOST=thor + +cd $BASE/build-$HOST +rm -rf readline-$VERSION +gtar xzvf /export/medusa/src/readline-$VERSION.tar.gz +cd readline-$VERSION + +LD_OPTIONS="-R/opt/csw/lib -L/opt/csw/lib -z defs -lc -lcurses" CC="cc -fast -xarch=386" ./configure --prefix=/opt/csw +LD_OPTIONS="-R/opt/csw/lib -L/opt/csw/lib -z defs -lc -lcurses" CC="cc -fast -xarch=386" gmake +gmake prefix=$BASE/build-$HOST/readline-$VERSION/cswstage/opt/csw install +LD_OPTIONS="-R/opt/csw/lib -L/opt/csw/lib -z defs -lc -lcurses" CC="cc -fast -xarch=386" gmake shared +gmake prefix=$BASE/build-$HOST/readline-$VERSION/cswstage/opt/csw install-shared + +echo "Waiting for input - perform any additional stuff now." +read input + +# Clean up according to CSW standards +cd cswstage/opt/csw +[ ! -d share ] && mkdir share +for dir in man doc info; do + [ -d $dir ] && mv $dir share/ && ln -s share/$dir $dir +done + +cd ../../ + +# Bug in the makefiles... +find . -name '*.old' -exec rm {} + + +pkgproto . | sed "s/e opt/e \/opt/" | sed "s/mark other/root bin/" > prototype.full +echo "i pkginfo" > prototype.tmp +echo "i copyright" >> prototype.tmp +cat prototype.full >> prototype.tmp +rm prototype.full + +cat prototype.tmp | sed "/info\/dir 0644/d" | sed "/info=share/d" | sed "/man=share/d" | sed "/doc=share/d" | sed "/opt 0755/d" | sed "/prototype.full/d" > prototype +rm prototype.tmp + + +for file in copyright pkginfo; do + cp /export/home/mark/pkgs/readline/$file . +done + +createpkg -r . + +mv *.gz /export/home/mark/pkgs/readline/ + +echo "All done!" Property changes on: csw/mgar/pkg/readline/trunk/legacy/readline/build.x86 ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/readline/trunk/legacy/readline/copyright =================================================================== --- csw/mgar/pkg/readline/trunk/legacy/readline/copyright (rev 0) +++ csw/mgar/pkg/readline/trunk/legacy/readline/copyright 2008-12-12 21:07:36 UTC (rev 2566) @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU 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. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), 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 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 show them these terms so they know 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. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + 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 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 derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 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 License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +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. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary 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 + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 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 Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing 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 for copying, distributing or modifying +the Program or works based on it. + + 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. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. 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 this 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 +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. 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 + + 11. 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. + + 12. 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 the public, 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 2 of the License, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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) 19yy 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 is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. Added: csw/mgar/pkg/readline/trunk/legacy/readline/pkginfo =================================================================== --- csw/mgar/pkg/readline/trunk/legacy/readline/pkginfo (rev 0) +++ csw/mgar/pkg/readline/trunk/legacy/readline/pkginfo 2008-12-12 21:07:36 UTC (rev 2566) @@ -0,0 +1,7 @@ +PKG=CSWreadline +NAME=readline - library to enable interactive line editing +VERSION=5.1 +CATEGORY=system +VENDOR=http://ftp.gnu.org/pub/gnu/readline/ packaged for CSW by Mark Round +HOTLINE=http://www.blastwave.org/bugtrack/ +EMAIL=mark at blastwave.org Added: csw/mgar/pkg/readline/trunk/legacy/readline/prototype =================================================================== --- csw/mgar/pkg/readline/trunk/legacy/readline/prototype (rev 0) +++ csw/mgar/pkg/readline/trunk/legacy/readline/prototype 2008-12-12 21:07:36 UTC (rev 2566) @@ -0,0 +1,18 @@ +i pkginfo +i copyright +d none /opt/csw 0755 root bin +d none /opt/csw/lib 0755 root bin +f none /opt/csw/lib/libhistory.so.4 0644 root bin +s none /opt/csw/lib/libhistory.so=libhistory.so.4 +f none /opt/csw/lib/libreadline.so.4 0644 root bin +s none /opt/csw/lib/libreadline.so=libreadline.so.4 +d none /opt/csw/include 0755 root bin +d none /opt/csw/include/readline 0755 root bin +f none /opt/csw/include/readline/readline.h 0644 root bin +f none /opt/csw/include/readline/chardefs.h 0644 root bin +f none /opt/csw/include/readline/keymaps.h 0644 root bin +f none /opt/csw/include/readline/history.h 0644 root bin +f none /opt/csw/include/readline/tilde.h 0644 root bin +f none /opt/csw/include/readline/rlstdc.h 0644 root bin +f none /opt/csw/include/readline/rlconf.h 0644 root bin +f none /opt/csw/include/readline/rltypedefs.h 0644 root bin 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 Dec 12 22:15:11 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 12 Dec 2008 21:15:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[2567] csw/mgar/pkg Message-ID: Revision: 2567 http://gar.svn.sourceforge.net/gar/?rev=2567&view=rev Author: dmichelsen Date: 2008-12-12 21:15:09 +0000 (Fri, 12 Dec 2008) Log Message: ----------- postgresql: Make stub package with legacy build description from leaving maintainer Added Paths: ----------- csw/mgar/pkg/postgresql/ csw/mgar/pkg/postgresql/branches/ csw/mgar/pkg/postgresql/tags/ csw/mgar/pkg/postgresql/trunk/ csw/mgar/pkg/postgresql/trunk/Makefile csw/mgar/pkg/postgresql/trunk/files/ csw/mgar/pkg/postgresql/trunk/legacy/ csw/mgar/pkg/postgresql/trunk/legacy/README csw/mgar/pkg/postgresql/trunk/legacy/libpq/ csw/mgar/pkg/postgresql/trunk/legacy/libpq/checkinstall csw/mgar/pkg/postgresql/trunk/legacy/libpq/compat.sparc.tgz csw/mgar/pkg/postgresql/trunk/legacy/libpq/compat.x86.tgz csw/mgar/pkg/postgresql/trunk/legacy/libpq/copyright csw/mgar/pkg/postgresql/trunk/legacy/libpq/depend csw/mgar/pkg/postgresql/trunk/legacy/libpq/pkginfo csw/mgar/pkg/postgresql/trunk/legacy/libpq/prototype.append csw/mgar/pkg/postgresql/trunk/legacy/postgresql/ csw/mgar/pkg/postgresql/trunk/legacy/postgresql/BUILD.notes csw/mgar/pkg/postgresql/trunk/legacy/postgresql/README-CSW.txt.sparc csw/mgar/pkg/postgresql/trunk/legacy/postgresql/README-CSW.txt.x86 csw/mgar/pkg/postgresql/trunk/legacy/postgresql/build.sparc csw/mgar/pkg/postgresql/trunk/legacy/postgresql/build.x86 csw/mgar/pkg/postgresql/trunk/legacy/postgresql/copyright csw/mgar/pkg/postgresql/trunk/legacy/postgresql/cswpostgres.sparc csw/mgar/pkg/postgresql/trunk/legacy/postgresql/cswpostgres.x86 csw/mgar/pkg/postgresql/trunk/legacy/postgresql/depend csw/mgar/pkg/postgresql/trunk/legacy/postgresql/libpqfiles.sparc csw/mgar/pkg/postgresql/trunk/legacy/postgresql/libpqfiles.x86 csw/mgar/pkg/postgresql/trunk/legacy/postgresql/pkginfo csw/mgar/pkg/postgresql/trunk/legacy/postgresql/postgresql.conf.sparc csw/mgar/pkg/postgresql/trunk/legacy/postgresql/postgresql.conf.x86 csw/mgar/pkg/postgresql/trunk/legacy/postgresql/postinstall csw/mgar/pkg/postgresql/trunk/legacy/postgresql/preremove csw/mgar/pkg/postgresql/trunk/legacy/postgresql/prototype.append csw/mgar/pkg/postgresql/trunk/legacy/postgresqlcontrib/ csw/mgar/pkg/postgresql/trunk/legacy/postgresqlcontrib/copyright csw/mgar/pkg/postgresql/trunk/legacy/postgresqlcontrib/depend csw/mgar/pkg/postgresql/trunk/legacy/postgresqlcontrib/pkginfo csw/mgar/pkg/postgresql/trunk/legacy/scripts/ csw/mgar/pkg/postgresql/trunk/legacy/scripts/env Property changes on: csw/mgar/pkg/postgresql/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 Added: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile (rev 0) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,16 @@ +GARNAME = package +GARVERSION = 1.0 +CATEGORIES = category + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWpackage,) + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/postgresql/trunk/legacy/README =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/README (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/README 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,37 @@ +Here are my postgresql scripts. + +Horrible and ugly, I know :( + +All you should need to do is unpack this in a ~/pkgs/ directory, tweak +a few things, and run. My standard was to have my home directory set +up like : + +pkgs/ for all build scripts, copyright, etc. +build- for each build host. + +And source under /export/medusa/src. + +So, on running these, you'd end up with ~/build-/postgresql-8.3.3. + +The scripts then move parts of the postgresql install into different +staging directories (and, in the case of libpq, unpack a +"compatibility" tarball) and then package them up in to the +appropriate ~/pkgs/ directories. The compat tarballs +could possibly be removed if everyone relinks their packages when +needed. It's a bit of a pain when a new upstream major version comes +out and you then have to include the previous libraries in... + +So you'll end up with packages under postgresql, postgresqlcontrib, and libpq. + +For some reason, the last time I tried this, I had to manually go into +the staging directory for postgresqlcontrib and run "createpkg -r ." - +not sure why this didn't work automatically. + +Like I say - these are pretty horrible and ugly, particularly the +sparc build script which produces the combined 32/64-bit package. But +they worked for years, so I never got round to moving them into GAR. I +hope these work for you - even though I've left the project, please do +contact me if you have any questions at all about them. + +-Mark + Added: csw/mgar/pkg/postgresql/trunk/legacy/libpq/checkinstall =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/libpq/checkinstall (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/libpq/checkinstall 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,36 @@ +#!/bin/sh + +# Check if the /opt/csw/libpq.so file exists, and if it is part +# of the CSWpostgresql package. If so, it's an old version of +# PostgreSQL and we can't continue... + +if [ -f "/opt/csw/lib/libpq.so" ]; then + if [ "`/usr/sbin/pkgchk -l -p /opt/csw/lib/libpq.so | grep CSWpostgresql 2> /dev/null`" ]; then + echo "*** WARNING ***" + echo " The installation has been aborted." + echo " " + echo " From version 7.3.5 onwards, the PostgreSQL package from blastwave.org" + echo " has been split into two parts. This is the 'libpq' package, which " + echo " contains core libraries and headers needed for PostgreSQL development." + echo " It is also needed by the 'postgresql' package, which contains the server" + echo " and clients." + echo " " + echo " It appears that you are attempting to upgrade an older release of PostgreSQL." + echo " You will need to manually stop the server and uninstall the CSWpostgresql " + echo " package before trying again - as the libpq package will otherwise conflict" + echo " with the currently installed postgresql package. " + echo " " + echo " You can do this with the following commands (as root) :" + echo " " + echo " /etc/init.d/cswpostgres stop" + echo " pkgrm CSWpostgresql" + echo " " + echo " Uninstalling the old version in this way will NOT affect your databases." + echo "*** WARNING ***" + + exit 1 + + fi + +fi + Property changes on: csw/mgar/pkg/postgresql/trunk/legacy/libpq/checkinstall ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/postgresql/trunk/legacy/libpq/compat.sparc.tgz =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/postgresql/trunk/legacy/libpq/compat.sparc.tgz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/postgresql/trunk/legacy/libpq/compat.x86.tgz =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/postgresql/trunk/legacy/libpq/compat.x86.tgz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/postgresql/trunk/legacy/libpq/copyright =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/libpq/copyright (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/libpq/copyright 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,23 @@ +PostgreSQL Database Management System +(formerly known as Postgres, then as Postgres95) + +Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group + +Portions Copyright (c) 1994, The Regents of the University of California + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose, without fee, and without a written agreement +is hereby granted, provided that the above copyright notice and this +paragraph and the following two paragraphs appear in all copies. + +IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR +DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING +LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS +DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + +THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS +ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO +PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. Added: csw/mgar/pkg/postgresql/trunk/legacy/libpq/depend =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/libpq/depend (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/libpq/depend 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,5 @@ +P CSWreadline +P CSWosslrt +P CSWzlib +P CSWisaexec + Added: csw/mgar/pkg/postgresql/trunk/legacy/libpq/pkginfo =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/libpq/pkginfo (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/libpq/pkginfo 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,8 @@ +PKG=CSWlibpq +NAME=libpq - libraries needed by postgresql server and clients +VERSION=8.3.3,REV=2008.06.26 +CATEGORY=application +VENDOR=http://www.postgresql.org/ packaged for CSW by Mark Round +HOTLINE=http://www.blastwave.org/bugtrack/ +EMAIL=mark at blastwave.org + Added: csw/mgar/pkg/postgresql/trunk/legacy/libpq/prototype.append =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/libpq/prototype.append (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/libpq/prototype.append 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,3 @@ +s none /opt/csw/postgresql/lib/64=sparcv9 +s none /opt/csw/postgresql/lib/32=sparcv8 +s none /opt/csw/postgresql/lib/sparcv8=. Added: csw/mgar/pkg/postgresql/trunk/legacy/postgresql/BUILD.notes =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/postgresql/BUILD.notes (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/postgresql/BUILD.notes 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,5 @@ +All you should need to do is tweak the version numbers in the build scripts, +and pkginfo files. + +You'll also need to update the compat tarballs if you're bumping a major version, +otherwise old packages will break if they haven't been re-linked. Added: csw/mgar/pkg/postgresql/trunk/legacy/postgresql/README-CSW.txt.sparc =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/postgresql/README-CSW.txt.sparc (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/postgresql/README-CSW.txt.sparc 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,103 @@ +*** Important information - please make sure you read this ! *** + +*** Migrating from older versions *** + +If you have upgraded from a previous 8.0, 8.1 or 8.2 version of PostgreSQL, +your databases will NOT work on this 8.3.x version. Before upgrading, you +should dump your databases using the old utilities. You can then create a +new data directory using this 8.3.x package, and import your dumps. +See the "64-bit support" section below for pointers to documentation on t +his. + +Another point to note is that the location of the PostgreSQL install has +changed. Previous 7.3.x packages used /opt/csw as the base - this package +uses /opt/csw/postgresql. You will need to add /opt/csw/postgresql/bin to your +$PATH, and any scripts you have written using the old locations will have to +be changed. + + +*** User configuration of server options *** + +Configuration of the server start-up options is now done through a user- +configuration file, /opt/csw/etc/postgresql.conf. A sample template has been +provided for you at /opt/csw/etc/postgresql.conf.csw. If you want to change +any of the server options discussed below, make a copy of this file to +/opt/csw/etc/postgresql.conf and edit it accordingly. + +If you cannot modify this file (for instance, you are mounting /opt/csw +from a read-only NFS server), you can use /etc/opt/csw/postgresql.conf +instead, and it will take precedence over /opt/csw/etc/postgresql.conf. + +*** Networking *** + +By default, the cswpostgres init script will start the server up listening on +localhost only. If you want to allow other hosts on your network to connect, you +will need to add "-o -i" to the value of SERVEROPTS in the user configuration +file and restart your server. The included template has the line already +entered, you just need to uncomment it (remove the leading #). + +Once this is done, PostgreSQL will now bind to all network interfaces and +listen for connections. You will still need to configure which hosts are allowed +access by modifying the pg_hba.conf file in your data directory - read the manual +for more information on this. + +*** 64-bit support *** + +The SPARC packages have been built with 64-bit support, but by default, the +32-bit version of the server will be run. If you need the 64-bit version, +edit the user configuration file and change the values of PGINIT and PGCTL +accordingly. + +It is important to note that the 64-bit server WILL NOT WORK with databases +created with the 32-bit version, and vice versa. You will get an error +message if you attempt this. + +In order to migrate your system to the 64-bit server, you will need to dump +your databases while running the 32-bit client, stop and upgrade the server, +initialise a new database directory, and import your dumps. For more information +on this procedure, see the PostgreSQL manual (included with this package), +chapter 9 - Backup and restore. This is located at : + +/opt/csw/postgresql/share/doc/html/backup.html + +All other PostgreSQL binaries in /opt/csw/postgresql/bin/ are copies of the +'isaexec' wrapper, which will run the appropriate binary for your +architecture and/or kernel. + +*** Starting the server *** + +The PostgreSQL database runs under the user 'postgres' - this has been created +for you by the installation script. + +The default PostgreSQL data directory is /opt/csw/var/pgdata. As this does not +exist, you will need to create it yourself before the database will start. +You can change the location of the data directory by altering the user +configuration file, and modifying the value of PGDATA. + +A startup script has been provided for you that handles database initialisation, +startup and shutdown functions - it is located at /etc/init.d/cswpostgres. You +should always use this script to start or stop the server, otherwise you may +find that you are running the wrong binaries (64-bit instead of 32-bit). + +It is set to start the database the next time the system enters runlevel 3 - +usually, this will be at the next boot. + +To create the data directory, the startup script accepts the "init" argument : + +/etc/init.d/cswpostgres init + +This will create and initialise the data directory. After this step has been +completed succesfully, the database can be started with : + +/etc/init.d/cswpostgres start + +If you get errors relating to shared memory on startup, make sure you have read +the section entitled "Manging Kernel Resources" - this is in Chapter 3 of the +PostgreSQL HTML Administrator's Guide, located at + +/opt/csw/postgresql/share/doc/html/index.html + + +Mark Round, +mark at blastwave.org + Property changes on: csw/mgar/pkg/postgresql/trunk/legacy/postgresql/README-CSW.txt.sparc ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/postgresql/trunk/legacy/postgresql/README-CSW.txt.x86 =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/postgresql/README-CSW.txt.x86 (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/postgresql/README-CSW.txt.x86 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,82 @@ +*** Important information - please make sure you read this ! *** + +*** Migrating from older versions *** + +If you have upgraded from a previous 8.0, 8.1 or 8.2 version of PostgreSQL, +your databases will NOT work on this 8.3.x version. Before upgrading, you +should dump your databases using the old utilities. You can then create a +new data directory using this 8.3.x package, and import your dumps. + +For more information on this procedure, see the PostgreSQL manual +(included with this package), chapter 9 - Backup and restore. +This is located at : + +/opt/csw/postgresql/share/doc/html/backup.html + +Another point to note is that the location of the PostgreSQL install has +changed. Previous 7.3.x packages used /opt/csw as the base - this package +uses /opt/csw/postgresql. You will need to add /opt/csw/postgresql/bin to your +$PATH, and any scripts you have written using the old locations will have to +be changed. + +*** User configuration of server options *** + +Configuration of the server start-up options is now done through a user- +configuration file, /opt/csw/etc/postgresql.conf. A sample template has been +provided for you at /opt/csw/etc/postgresql.conf.csw. If you want to change +any of the server options discussed below, make a copy of this file to +/opt/csw/etc/postgresql.conf and edit it accordingly. + +If you cannot modify this file (for instance, you are mounting /opt/csw +from a read-only NFS server), you can use /etc/opt/csw/postgresql.conf +instead, and it will take precedence over /opt/csw/etc/postgresql.conf. + +*** Networking *** + +By default, the cswpostgres init script will start the server up listening on +localhost only. If you want to allow other hosts on your network to connect, you +will need to add "-o -i" to the value of SERVEROPTS in the user configuration +file and restart your server. The included template has the line already +entered, you just need to uncomment it (remove the leading #). + +Once this is done, PostgreSQL will now bind to all network interfaces and +listen for connections. You will still need to configure which hosts are allowed +access by modifying the pg_hba.conf file in your data directory - read the manual +for more information on this. + +*** Starting the server *** + +The PostgreSQL database runs under the user 'postgres' - this has been created +for you by the installation script. + +The default PostgreSQL data directory is /opt/csw/var/pgdata. As this does not +exist, you will need to create it yourself before the database will start. +You can change the location of the data directory by altering the user +configuration file and modifying the value of PGDATA. + +A startup script has been provided for you that handles database initialisation, +startup and shutdown functions - it is located at /etc/init.d/cswpostgres. You +should always use this script to start or stop the server, otherwise you may +find that you are running the wrong binaries (64-bit instead of 32-bit). + +It is set to start the database the next time the system enters runlevel 3 - +usually, this will be at the next boot. + +To create the data directory, the startup script accepts the "init" argument : + +/etc/init.d/cswpostgres init + +This will create and initialise the data directory. After this step has been +completed succesfully, the database can be started with : + +/etc/init.d/cswpostgres start + +If you get errors relating to shared memory on startup, make sure you have read +the section entitled "Manging Kernel Resources" - this is in Chapter 3 of the +PostgreSQL HTML Administrator's Guide, located at + +/opt/csw/postgresql/share/doc/html/index.html + + +Mark Round, +mark at blastwave.org Property changes on: csw/mgar/pkg/postgresql/trunk/legacy/postgresql/README-CSW.txt.x86 ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/postgresql/trunk/legacy/postgresql/build.sparc =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/postgresql/build.sparc (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/postgresql/build.sparc 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,249 @@ +#!/usr/bin/bash + +. ~/pkgs/scripts/env + +PACKAGE=postgresql +VERSION=8.3.3 +HOST=ra + +# Override some defaults, as we're installing in /opt/csw/postgresql +LD_OPTIONS_64="-R/opt/csw/lib/64:/opt/csw/postgresql/lib/sparcv9 -L/opt/csw/lib/64" +LD_OPTIONS_32="-R/opt/csw/lib:/opt/csw/postgresql/lib -L/opt/csw/lib" + + +TARBALL="postgresql-8.3.3.tar.gz" + +## Start + +# Delete build dir so we start fresh +if [ -d $BASE/build-$HOST/$PACKAGE-$VERSION/ ]; then + rm -rf $BASE/build-$HOST/$PACKAGE-$VERSION +fi + +# And unpack and change into it +cd $BASE/build-$HOST +gtar xzvf $SRC/$TARBALL +cd $BASE/build-$HOST/$PACKAGE-$VERSION/ + + +## +## 64-bit version +## + +LD_OPTIONS="$LD_OPTIONS_64" CC="$CC_SPARC_64" ./configure --prefix=/opt/csw/postgresql --with-pam --with-openssl --enable-multibyte --with-CXX --with-includes=/opt/csw/include/openssl:/opt/csw/include --bindir=/opt/csw/postgresql/bin/sparcv9 --datadir=/opt/csw/postgresql/share --libexecdir=/opt/csw/postgresql/lib/sparcv9 --libdir=/opt/csw/postgresql/lib/sparcv9 + +# Bug fix, needed in old versions, maybe not needed now ? +perl -p -i -e "s/\.seg/\.section/g" src/backend/storage/lmgr/s_lock.c + +LD_OPTIONS="$LD_OPTIONS_64" CC="$CC_SPARC_64" gmake +gmake DESTDIR=$BASE/build-$HOST/postgresql-$VERSION/cswstage install + +cd $BASE/build-$HOST/$PACKAGE-$VERSION/ + +## +## "Contrib" package +## + +cd contrib +LD_OPTIONS="$LD_OPTIONS_64" CC="$CC_SPARC_64" gmake +gmake DESTDIR=$BASE/build-$HOST/postgresql-$VERSION/contribstage install + + +## +## 32-bit version +## +cd $BASE/build-$HOST/$PACKAGE-$VERSION/ +gmake distclean + +LD_OPTIONS="$LD_OPTIONS_32" CC="$CC_SPARC_32" ./configure --prefix=/opt/csw/postgresql --with-pam --with-openssl --enable-multibyte --with-CXX --with-includes=/opt/csw/include/openssl:/opt/csw/include --bindir=/opt/csw/postgresql/bin/sparcv8 --datadir=/opt/csw/postgresql/share --libexecdir=/opt/csw/postgresql/lib --libdir=/opt/csw/postgresql/lib + +LD_OPTIONS="$LD_OPTIONS_32" CC="$CC_SPARC_32" gmake + +gmake DESTDIR=$BASE/build-$HOST/postgresql-$VERSION/cswstage install +cd $BASE/build-$HOST/$PACKAGE-$VERSION/ + +## +## "Contrib" package +## + +cd contrib +LD_OPTIONS="$LD_OPTIONS_32" CC="$CC_SPARC_32" gmake +gmake DESTDIR=$BASE/build-$HOST/postgresql-$VERSION/contribstage install +cd $BASE/build-$HOST/$PACKAGE-$VERSION/ + + +## +## Packaging stuff +## +# Clean up according to CSW standards +cd $BASE/build-$HOST/postgresql-$VERSION/cswstage/opt/csw/postgresql +[ ! -d share ] && mkdir share +for dir in man doc info; do + [ -d $dir ] && mv $dir share/ && ln -s share/$dir $dir +done + +cd $BASE/build-$HOST/postgresql-$VERSION/contribstage/opt/csw/postgresql +[ ! -d share ] && mkdir share +for dir in man doc info; do + [ -d $dir ] && mv $dir share/ && ln -s share/$dir $dir +done + + +## +## Move libpq to separate staging directory +## And include compat libraries from older packages +## +cd $BASE/build-$HOST/$PACKAGE-$VERSION/ +mkdir -p $BASE/build-$HOST/postgresql-$VERSION/libpqstage/opt/csw/postgresql + +# Unpack the compat tarball of old libraries +gtar -C $BASE/build-$HOST/postgresql-$VERSION/libpqstage -xzvf $BASE/pkgs/libpq/compat.sparc.tgz + +cd $BASE/build-$HOST/postgresql-$VERSION/libpqstage/opt/csw/postgresql +while read file; do + [ ! -d "`dirname $file`" ] && mkdir -p "`dirname $file`" + mv $BASE/build-$HOST/postgresql-$VERSION/cswstage/opt/csw/postgresql/$file $file +done < $BASE/pkgs/postgresql/libpqfiles.sparc + +cd $BASE/build-$HOST/$PACKAGE-$VERSION/ + +## +## Package everything up +## +cd $BASE/build-$HOST/postgresql-$VERSION/cswstage + +# Make the prototype +pkgproto . | sed "s/e opt/e \/opt/" | sed "s/$USER $GROUP/root bin/g" > prototype.tmp +gsed -i "/info\/dir 0644/d" prototype.tmp +gsed -i "/info=share/d" prototype.tmp +gsed -i "/man=share/d" prototype.tmp +gsed -i "/doc=share/d" prototype.tmp +gsed -i "/opt 0755/d" prototype.tmp +gsed -i "/prototype.tmp/d" prototype.tmp +cat $BASE/pkgs/postgresql/prototype.append >> prototype.tmp + +# Isaexec wrapper +cd opt/csw/postgresql/bin +for prog in sparcv9/*; do + echo "l none /opt/csw/postgresql/bin/`basename $prog`=/opt/csw/bin/isaexec" >> $BASE/build-$HOST/postgresql-$VERSION/cswstage/prototype.tmp +done +cd $BASE/build-$HOST/postgresql-$VERSION/cswstage + + +# Copy various files "outside" the package + +for file in copyright depend pkginfo preremove postinstall; do + cp $BASE/pkgs/postgresql/$file . + echo "i $file" >> prototype +done + +cp $BASE/pkgs/postgresql/cswpostgres.sparc cswpostgres +cp $BASE/pkgs/postgresql/postgresql.conf.sparc postgresql.conf.csw +cp $BASE/pkgs/postgresql/README-CSW.txt.sparc README-CSW.txt + +# Strip binaries +find . -type f | xargs file | grep ELF | \ + awk -F: '{print $1}' | xargs strip +find . -type f | xargs file | grep ELF | \ + awk -F: '{print $1}' | xargs /usr/ccs/bin/mcs -d + +# Make the prototype +cat prototype.tmp >> prototype +rm prototype.tmp + +# Hack the wonky pgxs file +/opt/csw/bin/gsed -i -e '/medusa/d' ./opt/csw/postgresql/lib/pgxs/src/Makefile.global +/opt/csw/bin/gsed -i -e '/medusa/d' ./opt/csw/postgresql/lib/sparcv9/pgxs/src/Makefile.global + +# And package! +createpkg -r . +gzip *.pkg +mv *.gz $BASE/pkgs/postgresql/ + + +## Package up libpq +cd $BASE/build-$HOST/postgresql-$VERSION/libpqstage + +# Make the prototype +pkgproto . | sed "s/e opt/e \/opt/" | sed "s/$USER $GROUP/root bin/g" > prototype.tmp +gsed -i "/info\/dir 0644/d" prototype.tmp +gsed -i "/info=share/d" prototype.tmp +gsed -i "/man=share/d" prototype.tmp +gsed -i "/doc=share/d" prototype.tmp +gsed -i "/opt 0755/d" prototype.tmp +gsed -i "/prototype.tmp/d" prototype.tmp + +# Isaexec wrapper +cd opt/csw/postgresql/bin +for prog in sparcv9/*; do + echo "l none /opt/csw/postgresql/bin/`basename $prog`=/opt/csw/bin/isaexec" >> $BASE/build-$HOST/postgresql-$VERSION/libpqstage/prototype.tmp +done +cd $BASE/build-$HOST/postgresql-$VERSION/libpqstage + +# Copy various files "outside" the package +for file in copyright depend pkginfo checkinstall; do + cp $BASE/pkgs/libpq/$file . + echo "i $file" >> prototype +done + + + +# Strip binaries +find . -type f | xargs file | grep ELF | \ + awk -F: '{print $1}' | xargs strip +find . -type f | xargs file | grep ELF | \ + awk -F: '{print $1}' | xargs /usr/ccs/bin/mcs -d + +# Make the prototype +cat prototype.tmp >> prototype +rm prototype.tmp + +# And build! +createpkg -r . +gzip *.pkg +mv *.gz $BASE/pkgs/libpq/ + + + +## Package up contrib + +cd $BASE/build-$HOST/postgresql-$VERSION/contribstage + +# Make the prototype +pkgproto . | sed "s/e opt/e \/opt/" | sed "s/$USER $GROUP/root bin/g" > prototype.tmp +gsed -i "/info\/dir 0644/d" prototype.tmp +gsed -i "/info=share/d" prototype.tmp +gsed -i "/man=share/d" prototype.tmp +gsed -i "/doc=share/d" prototype.tmp +gsed -i "/opt 0755/d" prototype.tmp +gsed -i "/prototype.tmp/d" prototype.tmp + +# Isaexec wrapper +cd opt/csw/postgresql/bin +for prog in sparcv9/*; do + echo "l none /opt/csw/postgresql/bin/`basename $prog`=/opt/csw/bin/isaexec" >> $BASE/build-$HOST/postgresql-$VERSION/contribstage/prototype.tmp +done +cd $BASE/build-$HOST/postgresql-$VERSION/contribstage + + +# Copy various files "outside" the package +for file in copyright depend pkginfo; do + cp $BASE/pkgs/postgresqlcontrib/$file . + echo "i $file" >> prototype +done + +# Strip binaries +find . -type f | xargs file | grep ELF | \ + awk -F: '{print $1}' | xargs strip +find . -type f | xargs file | grep ELF | \ + awk -F: '{print $1}' | xargs /usr/ccs/bin/mcs -d + +# Make the prototype +cat prototype.tmp >> prototype +rm prototype.tmp + +# And build! +createpkg -r . +gzip *.pkg +mv *.gz $BASE/pkgs/postgresqlcontrib/ + Property changes on: csw/mgar/pkg/postgresql/trunk/legacy/postgresql/build.sparc ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/postgresql/trunk/legacy/postgresql/build.x86 =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/postgresql/build.x86 (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/postgresql/build.x86 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,197 @@ +#!/usr/bin/bash +. ~/pkgs/scripts/env + +PACKAGE=postgresql +VERSION=8.3.3 +HOST=thor + +SRC=/export/medusa/src + +# Override some defaults, as we're installing in /opt/csw/postgresql +LD_OPTIONS_32="-R/opt/csw/lib:/opt/csw/postgresql/lib -L/opt/csw/lib -L/opt/csw/lib/postgresql" +CC_INTEL_32="cc -O -xarch=386 -xinline=%auto,no%AddAcl" + +TARBALL="postgresql-8.3.3.tar.gz" + +## Start + +# Delete build dir so we start fresh +if [ -d $BASE/build-$HOST/$PACKAGE-$VERSION/ ]; then + rm -rf $BASE/build-$HOST/$PACKAGE-$VERSION +fi + +# And unpack and change into it +cd $BASE/build-$HOST +gtar xzvf $SRC/$TARBALL +cd $BASE/build-$HOST/$PACKAGE-$VERSION/ + +## +## 32-bit version +## +gmake distclean + +LD_OPTIONS="$LD_OPTIONS_32" CC="$CC_INTEL_32" ./configure --prefix=/opt/csw/postgresql --with-pam --with-openssl --enable-multibyte --with-CXX --with-includes=/opt/csw/include/openssl:/opt/csw/include --datadir=/opt/csw/postgresql/share --libexecdir=/opt/csw/postgresql/lib --libdir=/opt/csw/postgresql/lib + +LD_OPTIONS="$LD_OPTIONS_32" CC="$CC_INTEL_32" gmake +gmake DESTDIR=$BASE/build-$HOST/postgresql-$VERSION/cswstage install + +cd $BASE/build-$HOST/$PACKAGE-$VERSION/ + +## +## "Contrib" package +## + +cd contrib +LD_OPTIONS="$LD_OPTIONS_32" CC="$CC_INTEL_32" gmake +gmake DESTDIR=$BASE/build-$HOST/postgresql-$VERSION/contribstage install +cd $BASE/build-$HOST/$PACKAGE-$VERSION/ + + +## +## Packaging stuff +## +# Clean up according to CSW standards +cd $BASE/build-$HOST/postgresql-$VERSION/cswstage/opt/csw/postgresql +[ ! -d share ] && mkdir share +for dir in man doc info; do + [ -d $dir ] && mv $dir share/ && ln -s share/$dir $dir +done + +cd $BASE/build-$HOST/postgresql-$VERSION/contribstage/opt/csw/postgresql +[ ! -d share ] && mkdir share +for dir in man doc info; do + [ -d $dir ] && mv $dir share/ && ln -s share/$dir $dir +done + + +## +## Move libpq to separate staging directory +## +cd $BASE/build-$HOST/$PACKAGE-$VERSION/ +mkdir -p $BASE/build-$HOST/postgresql-$VERSION/libpqstage/opt/csw/postgresql + +# Unpack the compat tarball of old libraries +gtar -C $BASE/build-$HOST/postgresql-$VERSION/libpqstage -xzvf $BASE/pkgs/libpq/compat.x86.tgz + +cd $BASE/build-$HOST/postgresql-$VERSION/libpqstage/opt/csw/postgresql +while read file; do + [ ! -d "`dirname $file`" ] && mkdir -p "`dirname $file`" + mv $BASE/build-$HOST/postgresql-$VERSION/cswstage/opt/csw/postgresql/$file $file +done < $BASE/pkgs/postgresql/libpqfiles.x86 + + +## +## Package everything up +## + +cd $BASE/build-$HOST/postgresql-$VERSION/cswstage + +# Make the prototype +pkgproto . | sed "s/e opt/e \/opt/" | sed "s/$USER $GROUP/root bin/g" > prototype.tmp +gsed -i "/info\/dir 0644/d" prototype.tmp +gsed -i "/info=share/d" prototype.tmp +gsed -i "/man=share/d" prototype.tmp +gsed -i "/doc=share/d" prototype.tmp +gsed -i "/opt 0755/d" prototype.tmp +gsed -i "/prototype.tmp/d" prototype.tmp +cat $BASE/pkgs/postgresql/prototype.append >> prototype.tmp + +# Copy various files "outside" the package + +for file in copyright depend pkginfo preremove postinstall; do + cp $BASE/pkgs/postgresql/$file . + echo "i $file" >> prototype +done + +cp $BASE/pkgs/postgresql/cswpostgres.x86 cswpostgres +cp $BASE/pkgs/postgresql/postgresql.conf.x86 postgresql.conf.csw +cp $BASE/pkgs/postgresql/README-CSW.txt.x86 README-CSW.txt + +# Strip binaries +find . -type f | xargs file | grep ELF | \ + awk -F: '{print $1}' | xargs strip +find . -type f | xargs file | grep ELF | \ + awk -F: '{print $1}' | xargs /usr/ccs/bin/mcs -d + +# Make the prototype +cat prototype.tmp >> prototype +rm prototype.tmp + +# Hack the wonky pgxs file +/opt/csw/bin/gsed -i -e '/medusa/d' ./opt/csw/postgresql/lib/pgxs/src/Makefile.global + +# And package! +createpkg -r . +gzip *.pkg +mv *.gz $BASE/pkgs/postgresql/ + + +## Package up libpq +cd $BASE/build-$HOST/postgresql-$VERSION/libpqstage + +# Make the prototype +pkgproto . | sed "s/e opt/e \/opt/" | sed "s/$USER $GROUP/root bin/g" > prototype.tmp +gsed -i "/info\/dir 0644/d" prototype.tmp +gsed -i "/info=share/d" prototype.tmp +gsed -i "/man=share/d" prototype.tmp +gsed -i "/doc=share/d" prototype.tmp +gsed -i "/opt 0755/d" prototype.tmp +gsed -i "/prototype.tmp/d" prototype.tmp + +# Copy various files "outside" the package +for file in copyright depend pkginfo checkinstall; do + cp $BASE/pkgs/libpq/$file . + echo "i $file" >> prototype +done + +# Strip binaries +find . -type f | xargs file | grep ELF | \ + awk -F: '{print $1}' | xargs strip +find . -type f | xargs file | grep ELF | \ + awk -F: '{print $1}' | xargs /usr/ccs/bin/mcs -d + +# Make the prototype +cat prototype.tmp >> prototype +rm prototype.tmp + +# And build! +createpkg -r . +gzip *.pkg +mv *.gz $BASE/pkgs/libpq/ + + + +## Package up contrib + +cd $BASE/build-$HOST/postgresql-$VERSION/contribstage + +# Make the prototype +pkgproto . | sed "s/e opt/e \/opt/" | sed "s/$USER $GROUP/root bin/g" > prototype.tmp +gsed -i "/info\/dir 0644/d" prototype.tmp +gsed -i "/info=share/d" prototype.tmp +gsed -i "/man=share/d" prototype.tmp +gsed -i "/doc=share/d" prototype.tmp +gsed -i "/opt 0755/d" prototype.tmp +gsed -i "/prototype.tmp/d" prototype.tmp + +# Copy various files "outside" the package +for file in copyright depend pkginfo; do + cp $BASE/pkgs/postgresqlcontrib/$file . + echo "i $file" >> prototype +done + +# Strip binaries +find . -type f | xargs file | grep ELF | \ + awk -F: '{print $1}' | xargs strip +find . -type f | xargs file | grep ELF | \ + awk -F: '{print $1}' | xargs /usr/ccs/bin/mcs -d + +# Make the prototype +cat prototype.tmp >> prototype +rm prototype.tmp + +# And build! +createpkg -r . +gzip *.pkg +mv *.gz $BASE/pkgs/postgresqlcontrib/ + Property changes on: csw/mgar/pkg/postgresql/trunk/legacy/postgresql/build.x86 ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/postgresql/trunk/legacy/postgresql/copyright =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/postgresql/copyright (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/postgresql/copyright 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,23 @@ +PostgreSQL Database Management System +(formerly known as Postgres, then as Postgres95) + +Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group + +Portions Copyright (c) 1994, The Regents of the University of California + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose, without fee, and without a written agreement +is hereby granted, provided that the above copyright notice and this +paragraph and the following two paragraphs appear in all copies. + +IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR +DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING +LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS +DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + +THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS +ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO +PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. Added: csw/mgar/pkg/postgresql/trunk/legacy/postgresql/cswpostgres.sparc =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/postgresql/cswpostgres.sparc (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/postgresql/cswpostgres.sparc 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,97 @@ +#!/bin/sh +# PostgreSQL startup script - part of the CSWpostgresql package +# mark at blastwave.org + +# Read in the user configuration file +[ -s /opt/csw/etc/postgresql.conf ] && . /opt/csw/etc/postgresql.conf +[ -s /etc/opt/csw/postgresql.conf ] && . /etc/opt/csw/postgresql.conf + +# Defaults +[ -z "$PGDATA" ] && PGDATA=/opt/csw/var/pgdata +[ -z "$PGCTL" ] && PGCTL=/opt/csw/postgresql/bin/sparcv8/pg_ctl +[ -z "$PGINIT" ] && PGINIT=/opt/csw/postgresql/bin/sparcv8/initdb + + +# The following attempts to catch any mistakes in the server +# version - it checks if the 64-bit server was last run. If so, +# it forces the 64-bit server, otherwise it won't start up! +# And vice-versa for the 32-bit server... +if [ -f $PGDATA/postmaster.opts ]; then + grep 'sparcv9' $PGDATA/postmaster.opts > /dev/null + if [ $? -eq 0 ]; then + echo $PGCTL | grep "sparcv8" > /dev/null + if [ $? -eq 0 ]; then + echo "Warning: 32-bit server was specified in /etc/init.d/cswpostgres," + echo " but 64-bit version was last run. Using 64-bit server..." + fi + PGCTL=/opt/csw/postgresql/bin/sparcv9/pg_ctl + PGINIT=/opt/csw/postgresql/bin/sparcv9/initdb + else + # Did not detect 64-bit server last used + echo $PGCTL | grep "sparcv8" > /dev/null + if [ $? -ne 0 ]; then + echo "Warning: 64-bit server was specified in /etc/init.d/cswpostgres," + echo " but 32-bit version was last run. Using 32-bit server..." + fi + PGCTL=/opt/csw/postgresql/bin/sparcv8/pg_ctl + PGINIT=/opt/csw/postgresql/bin/sparcv8/initdb + fi +fi + +# Exit if postgres user hasn't been created. +grep '^postgres:' /etc/passwd >/dev/null +if [ $? -ne 0 ] ; then + getent passwd postgres >/dev/null + if [ $? -ne 0 ] ; then + exit 0 + fi +fi + +# Change to /var/tmp, as pgctl etc. need to be started from +# a directory that they can read +cd /var/tmp + +case "$1" in +start) + if [ -d $PGDATA -a `ls -l $PGDATA 2> /dev/null | wc -l` -gt 1 ]; then + # PostgreSQL data directory exists and is populated + echo "Starting PostgreSQL..." + su postgres -c "$PGCTL -D $PGDATA -l $PGDATA/postgresql.log start $SERVEROPTS" + fi + ;; + +stop) + echo "Stopping PostgreSQL database..." + su postgres -c "$PGCTL -D $PGDATA -l $PGDATA/postgresql.log stop" + ;; + +restart) + echo "Restarting PostgreSQL database..." + su postgres -c "$PGCTL -D $PGDATA -l $PGDATA/postgresql.log restart $SERVEROPTS" + ;; + +reload) + echo "Reloading PostgreSQL database..." + su postgres -c "$PGCTL -D $PGDATA -l $PGDATA/postgresql.log reload $SERVEROPTS" + ;; + +status) + su postgres -c "$PGCTL -D $PGDATA status" + ;; + +init) + # create and initialise data directory + echo "Creating PostgreSQL data directory at $PGDATA..." + # Create it, unless it's already there and empty + [ -d $PGDATA -a `ls -l $PGDATA 2> /dev/null | wc -l` -eq 1 ] || mkdir -p $PGDATA + chown postgres $PGDATA + echo "Initialising PostgreSQL database..." + su postgres -c "$PGINIT -D $PGDATA > /dev/null" + ;; + +*) + echo "Usage: $0 (init|start|stop|restart|reload|status)" + ;; + +esac + Property changes on: csw/mgar/pkg/postgresql/trunk/legacy/postgresql/cswpostgres.sparc ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/postgresql/trunk/legacy/postgresql/cswpostgres.x86 =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/postgresql/cswpostgres.x86 (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/postgresql/cswpostgres.x86 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,71 @@ +#!/bin/sh +# PostgreSQL startup script - part of the CSWpostgresql package +# mark at blastwave.org + +# Read in the user configuration file +[ -s /opt/csw/etc/postgresql.conf ] && . /opt/csw/etc/postgresql.conf +[ -s /etc/opt/csw/postgresql.conf ] && . /etc/opt/csw/postgresql.conf + +# Defaults +[ -z "$PGDATA" ] && PGDATA=/opt/csw/var/pgdata +[ -z "$PGCTL" ] && PGCTL=/opt/csw/postgresql/bin/pg_ctl +[ -z "$PGINIT" ] && PGINIT=/opt/csw/postgresql/bin/initdb + + +# Exit if postgres user hasn't been created. +grep '^postgres:' /etc/passwd >/dev/null +if [ $? -ne 0 ] ; then + getent passwd postgres >/dev/null + if [ $? -ne 0 ] ; then + exit 0 + fi +fi + +# Change to a directory that pg_ctl etc. can read - startup fails +# otherwise +cd /var/tmp + +case "$1" in +start) + if [ -d $PGDATA -a `ls -l $PGDATA 2> /dev/null | wc -l` -gt 1 ]; then + # PostgreSQL data directory exists and is populated + echo "Starting PostgreSQL..." + su postgres -c "$PGCTL -D $PGDATA -l $PGDATA/postgresql.log start $SERVEROPTS" + fi + ;; + +stop) + echo "Stopping PostgreSQL database..." + su postgres -c "$PGCTL -D $PGDATA -l $PGDATA/postgresql.log stop" + ;; + +restart) + echo "Restarting PostgreSQL database..." + su postgres -c "$PGCTL -D $PGDATA -l $PGDATA/postgresql.log restart $SERVEROPTS" + ;; + +reload) + echo "Reloading PostgreSQL database..." + su postgres -c "$PGCTL -D $PGDATA -l $PGDATA/postgresql.log reload $SERVEROPTS" + ;; + +status) + su postgres -c "$PGCTL -D $PGDATA status" + ;; + +init) + # create and initialise data directory + echo "Creating PostgreSQL data directory at $PGDATA..." + # Create it, unless it's already there and empty + [ -d $PGDATA -a `ls -l $PGDATA 2> /dev/null | wc -l` -eq 1 ] || mkdir -p $PGDATA + chown postgres $PGDATA + echo "Initialising PostgreSQL database..." + su postgres -c "$PGINIT -D $PGDATA > /dev/null" + ;; + +*) + echo "Usage: $0 (init|start|stop|restart|reload|status)" + ;; + +esac + Property changes on: csw/mgar/pkg/postgresql/trunk/legacy/postgresql/cswpostgres.x86 ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/postgresql/trunk/legacy/postgresql/depend =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/postgresql/depend (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/postgresql/depend 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,5 @@ +P CSWreadline +P CSWosslrt +P CSWlibpq +P CSWzlib +P CSWisaexec Added: csw/mgar/pkg/postgresql/trunk/legacy/postgresql/libpqfiles.sparc =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/postgresql/libpqfiles.sparc (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/postgresql/libpqfiles.sparc 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,45 @@ +lib/libpq.so.5.1 +lib/libpq.so.5 +lib/libpq.so +lib/libpq.a +lib/libecpg.so.6.0 +lib/libecpg.so.6 +lib/libecpg.so +lib/libecpg.a +lib/libpgtypes.a +lib/libpgtypes.so +lib/libpgtypes.so.3 +lib/libpgtypes.so.3.0 +lib/sparcv9/libpq.so.5.1 +lib/sparcv9/libpq.so.5 +lib/sparcv9/libpq.so +lib/sparcv9/libpq.a +lib/sparcv9/libecpg.so.6.0 +lib/sparcv9/libecpg.so.6 +lib/sparcv9/libecpg.so +lib/sparcv9/libecpg.a +lib/sparcv9/libpgtypes.a +lib/sparcv9/libpgtypes.so +lib/sparcv9/libpgtypes.so.3 +lib/sparcv9/libpgtypes.so.3.0 +include/sqlca.h +include/sql3types.h +include/internal/pqexpbuffer.h +include/internal/libpq-int.h +include/postgres_ext.h +include/pg_config_os.h +include/pg_config.h +include/libpq/libpq-fs.h +include/libpq-fe.h +include/ecpgtype.h +include/ecpglib.h +include/ecpgerrno.h +include/pgtypes_date.h +include/pgtypes_error.h +include/pgtypes_interval.h +include/pgtypes_numeric.h +include/pgtypes_timestamp.h +bin/sparcv8/ecpg +bin/sparcv9/ecpg +bin/sparcv8/pg_config +bin/sparcv9/pg_config Added: csw/mgar/pkg/postgresql/trunk/legacy/postgresql/libpqfiles.x86 =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/postgresql/libpqfiles.x86 (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/postgresql/libpqfiles.x86 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,31 @@ +lib/libpq.so.5.1 +lib/libpq.so.5 +lib/libpq.so +lib/libpq.a +lib/libecpg.so.6.0 +lib/libecpg.so.6 +lib/libecpg.so +lib/libecpg.a +lib/libpgtypes.a +lib/libpgtypes.so +lib/libpgtypes.so.3 +lib/libpgtypes.so.3.0 +include/sqlca.h +include/sql3types.h +include/internal/pqexpbuffer.h +include/internal/libpq-int.h +include/postgres_ext.h +include/pg_config_os.h +include/pg_config.h +include/libpq/libpq-fs.h +include/libpq-fe.h +include/ecpgtype.h +include/ecpglib.h +include/ecpgerrno.h +include/pgtypes_date.h +include/pgtypes_error.h +include/pgtypes_interval.h +include/pgtypes_numeric.h +include/pgtypes_timestamp.h +bin/ecpg +bin/pg_config Added: csw/mgar/pkg/postgresql/trunk/legacy/postgresql/pkginfo =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/postgresql/pkginfo (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/postgresql/pkginfo 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,7 @@ +PKG=CSWpostgresql +NAME=postgresql - advanced open source database system +VERSION=8.3.3,REV=2008.06.26 +CATEGORY=application +VENDOR=http://www.postgresql.org/ packaged for CSW by Mark Round +HOTLINE=http://www.blastwave.org/bugtrack/ +EMAIL=mark at blastwave.org Added: csw/mgar/pkg/postgresql/trunk/legacy/postgresql/postgresql.conf.sparc =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/postgresql/postgresql.conf.sparc (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/postgresql/postgresql.conf.sparc 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,34 @@ +# Example PostgreSQL server configuration file. +# Provided by the Blastwave package of PostgreSQL. +# This file is read by the /etc/init.d/cswpostgres startup script, +# and can be used to override the defaults. + +# The location of the data directory. +# Default : /opt/csw/var/pgdata +PGDATA=/opt/csw/var/pgdata + + +# Which binaries to use, 32- or 64-bit. +# Only use the 64-bit server if you're sure you need it. +# Make sure you have read /opt/csw/postgresql/share/doc/README-CSW.txt +# before changing these, as your databases may not work without +# a 'dump and restore' cycle ! + +# 32-bit server - default, and fine for most uses +PGCTL=/opt/csw/postgresql/bin/sparcv8/pg_ctl +PGINIT=/opt/csw/postgresql/bin/sparcv8/initdb + +# 64-bit server - uncomment these lines only if you really need them. +#PGCTL=/opt/csw/postgresql/bin/sparcv9/pg_ctl +#PGINIT=/opt/csw/postgresql/bin/sparcv9/initdb + + +# Additional options to pass to postmaster. +# These options will be passed to the postmaster program. The most common use of +# these is to allow network access to PostgreSQL from other hosts over TCP/IP. +# This is done by using the flags "-o -i", as in the example below. +# Uncomment this line to enable network access to PostgreSQL. +# Note that you will still need to configure authentication in the pg_hba.conf +# in your data directory. +# SERVEROPTS="-o -i" + Added: csw/mgar/pkg/postgresql/trunk/legacy/postgresql/postgresql.conf.x86 =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/postgresql/postgresql.conf.x86 (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/postgresql/postgresql.conf.x86 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,19 @@ +# Example PostgreSQL server configuration file. +# Provided by the Blastwave package of PostgreSQL. +# This file is read by the /etc/init.d/cswpostgres startup script, +# and can be used to override the defaults. + +# The location of the data directory. +# Default : /opt/csw/var/pgdata +PGDATA=/opt/csw/var/pgdata + + +# Additional options to pass to postmaster. +# These options will be passed to the postmaster program. The most common use of +# these is to allow network access to PostgreSQL from other hosts over TCP/IP. +# This is done by using the flags "-o -i", as in the example below. +# Uncomment this line to enable network access to PostgreSQL. +# Note that you will still need to configure authentication in the pg_hba.conf +# in your data directory. +# SERVEROPTS="-o -i" + Added: csw/mgar/pkg/postgresql/trunk/legacy/postgresql/postinstall =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/postgresql/postinstall (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/postgresql/postinstall 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,44 @@ +#!/bin/sh +# This script makes sure the postgres user exists. If not, it creates it. +# Modified from the MySQL script by Philip Brown. + +PGSQLHOME=/opt/csw/var/pgdata + +if [ "$PKG_ROOT_DIR" = "" ] ; then + PKG_ROOT_DIR="/" +fi + +#First check target machines password file, THEN check +#NIS/NIS+/whatever + +grep '^postgres:' $PKG_ROOT_DIR/etc/passwd >/dev/null +if [ $? -ne 0 ] ; then + getent passwd postgres >/dev/null + if [ $? -ne 0 ] ; then + NEEDUSER=1 + fi +fi + +if [ "$NEEDUSER" = 1 ] ; then + echo adding postgres user + chroot $PKG_ROOT_DIR /usr/sbin/useradd postgres + chroot $PKG_ROOT_DIR /usr/sbin/usermod -s /bin/sh -d $PGSQLHOME postgres +else + echo postgres user detected +fi + +# Start the server again... +/etc/init.d/cswpostgres start + + +cat < /dev/null + /etc/init.d/cswpostgres status && /etc/init.d/cswpostgres stop + /etc/init.d/cswpostgres status && exit 2 +fi +exit 0 + Property changes on: csw/mgar/pkg/postgresql/trunk/legacy/postgresql/preremove ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/postgresql/trunk/legacy/postgresql/prototype.append =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/postgresql/prototype.append (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/postgresql/prototype.append 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,8 @@ +f none /etc/init.d/cswpostgres=cswpostgres 0744 root sys +f none /opt/csw/etc/postgresql.conf.csw=postgresql.conf.csw 0755 root sys +f none /opt/csw/postgresql/share/doc/README-CSW.txt=README-CSW.txt 0644 root sys +s none /etc/rc3.d/S10cswpostgres=../init.d/cswpostgres +s none /etc/rc0.d/K90cswpostgres=../init.d/cswpostgres +s none /etc/rc1.d/K90cswpostgres=../init.d/cswpostgres +s none /etc/rc2.d/K90cswpostgres=../init.d/cswpostgres +s none /etc/rcS.d/K90cswpostgres=../init.d/cswpostgres Added: csw/mgar/pkg/postgresql/trunk/legacy/postgresqlcontrib/copyright =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/postgresqlcontrib/copyright (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/postgresqlcontrib/copyright 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,23 @@ +PostgreSQL Database Management System +(formerly known as Postgres, then as Postgres95) + +Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group + +Portions Copyright (c) 1994, The Regents of the University of California + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose, without fee, and without a written agreement +is hereby granted, provided that the above copyright notice and this +paragraph and the following two paragraphs appear in all copies. + +IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR +DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING +LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS +DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + +THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS +ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO +PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. Added: csw/mgar/pkg/postgresql/trunk/legacy/postgresqlcontrib/depend =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/postgresqlcontrib/depend (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/postgresqlcontrib/depend 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,5 @@ +P CSWlibpq +P CSWreadline +P CSWosslrt +P CSWzlib + Added: csw/mgar/pkg/postgresql/trunk/legacy/postgresqlcontrib/pkginfo =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/postgresqlcontrib/pkginfo (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/postgresqlcontrib/pkginfo 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,8 @@ +PKG=CSWpostgresqlcontrib +NAME=postgresqlcontrib - utilities not part of the core PostgreSQL distribution +VERSION=8.3.3,REV=2008.06.26 +CATEGORY=application +VENDOR=http://www.postgresql.org/ packaged for CSW by Mark Round +HOTLINE=http://www.blastwave.org/bugtrack/ +EMAIL=mark at blastwave.org + Added: csw/mgar/pkg/postgresql/trunk/legacy/scripts/env =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/scripts/env (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/scripts/env 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,21 @@ +#!/usr/bin/bash +# Sets some common variables + +BASE="/export/medusa/mark" +SRC="/export/medusa/src" + +USER="mark" +GROUP="`groups | awk '{print $1}'`" + +PATH="/opt/SUNWspro/bin:/opt/csw/bin:$PATH" +LD_OPTIONS_64="-R/opt/csw/lib/64 -L/opt/csw/lib/64" +LD_OPTIONS_32="-R/opt/csw/lib -L/opt/csw/lib" + +CC_SPARC_64="cc -xtarget=ultra -xarch=v9" +CC_SPARC_32="cc -xarch=v8" + +#CC_SPARC_64="cc -fast -xtarget=ultra -xarch=v9" +#CC_SPARC_32="cc -fast -xarch=v8" + +CC_INTEL_32="cc -xarch=386" +CC_INTEL_64="cc -xtarget=opteron -xarch=amd64" 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 Dec 12 22:16:43 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 12 Dec 2008 21:16:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[2568] csw/mgar/pkg/postgresql/trunk/legacy/README. postgresqljdbc Message-ID: Revision: 2568 http://gar.svn.sourceforge.net/gar/?rev=2568&view=rev Author: dmichelsen Date: 2008-12-12 21:16:43 +0000 (Fri, 12 Dec 2008) Log Message: ----------- postgresqljdbc: Add legacy build description Added Paths: ----------- csw/mgar/pkg/postgresql/trunk/legacy/README.postgresqljdbc Added: csw/mgar/pkg/postgresql/trunk/legacy/README.postgresqljdbc =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/README.postgresqljdbc (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/README.postgresqljdbc 2008-12-12 21:16:43 UTC (rev 2568) @@ -0,0 +1,24 @@ +Oh, and here's the postgresqljdbc prototype. No build script needed +for this, all I ever did was repackage the .jar files : + +i pkginfo +i copyright +d none /opt/csw 0755 root bin +d none /opt/csw/postgresql 0755 root bin +d none /opt/csw/postgresql/share 0755 root bin +d none /opt/csw/share 0755 root bin +d none /opt/csw/share/java 0755 root bin +f none /opt/csw/share/java/pg81jdbc2.jar 0644 root bin +f none /opt/csw/share/java/pg81jdbc2ee.jar 0644 root bin +f none /opt/csw/share/java/pg81jdbc3.jar 0644 root bin +f none /opt/csw/share/java/pg82jdbc2.jar 0644 root bin +f none /opt/csw/share/java/pg82jdbc2ee.jar 0644 root bin +f none /opt/csw/share/java/pg82jdbc3.jar 0644 root bin +f none /opt/csw/share/java/pg82jdbc4.jar 0644 root bin +s none /opt/csw/postgresql/share/pgjdbc4.jar=/opt/csw/share/java/pg82jdbc4.jar +s none /opt/csw/postgresql/share/pgjdbc3.jar=/opt/csw/share/java/pg82jdbc3.jar +s none /opt/csw/postgresql/share/pgjdbc2.jar=/opt/csw/share/java/pg82jdbc2.jar +s none /opt/csw/postgresql/share/pgjdbc2ee.jar=/opt/csw/share/java/pg82jdbc2ee.jar +s none /opt/csw/share/java/pgjdbc3.jar=pg81jdbc3.jar +s none /opt/csw/share/java/pgjdbc2.jar=pg81jdbc2.jar +s none /opt/csw/share/java/pgjdbc2ee.jar=pg81jdbc2ee.jar This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From william at wbonnet.net Fri Dec 12 21:30:47 2008 From: william at wbonnet.net (William Bonnet) Date: Fri, 12 Dec 2008 21:30:47 +0100 Subject: [csw-devel] Upstream Watch progress report In-Reply-To: <4942A8BF.1010201@opencsw.org> References: <49419757.1030503@wbonnet.net> <4942A8BF.1010201@opencsw.org> Message-ID: <4942C9F7.4070808@wbonnet.net> Hi Trygve >> Trygve, if you have time in the next weeks, we can look to a possibility >> of make this working together with Hudson. >> > > Let me know what you want and I can get it into Hudson. > Thanks :) We'll talk about this soon. Maybe this week end or next week on irc. Otherwise i'll drop you an email. Cheers -- William http://www.wbonnet.net http://www.sunwizard.net Le site fran?ais des amateurs de stations Unix http://www.blastwave.org An OpenSolaris Community Site http://www.opencsw.org Community SoftWare for Solaris http://www.guses.org French speaking Solaris User Group From chninkel at users.sourceforge.net Sat Dec 13 12:33:23 2008 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 13 Dec 2008 11:33:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[2569] csw/mgar/pkg/lftp/trunk Message-ID: Revision: 2569 http://gar.svn.sourceforge.net/gar/?rev=2569&view=rev Author: chninkel Date: 2008-12-13 11:33:23 +0000 (Sat, 13 Dec 2008) Log Message: ----------- lftp: update to 3.7.7 Modified Paths: -------------- csw/mgar/pkg/lftp/trunk/Makefile csw/mgar/pkg/lftp/trunk/checksums csw/mgar/pkg/lftp/trunk/files/changelog.CSW Modified: csw/mgar/pkg/lftp/trunk/Makefile =================================================================== --- csw/mgar/pkg/lftp/trunk/Makefile 2008-12-12 21:16:43 UTC (rev 2568) +++ csw/mgar/pkg/lftp/trunk/Makefile 2008-12-13 11:33:23 UTC (rev 2569) @@ -1,5 +1,5 @@ GARNAME = lftp -GARVERSION = 3.7.6 +GARVERSION = 3.7.7 CATEGORIES = net DESCRIPTION = sophisticated command-line ftp/http client Modified: csw/mgar/pkg/lftp/trunk/checksums =================================================================== --- csw/mgar/pkg/lftp/trunk/checksums 2008-12-12 21:16:43 UTC (rev 2568) +++ csw/mgar/pkg/lftp/trunk/checksums 2008-12-13 11:33:23 UTC (rev 2569) @@ -1,7 +1,7 @@ -53424ab64756a387f3367f475261358a download/lftp-3.7.6.tar.gz +7b7aebf99e862fa4b9dcf892b7b45d82 download/lftp-3.7.7.tar.gz 47fdb80e4575a9a70d69b146974620df download/CSWlftp.gspec 96ee1569832d5eaed0c3a7b37e13fc88 download/CSWlftp.prototype f2c7e3e3db9f5c48dddb983c95588528 download/CSWlftp.depend -eb73ad48caf3cc5d4d3f683c29a1859a download/changelog.CSW +1bcc79a591071b5110fa57c072b57818 download/changelog.CSW 3a01fb949dfe799507720c311222cd96 download/i.conf 51abe2144219c1af4c79c2e8b7e81cb9 download/r.conf Modified: csw/mgar/pkg/lftp/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2008-12-12 21:16:43 UTC (rev 2568) +++ csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2008-12-13 11:33:23 UTC (rev 2569) @@ -1,3 +1,9 @@ +lftp (3.7.7,REV=2008.12.12) unstable + + * New upstream version. + + -- Yann Rouillard Sat, 13 Dec 2008 11:53:59 +0100 + lftp (3.7.6,REV=2008.11.30) unstable * New upstream version. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Dec 13 14:30:45 2008 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 13 Dec 2008 13:30:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[2570] csw/mgar/pkg/openssl/trunk Message-ID: Revision: 2570 http://gar.svn.sourceforge.net/gar/?rev=2570&view=rev Author: chninkel Date: 2008-12-13 13:30:44 +0000 (Sat, 13 Dec 2008) Log Message: ----------- openssl: last fixes to be able to build with gar v2 Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile csw/mgar/pkg/openssl/trunk/checksums csw/mgar/pkg/openssl/trunk/files/CSWossl.gspec csw/mgar/pkg/openssl/trunk/files/CSWossldevel.gspec csw/mgar/pkg/openssl/trunk/files/CSWosslrt.gspec csw/mgar/pkg/openssl/trunk/files/CSWosslutils.gspec csw/mgar/pkg/openssl/trunk/files/changelog.CSW Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2008-12-13 11:33:23 UTC (rev 2569) +++ csw/mgar/pkg/openssl/trunk/Makefile 2008-12-13 13:30:44 UTC (rev 2570) @@ -41,8 +41,9 @@ # we don't yet use isaexec support so we disable # isa relocation for default isa NO_ISAEXEC = 1 -#ISA_RELOCATE_DIRS_i386 = -#ISA_RELOCATE_DIRS_sparcv8 = +# GAR wants and puts sparcv9 in lib/64 but openssl build system +# isn't the standard autoconf/automake one so we disable this +# relocation for now ISALIBDIR_sparcv9 = . libdir = /opt/csw/lib @@ -91,7 +92,7 @@ pre-configure-modulated: echo " ==> Creating configure script" cd $(WORKSRC) && ln -nf Configure configure - $(MAKECOOKIE) + @$(MAKECOOKIE) # we remove every debug information except symbol table # (should rather be done in the gar scripts) @@ -99,18 +100,22 @@ chmod -R u+w $(PKGROOT)$(libdir) find $(PKGROOT)$(libdir) -name "*.so*" -exec strip -x '{}' ';' +install-changelog: + ginstall -D $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/changelog.CSW $(SPKG_PKGBASE)/changelog.CSW + @$(MAKECOOKIE) + install-certs: [ -f $(PKGROOT)$(prefix)/ssl/openssl.cnf ] && \ ginstall -D $(PKGROOT)$(prefix)/ssl/openssl.cnf $(PKGROOT)$(sysconfdir)/ssl/openssl.cnf gunzip --stdout $(CURDIR)/$(FILEDIR)/certs.tar.gz | (cd $(PKGROOT)$(prefix)/ssl/certs && tar xf -) - cp -r $(WORKSRC)/certs/* $(PKGROOT)$(prefix)/ssl/certs + cp -r $(WORKSRC_FIRSTMOD)/certs/* $(PKGROOT)$(prefix)/ssl/certs OPENSSL=$(PKGROOT)/$(bindir)/openssl $(PKGROOT)/$(bindir)/c_rehash $(PKGROOT)/$(prefix)/ssl/certs/ - $(MAKECOOKIE) + @$(MAKECOOKIE) install-oldlibs: $(addprefix install-oldlibs-,$(OLDLIBS)) install-oldlibs-%: echo " ==> Installing old libraries $* from archive oldlibs.$*-$(GARCH).tar.gz"; \ cd $(PKGROOT) && gunzip -c $(CURDIR)/$(FILEDIR)/oldlibs.$*-$(GARCH).tar.gz | tar xvf - && \ - $(MAKECOOKIE) + @$(MAKECOOKIE) -pre-package: striplib install-certs install-oldlibs +post-merge: striplib install-certs install-oldlibs install-changelog Modified: csw/mgar/pkg/openssl/trunk/checksums =================================================================== --- csw/mgar/pkg/openssl/trunk/checksums 2008-12-13 11:33:23 UTC (rev 2569) +++ csw/mgar/pkg/openssl/trunk/checksums 2008-12-13 13:30:44 UTC (rev 2570) @@ -1,20 +1,20 @@ 561e00f18821c74b2b86c8c7786f9d8b download/openssl-0.9.8i.tar.gz -bc7aa9d2ea44e9ac28b11db12402024e download/CSWossl.gspec +b5ded4412606a0996595015bc2ff6974 download/CSWossl.gspec 05b45e7124833dee48e5f3c45591e95b download/CSWossl.depend 7fe01ca4ef9d0e971d57b00f4d0b168b download/CSWossl.prototype -cf0fa997cc719009991e67b4264caeed download/CSWosslrt.gspec +83480e01971e71d037bd44fa5ed4e4e5 download/CSWosslrt.gspec 78c26f65b14f3ebf4a29069a3f675285 download/CSWosslrt.checkinstall d41d8cd98f00b204e9800998ecf8427e download/CSWosslrt.depend cba143e52cb08dd3ee39f275aefa075d download/CSWosslrt.prototype-i386 ceeb4a59f1c31ae4deac9f2b61dadca2 download/CSWosslrt.prototype-sparc -1791edde7bf1bce62ac799852459dc47 download/CSWossldevel.gspec +2ac43ebf4689d236540e22171541be4e download/CSWossldevel.gspec 37995caa7f4155066b00fb7503e853da download/CSWossldevel.depend 45161ff3a5b00fd6942f63b77c0b0ed1 download/CSWossldevel.prototype-i386 7b1dd2e8c78b033ca2a8be4de097b147 download/CSWossldevel.prototype-sparc -0d55e4c93c94a1a72fb295d0ee6225d4 download/CSWosslutils.gspec +eec77249fb642c525cad67dcd055fb77 download/CSWosslutils.gspec 37995caa7f4155066b00fb7503e853da download/CSWosslutils.depend 6e0c86ddc23d044757810cca6f31f017 download/CSWosslutils.prototype -e3f149dea30df046b9042a69639bcf3b download/changelog.CSW +1bd6e7ee77845fc4de843d7479a4bdb9 download/changelog.CSW 7fdc09cd3c11db459c83c8946f7872f6 download/i.conf a454ac09091085813ec8900f5a0c917c download/r.conf 64f7c3f3a6cae483209b69c31c82557d download/openssl.0.9.8.patch Modified: csw/mgar/pkg/openssl/trunk/files/CSWossl.gspec =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWossl.gspec 2008-12-13 11:33:23 UTC (rev 2569) +++ csw/mgar/pkg/openssl/trunk/files/CSWossl.gspec 2008-12-13 13:30:44 UTC (rev 2570) @@ -4,4 +4,4 @@ %var desc Openssl meta package %var pkgfile %{bitname}-%{SPKG_VERSION}%{SPKG_REVSTAMP}-%{SPKG_OSNAME}-all-CSW.pkg %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/LICENSE +%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Modified: csw/mgar/pkg/openssl/trunk/files/CSWossldevel.gspec =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWossldevel.gspec 2008-12-13 11:33:23 UTC (rev 2569) +++ csw/mgar/pkg/openssl/trunk/files/CSWossldevel.gspec 2008-12-13 13:30:44 UTC (rev 2570) @@ -2,4 +2,4 @@ %var pkgname CSWossldevel %var desc Openssl development support %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/LICENSE +%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Modified: csw/mgar/pkg/openssl/trunk/files/CSWosslrt.gspec =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWosslrt.gspec 2008-12-13 11:33:23 UTC (rev 2569) +++ csw/mgar/pkg/openssl/trunk/files/CSWosslrt.gspec 2008-12-13 13:30:44 UTC (rev 2570) @@ -2,4 +2,4 @@ %var pkgname CSWosslrt %var desc Openssl runtime libraries %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/LICENSE +%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Modified: csw/mgar/pkg/openssl/trunk/files/CSWosslutils.gspec =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWosslutils.gspec 2008-12-13 11:33:23 UTC (rev 2569) +++ csw/mgar/pkg/openssl/trunk/files/CSWosslutils.gspec 2008-12-13 13:30:44 UTC (rev 2570) @@ -2,4 +2,4 @@ %var pkgname CSWosslutils %var desc Openssl binaries and related tools %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/LICENSE +%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Modified: csw/mgar/pkg/openssl/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssl/trunk/files/changelog.CSW 2008-12-13 11:33:23 UTC (rev 2569) +++ csw/mgar/pkg/openssl/trunk/files/changelog.CSW 2008-12-13 13:30:44 UTC (rev 2570) @@ -1,10 +1,17 @@ -openssl (0.9.8,REV=2008.10.05_rev=i) unstable +openssl (0.9.8,rev=2008.10.05_rev=i) unstable + * checkinstall script now accepts that /dev/random and + /dev/random are pipes (Closes: #2687) + + -- Yann Rouillard Sat, 13 Dec 2008 14:28:14 +0100 + +openssl (0.9.8,rev=2008.10.05_rev=i) unstable + * New upstream version. - * Added CA certs that were removed in 0.9.8h. - * Fixed ARCH in openssl meta-package. + * Added ca certs that were removed in 0.9.8h. + * Fixed arch in openssl meta-package. - -- Yann Rouillard Fri, 05 Oct 2008 21:25:09 +0200 + -- Yann Rouillard Fri, 05 oct 2008 21:25:09 +0200 openssl (0.9.8,REV=2007.12.26_rev=g) unstable This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Dec 13 14:42:04 2008 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 13 Dec 2008 13:42:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[2571] csw/mgar/pkg/arpwatch/trunk Message-ID: Revision: 2571 http://gar.svn.sourceforge.net/gar/?rev=2571&view=rev Author: chninkel Date: 2008-12-13 13:42:03 +0000 (Sat, 13 Dec 2008) Log Message: ----------- arpwatch: fixed prototype Modified Paths: -------------- csw/mgar/pkg/arpwatch/trunk/Makefile csw/mgar/pkg/arpwatch/trunk/checksums csw/mgar/pkg/arpwatch/trunk/files/CSWarpwatch.prototype Modified: csw/mgar/pkg/arpwatch/trunk/Makefile =================================================================== --- csw/mgar/pkg/arpwatch/trunk/Makefile 2008-12-13 13:30:44 UTC (rev 2570) +++ csw/mgar/pkg/arpwatch/trunk/Makefile 2008-12-13 13:42:03 UTC (rev 2571) @@ -36,6 +36,9 @@ # so libpcap is found SUN_CC_OPT += -L$(libdir) +# No test target in arpwatch Makefile +SKIPTEST = 1 + include gar/category.mk pre-configure: Modified: csw/mgar/pkg/arpwatch/trunk/checksums =================================================================== --- csw/mgar/pkg/arpwatch/trunk/checksums 2008-12-13 13:30:44 UTC (rev 2570) +++ csw/mgar/pkg/arpwatch/trunk/checksums 2008-12-13 13:42:03 UTC (rev 2571) @@ -1,7 +1,7 @@ cebfeb99c4a7c2a6cee2564770415fe7 download/arpwatch.tar.gz 0c9ca3341a64b564ff795320e9fe7746 download/CSWarpwatch.gspec -2aa9a97b195671e0a018ceb525916d82 download/CSWarpwatch.depend -0c0f1f3432a6f852fc00aee91e1a5664 download/CSWarpwatch.prototype +3e26b12ebf786b56e8ed1f5192734784 download/CSWarpwatch.depend +82ad6aedda8c58dd41d1eed72858fe30 download/CSWarpwatch.prototype b75294e9ae5192f5637f8c3594fb3ce6 download/cswarpwatch.xml 5a429cfbbb852a73dca372dd2db9c52f download/svc-cswarpwatch c190d02a3f5e4d20a390061509fcad92 download/cswarpwatch Modified: csw/mgar/pkg/arpwatch/trunk/files/CSWarpwatch.prototype =================================================================== --- csw/mgar/pkg/arpwatch/trunk/files/CSWarpwatch.prototype 2008-12-13 13:30:44 UTC (rev 2570) +++ csw/mgar/pkg/arpwatch/trunk/files/CSWarpwatch.prototype 2008-12-13 13:42:03 UTC (rev 2571) @@ -1,7 +1,7 @@ f none /opt/csw/etc/arpwatch.conf.CSW=arpwatch.conf 0755 root bin f none /opt/csw/sbin/arpsnmp 0755 root bin f none /opt/csw/sbin/arpwatch 0755 root bin -d none /opt/csw/share/man/man8 +d none /opt/csw/share/man/man8 0755 root bin f none /opt/csw/share/man/man8/arpsnmp.8 0755 root bin f none /opt/csw/share/man/man8/arpwatch.8 0755 root bin d none /opt/csw/var/arpwatch 0755 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Dec 13 19:14:37 2008 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 13 Dec 2008 18:14:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[2572] csw/mgar/pkg/openssl/trunk/Makefile Message-ID: Revision: 2572 http://gar.svn.sourceforge.net/gar/?rev=2572&view=rev Author: chninkel Date: 2008-12-13 18:14:37 +0000 (Sat, 13 Dec 2008) Log Message: ----------- openssl: moved striplib in post-install Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2008-12-13 13:42:03 UTC (rev 2571) +++ csw/mgar/pkg/openssl/trunk/Makefile 2008-12-13 18:14:37 UTC (rev 2572) @@ -96,9 +96,10 @@ # we remove every debug information except symbol table # (should rather be done in the gar scripts) -striplib: - chmod -R u+w $(PKGROOT)$(libdir) - find $(PKGROOT)$(libdir) -name "*.so*" -exec strip -x '{}' ';' +post-install-modulated: + echo " ==> Stripping libraries" + chmod -R u+w $(DESTDIR)$(libdir) + find $(DESTDIR)$(libdir) -name "*.so*" -exec strip -x '{}' ';' install-changelog: ginstall -D $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/changelog.CSW $(SPKG_PKGBASE)/changelog.CSW @@ -114,8 +115,8 @@ install-oldlibs: $(addprefix install-oldlibs-,$(OLDLIBS)) install-oldlibs-%: - echo " ==> Installing old libraries $* from archive oldlibs.$*-$(GARCH).tar.gz"; \ - cd $(PKGROOT) && gunzip -c $(CURDIR)/$(FILEDIR)/oldlibs.$*-$(GARCH).tar.gz | tar xvf - && \ + @echo " ==> Installing old libraries $* from archive oldlibs.$*-$(GARCH).tar.gz" + cd $(PKGROOT) && gunzip -c $(CURDIR)/$(FILEDIR)/oldlibs.$*-$(GARCH).tar.gz | tar xvf - @$(MAKECOOKIE) -post-merge: striplib install-certs install-oldlibs install-changelog +post-merge: install-certs install-oldlibs install-changelog 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 Dec 13 19:53:19 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 13 Dec 2008 18:53:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[2573] csw/mgar/pkg/openjade/trunk Message-ID: Revision: 2573 http://gar.svn.sourceforge.net/gar/?rev=2573&view=rev Author: bdwalton Date: 2008-12-13 18:53:19 +0000 (Sat, 13 Dec 2008) Log Message: ----------- now builds properly under gar v2 Modified Paths: -------------- csw/mgar/pkg/openjade/trunk/Makefile csw/mgar/pkg/openjade/trunk/checksums csw/mgar/pkg/openjade/trunk/files/CSWopenjade.gspec Removed Paths: ------------- csw/mgar/pkg/openjade/trunk/files/CSWopenjade.depend Modified: csw/mgar/pkg/openjade/trunk/Makefile =================================================================== --- csw/mgar/pkg/openjade/trunk/Makefile 2008-12-13 18:14:37 UTC (rev 2572) +++ csw/mgar/pkg/openjade/trunk/Makefile 2008-12-13 18:53:19 UTC (rev 2573) @@ -3,7 +3,10 @@ PATCHLEVEL = 27 CATEGORIES = apps -PREREQUISITES = CSWopensp +PREREQUISITE_PKGS = CSWopensp +REQUIRED_PKGS = CSWgcc3core CSWgcc3corert CSWgcc3g++ CSWgcc3g++rt +REQUIRED_PKGS += CSWggettext CSWiconv CSWopensp CSWsgmlcommon +REQUIRED_PKGS += CSWxmlcommon DESCRIPTION = A DSSSL implementation. define BLURB @@ -17,14 +20,15 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWopenjade,depend postinstall preremove) +DISTFILES += $(call admfiles,CSWopenjade,postinstall preremove) PATCHFILES = openjade-1.3.1-nsl.patch -# use gnu c/c++ for this one...(matches opensp and the c++ doesn't want to -# play with sun_cc...) -GARCOMPILER = GNU -GNU_CC_HOME = /opt/csw/gcc3 +# Use gcc3 to build this. a) it matches opensp b) the c++ used has +# some issues w/sun c++ and c) gcc4 generates object files that get +# the sun linker upset. [we could likely force gld or a strip in the +# middle somewhere, but this works too.] +GARCOMPILER = GCC3 CONFIGURE_ARGS = $(DIRPATHS) --disable-static CONFIGURE_ARGS += --datadir=$(datadir)/sgml/$(GARNAME)-$(GARVERSION) @@ -36,13 +40,16 @@ include gar/category.mk +#squish the pesky post strip la files... +MERGE_EXCLUDE_DEFAULT += $(libdir)/.*\.la\~ + sgmldir = $(DESTDIR)/$(datadir)/sgml/$(GARNAME)-$(GARVERSION) sgmldoc = $(DESTDIR)/$(docdir)/$(GARNAME) INSTALL = /opt/csw/bin/ginstall -c INSTALL_DATA = $(INSTALL) -m 0644 INSTALL_DIR = $(INSTALL) -m 0755 -d -post-install: +post-install-modulated: @echo Installing catalog files. @( cd $(WORKSRC); \ $(INSTALL_DIR) $(sgmldir)/; \ @@ -55,7 +62,6 @@ touch $(GARNAME)-$(GARVERSION)-$(PATCHLEVEL).soc; \ ln -s $(GARNAME)-$(GARVERSION)-$(PATCHLEVEL).soc $(GARNAME).soc; \ ) - @echo Installing docs. @( cd $(WORKSRC); \ $(INSTALL_DIR) $(sgmldoc); \ @@ -65,4 +71,4 @@ $(INSTALL_DATA) dsssl/README.jadetex $(sgmldoc)/; \ $(INSTALL_DATA) README COPYING VERSION $(sgmldoc)/; \ ) - @$(MAKECOOKIE) \ No newline at end of file + @$(MAKECOOKIE) Modified: csw/mgar/pkg/openjade/trunk/checksums =================================================================== --- csw/mgar/pkg/openjade/trunk/checksums 2008-12-13 18:14:37 UTC (rev 2572) +++ csw/mgar/pkg/openjade/trunk/checksums 2008-12-13 18:53:19 UTC (rev 2573) @@ -1,6 +1,5 @@ 7df692e3186109cc00db6825b777201e download/openjade-1.3.2.tar.gz -3bceb78eeb9bdb38e98e75c6fb20714e download/CSWopenjade.gspec -ea3dd2c469bf7e8efd183f82b743c90f download/CSWopenjade.depend +12f647d82faad16570aa84667ca9ed61 download/CSWopenjade.gspec a31c09c1e08da2712e87446762d9fcdc download/CSWopenjade.postinstall b35aca62389881efb0c0ebb296d9ae14 download/CSWopenjade.preremove ca3a0ff43d8ed182f432d723927cd2e9 download/openjade-1.3.1-nsl.patch Deleted: csw/mgar/pkg/openjade/trunk/files/CSWopenjade.depend =================================================================== --- csw/mgar/pkg/openjade/trunk/files/CSWopenjade.depend 2008-12-13 18:14:37 UTC (rev 2572) +++ csw/mgar/pkg/openjade/trunk/files/CSWopenjade.depend 2008-12-13 18:53:19 UTC (rev 2573) @@ -1,12 +0,0 @@ -P CSWcommon common - common files and dirs for CSW packages -P CSWgcc3core gcc3core - GNU C Compiler -P CSWgcc3corert gcc3corert - GNU C Compiler Run Time -P CSWgcc3g++ gcc3g++ - GNU C++ Compiler -P CSWgcc3g++rt gcc3g++rt - GNU C++ Compiler Run Time -P CSWgcc4corert gcc4corert - GNU C Compiler Run Time -P CSWgcc4g++rt gcc4g++rt - GNU C++ Compiler Run Time -P CSWggettext ggettext - GNU gettext -P CSWiconv libiconv - GNU iconv library -P CSWopensp opensp - a SGML parser called OpenSP -P CSWsgmlcommon sgmlcommon - A collection of entities and DTDs -P CSWxmlcommon xmlcommon - A collection of entities and DTDs Modified: csw/mgar/pkg/openjade/trunk/files/CSWopenjade.gspec =================================================================== --- csw/mgar/pkg/openjade/trunk/files/CSWopenjade.gspec 2008-12-13 18:14:37 UTC (rev 2572) +++ csw/mgar/pkg/openjade/trunk/files/CSWopenjade.gspec 2008-12-13 18:53:19 UTC (rev 2573) @@ -1,4 +1,4 @@ %var bitname openjade %var pkgname CSWopenjade %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING +%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 Sat Dec 13 22:51:31 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 13 Dec 2008 21:51:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[2574] csw/mgar/pkg/opengrok/trunk Message-ID: Revision: 2574 http://gar.svn.sourceforge.net/gar/?rev=2574&view=rev Author: dmichelsen Date: 2008-12-13 21:51:31 +0000 (Sat, 13 Dec 2008) Log Message: ----------- opengrok: Update to 0.7 and mGAR v2, package still unfinished Modified Paths: -------------- csw/mgar/pkg/opengrok/trunk/Makefile csw/mgar/pkg/opengrok/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/opengrok/trunk/files/CSWopengrok.depend Modified: csw/mgar/pkg/opengrok/trunk/Makefile =================================================================== --- csw/mgar/pkg/opengrok/trunk/Makefile 2008-12-13 18:53:19 UTC (rev 2573) +++ csw/mgar/pkg/opengrok/trunk/Makefile 2008-12-13 21:51:31 UTC (rev 2574) @@ -1,5 +1,5 @@ GARNAME = opengrok -GARVERSION = 0.6.1 +GARVERSION = 0.7 CATEGORIES = devel DESCRIPTION = A wicked fast source browser @@ -15,8 +15,10 @@ MASTER_SITES = http://www.opensolaris.org/os/project/opengrok/files/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWopengrok,depend postinstall preremove) +DISTFILES += $(call admfiles,CSWopengrok,postinstall preremove) +REQUIRED_PKGS = CSWectags CSWjavasvn CSWtomcat5 CSWmercurial + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/opengrok/trunk/checksums =================================================================== --- csw/mgar/pkg/opengrok/trunk/checksums 2008-12-13 18:53:19 UTC (rev 2573) +++ csw/mgar/pkg/opengrok/trunk/checksums 2008-12-13 21:51:31 UTC (rev 2574) @@ -1,4 +1,4 @@ -2681ad005fa238ff91c3e4818a2f07fa download/opengrok-0.6.1.tar.gz +17f554a60edde0b3ea9d9debc8ff8eef download/opengrok-0.7.tar.gz 1ab19c04b3551db20e5fbac19d731d3f download/CSWopengrok.gspec 0304d70ad22411352a6e3733203e6467 download/CSWopengrok.depend 3283129332005c795178e6f363f521a0 download/CSWopengrok.postinstall Deleted: csw/mgar/pkg/opengrok/trunk/files/CSWopengrok.depend =================================================================== --- csw/mgar/pkg/opengrok/trunk/files/CSWopengrok.depend 2008-12-13 18:53:19 UTC (rev 2573) +++ csw/mgar/pkg/opengrok/trunk/files/CSWopengrok.depend 2008-12-13 21:51:31 UTC (rev 2574) @@ -1,3 +0,0 @@ -P CSWectags ectags - Exuberant Ctags: A multilanguage implementation of Ctags -P CSWjavasvn javasvn - Subversion Java language binding -P CSWtomcat5 tomcat5 - Apache Jakarta Tomcat 5.5 Servlet/JSP Container This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Dec 13 23:06:47 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 13 Dec 2008 22:06:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[2575] csw/mgar/pkg/jdk5/trunk Message-ID: Revision: 2575 http://gar.svn.sourceforge.net/gar/?rev=2575&view=rev Author: dmichelsen Date: 2008-12-13 22:06:46 +0000 (Sat, 13 Dec 2008) Log Message: ----------- jdk5: Update to 1.5.0_17 and mGAR v2 and analogous to jdk6 Modified Paths: -------------- csw/mgar/pkg/jdk5/trunk/Makefile csw/mgar/pkg/jdk5/trunk/checksums csw/mgar/pkg/jdk5/trunk/files/CSWjdk5.gspec Added Paths: ----------- csw/mgar/pkg/jdk5/trunk/files/CSWjre5.gspec Property Changed: ---------------- csw/mgar/pkg/jdk5/trunk/ Property changes on: csw/mgar/pkg/jdk5/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/jdk5/trunk/Makefile =================================================================== --- csw/mgar/pkg/jdk5/trunk/Makefile 2008-12-13 21:51:31 UTC (rev 2574) +++ csw/mgar/pkg/jdk5/trunk/Makefile 2008-12-13 22:06:46 UTC (rev 2575) @@ -1,5 +1,5 @@ GARNAME = jdk5 -SPKG_VERSION = 1.5.0_16 +SPKG_VERSION = 1.5.0_17 GARVERSION = $(shell echo $(SPKG_VERSION) | sed -e 's/\./_/g') CATEGORIES = lang @@ -19,14 +19,30 @@ DISTFILES = $(foreach S,$(SUFFIXES),jdk-$(GARVERSION)-solaris-$S.sh) NOEXTRACT = $(foreach S,$(filter-out $(SUFFIXES_$(GARCH)),$(SUFFIXES)),jdk-$(GARVERSION)-solaris-$S.sh) DISTFILES += $(call admfiles,CSWjdk5) +DISTFILES += $(call admfiles,CSWjre5) -SPKG_SOURCEURL = http://java.sun.com/products/archive/ +SPKG_SOURCEURL = http://java.sun.com/javase/downloads/index_jdk5.jsp +SPKG_DESC_CSWjdk5 = Java Development Kit 6 +SPKG_DESC_CSWjre5 = Java Runtime Environment 6 + +REQUIRED_PKGS_CSWjdk6 = CSWjre6 + +MANPAGES_JRE = java.1 javaws.1 keytool.1 orbd.1 pack200.1 policytool.1 rmid.1 rmiregistry.1 +MANPAGES_JRE += servertool.1 tnameserv.1 unpack200.1 + +MANPAGE_REGEX = ($(shell echo $(MANPAGES_JRE) | perl -lne 's/\./\\./g;print join("|",split)')) + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = INSTALL_SCRIPTS = custom +PKGFILES_CSWjre5 = $(prefix)/java/jdk/$(DISTNAME)/jre/.* +PKGFILES_CSWjre5 += $(prefix)/java/jdk/$(DISTNAME)/man/.*/$(MANPAGE_REGEX) +PKGFILES_CSWjre5 += $(prefix)/java/jre/jre$(SPKG_VERSION) +PKGFILES_CSWjre5 += $(prefix)/java/jre/jre5 + # Tell the user to download the file manually manual//%: @echo @@ -41,7 +57,7 @@ # rule to extract files with shell shell-extract-%: @echo " ==> Extracting $(DOWNLOADDIR)/$*" - @echo "yes" | (D=$(abspath $(DOWNLOADDIR)/$*); cd $(EXTRACTDIR); MORE="-10000" sh $$D) + @echo "yes" | (D=$(abspath $(DOWNLOADDIR)/$*); cd $(EXTRACTDIR); DISPLAY= MORE="-10000" sh $$D -noregister) @$(MAKECOOKIE) extract-%.sh: shell-extract-%.sh @@ -51,9 +67,18 @@ install-custom: @echo " ==> Installing $(GARNAME)" - @rm -rf $(DESTDIR)$(prefix)/$(DISTNAME) - @ginstall -d $(DESTDIR)$(prefix) - @(cd $(WORKDIR); pax -r -w -v $(DISTNAME) $(DESTDIR)$(prefix)) - @rm -f $(DESTDIR)$(prefix)/$(GARNAME) - @gln -sf $(DISTNAME) $(DESTDIR)$(prefix)/$(GARNAME) + + rm -rf $(DESTDIR)$(prefix)/java + ginstall -d $(DESTDIR)$(prefix)/java/jdk + (cd $(WORKDIR); pax -r -w $(DISTNAME) $(DESTDIR)$(prefix)/java/jdk) + rm -f $(DESTDIR)$(prefix)/java/jdk/jdk5 + gln -sf $(DISTNAME) $(DESTDIR)$(prefix)/java/jdk/jdk5 + + ginstall -d $(DESTDIR)$(prefix)/java/jre + rm -f $(DESTDIR)$(prefix)/java/jre/jre$(SPKG_VERSION) + gln -sf ../jdk/$(DISTNAME)/jre $(DESTDIR)$(prefix)/java/jre/jre$(SPKG_VERSION) + rm -f $(DESTDIR)$(prefix)/java/jre/jre5 + gln -sf jre$(SPKG_VERSION) $(DESTDIR)$(prefix)/java/jre/jre5 + + gln -s ../man $(DESTDIR)$(prefix)/java/jdk/$(DISTNAME)/jre/man @$(MAKECOOKIE) Modified: csw/mgar/pkg/jdk5/trunk/checksums =================================================================== --- csw/mgar/pkg/jdk5/trunk/checksums 2008-12-13 21:51:31 UTC (rev 2574) +++ csw/mgar/pkg/jdk5/trunk/checksums 2008-12-13 22:06:46 UTC (rev 2575) @@ -1,5 +1,6 @@ -07cd02212259ed4b421c07b140873e88 download/jdk-1_5_0_16-solaris-sparc.sh -4216693ca5d27fa3a2242a2932149a38 download/jdk-1_5_0_16-solaris-sparcv9.sh -8f96c0535287b32d4ef26e35a5307957 download/jdk-1_5_0_16-solaris-i586.sh -cdb42f091f5ace5b5fb23b70d0a23520 download/jdk-1_5_0_16-solaris-amd64.sh -7fc8cfa2f14f146a0546d6b69dcc0aae download/CSWjdk5.gspec +7d8b35d7eb7664d36ff2387e73baa15b download/jdk-1_5_0_17-solaris-sparc.sh +7e0ccd19d636bc3fdf1781c07a99cb8d download/jdk-1_5_0_17-solaris-sparcv9.sh +f000bd7d44c2964dd811f3f526572106 download/jdk-1_5_0_17-solaris-i586.sh +419310f32f7f2bfff715bc6f1d1258c4 download/jdk-1_5_0_17-solaris-amd64.sh +43194293b08b51d47ebc1c78af346942 download/CSWjdk5.gspec +68ebd77b4f7648109eb11c58f8959b5b download/CSWjre5.gspec Modified: csw/mgar/pkg/jdk5/trunk/files/CSWjdk5.gspec =================================================================== --- csw/mgar/pkg/jdk5/trunk/files/CSWjdk5.gspec 2008-12-13 21:51:31 UTC (rev 2574) +++ csw/mgar/pkg/jdk5/trunk/files/CSWjdk5.gspec 2008-12-13 22:06:46 UTC (rev 2575) @@ -1,4 +1,4 @@ %var bitname jdk5 %var pkgname CSWjdk5 %include url file://%{PKGLIB}/csw_standard.gspec -%copyright url file://%{WORKSRC}/LICENSE +%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Added: csw/mgar/pkg/jdk5/trunk/files/CSWjre5.gspec =================================================================== --- csw/mgar/pkg/jdk5/trunk/files/CSWjre5.gspec (rev 0) +++ csw/mgar/pkg/jdk5/trunk/files/CSWjre5.gspec 2008-12-13 22:06:46 UTC (rev 2575) @@ -0,0 +1,4 @@ +%var bitname jre5 +%var pkgname CSWjre5 +%include url file://%{PKGLIB}/csw_standard.gspec +%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Dec 13 23:13:18 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 13 Dec 2008 22:13:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[2576] csw/mgar/pkg/jdk5/trunk/Makefile Message-ID: Revision: 2576 http://gar.svn.sourceforge.net/gar/?rev=2576&view=rev Author: dmichelsen Date: 2008-12-13 22:13:18 +0000 (Sat, 13 Dec 2008) Log Message: ----------- jdk5: Fix typo Modified Paths: -------------- csw/mgar/pkg/jdk5/trunk/Makefile Modified: csw/mgar/pkg/jdk5/trunk/Makefile =================================================================== --- csw/mgar/pkg/jdk5/trunk/Makefile 2008-12-13 22:06:46 UTC (rev 2575) +++ csw/mgar/pkg/jdk5/trunk/Makefile 2008-12-13 22:13:18 UTC (rev 2576) @@ -60,7 +60,7 @@ @echo "yes" | (D=$(abspath $(DOWNLOADDIR)/$*); cd $(EXTRACTDIR); DISPLAY= MORE="-10000" sh $$D -noregister) @$(MAKECOOKIE) -extract-%.sh: shell-extract-%.sh +extract-archive-%.sh: shell-extract-%.sh @$(MAKECOOKIE) include gar/category.mk @@ -68,17 +68,17 @@ install-custom: @echo " ==> Installing $(GARNAME)" - rm -rf $(DESTDIR)$(prefix)/java - ginstall -d $(DESTDIR)$(prefix)/java/jdk - (cd $(WORKDIR); pax -r -w $(DISTNAME) $(DESTDIR)$(prefix)/java/jdk) - rm -f $(DESTDIR)$(prefix)/java/jdk/jdk5 - gln -sf $(DISTNAME) $(DESTDIR)$(prefix)/java/jdk/jdk5 + @rm -rf $(DESTDIR)$(prefix)/java + @ginstall -d $(DESTDIR)$(prefix)/java/jdk + @(cd $(WORKDIR); pax -r -w $(DISTNAME) $(DESTDIR)$(prefix)/java/jdk) + @rm -f $(DESTDIR)$(prefix)/java/jdk/jdk5 + @gln -sf $(DISTNAME) $(DESTDIR)$(prefix)/java/jdk/jdk5 - ginstall -d $(DESTDIR)$(prefix)/java/jre - rm -f $(DESTDIR)$(prefix)/java/jre/jre$(SPKG_VERSION) - gln -sf ../jdk/$(DISTNAME)/jre $(DESTDIR)$(prefix)/java/jre/jre$(SPKG_VERSION) - rm -f $(DESTDIR)$(prefix)/java/jre/jre5 - gln -sf jre$(SPKG_VERSION) $(DESTDIR)$(prefix)/java/jre/jre5 + @ginstall -d $(DESTDIR)$(prefix)/java/jre + @rm -f $(DESTDIR)$(prefix)/java/jre/jre$(SPKG_VERSION) + @gln -sf ../jdk/$(DISTNAME)/jre $(DESTDIR)$(prefix)/java/jre/jre$(SPKG_VERSION) + @rm -f $(DESTDIR)$(prefix)/java/jre/jre5 + @gln -sf jre$(SPKG_VERSION) $(DESTDIR)$(prefix)/java/jre/jre5 - gln -s ../man $(DESTDIR)$(prefix)/java/jdk/$(DISTNAME)/jre/man + @gln -s ../man $(DESTDIR)$(prefix)/java/jdk/$(DISTNAME)/jre/man @$(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 Dec 14 03:04:11 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 14 Dec 2008 02:04:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[2577] csw/mgar/pkg/docbook-dtds/trunk Message-ID: Revision: 2577 http://gar.svn.sourceforge.net/gar/?rev=2577&view=rev Author: bdwalton Date: 2008-12-14 02:04:11 +0000 (Sun, 14 Dec 2008) Log Message: ----------- working build under gar v2 Modified Paths: -------------- csw/mgar/pkg/docbook-dtds/trunk/Makefile csw/mgar/pkg/docbook-dtds/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/docbook-dtds/trunk/ Property changes on: csw/mgar/pkg/docbook-dtds/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/docbook-dtds/trunk/Makefile =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/Makefile 2008-12-13 22:13:18 UTC (rev 2576) +++ csw/mgar/pkg/docbook-dtds/trunk/Makefile 2008-12-14 02:04:11 UTC (rev 2577) @@ -9,10 +9,11 @@ GARNAME = docbookdtds GARVERSION = 1.0 + PATCHLEVEL = 30.1 CATEGORIES = xtra -PREREQUISITES = CSWunzip +REQUIRED_PKGS = CSWsgmlcommon CSWxmlcommon CSWopenjade CSWlibxml2 DESCRIPTION = SGML and XML document type definitions for DocBook. define BLURB @@ -56,7 +57,7 @@ MASTER_SITES = $(O_SRC) $(D_SRC) DISTFILES = $(DBFILES) Makefile -DISTFILES += $(call admfiles,CSWdocbookdtds,depend postinstall preremove) +DISTFILES += $(call admfiles,CSWdocbookdtds,postinstall preremove) PATCHFILES = docbook-4.2-euro.patch docbook-dtd30-sgml-1.0.catalog.patch PATCHFILES += docbook-dtd31-sgml-1.0.catalog.patch @@ -77,73 +78,68 @@ include gar/category.mk -SGMLDIRS = 3.0 3.1 4.0 4.1 4.2 4.3 4.4 -XMLDIRS = 4.1.2 4.2 4.3 4.4 - - # ok, for each source, we make an explicit target that overrides the implicit # zip-extract-% targets in GAR. -zip-extract-docbk30.zip: +zip-extract-docbk30.zip: + ginstall -d $(WORKSRC)/3.0-sgml unzip $(DOWNLOADDIR)/docbk30.zip -d $(WORKSRC)/3.0-sgml @$(MAKECOOKIE) zip-extract-docbk31.zip: + ginstall -d $(WORKSRC)/3.1-sgml unzip $(DOWNLOADDIR)/docbk31.zip -d $(WORKSRC)/3.1-sgml @$(MAKECOOKIE) zip-extract-docbk40.zip: + ginstall -d $(WORKSRC)/4.0-sgml unzip $(DOWNLOADDIR)/docbk40.zip -d $(WORKSRC)/4.0-sgml @$(MAKECOOKIE) zip-extract-docbk41.zip: + ginstall -d $(WORKSRC)/4.1-sgml unzip $(DOWNLOADDIR)/docbk41.zip -d $(WORKSRC)/4.1-sgml @$(MAKECOOKIE) zip-extract-docbook-4.2.zip: + ginstall -d $(WORKSRC)/4.2-sgml unzip $(DOWNLOADDIR)/docbook-4.2.zip -d $(WORKSRC)/4.2-sgml @$(MAKECOOKIE) -zip-extract-docbkx412.zip: +zip-extract-docbkx412.zip: + ginstall -d $(WORKSRC)/4.1.2-xml unzip $(DOWNLOADDIR)/docbkx412.zip -d $(WORKSRC)/4.1.2-xml @$(MAKECOOKIE) zip-extract-docbook-4.3.zip: + ginstall -d $(WORKSRC)/4.3-sgml unzip $(DOWNLOADDIR)/docbook-4.3.zip -d $(WORKSRC)/4.3-sgml @$(MAKECOOKIE) zip-extract-docbook-4.4.zip: + ginstall -d $(WORKSRC)/4.4-sgml unzip $(DOWNLOADDIR)/docbook-4.4.zip -d $(WORKSRC)/4.4-sgml @$(MAKECOOKIE) zip-extract-docbook-xml-4.2.zip: + ginstall -d $(WORKSRC)/4.2-xml unzip $(DOWNLOADDIR)/docbook-xml-4.2.zip -d $(WORKSRC)/4.2-xml @$(MAKECOOKIE) zip-extract-docbook-xml-4.3.zip: + ginstall -d $(WORKSRC)/4.3-xml unzip $(DOWNLOADDIR)/docbook-xml-4.3.zip -d $(WORKSRC)/4.3-xml @$(MAKECOOKIE) zip-extract-docbook-xml-4.4.zip: + ginstall -d $(WORKSRC)/4.4-xml unzip $(DOWNLOADDIR)/docbook-xml-4.4.zip -d $(WORKSRC)/4.4-xml @$(MAKECOOKIE) -# we override extract for our needs...man this is horrible! (note the cookie -# madness) -pre-extract: $(WORKSRC) - ( cd $(WORKSRC); \ - for d in $(SGMLDIRS); do \ - [ -d $$d-sgml ] || mkdir $$d-sgml; \ - done; \ - for d in $(XMLDIRS); do \ - [ -d $$d-xml ] || mkdir $$d-xml; \ - done ) - @$(MAKECOOKIE) - post-extract: # Increase NAMELEN (bug #36058, bug #159382). [bug references from # rpm .spec file] - ( cd $(WORKSRC); \ + ( cd $(WORKSRC_FIRSTMOD); \ gsed -e's,\(NAMELEN\s\+\)44\(\s\*\)\?,\1256,' -i.namelen */docbook.dcl; \ cp ../Makefile .) - @$(MAKECOOKIE) \ No newline at end of file + @$(MAKECOOKIE) Modified: csw/mgar/pkg/docbook-dtds/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/checksums 2008-12-13 22:13:18 UTC (rev 2576) +++ csw/mgar/pkg/docbook-dtds/trunk/checksums 2008-12-14 02:04:11 UTC (rev 2577) @@ -11,7 +11,6 @@ cbb04e9a700955d88c50962ef22c1634 download/docbook-xml-4.4.zip e5318114e6c751a9e0835d7711275e13 download/Makefile 536104a1ab1e8eac583cf27f4f8844a4 download/CSWdocbookdtds.gspec -cb6dbfe9f6184a9de0725c0a61adc57b download/CSWdocbookdtds.depend 95eb4822347e50556398f4a11ee95097 download/CSWdocbookdtds.postinstall 9035c448e6480f6e916084fea388b512 download/CSWdocbookdtds.preremove 318742d3a6648a6905727f071cbc9847 download/docbook-4.2-euro.patch 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 Dec 14 03:43:27 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 14 Dec 2008 02:43:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[2578] csw/mgar/pkg/docbook-style-xsl/trunk Message-ID: Revision: 2578 http://gar.svn.sourceforge.net/gar/?rev=2578&view=rev Author: bdwalton Date: 2008-12-14 02:43:27 +0000 (Sun, 14 Dec 2008) Log Message: ----------- transition to gar v2 Modified Paths: -------------- csw/mgar/pkg/docbook-style-xsl/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/docbook-style-xsl/trunk/ Property changes on: csw/mgar/pkg/docbook-style-xsl/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/docbook-style-xsl/trunk/Makefile =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/Makefile 2008-12-14 02:04:11 UTC (rev 2577) +++ csw/mgar/pkg/docbook-style-xsl/trunk/Makefile 2008-12-14 02:43:27 UTC (rev 2578) @@ -4,8 +4,10 @@ CATEGORIES = xtra # for our (modified from rhel) copied in Makefile. -PREREQUISITES = CSWgfile CSWbash +PREREQUISITE_PKGS = CSWgfile CSWbash +REQUIRED_PKGS = CSWsgmlcommon CSWxmlcommon CSWdocbookdtds CSWlibxml2 + DESCRIPTION = Norman Walsh's XSL stylesheets for DocBook XML. define BLURB The DocBook XSL stylesheets are a set of stylesheets for use with an @@ -19,7 +21,7 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = docbook-xsl-$(GARVERSION).tar.bz2 DISTFILES += docbook-xsl-doc-$(GARVERSION).tar.bz2 -DISTFILES += $(call admfiles,CSWdocbookxsl,depend postinstall preremove) +DISTFILES += $(call admfiles,CSWdocbookxsl,postinstall preremove) DISTFILES += Makefile # These are listed in the same order they'd be applied during the rpm build... 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 Dec 14 04:30:04 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 14 Dec 2008 03:30:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[2579] csw/mgar/pkg/openjade/trunk/Makefile Message-ID: Revision: 2579 http://gar.svn.sourceforge.net/gar/?rev=2579&view=rev Author: bdwalton Date: 2008-12-14 03:30:04 +0000 (Sun, 14 Dec 2008) Log Message: ----------- clean dependencies Modified Paths: -------------- csw/mgar/pkg/openjade/trunk/Makefile Modified: csw/mgar/pkg/openjade/trunk/Makefile =================================================================== --- csw/mgar/pkg/openjade/trunk/Makefile 2008-12-14 02:43:27 UTC (rev 2578) +++ csw/mgar/pkg/openjade/trunk/Makefile 2008-12-14 03:30:04 UTC (rev 2579) @@ -4,7 +4,7 @@ CATEGORIES = apps PREREQUISITE_PKGS = CSWopensp -REQUIRED_PKGS = CSWgcc3core CSWgcc3corert CSWgcc3g++ CSWgcc3g++rt +REQUIRED_PKGS = CSWgcc3corert CSWgcc3g++rt REQUIRED_PKGS += CSWggettext CSWiconv CSWopensp CSWsgmlcommon REQUIRED_PKGS += CSWxmlcommon This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Dec 14 16:53:05 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 14 Dec 2008 15:53:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[2580] csw/mgar/pkg/x11 Message-ID: Revision: 2580 http://gar.svn.sourceforge.net/gar/?rev=2580&view=rev Author: wbonnet Date: 2008-12-14 15:53:05 +0000 (Sun, 14 Dec 2008) Log Message: ----------- Move inputproto to x11 subdir Added Paths: ----------- csw/mgar/pkg/x11/inputproto/ Property Changed: ---------------- csw/mgar/pkg/x11/inputproto/trunk/ Property changes on: csw/mgar/pkg/x11/inputproto/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Dec 14 18:20:40 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 14 Dec 2008 17:20:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[2581] csw/mgar/pkg/x11/inputproto/trunk Message-ID: Revision: 2581 http://gar.svn.sourceforge.net/gar/?rev=2581&view=rev Author: wbonnet Date: 2008-12-14 17:20:39 +0000 (Sun, 14 Dec 2008) Log Message: ----------- Move inputproto package to X11 subdir Modified Paths: -------------- csw/mgar/pkg/x11/inputproto/trunk/Makefile csw/mgar/pkg/x11/inputproto/trunk/checksums csw/mgar/pkg/x11/inputproto/trunk/files/CSWinputproto.gspec Removed Paths: ------------- csw/mgar/pkg/x11/inputproto/trunk/files/CSWinputproto.depend csw/mgar/pkg/x11/inputproto/trunk/files/CSWinputproto.prototype Modified: csw/mgar/pkg/x11/inputproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/inputproto/trunk/Makefile 2008-12-14 15:53:05 UTC (rev 2580) +++ csw/mgar/pkg/x11/inputproto/trunk/Makefile 2008-12-14 17:20:39 UTC (rev 2581) @@ -1,35 +1,20 @@ GARNAME = inputproto GARVERSION = 1.4.4 -CATEGORIES = lib +CATEGORIES = x11 DESCRIPTION = inputproto define BLURB inputproto endef -MASTER_SITES =http://xorg.freedesktop.org/releases/individual/proto/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWinputproto) # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -DISTFILES += $(call admfiles,CSWinputproto, depend) - -LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib - -export LDFLAGS - -TEST_SCRIPTS = none - -GREP = ggrep - include gar/category.mk -CONFIGURE_ARGS = --prefix=/opt/csw --mandir=/opt/csw/share/man -test-none: - @$(MAKECOOKIE) - -post-install: - ( gfind $(DESTDIR)/opt/csw -exec bash -c "file {} | ggrep ELF | ggrep -e 'executable' -e 'dynamic lib' | ggrep 'not stripped' && strip {}" \; ) Modified: csw/mgar/pkg/x11/inputproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/inputproto/trunk/checksums 2008-12-14 15:53:05 UTC (rev 2580) +++ csw/mgar/pkg/x11/inputproto/trunk/checksums 2008-12-14 17:20:39 UTC (rev 2581) @@ -1,3 +1,3 @@ 55c67c1f42d70458a3e4d153c8c07cf7 download/inputproto-1.4.4.tar.gz -9ab4295ca5a56d868a7f16e702d0317f download/CSWinputproto.gspec -d41d8cd98f00b204e9800998ecf8427e download/CSWinputproto.depend +0bf70c2ca902742d209d422600c99801 download/CSWinputproto.gspec +55c67c1f42d70458a3e4d153c8c07cf7 download/inputproto-1.4.4.tar.gz Modified: csw/mgar/pkg/x11/inputproto/trunk/files/CSWinputproto.gspec =================================================================== --- csw/mgar/pkg/x11/inputproto/trunk/files/CSWinputproto.gspec 2008-12-14 15:53:05 UTC (rev 2580) +++ csw/mgar/pkg/x11/inputproto/trunk/files/CSWinputproto.gspec 2008-12-14 17:20:39 UTC (rev 2581) @@ -1,4 +1,4 @@ %var bitname inputproto %var pkgname CSWinputproto %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING +%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 wbonnet at users.sourceforge.net Sun Dec 14 18:33:38 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 14 Dec 2008 17:33:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[2582] csw/mgar/pkg Message-ID: Revision: 2582 http://gar.svn.sourceforge.net/gar/?rev=2582&view=rev Author: wbonnet Date: 2008-12-14 17:33:37 +0000 (Sun, 14 Dec 2008) Log Message: ----------- Move packages to x11 Modified Paths: -------------- csw/mgar/pkg/x11/kbproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/kbproto/ csw/mgar/pkg/x11/renderproto/ csw/mgar/pkg/x11/xcb-proto/ csw/mgar/pkg/x11/xextproto/ csw/mgar/pkg/x11/xproto/ Removed Paths: ------------- csw/mgar/pkg/inputproto/ csw/mgar/pkg/kbproto/ csw/mgar/pkg/renderproto/ csw/mgar/pkg/xcb-proto/ csw/mgar/pkg/xextproto/ csw/mgar/pkg/xproto/ Property Changed: ---------------- csw/mgar/pkg/x11/kbproto/trunk/ csw/mgar/pkg/x11/renderproto/trunk/ csw/mgar/pkg/x11/xcb-proto/trunk/ csw/mgar/pkg/x11/xextproto/trunk/ csw/mgar/pkg/x11/xproto/trunk/ Property changes on: csw/mgar/pkg/x11/kbproto/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/x11/kbproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/kbproto/trunk/Makefile 2008-12-13 18:53:19 UTC (rev 2573) +++ csw/mgar/pkg/x11/kbproto/trunk/Makefile 2008-12-14 17:33:37 UTC (rev 2582) @@ -1,35 +1,20 @@ GARNAME = kbproto GARVERSION = 1.0.3 -CATEGORIES = lib +CATEGORIES = x11 DESCRIPTION = kbproto define BLURB kbproto endef -MASTER_SITES =http://xorg.freedesktop.org/releases/individual/proto/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -DISTFILES += $(call admfiles,CSWkbproto, depend) +DISTFILES += $(call admfiles,CSWkbproto) -LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib - -export LDFLAGS - -TEST_SCRIPTS = none - -GREP = ggrep - include gar/category.mk -CONFIGURE_ARGS = --prefix=/opt/csw --mandir=/opt/csw/share/man - -test-none: - @$(MAKECOOKIE) - -post-install: - ( gfind $(DESTDIR)/opt/csw -exec bash -c "file {} | ggrep ELF | ggrep -e 'executable' -e 'dynamic lib' | ggrep 'not stripped' && strip {}" \; ) Property changes on: csw/mgar/pkg/x11/renderproto/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/x11/xcb-proto/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/x11/xextproto/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/x11/xproto/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Dec 14 18:38:02 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 14 Dec 2008 17:38:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[2583] csw/mgar/pkg/x11/kbproto/trunk Message-ID: Revision: 2583 http://gar.svn.sourceforge.net/gar/?rev=2583&view=rev Author: wbonnet Date: 2008-12-14 17:38:01 +0000 (Sun, 14 Dec 2008) Log Message: ----------- Move files to /opt/csw/x11 Modified Paths: -------------- csw/mgar/pkg/x11/kbproto/trunk/checksums csw/mgar/pkg/x11/kbproto/trunk/files/CSWkbproto.gspec Removed Paths: ------------- csw/mgar/pkg/x11/kbproto/trunk/files/CSWkbproto.depend csw/mgar/pkg/x11/kbproto/trunk/files/CSWkbproto.prototype Modified: csw/mgar/pkg/x11/kbproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/kbproto/trunk/checksums 2008-12-14 17:33:37 UTC (rev 2582) +++ csw/mgar/pkg/x11/kbproto/trunk/checksums 2008-12-14 17:38:01 UTC (rev 2583) @@ -1,3 +1,3 @@ 1efc6a4d97acb3ec3f34c4b2508478dc download/kbproto-1.0.3.tar.gz -95b5e511af0a95f91913e1cd8d24d0ce download/CSWkbproto.gspec -d41d8cd98f00b204e9800998ecf8427e download/CSWkbproto.depend +18e0000ca77d25e593f4b4b960ad1a7c download/CSWkbproto.gspec +1efc6a4d97acb3ec3f34c4b2508478dc download/kbproto-1.0.3.tar.gz Modified: csw/mgar/pkg/x11/kbproto/trunk/files/CSWkbproto.gspec =================================================================== --- csw/mgar/pkg/x11/kbproto/trunk/files/CSWkbproto.gspec 2008-12-14 17:33:37 UTC (rev 2582) +++ csw/mgar/pkg/x11/kbproto/trunk/files/CSWkbproto.gspec 2008-12-14 17:38:01 UTC (rev 2583) @@ -1,4 +1,4 @@ %var bitname kbproto %var pkgname CSWkbproto %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING +%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 wbonnet at users.sourceforge.net Sun Dec 14 20:06:57 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 14 Dec 2008 19:06:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[2584] csw/mgar/pkg/x11/renderproto/trunk Message-ID: Revision: 2584 http://gar.svn.sourceforge.net/gar/?rev=2584&view=rev Author: wbonnet Date: 2008-12-14 19:06:57 +0000 (Sun, 14 Dec 2008) Log Message: ----------- Move to X11 subdir Modified Paths: -------------- csw/mgar/pkg/x11/renderproto/trunk/Makefile csw/mgar/pkg/x11/renderproto/trunk/checksums csw/mgar/pkg/x11/renderproto/trunk/files/CSWrenderproto.gspec Removed Paths: ------------- csw/mgar/pkg/x11/renderproto/trunk/files/CSWrenderproto.depend csw/mgar/pkg/x11/renderproto/trunk/files/CSWrenderproto.prototype Modified: csw/mgar/pkg/x11/renderproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/renderproto/trunk/Makefile 2008-12-14 17:38:01 UTC (rev 2583) +++ csw/mgar/pkg/x11/renderproto/trunk/Makefile 2008-12-14 19:06:57 UTC (rev 2584) @@ -1,35 +1,21 @@ GARNAME = renderproto GARVERSION = 0.9.3 -CATEGORIES = lib +CATEGORIES = x11 DESCRIPTION = renderproto define BLURB renderproto endef -MASTER_SITES =http://xorg.freedesktop.org/releases/individual/proto/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -DISTFILES += $(call admfiles,CSWrenderproto, depend) +DISTFILES += $(call admfiles,CSWrenderproto) -LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib - -export LDFLAGS - -TEST_SCRIPTS = none - -GREP = ggrep - include gar/category.mk -CONFIGURE_ARGS = --prefix=/opt/csw --mandir=/opt/csw/share/man -test-none: - @$(MAKECOOKIE) - -post-install: - ( gfind $(DESTDIR)/opt/csw -exec bash -c "file {} | ggrep ELF | ggrep -e 'executable' -e 'dynamic lib' | ggrep 'not stripped' && strip {}" \; ) Modified: csw/mgar/pkg/x11/renderproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/renderproto/trunk/checksums 2008-12-14 17:38:01 UTC (rev 2583) +++ csw/mgar/pkg/x11/renderproto/trunk/checksums 2008-12-14 19:06:57 UTC (rev 2584) @@ -1,3 +1,3 @@ ab8f3e356973d9c99810a8f092db3a2e download/renderproto-0.9.3.tar.gz -78032ae1b66c588360331ed8b994c0c1 download/CSWrenderproto.gspec -d41d8cd98f00b204e9800998ecf8427e download/CSWrenderproto.depend +7ed3eb5869a828ed11fd90b7f3c2e70e download/CSWrenderproto.gspec +ab8f3e356973d9c99810a8f092db3a2e download/renderproto-0.9.3.tar.gz Modified: csw/mgar/pkg/x11/renderproto/trunk/files/CSWrenderproto.gspec =================================================================== --- csw/mgar/pkg/x11/renderproto/trunk/files/CSWrenderproto.gspec 2008-12-14 17:38:01 UTC (rev 2583) +++ csw/mgar/pkg/x11/renderproto/trunk/files/CSWrenderproto.gspec 2008-12-14 19:06:57 UTC (rev 2584) @@ -1,4 +1,4 @@ %var bitname renderproto %var pkgname CSWrenderproto %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING +%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 wbonnet at users.sourceforge.net Sun Dec 14 20:14:55 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 14 Dec 2008 19:14:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[2585] csw/mgar/pkg/x11/xcb-proto/trunk Message-ID: Revision: 2585 http://gar.svn.sourceforge.net/gar/?rev=2585&view=rev Author: wbonnet Date: 2008-12-14 19:14:55 +0000 (Sun, 14 Dec 2008) Log Message: ----------- Move t X11 subdir Modified Paths: -------------- csw/mgar/pkg/x11/xcb-proto/trunk/Makefile csw/mgar/pkg/x11/xcb-proto/trunk/checksums csw/mgar/pkg/x11/xcb-proto/trunk/files/CSWxcb-proto.gspec Removed Paths: ------------- csw/mgar/pkg/x11/xcb-proto/trunk/files/CSWxcb-proto.depend csw/mgar/pkg/x11/xcb-proto/trunk/files/CSWxcb-proto.prototype Modified: csw/mgar/pkg/x11/xcb-proto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xcb-proto/trunk/Makefile 2008-12-14 19:06:57 UTC (rev 2584) +++ csw/mgar/pkg/x11/xcb-proto/trunk/Makefile 2008-12-14 19:14:55 UTC (rev 2585) @@ -1,6 +1,6 @@ GARNAME = xcb-proto GARVERSION = 1.1 -CATEGORIES = lib +CATEGORIES = x11 DESCRIPTION = xcb-proto define BLURB @@ -14,22 +14,8 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -DISTFILES += $(call admfiles,CSWxcb-proto, depend) +DISTFILES += $(call admfiles,CSWxcb-proto) -LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib - -export LDFLAGS - -TEST_SCRIPTS = none - -GREP = ggrep - include gar/category.mk -CONFIGURE_ARGS = --prefix=/opt/csw --mandir=/opt/csw/share/man -test-none: - @$(MAKECOOKIE) - -post-install: - ( gfind $(DESTDIR)/opt/csw -exec bash -c "file {} | ggrep ELF | ggrep -e 'executable' -e 'dynamic lib' | ggrep 'not stripped' && strip {}" \; ) Modified: csw/mgar/pkg/x11/xcb-proto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/xcb-proto/trunk/checksums 2008-12-14 19:06:57 UTC (rev 2584) +++ csw/mgar/pkg/x11/xcb-proto/trunk/checksums 2008-12-14 19:14:55 UTC (rev 2585) @@ -1,3 +1,3 @@ 424ac05f279fb9aab0139e982c81e6d6 download/xcb-proto-1.1.tar.gz -3beeed068baf809bb6d2c5958281c38d download/CSWxcb-proto.gspec -d41d8cd98f00b204e9800998ecf8427e download/CSWxcb-proto.depend +96f3a97a7bb1391d79bff88257ff98e2 download/CSWxcb-proto.gspec +424ac05f279fb9aab0139e982c81e6d6 download/xcb-proto-1.1.tar.gz Modified: csw/mgar/pkg/x11/xcb-proto/trunk/files/CSWxcb-proto.gspec =================================================================== --- csw/mgar/pkg/x11/xcb-proto/trunk/files/CSWxcb-proto.gspec 2008-12-14 19:06:57 UTC (rev 2584) +++ csw/mgar/pkg/x11/xcb-proto/trunk/files/CSWxcb-proto.gspec 2008-12-14 19:14:55 UTC (rev 2585) @@ -1,4 +1,4 @@ %var bitname xcbproto %var pkgname CSWxcbproto %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING +%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 wbonnet at users.sourceforge.net Sun Dec 14 20:18:04 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 14 Dec 2008 19:18:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[2586] csw/mgar/pkg/x11/xextproto/trunk Message-ID: Revision: 2586 http://gar.svn.sourceforge.net/gar/?rev=2586&view=rev Author: wbonnet Date: 2008-12-14 19:18:04 +0000 (Sun, 14 Dec 2008) Log Message: ----------- Move to X11 subdir Modified Paths: -------------- csw/mgar/pkg/x11/xextproto/trunk/Makefile csw/mgar/pkg/x11/xextproto/trunk/checksums csw/mgar/pkg/x11/xextproto/trunk/files/CSWxextproto.gspec Removed Paths: ------------- csw/mgar/pkg/x11/xextproto/trunk/files/CSWxextproto.depend csw/mgar/pkg/x11/xextproto/trunk/files/CSWxextproto.prototype Modified: csw/mgar/pkg/x11/xextproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xextproto/trunk/Makefile 2008-12-14 19:14:55 UTC (rev 2585) +++ csw/mgar/pkg/x11/xextproto/trunk/Makefile 2008-12-14 19:18:04 UTC (rev 2586) @@ -1,35 +1,20 @@ GARNAME = xextproto GARVERSION = 7.0.3 -CATEGORIES = lib +CATEGORIES = x11 DESCRIPTION = xextproto define BLURB xextproto endef -MASTER_SITES =http://xorg.freedesktop.org/releases/individual/proto/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -DISTFILES += $(call admfiles,CSWxextproto, depend) +DISTFILES += $(call admfiles,CSWxextproto) -LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib - -export LDFLAGS - -TEST_SCRIPTS = none - -GREP = ggrep - include gar/category.mk -CONFIGURE_ARGS = --prefix=/opt/csw --mandir=/opt/csw/share/man - -test-none: - @$(MAKECOOKIE) - -post-install: - ( gfind $(DESTDIR)/opt/csw -exec bash -c "file {} | ggrep ELF | ggrep -e 'executable' -e 'dynamic lib' | ggrep 'not stripped' && strip {}" \; ) Modified: csw/mgar/pkg/x11/xextproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/xextproto/trunk/checksums 2008-12-14 19:14:55 UTC (rev 2585) +++ csw/mgar/pkg/x11/xextproto/trunk/checksums 2008-12-14 19:18:04 UTC (rev 2586) @@ -1,3 +1,3 @@ 6a8f9f9559e9065858905043c17e05a1 download/xextproto-7.0.3.tar.gz -eccfcd948b06943cbd532906a56ff190 download/CSWxextproto.gspec -d41d8cd98f00b204e9800998ecf8427e download/CSWxextproto.depend +fd70e9403a62d42ca8e45df6fda471c9 download/CSWxextproto.gspec +6a8f9f9559e9065858905043c17e05a1 download/xextproto-7.0.3.tar.gz Modified: csw/mgar/pkg/x11/xextproto/trunk/files/CSWxextproto.gspec =================================================================== --- csw/mgar/pkg/x11/xextproto/trunk/files/CSWxextproto.gspec 2008-12-14 19:14:55 UTC (rev 2585) +++ csw/mgar/pkg/x11/xextproto/trunk/files/CSWxextproto.gspec 2008-12-14 19:18:04 UTC (rev 2586) @@ -1,4 +1,4 @@ %var bitname xextproto %var pkgname CSWxextproto %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING +%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 wbonnet at users.sourceforge.net Sun Dec 14 20:22:16 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 14 Dec 2008 19:22:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[2587] csw/mgar/pkg/x11/xproto/trunk Message-ID: Revision: 2587 http://gar.svn.sourceforge.net/gar/?rev=2587&view=rev Author: wbonnet Date: 2008-12-14 19:22:16 +0000 (Sun, 14 Dec 2008) Log Message: ----------- Move to X11 subdir Modified Paths: -------------- csw/mgar/pkg/x11/xproto/trunk/Makefile csw/mgar/pkg/x11/xproto/trunk/checksums csw/mgar/pkg/x11/xproto/trunk/files/CSWxproto.gspec Modified: csw/mgar/pkg/x11/xproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xproto/trunk/Makefile 2008-12-14 19:18:04 UTC (rev 2586) +++ csw/mgar/pkg/x11/xproto/trunk/Makefile 2008-12-14 19:22:16 UTC (rev 2587) @@ -1,35 +1,20 @@ GARNAME = xproto GARVERSION = 7.0.14 -CATEGORIES = lib +CATEGORIES = x11 DESCRIPTION = xproto define BLURB xproto endef -MASTER_SITES =http://xorg.freedesktop.org/releases/individual/proto/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -DISTFILES += $(call admfiles,CSWxproto, depend) +DISTFILES += $(call admfiles,CSWxproto) -LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib - -export LDFLAGS - -TEST_SCRIPTS = none - -GREP = ggrep - include gar/category.mk -CONFIGURE_ARGS = --prefix=/opt/csw --mandir=/opt/csw/share/man - -test-none: - @$(MAKECOOKIE) - -post-install: - ( gfind $(DESTDIR)/opt/csw -exec bash -c "file {} | ggrep ELF | ggrep -e 'executable' -e 'dynamic lib' | ggrep 'not stripped' && strip {}" \; ) Modified: csw/mgar/pkg/x11/xproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/xproto/trunk/checksums 2008-12-14 19:18:04 UTC (rev 2586) +++ csw/mgar/pkg/x11/xproto/trunk/checksums 2008-12-14 19:22:16 UTC (rev 2587) @@ -1,3 +1,3 @@ 3575f7bea6d3314508f142575eb8e843 download/xproto-7.0.14.tar.gz -b72227e1b4bd37ced508c6809d750114 download/CSWxproto.gspec -d41d8cd98f00b204e9800998ecf8427e download/CSWxproto.depend +87ea47c8bd3fcf06c6d6b78822c967e5 download/CSWxproto.gspec +3575f7bea6d3314508f142575eb8e843 download/xproto-7.0.14.tar.gz Modified: csw/mgar/pkg/x11/xproto/trunk/files/CSWxproto.gspec =================================================================== --- csw/mgar/pkg/x11/xproto/trunk/files/CSWxproto.gspec 2008-12-14 19:18:04 UTC (rev 2586) +++ csw/mgar/pkg/x11/xproto/trunk/files/CSWxproto.gspec 2008-12-14 19:22:16 UTC (rev 2587) @@ -1,4 +1,4 @@ %var bitname xproto %var pkgname CSWxproto %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING +%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 wbonnet at users.sourceforge.net Sun Dec 14 20:40:35 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 14 Dec 2008 19:40:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[2588] csw/mgar/pkg Message-ID: Revision: 2588 http://gar.svn.sourceforge.net/gar/?rev=2588&view=rev Author: wbonnet Date: 2008-12-14 19:40:34 +0000 (Sun, 14 Dec 2008) Log Message: ----------- Move to subdir X11 and GARv2 Modified Paths: -------------- csw/mgar/pkg/x11/libpthread-stubs/trunk/Makefile csw/mgar/pkg/x11/libpthread-stubs/trunk/files/CSWlibpthreadstubs.gspec csw/mgar/pkg/x11/xcb-proto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/libpthread-stubs/ Removed Paths: ------------- csw/mgar/pkg/libpthread-stubs/ csw/mgar/pkg/x11/libpthread-stubs/trunk/files/CSWlibpthreadstubs.depend csw/mgar/pkg/x11/libpthread-stubs/trunk/files/CSWlibpthreadstubs.prototype Property Changed: ---------------- csw/mgar/pkg/x11/libpthread-stubs/trunk/ Property changes on: csw/mgar/pkg/x11/libpthread-stubs/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/x11/libpthread-stubs/trunk/Makefile =================================================================== --- csw/mgar/pkg/libpthread-stubs/trunk/Makefile 2008-12-13 18:53:19 UTC (rev 2573) +++ csw/mgar/pkg/x11/libpthread-stubs/trunk/Makefile 2008-12-14 19:40:34 UTC (rev 2588) @@ -1,39 +1,20 @@ GARNAME = libpthread-stubs GARVERSION = 0.1 -CATEGORIES = lib +CATEGORIES = x11 DESCRIPTION = pthread stubs not provided by native libc define BLURB This library provides weak aliases for pthread functions not provided in libc or otherwise available by default. Libraries like libxcb rely on pthread stubs to use pthreads optionally, becoming thread-safe when linked to libpthread, while avoiding any performance hit when running single-threaded. libpthread-stubs supports this behavior even on platforms which do not supply all the necessary pthread stubs. On platforms which already supply all the necessary pthread stubs, this package has no content. endef -MASTER_SITES =http://xcb.freedesktop.org/dist/ +MASTER_SITES = $(XCB_MASTER_SITES) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -# DISTFILES += CSWlibpthreadstubs.gspec CSWlibpthreadstubs.prototype CSWlibpthreadstubs.depend -# DISTFILES += CSWlibpthreadstubsdev.gspec CSWlibpthreadstubsdev.prototype CSWlibpthreadstubsdev.depend DISTFILES += $(call admfiles,CSWlibpthreadstubs, depend) -CFLAGS += -xlibmil -errtags=yes -erroff=E_EMPTY_DECLARATION -CXXFLAGS += -xlibmil -xlibmopt -features=tmplife -norunpath -LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib - -export CFLAGS CXXFLAGS LDFLAGS - -TEST_SCRIPTS = none - -GREP = ggrep - include gar/category.mk -CONFIGURE_ARGS = --prefix=/opt/csw --mandir=/opt/csw/share/man - -test-none: - @$(MAKECOOKIE) - -post-install: - ( gfind $(DESTDIR)/opt/csw -exec bash -c "file {} | ggrep ELF | ggrep -e 'executable' -e 'dynamic lib' | ggrep 'not stripped' && strip {}" \; ) Modified: csw/mgar/pkg/x11/libpthread-stubs/trunk/files/CSWlibpthreadstubs.gspec =================================================================== --- csw/mgar/pkg/libpthread-stubs/trunk/files/CSWlibpthreadstubs.gspec 2008-12-13 18:53:19 UTC (rev 2573) +++ csw/mgar/pkg/x11/libpthread-stubs/trunk/files/CSWlibpthreadstubs.gspec 2008-12-14 19:40:34 UTC (rev 2588) @@ -1,4 +1,4 @@ %var bitname libpthreadstubs %var pkgname CSWlibpthreadstubs %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING +%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Deleted: csw/mgar/pkg/x11/libpthread-stubs/trunk/files/CSWlibpthreadstubs.prototype =================================================================== --- csw/mgar/pkg/libpthread-stubs/trunk/files/CSWlibpthreadstubs.prototype 2008-12-13 18:53:19 UTC (rev 2573) +++ csw/mgar/pkg/x11/libpthread-stubs/trunk/files/CSWlibpthreadstubs.prototype 2008-12-14 19:40:34 UTC (rev 2588) @@ -1,5 +0,0 @@ -d none /opt/csw/lib/pkgconfig 0755 root bin -f none /opt/csw/lib/pkgconfig/pthread-stubs.pc 0644 root bin -i copyright=CSWlibpthreadstubs.copyright -i depend=CSWlibpthreadstubs.depend -i pkginfo=CSWlibpthreadstubs.pkginfo Modified: csw/mgar/pkg/x11/xcb-proto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xcb-proto/trunk/Makefile 2008-12-14 19:22:16 UTC (rev 2587) +++ csw/mgar/pkg/x11/xcb-proto/trunk/Makefile 2008-12-14 19:40:34 UTC (rev 2588) @@ -7,7 +7,7 @@ xcb-proto endef -MASTER_SITES =http://xcb.freedesktop.org/dist/ +MASTER_SITES = $(XCB_MASTER_SITES) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Dec 14 21:22:31 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 14 Dec 2008 20:22:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[2589] csw/mgar/pkg/x11/libpthread-stubs/trunk Message-ID: Revision: 2589 http://gar.svn.sourceforge.net/gar/?rev=2589&view=rev Author: wbonnet Date: 2008-12-14 20:22:31 +0000 (Sun, 14 Dec 2008) Log Message: ----------- Move to X11 subdir Modified Paths: -------------- csw/mgar/pkg/x11/libpthread-stubs/trunk/Makefile csw/mgar/pkg/x11/libpthread-stubs/trunk/checksums Modified: csw/mgar/pkg/x11/libpthread-stubs/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libpthread-stubs/trunk/Makefile 2008-12-14 19:40:34 UTC (rev 2588) +++ csw/mgar/pkg/x11/libpthread-stubs/trunk/Makefile 2008-12-14 20:22:31 UTC (rev 2589) @@ -14,7 +14,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -DISTFILES += $(call admfiles,CSWlibpthreadstubs, depend) +DISTFILES += $(call admfiles,CSWlibpthreadstubs) include gar/category.mk Modified: csw/mgar/pkg/x11/libpthread-stubs/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libpthread-stubs/trunk/checksums 2008-12-14 19:40:34 UTC (rev 2588) +++ csw/mgar/pkg/x11/libpthread-stubs/trunk/checksums 2008-12-14 20:22:31 UTC (rev 2589) @@ -1,3 +1,2 @@ 5e3e75160ab6a8c212d0ecd82aa04651 download/libpthread-stubs-0.1.tar.gz -9ea5b260e4d45c5f92bb54601b77fa32 download/CSWlibpthreadstubs.gspec -d41d8cd98f00b204e9800998ecf8427e download/CSWlibpthreadstubs.depend +adceda12cfefe051430db570bbc6a438 download/CSWlibpthreadstubs.gspec This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Dec 14 21:27:33 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 14 Dec 2008 20:27:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[2590] csw/mgar/pkg Message-ID: Revision: 2590 http://gar.svn.sourceforge.net/gar/?rev=2590&view=rev Author: wbonnet Date: 2008-12-14 20:27:27 +0000 (Sun, 14 Dec 2008) Log Message: ----------- move to X11 subdir Modified Paths: -------------- csw/mgar/pkg/x11/libXau/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/libXau/ Removed Paths: ------------- csw/mgar/pkg/libXau/ Property Changed: ---------------- csw/mgar/pkg/x11/libXau/trunk/ Property changes on: csw/mgar/pkg/x11/libXau/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/x11/libXau/trunk/Makefile =================================================================== --- csw/mgar/pkg/libXau/trunk/Makefile 2008-12-13 18:53:19 UTC (rev 2573) +++ csw/mgar/pkg/x11/libXau/trunk/Makefile 2008-12-14 20:27:27 UTC (rev 2590) @@ -1,6 +1,6 @@ GARNAME = libXau GARVERSION = 1.0.4 -CATEGORIES = lib +CATEGORIES = x11 DESCRIPTION = X11 authorisation library define BLURB This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Dec 14 21:35:35 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 14 Dec 2008 20:35:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[2591] csw/mgar/gar/v2/categories Message-ID: Revision: 2591 http://gar.svn.sourceforge.net/gar/?rev=2591&view=rev Author: wbonnet Date: 2008-12-14 20:35:35 +0000 (Sun, 14 Dec 2008) Log Message: ----------- Add x11 category Added Paths: ----------- csw/mgar/gar/v2/categories/x11/ csw/mgar/gar/v2/categories/x11/category.mk Added: csw/mgar/gar/v2/categories/x11/category.mk =================================================================== --- csw/mgar/gar/v2/categories/x11/category.mk (rev 0) +++ csw/mgar/gar/v2/categories/x11/category.mk 2008-12-14 20:35:35 UTC (rev 2591) @@ -0,0 +1,41 @@ +# X11 +X11_PROTO_MASTER_SITE = http://xorg.freedesktop.org/releases/individual/proto/ +XCB_MASTER_SITES = http://xcb.freedesktop.org/dist/ + +# C compiler flags +CFLAGS += -xlibmil -errtags=yes -erroff=E_EMPTY_DECLARATION + +# C++ compiler flags +CXXFLAGS += -xlibmil -xlibmopt -features=tmplife -norunpath + +# Preprocessor flags + +# Linker flags +LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib + +# Defines some tools used by autostuff +GREP = ggrep + +# export the variables +export LDFLAGS CXXFLAGS CFLAGS CPPFLAGS GREP + +# pkg-config options +PKG_CONFIG_PATH += $(DESTDIR)/opt/csw/lib/pkgconfig +PKG_CONFIG_PATH += $(DESTDIR)/opt/csw/X11/lib/pkgconfig + +# Configure common options +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --prefix=/opt/csw/X11 +CONFIGURE_ARGS += --exec-prefix=/opt/csw/X11 +CONFIGURE_ARGS += --libdir=/opt/csw/X11 +CONFIGURE_ARGS += --includedir=/opt/csw/X11/include +CONFIGURE_ARGS += --datadir=/opt/csw/X11/share +CONFIGURE_ARGS += --mandir=/opt/csw/X11/share/man +CONFIGURE_ARGS += --docdir=/opt/csw/X11/share/doc + +# No tests scripts, thus there is no "gmake test" target +TEST_SCRIPTS = + +# Includes the rest of gar +include gar/gar.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 Sun Dec 14 22:38:42 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 14 Dec 2008 21:38:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[2592] csw/mgar/pkg/pca/trunk Message-ID: Revision: 2592 http://gar.svn.sourceforge.net/gar/?rev=2592&view=rev Author: dmichelsen Date: 2008-12-14 21:38:42 +0000 (Sun, 14 Dec 2008) Log Message: ----------- pca: Add pca.conf from William Bonnet, review of parameters for latest version pending Modified Paths: -------------- csw/mgar/pkg/pca/trunk/Makefile csw/mgar/pkg/pca/trunk/checksums Added Paths: ----------- csw/mgar/pkg/pca/trunk/files/pca.conf Modified: csw/mgar/pkg/pca/trunk/Makefile =================================================================== --- csw/mgar/pkg/pca/trunk/Makefile 2008-12-14 20:35:35 UTC (rev 2591) +++ csw/mgar/pkg/pca/trunk/Makefile 2008-12-14 21:38:42 UTC (rev 2592) @@ -16,6 +16,7 @@ MASTER_SITES = http://www.par.univie.ac.at/solaris/pca/download/ DISTFILES = $(GARNAME)-$(GARVERSION) DISTFILES += $(call admfiles,CSWpca) +DISTFILES += pca.conf # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d{8}-\d{2}) Modified: csw/mgar/pkg/pca/trunk/checksums =================================================================== --- csw/mgar/pkg/pca/trunk/checksums 2008-12-14 20:35:35 UTC (rev 2591) +++ csw/mgar/pkg/pca/trunk/checksums 2008-12-14 21:38:42 UTC (rev 2592) @@ -1,2 +1,3 @@ 85ce7fa0c108b5e6f1fd1b84e1216ca6 download/pca-20081024-01 12fc8ec8fe4164566632328a76e025f7 download/CSWpca.gspec +12de68ff8f67b4bb8b095e5646402208 download/pca.conf Added: csw/mgar/pkg/pca/trunk/files/pca.conf =================================================================== --- csw/mgar/pkg/pca/trunk/files/pca.conf (rev 0) +++ csw/mgar/pkg/pca/trunk/files/pca.conf 2008-12-14 21:38:42 UTC (rev 2592) @@ -0,0 +1,396 @@ +# ----------------------------------------------------------------------------- +# +# PCA - Patch Check Advanced +# +# The template for this configuration file is associated to version 5.3 +# if you currently use a newer version, please check if you need to update +# this file. +# +# +# +# The behaviour of pca can be configured by setting any option either in this +# configuration file, or as an environment variable with the PCA_ prefix or on +# the command line. +# +# See man page for pca for a complete list of allowed options +# +# At first, this configuration file is read from the following locations : +# +# /opt/csw/bin/pca.conf +# /opt/csw/etc/pca.conf +# /etc/pca.conf +# $HOME/.pca +# pca.conf in the current directory +# +# in this order. Options are set by specifying option=value in the file. +# +# Example: To set the path of the wget command, use wget=/opt/csw/bin/wget +# To enable debug output, use debug=1. +# +# The values defined in this configuration file can be supereded at runtime. +# +# After reading the values from the first configuration file, all environment +# variables matching PCA_OPTION are read. +# +# Example: To set the patch download directory, set PCA_PATCHDIR to +# /some/dir/. +# To set the noheader option, set PCA_NOHEADER to 1. +# +# At last, the command line options are read. Example: To set the location of +# the patch xref file, use -X /tmp or --xrefdir=/tmp. To set the option for +# safe patch installation, use -s or --safe. +# +# +# +# The following value is set by default in the Blastwave package +# +# wget=/opt/csw/bin/wget +# + + + +# ----------------------------------------------------------------------------- +# +# Variable : user +# +# Login name for Sun Online Account authentication. +# +# user=USER + +# ----------------------------------------------------------------------------- +# +# Variable : passwd +# +# Password for Sun Online Account authentication. +# +# passwd=PASS + + + + +# ----------------------------------------------------------------------------- +# +# Variable : list +# +# List patches. See OPERANDS on how to specify which patches are listed. +# +# Set the variable value to 1 to activate it. By default (uncommented line) +# this option is not activated. Uncomment the line to activate it. +# +# list=1 + +# ----------------------------------------------------------------------------- +# +# Variable : listhtml +# +# Like -l, but generates output in HTML format, including links to patch READMEs and downloads. +# +# Set the variable value to 1 to activate it. By default (uncommented line) +# this option is not activated. Uncomment the line to activate it. +# +# listhtml=1 + +# ----------------------------------------------------------------------------- +# +# Variable : download +# +# Download patches. See OPERANDS on how to specify which patches are +# downloaded. Patches are placed in the current directory or in patchdir, +# if set. +# +# Set the variable value to 1 to activate it. By default (uncommented line) +# this option is not activated. Uncomment the line to activate it. +# +# download=1 + +# ----------------------------------------------------------------------------- +# +# Variable : install +# +# Download and install patches. See OPERANDS on how to specify which patches +# are installed. Requires pca to be run as root. +# +# Set the variable value to 1 to activate it. By default (uncommented line) +# this option is not activated. Uncomment the line to activate it. +# +# install=1 + +# ----------------------------------------------------------------------------- +# +# Variable : pretend +# +# Like -i, but only pretend to install patches. Can be used to find out if +# any of the patches require a reboot. +# +# Set the variable value to 1 to activate it. By default (uncommented line) +# this option is not activated. Uncomment the line to activate it. +# +# pretend=1 + +# ----------------------------------------------------------------------------- +# +# Variable : readme +# +# Display patch READMEs. See OPERANDS on how to specify which READMEs are +# displayed. The patch README is extracted from a previously downloaded patch +# file or downloaded directly from Sun. +# +# Set the variable value to 1 to activate it. By default (uncommented line) +# this option is not activated. Uncomment the line to activate it. +# +# readme=1 + +# ----------------------------------------------------------------------------- +# +# Variable : getxref +# +# Download most recent patch cross-reference file. If the file does not exist +# or is older than 24 hours, pca tries to download it on its own before +# anything else. +# +# Set the variable value to 1 to activate it. By default (uncommented line) +# this option is not activated. Uncomment the line to activate it. +# +# getxref=1 + +# ----------------------------------------------------------------------------- +# +# Variable : xfredir +# +# Set location of the cross-reference file. The default is /var/tmp. +# By default, patchdiag.xref is writable for all users. If the xrefown +# option is set, or the xrefdir option contains /home, the cross reference +# file will be writable by the current user only. +# +# xrefdir=/var/opt/csw/pca + +# ----------------------------------------------------------------------------- +# +# Variable : nocheckxref +# +# Do not check for updated patch cross-reference file. Use this option to +# maintain a global baseline patch set. +# +# Set the variable value to 1 to activate it. By default (uncommented line) +# this option is not activated. Uncomment the line to activate it. +# +# nocheckxref=1 + +# ----------------------------------------------------------------------------- +# +# Variable : xrefown +# +# If set, patchdiag.xref will be writable for the current user only. +# +# Set the variable value to 1 to activate it. By default (uncommented line) +# this option is not activated. Uncomment the line to activate it. +# +# xrefown=1 + +# ----------------------------------------------------------------------------- +# +# Variable : nocache +# +# If a proxy is used to access the Internet, this option advises it to not +# cache patchdiag.xref. Useful if the proxy can't be trusted to always return +# an up-to-date version of the file. +# +# Set the variable value to 1 to activate it. By default (uncommented line) +# this option is not activated. Uncomment the line to activate it. +# +# nocache=1 + +# ----------------------------------------------------------------------------- +# +# Variable : patchdir +# +# Set directory to which patches are downloaded. Only use absolute path names. +# The default is the current working directory. +# +# patchdir=/var/opt/csw/pca/download + +# ----------------------------------------------------------------------------- +# +# Variable : askauth +# +# Ask for Sun Online Account data interactively. +# +# Set the variable value to 1 to activate it. By default (uncommented line) +# this option is not activated. Uncomment the line to activate it. +# +# askauth=1 + +# ----------------------------------------------------------------------------- +# +# Variable : localurl +# +# If set, pca tries to download patches and READMEs from this URL first. +# Any URL starting with file:/, ftp://, http:// or https:// can be used. +# See LOCAL PATCH SERVER for more information. +# +# localurl=URL + +# ----------------------------------------------------------------------------- +# +# Variable : pattern +# +# List only patches whose synopsis matches the search pattern REGEX. This +# can be a simple string like mail or a regular expression like "[kK]ernel". +# +# pattern=REGEX + +# ----------------------------------------------------------------------------- +# +# Variable : noreboot +# +# Install only patches that don't require a reboot after installation. +# +# Set the variable value to 1 to activate it. By default (uncommented line) +# this option is not activated. Uncomment the line to activate it. +# +# noreboot=1 + + +# ----------------------------------------------------------------------------- +# +# Variable : minage +# +# List only patches which are at least DAYS old. +# +# Set the variable value to the number of DAYS (eg: 5, 10, 30). By default +# (uncommented line) this option is not activated. Uncomment the line to +# activate it. +# +# minage=DAYS + + +# ----------------------------------------------------------------------------- +# +# Variable : syslog +# +# Syslog facility (eg. user or local0) to log successful patch installs to. +# +# syslog=TYPE + +# ----------------------------------------------------------------------------- +# +# Variable : nobackup +# +# Make patchadd not back up files when installing patches. This works by +# running patchadd with its -d option. Patches can not be backed out if this +# option is used. +# +# Set the variable value to 1 to activate it. By default (uncommented line) +# this option is not activated. Uncomment the line to activate it. +# +# nobackup=1 + +# ----------------------------------------------------------------------------- +# +# Variable : safe +# +# Safe patch installation. Checks all files for local modifications before +# installing a patch. A patch will not be installed if files with local +# modifications would be overwritten. +# +# Set the variable value to 1 to activate it. By default (uncommented line) +# this option is not activated. Uncomment the line to activate it. +# +# safe=1 + +# ----------------------------------------------------------------------------- +# +# Variable : currentzone +# +# Make patchadd modify packages in the current zone only. This works by +# running patchadd with its -G option. This option works on Solaris 10 or +# newer only. +# +# Set the variable value to 1 to activate it. By default (uncommented line) +# this option is not activated. Uncomment the line to activate it. +# +# currentzone=1 + +# ----------------------------------------------------------------------------- +# +# Variable : patchadd +# +# Path to an alternative patchadd command. +# +# patchadd=FILE + +# ----------------------------------------------------------------------------- +# +# Variable : noheader +# +# Don't display descriptive headers. Useful if re-using pca's output in own +# scripts. +# +# Set the variable value to 1 to activate it. By default (uncommented line) +# this option is not activated. Uncomment the line to activate it. +# +# noheader=1 + +# ----------------------------------------------------------------------------- +# +# Variable : fromfiles +# +# Read uname/showrev/pkginfo output from files in the specified directory, +# where DIR can also be a file name prefix. See CREATING PATCH REPORTS FOR +# REMOTE MACHINES for details. +# +# fromfiles=DIR + +# ----------------------------------------------------------------------------- +# +# Variable : root +# +# Set alternative root directory. This can be useful for Live Upgrade, to +# analyze patches in an alternate root environment or to point pca at the +# mini-root of a jumpstart install server. This option works on Solaris 9 or +# newer only. +# +# root=DIR + +# ----------------------------------------------------------------------------- +# +# Variable : wget +# +# Path to the wget command. +# + +wget=/opt/csw/bin/wget + +# ----------------------------------------------------------------------------- +# +# Variable : debug +# +# Show debug output. This includes output generated by patchadd. +# +# Set the variable value to 1 to activate it. By default (uncommented line) +# this option is not activated. Uncomment the line to activate it. +# +# debug=1 + +# ----------------------------------------------------------------------------- +# +# Variable : help +# +# Print help on command line options. +# +# Set the variable value to 1 to activate it. By default (uncommented line) +# this option is not activated. Uncomment the line to activate it. +# +# help=1 + +# ----------------------------------------------------------------------------- +# +# Variable : version +# +# Print version information. +# +# Set the variable value to 1 to activate it. By default (uncommented line) +# this option is not activated. Uncomment the line to activate it. +# +# version=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 Mon Dec 15 12:26:13 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Dec 2008 11:26:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[2593] csw/mgar/pkg Message-ID: Revision: 2593 http://gar.svn.sourceforge.net/gar/?rev=2593&view=rev Author: dmichelsen Date: 2008-12-15 11:26:10 +0000 (Mon, 15 Dec 2008) Log Message: ----------- gar: First commit Added Paths: ----------- csw/mgar/pkg/gar/ csw/mgar/pkg/gar/branches/ csw/mgar/pkg/gar/tags/ csw/mgar/pkg/gar/trunk/ csw/mgar/pkg/gar/trunk/Makefile csw/mgar/pkg/gar/trunk/checksums csw/mgar/pkg/gar/trunk/files/ csw/mgar/pkg/gar/trunk/files/CSWgar-v1.gspec csw/mgar/pkg/gar/trunk/files/CSWgar-v2.gspec csw/mgar/pkg/gar/trunk/files/CSWgar.gspec csw/mgar/pkg/gar/trunk/files/garit Property changes on: csw/mgar/pkg/gar/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 gar-base https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar Added: csw/mgar/pkg/gar/trunk/Makefile =================================================================== --- csw/mgar/pkg/gar/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gar/trunk/Makefile 2008-12-15 11:26:10 UTC (rev 2593) @@ -0,0 +1,48 @@ +GARNAME = gar +GARVERSION = 2.0 +CATEGORIES = utils + +DESCRIPTION = The GAR package build system +define BLURB +endef + +# No master sites, we already have GAR in the repository +MASTER_SITES = +DISTFILES = $(call admfiles,CSWgar,) +DISTFILES += $(call admfiles,CSWgar-v1,) +DISTFILES += $(call admfiles,CSWgar-v2,) +DISTFILES += garit + +WORKSRC = $(WORKDIR) + +SPKG_SOURCEURL = http://gar.sourceforge.net + +SPKG_DESC_CSWgar = The mGAR package build system +SPKG_DESC_CSWgar-v1 = The mGAR v1 system files +SPKG_DESC_CSWgar-v2 = The mGAR v2 system files + +REQUIRED_PKGS_CSWgar = $(PREREQUISITE_BASE_PKGS) CSWsvn +REQUIRED_PKGS_CSWgar-v1 = CSWgar +REQUIRED_PKGS_CSWgar-v2 = CSWgar + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +PKGFILES_CSWgar-v1 = $(prefix)/src/gar/v1/.* +PKGFILES_CSWgar-v2 = $(prefix)/src/gar/v2/.* + +# Because the bad pathes are in the bad pathes check we cannot check ourselves +ENABLE_CHECK = 0 + +include gar/category.mk + +install-custom: + @echo " ==> Installing $(GARNAME)" + + rm -f $(DESTIR)$(bindir)/garit + ginstall -d $(DESTDIR)$(bindir) + ginstall $(WORKSRC)/garit $(DESTDIR)$(bindir)/garit + ginstall -d $(DESTDIR)$(prefix)/src/gar + cd $(CURDIR)/gar-base && pax -r -w -v -s ,.*/\.svn.*,, . $(DESTDIR)$(prefix)/src/gar Added: csw/mgar/pkg/gar/trunk/checksums =================================================================== --- csw/mgar/pkg/gar/trunk/checksums (rev 0) +++ csw/mgar/pkg/gar/trunk/checksums 2008-12-15 11:26:10 UTC (rev 2593) @@ -0,0 +1,4 @@ +ce15d9d2f3f7c2807b385142097446f6 download/CSWgar.gspec +972eef3a1dd23345e20df9d7b34ccf85 download/CSWgar-v1.gspec +8d0f9e54dfd9dc49147343ab5eef546d download/CSWgar-v2.gspec +3505c7f06c435fd0b34e9addd5b4da2a download/garit Added: csw/mgar/pkg/gar/trunk/files/CSWgar-v1.gspec =================================================================== --- csw/mgar/pkg/gar/trunk/files/CSWgar-v1.gspec (rev 0) +++ csw/mgar/pkg/gar/trunk/files/CSWgar-v1.gspec 2008-12-15 11:26:10 UTC (rev 2593) @@ -0,0 +1,5 @@ +%var bitname gar_v1 +%var pkgname CSWgar-v1 +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright +This software is released under GPL. Added: csw/mgar/pkg/gar/trunk/files/CSWgar-v2.gspec =================================================================== --- csw/mgar/pkg/gar/trunk/files/CSWgar-v2.gspec (rev 0) +++ csw/mgar/pkg/gar/trunk/files/CSWgar-v2.gspec 2008-12-15 11:26:10 UTC (rev 2593) @@ -0,0 +1,5 @@ +%var bitname gar_v2 +%var pkgname CSWgar-v2 +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright +This software is released under GPL. Added: csw/mgar/pkg/gar/trunk/files/CSWgar.gspec =================================================================== --- csw/mgar/pkg/gar/trunk/files/CSWgar.gspec (rev 0) +++ csw/mgar/pkg/gar/trunk/files/CSWgar.gspec 2008-12-15 11:26:10 UTC (rev 2593) @@ -0,0 +1,5 @@ +%var bitname gar +%var pkgname CSWgar +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright +This software is released under GPL. Added: csw/mgar/pkg/gar/trunk/files/garit =================================================================== --- csw/mgar/pkg/gar/trunk/files/garit (rev 0) +++ csw/mgar/pkg/gar/trunk/files/garit 2008-12-15 11:26:10 UTC (rev 2593) @@ -0,0 +1,32 @@ +#!/bin/sh +#! -*- perl -*- +eval 'exec perl -x -w $0 ${1+"$@"}' + if 0; + +# garit - Script for making tasks with GAR easy +# +# Author: Dagobert Michelsen, + +my $version = 0.01 + +use strict; +use Config; + +sub man { + eval "use Pod::Usage"; + if ($@) { err ('Required module Pod::Usage not found') } + + # Change uid to something secure as pod2usage does not run as root. + # This snippet is taken from perldoc. See the comments there. + my $id= eval { getpwnam("nobody") }; + $id= eval { getpwnam("nouser") } unless defined $id; + $id= -2 unless defined $id; + eval { + $< = $id; # real uid + $> = $id; # effective uid + $< = $id; # real uid + $> = $id; # effective uid + }; + pod2usage( -exitstatus => 0, -verbose => 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 Mon Dec 15 12:37:34 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Dec 2008 11:37:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[2594] csw/mgar/gar Message-ID: Revision: 2594 http://gar.svn.sourceforge.net/gar/?rev=2594&view=rev Author: dmichelsen Date: 2008-12-15 11:37:33 +0000 (Mon, 15 Dec 2008) Log Message: ----------- mGAR v1/v2: Fix default pathes for build_pkgdb Modified Paths: -------------- csw/mgar/gar/v1/bin/build_pkgdb csw/mgar/gar/v2/bin/build_pkgdb Modified: csw/mgar/gar/v1/bin/build_pkgdb =================================================================== --- csw/mgar/gar/v1/bin/build_pkgdb 2008-12-15 11:26:10 UTC (rev 2593) +++ csw/mgar/gar/v1/bin/build_pkgdb 2008-12-15 11:37:33 UTC (rev 2594) @@ -13,7 +13,7 @@ # build_pkgdb - create CSW package name database from makefiles/gspecs # -GARROOT=${1:-'/export/medusa/comand/csw'} +GARROOT=${1:-.} for makefile in `gfind $GARROOT -mindepth 3 -maxdepth 3 -name Makefile \ | grep -v meta | sort` Modified: csw/mgar/gar/v2/bin/build_pkgdb =================================================================== --- csw/mgar/gar/v2/bin/build_pkgdb 2008-12-15 11:26:10 UTC (rev 2593) +++ csw/mgar/gar/v2/bin/build_pkgdb 2008-12-15 11:37:33 UTC (rev 2594) @@ -13,7 +13,7 @@ # build_pkgdb - create CSW package name database from makefiles/gspecs # -GARROOT=${1:-'/export/medusa/comand/csw'} +GARROOT=${1:-.} for makefile in `gfind $GARROOT -mindepth 3 -maxdepth 3 -name Makefile \ | grep -v meta | sort` 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 Dec 15 12:43:33 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Dec 2008 11:43:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[2595] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 2595 http://gar.svn.sourceforge.net/gar/?rev=2595&view=rev Author: dmichelsen Date: 2008-12-15 11:43:32 +0000 (Mon, 15 Dec 2008) Log Message: ----------- mGAR v2: Add DEBUG_PACKAGING flag Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2008-12-15 11:37:33 UTC (rev 2594) +++ csw/mgar/gar/v2/gar.pkg.mk 2008-12-15 11:43:32 UTC (rev 2595) @@ -13,6 +13,12 @@ # # +ifeq ($(DEBUG_PACKAGING),) +_DBG=@ +else +_DBG= +endif + PKGINFO ?= /usr/bin/pkginfo SPKG_SPECS ?= $(basename $(filter %.gspec,$(DISTFILES))) @@ -156,11 +162,11 @@ # Pulled in from pkglib/csw_prototype.gspec $(PROTOTYPE): $(WORKDIR) merge - @cswproto -r $(PKGROOT) $(PKGROOT) >$@ + $(_DBG)cswproto -r $(PKGROOT) $(PKGROOT) >$@ .PRECIOUS: $(WORKDIR)/%.prototype $(WORKDIR)/%.prototype-$(GARCH) $(WORKDIR)/%.prototype: | $(PROTOTYPE) - @if [ -n "$(PKGFILES_$*_SHARED)" -o \ + $(_DBG)if [ -n "$(PKGFILES_$*_SHARED)" -o \ -n "$(PKGFILES_$*)" -o \ -n "$(_PKGFILES_EXCLUDE_$*)" -o \ -n "$(ISAEXEC_FILES_$*)" -o \ @@ -178,12 +184,12 @@ fi $(WORKDIR)/%.prototype-$(GARCH): | $(WORKDIR)/%.prototype - @cat $(WORKDIR)/$*.prototype $(_PROTOTYPE_FILTER_$*) >$@ + $(_DBG)cat $(WORKDIR)/$*.prototype $(_PROTOTYPE_FILTER_$*) >$@ # $_EXTRA_GAR_PKGS is for dynamic dependencies added by GAR itself (like CSWisaexec or CSWcswclassutils) .PRECIOUS: $(WORKDIR)/%.depend $(WORKDIR)/%.depend: - $(if $(_EXTRA_GAR_PKGS)$(REQUIRED_PKGS_$*)$(REQUIRED_PKGS), \ + $(_DBG)$(if $(_EXTRA_GAR_PKGS)$(REQUIRED_PKGS_$*)$(REQUIRED_PKGS), \ ($(foreach PKG,$(_EXTRA_GAR_PKGS) $(REQUIRED_PKGS_$*) $(REQUIRED_PKGS),\ $(if $(SPKG_DESC_$(PKG)), \ echo "P $(PKG) $(call _pkglist_catalogname,$(PKG)) - $(SPKG_DESC_$(PKG))";, \ @@ -218,7 +224,7 @@ package-%: $(WORKDIR)/%.prototype-$(GARCH) $(WORKDIR)/%.depend @echo " ==> Processing $*.gspec" - @( $(call _PKG_ENV,$*) mkpackage --spec $(WORKDIR)/$*.gspec \ + $(_DBG)( $(call _PKG_ENV,$*) mkpackage --spec $(WORKDIR)/$*.gspec \ --spooldir $(SPKG_SPOOLDIR) \ --destdir $(SPKG_EXPORT) \ --workdir $(SPKG_WORKDIR) \ 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 Dec 15 12:44:55 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Dec 2008 11:44:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[2596] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 2596 http://gar.svn.sourceforge.net/gar/?rev=2596&view=rev Author: dmichelsen Date: 2008-12-15 11:44:55 +0000 (Mon, 15 Dec 2008) Log Message: ----------- mGAR v2: Make default merge excludes more flexible Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2008-12-15 11:43:32 UTC (rev 2595) +++ csw/mgar/gar/v2/gar.mk 2008-12-15 11:44:55 UTC (rev 2596) @@ -533,7 +533,10 @@ _MERGE_INCLUDE_FILES += $(EXTRA_MERGE_INCLUDE_FILES) $(EXTRA_MERGE_INCLUDE_FILES_$(MODULATION)) MERGE_EXCLUDE_INFODIR ?= $(sharedstatedir)/info/dir -MERGE_EXCLUDE_DEFAULT ?= $(MERGE_EXCLUDE_INFODIR) $(libdir)/.*\.a $(libdir)/.*\.la +MERGE_EXCLUDE_LIBTOOL ?= $(libdir)/.*\.la +MERGE_EXCLUDE_BACKUPFILES ?= .*\~ +MERGE_EXCLUDE_STATICLIBS ?= $(libdir)/.*\.a +MERGE_EXCLUDE_DEFAULT ?= $(MERGE_EXCLUDE_INFODIR) $(MERGE_EXCLUDE_LIBTOOL) $(MERGE_EXCLUDE_BACKUPFILES) $(MERGE_EXCLUDE_STATICLIBS) # Exclude these files ifeq ($(origin MERGE_EXCLUDE_FILES_$(MODULATION)), undefined) 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 Dec 15 13:49:51 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Dec 2008 12:49:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[2597] csw/branches/dam/automatic-multiarch-compile/devel Message-ID: Revision: 2597 http://gar.svn.sourceforge.net/gar/?rev=2597&view=rev Author: dmichelsen Date: 2008-12-15 12:49:51 +0000 (Mon, 15 Dec 2008) Log Message: ----------- automatic-multiarch-compile distcc: Initial commit Added Paths: ----------- csw/branches/dam/automatic-multiarch-compile/devel/distcc/ csw/branches/dam/automatic-multiarch-compile/devel/distcc/Makefile csw/branches/dam/automatic-multiarch-compile/devel/distcc/checksums csw/branches/dam/automatic-multiarch-compile/devel/distcc/files/ csw/branches/dam/automatic-multiarch-compile/devel/distcc/files/CSWdistcc.gspec Added: csw/branches/dam/automatic-multiarch-compile/devel/distcc/Makefile =================================================================== --- csw/branches/dam/automatic-multiarch-compile/devel/distcc/Makefile (rev 0) +++ csw/branches/dam/automatic-multiarch-compile/devel/distcc/Makefile 2008-12-15 12:49:51 UTC (rev 2597) @@ -0,0 +1,21 @@ +GARNAME = distcc +GARVERSION = 3.0 +CATEGORIES = devel + +DESCRIPTION = Distributed compilation for faster C/C++ builds +define BLURB + distcc is a program to distribute builds of C, C++, Objective C or + Objective C++ code across several machines on a network. distcc should + always generate the same results as a local build, is simple to install + and use, and is usually much faster than a local compile. +endef + +MASTER_SITES = $(GOOGLE_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTFILES += $(call admfiles,CSWdistcc,) + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include ../category.mk Added: csw/branches/dam/automatic-multiarch-compile/devel/distcc/checksums =================================================================== --- csw/branches/dam/automatic-multiarch-compile/devel/distcc/checksums (rev 0) +++ csw/branches/dam/automatic-multiarch-compile/devel/distcc/checksums 2008-12-15 12:49:51 UTC (rev 2597) @@ -0,0 +1,2 @@ +a3cab94fb8514687805456bcca9a15ea download/distcc-3.0.tar.bz2 +d301ec445ac117b16707593e77713d82 download/CSWdistcc.gspec Added: csw/branches/dam/automatic-multiarch-compile/devel/distcc/files/CSWdistcc.gspec =================================================================== --- csw/branches/dam/automatic-multiarch-compile/devel/distcc/files/CSWdistcc.gspec (rev 0) +++ csw/branches/dam/automatic-multiarch-compile/devel/distcc/files/CSWdistcc.gspec 2008-12-15 12:49:51 UTC (rev 2597) @@ -0,0 +1,4 @@ +%var bitname distcc +%var pkgname CSWdistcc +%include url file://%{PKGLIB}/csw_dyndepend.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 Mon Dec 15 13:52:19 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Dec 2008 12:52:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[2598] csw/branches/dam/automatic-multiarch-compile/apps Message-ID: Revision: 2598 http://gar.svn.sourceforge.net/gar/?rev=2598&view=rev Author: dmichelsen Date: 2008-12-15 12:52:17 +0000 (Mon, 15 Dec 2008) Log Message: ----------- automatic-multiarch-compile/apps iozone: Initial commit Added Paths: ----------- csw/branches/dam/automatic-multiarch-compile/apps/iozone/ csw/branches/dam/automatic-multiarch-compile/apps/iozone/Makefile csw/branches/dam/automatic-multiarch-compile/apps/iozone/checksums csw/branches/dam/automatic-multiarch-compile/apps/iozone/files/ csw/branches/dam/automatic-multiarch-compile/apps/iozone/files/CSWiozone.gspec csw/branches/dam/automatic-multiarch-compile/apps/iozone/files/patch-vx_ioctl.diff csw/branches/dam/automatic-multiarch-compile/apps/iozone/files/vx_ioctl.h Added: csw/branches/dam/automatic-multiarch-compile/apps/iozone/Makefile =================================================================== --- csw/branches/dam/automatic-multiarch-compile/apps/iozone/Makefile (rev 0) +++ csw/branches/dam/automatic-multiarch-compile/apps/iozone/Makefile 2008-12-15 12:52:17 UTC (rev 2598) @@ -0,0 +1,61 @@ +GARNAME = iozone +GARVERSION = 3.291 +VERSION = $(shell echo $(GARVERSION) | sed -e 's/\./_/g') +CATEGORIES = apps + +DESCRIPTION = IO benchmarking tool +define BLURB + IOzone is a filesystem benchmark tool. The benchmark + generates and measures a variety of file operations. + Iozone has been ported to many machines and runs under + many operating systems. +endef + +MASTER_SITES = http://www.iozone.org/src/current/ +#MASTER_SITES += http://www.iozone.org/docs/ +DISTFILES = $(GARNAME)$(VERSION).tar +DISTFILES += vx_ioctl.h +DISTFILES += $(call admfiles,CSWiozone) + +DISTNAME = $(GARNAME)$(VERSION) + +PATCHFILES = patch-vx_ioctl.diff + +#DOCS = IOzone_msword_98.pdf +#DOCS += Iozone_ps.gz +#DOCS += IOzone_msword_98.doc +#DOCS += Run_rules.doc + +WORKSRC = $(WORKDIR)/$(DISTNAME)/src/current +DOCSRC = $(WORKDIR)/$(DISTNAME)/docs + +# We don't have this modern autoconfig-doodle-crap +CONFIGURE_SCRIPTS = +TEST_SCRIPTS = + +BUILD_SCRIPTS = $(WORKSRC)/makefile + +MODULATORS = TARGET +MODULATIONS_TARGET = 32 64 + +BUILD_ARGS_32 = Solaris +BUILD_ARGS_64 = Solaris8-64 +BUILD_ARGS = $(BUILD_ARGS_$(TARGET)) + +INSTALL_SCRIPTS = custom + +include ../category.mk + +# Make sure the VxFS header is in place +post-extract: + @cp $(WORKDIR)/vx_ioctl.h $(WORKSRC) + @$(MAKECOOKIE) + +# The install part from the Makefile is completely unrelocatable :-( +install-custom: + @echo " ==> Installing $(GARNAME)" + ginstall -d $(DESTDIR)$(bindir) + ginstall $(WORKSRC)/iozone $(DESTDIR)$(bindir) + ginstall -d $(DESTDIR)$(mandir)/man1 + ginstall $(DOCSRC)/iozone.1 $(DESTDIR)$(mandir)/man1 + @$(MAKECOOKIE) Added: csw/branches/dam/automatic-multiarch-compile/apps/iozone/checksums =================================================================== --- csw/branches/dam/automatic-multiarch-compile/apps/iozone/checksums (rev 0) +++ csw/branches/dam/automatic-multiarch-compile/apps/iozone/checksums 2008-12-15 12:52:17 UTC (rev 2598) @@ -0,0 +1,4 @@ +fceb0146e50e714a6c4b3618489e4880 download/iozone3_291.tar +5c485e1e0f464c4c47b05140f383b4b2 download/vx_ioctl.h +84aa96a0593883e2e6a38504be8a0aec download/CSWiozone.gspec +bbf1f15160145b829dbc00b8c8c7b60e download/patch-vx_ioctl.diff Added: csw/branches/dam/automatic-multiarch-compile/apps/iozone/files/CSWiozone.gspec =================================================================== --- csw/branches/dam/automatic-multiarch-compile/apps/iozone/files/CSWiozone.gspec (rev 0) +++ csw/branches/dam/automatic-multiarch-compile/apps/iozone/files/CSWiozone.gspec 2008-12-15 12:52:17 UTC (rev 2598) @@ -0,0 +1,4 @@ +%var bitname iozone +%var pkgname CSWiozone +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKSRC}/LICENSE Added: csw/branches/dam/automatic-multiarch-compile/apps/iozone/files/patch-vx_ioctl.diff =================================================================== --- csw/branches/dam/automatic-multiarch-compile/apps/iozone/files/patch-vx_ioctl.diff (rev 0) +++ csw/branches/dam/automatic-multiarch-compile/apps/iozone/files/patch-vx_ioctl.diff 2008-12-15 12:52:17 UTC (rev 2598) @@ -0,0 +1,24 @@ +diff -Naur tmp/iozone3_291/src/current/iozone.c work/root-blastwavepkg.d/iozone3_291/src/current/iozone.c +--- current/iozone.c 2008-03-03 16:38:17.000000000 +0100 ++++ current/iozone.c 2008-04-23 11:20:00.862783000 +0200 +@@ -338,7 +338,7 @@ + #endif + + #ifdef VXFS +-#include ++#include "vx_ioctl.h" + #endif + + #ifdef unix +diff -Naur tmp/iozone3_291/src/current/libasync.c work/root-blastwavepkg.d/iozone3_291/src/current/libasync.c +--- current/libasync.c 2008-03-03 16:38:17.000000000 +0100 ++++ current/libasync.c 2008-04-23 11:20:09.562273000 +0200 +@@ -106,7 +106,7 @@ + #include + #endif + #ifdef VXFS +-#include ++#include "vx_ioctl.h" + #endif + + #if defined(OSFV5) || defined(linux) Added: csw/branches/dam/automatic-multiarch-compile/apps/iozone/files/vx_ioctl.h =================================================================== --- csw/branches/dam/automatic-multiarch-compile/apps/iozone/files/vx_ioctl.h (rev 0) +++ csw/branches/dam/automatic-multiarch-compile/apps/iozone/files/vx_ioctl.h 2008-12-15 12:52:17 UTC (rev 2598) @@ -0,0 +1,135 @@ +/* @(#)src/unix/pagecache/sol/common/kernel/base/vx_ioctl.h 3.15 10/05/00 14:53:28 - */ +/* #ident "@(#)vxfs:src/unix/pagecache/sol/common/kernel/base/vx_ioctl.h 3.15" */ + +/* + * Copyright (c) 2000 VERITAS Software Corporation. ALL RIGHTS RESERVED. + * UNPUBLISHED -- RIGHTS RESERVED UNDER THE COPYRIGHT + * LAWS OF THE UNITED STATES. USE OF A COPYRIGHT NOTICE + * IS PRECAUTIONARY ONLY AND DOES NOT IMPLY PUBLICATION + * OR DISCLOSURE. + * + * THIS SOFTWARE CONTAINS CONFIDENTIAL INFORMATION AND + * TRADE SECRETS OF VERITAS SOFTWARE. USE, DISCLOSURE, + * OR REPRODUCTION IS PROHIBITED WITHOUT THE PRIOR + * EXPRESS WRITTEN PERMISSION OF VERITAS SOFTWARE. + * + * RESTRICTED RIGHTS LEGEND + * USE, DUPLICATION, OR DISCLOSURE BY THE GOVERNMENT IS + * SUBJECT TO RESTRICTIONS AS SET FORTH IN SUBPARAGRAPH + * (C) (1) (ii) OF THE RIGHTS IN TECHNICAL DATA AND + * COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013. + * VERITAS SOFTWARE + * 1600 PLYMOUTH STREET, MOUNTAIN VIEW, CA 94043 + */ + +#ifndef _FS_VXFS_VX_IOCTL_H +#define _FS_VXFS_VX_IOCTL_H + +#include + +#define VX_IOCTL (('V' << 24) | ('X' << 16) | ('F' << 8)) + +/* + * User group ioctls + */ + +#define VX_SETCACHE (VX_IOCTL | 1) /* set cache advice */ +#define VX_GETCACHE (VX_IOCTL | 2) /* get cache advice */ +#define VX_GETFSOPT (VX_IOCTL | 5) /* get cache advice */ + +#if _FILE_OFFSET_BITS==64 +#define VX_SETEXT (VX_IOCTL | 39) +#define VX_GETEXT (VX_IOCTL | 40) +#else +#define VX_SETEXT (VX_IOCTL | 3) +#define VX_GETEXT (VX_IOCTL | 4) +#endif /*_FILE_OFFSET_BITS==64*/ + +struct vx_ext { + off_t ext_size; /* extent size in fs blocks */ + off_t reserve; /* space reservation in fs blocks */ + int a_flags; /* allocation flags */ +}; + +#ifdef _LP64 +#define VX_FREEZE_ALL (VX_IOCTL | 6) +#else +#define VX_FREEZE_ALL (VX_IOCTL | 41) +#endif /*_LP64*/ + +/* + * The VX_FREEZE_ALL ioctl uses the following structure + */ + +struct vx_freezeall { + int num; /* number of fd pointed to */ + int timeout; /* timeout value for the freeze all */ + int *fds; /* buffer for file descriptor list */ +}; + +/* + * Values for freeze and thaw ioctls. These must match the volume manager + * VOL_FREEZE and VOL_THAW ioctl values. + * + * These are in the user group as opposed to the admin group because we need + * to maintain backward binary compatibility with VxVM. + */ + +#ifndef VOLIOC +#define VOLIOC (('V' << 24) | ('O' << 16) | ('L' << 8)) +#endif /* VOLIOC */ + +#define VX_FREEZE (VOLIOC | 100) /* freeze the file system */ +#define VX_THAW (VOLIOC | 101) /* unfreeze the file system */ + +/* + * values for a_flags in vx_ext + */ + +#define VX_AFLAGS 0x3f /* valid flags for a_flags */ +#define VX_NOEXTEND 0x01 /* file is not to be extended */ +#define VX_TRIM 0x02 /* trim reservation to i_size on close */ +#define VX_CONTIGUOUS 0x04 /* file must be contiguously allocated */ +#define VX_ALIGN 0x08 /* extents allocated on extent boundaries */ +#define VX_NORESERVE 0x10 /* don't change i_reserve */ +#define VX_CHGSIZE 0x20 /* change i_size to match reservation */ + +/* + * vx_setcache flags + */ + +#define VX_ADVFLAGS 0x0003f /* valid advisory flags */ +#define VX_RANDOM 0x00001 /* file is accessed randomly */ +#define VX_SEQ 0x00002 /* file is accessed sequentially */ +#define VX_DIRECT 0x00004 /* perform direct (un-buffered) i/o */ +#define VX_NOREUSE 0x00008 /* do not cache file data */ +#define VX_DSYNC 0x00010 /* synchronous data i/o (not mtime) */ +#define VX_UNBUFFERED 0x00020 /* perform non-sync direct i/o */ + +/* + * Flags for VX_GETFSOPT + */ + +#define VX_FSO_NOLOG 0x0000001 /* mounted with VX_MS_NOLOG */ +#define VX_FSO_BLKCLEAR 0x0000002 /* mounted with VX_MS_BLKCLEAR */ +#define VX_FSO_NODATAINLOG 0x0000004 /* mounted with VX_MS_NODATAINLOG */ +#define VX_FSO_SNAPSHOT 0x0000008 /* is a snapshot */ +#define VX_FSO_SNAPPED 0x0000010 /* is being snapped */ +#define VX_FSO_VJFS 0x0000020 /* the kernel is VJFS */ +#define VX_FSO_DELAYLOG 0x0000040 /* mounted with VX_MS_DELAYLOG */ +#define VX_FSO_TMPLOG 0x0000080 /* mounted with VX_MS_TMPLOG */ +#define VX_FSO_CACHE_DIRECT 0x0000100 /* mounted with VX_MS_CACHE_DIRECT */ +#define VX_FSO_CACHE_DSYNC 0x0000200 /* mounted with VX_MS_CACHE_DSYNC */ +#define VX_FSO_CACHE_CLOSESYNC 0x0000400 /* mnt'd with VX_MS_CACHE_CLOSESYNC */ +#define VX_FSO_OSYNC_DIRECT 0x0001000 /* mounted with VX_MS_OSYNC_DIRECT */ +#define VX_FSO_OSYNC_DSYNC 0x0002000 /* mounted with VX_MS_OSYNC_DSYNC */ +#define VX_FSO_OSYNC_CLOSESYNC 0x0004000 /* mnt'd with VX_MS_OSYNC_CLOSESYNC */ +#define VX_FSO_FILESET 0x0010000 /* mounted as a file set */ +#define VX_FSO_CACHE_TMPCACHE 0x0020000 /* mnt'd with VX_MS_CACHE_TMPCACHE */ +#define VX_FSO_OSYNC_DELAY 0x0040000 /* mounted with VX_MS_OSYNC_DELAY */ +#define VX_FSO_CACHE_UNBUFFERED 0x0080000 /* mnt'd w/ VX_MS_CACHE_UNBUFFERED */ +#define VX_FSO_OSYNC_UNBUFFERED 0x0100000 /* mounted with VX_MS_UNBUFFERED */ +#define VX_FSO_QIO_ON 0x0200000 /* mounted with VX_MS_QIO_ON */ +#define VX_FSO_NOATIME 0x0400000 /* mounted with VX_MS_NOATIME */ + +#endif /* _FS_VXFS_VX_IOCTL_H */ Property changes on: csw/branches/dam/automatic-multiarch-compile/apps/iozone/files/vx_ioctl.h ___________________________________________________________________ Added: svn:executable + * 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 Dec 15 13:53:41 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Dec 2008 12:53:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[2599] csw/branches/dam/automatic-multiarch-compile/lib Message-ID: Revision: 2599 http://gar.svn.sourceforge.net/gar/?rev=2599&view=rev Author: dmichelsen Date: 2008-12-15 12:53:40 +0000 (Mon, 15 Dec 2008) Log Message: ----------- automatic-multiarch-compile gettext: Initial commit Added Paths: ----------- csw/branches/dam/automatic-multiarch-compile/lib/gettext/ csw/branches/dam/automatic-multiarch-compile/lib/gettext/Makefile csw/branches/dam/automatic-multiarch-compile/lib/gettext/checksums csw/branches/dam/automatic-multiarch-compile/lib/gettext/files/ csw/branches/dam/automatic-multiarch-compile/lib/gettext/files/CSWggettext.gspec Added: csw/branches/dam/automatic-multiarch-compile/lib/gettext/Makefile =================================================================== --- csw/branches/dam/automatic-multiarch-compile/lib/gettext/Makefile (rev 0) +++ csw/branches/dam/automatic-multiarch-compile/lib/gettext/Makefile 2008-12-15 12:53:40 UTC (rev 2599) @@ -0,0 +1,31 @@ +GARNAME = gettext +GARVERSION = 0.17 +CATEGORIES = lib + +DESCRIPTION = GNU gettext +define BLURB +endef + +MASTER_SITES = $(GNU_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWggettext) + +EXTRA_BUILD_ISAS_sparc = sparcv9 +EXTRA_BUILD_ISAS_i386 = amd64 + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --program-transform-name='s/^/g&/' + +TEST_TARGET = check + +include ../category.mk + +LIBS = -lsec +export LIBS + +post-install: + @# Only CSWiconv should have lib/charset.alias in it + @rm -f $(DESTDIR)$(libdir)/charset.alias + @# Only CSWcommon should have share/locale/locale.alias in it + @rm -f $(DESTDIR)$(sharedstatedir)/locale/locale.alias + Added: csw/branches/dam/automatic-multiarch-compile/lib/gettext/checksums =================================================================== --- csw/branches/dam/automatic-multiarch-compile/lib/gettext/checksums (rev 0) +++ csw/branches/dam/automatic-multiarch-compile/lib/gettext/checksums 2008-12-15 12:53:40 UTC (rev 2599) @@ -0,0 +1,2 @@ +58a2bc6d39c0ba57823034d55d65d606 download/gettext-0.17.tar.gz +e77ed8e74dcd0abbf699d345acde7e85 download/CSWggettext.gspec Added: csw/branches/dam/automatic-multiarch-compile/lib/gettext/files/CSWggettext.gspec =================================================================== --- csw/branches/dam/automatic-multiarch-compile/lib/gettext/files/CSWggettext.gspec (rev 0) +++ csw/branches/dam/automatic-multiarch-compile/lib/gettext/files/CSWggettext.gspec 2008-12-15 12:53:40 UTC (rev 2599) @@ -0,0 +1,4 @@ +%var bitname ggettext +%var pkgname CSWggettext +%include url file://%{PKGLIB}/csw_dyndepend.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 Mon Dec 15 13:55:23 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Dec 2008 12:55:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[2600] csw/branches/dam/automatic-multiarch-compile/server/ openldap Message-ID: Revision: 2600 http://gar.svn.sourceforge.net/gar/?rev=2600&view=rev Author: dmichelsen Date: 2008-12-15 12:55:23 +0000 (Mon, 15 Dec 2008) Log Message: ----------- automatic-multiarch-compile openldap: Update to 2.3.41 and minor tweaks Modified Paths: -------------- csw/branches/dam/automatic-multiarch-compile/server/openldap/Makefile csw/branches/dam/automatic-multiarch-compile/server/openldap/checksums csw/branches/dam/automatic-multiarch-compile/server/openldap/files/CSWoldap.depend Modified: csw/branches/dam/automatic-multiarch-compile/server/openldap/Makefile =================================================================== --- csw/branches/dam/automatic-multiarch-compile/server/openldap/Makefile 2008-12-15 12:53:40 UTC (rev 2599) +++ csw/branches/dam/automatic-multiarch-compile/server/openldap/Makefile 2008-12-15 12:55:23 UTC (rev 2600) @@ -1,6 +1,6 @@ GARNAME = openldap -GARVERSION = 2.3.40 -CATEGORIES = server +GARVERSION = 2.3.41 +CATEGORIE1 = server DESCRIPTION = Open source implementation of the Lightweight Directory Access Protocol define BLURB @@ -25,8 +25,8 @@ EXTRA_DOCS = README.CSW openldaprc $(PATCHFILES) -EXTRA_LIB = $(prefix)/bdb4/lib -EXTRA_INC = $(prefix)/bdb4/include +EXTRA_INC = $(prefix)/bdb44/include +EXTRA_LIB = $(prefix)/bdb44/lib CONFIGURE_ARGS = $(DIRPATHS) @@ -37,6 +37,9 @@ EXTRA_BUILD_ISAS_sparc = sparcv9 EXTRA_BUILD_ISAS_i386 = pentium_pro amd64 +ISA_RELOCATE_DIRS_pentium_pro = $(libdir) +EXTRA_MERGE_EXCLUDE_FILES_pentium_pro = .*\.a .*\.la + PKGFILES_CSWoldapclient_EXCLUSIVE = $(bindir)/.* PKGFILES_CSWoldapclient_EXCLUSIVE += $(mandir)/man1/.* Modified: csw/branches/dam/automatic-multiarch-compile/server/openldap/checksums =================================================================== --- csw/branches/dam/automatic-multiarch-compile/server/openldap/checksums 2008-12-15 12:53:40 UTC (rev 2599) +++ csw/branches/dam/automatic-multiarch-compile/server/openldap/checksums 2008-12-15 12:55:23 UTC (rev 2600) @@ -1,19 +1,16 @@ -728e95d806a3d47d9686481d72e62072 download/openldap-2.3.40.tgz +7551b72365f87eeaa3a334c8b3029403 download/openldap-2.3.41.tgz 2f6e6a8c9c3497f1c0c9d52ea2d1dafa download/CSWoldap.gspec -059b2c7ae6d2f181e9098a8afc852ce4 download/CSWoldap.depend -bebf1c2805dfe126938a9631f9d7947f download/CSWoldap.prototype +22d5e58da2b46dddf121f087083dd5d3 download/CSWoldap.depend d7e13ba31a8de786f7cdbe3d529a9728 download/cswopenldap 0e57547ad2b5fedca9f0bd4beaddfe39 download/openldap.xml e15c2020566e56f02118e75c89111f15 download/svc-openldap 5eb9a4b33ac44dd218d508e17f827461 download/CSWoldapclient.gspec ff1e9fbbaf7b56927e297226ed429b0f download/CSWoldapclient.depend -14406b97a0e1587071f8598132f64bab download/CSWoldapclient.prototype 16a7768e2473edbbb3bdff1c64835f1c download/CSWoldapdevel.gspec 6d30b718d20705441b89353dae9e64b4 download/CSWoldapdevel.depend -aa020153cf5ecfc19252d45e89708eda download/CSWoldapdevel.prototype 0cc22644bd37d23564afb7fba580d607 download/CSWoldaprt.gspec 85d952cebd7d6cc954c08f8b446815ba download/CSWoldaprt.depend -755aef96cb0ab523b49e83504d37c107 download/CSWoldaprt.prototype 892dba5f625755be024c30ea0055fd55 download/README.CSW ab2ac7519b092ce8d16124c5270bfec0 download/openldaprc 2d8b0286819ffcb41761a6fdd735c5ae download/patch-oldap-2.3.24-ntlm.diff +2d8b0286819ffcb41761a6fdd735c5ae download/patch-oldap-2.3.24-ntlm.diff Modified: csw/branches/dam/automatic-multiarch-compile/server/openldap/files/CSWoldap.depend =================================================================== --- csw/branches/dam/automatic-multiarch-compile/server/openldap/files/CSWoldap.depend 2008-12-15 12:53:40 UTC (rev 2599) +++ csw/branches/dam/automatic-multiarch-compile/server/openldap/files/CSWoldap.depend 2008-12-15 12:55:23 UTC (rev 2600) @@ -1,4 +1,4 @@ -P CSWbdb4 berkeleydb4 - Embedded database libraries and utilities +P CSWbdb44 berkeleydb44 - embedded database libraries and utilities P CSWiconv libiconv - GNU iconv library P CSWlibnet libnet - the libnet packet construction library P CSWlibtool libtool - Generic library support script 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 Dec 15 15:06:58 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Dec 2008 14:06:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[2601] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 2601 http://gar.svn.sourceforge.net/gar/?rev=2601&view=rev Author: dmichelsen Date: 2008-12-15 14:06:58 +0000 (Mon, 15 Dec 2008) Log Message: ----------- mGAR v2: New variable INCOMPATIBLE_PKGS to produce 'I'-type depends Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2008-12-15 12:55:23 UTC (rev 2600) +++ csw/mgar/gar/v2/gar.pkg.mk 2008-12-15 14:06:58 UTC (rev 2601) @@ -190,7 +190,10 @@ .PRECIOUS: $(WORKDIR)/%.depend $(WORKDIR)/%.depend: $(_DBG)$(if $(_EXTRA_GAR_PKGS)$(REQUIRED_PKGS_$*)$(REQUIRED_PKGS), \ - ($(foreach PKG,$(_EXTRA_GAR_PKGS) $(REQUIRED_PKGS_$*) $(REQUIRED_PKGS),\ + ($(foreach PKG,$(INCOMPATIBLE_PKGS_$*) $(INCOMPATIBLE_PKGS),\ + echo "I $(PKG)";\ + )\ + $(foreach PKG,$(_EXTRA_GAR_PKGS) $(REQUIRED_PKGS_$*) $(REQUIRED_PKGS),\ $(if $(SPKG_DESC_$(PKG)), \ echo "P $(PKG) $(call _pkglist_catalogname,$(PKG)) - $(SPKG_DESC_$(PKG))";, \ echo "$(shell /usr/bin/pkginfo $(PKG) | awk '{ $$1 = "P"; print } ')"; \ 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 Dec 15 15:07:34 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Dec 2008 14:07:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[2602] csw/mgar/pkg/graphviz/trunk Message-ID: Revision: 2602 http://gar.svn.sourceforge.net/gar/?rev=2602&view=rev Author: dmichelsen Date: 2008-12-15 14:07:33 +0000 (Mon, 15 Dec 2008) Log Message: ----------- graphviz: Move to mGAR v2 Modified Paths: -------------- csw/mgar/pkg/graphviz/trunk/Makefile csw/mgar/pkg/graphviz/trunk/checksums csw/mgar/pkg/graphviz/trunk/files/CSWgraphviz.gspec Removed Paths: ------------- csw/mgar/pkg/graphviz/trunk/files/CSWgraphviz.depend Property Changed: ---------------- csw/mgar/pkg/graphviz/trunk/ Property changes on: csw/mgar/pkg/graphviz/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/graphviz/trunk/Makefile =================================================================== --- csw/mgar/pkg/graphviz/trunk/Makefile 2008-12-15 14:06:58 UTC (rev 2601) +++ csw/mgar/pkg/graphviz/trunk/Makefile 2008-12-15 14:07:33 UTC (rev 2602) @@ -9,13 +9,17 @@ emphasis is on making very good drawings of reasonably-sized graphs. endef -MASTER_SITES = http://www.graphviz.org/pub/graphviz/ARCHIVE/ +MASTER_SITES = http://www.graphviz.org/pub/graphviz/stable/SOURCES/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWgraphviz,depend) +DISTFILES += $(call admfiles,CSWgraphviz) # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +REQUIRED_PKGS = CSWexpat CSWfconfig CSWftype2 CSWgd CSWiconv CSWjpeg +REQUIRED_PKGS += CSWpng CSWxpm CSWzlib CSWsunmath +INCOMPATIBLE_PKGS = CSWgraphvis + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/graphviz/trunk/checksums =================================================================== --- csw/mgar/pkg/graphviz/trunk/checksums 2008-12-15 14:06:58 UTC (rev 2601) +++ csw/mgar/pkg/graphviz/trunk/checksums 2008-12-15 14:07:33 UTC (rev 2602) @@ -1,4 +1,2 @@ 703089233da491b736e5d1548f25477f download/graphviz-1.18.tar.gz -471f1a7fc69346b54e6863896452556b download/CSWgraphviz.gspec -c06fe1ab83f4670ed9c436a439f48451 download/CSWgraphviz.depend -edf81d3f2ef4a0ef5321435b6831f528 download/CSWgraphviz.prototype +7d7c6845f079132513d80078e403c0b6 download/CSWgraphviz.gspec Deleted: csw/mgar/pkg/graphviz/trunk/files/CSWgraphviz.depend =================================================================== --- csw/mgar/pkg/graphviz/trunk/files/CSWgraphviz.depend 2008-12-15 14:06:58 UTC (rev 2601) +++ csw/mgar/pkg/graphviz/trunk/files/CSWgraphviz.depend 2008-12-15 14:07:33 UTC (rev 2602) @@ -1,9 +0,0 @@ -P CSWexpat expat - XML Parser Toolkit -P CSWfconfig fontconfig - Font configuration and customization library -P CSWftype2 freetype2 - The free and portable high quality font engine -P CSWgd gd - libgd, Graphics creation library and utilities -P CSWiconv libiconv - GNU iconv library -P CSWjpeg jpeg - lib and tools for JPEG image format -P CSWpng png - library for Portable Network Graphics format (PNG) -P CSWxpm xpm - library for X11 PixMap format (libXpm.so.4.11) -P CSWzlib zlib - Zlib Data Compression Library Modified: csw/mgar/pkg/graphviz/trunk/files/CSWgraphviz.gspec =================================================================== --- csw/mgar/pkg/graphviz/trunk/files/CSWgraphviz.gspec 2008-12-15 14:06:58 UTC (rev 2601) +++ csw/mgar/pkg/graphviz/trunk/files/CSWgraphviz.gspec 2008-12-15 14:07:33 UTC (rev 2602) @@ -1,4 +1,4 @@ %var bitname graphviz %var pkgname CSWgraphviz %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING +%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 bonivart at users.sourceforge.net Mon Dec 15 17:08:25 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 15 Dec 2008 16:08:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[2603] csw/mgar/pkg/cpan/Module-Load-Conditional/trunk Message-ID: Revision: 2603 http://gar.svn.sourceforge.net/gar/?rev=2603&view=rev Author: bonivart Date: 2008-12-15 16:08:25 +0000 (Mon, 15 Dec 2008) Log Message: ----------- Module-Load-Conditional: moved to gar v2, removed manual prototype and depend Modified Paths: -------------- csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/files/CSWpmmodloadcond.depend csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/files/CSWpmmodloadcond.prototype Property Changed: ---------------- csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/ Property changes on: csw/mgar/pkg/cpan/Module-Load-Conditional/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile 2008-12-15 14:07:33 UTC (rev 2602) +++ csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile 2008-12-15 16:08:25 UTC (rev 2603) @@ -9,11 +9,17 @@ any of the modules you have installed on your system during runtime. endef -DISTFILES += $(call admfiles,CSWpmmodloadcond,depend prototype) +DISTFILES += $(call admfiles,CSWpmmodloadcond,) +REQUIRED_PKGS = CSWpmprmscheck CSWpmmodload CSWpmlclemktxtsimple + +#SKIPTEST = 1 + DEPENDS += cpan/Params-Check DEPENDS += cpan/Module-Load DEPENDS += cpan/Locale-Maketext-Simple DEPENDS += cpan/version +EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod + include gar/category.mk Modified: csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/checksums 2008-12-15 14:07:33 UTC (rev 2602) +++ csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/checksums 2008-12-15 16:08:25 UTC (rev 2603) @@ -1,4 +1,2 @@ e912706042be78943b1af9a349378bbd download/CSWpmmodloadcond.gspec -29950eac3f358abb2289ba87ec1e54ae download/CSWpmmodloadcond.depend -7e19b3870875ba4f3ac57b1bd99906ca download/CSWpmmodloadcond.prototype -fae73541e0b1d87d0bbe6e1676e5e738 download/Module-Load-Conditional-0.16.tar.gz +cc80e455e996fa2fbd6933283c3947ef download/Module-Load-Conditional-0.26.tar.gz Deleted: csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/files/CSWpmmodloadcond.depend =================================================================== --- csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/files/CSWpmmodloadcond.depend 2008-12-15 14:07:33 UTC (rev 2602) +++ csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/files/CSWpmmodloadcond.depend 2008-12-15 16:08:25 UTC (rev 2603) @@ -1,3 +0,0 @@ -P CSWpmlclemktxtsimple pm_lclemktxtsimple - simple interface to Locale::Maketext::Lexicon -P CSWpmmodload pm_modload - Runtime require of both modules and files -P CSWpmprmscheck pm_prmscheck - A generic input parsing/checking mechanism. Deleted: csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/files/CSWpmmodloadcond.prototype =================================================================== --- csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/files/CSWpmmodloadcond.prototype 2008-12-15 14:07:33 UTC (rev 2602) +++ csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/files/CSWpmmodloadcond.prototype 2008-12-15 16:08:25 UTC (rev 2603) @@ -1,16 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Module/Load 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Module/Load/Conditional 0755 root bin -f none /opt/csw/lib/perl/csw/auto/Module/Load/Conditional/.packlist 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/Module::Load::Conditional.3perl 0444 root bin -d none /opt/csw/share/perl 0755 root bin -d none /opt/csw/share/perl/csw 0755 root bin -d none /opt/csw/share/perl/csw/Module 0755 root bin -d none /opt/csw/share/perl/csw/Module/Load 0755 root bin -f none /opt/csw/share/perl/csw/Module/Load/Conditional.pm 0444 root bin 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 Dec 15 17:20:08 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 15 Dec 2008 16:20:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[2604] csw/mgar/pkg/cpan/Module-Load/trunk Message-ID: Revision: 2604 http://gar.svn.sourceforge.net/gar/?rev=2604&view=rev Author: bonivart Date: 2008-12-15 16:20:08 +0000 (Mon, 15 Dec 2008) Log Message: ----------- Module-Load: updated to 0.12 Modified Paths: -------------- csw/mgar/pkg/cpan/Module-Load/trunk/Makefile csw/mgar/pkg/cpan/Module-Load/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Module-Load/trunk/files/CSWpmmodload.depend csw/mgar/pkg/cpan/Module-Load/trunk/files/CSWpmmodload.prototype Property Changed: ---------------- csw/mgar/pkg/cpan/Module-Load/trunk/ Property changes on: csw/mgar/pkg/cpan/Module-Load/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Module-Load/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Module-Load/trunk/Makefile 2008-12-15 16:08:25 UTC (rev 2603) +++ csw/mgar/pkg/cpan/Module-Load/trunk/Makefile 2008-12-15 16:20:08 UTC (rev 2604) @@ -1,5 +1,5 @@ GARNAME = Module-Load -GARVERSION = 0.10 +GARVERSION = 0.12 CATEGORIES = cpan AUTHOR = KANE @@ -9,6 +9,10 @@ or a module. endef -DISTFILES += $(call admfiles,CSWpmmodload,depend prototype) +DISTFILES += $(call admfiles,CSWpmmodload,) +#SKIPTEST = 1 + +EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod + include gar/category.mk Modified: csw/mgar/pkg/cpan/Module-Load/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Module-Load/trunk/checksums 2008-12-15 16:08:25 UTC (rev 2603) +++ csw/mgar/pkg/cpan/Module-Load/trunk/checksums 2008-12-15 16:20:08 UTC (rev 2604) @@ -1,4 +1,2 @@ 6e4e4023477a104e96c1145551065db5 download/CSWpmmodload.gspec -882cfc02f0fd6a7892b45bc34a8a9755 download/CSWpmmodload.depend -e887c9dca1a15ae0dc9611d95b6975b0 download/CSWpmmodload.prototype -ee40eb2fa3059381e43d1f14d414fe67 download/Module-Load-0.10.tar.gz +be2f196d1f364887eb94d08bb1e24c1d download/Module-Load-0.12.tar.gz Deleted: csw/mgar/pkg/cpan/Module-Load/trunk/files/CSWpmmodload.prototype =================================================================== --- csw/mgar/pkg/cpan/Module-Load/trunk/files/CSWpmmodload.prototype 2008-12-15 16:08:25 UTC (rev 2603) +++ csw/mgar/pkg/cpan/Module-Load/trunk/files/CSWpmmodload.prototype 2008-12-15 16:20:08 UTC (rev 2604) @@ -1,15 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Module 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Module/Load 0755 root bin -f none /opt/csw/lib/perl/csw/auto/Module/Load/.packlist 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/Module::Load.3perl 0444 root bin -d none /opt/csw/share/perl 0755 root bin -d none /opt/csw/share/perl/csw 0755 root bin -d none /opt/csw/share/perl/csw/Module 0755 root bin -f none /opt/csw/share/perl/csw/Module/Load.pm 0444 root bin 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 Dec 15 17:27:27 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 15 Dec 2008 16:27:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[2605] csw/mgar/pkg/cpan/libwww-perl/trunk/files Message-ID: Revision: 2605 http://gar.svn.sourceforge.net/gar/?rev=2605&view=rev Author: bonivart Date: 2008-12-15 16:27:27 +0000 (Mon, 15 Dec 2008) Log Message: ----------- libwww-perl: removed manual depend and prototype Removed Paths: ------------- csw/mgar/pkg/cpan/libwww-perl/trunk/files/CSWpmlibwww.depend csw/mgar/pkg/cpan/libwww-perl/trunk/files/CSWpmlibwww.prototype Deleted: csw/mgar/pkg/cpan/libwww-perl/trunk/files/CSWpmlibwww.depend =================================================================== --- csw/mgar/pkg/cpan/libwww-perl/trunk/files/CSWpmlibwww.depend 2008-12-15 16:20:08 UTC (rev 2604) +++ csw/mgar/pkg/cpan/libwww-perl/trunk/files/CSWpmlibwww.depend 2008-12-15 16:27:27 UTC (rev 2605) @@ -1,6 +0,0 @@ -P CSWpmmimebase64 -P CSWpmhtmlfmt -P CSWpmcompresszlib -P CSWpmhtmlparser pm_htmlparser - HTML parser class -P CSWpmuri pm_uri - Uniform Resource Identifiers (absolute and relative) -P CSWpmhtmltagset Deleted: csw/mgar/pkg/cpan/libwww-perl/trunk/files/CSWpmlibwww.prototype =================================================================== --- csw/mgar/pkg/cpan/libwww-perl/trunk/files/CSWpmlibwww.prototype 2008-12-15 16:20:08 UTC (rev 2604) +++ csw/mgar/pkg/cpan/libwww-perl/trunk/files/CSWpmlibwww.prototype 2008-12-15 16:27:27 UTC (rev 2605) @@ -1,112 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/LWP 0755 root bin -f none /opt/csw/lib/perl/csw/auto/LWP/.packlist 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/Bundle::LWP.3perl 0444 root bin -f none /opt/csw/share/man/man3/File::Listing.3perl 0444 root bin -f none /opt/csw/share/man/man3/HTML::Form.3perl 0444 root bin -f none /opt/csw/share/man/man3/HTTP::Cookies.3perl 0444 root bin -f none /opt/csw/share/man/man3/HTTP::Cookies::Microsoft.3perl 0444 root bin -f none /opt/csw/share/man/man3/HTTP::Cookies::Netscape.3perl 0444 root bin -f none /opt/csw/share/man/man3/HTTP::Daemon.3perl 0444 root bin -f none /opt/csw/share/man/man3/HTTP::Date.3perl 0444 root bin -f none /opt/csw/share/man/man3/HTTP::Headers.3perl 0444 root bin -f none /opt/csw/share/man/man3/HTTP::Headers::Util.3perl 0444 root bin -f none /opt/csw/share/man/man3/HTTP::Message.3perl 0444 root bin -f none /opt/csw/share/man/man3/HTTP::Negotiate.3perl 0444 root bin -f none /opt/csw/share/man/man3/HTTP::Request.3perl 0444 root bin -f none /opt/csw/share/man/man3/HTTP::Request::Common.3perl 0444 root bin -f none /opt/csw/share/man/man3/HTTP::Response.3perl 0444 root bin -f none /opt/csw/share/man/man3/HTTP::Status.3perl 0444 root bin -f none /opt/csw/share/man/man3/LWP.3perl 0444 root bin -f none /opt/csw/share/man/man3/LWP::Authen::Ntlm.3perl 0444 root bin -f none /opt/csw/share/man/man3/LWP::ConnCache.3perl 0444 root bin -f none /opt/csw/share/man/man3/LWP::Debug.3perl 0444 root bin -f none /opt/csw/share/man/man3/LWP::DebugFile.3perl 0444 root bin -f none /opt/csw/share/man/man3/LWP::MediaTypes.3perl 0444 root bin -f none /opt/csw/share/man/man3/LWP::MemberMixin.3perl 0444 root bin -f none /opt/csw/share/man/man3/LWP::Protocol.3perl 0444 root bin -f none /opt/csw/share/man/man3/LWP::RobotUA.3perl 0444 root bin -f none /opt/csw/share/man/man3/LWP::Simple.3perl 0444 root bin -f none /opt/csw/share/man/man3/LWP::UserAgent.3perl 0444 root bin -f none /opt/csw/share/man/man3/Net::HTTP.3perl 0444 root bin -f none /opt/csw/share/man/man3/Net::HTTP::NB.3perl 0444 root bin -f none /opt/csw/share/man/man3/WWW::RobotRules.3perl 0444 root bin -f none /opt/csw/share/man/man3/WWW::RobotRules::AnyDBM_File.3perl 0444 root bin -f none /opt/csw/share/man/man3/lwpcook.3perl 0444 root bin -f none /opt/csw/share/man/man3/lwptut.3perl 0444 root bin -d none /opt/csw/share/perl 0755 root bin -d none /opt/csw/share/perl/csw 0755 root bin -d none /opt/csw/share/perl/csw/Bundle 0755 root bin -f none /opt/csw/share/perl/csw/Bundle/LWP.pm 0444 root bin -d none /opt/csw/share/perl/csw/File 0755 root bin -f none /opt/csw/share/perl/csw/File/Listing.pm 0444 root bin -d none /opt/csw/share/perl/csw/HTML 0755 root bin -f none /opt/csw/share/perl/csw/HTML/Form.pm 0444 root bin -d none /opt/csw/share/perl/csw/HTTP 0755 root bin -d none /opt/csw/share/perl/csw/HTTP/Cookies 0755 root bin -f none /opt/csw/share/perl/csw/HTTP/Cookies.pm 0444 root bin -f none /opt/csw/share/perl/csw/HTTP/Cookies/Microsoft.pm 0444 root bin -f none /opt/csw/share/perl/csw/HTTP/Cookies/Netscape.pm 0444 root bin -f none /opt/csw/share/perl/csw/HTTP/Daemon.pm 0444 root bin -f none /opt/csw/share/perl/csw/HTTP/Date.pm 0444 root bin -d none /opt/csw/share/perl/csw/HTTP/Headers 0755 root bin -f none /opt/csw/share/perl/csw/HTTP/Headers.pm 0444 root bin -f none /opt/csw/share/perl/csw/HTTP/Headers/Auth.pm 0444 root bin -f none /opt/csw/share/perl/csw/HTTP/Headers/ETag.pm 0444 root bin -f none /opt/csw/share/perl/csw/HTTP/Headers/Util.pm 0444 root bin -f none /opt/csw/share/perl/csw/HTTP/Message.pm 0444 root bin -f none /opt/csw/share/perl/csw/HTTP/Negotiate.pm 0444 root bin -d none /opt/csw/share/perl/csw/HTTP/Request 0755 root bin -f none /opt/csw/share/perl/csw/HTTP/Request.pm 0444 root bin -f none /opt/csw/share/perl/csw/HTTP/Request/Common.pm 0444 root bin -f none /opt/csw/share/perl/csw/HTTP/Response.pm 0444 root bin -f none /opt/csw/share/perl/csw/HTTP/Status.pm 0444 root bin -d none /opt/csw/share/perl/csw/LWP 0755 root bin -f none /opt/csw/share/perl/csw/LWP.pm 0444 root bin -d none /opt/csw/share/perl/csw/LWP/Authen 0755 root bin -f none /opt/csw/share/perl/csw/LWP/Authen/Basic.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/Authen/Digest.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/Authen/Ntlm.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/ConnCache.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/Debug.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/DebugFile.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/MediaTypes.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/MemberMixin.pm 0444 root bin -d none /opt/csw/share/perl/csw/LWP/Protocol 0755 root bin -f none /opt/csw/share/perl/csw/LWP/Protocol.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/Protocol/GHTTP.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/Protocol/cpan.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/Protocol/data.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/Protocol/file.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/Protocol/ftp.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/Protocol/gopher.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/Protocol/http.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/Protocol/http10.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/Protocol/https.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/Protocol/https10.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/Protocol/loopback.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/Protocol/mailto.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/Protocol/nntp.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/Protocol/nogo.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/RobotUA.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/Simple.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/UserAgent.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/media.types 0444 root bin -d none /opt/csw/share/perl/csw/Net 0755 root bin -d none /opt/csw/share/perl/csw/Net/HTTP 0755 root bin -f none /opt/csw/share/perl/csw/Net/HTTP.pm 0444 root bin -f none /opt/csw/share/perl/csw/Net/HTTP/Methods.pm 0444 root bin -f none /opt/csw/share/perl/csw/Net/HTTP/NB.pm 0444 root bin -f none /opt/csw/share/perl/csw/Net/HTTPS.pm 0444 root bin -d none /opt/csw/share/perl/csw/WWW 0755 root bin -d none /opt/csw/share/perl/csw/WWW/RobotRules 0755 root bin -f none /opt/csw/share/perl/csw/WWW/RobotRules.pm 0444 root bin -f none /opt/csw/share/perl/csw/WWW/RobotRules/AnyDBM_File.pm 0444 root bin -f none /opt/csw/share/perl/csw/lwpcook.pod 0444 root bin -f none /opt/csw/share/perl/csw/lwptut.pod 0444 root bin 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 Dec 15 18:35:52 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 15 Dec 2008 17:35:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[2606] csw/mgar/pkg/docbook-dtds/trunk Message-ID: Revision: 2606 http://gar.svn.sourceforge.net/gar/?rev=2606&view=rev Author: bdwalton Date: 2008-12-15 17:35:52 +0000 (Mon, 15 Dec 2008) Log Message: ----------- Convert the local Makefile into a patch for easier 'installation' in gar2. A few other tweaks for better packaging under v2. Modified Paths: -------------- csw/mgar/pkg/docbook-dtds/trunk/Makefile csw/mgar/pkg/docbook-dtds/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/docbook-dtds/trunk/files/Makefile Modified: csw/mgar/pkg/docbook-dtds/trunk/Makefile =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/Makefile 2008-12-15 16:27:27 UTC (rev 2605) +++ csw/mgar/pkg/docbook-dtds/trunk/Makefile 2008-12-15 17:35:52 UTC (rev 2606) @@ -56,7 +56,7 @@ DBFILES += docbook-xml-4.3.zip docbook-4.4.zip docbook-xml-4.4.zip MASTER_SITES = $(O_SRC) $(D_SRC) -DISTFILES = $(DBFILES) Makefile +DISTFILES = $(DBFILES) DISTFILES += $(call admfiles,CSWdocbookdtds,postinstall preremove) PATCHFILES = docbook-4.2-euro.patch docbook-dtd30-sgml-1.0.catalog.patch @@ -65,6 +65,7 @@ PATCHFILES += docbook-dtd41-sgml-1.0.catalog.patch PATCHFILES += docbook-dtd42-sgml-1.0.catalog.patch PATCHFILES += docbook-dtds-ents.patch +PATCHFILES += add_makefile.patch # we don't need no stinkin' configure! :) CONFIGURE_SCRIPTS = @@ -140,6 +141,7 @@ # Increase NAMELEN (bug #36058, bug #159382). [bug references from # rpm .spec file] ( cd $(WORKSRC_FIRSTMOD); \ - gsed -e's,\(NAMELEN\s\+\)44\(\s\*\)\?,\1256,' -i.namelen */docbook.dcl; \ - cp ../Makefile .) + gsed -e's,\(NAMELEN\s\+\)44\(\s\*\)\?,\1256,' -i.namelen \ + */docbook.dcl ) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/docbook-dtds/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/checksums 2008-12-15 16:27:27 UTC (rev 2605) +++ csw/mgar/pkg/docbook-dtds/trunk/checksums 2008-12-15 17:35:52 UTC (rev 2606) @@ -9,7 +9,6 @@ ab200202b9e136a144db1e0864c45074 download/docbook-xml-4.3.zip f89e1bd0b2c7a361e3f1f739e16b5d0d download/docbook-4.4.zip cbb04e9a700955d88c50962ef22c1634 download/docbook-xml-4.4.zip -e5318114e6c751a9e0835d7711275e13 download/Makefile 536104a1ab1e8eac583cf27f4f8844a4 download/CSWdocbookdtds.gspec 95eb4822347e50556398f4a11ee95097 download/CSWdocbookdtds.postinstall 9035c448e6480f6e916084fea388b512 download/CSWdocbookdtds.preremove @@ -20,3 +19,4 @@ e976c302070ec2e14316d4a601c224cb download/docbook-dtd41-sgml-1.0.catalog.patch 0ee42c28835cd448b6b47b2345394b28 download/docbook-dtd42-sgml-1.0.catalog.patch 1dae3f33fe7dda3fd68a4d4a3df2c653 download/docbook-dtds-ents.patch +9fba7b568d66e824b498706eb1c83a73 download/add_makefile.patch Deleted: csw/mgar/pkg/docbook-dtds/trunk/files/Makefile =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/Makefile 2008-12-15 16:27:27 UTC (rev 2605) +++ csw/mgar/pkg/docbook-dtds/trunk/files/Makefile 2008-12-15 17:35:52 UTC (rev 2606) @@ -1,81 +0,0 @@ -prefix = /opt/csw -sysconfdir = $(prefix)/etc -datadir = $(prefix)/share - - -INSTALL = /opt/csw/bin/ginstall -c -INSTALL_DATA = $(INSTALL) -m 0644 -INSTALL_DIR = $(INSTALL) -m 0755 -d - -docbookdir = $(datadir)/sgml/docbook -docdir = $(datadir)/doc/docbookdtds - -SGML = $(wildcard *-sgml) -XML = $(wildcard *-xml) - -SGMLTARG = $(patsubst %,inst-%,$(SGML)) -XMLTARG = $(patsubst %,inst-%,$(XML)) - -.PHONY: $(SGML) $(XMLT) - -all: build - -install: $(SGMLTARG) $(XMLTARG) links docs - -links: $(SGMLTARG) $(XMLTARG) - @echo Installing links to most current SGML and XML catalogs - @( $(INSTALL_DIR) $(DESTDIR)/$(sysconfdir)/sgml; \ - cd $(DESTDIR)/$(sysconfdir)/sgml; \ - [ -h $(DESTDIR)/$(sysconfdir)/sgml/sgml-docbook.cat ] || \ - ln -s sgml-docbook-4.4-$(GARVERSION)-$(PATCHLEVEL).cat \ - $(DESTDIR)/$(sysconfdir)/sgml/sgml-docbook.cat; \ - [ -h $(DESTDIR)/$(sysconfdir)/sgml/xml-docbook.cat ] || \ - ln -s xml-docbook-4.4-$(GARVERSION)-$(PATCHLEVEL).cat \ - $(DESTDIR)/$(sysconfdir)/sgml/xml-docbook.cat ) - -docs: - @echo Installing docs - $(INSTALL_DIR) $(DESTDIR)/$(docdir)/ - for d in *; do \ - if [ "`echo $$d/*txt`" != "$$d/*txt" ]; then \ - $(INSTALL_DIR) $(DESTDIR)/$(docdir)/$$d; \ - $(INSTALL_DATA) $$d/*txt $(DESTDIR)/$(docdir)/$$d/; \ - fi \ - done - for x in 3 4; do \ - dir=$(DESTDIR)/$(docdir)/$$x.1-sgml; \ - [ -d $$dir ] || $(INSTALL_DIR) $$dir; \ - $(INSTALL_DATA) $$x.1-sgml/ChangeLog $$dir/; \ - done - -inst-%-sgml: DD=$(DESTDIR)/$(docbookdir)/sgml-dtd-$*$(GARVERSION)-$(PATCHLEVEL) -inst-%-sgml: - @echo Installing $*-sgml - @( cd $*-sgml; \ - gmkdir -p $(DD); \ - $(INSTALL_DATA) *dtd *mod $(DD)/; \ - [ -n "`ls *dcl 2>/dev/null`" ] && $(INSTALL_DATA) *dcl $(DD); \ - $(INSTALL_DATA) docbook.cat $(DD)/; \ - if [ -d ent ]; then \ - $(INSTALL_DIR) $(DD)/ent; \ - $(INSTALL_DATA) ent/* $(DD)/ent/; \ - fi ) - -inst-%-xml: DD=$(DESTDIR)/$(docbookdir)/xml-dtd-$*-$(GARVERSION)-$(PATCHLEVEL) -inst-%-xml: - @echo Installing $*-xml - @( cd $*-xml; \ - gmkdir -p $(DD); \ - $(INSTALL_DATA) *dtd *mod $(DD)/; \ - [ -n "`ls *dcl 2>/dev/null`" ] && $(INSTALL_DATA) *dcl $(DD); \ - $(INSTALL_DATA) docbook.cat $(DD)/; \ - if [ -d ent ]; then \ - $(INSTALL_DIR) $(DD)/ent; \ - $(INSTALL_DATA) ent/* $(DD)/ent/; \ - fi ) - -build: - @echo Nothing to build...dummy statement in action. - -showtarg: - @echo $(SGMLTARG) $(XMLTARG) 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 Dec 15 19:09:48 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 15 Dec 2008 18:09:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[2607] csw/mgar/pkg/docbook-dtds/trunk Message-ID: Revision: 2607 http://gar.svn.sourceforge.net/gar/?rev=2607&view=rev Author: bdwalton Date: 2008-12-15 18:09:48 +0000 (Mon, 15 Dec 2008) Log Message: ----------- Added the makefile patch to svn, tweaked install filename for catalog files. Modified Paths: -------------- csw/mgar/pkg/docbook-dtds/trunk/checksums Added Paths: ----------- csw/mgar/pkg/docbook-dtds/trunk/files/add_makefile.patch Modified: csw/mgar/pkg/docbook-dtds/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/checksums 2008-12-15 17:35:52 UTC (rev 2606) +++ csw/mgar/pkg/docbook-dtds/trunk/checksums 2008-12-15 18:09:48 UTC (rev 2607) @@ -19,4 +19,4 @@ e976c302070ec2e14316d4a601c224cb download/docbook-dtd41-sgml-1.0.catalog.patch 0ee42c28835cd448b6b47b2345394b28 download/docbook-dtd42-sgml-1.0.catalog.patch 1dae3f33fe7dda3fd68a4d4a3df2c653 download/docbook-dtds-ents.patch -9fba7b568d66e824b498706eb1c83a73 download/add_makefile.patch +e95f2615b1a3f50b9d14efdb4d188f3d download/add_makefile.patch Added: csw/mgar/pkg/docbook-dtds/trunk/files/add_makefile.patch =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/add_makefile.patch (rev 0) +++ csw/mgar/pkg/docbook-dtds/trunk/files/add_makefile.patch 2008-12-15 18:09:48 UTC (rev 2607) @@ -0,0 +1,84 @@ +--- /dev/null 2008-12-15 18:41:04.000000000 +0100 ++++ docbookdtds-1.0/Makefile 2008-12-15 18:55:18.651895350 +0100 +@@ -0,0 +1,81 @@ ++prefix = /opt/csw ++sysconfdir = $(prefix)/etc ++datadir = $(prefix)/share ++ ++ ++INSTALL = /opt/csw/bin/ginstall -c ++INSTALL_DATA = $(INSTALL) -m 0644 ++INSTALL_DIR = $(INSTALL) -m 0755 -d ++ ++docbookdir = $(datadir)/sgml/docbook ++docdir = $(datadir)/doc/docbookdtds ++ ++SGML = $(wildcard *-sgml) ++XML = $(wildcard *-xml) ++ ++SGMLTARG = $(patsubst %,inst-%,$(SGML)) ++XMLTARG = $(patsubst %,inst-%,$(XML)) ++ ++.PHONY: $(SGML) $(XMLT) ++ ++all: build ++ ++install: $(SGMLTARG) $(XMLTARG) links docs ++ ++links: $(SGMLTARG) $(XMLTARG) ++ @echo Installing links to most current SGML and XML catalogs ++ @( $(INSTALL_DIR) $(DESTDIR)/$(sysconfdir)/sgml; \ ++ cd $(DESTDIR)/$(sysconfdir)/sgml; \ ++ [ -h $(DESTDIR)/$(sysconfdir)/sgml/sgml-docbook.cat ] || \ ++ ln -s sgml-docbook-4.4-$(GARVERSION)-$(PATCHLEVEL).cat \ ++ $(DESTDIR)/$(sysconfdir)/sgml/sgml-docbook.cat; \ ++ [ -h $(DESTDIR)/$(sysconfdir)/sgml/xml-docbook.cat ] || \ ++ ln -s xml-docbook-4.4-$(GARVERSION)-$(PATCHLEVEL).cat \ ++ $(DESTDIR)/$(sysconfdir)/sgml/xml-docbook.cat ) ++ ++docs: ++ @echo Installing docs ++ $(INSTALL_DIR) $(DESTDIR)/$(docdir)/ ++ for d in *; do \ ++ if [ "`echo $$d/*txt`" != "$$d/*txt" ]; then \ ++ $(INSTALL_DIR) $(DESTDIR)/$(docdir)/$$d; \ ++ $(INSTALL_DATA) $$d/*txt $(DESTDIR)/$(docdir)/$$d/; \ ++ fi \ ++ done ++ for x in 3 4; do \ ++ dir=$(DESTDIR)/$(docdir)/$$x.1-sgml; \ ++ [ -d $$dir ] || $(INSTALL_DIR) $$dir; \ ++ $(INSTALL_DATA) $$x.1-sgml/ChangeLog $$dir/; \ ++ done ++ ++inst-%-sgml: DD=$(DESTDIR)/$(docbookdir)/sgml-dtd-$*-$(GARVERSION)-$(PATCHLEVEL) ++inst-%-sgml: ++ @echo Installing $*-sgml ++ @( cd $*-sgml; \ ++ gmkdir -p $(DD); \ ++ $(INSTALL_DATA) *dtd *mod $(DD)/; \ ++ [ -n "`ls *dcl 2>/dev/null`" ] && $(INSTALL_DATA) *dcl $(DD); \ ++ $(INSTALL_DATA) docbook.cat $(DD)/catalog; \ ++ if [ -d ent ]; then \ ++ $(INSTALL_DIR) $(DD)/ent; \ ++ $(INSTALL_DATA) ent/* $(DD)/ent/; \ ++ fi ) ++ ++inst-%-xml: DD=$(DESTDIR)/$(docbookdir)/xml-dtd-$*-$(GARVERSION)-$(PATCHLEVEL) ++inst-%-xml: ++ @echo Installing $*-xml ++ @( cd $*-xml; \ ++ gmkdir -p $(DD); \ ++ $(INSTALL_DATA) *dtd *mod $(DD)/; \ ++ [ -n "`ls *dcl 2>/dev/null`" ] && $(INSTALL_DATA) *dcl $(DD); \ ++ $(INSTALL_DATA) docbook.cat $(DD)/catalog; \ ++ if [ -d ent ]; then \ ++ $(INSTALL_DIR) $(DD)/ent; \ ++ $(INSTALL_DATA) ent/* $(DD)/ent/; \ ++ fi ) ++ ++build: ++ @echo Nothing to build...dummy statement in action. ++ ++showtarg: ++ @echo $(SGMLTARG) $(XMLTARG) 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 Dec 15 21:11:36 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 15 Dec 2008 20:11:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[2608] csw/mgar/pkg/docbook-dtds/trunk Message-ID: Revision: 2608 http://gar.svn.sourceforge.net/gar/?rev=2608&view=rev Author: bdwalton Date: 2008-12-15 20:11:36 +0000 (Mon, 15 Dec 2008) Log Message: ----------- Corrected postinstall/preremove script to not use chroot like it's a Linux box. Doh! Modified Paths: -------------- csw/mgar/pkg/docbook-dtds/trunk/checksums csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.preremove Modified: csw/mgar/pkg/docbook-dtds/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/checksums 2008-12-15 18:09:48 UTC (rev 2607) +++ csw/mgar/pkg/docbook-dtds/trunk/checksums 2008-12-15 20:11:36 UTC (rev 2608) @@ -10,8 +10,8 @@ f89e1bd0b2c7a361e3f1f739e16b5d0d download/docbook-4.4.zip cbb04e9a700955d88c50962ef22c1634 download/docbook-xml-4.4.zip 536104a1ab1e8eac583cf27f4f8844a4 download/CSWdocbookdtds.gspec -95eb4822347e50556398f4a11ee95097 download/CSWdocbookdtds.postinstall -9035c448e6480f6e916084fea388b512 download/CSWdocbookdtds.preremove +15aa1d4d660b64c96f0e68bdaa04facb download/CSWdocbookdtds.postinstall +140c5f6cda37568a76f43f349bef8453 download/CSWdocbookdtds.preremove 318742d3a6648a6905727f071cbc9847 download/docbook-4.2-euro.patch e3067045964536cc7445d5c3f1e99916 download/docbook-dtd30-sgml-1.0.catalog.patch 856d40f5d1e3fc8fd939b88bf5fedc87 download/docbook-dtd31-sgml-1.0.catalog.patch Modified: csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall 2008-12-15 18:09:48 UTC (rev 2607) +++ csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall 2008-12-15 20:11:36 UTC (rev 2608) @@ -4,9 +4,10 @@ # rhel5 docbook-dtds rpm spec. # 20081204 -bw -if [ -n "$PKG_INSTALL_ROOT" -a "$PKG_INSTALL_ROOT" != "/" ]; then - chroot $PKG_INSTALL_ROOT -fi +case "$PKG_INSTALL_ROOT" in + ""|"/") PREFIX= ;; + *) PREFIX="chroot $PKG_INSTALL_ROOT";; +esac XMLCAT=/opt/csw/bin/xmlcatalog INSTCAT=/opt/csw/bin/install-catalog @@ -24,184 +25,183 @@ # Update the centralized catalog corresponding to this version of the DTD # DocBook V3.0 -$XMLCAT --sgml --noout --add \ +$PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-3.0-$VERSION-$RELEASE.cat \ $CSWSGML/sgml-iso-entities-8879.1986/catalog -$XMLCAT --sgml --noout --add \ +$PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-3.0-$VERSION-$RELEASE.cat \ $CSWSGML/docbook/sgml-dtd-3.0-$VERSION-$RELEASE/catalog # DocBook V3.1 -$XMLCAT --sgml --noout --add \ +$PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-3.1-$VERSION-$RELEASE.cat \ $CSWSGML/sgml-iso-entities-8879.1986/catalog -$XMLCAT --sgml --noout --add \ +$PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-3.1-$VERSION-$RELEASE.cat \ $CSWSGML/docbook/sgml-dtd-3.1-$VERSION-$RELEASE/catalog # DocBook V4.0 -$XMLCAT --sgml --noout --add \ +$PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-4.0-$VERSION-$RELEASE.cat \ $CSWSGML/sgml-iso-entities-8879.1986/catalog -$XMLCAT --sgml --noout --add \ +$PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-4.0-$VERSION-$RELEASE.cat \ $CSWSGML/docbook/sgml-dtd-4.0-$VERSION-$RELEASE/catalog # DocBook V4.1 -$XMLCAT --sgml --noout --add \ +$PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-4.1-$VERSION-$RELEASE.cat \ $CSWSGML/sgml-iso-entities-8879.1986/catalog -$XMLCAT --sgml --noout --add \ +$PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-4.1-$VERSION-$RELEASE.cat \ $CSWSGML/docbook/sgml-dtd-4.1-$VERSION-$RELEASE/catalog # DocBook XML V4.1.2 -$XMLCAT --sgml --noout --add \ +$PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/xml-docbook-4.1.2-$VERSION-$RELEASE.cat \ $CSWSGML/sgml-iso-entities-8879.1986/catalog -$XMLCAT --sgml --noout --add \ +$PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/xml-docbook-4.1.2-$VERSION-$RELEASE.cat \ $CSWSGML/docbook/xml-dtd-4.1.2-$VERSION-$RELEASE/catalog # DocBook V4.2 -$XMLCAT --sgml --noout --add \ +$PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-4.2-$VERSION-$RELEASE.cat \ $CSWSGML/sgml-iso-entities-8879.1986/catalog -$XMLCAT --sgml --noout --add \ +$PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-4.2-$VERSION-$RELEASE.cat \ $CSWSGML/docbook/sgml-dtd-4.2-$VERSION-$RELEASE/catalog # DocBook XML V4.2 -$XMLCAT --sgml --noout --add \ +$PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/xml-docbook-4.2-$VERSION-$RELEASE.cat \ $CSWSGML/sgml-iso-entities-8879.1986/catalog -$XMLCAT --sgml --noout --add \ +$PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/xml-docbook-4.2-$VERSION-$RELEASE.cat \ $CSWSGML/docbook/xml-dtd-4.2-$VERSION-$RELEASE/catalog # DocBook V4.3 -$XMLCAT --sgml --noout --add \ +$PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-4.3-$VERSION-$RELEASE.cat \ $CSWSGML/sgml-iso-entities-8879.1986/catalog -$XMLCAT --sgml --noout --add \ +$PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-4.3-$VERSION-$RELEASE.cat \ $CSWSGML/docbook/sgml-dtd-4.3-$VERSION-$RELEASE/catalog # DocBook XML V4.3 -$XMLCAT --sgml --noout --add \ +$PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/xml-docbook-4.3-$VERSION-$RELEASE.cat \ $CSWSGML/sgml-iso-entities-8879.1986/catalog -$XMLCAT --sgml --noout --add \ +$PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/xml-docbook-4.3-$VERSION-$RELEASE.cat \ $CSWSGML/docbook/xml-dtd-4.3-$VERSION-$RELEASE/catalog # DocBook V4.4 -$XMLCAT --sgml --noout --add \ +$PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-4.4-$VERSION-$RELEASE.cat \ $CSWSGML/sgml-iso-entities-8879.1986/catalog -$XMLCAT --sgml --noout --add \ +$PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-4.4-$VERSION-$RELEASE.cat \ $CSWSGML/docbook/sgml-dtd-4.4-$VERSION-$RELEASE/catalog # DocBook XML V4.4 -$XMLCAT --sgml --noout --add \ +$PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/xml-docbook-4.4-$VERSION-$RELEASE.cat \ $CSWSGML/sgml-iso-entities-8879.1986/catalog -$XMLCAT --sgml --noout --add \ +$PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/xml-docbook-4.4-$VERSION-$RELEASE.cat \ $CSWSGML/docbook/xml-dtd-4.4-$VERSION-$RELEASE/catalog # The following lines are for the case in which the style sheets # were installed after another DTD but before this DTD -STYLESHEETS=`echo $CSWSGML/docbook/dsssl-stylesheets-*` -#STYLESHEETS=${STYLESHEETS##*/dsssl-stylesheets-} -STYLESHEETS=`echo $STYLESHEETS | sed 's#[^ ]*/dsssl-stylesheets-##g'` +SS=`echo $PKG_INSTALL_ROOT/$CSWSGML/docbook/dsssl-stylesheets-*` +STYLESHEETS=`echo $SS | sed 's#[^ ]*/dsssl-stylesheets-##g'` if [ "$STYLESHEETS" != "*" ]; then # DocBook V3.0 - $XMLCAT --sgml --noout --add \ + $PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-3.0-$VERSION-$RELEASE.cat \ $CSWSGML/openjade-$OPENJADEVER/catalog - $XMLCAT --sgml --noout --add \ + $PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-3.0-$VERSION-$RELEASE.cat \ $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog # DocBook V3.1 - $XMLCAT --sgml --noout --add \ + $PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-3.1-$VERSION-$RELEASE.cat \ $CSWSGML/openjade-$OPENJADEVER/catalog - $XMLCAT --sgml --noout --add \ + $PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-3.1-$VERSION-$RELEASE.cat \ $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog # DocBook V4.0 - $XMLCAT --sgml --noout --add \ + $PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-4.0-$VERSION-$RELEASE.cat \ $CSWSGML/openjade-$OPENJADEVER/catalog - $XMLCAT --sgml --noout --add \ + $PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-4.0-$VERSION-$RELEASE.cat \ $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog # DocBook V4.1 - $XMLCAT --sgml --noout --add \ + $PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-4.1-$VERSION-$RELEASE.cat \ $CSWSGML/openjade-$OPENJADEVER/catalog - $XMLCAT --sgml --noout --add \ + $PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-4.1-$VERSION-$RELEASE.cat \ $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog # DocBook XML V4.1.2 - $XMLCAT --sgml --noout --add \ + $PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/xml-docbook-4.1.2-$VERSION-$RELEASE.cat \ $CSWSGML/openjade-$OPENJADEVER/catalog - $XMLCAT --sgml --noout --add \ + $PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/xml-docbook-4.1.2-$VERSION-$RELEASE.cat \ $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog # DocBook V4.2 - $XMLCAT --sgml --noout --add \ + $PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-4.2-$VERSION-$RELEASE.cat \ $CSWSGML/openjade-$OPENJADEVER/catalog - $XMLCAT --sgml --noout --add \ + $PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-4.2-$VERSION-$RELEASE.cat \ $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog # DocBook XML V4.2 - $XMLCAT --sgml --noout --add \ + $PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/xml-docbook-4.2-$VERSION-$RELEASE.cat \ $CSWSGML/openjade-$OPENJADEVER/catalog - $XMLCAT --sgml --noout --add \ + $PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/xml-docbook-4.2-$VERSION-$RELEASE.cat \ $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog # DocBook V4.3 - $XMLCAT --sgml --noout --add \ + $PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-4.3-$VERSION-$RELEASE.cat \ $CSWSGML/openjade-$OPENJADEVER/catalog - $XMLCAT --sgml --noout --add \ + $PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-4.3-$VERSION-$RELEASE.cat \ $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog # DocBook XML V4.3 - $XMLCAT --sgml --noout --add \ + $PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/xml-docbook-4.3-$VERSION-$RELEASE.cat \ $CSWSGML/openjade-$OPENJADEVER/catalog - $XMLCAT --sgml --noout --add \ + $PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/xml-docbook-4.3-$VERSION-$RELEASE.cat \ $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog # DocBook V4.4 - $XMLCAT --sgml --noout --add \ + $PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-4.4-$VERSION-$RELEASE.cat \ $CSWSGML/openjade-$OPENJADEVER/catalog - $XMLCAT --sgml --noout --add \ + $PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-4.4-$VERSION-$RELEASE.cat \ $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog # DocBook XML V4.4 - $XMLCAT --sgml --noout --add \ + $PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/xml-docbook-4.4-$VERSION-$RELEASE.cat \ $CSWSGML/openjade-$OPENJADEVER/catalog - $XMLCAT --sgml --noout --add \ + $PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/xml-docbook-4.4-$VERSION-$RELEASE.cat \ $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog fi @@ -210,7 +210,7 @@ # SGML one. We need to do this (*sigh*) because xmlcatalog messes up # the order of the lines, and SGML tools don't like to see XML things # they aren't expecting. -CATALOG=$CSWSGMLCNF/catalog +CATALOG=$PKG_INSTALL_ROOT/$CSWSGMLCNF/catalog SGML=`cat -n ${CATALOG} | grep sgml-docbook | head -1 | awk '{print $1}'` XML=`cat -n ${CATALOG} | grep xml-docbook | head -1 | awk '{print $1}'` @@ -223,9 +223,9 @@ # make sure we're using the system perl, as we know for sure that it # can handle this operation correctly. /usr/bin/perl -e "@_=<>;@_[$XML,$SGML]=@_[$SGML,$XML];print @_" \ - ${CATALOG} > ${CATALOG}.tmp + $CATALOG > $CATALOG.tmp - mv ${CATALOG}.tmp ${CATALOG} + mv $CATALOG.tmp $CATALOG fi ## @@ -234,364 +234,364 @@ CATALOG=$CSWSGML/docbook/xmlcatalog -if [ -w $CATALOG ] +if [ -w $PKG_INSTALL_ROOT/$CATALOG ] then # DocBook XML V4.1.2 - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Publishing//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-pub.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Greek Letters//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-grk1.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/dbpoolx.mod" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-box.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//DTD DocBook XML V4.1.2//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/docbookx.dtd" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Greek Symbols//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-grk3.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amsn.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-num.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/dbcentx.mod" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-grk4.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/dbnotnx.mod" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-dia.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-grk2.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/dbgenent.mod" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/dbhierx.mod" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amsa.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amso.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-cyrl.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES General Technical//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-tech.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amsc.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/soextblx.dtd" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/calstblx.dtd" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Latin 1//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-lat1.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amsb.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Latin 2//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-lat2.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amsr.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-cyr2.ent" $CATALOG - $XMLCAT --noout --add "rewriteSystem" \ + $PREFIX $XMLCAT --noout --add "rewriteSystem" \ "http://www.oasis-open.org/docbook/xml/4.1.2" \ "xml-dtd-4.1.2-$VERSION-$RELEASE" $CATALOG - $XMLCAT --noout --add "rewriteURI" \ + $PREFIX $XMLCAT --noout --add "rewriteURI" \ "http://www.oasis-open.org/docbook/xml/4.1.2" \ "xml-dtd-4.1.2-$VERSION-$RELEASE" $CATALOG # DocBook XML V4.2 - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Publishing//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-pub.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Greek Letters//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-grk1.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML Information Pool V4.2//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/dbpoolx.mod" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-box.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//DTD DocBook XML V4.2//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/docbookx.dtd" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Greek Symbols//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-grk3.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amsn.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-num.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Character Entities V4.2//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/dbcentx.mod" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-grk4.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Notations V4.2//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/dbnotnx.mod" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-dia.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-grk2.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.2//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/dbgenent.mod" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.2//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/dbhierx.mod" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amsa.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amso.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-cyrl.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES General Technical//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-tech.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amsc.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/soextblx.dtd" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//DTD DocBook XML CALS Table Model V4.2//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/calstblx.dtd" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Latin 1//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-lat1.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amsb.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Latin 2//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-lat2.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amsr.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-cyr2.ent" $CATALOG - $XMLCAT --noout --add "rewriteSystem" \ + $PREFIX $XMLCAT --noout --add "rewriteSystem" \ "http://www.oasis-open.org/docbook/xml/4.2" \ "xml-dtd-4.2-$VERSION-$RELEASE" $CATALOG - $XMLCAT --noout --add "rewriteURI" \ + $PREFIX $XMLCAT --noout --add "rewriteURI" \ "http://www.oasis-open.org/docbook/xml/4.2" \ "xml-dtd-4.2-$VERSION-$RELEASE" $CATALOG # DocBook XML V4.3 - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Publishing//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-pub.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Greek Letters//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-grk1.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML Information Pool V4.3//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/dbpoolx.mod" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-box.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//DTD DocBook XML V4.3//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/docbookx.dtd" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Greek Symbols//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-grk3.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amsn.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-num.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Character Entities V4.3//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/dbcentx.mod" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-grk4.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Notations V4.3//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/dbnotnx.mod" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-dia.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-grk2.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.3//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/dbgenent.mod" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.3//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/dbhierx.mod" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amsa.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amso.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-cyrl.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES General Technical//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-tech.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amsc.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/soextblx.dtd" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//DTD DocBook XML CALS Table Model V4.3//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/calstblx.dtd" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Latin 1//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-lat1.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amsb.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Latin 2//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-lat2.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amsr.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-cyr2.ent" $CATALOG - $XMLCAT --noout --add "rewriteSystem" \ + $PREFIX $XMLCAT --noout --add "rewriteSystem" \ "http://www.oasis-open.org/docbook/xml/4.3" \ "xml-dtd-4.3-$VERSION-$RELEASE" $CATALOG - $XMLCAT --noout --add "rewriteURI" \ + $PREFIX $XMLCAT --noout --add "rewriteURI" \ "http://www.oasis-open.org/docbook/xml/4.3" \ "xml-dtd-4.3-$VERSION-$RELEASE" $CATALOG # DocBook XML V4.4 - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Publishing//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-pub.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Greek Letters//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-grk1.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML Information Pool V4.4//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/dbpoolx.mod" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-box.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//DTD DocBook XML V4.4//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/docbookx.dtd" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Greek Symbols//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-grk3.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amsn.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-num.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Character Entities V4.4//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/dbcentx.mod" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-grk4.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Notations V4.4//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/dbnotnx.mod" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-dia.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-grk2.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.4//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/dbgenent.mod" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.4//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/dbhierx.mod" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amsa.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amso.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-cyrl.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES General Technical//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-tech.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amsc.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/soextblx.dtd" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//DTD DocBook XML CALS Table Model V4.4//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/calstblx.dtd" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Latin 1//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-lat1.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amsb.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Latin 2//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-lat2.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amsr.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-cyr2.ent" $CATALOG - $XMLCAT --noout --add "rewriteSystem" \ + $PREFIX $XMLCAT --noout --add "rewriteSystem" \ "http://www.oasis-open.org/docbook/xml/4.4" \ "xml-dtd-4.4-$VERSION-$RELEASE" $CATALOG - $XMLCAT --noout --add "rewriteURI" \ + $PREFIX $XMLCAT --noout --add "rewriteURI" \ "http://www.oasis-open.org/docbook/xml/4.4" \ "xml-dtd-4.4-$VERSION-$RELEASE" $CATALOG fi # Finally, make sure everything in $CSWSGMLCNF is readable! -/bin/chmod a+r $CSWSGMLCNF/* +/bin/chmod a+r $PKG_INSTALL_ROOT/$CSWSGMLCNF/* Modified: csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.preremove =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.preremove 2008-12-15 18:09:48 UTC (rev 2607) +++ csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.preremove 2008-12-15 20:11:36 UTC (rev 2608) @@ -4,9 +4,10 @@ # rhel5 docbook-dtds rpm spec. # 20081204 -bw -if [ -n "$PKG_INSTALL_ROOT" -a "$PKG_INSTALL_ROOT" != "/" ]; then - chroot $PKG_INSTALL_ROOT -fi +case "$PKG_INSTALL_ROOT" in + ""|"/") PREFIX= ;; + *) PREFIX="chroot $PKG_INSTALL_ROOT ";; +esac XMLCAT=/opt/csw/bin/xmlcatalog CSWSGMLCNF=/opt/csw/etc/sgml @@ -23,65 +24,65 @@ # Update the centralized catalog corresponding to this version of the DTD # DocBook V3.0 -$XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ +$PREFIX $XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ $CSWSGMLCNF/sgml-docbook-3.0-$VERSION-$RELEASE.cat -rm -f $CSWSGMLCNF/sgml-docbook-3.0-$VERSION-$RELEASE.cat +rm -f $PKG_INSTALL_ROOT/$CSWSGMLCNF/sgml-docbook-3.0-$VERSION-$RELEASE.cat # DocBook V3.1 -$XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ +$PREFIX $XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ $CSWSGMLCNF/sgml-docbook-3.1-$VERSION-$RELEASE.cat -rm -f $CSWSGMLCNF/sgml-docbook-3.1-$VERSION-$RELEASE.cat +rm -f $PKG_INSTALL_ROOT/CSWSGMLCNF/sgml-docbook-3.1-$VERSION-$RELEASE.cat # DocBook V4.0 -$XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ +$PREFIX $XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ $CSWSGMLCNF/sgml-docbook-4.0-$VERSION-$RELEASE.cat -rm -f $CSWSGMLCNF/sgml-docbook-4.0-$VERSION-$RELEASE.cat +rm -f $PKG_INSTALL_ROOT/$CSWSGMLCNF/sgml-docbook-4.0-$VERSION-$RELEASE.cat # DocBook V4.1 -$XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ +$PREFIX $XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ $CSWSGMLCNF/sgml-docbook-4.1-$VERSION-$RELEASE.cat -rm -f $CSWSGMLCNF/sgml-docbook-4.1-$VERSION-$RELEASE.cat +rm -f $PKG_INSTALL_ROOT/$CSWSGMLCNF/sgml-docbook-4.1-$VERSION-$RELEASE.cat # DocBook XML V4.1.2 -$XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ +$PREFIX $XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ $CSWSGMLCNF/xml-docbook-4.1.2-$VERSION-$RELEASE.cat -rm -f $CSWSGMLCNF/xml-docbook-4.1.2-$VERSION-$RELEASE.cat +rm -f $PKG_INSTALL_ROOT/$CSWSGMLCNF/xml-docbook-4.1.2-$VERSION-$RELEASE.cat # DocBook V4.2 -$XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ +$PREFIX $XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ $CSWSGMLCNF/sgml-docbook-4.2-$VERSION-$RELEASE.cat -rm -f $CSWSGMLCNF/sgml-docbook-4.2-$VERSION-$RELEASE.cat +rm -f $PKG_INSTALL_ROOT/$CSWSGMLCNF/sgml-docbook-4.2-$VERSION-$RELEASE.cat # DocBook XML V4.2 -$XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ +$PREFIX $XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ $CSWSGMLCNF/xml-docbook-4.2-$VERSION-$RELEASE.cat -rm -f $CSWSGMLCNF/xml-docbook-4.2-$VERSION-$RELEASE.cat +rm -f $PKG_INSTALL_ROOT/$CSWSGMLCNF/xml-docbook-4.2-$VERSION-$RELEASE.cat # DocBook V4.3 -$XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ +$PREFIX $XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ $CSWSGMLCNF/sgml-docbook-4.3-$VERSION-$RELEASE.cat -rm -f $CSWSGMLCNF/sgml-docbook-4.3-$VERSION-$RELEASE.cat +rm -f $PKG_INSTALL_ROOT/$CSWSGMLCNF/sgml-docbook-4.3-$VERSION-$RELEASE.cat # DocBook XML V4.3 -$XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ +$PREFIX $XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ $CSWSGMLCNF/xml-docbook-4.3-$VERSION-$RELEASE.cat -rm -f $CSWSGMLCNF/xml-docbook-4.3-$VERSION-$RELEASE.cat +rm -f $PKG_INSTALL_ROOT/$CSWSGMLCNF/xml-docbook-4.3-$VERSION-$RELEASE.cat # DocBook V4.4 -$XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ +$PREFIX $XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ $CSWSGMLCNF/sgml-docbook-4.4-$VERSION-$RELEASE.cat -rm -f $CSWSGMLCNF/sgml-docbook-4.4-$VERSION-$RELEASE.cat +rm -f $PKG_INSTALL_ROOT/$CSWSGMLCNF/sgml-docbook-4.4-$VERSION-$RELEASE.cat # DocBook XML V4.4 -$XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ +$PREFIX $XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ $CSWSGMLCNF/xml-docbook-4.4-$VERSION-$RELEASE.cat -rm -f $CSWSGMLCNF/xml-docbook-4.4-$VERSION-$RELEASE.cat +rm -f $PKG_INSTALL_ROOT/$PKG_INSTALL_ROOT/$CSWSGMLCNF/xml-docbook-4.4-$VERSION-$RELEASE.cat # Fix up SGML super catalog so that there isn't an XML DTD before an # SGML one. We need to do this (*sigh*) because xmlcatalog messes up # the order of the lines, and SGML tools don't like to see XML things # they aren't expecting. -CATALOG=$CSWSGMLCNF/catalog +CATALOG=$PKG_INSTALL_ROOT/$CSWSGMLCNF/catalog SGML=`cat -n ${CATALOG} | grep sgml-docbook | head -1 | awk '{print $1}'` XML=`cat -n ${CATALOG} | grep xml-docbook | head -1 | awk '{print $1}'` # Do they need switching around? @@ -91,8 +92,8 @@ XML=`expr $XML - 1` SGML=`expr $SGML - 1` /usr/bin/perl -e "@_=<>;@_[$XML, $SGML]=@_[$SGML, $XML];print @_" \ - ${CATALOG} > ${CATALOG}.tmp - mv -f ${CATALOG}.tmp ${CATALOG} + $CATALOG > $CATALOG.tmp + mv -f $CATALOG.tmp $CATALOG fi ## @@ -101,237 +102,237 @@ CATALOG=$CSWSGML/docbook/xmlcatalog -if [ -w $CATALOG ] +if [ -w $PKG_INSTALL_ROOT/$CATALOG ] then # DocBook XML V4.1.2 - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-pub.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-grk1.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/dbpoolx.mod" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-box.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/docbookx.dtd" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-grk3.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amsn.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-num.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/dbcentx.mod" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-grk4.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/dbnotnx.mod" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-dia.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-grk2.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/dbgenent.mod" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/dbhierx.mod" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amsa.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amso.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-cyrl.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-tech.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amsc.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/soextblx.dtd" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/calstblx.dtd" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-lat1.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amsb.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-lat2.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amsr.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-cyr2.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE" $CATALOG # DocBook XML V4.2 - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-pub.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-grk1.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/dbpoolx.mod" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-box.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/docbookx.dtd" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-grk3.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amsn.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-num.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/dbcentx.mod" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-grk4.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/dbnotnx.mod" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-dia.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-grk2.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/dbgenent.mod" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/dbhierx.mod" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amsa.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amso.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-cyrl.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-tech.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amsc.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/soextblx.dtd" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/calstblx.dtd" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-lat1.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amsb.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-lat2.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amsr.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-cyr2.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE" $CATALOG # DocBook XML V4.3 - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-pub.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-grk1.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/dbpoolx.mod" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-box.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/docbookx.dtd" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-grk3.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amsn.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-num.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/dbcentx.mod" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-grk4.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/dbnotnx.mod" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-dia.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-grk2.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/dbgenent.mod" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/dbhierx.mod" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amsa.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amso.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-cyrl.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-tech.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amsc.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/soextblx.dtd" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/calstblx.dtd" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-lat1.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amsb.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-lat2.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amsr.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-cyr2.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE" $CATALOG # DocBook XML V4.4 - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-pub.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-grk1.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/dbpoolx.mod" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-box.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/docbookx.dtd" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-grk3.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amsn.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-num.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/dbcentx.mod" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-grk4.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/dbnotnx.mod" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-dia.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-grk2.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/dbgenent.mod" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/dbhierx.mod" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amsa.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amso.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-cyrl.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-tech.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amsc.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/soextblx.dtd" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/calstblx.dtd" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-lat1.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amsb.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-lat2.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amsr.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-cyr2.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE" $CATALOG 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 Dec 15 21:13:22 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 15 Dec 2008 20:13:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[2609] csw/mgar/pkg/docbook-style-xsl/trunk Message-ID: Revision: 2609 http://gar.svn.sourceforge.net/gar/?rev=2609&view=rev Author: bdwalton Date: 2008-12-15 20:13:21 +0000 (Mon, 15 Dec 2008) Log Message: ----------- - Convert our local Makefile to a patch for easier application in gar2. - Make postinstall/preremove use solaris-style chroot instead of linux-style. - Clean package build under gar2. Modified Paths: -------------- csw/mgar/pkg/docbook-style-xsl/trunk/Makefile csw/mgar/pkg/docbook-style-xsl/trunk/checksums csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.postinstall csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.preremove Added Paths: ----------- csw/mgar/pkg/docbook-style-xsl/trunk/files/add_makefile.patch Modified: csw/mgar/pkg/docbook-style-xsl/trunk/Makefile =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/Makefile 2008-12-15 20:11:36 UTC (rev 2608) +++ csw/mgar/pkg/docbook-style-xsl/trunk/Makefile 2008-12-15 20:13:21 UTC (rev 2609) @@ -22,12 +22,12 @@ DISTFILES = docbook-xsl-$(GARVERSION).tar.bz2 DISTFILES += docbook-xsl-doc-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWdocbookxsl,postinstall preremove) -DISTFILES += Makefile # These are listed in the same order they'd be applied during the rpm build... # They don't apply cleanly, otherwise. PATCHFILES = docbook-xsl-pagesetup.patch docbook-xsl-marginleft.patch PATCHFILES += docbook-xsl-lists.patch docbook-xsl-sp.patch +PATCHFILES += add_makefile.patch CONFIGURE_SCRIPTS = @@ -41,11 +41,7 @@ #to make the package extraction happy...(we don't use the - separator) WORKSRC = $(WORKDIR)/docbook-xsl-$(GARVERSION) -post-extract: - @( cd $(WORKSRC); cp ../Makefile . ) - @$(MAKECOOKIE) - -post-install: +post-install-modulated: @(cd $(DESTDIR)/opt/csw/share/sgml/docbook; \ ln -s xsl-stylesheets-$(GARVERSION)-$(PATCHLEVEL) \ xsl-stylesheets ) Modified: csw/mgar/pkg/docbook-style-xsl/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/checksums 2008-12-15 20:11:36 UTC (rev 2608) +++ csw/mgar/pkg/docbook-style-xsl/trunk/checksums 2008-12-15 20:13:21 UTC (rev 2609) @@ -1,11 +1,10 @@ 6ebd29a67f2dcc3f2220f475ee6f6552 download/docbook-xsl-1.69.1.tar.bz2 b3bf09a0b1a368a3490e68ffc695d290 download/docbook-xsl-doc-1.69.1.tar.bz2 4120f10e50070dd8fc2284d5214bf51d download/CSWdocbookxsl.gspec -6d190471746a394df111025da3060868 download/CSWdocbookxsl.depend -626425bf8e0de42afd5781c2d63397fc download/CSWdocbookxsl.postinstall -9f98469194bd4c15bf6b3fc76514b406 download/CSWdocbookxsl.preremove -ae11620673a7144c4df9a6e408a3bcb1 download/Makefile +8911f851d78a1ab1a21c49286f37f6cb download/CSWdocbookxsl.postinstall +88f331d079de730ef77a5091e69989e2 download/CSWdocbookxsl.preremove 84b37b559cc95c747e39a5a8f79558a3 download/docbook-xsl-pagesetup.patch 1d1ff63f5ebd3527c925f68e55138b6f download/docbook-xsl-marginleft.patch cec8c281ed1c9be99ad47a74362248d5 download/docbook-xsl-lists.patch e7bbf777eadbb70aaed073006de0347e download/docbook-xsl-sp.patch +6e7ff9307e810ea822c94818cfbc86e0 download/add_makefile.patch Modified: csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.postinstall =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.postinstall 2008-12-15 20:11:36 UTC (rev 2608) +++ csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.postinstall 2008-12-15 20:13:21 UTC (rev 2609) @@ -1,8 +1,9 @@ #!/bin/sh -if [ -n "$PKG_INSTALL_ROOT" -a "$PKG_INSTALL_ROOT" != "/" ]; then - chroot $PKG_INSTALL_ROOT -fi +case "$PKG_INSTALL_ROOT" in + ""|"/") PREFIX= ;; + *) PREFIX="chroot $PKG_INSTALL_ROOT ";; +esac PATH=/opt/csw/bin:$PATH @@ -13,15 +14,16 @@ DBHOME=/opt/csw/share/sgml/docbook CATALOG=/opt/csw/etc/xml/catalog -$CATCMD --noout --add "rewriteSystem" \ + +$PREFIX $CATCMD --noout --add "rewriteSystem" \ "http://docbook.sourceforge.net/release/xsl/$VERSION" \ "file://$DBHOME/xsl-stylesheets-$VERSION-$RELEASE" $CATALOG -$CATCMD --noout --add "rewriteURI" \ +$PREFIX $CATCMD --noout --add "rewriteURI" \ "http://docbook.sourceforge.net/release/xsl/$VERSION" \ "file://$DBHOME/xsl-stylesheets-$VERSION-$RELEASE" $CATALOG -$CATCMD --noout --add "rewriteSystem" \ +$PREFIX $CATCMD --noout --add "rewriteSystem" \ "http://docbook.sourceforge.net/release/xsl/current" \ "file://$DBHOME/xsl-stylesheets-$VERSION-$RELEASE" $CATALOG -$CATCMD --noout --add "rewriteURI" \ +$PREFIX $CATCMD --noout --add "rewriteURI" \ "http://docbook.sourceforge.net/release/xsl/current" \ "file://$DBHOME/xsl-stylesheets-$VERSION-$RELEASE" $CATALOG Modified: csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.preremove =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.preremove 2008-12-15 20:11:36 UTC (rev 2608) +++ csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.preremove 2008-12-15 20:13:21 UTC (rev 2609) @@ -1,8 +1,9 @@ #!/bin/sh -if [ -n "$PKG_INSTALL_ROOT" -a "$PKG_INSTALL_ROOT" != "/" ]; then - chroot $PKG_INSTALL_ROOT -fi +case "$PKG_INSTALL_ROOT" in + ""|"/") PREFIX= ;; + *) PREFIX="chroot $PKG_INSTALL_ROOT ";; +esac PATH=/opt/csw/bin:$PATH @@ -12,5 +13,5 @@ VERSION=1.69.1 RELEASE=5.1 -$XMLCAT --noout --del \ - "file://$DBHOME/xsl-stylesheets-$VERSION-$RELEASE" $CATALOG \ No newline at end of file +$PREFIX $XMLCAT --noout --del \ + "file://$DBHOME/xsl-stylesheets-$VERSION-$RELEASE" $CATALOG Added: csw/mgar/pkg/docbook-style-xsl/trunk/files/add_makefile.patch =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/files/add_makefile.patch (rev 0) +++ csw/mgar/pkg/docbook-style-xsl/trunk/files/add_makefile.patch 2008-12-15 20:13:21 UTC (rev 2609) @@ -0,0 +1,55 @@ +--- /dev/null 2008-12-14 03:06:26.000000000 +0100 ++++ docbook-xsl-1.69.1/Makefile 2008-12-14 04:12:33.444192066 +0100 +@@ -0,0 +1,51 @@ ++ ++DESTDIR ?= ... should be overridden by GAR ... ++GARVERSION ?= ... should be overridden by GAR ... ++PATCHLEVEL ?= ... should be overridden by GAR ... ++ ++SHELL = /opt/csw/bin/bash ++ ++prefix = $(DESTDIR)/opt/csw ++bindir = $(prefix)/bin ++datadir = $(prefix)/share ++ ++instdir = $(datadir)/sgml/docbook/xsl-stylesheets-$(GARVERSION)-$(PATCHLEVEL) ++docdir = $(datadir)/doc/docbookxsl-$(GARVERSION)-$(PATCHLEVEL) ++ ++all: install ++ ++install: install-xsl install-img install-misc install-docs ++ ++install-xsl: ++ gmkdir -p $(instdir)/{common,fo,html,htmlhelp/doc,javahelp,lib,template,xhtml,manpages,profiling} ++ cp common/*.dtd $(instdir)/common ++ cp common/*.xml $(instdir)/common ++ cp common/*.xsl $(instdir)/common ++ cp fo/*.xml $(instdir)/fo ++ cp fo/*.xsl $(instdir)/fo ++ cp html/*.xml $(instdir)/html ++ cp html/*.xsl $(instdir)/html ++ cp htmlhelp/*.xsl $(instdir)/htmlhelp ++ cp javahelp/*.xsl $(instdir)/javahelp ++ cp lib/lib.xsl $(instdir)/lib ++ cp template/README $(instdir)/template ++ cp template/*.xml $(instdir)/template ++ cp template/*.xsl $(instdir)/template ++ cp xhtml/*.xsl $(instdir)/xhtml ++ cp manpages/README $(instdir)/manpages ++ cp manpages/*.xsl $(instdir)/manpages ++ cp profiling/*.xsl $(instdir)/profiling ++ ++install-img: ++ gmkdir -p $(instdir)/images/callouts ++ cp images/*.gif $(instdir)/images ++ cp images/*.png $(instdir)/images ++ cp images/callouts/*.png $(instdir)/images/callouts ++ ++install-misc: ++ cp VERSION $(instdir) ++ ++install-docs: ++ gmkdir -p $(docdir) ++ cp BUGS ChangeLog README TODO $(docdir)/ ++ cp -R doc $(docdir)/ +\ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Dec 15 21:34:14 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 15 Dec 2008 20:34:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[2610] csw/mgar/pkg/xrender/trunk/Makefile Message-ID: Revision: 2610 http://gar.svn.sourceforge.net/gar/?rev=2610&view=rev Author: wbonnet Date: 2008-12-15 20:34:13 +0000 (Mon, 15 Dec 2008) Log Message: ----------- Fix UFILES_REGEX Modified Paths: -------------- csw/mgar/pkg/xrender/trunk/Makefile Modified: csw/mgar/pkg/xrender/trunk/Makefile =================================================================== --- csw/mgar/pkg/xrender/trunk/Makefile 2008-12-15 20:13:21 UTC (rev 2609) +++ csw/mgar/pkg/xrender/trunk/Makefile 2008-12-15 20:34:13 UTC (rev 2610) @@ -12,7 +12,7 @@ PKGDIST = libXrender-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = libXrender-(\d+(?:\.\d+)*).tar.gz DISTFILES += CSWlibxrender.gspec CSWlibxrender.prototype CSWlibxrender.depend DISTFILES += CSWrenderdev.gspec CSWrenderdev.prototype CSWrenderdev.depend This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Dec 15 21:52:57 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 15 Dec 2008 20:52:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[2611] csw/mgar/pkg/xft/trunk/Makefile Message-ID: Revision: 2611 http://gar.svn.sourceforge.net/gar/?rev=2611&view=rev Author: wbonnet Date: 2008-12-15 20:52:57 +0000 (Mon, 15 Dec 2008) Log Message: ----------- Fix UFILE_REGEX Modified Paths: -------------- csw/mgar/pkg/xft/trunk/Makefile Modified: csw/mgar/pkg/xft/trunk/Makefile =================================================================== --- csw/mgar/pkg/xft/trunk/Makefile 2008-12-15 20:34:13 UTC (rev 2610) +++ csw/mgar/pkg/xft/trunk/Makefile 2008-12-15 20:52:57 UTC (rev 2611) @@ -12,7 +12,7 @@ PKGDIST = libXft-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = libXft-(\d+(?:\.\d+)*).tar.gz DISTFILES += CSWlibxft2.gspec CSWlibxft2.prototype CSWlibxft2.depend DISTFILES += CSWlibxft2dev.gspec CSWlibxft2dev.prototype CSWlibxft2dev.depend This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Dec 15 23:05:34 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 15 Dec 2008 22:05:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[2612] csw/mgar/gar Message-ID: Revision: 2612 http://gar.svn.sourceforge.net/gar/?rev=2612&view=rev Author: wbonnet Date: 2008-12-15 22:05:34 +0000 (Mon, 15 Dec 2008) Log Message: ----------- Fix some directories parsing Modified Paths: -------------- csw/mgar/gar/v1/bin/upstream_watch csw/mgar/gar/v2/bin/upstream_watch Modified: csw/mgar/gar/v1/bin/upstream_watch =================================================================== --- csw/mgar/gar/v1/bin/upstream_watch 2008-12-15 20:52:57 UTC (rev 2611) +++ csw/mgar/gar/v1/bin/upstream_watch 2008-12-15 22:05:34 UTC (rev 2612) @@ -75,7 +75,7 @@ # # TODO: find a better way than lftp to do this # -sub get_file_list +sub get_file_list_lftp { my $url = shift; my @file_list; @@ -90,16 +90,20 @@ $http_proxy_cmd = "set http:proxy $ENV{HTTP_PROXY};" if exists $ENV{HTTP_PROXY}; $http_proxy_cmd = "set http:proxy $ENV{http_proxy};" if exists $ENV{http_proxy}; - open (FH, "lftp -q -c \"set net:timeout 30; set net:max-retries 16; $ftp_proxy_cmd $http_proxy_cmd open $url/ && ls\" 2>/dev/null |"); + open (my $FH, "lftp -q -c \"set net:timeout 30; set net:max-retries 16; $ftp_proxy_cmd $http_proxy_cmd open $url/ && ls\" 2>/dev/null |"); - while (my $line = ) { + while (my $line = <$FH>) { my @cols = split (/\s+/, $line); my $filename = $cols[$#cols]; chomp ($filename); + my $result = rindex($filename, '/'); + if ($result != -1) { + $filename = substr $filename , $result +1 ; + } push (@file_list, $filename); } - close (FH); + close ($FH); return \@file_list; } @@ -116,9 +120,6 @@ Usage: upstream_watch -u URL file_regex... Display the latest upstream files. EOF - - - } foreach my $file_pattern (@ARGV) { @@ -127,8 +128,8 @@ my $newest_file = ""; foreach my $url (@urls) { - my $file_list = get_file_list ($url); - + my $file_list = get_file_list_lftp ($url); + foreach my $file (@{$file_list}) { if ($file =~ /^$file_pattern$/) { my $char = '/'; Modified: csw/mgar/gar/v2/bin/upstream_watch =================================================================== --- csw/mgar/gar/v2/bin/upstream_watch 2008-12-15 20:52:57 UTC (rev 2611) +++ csw/mgar/gar/v2/bin/upstream_watch 2008-12-15 22:05:34 UTC (rev 2612) @@ -75,7 +75,7 @@ # # TODO: find a better way than lftp to do this # -sub get_file_list +sub get_file_list_lftp { my $url = shift; my @file_list; @@ -90,16 +90,20 @@ $http_proxy_cmd = "set http:proxy $ENV{HTTP_PROXY};" if exists $ENV{HTTP_PROXY}; $http_proxy_cmd = "set http:proxy $ENV{http_proxy};" if exists $ENV{http_proxy}; - open (FH, "lftp -q -c \"set net:timeout 30; set net:max-retries 16; $ftp_proxy_cmd $http_proxy_cmd open $url/ && ls\" 2>/dev/null |"); + open (my $FH, "lftp -q -c \"set net:timeout 30; set net:max-retries 16; $ftp_proxy_cmd $http_proxy_cmd open $url/ && ls\" 2>/dev/null |"); - while (my $line = ) { + while (my $line = <$FH>) { my @cols = split (/\s+/, $line); my $filename = $cols[$#cols]; chomp ($filename); + my $result = rindex($filename, '/'); + if ($result != -1) { + $filename = substr $filename , $result +1 ; + } push (@file_list, $filename); } - close (FH); + close ($FH); return \@file_list; } @@ -116,9 +120,6 @@ Usage: upstream_watch -u URL file_regex... Display the latest upstream files. EOF - - - } foreach my $file_pattern (@ARGV) { @@ -127,8 +128,8 @@ my $newest_file = ""; foreach my $url (@urls) { - my $file_list = get_file_list ($url); - + my $file_list = get_file_list_lftp ($url); + foreach my $file (@{$file_list}) { if ($file =~ /^$file_pattern$/) { my $char = '/'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Dec 15 23:17:38 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 15 Dec 2008 22:17:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[2613] csw/mgar/pkg/sudo/trunk/Makefile Message-ID: Revision: 2613 http://gar.svn.sourceforge.net/gar/?rev=2613&view=rev Author: wbonnet Date: 2008-12-15 22:17:38 +0000 (Mon, 15 Dec 2008) Log Message: ----------- Fix UFILE REGEXP Modified Paths: -------------- csw/mgar/pkg/sudo/trunk/Makefile Modified: csw/mgar/pkg/sudo/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo/trunk/Makefile 2008-12-15 22:05:34 UTC (rev 2612) +++ csw/mgar/pkg/sudo/trunk/Makefile 2008-12-15 22:17:38 UTC (rev 2613) @@ -14,7 +14,7 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)(p\d+)?.tar.gz DISTFILES += CSWsudo.gspec CSWsudo.postinstall DISTFILES += CSWsudo.prototype CSWsudo.depend This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Dec 15 23:43:57 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 15 Dec 2008 22:43:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[2614] csw/mgar/pkg/sudo/trunk/Makefile Message-ID: Revision: 2614 http://gar.svn.sourceforge.net/gar/?rev=2614&view=rev Author: wbonnet Date: 2008-12-15 22:43:57 +0000 (Mon, 15 Dec 2008) Log Message: ----------- Fix UFILE_REGEX Modified Paths: -------------- csw/mgar/pkg/sudo/trunk/Makefile Modified: csw/mgar/pkg/sudo/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo/trunk/Makefile 2008-12-15 22:17:38 UTC (rev 2613) +++ csw/mgar/pkg/sudo/trunk/Makefile 2008-12-15 22:43:57 UTC (rev 2614) @@ -14,7 +14,7 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)(p\d+)?.tar.gz +UFILES_REGEX = $(GARNAME)-((\d+(?:\.\d+)*)(p\d+)?).tar.gz DISTFILES += CSWsudo.gspec CSWsudo.postinstall DISTFILES += CSWsudo.prototype CSWsudo.depend This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Dec 15 23:48:38 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 15 Dec 2008 22:48:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[2615] csw/mgar/gar/v1/gar.lib.mk Message-ID: Revision: 2615 http://gar.svn.sourceforge.net/gar/?rev=2615&view=rev Author: wbonnet Date: 2008-12-15 22:48:37 +0000 (Mon, 15 Dec 2008) Log Message: ----------- Suppress extra comment Modified Paths: -------------- csw/mgar/gar/v1/gar.lib.mk Modified: csw/mgar/gar/v1/gar.lib.mk =================================================================== --- csw/mgar/gar/v1/gar.lib.mk 2008-12-15 22:43:57 UTC (rev 2614) +++ csw/mgar/gar/v1/gar.lib.mk 2008-12-15 22:48:37 UTC (rev 2615) @@ -191,7 +191,6 @@ else \ if echo $(DISTFILES) | grep -w $$FILE >/dev/null; then \ PACKAGE_UP_TO_DATE=1; \ -echo DISTFILES : $(DISTFILES); \ echo "$(GARNAME) : Package is up-to-date. Current version is $$FILE" ; \ else \ NEW_FILES="$$FILE $$NEW_FILES"; \ @@ -215,7 +214,7 @@ echo "$(GARNAME) : new upstream files available: $$NEW_FILES"; \ fi; \ fi - + checknew-%: @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvel at opencsw.org Tue Dec 16 00:27:16 2008 From: trygvel at opencsw.org (=?ISO-8859-1?Q?Trygve_Laugst=F8l?=) Date: Tue, 16 Dec 2008 00:27:16 +0100 Subject: [csw-devel] Building GIT Message-ID: <4946E7D4.4000805@opencsw.org> Hi Ben! I just had a need for Git locally so I though I should build the git package from source. As I'm currently on a crappy line the xsltproc steps took very long time to complete and I notices with some trussing that it was connecting to the internet trying to fetch the XSLTs: stat64("http://docbook.sourceforge.net/release/xsl/current/html/lists.xsl", 0x08046370) Err#2 ENOENT Shouldn't this be using a catalog and reference a local copy of the XMLTs? -- Trygve From trygvel at opencsw.org Tue Dec 16 01:05:40 2008 From: trygvel at opencsw.org (=?ISO-8859-1?Q?Trygve_Laugst=F8l?=) Date: Tue, 16 Dec 2008 01:05:40 +0100 Subject: [csw-devel] gmake garlinks Message-ID: <4946F0D4.8090103@opencsw.org> Hello (Dago) Could you make the garlinks goal not write out "...failed" if the link already was correct? I just goofed around because I couldn't understand why it would fail. -- Trygve From bwalton at opencsw.org Tue Dec 16 01:36:12 2008 From: bwalton at opencsw.org (Ben Walton) Date: Mon, 15 Dec 2008 19:36:12 -0500 Subject: [csw-devel] Building GIT In-Reply-To: <4946E7D4.4000805@opencsw.org> References: <4946E7D4.4000805@opencsw.org> Message-ID: <1229387608-sup-6685@ntdws12.chass.utoronto.ca> Excerpts from Trygve Laugst?l's message of Mon Dec 15 18:27:16 -0500 2008: Hi Trygve, > stat64("http://docbook.sourceforge.net/release/xsl/current/html/lists.xsl", > 0x08046370) Err#2 ENOENT > > Shouldn't this be using a catalog and reference a local copy of the > XMLTs? Yes, it should. I'm currently struggling through the dependency gauntlet to get the proper docbook dtds and xsl stylesheets in place. When they're released, xmlto (used to create docs for git in combination with asciidoc) will follow, at which point git should build fully. It's just taken far longer than I anticipated... Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 GPG Key Id: 8E89F6D2; Key Server: pgp.mit.edu Contact me to arrange for a CAcert assurance meeting. -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 189 bytes Desc: not available Url : http://lists.opencsw.org/pipermail/devel/attachments/20081215/f6afca92/attachment.asc From bonivart at users.sourceforge.net Tue Dec 16 11:19:56 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 16 Dec 2008 10:19:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[2616] csw/mgar/pkg/bind/trunk Message-ID: Revision: 2616 http://gar.svn.sourceforge.net/gar/?rev=2616&view=rev Author: bonivart Date: 2008-12-16 10:19:55 +0000 (Tue, 16 Dec 2008) Log Message: ----------- bind: update to 9.5.0-P2 and switch to gar v2 Modified Paths: -------------- csw/mgar/pkg/bind/trunk/Makefile csw/mgar/pkg/bind/trunk/checksums Added Paths: ----------- csw/mgar/pkg/bind/trunk/files/CSWbinddevel.gspec csw/mgar/pkg/bind/trunk/files/CSWbindutils.gspec csw/mgar/pkg/bind/trunk/files/CSWlibbind.gspec Property Changed: ---------------- csw/mgar/pkg/bind/trunk/ Property changes on: csw/mgar/pkg/bind/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/bind/trunk/Makefile =================================================================== --- csw/mgar/pkg/bind/trunk/Makefile 2008-12-15 22:48:37 UTC (rev 2615) +++ csw/mgar/pkg/bind/trunk/Makefile 2008-12-16 10:19:55 UTC (rev 2616) @@ -1,5 +1,5 @@ GARNAME = bind -GARVERSION = 9.4.2 +GARVERSION = 9.5.0 RELEASE = P2 DISTVERSION = $(GARVERSION)-$(RELEASE) DISTNAME = $(GARNAME)-$(DISTVERSION) @@ -18,7 +18,15 @@ MASTER_SITES = http://ftp.isc.org/isc/bind9/$(GARVERSION)-$(RELEASE)/ DISTFILES = $(GARNAME)-$(GARVERSION)-$(RELEASE).tar.gz DISTFILES += $(call admfiles,CSWbind,preinstall postinstall preremove) +DISTFILES += $(call admfiles,CSWbinddevel,) +DISTFILES += $(call admfiles,CSWlibbind,) +DISTFILES += $(call admfiles,CSWbindutils,) +REQUIRED_PKGS_CSWbind = CSWlibbind CSWbindutils CSWcswclassutils +REQUIRED_PKGS_CSWbinddevel = CSWbind +REQUIRED_PKGS_CSWlibbind = CSWiconv CSWlibxml2 CSWosslrt CSWzlib +REQUIRED_PKGS_CSWbindutils = CSWlibbind + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = (\d+(?:\.\d+)*)-([A-Z][0-9]) @@ -30,21 +38,29 @@ CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw CONFIGURE_ARGS += --localstatedir=/var/opt/csw/named +EXTRA_MERGE_EXCLUDE_FILES = .*~ $(libdir)/.*\.a $(libdir)/.*\.la + +PKGFILES_CSWbinddevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibbind = $(libdir)/.* +PKGFILES_CSWbindutils = $(bindir)/.* + INSTALL_SCRIPTS = custom -include gar/category.mk +PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswnamed$$$$/ { $$$$2 = "cswinitsmf" } { print }' SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) SPKG_SOURCEURL = http://www.isc.org/software/bind -#SPKG_CLASSES = none cswinitsmf +SPKG_CLASSES = none cswinitsmf +include gar/category.mk + install-custom: @echo " ==> Installing $(GARNAME) (custom)" @rm -rf $(DESTDIR) -# @ginstall -d $(DESTDIR)/etc/opt/csw/init.d -# @cp $(FILEDIR)/CSWbind.cswnamed $(DESTDIR)/etc/opt/csw/init.d/cswnamed - @ginstall -d $(DESTDIR)/etc/init.d - @cp $(FILEDIR)/CSWbind.cswnamed $(DESTDIR)/etc/init.d/cswnamed + @ginstall -d $(DESTDIR)/etc/opt/csw/init.d + @cp $(FILEDIR)/CSWbind.cswnamed $(DESTDIR)/etc/opt/csw/init.d/cswnamed +# @ginstall -d $(DESTDIR)/etc/init.d +# @cp $(FILEDIR)/CSWbind.cswnamed $(DESTDIR)/etc/init.d/cswnamed @ginstall -d $(DESTDIR)/etc/opt/csw @cp $(FILEDIR)/CSWbind.named.conf.CSW $(DESTDIR)/etc/opt/csw/named.conf.CSW @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) Modified: csw/mgar/pkg/bind/trunk/checksums =================================================================== --- csw/mgar/pkg/bind/trunk/checksums 2008-12-15 22:48:37 UTC (rev 2615) +++ csw/mgar/pkg/bind/trunk/checksums 2008-12-16 10:19:55 UTC (rev 2616) @@ -1,5 +1,8 @@ -74464f8af260ad71a19a3400a1ae00bb download/bind-9.4.2-P2.tar.gz +16c893f73a394c8cc36d7900cb9bb801 download/bind-9.5.0-P2.tar.gz 9d20fd7cceac478243ac485868b9ef35 download/CSWbind.gspec 9338f20547092ec54136ebebd5f663d3 download/CSWbind.preinstall 78702926bd064e3a1f4ac56ae85866a9 download/CSWbind.postinstall 104f5539928c029738b0a1808f8af262 download/CSWbind.preremove +af16ec4f9c20614932f67acd116e52ad download/CSWbinddevel.gspec +40e00ac3e92ec835dbf567581930d34e download/CSWlibbind.gspec +7f81505db2da9fbc899b9abeac434c58 download/CSWbindutils.gspec Added: csw/mgar/pkg/bind/trunk/files/CSWbinddevel.gspec =================================================================== --- csw/mgar/pkg/bind/trunk/files/CSWbinddevel.gspec (rev 0) +++ csw/mgar/pkg/bind/trunk/files/CSWbinddevel.gspec 2008-12-16 10:19:55 UTC (rev 2616) @@ -0,0 +1,8 @@ +%var bitname bind_devel +%var pkgname CSWbinddevel +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%prototype exec cswproto -s %{TIMESTAMP} -r %{DESTDIR} %{DESTDIR} +%copyright + +Please see /opt/csw/share/doc/bind/LICENSE for license information + Added: csw/mgar/pkg/bind/trunk/files/CSWbindutils.gspec =================================================================== --- csw/mgar/pkg/bind/trunk/files/CSWbindutils.gspec (rev 0) +++ csw/mgar/pkg/bind/trunk/files/CSWbindutils.gspec 2008-12-16 10:19:55 UTC (rev 2616) @@ -0,0 +1,8 @@ +%var bitname bind_utils +%var pkgname CSWbindutils +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%prototype exec cswproto -s %{TIMESTAMP} -r %{DESTDIR} %{DESTDIR} +%copyright + +Please see /opt/csw/share/doc/bind/LICENSE for license information + Added: csw/mgar/pkg/bind/trunk/files/CSWlibbind.gspec =================================================================== --- csw/mgar/pkg/bind/trunk/files/CSWlibbind.gspec (rev 0) +++ csw/mgar/pkg/bind/trunk/files/CSWlibbind.gspec 2008-12-16 10:19:55 UTC (rev 2616) @@ -0,0 +1,8 @@ +%var bitname libbind +%var pkgname CSWlibbind +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%prototype exec cswproto -s %{TIMESTAMP} -r %{DESTDIR} %{DESTDIR} +%copyright + +Please see /opt/csw/share/doc/bind/LICENSE for license information + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvel at opencsw.org Tue Dec 16 11:51:53 2008 From: trygvel at opencsw.org (=?UTF-8?B?VHJ5Z3ZlIExhdWdzdMO4bA==?=) Date: Tue, 16 Dec 2008 11:51:53 +0100 Subject: [csw-devel] Building GIT In-Reply-To: <1229387608-sup-6685@ntdws12.chass.utoronto.ca> References: <4946E7D4.4000805@opencsw.org> <1229387608-sup-6685@ntdws12.chass.utoronto.ca> Message-ID: <49478849.90702@opencsw.org> Ben Walton wrote: > Excerpts from Trygve Laugst?l's message of Mon Dec 15 18:27:16 -0500 2008: > > Hi Trygve, > >> stat64("http://docbook.sourceforge.net/release/xsl/current/html/lists.xsl", >> 0x08046370) Err#2 ENOENT >> >> Shouldn't this be using a catalog and reference a local copy of the >> XMLTs? > > Yes, it should. I'm currently struggling through the dependency > gauntlet to get the proper docbook dtds and xsl stylesheets in place. > When they're released, xmlto (used to create docs for git in > combination with asciidoc) will follow, at which point git should > build fully. > > It's just taken far longer than I anticipated... Oki. Go get it working I also had to skip the tests as there was a couple of them that suddenly asked me for input. Is that expected? Btw, I was building this on snv b101. -- Trygve From bwalton at opencsw.org Tue Dec 16 14:55:16 2008 From: bwalton at opencsw.org (Ben Walton) Date: Tue, 16 Dec 2008 08:55:16 -0500 Subject: [csw-devel] Building GIT In-Reply-To: <49478849.90702@opencsw.org> References: <4946E7D4.4000805@opencsw.org> <1229387608-sup-6685@ntdws12.chass.utoronto.ca> <49478849.90702@opencsw.org> Message-ID: <1229435468-sup-8102@ntdws12.chass.utoronto.ca> Excerpts from Trygve Laugst?l's message of Tue Dec 16 05:51:53 -0500 2008: > Oki. Go get it working I also had to skip the tests as there was a > couple of them that suddenly asked me for input. Is that expected? Well, I hadn't seen that behaviour, but I do know there are some bash-isms lurking in some of the install script stuff. I haven't spent time on that yet, as I felt that getting the foundation for xmlto and asciidoc in place was the first priority. I really only got the GAR description to the point where I knew that there was no point going forward until foundation was laid, so don't expect anything useful from it and you won't be disappointed! On the plus side, I think I may finally be becoming someone that curses when they see bash-isms in /bin/sh scripts! :) I'm _hoping_ I can get this all put together by Friday, as I'd rather not futz with it over the holidays (but I will if I need to)... Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 GPG Key Id: 8E89F6D2; Key Server: pgp.mit.edu Contact me to arrange for a CAcert assurance meeting. -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 189 bytes Desc: not available Url : http://lists.opencsw.org/pipermail/devel/attachments/20081216/6eb2c26c/attachment.asc From trygvel at opencsw.org Tue Dec 16 16:02:26 2008 From: trygvel at opencsw.org (=?UTF-8?B?VHJ5Z3ZlIExhdWdzdMO4bA==?=) Date: Tue, 16 Dec 2008 16:02:26 +0100 Subject: [csw-devel] Building GIT In-Reply-To: <1229435468-sup-8102@ntdws12.chass.utoronto.ca> References: <4946E7D4.4000805@opencsw.org> <1229387608-sup-6685@ntdws12.chass.utoronto.ca> <49478849.90702@opencsw.org> <1229435468-sup-8102@ntdws12.chass.utoronto.ca> Message-ID: <4947C302.6090700@opencsw.org> Ben Walton wrote: > Excerpts from Trygve Laugst?l's message of Tue Dec 16 05:51:53 -0500 2008: >> Oki. Go get it working I also had to skip the tests as there was a >> couple of them that suddenly asked me for input. Is that expected? > > Well, I hadn't seen that behaviour, but I do know there are some > bash-isms lurking in some of the install script stuff. I haven't > spent time on that yet, as I felt that getting the foundation for > xmlto and asciidoc in place was the first priority. > > I really only got the GAR description to the point where I knew that > there was no point going forward until foundation was laid, so don't > expect anything useful from it and you won't be disappointed! > > On the plus side, I think I may finally be becoming someone that > curses when they see bash-isms in /bin/sh scripts! :) > > I'm _hoping_ I can get this all put together by Friday, as I'd rather > not futz with it over the holidays (but I will if I need to)... Let me know if there is anything I can do, this package is getting important for me. I'm on IRC most of the day European time. -- Trygve From trygvel at opencsw.org Tue Dec 16 16:05:06 2008 From: trygvel at opencsw.org (=?ISO-8859-1?Q?Trygve_Laugst=F8l?=) Date: Tue, 16 Dec 2008 16:05:06 +0100 Subject: [csw-devel] IRC Message-ID: <4947C3A2.1030707@opencsw.org> Hello A few of us maintainers are regularly hanging out on IRC chatting on CSW, Solaris, life and everything else. Feel free to join us on freenode[1], the channel name is (drumroll...) #opencsw. OpenCSW has more than one useful IRC client: xchat [2] and irssi [3]. [1]: http://freenode.net/ [2]: http://opencsw.org/packages/xchat [3]: http://opencsw.org/packages/irssi -- Trygve From dmichelsen at users.sourceforge.net Tue Dec 16 16:07:36 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 16 Dec 2008 15:07:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[2617] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 2617 http://gar.svn.sourceforge.net/gar/?rev=2617&view=rev Author: dmichelsen Date: 2008-12-16 15:07:35 +0000 (Tue, 16 Dec 2008) Log Message: ----------- mGAR v2: Allow setting of LD_OPTIONS if explicitly set Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2008-12-16 10:19:55 UTC (rev 2616) +++ csw/mgar/gar/v2/gar.conf.mk 2008-12-16 15:07:35 UTC (rev 2617) @@ -533,7 +533,9 @@ COMMON_EXPORTS ?= $(DIRECTORY_EXPORTS) $(COMPILER_EXPORTS) $(GARPKG_EXPORTS) $(EXTRA_COMMON_EXPORTS) # LD_OPTIONS = $(LINKER_FLAGS) -# COMMON_EXPORTS += LD_OPTIONS +ifneq ($(LD_OPTIONS),) +COMMON_EXPORTS += LD_OPTIONS +endif CONFIGURE_EXPORTS ?= $(COMMON_EXPORTS) $(EXTRA_CONFIGURE_EXPORTS) PKG_CONFIG_PATH DESTDIR BUILD_EXPORTS ?= $(COMMON_EXPORTS) $(EXTRA_BUILD_EXPORTS) 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 Dec 16 16:27:14 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 16 Dec 2008 15:27:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[2618] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 2618 http://gar.svn.sourceforge.net/gar/?rev=2618&view=rev Author: dmichelsen Date: 2008-12-16 15:27:14 +0000 (Tue, 16 Dec 2008) Log Message: ----------- mGAR v2: Small fix for reset-configure-* and minor cleanups of testcode Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2008-12-16 15:07:35 UTC (rev 2617) +++ csw/mgar/gar/v2/gar.mk 2008-12-16 15:27:14 UTC (rev 2618) @@ -46,8 +46,10 @@ # successfully completed #DONADA = @echo " [$@] complete. Finished rules: $+" #DONADA = @touch $(COOKIEDIR)/$@; echo " [$@] complete for $(GARNAME)." -DONADA = @touch $(COOKIEDIR)/$(patsubst $(COOKIEDIR)/%,%,$@); echo " [$@] complete for $(GARNAME)." +COOKIEFILE = $(COOKIEDIR)/$(patsubst $(COOKIEDIR)/%,%,$1) +DONADA = @touch $(call COOKIEFILE,$@); echo " [$@] complete for $(GARNAME)." + # TODO: write a stub rule to print out the name of a rule when it # *does* do something, and handle indentation intelligently. @@ -136,10 +138,6 @@ endef define _modulate_do -xtest-$(2): - @gmake -s MODULATION=$(2) $(4) _pmod - @# The next line has intentionally been left blank - $(call _modulate_target,extract,$(2),$(4)) $(call _modulate_target,patch,$(2),$(4)) $(call _modulate_target,configure,$(2),$(4)) @@ -188,12 +186,6 @@ $(eval $(call _modulate,$(MODULATORS))) -moddebug: - @echo $(strip $(strip $(call _modulate,$(MODULATORS)))) - -allmod: $(foreach M,$(MODULATIONS),xtest-$(M)) - - modenv: @echo " Modulators: $(MODULATORS)" @echo "Modulations: $(MODULATIONS)" @@ -381,14 +373,12 @@ .PHONY: reset-configure reset-configure-modulated reconfigure: reset-configure configure -reset-configure-isa: +reset-configure: $(addprefix reset-configure-,$(MODULATIONS)) + rm -f $(COOKIEDIR)/configure -reset-configure: - @$(foreach ISA,$(NEEDED_ISAS),$(MAKE) -s ISA=$(ISA) reset-configure-isa;) +reset-configure-modulated: + rm -f $(addprefix $(COOKIEDIR)/,$(CONFIGURE_TARGETS)) -reconfigure-isa-%: - @$(MAKE) -s ISA=$* reset-configure-isa configure-isa - # returns true if configure has completed successfully, false # otherwise configure-p: 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 Dec 16 16:28:19 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 16 Dec 2008 15:28:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[2619] csw/mgar/pkg/ncurses/trunk/Makefile Message-ID: Revision: 2619 http://gar.svn.sourceforge.net/gar/?rev=2619&view=rev Author: dmichelsen Date: 2008-12-16 15:28:19 +0000 (Tue, 16 Dec 2008) Log Message: ----------- ncurses: Fix flags for some builds, 5.7 sparcv9 still to go Modified Paths: -------------- csw/mgar/pkg/ncurses/trunk/Makefile Modified: csw/mgar/pkg/ncurses/trunk/Makefile =================================================================== --- csw/mgar/pkg/ncurses/trunk/Makefile 2008-12-16 15:27:14 UTC (rev 2618) +++ csw/mgar/pkg/ncurses/trunk/Makefile 2008-12-16 15:28:19 UTC (rev 2619) @@ -28,16 +28,18 @@ CONFIGURE_ARGS += --with-build-ldflags="-64" endif +ifeq ($(GARVERSION),5.7) +LD_OPTIONS = $(LD_FLAGS) +endif + TEST_SCRIPTS = include gar/category.mk -# 32 Bit -#LDFLAGS := $(filter-out -xarch=386,$(filter-out -m32,$(LDFLAGS))) +#LDFLAGS := $(filter-out -xarch=%,$(filter-out -m%,$(LDFLAGS))) +LDFLAGS := -# 64 Bit -#LDFLAGS := $(filter-out -xarch=sse2,$(filter-out -m64,$(LDFLAGS))) -#ifeq ($(MEMORYMODEL),64) -#LDFLAGS := $(LDFLAGS) -64 -#endif +ifeq ($(MEMORYMODEL),64) +LDFLAGS := $(LDFLAGS) $(if $(findstring $(GARVERSION),5.6),-xarch=v9) +endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Dec 16 17:14:01 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 16 Dec 2008 16:14:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[2620] csw/mgar/pkg/bind/trunk Message-ID: Revision: 2620 http://gar.svn.sourceforge.net/gar/?rev=2620&view=rev Author: bonivart Date: 2008-12-16 16:14:01 +0000 (Tue, 16 Dec 2008) Log Message: ----------- bind: using cswclassutils made it possible to remove postinstall Modified Paths: -------------- csw/mgar/pkg/bind/trunk/Makefile csw/mgar/pkg/bind/trunk/checksums csw/mgar/pkg/bind/trunk/files/CSWbind.cswnamed csw/mgar/pkg/bind/trunk/files/CSWbind.gspec csw/mgar/pkg/bind/trunk/files/CSWbind.preremove csw/mgar/pkg/bind/trunk/files/CSWbinddevel.gspec csw/mgar/pkg/bind/trunk/files/CSWbindutils.gspec csw/mgar/pkg/bind/trunk/files/CSWlibbind.gspec Removed Paths: ------------- csw/mgar/pkg/bind/trunk/files/CSWbind.postinstall Modified: csw/mgar/pkg/bind/trunk/Makefile =================================================================== --- csw/mgar/pkg/bind/trunk/Makefile 2008-12-16 15:28:19 UTC (rev 2619) +++ csw/mgar/pkg/bind/trunk/Makefile 2008-12-16 16:14:01 UTC (rev 2620) @@ -17,11 +17,16 @@ UPSTREAM_MASTER_SITES = http://ftp.isc.org/isc/bind9/ MASTER_SITES = http://ftp.isc.org/isc/bind9/$(GARVERSION)-$(RELEASE)/ DISTFILES = $(GARNAME)-$(GARVERSION)-$(RELEASE).tar.gz -DISTFILES += $(call admfiles,CSWbind,preinstall postinstall preremove) +DISTFILES += $(call admfiles,CSWbind,preinstall preremove) DISTFILES += $(call admfiles,CSWbinddevel,) DISTFILES += $(call admfiles,CSWlibbind,) DISTFILES += $(call admfiles,CSWbindutils,) +SPKG_DESC_CSWbind = ISC BIND main package +SPKG_DESC_CSWbinddevel = ISC BIND development package +SPKG_DESC_CSWlibbind = ISC BIND library package +SPKG_DESC_CSWbindutils = ISC BIND utilities package + REQUIRED_PKGS_CSWbind = CSWlibbind CSWbindutils CSWcswclassutils REQUIRED_PKGS_CSWbinddevel = CSWbind REQUIRED_PKGS_CSWlibbind = CSWiconv CSWlibxml2 CSWosslrt CSWzlib @@ -44,24 +49,23 @@ PKGFILES_CSWlibbind = $(libdir)/.* PKGFILES_CSWbindutils = $(bindir)/.* +ENABLE_CHECK = 0 + INSTALL_SCRIPTS = custom -PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswnamed$$$$/ { $$$$2 = "cswinitsmf" } { print }' +PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswnamed$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/named.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } $$$$3 ~ /\/var\/opt\/csw\/named/ { $$$$5 = "named" } { print }' -SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) SPKG_SOURCEURL = http://www.isc.org/software/bind -SPKG_CLASSES = none cswinitsmf +SPKG_CLASSES_CSWbind = none cswcpsampleconf cswinitsmf include gar/category.mk +SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) + install-custom: @echo " ==> Installing $(GARNAME) (custom)" - @rm -rf $(DESTDIR) @ginstall -d $(DESTDIR)/etc/opt/csw/init.d @cp $(FILEDIR)/CSWbind.cswnamed $(DESTDIR)/etc/opt/csw/init.d/cswnamed -# @ginstall -d $(DESTDIR)/etc/init.d -# @cp $(FILEDIR)/CSWbind.cswnamed $(DESTDIR)/etc/init.d/cswnamed - @ginstall -d $(DESTDIR)/etc/opt/csw @cp $(FILEDIR)/CSWbind.named.conf.CSW $(DESTDIR)/etc/opt/csw/named.conf.CSW @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) @cp $(FILEDIR)/CSWbind.README.CSW $(DESTDIR)$(docdir)/$(GARNAME)/README.CSW @@ -73,4 +77,5 @@ @cp $(WORKSRC)/COPYRIGHT $(DESTDIR)$(docdir)/$(GARNAME)/LICENSE ( cd $(WORKSRC) ; \ gmake DESTDIR=$(DESTDIR) install ) + @touch $(DESTDIR)/var/opt/csw/named/named.pid @$(MAKECOOKIE) Modified: csw/mgar/pkg/bind/trunk/checksums =================================================================== --- csw/mgar/pkg/bind/trunk/checksums 2008-12-16 15:28:19 UTC (rev 2619) +++ csw/mgar/pkg/bind/trunk/checksums 2008-12-16 16:14:01 UTC (rev 2620) @@ -1,8 +1,7 @@ 16c893f73a394c8cc36d7900cb9bb801 download/bind-9.5.0-P2.tar.gz -9d20fd7cceac478243ac485868b9ef35 download/CSWbind.gspec +e346b8d43181db864605c76435a0f731 download/CSWbind.gspec 9338f20547092ec54136ebebd5f663d3 download/CSWbind.preinstall -78702926bd064e3a1f4ac56ae85866a9 download/CSWbind.postinstall -104f5539928c029738b0a1808f8af262 download/CSWbind.preremove -af16ec4f9c20614932f67acd116e52ad download/CSWbinddevel.gspec -40e00ac3e92ec835dbf567581930d34e download/CSWlibbind.gspec -7f81505db2da9fbc899b9abeac434c58 download/CSWbindutils.gspec +90026b0ca15e2435ddae730c5bed4a42 download/CSWbind.preremove +771f4b6098f7bdeb83c5690dfeb6b5eb download/CSWbinddevel.gspec +d5c381cd0cf6be25fc3a75fc470eeaf6 download/CSWlibbind.gspec +a6c7fa764b592aed3b370b9a49e9920e download/CSWbindutils.gspec Modified: csw/mgar/pkg/bind/trunk/files/CSWbind.cswnamed =================================================================== --- csw/mgar/pkg/bind/trunk/files/CSWbind.cswnamed 2008-12-16 15:28:19 UTC (rev 2619) +++ csw/mgar/pkg/bind/trunk/files/CSWbind.cswnamed 2008-12-16 16:14:01 UTC (rev 2620) @@ -1,7 +1,7 @@ #!/sbin/sh # rc-script for CSW Bind -# Peter Bonivart, 2008-11-18 +# Peter Bonivart, 2008-12-16 USER=named #OPTIONS="-d 1" # debug mode @@ -11,14 +11,14 @@ ZONE= # used for initialization, do not change case "$1" in - 'start') + start) if [ -f /opt/csw/sbin/named -a -f /etc/opt/csw/named.conf ]; then echo 'Starting bind.' # ulimit -n 1024 /opt/csw/sbin/named $OPTIONS & fi ;; - 'stop') + stop) echo 'Shutting down bind.' if [ -x /usr/bin/zonename ]; then if [ "`/usr/bin/zonename`" = "global" ]; then @@ -28,7 +28,7 @@ pkill $ZONE named exit 0 ;; - 'reload') + reload|refresh) echo 'Reloading bind.' if [ -x /usr/bin/zonename ]; then if [ "`/usr/bin/zonename`" = "global" ]; then @@ -39,7 +39,7 @@ exit 0 ;; *) - echo "Usage: $0 { start | stop | reload }" + echo "Usage: $0 { start | stop | reload | refresh }" exit 1 ;; esac Modified: csw/mgar/pkg/bind/trunk/files/CSWbind.gspec =================================================================== --- csw/mgar/pkg/bind/trunk/files/CSWbind.gspec 2008-12-16 15:28:19 UTC (rev 2619) +++ csw/mgar/pkg/bind/trunk/files/CSWbind.gspec 2008-12-16 16:14:01 UTC (rev 2620) @@ -1,7 +1,6 @@ %var bitname bind %var pkgname CSWbind %include url file://%{PKGLIB}/csw_dyndepend.gspec -%prototype exec cswproto -s %{TIMESTAMP} -r %{DESTDIR} %{DESTDIR} %copyright Please see /opt/csw/share/doc/bind/LICENSE for license information Deleted: csw/mgar/pkg/bind/trunk/files/CSWbind.postinstall =================================================================== --- csw/mgar/pkg/bind/trunk/files/CSWbind.postinstall 2008-12-16 15:28:19 UTC (rev 2619) +++ csw/mgar/pkg/bind/trunk/files/CSWbind.postinstall 2008-12-16 16:14:01 UTC (rev 2620) @@ -1,34 +0,0 @@ -#!/bin/sh - -# 2008-11-19 - -ETC=$PKG_INSTALL_ROOT/etc/opt/csw -VAR=$PKG_INSTALL_ROOT/var/opt/csw/named - -# check csw.conf -if [ -x $BASEDIR/etc/csw.conf ] ; then - . $BASEDIR/etc/csw.conf -fi -if [ -x $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf ] ; then - . $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf -fi - -# enable? -if [ ! -f "$ETC/named.conf" ]; then - if [ "$autoenable_daemons" = "no" ]; then - echo "named.conf not created due to csw.conf setting." - else - cp -p $ETC/named.conf.CSW $ETC/named.conf - fi -else - echo "named.conf already exists, will not copy named.conf.CSW to it." -fi - -# set owner on var dir -chown -R named $VAR - -echo -echo ">>> Read /opt/csw/share/doc/bind/README.CSW for more info <<<" -echo - -exit 0 Modified: csw/mgar/pkg/bind/trunk/files/CSWbind.preremove =================================================================== --- csw/mgar/pkg/bind/trunk/files/CSWbind.preremove 2008-12-16 15:28:19 UTC (rev 2619) +++ csw/mgar/pkg/bind/trunk/files/CSWbind.preremove 2008-12-16 16:14:01 UTC (rev 2620) @@ -1,14 +1,7 @@ #!/bin/sh -# 2008-11-19 +# 2008-12-16 -ETC=$PKG_INSTALL_ROOT/etc/opt/csw - -echo - -# stop bind -/etc/init.d/cswnamed stop - # remove named user if created by this package /usr/bin/grep "^named:" $PKG_INSTALL_ROOT/etc/passwd | /usr/bin/grep ":CSW BIND DNS:" > /dev/null 2>&1 if [ "$?" = "0" ]; then @@ -16,11 +9,4 @@ /usr/sbin/userdel named > /dev/null 2>&1 fi -# remove conf files -if [ "`cmp "$ETC/named.conf" "$ETC/named.conf.CSW"`" ]; then - echo "named.conf modified, will not remove it." -else - /bin/rm $ETC/named.conf -fi - exit 0 Modified: csw/mgar/pkg/bind/trunk/files/CSWbinddevel.gspec =================================================================== --- csw/mgar/pkg/bind/trunk/files/CSWbinddevel.gspec 2008-12-16 15:28:19 UTC (rev 2619) +++ csw/mgar/pkg/bind/trunk/files/CSWbinddevel.gspec 2008-12-16 16:14:01 UTC (rev 2620) @@ -1,7 +1,6 @@ %var bitname bind_devel %var pkgname CSWbinddevel %include url file://%{PKGLIB}/csw_dyndepend.gspec -%prototype exec cswproto -s %{TIMESTAMP} -r %{DESTDIR} %{DESTDIR} %copyright Please see /opt/csw/share/doc/bind/LICENSE for license information Modified: csw/mgar/pkg/bind/trunk/files/CSWbindutils.gspec =================================================================== --- csw/mgar/pkg/bind/trunk/files/CSWbindutils.gspec 2008-12-16 15:28:19 UTC (rev 2619) +++ csw/mgar/pkg/bind/trunk/files/CSWbindutils.gspec 2008-12-16 16:14:01 UTC (rev 2620) @@ -1,7 +1,6 @@ %var bitname bind_utils %var pkgname CSWbindutils %include url file://%{PKGLIB}/csw_dyndepend.gspec -%prototype exec cswproto -s %{TIMESTAMP} -r %{DESTDIR} %{DESTDIR} %copyright Please see /opt/csw/share/doc/bind/LICENSE for license information Modified: csw/mgar/pkg/bind/trunk/files/CSWlibbind.gspec =================================================================== --- csw/mgar/pkg/bind/trunk/files/CSWlibbind.gspec 2008-12-16 15:28:19 UTC (rev 2619) +++ csw/mgar/pkg/bind/trunk/files/CSWlibbind.gspec 2008-12-16 16:14:01 UTC (rev 2620) @@ -1,7 +1,6 @@ %var bitname libbind %var pkgname CSWlibbind %include url file://%{PKGLIB}/csw_dyndepend.gspec -%prototype exec cswproto -s %{TIMESTAMP} -r %{DESTDIR} %{DESTDIR} %copyright Please see /opt/csw/share/doc/bind/LICENSE for license information 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 Dec 16 17:20:11 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 16 Dec 2008 16:20:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[2621] csw/mgar/pkg/docbook-style-xsl/trunk Message-ID: Revision: 2621 http://gar.svn.sourceforge.net/gar/?rev=2621&view=rev Author: bdwalton Date: 2008-12-16 16:20:11 +0000 (Tue, 16 Dec 2008) Log Message: ----------- split out share/doc to a separate docbookxsldoc package Modified Paths: -------------- csw/mgar/pkg/docbook-style-xsl/trunk/Makefile csw/mgar/pkg/docbook-style-xsl/trunk/checksums Added Paths: ----------- csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsldoc.gspec Modified: csw/mgar/pkg/docbook-style-xsl/trunk/Makefile =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/Makefile 2008-12-16 16:14:01 UTC (rev 2620) +++ csw/mgar/pkg/docbook-style-xsl/trunk/Makefile 2008-12-16 16:20:11 UTC (rev 2621) @@ -6,8 +6,12 @@ # for our (modified from rhel) copied in Makefile. PREREQUISITE_PKGS = CSWgfile CSWbash -REQUIRED_PKGS = CSWsgmlcommon CSWxmlcommon CSWdocbookdtds CSWlibxml2 +REQUIRED_PKGS_CSWdocbookxsl = CSWsgmlcommon CSWxmlcommon CSWdocbookdtds +REQUIRED_PKGS_CSWdocbookxsl += CSWlibxml2 +REQUIRED_PKGS_CSWdocbookxsldoc = CSWdocbookxsl +PKGFILES_CSWdocbookxsldoc = $(datadir)/doc/.* + DESCRIPTION = Norman Walsh's XSL stylesheets for DocBook XML. define BLURB The DocBook XSL stylesheets are a set of stylesheets for use with an @@ -22,6 +26,7 @@ DISTFILES = docbook-xsl-$(GARVERSION).tar.bz2 DISTFILES += docbook-xsl-doc-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWdocbookxsl,postinstall preremove) +DISTFILES += $(call admfiles,CSWdocbookxsldoc,) # These are listed in the same order they'd be applied during the rpm build... # They don't apply cleanly, otherwise. Modified: csw/mgar/pkg/docbook-style-xsl/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/checksums 2008-12-16 16:14:01 UTC (rev 2620) +++ csw/mgar/pkg/docbook-style-xsl/trunk/checksums 2008-12-16 16:20:11 UTC (rev 2621) @@ -3,6 +3,7 @@ 4120f10e50070dd8fc2284d5214bf51d download/CSWdocbookxsl.gspec 8911f851d78a1ab1a21c49286f37f6cb download/CSWdocbookxsl.postinstall 88f331d079de730ef77a5091e69989e2 download/CSWdocbookxsl.preremove +2da0402bea01c8235e6fffac147382d5 download/CSWdocbookxsldoc.gspec 84b37b559cc95c747e39a5a8f79558a3 download/docbook-xsl-pagesetup.patch 1d1ff63f5ebd3527c925f68e55138b6f download/docbook-xsl-marginleft.patch cec8c281ed1c9be99ad47a74362248d5 download/docbook-xsl-lists.patch Added: csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsldoc.gspec =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsldoc.gspec (rev 0) +++ csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsldoc.gspec 2008-12-16 16:20:11 UTC (rev 2621) @@ -0,0 +1,5 @@ +%var bitname docbookxsldoc +%var pkgname CSWdocbookxsldoc +%var arch all +%include url file://%{PKGLIB}/csw_dyndepend.gspec + 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 Dec 16 19:02:04 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 16 Dec 2008 18:02:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[2622] csw/mgar/pkg/git/trunk/ Message-ID: Revision: 2622 http://gar.svn.sourceforge.net/gar/?rev=2622&view=rev Author: bdwalton Date: 2008-12-16 18:02:04 +0000 (Tue, 16 Dec 2008) Log Message: ----------- cut over to gar2 Property Changed: ---------------- csw/mgar/pkg/git/trunk/ Property changes on: csw/mgar/pkg/git/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 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 Dec 16 19:48:17 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 16 Dec 2008 18:48:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[2623] csw/mgar/gar/v2 Message-ID: Revision: 2623 http://gar.svn.sourceforge.net/gar/?rev=2623&view=rev Author: dmichelsen Date: 2008-12-16 18:48:14 +0000 (Tue, 16 Dec 2008) Log Message: ----------- mGAR v2: More generalized debug target 'modenv' instead of 'isaenv' Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2008-12-16 18:02:04 UTC (rev 2622) +++ csw/mgar/gar/v2/gar.conf.mk 2008-12-16 18:48:14 UTC (rev 2623) @@ -591,7 +591,7 @@ @echo " No = Compiler cannot generate code for that ISA" @echo -isaenv: +modenv: @echo " Arch: $(GARCH)" @echo " Kernel: $(KERNELISA)" @echo @@ -610,13 +610,11 @@ @echo " Merge exclude: $(_MERGE_EXCLUDE_FILES)" @echo @echo "Requested compiler flags:" - @$(foreach ISA,$(ISA) $(filter-out $(ISA),$(BUILD_ISAS)), \ - $(MAKE) -s ISA=$(ISA) _isaenv; \ - ) + @$(foreach MOD,$(MODULATIONS),$(MAKE) -s _modenv-$(MOD);) -_isaenv: +_modenv-modulated: @echo; \ - echo "* ISA $(ISA)"; \ + echo "* Modulation $(MODULATION): $(foreach M,$(MODULATORS),$M=$($M))"; \ echo " PATH = $(PATH)"; \ echo "PKG_CONFIG_PATH = $(PKG_CONFIG_PATH)"; \ echo " CFLAGS = $(CFLAGS)"; \ Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2008-12-16 18:02:04 UTC (rev 2622) +++ csw/mgar/gar/v2/gar.mk 2008-12-16 18:48:14 UTC (rev 2623) @@ -137,19 +137,27 @@ endef +define _modulate_target_nocookie_noprepost +$(1)-$(2): + @gmake -s MODULATION=$(2) $(3) $(1)-modulated + @# The next line has intentionally been left blank to explicitly terminate this make rule + +endef + define _modulate_do $(call _modulate_target,extract,$(2),$(4)) $(call _modulate_target,patch,$(2),$(4)) $(call _modulate_target,configure,$(2),$(4)) -$(call _modulate_target_nocookie,reset-configure,$(2),$(4)) +$(call _modulate_target_nocookie_noprepost,reset-configure,$(2),$(4)) $(call _modulate_target,build,$(2),$(4)) -$(call _modulate_target_nocookie,reset-build,$(2),$(4)) +$(call _modulate_target_nocookie_noprepost,reset-build,$(2),$(4)) $(call _modulate_target,test,$(2),$(4)) $(call _modulate_target,install,$(2),$(4)) -$(call _modulate_target_nocookie,reset-install,$(2),$(4)) +$(call _modulate_target_nocookie_noprepost,reset-install,$(2),$(4)) $(call _modulate_target,merge,$(2),$(4)) -$(call _modulate_target_nocookie,reset-merge,$(2),$(4)) -$(call _modulate_target_nocookie,clean,$(2),$(4)) +$(call _modulate_target_nocookie_noprepost,reset-merge,$(2),$(4)) +$(call _modulate_target_nocookie_noprepost,clean,$(2),$(4)) +$(call _modulate_target_nocookie_noprepost,_modenv,$(2),$(4)) endef # This evaluates to the make rules for all modulations passed as first argument @@ -186,10 +194,6 @@ $(eval $(call _modulate,$(MODULATORS))) -modenv: - @echo " Modulators: $(MODULATORS)" - @echo "Modulations: $(MODULATIONS)" - @echo "M: $(call expand_modulator_1,ISA)" # ========================= MAIN RULES ========================= # The main rules are the ones that the user can specify as a 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 Dec 16 21:59:04 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 16 Dec 2008 20:59:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[2624] csw/mgar/pkg/git/trunk Message-ID: Revision: 2624 http://gar.svn.sourceforge.net/gar/?rev=2624&view=rev Author: bdwalton Date: 2008-12-16 20:59:04 +0000 (Tue, 16 Dec 2008) Log Message: ----------- first working build; tests fail, but i think that is a sed vs gsed issue Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile csw/mgar/pkg/git/trunk/checksums Added Paths: ----------- csw/mgar/pkg/git/trunk/files/doc-makefile.patch Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2008-12-16 18:48:14 UTC (rev 2623) +++ csw/mgar/pkg/git/trunk/Makefile 2008-12-16 20:59:04 UTC (rev 2624) @@ -1,7 +1,9 @@ GARNAME = git -GARVERSION = 1.5.5.1 +GARVERSION = 1.6.0.5 CATEGORIES = devel +PREREQUISITE_PKGS = CSWasciidoc CSWossldevel CSWxmlto CSWbash CSWcurl + DESCRIPTION = Fast Version Control System define BLURB Git is a popular version control system designed to handle @@ -13,17 +15,22 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWgit,) +PATCHFILES = doc-makefile.patch + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -PREREQUISITE_PKGS = CSWasciidoc CSWossldevel +GARCOMPILER = GNU -CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS = $(DIRPATHS) --with-shell=/opt/csw/bin/bash -BUILD_ARGS = MSGFMT=gmsgfmt all doc +BUILD_ARGS = MSGFMT=gmsgfmt SHELL_PATH=/opt/csw/bin/bash all doc INSTALL_ARGS = install-doc include gar/category.mk CFLAGS += -L$(libdir) + +# for tail -n +PATH := /usr/xpg4/bin:$(PATH) \ No newline at end of file Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2008-12-16 18:48:14 UTC (rev 2623) +++ csw/mgar/pkg/git/trunk/checksums 2008-12-16 20:59:04 UTC (rev 2624) @@ -1,2 +1,3 @@ -6c5ffadc0e6a8652833b4160510ed27f download/git-1.5.5.1.tar.bz2 +899172ebeac65f7a09a8e204d4f87d8c download/git-1.6.0.5.tar.bz2 fa435e5bd4c829d055a1265ec36360fe download/CSWgit.gspec +369547e8222dcf8be214b5013f28afcc download/doc-makefile.patch Added: csw/mgar/pkg/git/trunk/files/doc-makefile.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/doc-makefile.patch (rev 0) +++ csw/mgar/pkg/git/trunk/files/doc-makefile.patch 2008-12-16 20:59:04 UTC (rev 2624) @@ -0,0 +1,50 @@ +--- git-1.6.0.5/Documentation/Makefile.orig 2008-12-16 14:41:44.670977000 -0500 ++++ git-1.6.0.5/Documentation/Makefile 2008-12-16 14:49:07.561035000 -0500 +@@ -56,6 +56,8 @@ + -include ../config.mak.autogen + -include ../config.mak + ++SHELL = $(SHELL_PATH) ++ + ifdef ASCIIDOC8 + ASCIIDOC_EXTRA += -a asciidoc7compatible + endif +@@ -105,7 +107,7 @@ + fi + + install-html: html +- sh ./install-webdoc.sh $(DESTDIR)$(htmldir) ++ $(SHELL) ./install-webdoc.sh $(DESTDIR)$(htmldir) + + ../GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE + $(MAKE) -C ../ GIT-VERSION-FILE +@@ -167,7 +169,7 @@ + + technical/api-index.txt: technical/api-index-skel.txt \ + technical/api-index.sh $(patsubst %,%.txt,$(API_DOCS)) +- cd technical && sh ./api-index.sh ++ cd technical && $(SHELL) ./api-index.sh + + $(patsubst %,%.html,$(API_DOCS) technical/api-index): %.html : %.txt + $(ASCIIDOC) -b xhtml11 -f asciidoc.conf \ +@@ -203,7 +205,7 @@ + + howto-index.txt: howto-index.sh $(wildcard howto/*.txt) + $(RM) $@+ $@ +- sh ./howto-index.sh $(wildcard howto/*.txt) >$@+ ++ $(SHELL) ./howto-index.sh $(wildcard howto/*.txt) >$@+ + mv $@+ $@ + + $(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt +@@ -217,9 +219,9 @@ + mv $@+ $@ + + install-webdoc : html +- sh ./install-webdoc.sh $(WEBDOC_DEST) ++ $(SHELL) ./install-webdoc.sh $(WEBDOC_DEST) + + quick-install: +- sh ./install-doc-quick.sh $(DOC_REF) $(DESTDIR)$(mandir) ++ $(SHELL) ./install-doc-quick.sh $(DOC_REF) $(DESTDIR)$(mandir) + + .PHONY: .FORCE-GIT-VERSION-FILE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Dec 16 23:02:55 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 16 Dec 2008 22:02:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[2625] csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile Message-ID: Revision: 2625 http://gar.svn.sourceforge.net/gar/?rev=2625&view=rev Author: wbonnet Date: 2008-12-16 22:02:55 +0000 (Tue, 16 Dec 2008) Log Message: ----------- Fix Author for fetching and downloading Modified Paths: -------------- csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile Modified: csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile 2008-12-16 20:59:04 UTC (rev 2624) +++ csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile 2008-12-16 22:02:55 UTC (rev 2625) @@ -1,7 +1,7 @@ GARNAME = BerkeleyDB GARVERSION = 0.36 CATEGORIES = cpan -AUTHOR = Paul Marquess +AUTHOR = PMQS DESCRIPTION = BerkeleyDB module define BLURB This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Dec 16 23:07:49 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 16 Dec 2008 22:07:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[2626] csw/mgar/pkg/cpan/Convert-UUlib/trunk/Makefile Message-ID: Revision: 2626 http://gar.svn.sourceforge.net/gar/?rev=2626&view=rev Author: wbonnet Date: 2008-12-16 22:07:49 +0000 (Tue, 16 Dec 2008) Log Message: ----------- Fix UFILE Regex Modified Paths: -------------- csw/mgar/pkg/cpan/Convert-UUlib/trunk/Makefile Modified: csw/mgar/pkg/cpan/Convert-UUlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Convert-UUlib/trunk/Makefile 2008-12-16 22:02:55 UTC (rev 2625) +++ csw/mgar/pkg/cpan/Convert-UUlib/trunk/Makefile 2008-12-16 22:07:49 UTC (rev 2626) @@ -1,7 +1,7 @@ GARNAME = Convert-UUlib GARVERSION = 1.12 CATEGORIES = cpan -AUTHOR = Marc Lehmann +AUTHOR = MLEHMANN DESCRIPTION = Perl interface to the uulib library define BLURB This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Dec 16 23:14:24 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 16 Dec 2008 22:14:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[2627] csw/mgar/gar/v1/categories/cpan/category.mk Message-ID: Revision: 2627 http://gar.svn.sourceforge.net/gar/?rev=2627&view=rev Author: wbonnet Date: 2008-12-16 22:14:23 +0000 (Tue, 16 Dec 2008) Log Message: ----------- Update default regexp and upstream master site Modified Paths: -------------- csw/mgar/gar/v1/categories/cpan/category.mk Modified: csw/mgar/gar/v1/categories/cpan/category.mk =================================================================== --- csw/mgar/gar/v1/categories/cpan/category.mk 2008-12-16 22:07:49 UTC (rev 2626) +++ csw/mgar/gar/v1/categories/cpan/category.mk 2008-12-16 22:14:23 UTC (rev 2627) @@ -28,8 +28,8 @@ SPKG_SOURCEURL := $(SPKG_SOURCEURL)/~$(call TOLOWER,$(AUTHOR)) # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -USTREAM_MASTER_SITE = $(SPKG_SOURCEURL) +UFILES_REGEX ?= $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +USTREAM_MASTER_SITE ?= $(SPKG_SOURCEURL) SPKG_SOURCEURL := $(SPKG_SOURCEURL)/$(GARNAME) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Dec 16 23:15:31 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 16 Dec 2008 22:15:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[2628] csw/mgar/gar/v2/categories/cpan/category.mk Message-ID: Revision: 2628 http://gar.svn.sourceforge.net/gar/?rev=2628&view=rev Author: wbonnet Date: 2008-12-16 22:15:30 +0000 (Tue, 16 Dec 2008) Log Message: ----------- Update default regexp for upstream detection Modified Paths: -------------- csw/mgar/gar/v2/categories/cpan/category.mk Modified: csw/mgar/gar/v2/categories/cpan/category.mk =================================================================== --- csw/mgar/gar/v2/categories/cpan/category.mk 2008-12-16 22:14:23 UTC (rev 2627) +++ csw/mgar/gar/v2/categories/cpan/category.mk 2008-12-16 22:15:30 UTC (rev 2628) @@ -28,8 +28,8 @@ SPKG_SOURCEURL := $(SPKG_SOURCEURL)/~$(call TOLOWER,$(AUTHOR)) # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -USTREAM_MASTER_SITE = $(SPKG_SOURCEURL) +UFILES_REGEX ?= $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +USTREAM_MASTER_SITE ?= $(SPKG_SOURCEURL) SPKG_SOURCEURL := $(SPKG_SOURCEURL)/$(GARNAME) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Dec 16 23:38:36 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 16 Dec 2008 22:38:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[2629] csw/mgar/pkg/cpan Message-ID: Revision: 2629 http://gar.svn.sourceforge.net/gar/?rev=2629&view=rev Author: wbonnet Date: 2008-12-16 22:38:36 +0000 (Tue, 16 Dec 2008) Log Message: ----------- Update some UFILE_REGEX Modified Paths: -------------- csw/mgar/pkg/cpan/DateManip/trunk/Makefile csw/mgar/pkg/cpan/Frontier-RPC/trunk/Makefile csw/mgar/pkg/cpan/Gtk2-PodViewer/trunk/Makefile csw/mgar/pkg/cpan/IO-Pager/trunk/Makefile csw/mgar/pkg/cpan/Syslog/trunk/Makefile csw/mgar/pkg/cpan/VCP/trunk/Makefile csw/mgar/pkg/cpan/sol-inst/trunk/Makefile Modified: csw/mgar/pkg/cpan/DateManip/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DateManip/trunk/Makefile 2008-12-16 22:15:30 UTC (rev 2628) +++ csw/mgar/pkg/cpan/DateManip/trunk/Makefile 2008-12-16 22:38:36 UTC (rev 2629) @@ -1,4 +1,4 @@ -GARNAME = DateManip +GARNAME = Date-Manip GARVERSION = 5.46 CATEGORIES = cpan AUTHOR = SBECK Modified: csw/mgar/pkg/cpan/Frontier-RPC/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Frontier-RPC/trunk/Makefile 2008-12-16 22:15:30 UTC (rev 2628) +++ csw/mgar/pkg/cpan/Frontier-RPC/trunk/Makefile 2008-12-16 22:38:36 UTC (rev 2629) @@ -12,6 +12,8 @@ DISTFILES += $(call admfiles,CSWpmfrontierrpc,depend prototype) +UFILES_REGEX ?= $(GARNAME)-((\d+(?:\.\d+)*)(b\d+)?).tar.gz + # See http://rt.cpan.org/Public/Bug/Display.html?id=18299 PATCHFILES += XMLRPC-mp2.diff Modified: csw/mgar/pkg/cpan/Gtk2-PodViewer/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Gtk2-PodViewer/trunk/Makefile 2008-12-16 22:15:30 UTC (rev 2628) +++ csw/mgar/pkg/cpan/Gtk2-PodViewer/trunk/Makefile 2008-12-16 22:38:36 UTC (rev 2629) @@ -1,4 +1,4 @@ -GARNAME = Gtk2-PodViewer +GARNAME = Gtk2-Ex-PodViewer GARVERSION = 0.13 CATEGORIES = cpan AUTHOR = GBROWN Modified: csw/mgar/pkg/cpan/IO-Pager/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/IO-Pager/trunk/Makefile 2008-12-16 22:15:30 UTC (rev 2628) +++ csw/mgar/pkg/cpan/IO-Pager/trunk/Makefile 2008-12-16 22:38:36 UTC (rev 2629) @@ -13,6 +13,8 @@ MODDIST = $(GARNAME)-$(GARVERSION).tgz DISTFILES = $(call admfiles,CSWpmiopager,depend prototype) +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz + # Tests are mostly visual verification TEST_SCRIPTS = Modified: csw/mgar/pkg/cpan/Syslog/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Syslog/trunk/Makefile 2008-12-16 22:15:30 UTC (rev 2628) +++ csw/mgar/pkg/cpan/Syslog/trunk/Makefile 2008-12-16 22:38:36 UTC (rev 2629) @@ -1,4 +1,4 @@ -GARNAME = Syslog +GARNAME = Unix-Syslog GARVERSION = 0.97 CATEGORIES = cpan AUTHOR = MHARNISCH Modified: csw/mgar/pkg/cpan/VCP/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/VCP/trunk/Makefile 2008-12-16 22:15:30 UTC (rev 2628) +++ csw/mgar/pkg/cpan/VCP/trunk/Makefile 2008-12-16 22:38:36 UTC (rev 2629) @@ -16,6 +16,8 @@ MODDIST = $(MODDISTP).tar.gz WORKSRC = $(WORKDIR)/$(MODDISTP) +UFILES_REGEX ?= $(GARNAME)-autrijus-snapshot-((\d+(?:\.\d+)*)(-\d+)?).tar.gz + DEPENDS += cpan/HTML-Tree DEPENDS += cpan/IPC-Run3 DEPENDS += cpan/PodToHTML Modified: csw/mgar/pkg/cpan/sol-inst/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/sol-inst/trunk/Makefile 2008-12-16 22:15:30 UTC (rev 2628) +++ csw/mgar/pkg/cpan/sol-inst/trunk/Makefile 2008-12-16 22:38:36 UTC (rev 2629) @@ -9,6 +9,8 @@ information on a Solaris system. endef +UFILES_REGEX ?= $(GARNAME)-((\d+(?:\.\d+)*)(a)?).tar.gz + WORKSRC = $(WORKDIR)/Solaris DISTFILES += CSWpmsolinst.gspec 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 Dec 17 04:48:48 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 17 Dec 2008 03:48:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[2630] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 2630 http://gar.svn.sourceforge.net/gar/?rev=2630&view=rev Author: bdwalton Date: 2008-12-17 03:48:48 +0000 (Wed, 17 Dec 2008) Log Message: ----------- Depend on gsed and the gnu links during build so that tests assuming sed as gnu sed work. The package now builds and passes the tests (sol10 x86). Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2008-12-16 22:38:36 UTC (rev 2629) +++ csw/mgar/pkg/git/trunk/Makefile 2008-12-17 03:48:48 UTC (rev 2630) @@ -3,6 +3,7 @@ CATEGORIES = devel PREREQUISITE_PKGS = CSWasciidoc CSWossldevel CSWxmlto CSWbash CSWcurl +PREREQUISITE_PKGS += CSWgsed CSWgnulinks DESCRIPTION = Fast Version Control System define BLURB @@ -30,7 +31,6 @@ include gar/category.mk -CFLAGS += -L$(libdir) - -# for tail -n -PATH := /usr/xpg4/bin:$(PATH) \ No newline at end of file +# for tail -n and to override things like, etc with the gnu counterparts +# gnu must come first so xpg4/sed isn't found first. +PATH := /opt/csw/gnu:/usr/xpg4/bin:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Dec 17 16:33:03 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 17 Dec 2008 15:33:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[2631] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 2631 http://gar.svn.sourceforge.net/gar/?rev=2631&view=rev Author: bonivart Date: 2008-12-17 15:33:03 +0000 (Wed, 17 Dec 2008) Log Message: ----------- pkgutil: update to 1.3.1 due to minor bug in pre/post Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.postinstall csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.preremove Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2008-12-17 03:48:48 UTC (rev 2630) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2008-12-17 15:33:03 UTC (rev 2631) @@ -1,5 +1,5 @@ GARNAME = pkgutil -GARVERSION = 1.3 +GARVERSION = 1.3.1 CATEGORIES = utils DESCRIPTION = Installs Solaris packages easily @@ -31,25 +31,24 @@ install-custom: @echo " ==> Installing $(GARNAME) (custom)" @rm -rf $(DESTDIR) -# @ginstall -d $(DESTDIR)/etc/opt/csw - @ginstall -d $(DESTDIR)/opt/csw/bin - @ginstall -d $(DESTDIR)/opt/csw/etc + @ginstall -d $(DESTDIR)$(bindir) + @ginstall -d $(DESTDIR)$/sysconfdir) @ginstall -d $(DESTDIR)/opt/csw/libexec/pkgutil - @ginstall -d $(DESTDIR)/opt/csw/share/doc/pkgutil + @ginstall -d $(DESTDIR)$(docdir)/pkgutil @ginstall -d $(DESTDIR)$(mandir)/man1 # @ginstall -d $(DESTDIR)/usr/sadm/install/scripts @ginstall -d $(DESTDIR)/var/opt/csw/pkgutil/packages - @pod2man --section=1 $(WORKSRC)/$(GARNAME) > $(DESTDIR)$(mandir)/man1/pkgutil.1 # @cp -r $(WORKSRC)/$(GARNAME).conf $(DESTDIR)/etc/opt/csw/$(GARNAME).conf.CSW - @cp -r $(WORKSRC)/$(GARNAME).conf $(DESTDIR)/opt/csw/etc/$(GARNAME).conf.CSW - @cp -r $(WORKSRC)/$(GARNAME) $(DESTDIR)/opt/csw/bin/ - @cp -r $(WORKSRC)/bldcat $(DESTDIR)/opt/csw/bin/ - @cp -r $(WORKSRC)/chkcat $(DESTDIR)/opt/csw/bin/ - @cp -r $(WORKSRC)/readme $(DESTDIR)/opt/csw/share/doc/pkgutil/ -# @cp -r $(FILEDIR)/CSWpkgutil.copyright $(DESTDIR)/opt/csw/share/doc/pkgutil/LICENSE + @cp -r $(WORKSRC)/$(GARNAME).conf $(DESTDIR)$(sysconfdir)/$(GARNAME).conf.CSW + @cp -r $(WORKSRC)/$(GARNAME) $(DESTDIR)$(bindir) + @cp -r $(WORKSRC)/bldcat $(DESTDIR)$(bindir) + @cp -r $(WORKSRC)/chkcat $(DESTDIR)$(bindir) + @cp -r $(WORKSRC)/readme $(DESTDIR)$(docdir)/pkgutil/ +# @cp -r $(FILEDIR)/CSWpkgutil.copyright $(DESTDIR)$(docdir)/pkgutil/LICENSE @cp -r $(WORKSRC)/copyright $(DESTDIR)$(docdir)/pkgutil/LICENSE # @cp -r $(FILEDIR)/CSWpkgutil.i.cswpkgutil $(DESTDIR)/usr/sadm/install/scripts/i.cswpkgutil # @cp -r $(FILEDIR)/CSWpkgutil.r.cswpkgutil $(DESTDIR)/usr/sadm/install/scripts/r.cswpkgutil @cp -r $(WORKSRC)/admin $(DESTDIR)/var/opt/csw/pkgutil/admin.CSW @cp -r $(WORKSRC)/wget-`uname -p` $(DESTDIR)/opt/csw/libexec/pkgutil/wget + @pod2man --section=1 $(WORKSRC)/$(GARNAME) > $(DESTDIR)$(mandir)/man1/pkgutil.1 @$(MAKECOOKIE) Modified: csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.postinstall =================================================================== --- csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.postinstall 2008-12-17 03:48:48 UTC (rev 2630) +++ csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.postinstall 2008-12-17 15:33:03 UTC (rev 2631) @@ -1,6 +1,6 @@ #!/bin/sh -ETC=$PKG_INSTALL_ROOT/etc/opt/csw +ETC=$PKG_INSTALL_ROOT/opt/csw/etc VAR=$PKG_INSTALL_ROOT/var/opt/csw/pkgutil echo Modified: csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.preremove =================================================================== --- csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.preremove 2008-12-17 03:48:48 UTC (rev 2630) +++ csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.preremove 2008-12-17 15:33:03 UTC (rev 2631) @@ -1,6 +1,6 @@ #!/bin/sh -ETC=$PKG_INSTALL_ROOT/etc/opt/csw +ETC=$PKG_INSTALL_ROOT/opt/csw/etc VAR=$PKG_INSTALL_ROOT/var/opt/csw/pkgutil echo This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Dec 17 16:36:58 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 17 Dec 2008 15:36:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[2632] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 2632 http://gar.svn.sourceforge.net/gar/?rev=2632&view=rev Author: bonivart Date: 2008-12-17 15:36:58 +0000 (Wed, 17 Dec 2008) Log Message: ----------- pkgutil: Makefile fix 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 2008-12-17 15:33:03 UTC (rev 2631) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2008-12-17 15:36:58 UTC (rev 2632) @@ -32,7 +32,7 @@ @echo " ==> Installing $(GARNAME) (custom)" @rm -rf $(DESTDIR) @ginstall -d $(DESTDIR)$(bindir) - @ginstall -d $(DESTDIR)$/sysconfdir) + @ginstall -d $(DESTDIR)$(sysconfdir) @ginstall -d $(DESTDIR)/opt/csw/libexec/pkgutil @ginstall -d $(DESTDIR)$(docdir)/pkgutil @ginstall -d $(DESTDIR)$(mandir)/man1 Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2008-12-17 15:33:03 UTC (rev 2631) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2008-12-17 15:36:58 UTC (rev 2632) @@ -1,5 +1,5 @@ -1b930b0ac7aee3f9523a07ad27bdb211 download/pkgutil-1.3.zip +1b930b0ac7aee3f9523a07ad27bdb211 download/pkgutil-1.3.1.zip 805cd30ad9f21cb1167d166fa99b5891 download/CSWpkgutil.gspec 2f561d7f40289fac9bd02d2504b73693 download/CSWpkgutil.prototype -bea1e5ef39a8389b9feaa18938993205 download/CSWpkgutil.postinstall -5b83368c47fc309a69a1a5020d55385b download/CSWpkgutil.preremove +b9a3a99ece73247e0dbcbb8ea448fcba download/CSWpkgutil.postinstall +6905ca210b32f0789c8640c32de44911 download/CSWpkgutil.preremove This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Wed Dec 17 19:23:22 2008 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Wed, 17 Dec 2008 18:23:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[2633] csw/mgar/pkg/xmlto/trunk/Makefile Message-ID: Revision: 2633 http://gar.svn.sourceforge.net/gar/?rev=2633&view=rev Author: trygvis Date: 2008-12-17 18:23:22 +0000 (Wed, 17 Dec 2008) Log Message: ----------- o Adding missing pre-requisite. Modified Paths: -------------- csw/mgar/pkg/xmlto/trunk/Makefile Modified: csw/mgar/pkg/xmlto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlto/trunk/Makefile 2008-12-17 15:36:58 UTC (rev 2632) +++ csw/mgar/pkg/xmlto/trunk/Makefile 2008-12-17 18:23:22 UTC (rev 2633) @@ -2,7 +2,7 @@ GARVERSION = 0.0.21 CATEGORIES = utils -PREREQUISITE_PKGS = CSWmktemp CSWfindutils CSWdocbookxsl CSWlibxslt CSWflex +PREREQUISITE_PKGS = CSWmktemp CSWfindutils CSWdocbookxsl CSWlibxslt CSWflex CSWggetopts REQUIRES_PKGS = CSWsgmlcommon CSWxmlcommon CSWlibxml2 CSWdocbookdtds REQUIRES_PKGS += CSWdocbookxsl CSWlibxslt CSWflex CSWw3m This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Wed Dec 17 19:23:40 2008 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Wed, 17 Dec 2008 18:23:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[2634] csw/mgar/pkg/asciidoc/trunk/Makefile Message-ID: Revision: 2634 http://gar.svn.sourceforge.net/gar/?rev=2634&view=rev Author: trygvis Date: 2008-12-17 18:23:40 +0000 (Wed, 17 Dec 2008) Log Message: ----------- o Adding missing pre-requisite. Modified Paths: -------------- csw/mgar/pkg/asciidoc/trunk/Makefile Modified: csw/mgar/pkg/asciidoc/trunk/Makefile =================================================================== --- csw/mgar/pkg/asciidoc/trunk/Makefile 2008-12-17 18:23:22 UTC (rev 2633) +++ csw/mgar/pkg/asciidoc/trunk/Makefile 2008-12-17 18:23:40 UTC (rev 2634) @@ -20,6 +20,8 @@ DISTFILES += CSWasciidoc.gspec CSWasciidoc.depend DISTFILES += $(AUTOFILES) +PREREQUISITE_PKGS = CSWautoconf + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).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 Wed Dec 17 19:44:11 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 17 Dec 2008 18:44:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[2635] csw/mgar/pkg/docbook-style-xsl/trunk/files/ CSWdocbookxsldoc.gspec Message-ID: Revision: 2635 http://gar.svn.sourceforge.net/gar/?rev=2635&view=rev Author: bdwalton Date: 2008-12-17 18:44:11 +0000 (Wed, 17 Dec 2008) Log Message: ----------- fixed description for docbookxsl doc package. Modified Paths: -------------- csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsldoc.gspec Modified: csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsldoc.gspec =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsldoc.gspec 2008-12-17 18:23:40 UTC (rev 2634) +++ csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsldoc.gspec 2008-12-17 18:44:11 UTC (rev 2635) @@ -1,5 +1,6 @@ %var bitname docbookxsldoc %var pkgname CSWdocbookxsldoc %var arch all +%var desc Documentation for the Docbook XSL Stylesheets %include url file://%{PKGLIB}/csw_dyndepend.gspec 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 Dec 17 20:01:19 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 17 Dec 2008 19:01:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[2636] csw/mgar/pkg/git/trunk Message-ID: Revision: 2636 http://gar.svn.sourceforge.net/gar/?rev=2636&view=rev Author: bdwalton Date: 2008-12-17 19:01:19 +0000 (Wed, 17 Dec 2008) Log Message: ----------- working towards splitting up the package Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile csw/mgar/pkg/git/trunk/checksums csw/mgar/pkg/git/trunk/files/CSWgit.gspec Added Paths: ----------- csw/mgar/pkg/git/trunk/files/CSWgitdoc.gspec csw/mgar/pkg/git/trunk/files/CSWgitgui.gspec csw/mgar/pkg/git/trunk/files/CSWgitk.gspec csw/mgar/pkg/git/trunk/files/CSWpmgit.gspec Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2008-12-17 18:44:11 UTC (rev 2635) +++ csw/mgar/pkg/git/trunk/Makefile 2008-12-17 19:01:19 UTC (rev 2636) @@ -3,8 +3,12 @@ CATEGORIES = devel PREREQUISITE_PKGS = CSWasciidoc CSWossldevel CSWxmlto CSWbash CSWcurl -PREREQUISITE_PKGS += CSWgsed CSWgnulinks +PREREQUISITE_PKGS += CSWgsed CSWgnulinks CSWperl CSWtcl CSWtk +REQUIRED_PKGS_CSWgit = CSWzlib CSWperl CSWrsync CSWcurl CSWosslrt CSWpmgit +REQUIRED_PKGS_CSWgitk = CSWgit CSWtk +REQUIRED_PKGS_CSWgitgui = CSWgit CSWtk + DESCRIPTION = Fast Version Control System define BLURB Git is a popular version control system designed to handle @@ -15,22 +19,44 @@ MASTER_SITES = http://kernel.org/pub/software/scm/$(GARNAME)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWgit,) +DISTFILES += $(call admfiles,CSWgitdoc,) +DISTFILES += $(call admfiles,CSWpmgit,) +DISTFILES += $(call admfiles,CSWgitgui,) +DISTFILES += $(call admfiles,CSWgitk,) PATCHFILES = doc-makefile.patch +PKGFILES_CSWgitgui = $(bindir)/git-gui $(bindir)/git-citool \ + $(mandir)/man1/git-gui.* $(mandir)/man1/git-citool.* \ + $(datadir)/git-gui/.* $(datadir)/doc/git-gui.* +PKGFILES_CSWgitk = $(bindir)/gitk $(datadir)/doc/gitk.* $(datadir)/gitk.* \ + $(mandir)/man1/gitk.* +PKGFILES_CSWgitdoc = $(datadir)/doc/.* + +PKGFILES_CSWpmgit = + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 GARCOMPILER = GNU CONFIGURE_ARGS = $(DIRPATHS) --with-shell=/opt/csw/bin/bash +CONFIGURE_ARGS += --with-perl=/opt/csw/bin/perl +CONFIGURE_ARGS += --with-tcltk=/opt/csw/bin/tclsh +CONFIGURE_ARGS += --with-zlib=/opt/csw BUILD_ARGS = MSGFMT=gmsgfmt SHELL_PATH=/opt/csw/bin/bash all doc -INSTALL_ARGS = install-doc +INSTALL_ARGS = install install-doc include gar/category.mk # for tail -n and to override things like, etc with the gnu counterparts # gnu must come first so xpg4/sed isn't found first. PATH := /opt/csw/gnu:/usr/xpg4/bin:$(PATH) + +post-install-modulated: + @echo Removing perllocal.pod + @rm -f ${DESTDIR}/opt/csw/lib/perl/5.8.8/perllocal.pod* + @chmod 644 ${DESTDIR}/${libdir}/perl5/site_perl/*pm + @$(MAKECOOKIE) Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2008-12-17 18:44:11 UTC (rev 2635) +++ csw/mgar/pkg/git/trunk/checksums 2008-12-17 19:01:19 UTC (rev 2636) @@ -1,3 +1,7 @@ 899172ebeac65f7a09a8e204d4f87d8c download/git-1.6.0.5.tar.bz2 -fa435e5bd4c829d055a1265ec36360fe download/CSWgit.gspec +57d2c46660773d3a1e87651447e3252a download/CSWgit.gspec +5c5f3cd7951602129a5283c0c242ed3d download/CSWgitdoc.gspec +9ca606aeacf21b081e425a539b848567 download/CSWpmgit.gspec +c5210335743e17938bde6f922891b02a download/CSWgitgui.gspec +82bc03b73b73a6f4b251992a1c671aab download/CSWgitk.gspec 369547e8222dcf8be214b5013f28afcc download/doc-makefile.patch Modified: csw/mgar/pkg/git/trunk/files/CSWgit.gspec =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgit.gspec 2008-12-17 18:44:11 UTC (rev 2635) +++ csw/mgar/pkg/git/trunk/files/CSWgit.gspec 2008-12-17 19:01:19 UTC (rev 2636) @@ -1,4 +1,4 @@ %var bitname git %var pkgname CSWgit %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING +%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Added: csw/mgar/pkg/git/trunk/files/CSWgitdoc.gspec =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgitdoc.gspec (rev 0) +++ csw/mgar/pkg/git/trunk/files/CSWgitdoc.gspec 2008-12-17 19:01:19 UTC (rev 2636) @@ -0,0 +1,5 @@ +%var bitname gitdoc +%var pkgname CSWgitdoc +%var desc Documentation for Git +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Added: csw/mgar/pkg/git/trunk/files/CSWgitgui.gspec =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgitgui.gspec (rev 0) +++ csw/mgar/pkg/git/trunk/files/CSWgitgui.gspec 2008-12-17 19:01:19 UTC (rev 2636) @@ -0,0 +1,5 @@ +%var bitname gitgui +%var pkgname CSWgitgui +%var desc Git GUI tool +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Added: csw/mgar/pkg/git/trunk/files/CSWgitk.gspec =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgitk.gspec (rev 0) +++ csw/mgar/pkg/git/trunk/files/CSWgitk.gspec 2008-12-17 19:01:19 UTC (rev 2636) @@ -0,0 +1,5 @@ +%var bitname gitk +%var pkgname CSWgitk +%var desc Git revision tree visualiser +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Added: csw/mgar/pkg/git/trunk/files/CSWpmgit.gspec =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWpmgit.gspec (rev 0) +++ csw/mgar/pkg/git/trunk/files/CSWpmgit.gspec 2008-12-17 19:01:19 UTC (rev 2636) @@ -0,0 +1,5 @@ +%var bitname pm_git +%var pkgname CSWpmgit +%var desc Perl interface to Git +%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 trygvis at users.sourceforge.net Wed Dec 17 20:09:55 2008 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Wed, 17 Dec 2008 19:09:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[2637] csw/mgar/pkg/xmlto/trunk/Makefile Message-ID: Revision: 2637 http://gar.svn.sourceforge.net/gar/?rev=2637&view=rev Author: trygvis Date: 2008-12-17 19:09:49 +0000 (Wed, 17 Dec 2008) Log Message: ----------- uhm .. Modified Paths: -------------- csw/mgar/pkg/xmlto/trunk/Makefile Modified: csw/mgar/pkg/xmlto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlto/trunk/Makefile 2008-12-17 19:01:19 UTC (rev 2636) +++ csw/mgar/pkg/xmlto/trunk/Makefile 2008-12-17 19:09:49 UTC (rev 2637) @@ -2,7 +2,7 @@ GARVERSION = 0.0.21 CATEGORIES = utils -PREREQUISITE_PKGS = CSWmktemp CSWfindutils CSWdocbookxsl CSWlibxslt CSWflex CSWggetopts +PREREQUISITE_PKGS = CSWmktemp CSWfindutils CSWdocbookxsl CSWlibxslt CSWflex CSWggetopt REQUIRES_PKGS = CSWsgmlcommon CSWxmlcommon CSWlibxml2 CSWdocbookdtds REQUIRES_PKGS += CSWdocbookxsl CSWlibxslt CSWflex CSWw3m 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 Dec 17 22:58:21 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 17 Dec 2008 21:58:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[2638] csw/mgar/pkg/xmlto/trunk Message-ID: Revision: 2638 http://gar.svn.sourceforge.net/gar/?rev=2638&view=rev Author: bdwalton Date: 2008-12-17 21:58:21 +0000 (Wed, 17 Dec 2008) Log Message: ----------- revert to SoS11 compiler, handle license file better Modified Paths: -------------- csw/mgar/pkg/xmlto/trunk/Makefile csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.gspec Removed Paths: ------------- csw/mgar/pkg/xmlto/trunk/files/GPL Modified: csw/mgar/pkg/xmlto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlto/trunk/Makefile 2008-12-17 19:09:49 UTC (rev 2637) +++ csw/mgar/pkg/xmlto/trunk/Makefile 2008-12-17 21:58:21 UTC (rev 2638) @@ -15,15 +15,13 @@ MASTER_SITES = https://fedorahosted.org/$(GARNAME)/export/1/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += $(call admfiles,CSWxmlto) GPL +DISTFILES += $(call admfiles,CSWxmlto) TEST_TARGET = check # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -GARCOMPILER = GNU - # this ssl site has a cert we don't recognize WGET_OPTS = --no-check-certificate @@ -38,8 +36,6 @@ CONFIGURE_ARGS += --with-bash=/opt/csw/bin/bash CONFIGURE_ARGS += --with-getopt=/opt/csw/bin/ggetopt -EXTRACT_TARGETS-global = $(call admfiles,CSWxmlto) GPL - include gar/category.mk # We need this for 'tail -n' @@ -48,5 +44,3 @@ #reset XML_CATALOG lookup (we rely on having packages that provide stylesheets #etc). Having xsltproc not find them during build makes us blow up!! XML_CATALOG_FILES = /opt/csw/etc/xml/catalog - - Modified: csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.gspec =================================================================== --- csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.gspec 2008-12-17 19:09:49 UTC (rev 2637) +++ csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.gspec 2008-12-17 21:58:21 UTC (rev 2638) @@ -1,4 +1,4 @@ %var bitname xmlto %var pkgname CSWxmlto %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKDIR}/GPL +%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Deleted: csw/mgar/pkg/xmlto/trunk/files/GPL =================================================================== --- csw/mgar/pkg/xmlto/trunk/files/GPL 2008-12-17 19:09:49 UTC (rev 2637) +++ csw/mgar/pkg/xmlto/trunk/files/GPL 2008-12-17 21:58:21 UTC (rev 2638) @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU 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. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), 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 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 show them these terms so they know 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. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - 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 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 derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 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 License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -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. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary 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 - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 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 Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing 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 for copying, distributing or modifying -the Program or works based on it. - - 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. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. 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 this 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 -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. 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 - - 11. 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. - - 12. 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 - - 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 the public, 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 2 of the License, 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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) 19yy 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 is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 18 00:39:14 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 17 Dec 2008 23:39:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[2639] csw/mgar/gar Message-ID: Revision: 2639 http://gar.svn.sourceforge.net/gar/?rev=2639&view=rev Author: wbonnet Date: 2008-12-17 23:39:14 +0000 (Wed, 17 Dec 2008) Log Message: ----------- Add support for Sourceforge download page parsing Modified Paths: -------------- csw/mgar/gar/v1/bin/upstream_watch csw/mgar/gar/v1/gar.conf.mk csw/mgar/gar/v1/gar.lib.mk csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v1/bin/upstream_watch =================================================================== --- csw/mgar/gar/v1/bin/upstream_watch 2008-12-17 21:58:21 UTC (rev 2638) +++ csw/mgar/gar/v1/bin/upstream_watch 2008-12-17 23:39:14 UTC (rev 2639) @@ -108,11 +108,64 @@ return \@file_list; } +sub get_file_list_wget_sourceforge +{ + my $url = shift; + my @file_list; + + my $http_proxy_cmd = ""; + my $wget_command ="wget"; + my $filename = ""; + + # lftp doesn't seem to obey the _PROXY env variable + # we must manually set them + $http_proxy_cmd = "set http:proxy $ENV{HTTP_PROXY};" if exists $ENV{HTTP_PROXY}; + $http_proxy_cmd = "set http:proxy $ENV{http_proxy};" if exists $ENV{http_proxy}; + $wget_command = "$http_proxy_cmd ; wget --proxy=on" if exists $ENV{http_proxy_cmd}; + + open (my $FH, "$wget_command -qO- $url 2>/dev/null | grep class | grep selected | grep li | grep Download | "); + + if (my $line = <$FH>) { + my @cols = split (/"/, $line); + $filename = $cols[3]; + chomp ($filename); + } + else { + close ($FH); + return \@file_list; + } + + close ($FH); + + $url = "http://downloads.sourceforge.net" . $filename; + open ($FH, "$wget_command -qO- $url 2>/dev/null | grep $filename | grep package_id= | grep release_id | "); + + if (my $line = <$FH>) { + my @cols = split (/>/, $line); + my $filename = $cols[2]; + chomp ($filename); + @cols = split (/ \$help, + "s|use_sf=i" => \$use_sf, "u|url=s@" => \@urls); if ($help) { @@ -126,9 +179,14 @@ my $newest_version = 0; my $newest_file = ""; + my $file_list ; foreach my $url (@urls) { - my $file_list = get_file_list_lftp ($url); + if ($use_sf != 0) { + $file_list = get_file_list_wget_sourceforge ($url); + } else { + $file_list = get_file_list_lftp ($url); +} foreach my $file (@{$file_list}) { if ($file =~ /^$file_pattern$/) { Modified: csw/mgar/gar/v1/gar.conf.mk =================================================================== --- csw/mgar/gar/v1/gar.conf.mk 2008-12-17 21:58:21 UTC (rev 2638) +++ csw/mgar/gar/v1/gar.conf.mk 2008-12-17 23:39:14 UTC (rev 2639) @@ -233,6 +233,8 @@ SF_MIRRORS ?= http://downloads.sourceforge.net/$(SF_PROJ)/ # Keep this for compatibility SF_MIRROR = $(firstword $(SF_MIRRORS)) +SF_PROJECT_SHOWFILE ?= http://sourceforge.net/project/showfiles.php?group_id +UPSTREAM_USE_SF ?= 0 # GNU GNU_SITE = http://mirrors.kernel.org/ Modified: csw/mgar/gar/v1/gar.lib.mk =================================================================== --- csw/mgar/gar/v1/gar.lib.mk 2008-12-17 21:58:21 UTC (rev 2638) +++ csw/mgar/gar/v1/gar.lib.mk 2008-12-17 23:39:14 UTC (rev 2639) @@ -113,8 +113,9 @@ UPSTREAM_MASTER_SITES ?= $(MASTER_SITES) UW_ARGS = $(addprefix -u ,$(UPSTREAM_MASTER_SITES)) +SF_ARGS = $(addprefix -s ,$(UPSTREAM_USE_SF)) ifneq ($(UFILES_REGEX), "") - FILES2CHECK = $(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/upstream_watch $(UW_ARGS) $(addsuffix ',$(addprefix ',$(UFILES_REGEX)))) + FILES2CHECK = $(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/upstream_watch $(UW_ARGS) $(SF_ARGS) $(addsuffix ',$(addprefix ',$(UFILES_REGEX)))) else FILES2CHECK = "" endif @@ -130,7 +131,7 @@ else \ if echo $(DISTFILES) | grep -w $$FILE >/dev/null; then \ PACKAGE_UP_TO_DATE=1; \ - echo "$(GARNAME) : Package is up-to-date. Current version is $$FILE" ; \ + echo "$(GARNAME) : Package is up-to-date. Current version is $$FILE" ; \ else \ NEW_FILES="$$FILE $$NEW_FILES"; \ fi; \ @@ -138,8 +139,8 @@ $(MAKE) checknew-$$FILE >/dev/null; \ done; \ if test -z "$$NEW_FILES" ; then \ - if [ ! -n '$(UFILES_REGEX)' ]; then \ - echo "$(GARNAME) : Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \ + if [ ! -n '$(UFILES_REGEX)' ]; then \ + echo "$(GARNAME) : Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \ # { echo ""; \ # echo "Hello dear $(GARNAME) maintainer,"; \ # echo ""; \ @@ -149,37 +150,37 @@ # echo ""; \ # echo "--"; \ # echo "Kindest regards"; \ -# echo "The upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ +# echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ else \ - if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ + if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ echo "$(GARNAME) : Warning no files to check ! $(FILES2CHECK)" ; \ echo "$(GARNAME) : UPSTREAM_MASTER_SITES is $(UPSTREAM_MASTER_SITES)" ; \ echo "$(GARNAME) : DISTNAME is $(DISTNAME)" ; \ echo "$(GARNAME) : UFILES_REGEX is : $(UFILES_REGEX)" ; \ echo "$(GARNAME) : Please check configuration" ; \ - fi; \ - fi; \ - else \ + fi; \ + fi; \ + else \ echo "$(GARNAME) : new upstream files available: $$NEW_FILES"; \ - { echo ""; \ - echo "Hello dear $(GARNAME) maintainer,"; \ - echo ""; \ - echo "The upstream notification job has detected the availability of new files for $(GARNAME)."; \ - echo ""; \ - echo "The following upstream file(s):"; \ - echo " $$NEW_FILES"; \ - echo ""; \ - echo "is/are available at the following url(s):"; \ - echo " $(UPSTREAM_MASTER_SITES)"; \ - echo ""; \ - echo "Please consider updating your package." ; \ - echo ""; \ - echo "--"; \ - echo "Kindest regards"; \ - echo "The upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ - fi; \ + { echo ""; \ + echo "Hello dear $(GARNAME) maintainer,"; \ + echo ""; \ + echo "The upstream notification job has detected the availability of new files for $(GARNAME)."; \ + echo ""; \ + echo "The following upstream file(s):"; \ + echo " $$NEW_FILES"; \ + echo ""; \ + echo "is/are available at the following url(s):"; \ + echo " $(UPSTREAM_MASTER_SITES)"; \ + echo ""; \ + echo "Please consider updating your package." ; \ + echo ""; \ + echo "--"; \ + echo "Kindest regards"; \ + echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ + fi; \ fi - + check-upstream: @if [ -n '$(FILES2CHECK)' ]; then \ NEW_FILES=""; \ @@ -191,7 +192,7 @@ else \ if echo $(DISTFILES) | grep -w $$FILE >/dev/null; then \ PACKAGE_UP_TO_DATE=1; \ - echo "$(GARNAME) : Package is up-to-date. Current version is $$FILE" ; \ + echo "$(GARNAME) : Package is up-to-date. Current version is $$FILE" ; \ else \ NEW_FILES="$$FILE $$NEW_FILES"; \ fi; \ @@ -199,20 +200,20 @@ $(MAKE) checknew-$$FILE >/dev/null; \ done; \ if test -z "$$NEW_FILES" ; then \ - if [ ! -n '$(UFILES_REGEX)' ]; then \ - echo "$(GARNAME) : Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \ + if [ ! -n '$(UFILES_REGEX)' ]; then \ + echo "$(GARNAME) : Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \ else \ - if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ + if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ echo "$(GARNAME) : Warning no files to check ! $(FILES2CHECK)" ; \ echo "$(GARNAME) : UPSTREAM_MASTER_SITES is $(UPSTREAM_MASTER_SITES)" ; \ echo "$(GARNAME) : DISTNAME is $(DISTNAME)" ; \ echo "$(GARNAME) : UFILES_REGEX is : $(UFILES_REGEX)" ; \ echo "$(GARNAME) : Please check configuration" ; \ - fi; \ - fi; \ - else \ + fi; \ + fi; \ + else \ echo "$(GARNAME) : new upstream files available: $$NEW_FILES"; \ - fi; \ + fi; \ fi checknew-%: Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2008-12-17 21:58:21 UTC (rev 2638) +++ csw/mgar/gar/v2/gar.lib.mk 2008-12-17 23:39:14 UTC (rev 2639) @@ -111,8 +111,9 @@ UPSTREAM_MASTER_SITES ?= $(MASTER_SITES) UW_ARGS = $(addprefix -u ,$(UPSTREAM_MASTER_SITES)) +SF_ARGS = $(addprefix -s ,$(UPSTREAM_USE_SF)) ifneq ($(UFILES_REGEX), "") - FILES2CHECK = $(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/upstream_watch $(UW_ARGS) $(addsuffix ',$(addprefix ',$(UFILES_REGEX)))) + FILES2CHECK = $(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/upstream_watch $(UW_ARGS) $(SF_ARGS) $(addsuffix ',$(addprefix ',$(UFILES_REGEX)))) else FILES2CHECK = "" endif @@ -128,7 +129,7 @@ else \ if echo $(DISTFILES) | grep -w $$FILE >/dev/null; then \ PACKAGE_UP_TO_DATE=1; \ - echo "$(GARNAME) : Package is up-to-date. Current version is $$FILE" ; \ + echo "$(GARNAME) : Package is up-to-date. Current version is $$FILE" ; \ else \ NEW_FILES="$$FILE $$NEW_FILES"; \ fi; \ @@ -136,8 +137,8 @@ $(MAKE) checknew-$$FILE >/dev/null; \ done; \ if test -z "$$NEW_FILES" ; then \ - if [ ! -n '$(UFILES_REGEX)' ]; then \ - echo "$(GARNAME) : Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \ + if [ ! -n '$(UFILES_REGEX)' ]; then \ + echo "$(GARNAME) : Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \ # { echo ""; \ # echo "Hello dear $(GARNAME) maintainer,"; \ # echo ""; \ @@ -149,33 +150,33 @@ # echo "Kindest regards"; \ # echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ else \ - if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ + if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ echo "$(GARNAME) : Warning no files to check ! $(FILES2CHECK)" ; \ echo "$(GARNAME) : UPSTREAM_MASTER_SITES is $(UPSTREAM_MASTER_SITES)" ; \ echo "$(GARNAME) : DISTNAME is $(DISTNAME)" ; \ echo "$(GARNAME) : UFILES_REGEX is : $(UFILES_REGEX)" ; \ echo "$(GARNAME) : Please check configuration" ; \ - fi; \ - fi; \ - else \ + fi; \ + fi; \ + else \ echo "$(GARNAME) : new upstream files available: $$NEW_FILES"; \ - { echo ""; \ - echo "Hello dear $(GARNAME) maintainer,"; \ - echo ""; \ - echo "The upstream notification job has detected the availability of new files for $(GARNAME)."; \ - echo ""; \ - echo "The following upstream file(s):"; \ - echo " $$NEW_FILES"; \ - echo ""; \ - echo "is/are available at the following url(s):"; \ - echo " $(UPSTREAM_MASTER_SITES)"; \ - echo ""; \ - echo "Please consider updating your package." ; \ - echo ""; \ - echo "--"; \ - echo "Kindest regards"; \ - echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ - fi; \ + { echo ""; \ + echo "Hello dear $(GARNAME) maintainer,"; \ + echo ""; \ + echo "The upstream notification job has detected the availability of new files for $(GARNAME)."; \ + echo ""; \ + echo "The following upstream file(s):"; \ + echo " $$NEW_FILES"; \ + echo ""; \ + echo "is/are available at the following url(s):"; \ + echo " $(UPSTREAM_MASTER_SITES)"; \ + echo ""; \ + echo "Please consider updating your package." ; \ + echo ""; \ + echo "--"; \ + echo "Kindest regards"; \ + echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ + fi; \ fi check-upstream: @@ -189,7 +190,7 @@ else \ if echo $(DISTFILES) | grep -w $$FILE >/dev/null; then \ PACKAGE_UP_TO_DATE=1; \ - echo "$(GARNAME) : Package is up-to-date. Current version is $$FILE" ; \ + echo "$(GARNAME) : Package is up-to-date. Current version is $$FILE" ; \ else \ NEW_FILES="$$FILE $$NEW_FILES"; \ fi; \ @@ -197,20 +198,20 @@ $(MAKE) checknew-$$FILE >/dev/null; \ done; \ if test -z "$$NEW_FILES" ; then \ - if [ ! -n '$(UFILES_REGEX)' ]; then \ - echo "$(GARNAME) : Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \ + if [ ! -n '$(UFILES_REGEX)' ]; then \ + echo "$(GARNAME) : Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \ else \ - if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ + if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ echo "$(GARNAME) : Warning no files to check ! $(FILES2CHECK)" ; \ echo "$(GARNAME) : UPSTREAM_MASTER_SITES is $(UPSTREAM_MASTER_SITES)" ; \ echo "$(GARNAME) : DISTNAME is $(DISTNAME)" ; \ echo "$(GARNAME) : UFILES_REGEX is : $(UFILES_REGEX)" ; \ echo "$(GARNAME) : Please check configuration" ; \ - fi; \ - fi; \ - else \ + fi; \ + fi; \ + else \ echo "$(GARNAME) : new upstream files available: $$NEW_FILES"; \ - fi; \ + fi; \ fi checknew-%: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 18 00:40:05 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 17 Dec 2008 23:40:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[2640] csw/mgar/gar Message-ID: Revision: 2640 http://gar.svn.sourceforge.net/gar/?rev=2640&view=rev Author: wbonnet Date: 2008-12-17 23:40:05 +0000 (Wed, 17 Dec 2008) Log Message: ----------- Port to upstream_watch v2 SF download page support Modified Paths: -------------- csw/mgar/gar/v1/bin/upstream_watch csw/mgar/gar/v2/bin/upstream_watch Modified: csw/mgar/gar/v1/bin/upstream_watch =================================================================== --- csw/mgar/gar/v1/bin/upstream_watch 2008-12-17 23:39:14 UTC (rev 2639) +++ csw/mgar/gar/v1/bin/upstream_watch 2008-12-17 23:40:05 UTC (rev 2640) @@ -186,7 +186,7 @@ $file_list = get_file_list_wget_sourceforge ($url); } else { $file_list = get_file_list_lftp ($url); -} + } foreach my $file (@{$file_list}) { if ($file =~ /^$file_pattern$/) { Modified: csw/mgar/gar/v2/bin/upstream_watch =================================================================== --- csw/mgar/gar/v2/bin/upstream_watch 2008-12-17 23:39:14 UTC (rev 2639) +++ csw/mgar/gar/v2/bin/upstream_watch 2008-12-17 23:40:05 UTC (rev 2640) @@ -108,11 +108,64 @@ return \@file_list; } +sub get_file_list_wget_sourceforge +{ + my $url = shift; + my @file_list; + + my $http_proxy_cmd = ""; + my $wget_command ="wget"; + my $filename = ""; + + # lftp doesn't seem to obey the _PROXY env variable + # we must manually set them + $http_proxy_cmd = "set http:proxy $ENV{HTTP_PROXY};" if exists $ENV{HTTP_PROXY}; + $http_proxy_cmd = "set http:proxy $ENV{http_proxy};" if exists $ENV{http_proxy}; + $wget_command = "$http_proxy_cmd ; wget --proxy=on" if exists $ENV{http_proxy_cmd}; + + open (my $FH, "$wget_command -qO- $url 2>/dev/null | grep class | grep selected | grep li | grep Download | "); + + if (my $line = <$FH>) { + my @cols = split (/"/, $line); + $filename = $cols[3]; + chomp ($filename); + } + else { + close ($FH); + return \@file_list; + } + + close ($FH); + + $url = "http://downloads.sourceforge.net" . $filename; + open ($FH, "$wget_command -qO- $url 2>/dev/null | grep $filename | grep package_id= | grep release_id | "); + + if (my $line = <$FH>) { + my @cols = split (/>/, $line); + my $filename = $cols[2]; + chomp ($filename); + @cols = split (/ \$help, + "s|use_sf=i" => \$use_sf, "u|url=s@" => \@urls); if ($help) { @@ -126,9 +179,14 @@ my $newest_version = 0; my $newest_file = ""; + my $file_list ; foreach my $url (@urls) { - my $file_list = get_file_list_lftp ($url); + if ($use_sf != 0) { + $file_list = get_file_list_wget_sourceforge ($url); + } else { + $file_list = get_file_list_lftp ($url); + } foreach my $file (@{$file_list}) { if ($file =~ /^$file_pattern$/) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 18 00:41:08 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 17 Dec 2008 23:41:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[2641] csw/mgar/pkg/slrn/trunk/Makefile Message-ID: Revision: 2641 http://gar.svn.sourceforge.net/gar/?rev=2641&view=rev Author: wbonnet Date: 2008-12-17 23:41:08 +0000 (Wed, 17 Dec 2008) Log Message: ----------- Fix URL and regexp for uwatch Modified Paths: -------------- csw/mgar/pkg/slrn/trunk/Makefile Modified: csw/mgar/pkg/slrn/trunk/Makefile =================================================================== --- csw/mgar/pkg/slrn/trunk/Makefile 2008-12-17 23:40:05 UTC (rev 2640) +++ csw/mgar/pkg/slrn/trunk/Makefile 2008-12-17 23:41:08 UTC (rev 2641) @@ -19,7 +19,9 @@ DISTFILES += $(call admfiles,CSWslrn,prototype depend) # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=7768 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = $(GARNAME)-((\d+(?:\.\d+)*)(p\d+)?) LD_OPTIONS = -R/opt/csw/lib/\$$ISALIST -R/opt/csw/lib This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 18 00:48:53 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 17 Dec 2008 23:48:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[2642] csw/mgar/pkg/asciidoc/trunk/Makefile Message-ID: Revision: 2642 http://gar.svn.sourceforge.net/gar/?rev=2642&view=rev Author: wbonnet Date: 2008-12-17 23:48:53 +0000 (Wed, 17 Dec 2008) Log Message: ----------- Fix UFILE_REGEX Modified Paths: -------------- csw/mgar/pkg/asciidoc/trunk/Makefile Modified: csw/mgar/pkg/asciidoc/trunk/Makefile =================================================================== --- csw/mgar/pkg/asciidoc/trunk/Makefile 2008-12-17 23:41:08 UTC (rev 2641) +++ csw/mgar/pkg/asciidoc/trunk/Makefile 2008-12-17 23:48:53 UTC (rev 2642) @@ -23,7 +23,9 @@ PREREQUISITE_PKGS = CSWautoconf # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=67797 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = (\d+(?:\.\d+)*) CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 18 00:50:55 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 17 Dec 2008 23:50:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[2643] csw/mgar/pkg/avantfax/trunk Message-ID: Revision: 2643 http://gar.svn.sourceforge.net/gar/?rev=2643&view=rev Author: wbonnet Date: 2008-12-17 23:50:55 +0000 (Wed, 17 Dec 2008) Log Message: ----------- Fix UFILE_REGEX Delete cookies directory from svn Modified Paths: -------------- csw/mgar/pkg/avantfax/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/avantfax/trunk/cookies/ Modified: csw/mgar/pkg/avantfax/trunk/Makefile =================================================================== --- csw/mgar/pkg/avantfax/trunk/Makefile 2008-12-17 23:48:53 UTC (rev 2642) +++ csw/mgar/pkg/avantfax/trunk/Makefile 2008-12-17 23:50:55 UTC (rev 2643) @@ -17,7 +17,9 @@ DISTFILES += $(call admfiles,CSWavantfax,depend preinstall postinstall) # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=160107 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = (\d+(?:\.\d+)*) CONFIGURE_SCRIPTS = BUILD_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 18 00:52:39 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 17 Dec 2008 23:52:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[2644] csw/mgar/pkg/boost/trunk/Makefile Message-ID: Revision: 2644 http://gar.svn.sourceforge.net/gar/?rev=2644&view=rev Author: wbonnet Date: 2008-12-17 23:52:39 +0000 (Wed, 17 Dec 2008) Log Message: ----------- Fix UFILE_REGEX Modified Paths: -------------- csw/mgar/pkg/boost/trunk/Makefile Modified: csw/mgar/pkg/boost/trunk/Makefile =================================================================== --- csw/mgar/pkg/boost/trunk/Makefile 2008-12-17 23:50:55 UTC (rev 2643) +++ csw/mgar/pkg/boost/trunk/Makefile 2008-12-17 23:52:39 UTC (rev 2644) @@ -21,7 +21,9 @@ DISTFILES += CSWboost.gspec # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=7586 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = (\d+(?:\.\d+)*) WORKSRC = $(WORKDIR)/$(GARNAME)_$(DISTVERSION) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 18 00:54:28 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 17 Dec 2008 23:54:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[2645] csw/mgar/pkg/clusterit/trunk/Makefile Message-ID: Revision: 2645 http://gar.svn.sourceforge.net/gar/?rev=2645&view=rev Author: wbonnet Date: 2008-12-17 23:54:28 +0000 (Wed, 17 Dec 2008) Log Message: ----------- Fix UFILE_REGEX Modified Paths: -------------- csw/mgar/pkg/clusterit/trunk/Makefile Modified: csw/mgar/pkg/clusterit/trunk/Makefile =================================================================== --- csw/mgar/pkg/clusterit/trunk/Makefile 2008-12-17 23:52:39 UTC (rev 2644) +++ csw/mgar/pkg/clusterit/trunk/Makefile 2008-12-17 23:54:28 UTC (rev 2645) @@ -13,7 +13,9 @@ DISTFILES += $(call admfiles,CSWclusterit,) # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=154528 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*) PREFIX = /opt/csw/$(GARNAME) CONFIGURE_ARGS = --prefix=$(PREFIX) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 18 00:55:34 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 17 Dec 2008 23:55:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[2646] csw/mgar/pkg/clusterssh/trunk/Makefile Message-ID: Revision: 2646 http://gar.svn.sourceforge.net/gar/?rev=2646&view=rev Author: wbonnet Date: 2008-12-17 23:55:34 +0000 (Wed, 17 Dec 2008) Log Message: ----------- Fix UFILE_REGEX Modified Paths: -------------- csw/mgar/pkg/clusterssh/trunk/Makefile Modified: csw/mgar/pkg/clusterssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/clusterssh/trunk/Makefile 2008-12-17 23:54:28 UTC (rev 2645) +++ csw/mgar/pkg/clusterssh/trunk/Makefile 2008-12-17 23:55:34 UTC (rev 2646) @@ -13,7 +13,9 @@ DISTFILES += $(call admfiles,CSWclusterssh,) # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=89139 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = (\d+(?:\.\d+)*) PREFIX = /opt/csw/ CONFIGURE_ARGS = --prefix=$(PREFIX) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 18 00:56:46 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 17 Dec 2008 23:56:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[2647] csw/mgar/pkg/ctags/trunk/Makefile Message-ID: Revision: 2647 http://gar.svn.sourceforge.net/gar/?rev=2647&view=rev Author: wbonnet Date: 2008-12-17 23:56:46 +0000 (Wed, 17 Dec 2008) Log Message: ----------- Fix UFILE_REGEX Modified Paths: -------------- csw/mgar/pkg/ctags/trunk/Makefile Modified: csw/mgar/pkg/ctags/trunk/Makefile =================================================================== --- csw/mgar/pkg/ctags/trunk/Makefile 2008-12-17 23:55:34 UTC (rev 2646) +++ csw/mgar/pkg/ctags/trunk/Makefile 2008-12-17 23:56:46 UTC (rev 2647) @@ -16,7 +16,9 @@ DISTFILES += CSWctags.gspec CSWctags.prototype # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=6556 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = (\d+(?:\.\d+)*) # Respect DESTDIR PATCHFILES += install.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 18 00:58:36 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 17 Dec 2008 23:58:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[2648] csw/mgar/pkg/easytag/trunk/Makefile Message-ID: Revision: 2648 http://gar.svn.sourceforge.net/gar/?rev=2648&view=rev Author: wbonnet Date: 2008-12-17 23:58:36 +0000 (Wed, 17 Dec 2008) Log Message: ----------- Fix UFILE_REGEX Modified Paths: -------------- csw/mgar/pkg/easytag/trunk/Makefile Modified: csw/mgar/pkg/easytag/trunk/Makefile =================================================================== --- csw/mgar/pkg/easytag/trunk/Makefile 2008-12-17 23:56:46 UTC (rev 2647) +++ csw/mgar/pkg/easytag/trunk/Makefile 2008-12-17 23:58:36 UTC (rev 2648) @@ -12,7 +12,9 @@ DISTFILES += $(call admfiles,CSWeasytag,depend) # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=5216 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = (\d+(?:\.\d+)*) GARCOMPILER = GNU This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 18 01:02:12 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 18 Dec 2008 00:02:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[2649] csw/mgar/gar Message-ID: Revision: 2649 http://gar.svn.sourceforge.net/gar/?rev=2649&view=rev Author: wbonnet Date: 2008-12-18 00:02:12 +0000 (Thu, 18 Dec 2008) Log Message: ----------- Fix loop when parsing file version in sf download page Modified Paths: -------------- csw/mgar/gar/v1/bin/upstream_watch csw/mgar/gar/v2/bin/upstream_watch Modified: csw/mgar/gar/v1/bin/upstream_watch =================================================================== --- csw/mgar/gar/v1/bin/upstream_watch 2008-12-17 23:58:36 UTC (rev 2648) +++ csw/mgar/gar/v1/bin/upstream_watch 2008-12-18 00:02:12 UTC (rev 2649) @@ -140,7 +140,7 @@ $url = "http://downloads.sourceforge.net" . $filename; open ($FH, "$wget_command -qO- $url 2>/dev/null | grep $filename | grep package_id= | grep release_id | "); - if (my $line = <$FH>) { + while (my $line = <$FH>) { my @cols = split (/>/, $line); my $filename = $cols[2]; chomp ($filename); @@ -149,10 +149,6 @@ chomp ($filename); push (@file_list, $filename); } - else { - close ($FH); - return \@file_list; - } close ($FH); @@ -186,7 +182,7 @@ $file_list = get_file_list_wget_sourceforge ($url); } else { $file_list = get_file_list_lftp ($url); - } + } foreach my $file (@{$file_list}) { if ($file =~ /^$file_pattern$/) { Modified: csw/mgar/gar/v2/bin/upstream_watch =================================================================== --- csw/mgar/gar/v2/bin/upstream_watch 2008-12-17 23:58:36 UTC (rev 2648) +++ csw/mgar/gar/v2/bin/upstream_watch 2008-12-18 00:02:12 UTC (rev 2649) @@ -140,7 +140,7 @@ $url = "http://downloads.sourceforge.net" . $filename; open ($FH, "$wget_command -qO- $url 2>/dev/null | grep $filename | grep package_id= | grep release_id | "); - if (my $line = <$FH>) { + while (my $line = <$FH>) { my @cols = split (/>/, $line); my $filename = $cols[2]; chomp ($filename); @@ -149,10 +149,6 @@ chomp ($filename); push (@file_list, $filename); } - else { - close ($FH); - return \@file_list; - } close ($FH); @@ -186,7 +182,7 @@ $file_list = get_file_list_wget_sourceforge ($url); } else { $file_list = get_file_list_lftp ($url); - } + } foreach my $file (@{$file_list}) { if ($file =~ /^$file_pattern$/) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 18 01:03:41 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 18 Dec 2008 00:03:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[2650] csw/mgar/pkg Message-ID: Revision: 2650 http://gar.svn.sourceforge.net/gar/?rev=2650&view=rev Author: wbonnet Date: 2008-12-18 00:03:41 +0000 (Thu, 18 Dec 2008) Log Message: ----------- Fix some UFILEREGEX Modified Paths: -------------- csw/mgar/pkg/x11/libXau/trunk/Makefile csw/mgar/pkg/zsh/trunk/Makefile Modified: csw/mgar/pkg/x11/libXau/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libXau/trunk/Makefile 2008-12-18 00:02:12 UTC (rev 2649) +++ csw/mgar/pkg/x11/libXau/trunk/Makefile 2008-12-18 00:03:41 UTC (rev 2650) @@ -18,22 +18,7 @@ DISTFILES += CSWlibXaudev.gspec CSWlibXaudev.prototype CSWlibXaudev.depend # DISTFILES += $(call admfiles,CSWlibXau, depend) -CFLAGS += -xlibmil -errtags=yes -erroff=E_EMPTY_DECLARATION -CXXFLAGS += -xlibmil -xlibmopt -features=tmplife -norunpath -LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib -export CFLAGS CXXFLAGS LDFLAGS - -TEST_SCRIPTS = none - -GREP = ggrep - include gar/category.mk -CONFIGURE_ARGS = --prefix=/opt/csw --mandir=/opt/csw/share/man -test-none: - @$(MAKECOOKIE) - -post-install: - ( gfind $(DESTDIR)/opt/csw -exec bash -c "file {} | ggrep ELF | ggrep -e 'executable' -e 'dynamic lib' | ggrep 'not stripped' && strip {}" \; ) Modified: csw/mgar/pkg/zsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/zsh/trunk/Makefile 2008-12-18 00:02:12 UTC (rev 2649) +++ csw/mgar/pkg/zsh/trunk/Makefile 2008-12-18 00:03:41 UTC (rev 2650) @@ -14,7 +14,9 @@ DISTFILES += $(call admfiles,CSWzsh,depend postinstall postremove) # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +UPSTREAM_MASTER_SITES = http://sourceforge.net/project/showfiles.php?group_id=4068 +#UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +UFILES_REGEX = (\d+(?:\.\d+)*) CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-maildir-support 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 Dec 18 02:24:49 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 18 Dec 2008 01:24:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[2651] csw/mgar/pkg/git/trunk Message-ID: Revision: 2651 http://gar.svn.sourceforge.net/gar/?rev=2651&view=rev Author: bdwalton Date: 2008-12-18 01:24:49 +0000 (Thu, 18 Dec 2008) Log Message: ----------- - Reorged the package split (somewhat...and not fully tested) - Build depend on pm_subversion now (so we can do git_svn) - Actually install documentation - Enable the git emacs contrib extra. Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile csw/mgar/pkg/git/trunk/checksums Added Paths: ----------- csw/mgar/pkg/git/trunk/files/CSWgitemacs.gspec Removed Paths: ------------- csw/mgar/pkg/git/trunk/files/CSWpmgit.gspec Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2008-12-18 00:03:41 UTC (rev 2650) +++ csw/mgar/pkg/git/trunk/Makefile 2008-12-18 01:24:49 UTC (rev 2651) @@ -3,12 +3,18 @@ CATEGORIES = devel PREREQUISITE_PKGS = CSWasciidoc CSWossldevel CSWxmlto CSWbash CSWcurl -PREREQUISITE_PKGS += CSWgsed CSWgnulinks CSWperl CSWtcl CSWtk +PREREQUISITE_PKGS += CSWgsed CSWgnulinks CSWperl CSWtcl CSWtk CSWexpat +PREREQUISITE_PKGS += CSWzlib CSWpmerror CSWpmsvn -REQUIRED_PKGS_CSWgit = CSWzlib CSWperl CSWrsync CSWcurl CSWosslrt CSWpmgit +REQUIRED_PKGS_CSWgit = CSWzlib CSWperl CSWrsync CSWcurlrt CSWosslrt +REQUIRED_PKGS_CSWgit += CSWossh CSWiconv CSWexpat CSWbash + REQUIRED_PKGS_CSWgitk = CSWgit CSWtk + REQUIRED_PKGS_CSWgitgui = CSWgit CSWtk +REQUIRED_PKGS_CSWgitdoc = CSWgit + DESCRIPTION = Fast Version Control System define BLURB Git is a popular version control system designed to handle @@ -18,36 +24,39 @@ MASTER_SITES = http://kernel.org/pub/software/scm/$(GARNAME)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += $(call admfiles,CSWgit,) -DISTFILES += $(call admfiles,CSWgitdoc,) -DISTFILES += $(call admfiles,CSWpmgit,) DISTFILES += $(call admfiles,CSWgitgui,) DISTFILES += $(call admfiles,CSWgitk,) +DISTFILES += $(call admfiles,CSWgitemacs,) +DISTFILES += $(call admfiles,CSWgitdoc,) +DISTFILES += $(call admfiles,CSWgit,) PATCHFILES = doc-makefile.patch + PKGFILES_CSWgitgui = $(bindir)/git-gui $(bindir)/git-citool \ $(mandir)/man1/git-gui.* $(mandir)/man1/git-citool.* \ $(datadir)/git-gui/.* $(datadir)/doc/git-gui.* PKGFILES_CSWgitk = $(bindir)/gitk $(datadir)/doc/gitk.* $(datadir)/gitk.* \ $(mandir)/man1/gitk.* +PKGFILES_CSWgitemacs = $(datadir)/emacs/.* PKGFILES_CSWgitdoc = $(datadir)/doc/.* -PKGFILES_CSWpmgit = - # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 GARCOMPILER = GNU -CONFIGURE_ARGS = $(DIRPATHS) --with-shell=/opt/csw/bin/bash -CONFIGURE_ARGS += --with-perl=/opt/csw/bin/perl -CONFIGURE_ARGS += --with-tcltk=/opt/csw/bin/tclsh -CONFIGURE_ARGS += --with-zlib=/opt/csw +CONFIGURE_ARGS = $(DIRPATHS) --with-shell=$(bindir)/bash +CONFIGURE_ARGS += --with-perl=$(bindir)/perl +CONFIGURE_ARGS += --with-tcltk=$(bindir)/tclsh +CONFIGURE_ARGS += --with-zlib=$(prefix) +CONFIGURE_ARGS += --with-iconv=$(prefix) -BUILD_ARGS = MSGFMT=gmsgfmt SHELL_PATH=/opt/csw/bin/bash all doc +BUILD_ARGS = MSGFMT=gmsgfmt SHELL_PATH=/opt/csw/bin/bash \ + ETC_CONFIG=$(sysconfdir)/gitconfig \ + all doc -INSTALL_ARGS = install install-doc +INSTALL_ARGS = ETC_CONFIG=$(sysconfdir)/gitconfig install-doc include gar/category.mk @@ -55,8 +64,24 @@ # gnu must come first so xpg4/sed isn't found first. PATH := /opt/csw/gnu:/usr/xpg4/bin:$(PATH) +# force the elisp extension to be built too. +post-build-modulated: + @echo Builing Emacs Git extension + @( cd $(WORKSRC); $(MAKE) -C contrib/emacs ) + +post-install-modulated: GD=$(DESTDIR)/$(datadir)/doc/$(GARNAME)-$(GARVERSION) post-install-modulated: @echo Removing perllocal.pod - @rm -f ${DESTDIR}/opt/csw/lib/perl/5.8.8/perllocal.pod* + @rm -f ${DESTDIR}/$(perllib)/5.8.8/perllocal.pod* @chmod 644 ${DESTDIR}/${libdir}/perl5/site_perl/*pm + @echo Installing Emacs Git extension + @( cd $(WORKSRC); $(MAKE) -C contrib/emacs install \ + emacsdir=$(DESTDIR)/$(datadir)/emacs/site-lisp ) + @echo Installing Documentation + @( cd $(WORKSRC); \ + ginstall -c -m 0755 -d $(GD); \ + cp -R Documentation/*.txt $(GD)/; \ + cp -R contrib/hooks README COPYING $(GD)/; \ + cp -R Documentation/*.html Documentation/docbook-xsl.css $(GD)/; \ + cp -R Documentation/howto Documentation/technical $(GD)/; ) @$(MAKECOOKIE) Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2008-12-18 00:03:41 UTC (rev 2650) +++ csw/mgar/pkg/git/trunk/checksums 2008-12-18 01:24:49 UTC (rev 2651) @@ -1,7 +1,7 @@ 899172ebeac65f7a09a8e204d4f87d8c download/git-1.6.0.5.tar.bz2 -57d2c46660773d3a1e87651447e3252a download/CSWgit.gspec -5c5f3cd7951602129a5283c0c242ed3d download/CSWgitdoc.gspec -9ca606aeacf21b081e425a539b848567 download/CSWpmgit.gspec c5210335743e17938bde6f922891b02a download/CSWgitgui.gspec 82bc03b73b73a6f4b251992a1c671aab download/CSWgitk.gspec +9cac3cac85cac148c423d18d8b40d9ee download/CSWgitemacs.gspec +5c5f3cd7951602129a5283c0c242ed3d download/CSWgitdoc.gspec +57d2c46660773d3a1e87651447e3252a download/CSWgit.gspec 369547e8222dcf8be214b5013f28afcc download/doc-makefile.patch Added: csw/mgar/pkg/git/trunk/files/CSWgitemacs.gspec =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgitemacs.gspec (rev 0) +++ csw/mgar/pkg/git/trunk/files/CSWgitemacs.gspec 2008-12-18 01:24:49 UTC (rev 2651) @@ -0,0 +1,5 @@ +%var bitname gitemacs +%var pkgname CSWgitemacs +%var desc A Git VCS mode for Emacs +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Deleted: csw/mgar/pkg/git/trunk/files/CSWpmgit.gspec =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWpmgit.gspec 2008-12-18 00:03:41 UTC (rev 2650) +++ csw/mgar/pkg/git/trunk/files/CSWpmgit.gspec 2008-12-18 01:24:49 UTC (rev 2651) @@ -1,5 +0,0 @@ -%var bitname pm_git -%var pkgname CSWpmgit -%var desc Perl interface to Git -%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 bdwalton at users.sourceforge.net Thu Dec 18 03:13:58 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 18 Dec 2008 02:13:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[2652] csw/mgar/pkg/git/trunk Message-ID: Revision: 2652 http://gar.svn.sourceforge.net/gar/?rev=2652&view=rev Author: bdwalton Date: 2008-12-18 02:13:58 +0000 (Thu, 18 Dec 2008) Log Message: ----------- - More package splitting. - Cleaned up old package file regexes. - Still get (according to `make package` output) lib dependencies on SUNW expat and apache2...? Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile csw/mgar/pkg/git/trunk/checksums csw/mgar/pkg/git/trunk/files/CSWgitemacs.gspec csw/mgar/pkg/git/trunk/files/CSWgitgui.gspec Added Paths: ----------- csw/mgar/pkg/git/trunk/files/CSWgitcvs.gspec csw/mgar/pkg/git/trunk/files/CSWgitsvn.gspec Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2008-12-18 01:24:49 UTC (rev 2651) +++ csw/mgar/pkg/git/trunk/Makefile 2008-12-18 02:13:58 UTC (rev 2652) @@ -13,6 +13,10 @@ REQUIRED_PKGS_CSWgitgui = CSWgit CSWtk +REQUIRED_PKGS_CSWgitsvn = CSWgit CSWpmsvn + +REQUIRED_PKGS_CSWgitcvs = CSWgit CSWcvs + REQUIRED_PKGS_CSWgitdoc = CSWgit DESCRIPTION = Fast Version Control System @@ -28,15 +32,22 @@ DISTFILES += $(call admfiles,CSWgitk,) DISTFILES += $(call admfiles,CSWgitemacs,) DISTFILES += $(call admfiles,CSWgitdoc,) +DISTFILES += $(call admfiles,CSWgitsvn,) +DISTFILES += $(call admfiles,CSWgitcvs,) DISTFILES += $(call admfiles,CSWgit,) PATCHFILES = doc-makefile.patch - -PKGFILES_CSWgitgui = $(bindir)/git-gui $(bindir)/git-citool \ +PKGFILES_CSWgitsvn = $(libexecdir)/git-core/*svn $(datadir)/doc/.*svn.* \ + $(mandir)/man1/.*svn.* +PKGFILES_CSWgitcvs = $(libexecdir)/git-core/.*cvs.* $(datadir)/doc/.*cvs.* \ + $(mandir)/man1/.*cvs.* $(mandir)/man7/.*cvs.* \ + ($bindir)/.*cvs.* +PKGFILES_CSWgitgui = $(bindir)/git-gui \ $(mandir)/man1/git-gui.* $(mandir)/man1/git-citool.* \ - $(datadir)/git-gui/.* $(datadir)/doc/git-gui.* -PKGFILES_CSWgitk = $(bindir)/gitk $(datadir)/doc/gitk.* $(datadir)/gitk.* \ + $(datadir)/git-gui/.* $(datadir)/doc/.*git-gui.* \ + $(libexecdir)/git-core/git-gui.* +PKGFILES_CSWgitk = $(bindir)/gitk $(datadir)/doc/.*gitk.* $(datadir)/gitk.* \ $(mandir)/man1/gitk.* PKGFILES_CSWgitemacs = $(datadir)/emacs/.* PKGFILES_CSWgitdoc = $(datadir)/doc/.* @@ -71,9 +82,10 @@ post-install-modulated: GD=$(DESTDIR)/$(datadir)/doc/$(GARNAME)-$(GARVERSION) post-install-modulated: - @echo Removing perllocal.pod - @rm -f ${DESTDIR}/$(perllib)/5.8.8/perllocal.pod* - @chmod 644 ${DESTDIR}/${libdir}/perl5/site_perl/*pm + @echo Cleaning up perl stuff + @rm -rf $(DESTDIR)/$(libdir)/perl5/site_perl/5* + @rm -rf $(DESTDIR)/$(perllib)/ + @chmod 644 $(DESTDIR)/$(libdir)/perl5/site_perl/*pm @echo Installing Emacs Git extension @( cd $(WORKSRC); $(MAKE) -C contrib/emacs install \ emacsdir=$(DESTDIR)/$(datadir)/emacs/site-lisp ) Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2008-12-18 01:24:49 UTC (rev 2651) +++ csw/mgar/pkg/git/trunk/checksums 2008-12-18 02:13:58 UTC (rev 2652) @@ -1,7 +1,9 @@ 899172ebeac65f7a09a8e204d4f87d8c download/git-1.6.0.5.tar.bz2 -c5210335743e17938bde6f922891b02a download/CSWgitgui.gspec +61bd2360757ef9eb527763fb0947b4d8 download/CSWgitgui.gspec 82bc03b73b73a6f4b251992a1c671aab download/CSWgitk.gspec -9cac3cac85cac148c423d18d8b40d9ee download/CSWgitemacs.gspec +721e03b218e0e5116372b971838fcd31 download/CSWgitemacs.gspec 5c5f3cd7951602129a5283c0c242ed3d download/CSWgitdoc.gspec +20e88773629b851f5b986fa75f104813 download/CSWgitsvn.gspec +88464ba7e12561d3eb53e729c5a9600c download/CSWgitcvs.gspec 57d2c46660773d3a1e87651447e3252a download/CSWgit.gspec 369547e8222dcf8be214b5013f28afcc download/doc-makefile.patch Added: csw/mgar/pkg/git/trunk/files/CSWgitcvs.gspec =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgitcvs.gspec (rev 0) +++ csw/mgar/pkg/git/trunk/files/CSWgitcvs.gspec 2008-12-18 02:13:58 UTC (rev 2652) @@ -0,0 +1,5 @@ +%var bitname git_cvs +%var pkgname CSWgitcvs +%var desc Git tools for working with CVS repositories +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Modified: csw/mgar/pkg/git/trunk/files/CSWgitemacs.gspec =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgitemacs.gspec 2008-12-18 01:24:49 UTC (rev 2651) +++ csw/mgar/pkg/git/trunk/files/CSWgitemacs.gspec 2008-12-18 02:13:58 UTC (rev 2652) @@ -1,4 +1,4 @@ -%var bitname gitemacs +%var bitname git_emacs %var pkgname CSWgitemacs %var desc A Git VCS mode for Emacs %include url file://%{PKGLIB}/csw_dyndepend.gspec Modified: csw/mgar/pkg/git/trunk/files/CSWgitgui.gspec =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgitgui.gspec 2008-12-18 01:24:49 UTC (rev 2651) +++ csw/mgar/pkg/git/trunk/files/CSWgitgui.gspec 2008-12-18 02:13:58 UTC (rev 2652) @@ -1,4 +1,4 @@ -%var bitname gitgui +%var bitname git_gui %var pkgname CSWgitgui %var desc Git GUI tool %include url file://%{PKGLIB}/csw_dyndepend.gspec Added: csw/mgar/pkg/git/trunk/files/CSWgitsvn.gspec =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgitsvn.gspec (rev 0) +++ csw/mgar/pkg/git/trunk/files/CSWgitsvn.gspec 2008-12-18 02:13:58 UTC (rev 2652) @@ -0,0 +1,5 @@ +%var bitname git_svn +%var pkgname CSWgitsvn +%var desc Git tools for working with Subversion repositories +%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 bonivart at users.sourceforge.net Thu Dec 18 10:00:50 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 18 Dec 2008 09:00:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[2653] csw/mgar/pkg/cpan/Module-Load-Conditional/trunk Message-ID: Revision: 2653 http://gar.svn.sourceforge.net/gar/?rev=2653&view=rev Author: bonivart Date: 2008-12-18 09:00:50 +0000 (Thu, 18 Dec 2008) Log Message: ----------- Module-Load-Conditional: update to 0.28 Modified Paths: -------------- csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/checksums Modified: csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile 2008-12-18 02:13:58 UTC (rev 2652) +++ csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile 2008-12-18 09:00:50 UTC (rev 2653) @@ -1,5 +1,5 @@ GARNAME = Module-Load-Conditional -GARVERSION = 0.26 +GARVERSION = 0.28 CATEGORIES = cpan AUTHOR = KANE Modified: csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/checksums 2008-12-18 02:13:58 UTC (rev 2652) +++ csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/checksums 2008-12-18 09:00:50 UTC (rev 2653) @@ -1,2 +1,2 @@ e912706042be78943b1af9a349378bbd download/CSWpmmodloadcond.gspec -cc80e455e996fa2fbd6933283c3947ef download/Module-Load-Conditional-0.26.tar.gz +e4924b9903482aa88a1240cea9760aa8 download/Module-Load-Conditional-0.28.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Dec 18 10:27:24 2008 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 18 Dec 2008 09:27:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[2654] csw/mgar/pkg Message-ID: Revision: 2654 http://gar.svn.sourceforge.net/gar/?rev=2654&view=rev Author: skayser Date: 2008-12-18 09:27:24 +0000 (Thu, 18 Dec 2008) Log Message: ----------- mbuffer: Initial commit Added Paths: ----------- csw/mgar/pkg/mbuffer/ csw/mgar/pkg/mbuffer/branches/ csw/mgar/pkg/mbuffer/tags/ csw/mgar/pkg/mbuffer/trunk/ csw/mgar/pkg/mbuffer/trunk/Makefile csw/mgar/pkg/mbuffer/trunk/checksums csw/mgar/pkg/mbuffer/trunk/files/ csw/mgar/pkg/mbuffer/trunk/files/CSWpackage.gspec Property changes on: csw/mgar/pkg/mbuffer/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/mbuffer/trunk/Makefile =================================================================== --- csw/mgar/pkg/mbuffer/trunk/Makefile (rev 0) +++ csw/mgar/pkg/mbuffer/trunk/Makefile 2008-12-18 09:27:24 UTC (rev 2654) @@ -0,0 +1,32 @@ +GARNAME = mbuffer +GARVERSION = 20081207 +CATEGORIES = utils + +DESCRIPTION = A tool for buffering data streams +define BLURB + mbuffer is a tool for buffering data streams. Its special feature is to show + the I/O rate and summary to the user. It is especially useful, if you are + writing backups to fast tape drives or libraries. Those drives tend to stop + and rewind if they have a buffer underrun. This so called tape screwing + reduces the lifetime of the motors. mbuffer can prevent buffer underruns, + if used correctly and speed up the whole backup process. +endef + +MASTER_SITES = http://www.maier-komor.de/software/mbuffer/ +DISTFILES = $(GARNAME)-$(GARVERSION).tgz +DISTFILES += $(call admfiles,CSWpackage,) + +# We define upstream file regex so we can be notifed of new upstream software +# release +UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, +# then uncomment the next line. Otherwise it is set by default to the +# value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/mbuffer/trunk/checksums =================================================================== --- csw/mgar/pkg/mbuffer/trunk/checksums (rev 0) +++ csw/mgar/pkg/mbuffer/trunk/checksums 2008-12-18 09:27:24 UTC (rev 2654) @@ -0,0 +1,2 @@ +640dab1531246f4e93ba5f0ccccff65b download/mbuffer-20081207.tgz +6607910097dc7478838eed424c4ef45e download/CSWpackage.gspec Added: csw/mgar/pkg/mbuffer/trunk/files/CSWpackage.gspec =================================================================== --- csw/mgar/pkg/mbuffer/trunk/files/CSWpackage.gspec (rev 0) +++ csw/mgar/pkg/mbuffer/trunk/files/CSWpackage.gspec 2008-12-18 09:27:24 UTC (rev 2654) @@ -0,0 +1,4 @@ +%var bitname mbuffer +%var pkgname CSWmbuffer +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKSRC}/LICENSE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Dec 18 11:18:50 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 18 Dec 2008 10:18:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[2655] csw/mgar/pkg/clamav/trunk Message-ID: Revision: 2655 http://gar.svn.sourceforge.net/gar/?rev=2655&view=rev Author: bonivart Date: 2008-12-18 10:18:50 +0000 (Thu, 18 Dec 2008) Log Message: ----------- clamav: fix conf files Modified Paths: -------------- csw/mgar/pkg/clamav/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/clamav/trunk/files/CSWclamav.clamd.conf.p csw/mgar/pkg/clamav/trunk/files/CSWclamav.freshclam.conf.p Modified: csw/mgar/pkg/clamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamav/trunk/Makefile 2008-12-18 09:27:24 UTC (rev 2654) +++ csw/mgar/pkg/clamav/trunk/Makefile 2008-12-18 10:18:50 UTC (rev 2655) @@ -52,6 +52,8 @@ SPKG_SOURCEURL = http://www.clamav.net/ +ENABLE_CHECK=0 + include gar/category.mk DOCS = AUTHORS BUGS ChangeLog @@ -68,7 +70,11 @@ @ginstall -d $(DESTDIR)/etc/opt/csw/init.d @ginstall -m 755 $(FILEDIR)/CSWclamav.cswclamd $(DESTDIR)/etc/opt/csw/init.d/cswclamd @ginstall -m 755 $(FILEDIR)/CSWclamav.cswclamav-milter $(DESTDIR)/etc/opt/csw/init.d/cswclamav-milter + @( cd $(DESTDIR)$(sysconfdir) ; \ + gpatch < ../../../../../$(FILEDIR)/CSWclamav.clamd.conf.p ) @mv $(DESTDIR)$(sysconfdir)/clamd.conf $(DESTDIR)$(sysconfdir)/clamd.conf.CSW + @( cd $(DESTDIR)$(sysconfdir) ; \ + gpatch < ../../../../../$(FILEDIR)/CSWclamav.freshclam.conf.p ) @mv $(DESTDIR)$(sysconfdir)/freshclam.conf $(DESTDIR)$(sysconfdir)/freshclam.conf.CSW @ginstall -d $(DOCDEST) @$(foreach DOC,$(DOCS),ginstall -m 644 $(WORKSRC)/$(DOC) $(DOCDEST);) Added: csw/mgar/pkg/clamav/trunk/files/CSWclamav.clamd.conf.p =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWclamav.clamd.conf.p (rev 0) +++ csw/mgar/pkg/clamav/trunk/files/CSWclamav.clamd.conf.p 2008-12-18 10:18:50 UTC (rev 2655) @@ -0,0 +1,11 @@ +--- clamd.conf 2008-12-18 10:50:45.033181389 +0100 ++++ clamd.conf 2008-12-18 10:46:07.995146244 +0100 +@@ -5,7 +5,7 @@ + + + # Comment or remove the line below. +-Example ++#Example + + # Uncomment this option to enable logging. + # LogFile must be writable for the user running daemon. Added: csw/mgar/pkg/clamav/trunk/files/CSWclamav.freshclam.conf.p =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWclamav.freshclam.conf.p (rev 0) +++ csw/mgar/pkg/clamav/trunk/files/CSWclamav.freshclam.conf.p 2008-12-18 10:18:50 UTC (rev 2655) @@ -0,0 +1,11 @@ +--- freshclam.conf 2008-12-18 10:50:48.949505178 +0100 ++++ freshclam.conf 2008-12-18 10:46:14.856162590 +0100 +@@ -5,7 +5,7 @@ + + + # Comment or remove the line below. +-Example ++#Example + + # Path to the database directory. + # WARNING: It must match clamd.conf's directive! This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Dec 18 13:55:57 2008 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 18 Dec 2008 12:55:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[2656] csw/mgar/pkg/mbuffer/trunk Message-ID: Revision: 2656 http://gar.svn.sourceforge.net/gar/?rev=2656&view=rev Author: skayser Date: 2008-12-18 12:55:57 +0000 (Thu, 18 Dec 2008) Log Message: ----------- mbuffer: reverted to gar v1 Modified Paths: -------------- csw/mgar/pkg/mbuffer/trunk/Makefile csw/mgar/pkg/mbuffer/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/mbuffer/trunk/ Property changes on: csw/mgar/pkg/mbuffer/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 Modified: csw/mgar/pkg/mbuffer/trunk/Makefile =================================================================== --- csw/mgar/pkg/mbuffer/trunk/Makefile 2008-12-18 10:18:50 UTC (rev 2655) +++ csw/mgar/pkg/mbuffer/trunk/Makefile 2008-12-18 12:55:57 UTC (rev 2656) @@ -16,6 +16,8 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tgz DISTFILES += $(call admfiles,CSWpackage,) +REQUIRED_PKGS = CSWosslrt + # We define upstream file regex so we can be notifed of new upstream software # release UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz @@ -27,6 +29,11 @@ CONFIGURE_ARGS = $(DIRPATHS) -TEST_TARGET = check +include gar/category.mk -include gar/category.mk +DOCS = ChangeLog README AUTHORS +DOCDEST = $(DESTDIR)$(docdir)/$(GARNAME) + +post-install: + @ginstall -d $(DOCDEST) + @$(foreach DOC,$(DOCS),ginstall -m 644 $(WORKSRC)/$(DOC) $(DOCDEST);) Modified: csw/mgar/pkg/mbuffer/trunk/checksums =================================================================== --- csw/mgar/pkg/mbuffer/trunk/checksums 2008-12-18 10:18:50 UTC (rev 2655) +++ csw/mgar/pkg/mbuffer/trunk/checksums 2008-12-18 12:55:57 UTC (rev 2656) @@ -1,2 +1,2 @@ 640dab1531246f4e93ba5f0ccccff65b download/mbuffer-20081207.tgz -6607910097dc7478838eed424c4ef45e download/CSWpackage.gspec +ee84b171939ddb3f60a49b5989626000 download/CSWpackage.gspec This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Dec 18 14:15:26 2008 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 18 Dec 2008 13:15:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[2657] csw/mgar/pkg/mbuffer/trunk Message-ID: Revision: 2657 http://gar.svn.sourceforge.net/gar/?rev=2657&view=rev Author: skayser Date: 2008-12-18 13:15:26 +0000 (Thu, 18 Dec 2008) Log Message: ----------- mbuffer: minor fixes Modified Paths: -------------- csw/mgar/pkg/mbuffer/trunk/Makefile csw/mgar/pkg/mbuffer/trunk/checksums Modified: csw/mgar/pkg/mbuffer/trunk/Makefile =================================================================== --- csw/mgar/pkg/mbuffer/trunk/Makefile 2008-12-18 12:55:57 UTC (rev 2656) +++ csw/mgar/pkg/mbuffer/trunk/Makefile 2008-12-18 13:15:26 UTC (rev 2657) @@ -29,6 +29,8 @@ CONFIGURE_ARGS = $(DIRPATHS) +TEST_TARGET = check + include gar/category.mk DOCS = ChangeLog README AUTHORS Modified: csw/mgar/pkg/mbuffer/trunk/checksums =================================================================== --- csw/mgar/pkg/mbuffer/trunk/checksums 2008-12-18 12:55:57 UTC (rev 2656) +++ csw/mgar/pkg/mbuffer/trunk/checksums 2008-12-18 13:15:26 UTC (rev 2657) @@ -1,2 +1,2 @@ 640dab1531246f4e93ba5f0ccccff65b download/mbuffer-20081207.tgz -ee84b171939ddb3f60a49b5989626000 download/CSWpackage.gspec +6607910097dc7478838eed424c4ef45e download/CSWpackage.gspec This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Dec 18 15:47:00 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 18 Dec 2008 14:47:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[2658] csw/mgar/pkg/clamav/trunk/Makefile Message-ID: Revision: 2658 http://gar.svn.sourceforge.net/gar/?rev=2658&view=rev Author: bonivart Date: 2008-12-18 14:46:59 +0000 (Thu, 18 Dec 2008) Log Message: ----------- clamav: edit classes Modified Paths: -------------- csw/mgar/pkg/clamav/trunk/Makefile Modified: csw/mgar/pkg/clamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamav/trunk/Makefile 2008-12-18 13:15:26 UTC (rev 2657) +++ csw/mgar/pkg/clamav/trunk/Makefile 2008-12-18 14:46:59 UTC (rev 2658) @@ -31,7 +31,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -SPKG_CLASSES = none cswcpsampleconf cswinitsmf +SPKG_CLASSES_CSWclamav = none cswcpsampleconf cswinitsmf CFLAGS=-xO2 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 Dec 18 16:57:42 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 18 Dec 2008 15:57:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[2659] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 2659 http://gar.svn.sourceforge.net/gar/?rev=2659&view=rev Author: bdwalton Date: 2008-12-18 15:57:42 +0000 (Thu, 18 Dec 2008) Log Message: ----------- fixed a few of the package split rules. Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2008-12-18 14:46:59 UTC (rev 2658) +++ csw/mgar/pkg/git/trunk/Makefile 2008-12-18 15:57:42 UTC (rev 2659) @@ -42,11 +42,11 @@ $(mandir)/man1/.*svn.* PKGFILES_CSWgitcvs = $(libexecdir)/git-core/.*cvs.* $(datadir)/doc/.*cvs.* \ $(mandir)/man1/.*cvs.* $(mandir)/man7/.*cvs.* \ - ($bindir)/.*cvs.* + $(bindir)/.*cvs.* PKGFILES_CSWgitgui = $(bindir)/git-gui \ - $(mandir)/man1/git-gui.* $(mandir)/man1/git-citool.* \ + $(mandir)/.*git-gui.* $(mandir)/.*git-citool.* \ $(datadir)/git-gui/.* $(datadir)/doc/.*git-gui.* \ - $(libexecdir)/git-core/git-gui.* + $(libexecdir)/.*git-gui.* $(libexecdir)/.*git-citool PKGFILES_CSWgitk = $(bindir)/gitk $(datadir)/doc/.*gitk.* $(datadir)/gitk.* \ $(mandir)/man1/gitk.* PKGFILES_CSWgitemacs = $(datadir)/emacs/.* 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 Dec 18 17:41:27 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 18 Dec 2008 16:41:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[2660] csw/mgar/pkg/git/trunk Message-ID: Revision: 2660 http://gar.svn.sourceforge.net/gar/?rev=2660&view=rev Author: bdwalton Date: 2008-12-18 16:41:24 +0000 (Thu, 18 Dec 2008) Log Message: ----------- rename gitdoc -> git_doc for better readability Modified Paths: -------------- csw/mgar/pkg/git/trunk/checksums csw/mgar/pkg/git/trunk/files/CSWgitdoc.gspec Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2008-12-18 15:57:42 UTC (rev 2659) +++ csw/mgar/pkg/git/trunk/checksums 2008-12-18 16:41:24 UTC (rev 2660) @@ -2,7 +2,7 @@ 61bd2360757ef9eb527763fb0947b4d8 download/CSWgitgui.gspec 82bc03b73b73a6f4b251992a1c671aab download/CSWgitk.gspec 721e03b218e0e5116372b971838fcd31 download/CSWgitemacs.gspec -5c5f3cd7951602129a5283c0c242ed3d download/CSWgitdoc.gspec +5130143dc4cdba927534852fdd39d7c5 download/CSWgitdoc.gspec 20e88773629b851f5b986fa75f104813 download/CSWgitsvn.gspec 88464ba7e12561d3eb53e729c5a9600c download/CSWgitcvs.gspec 57d2c46660773d3a1e87651447e3252a download/CSWgit.gspec Modified: csw/mgar/pkg/git/trunk/files/CSWgitdoc.gspec =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgitdoc.gspec 2008-12-18 15:57:42 UTC (rev 2659) +++ csw/mgar/pkg/git/trunk/files/CSWgitdoc.gspec 2008-12-18 16:41:24 UTC (rev 2660) @@ -1,4 +1,4 @@ -%var bitname gitdoc +%var bitname git_doc %var pkgname CSWgitdoc %var desc Documentation for Git %include url file://%{PKGLIB}/csw_dyndepend.gspec 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 Dec 18 22:07:42 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 18 Dec 2008 21:07:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[2661] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 2661 http://gar.svn.sourceforge.net/gar/?rev=2661&view=rev Author: bdwalton Date: 2008-12-18 21:07:42 +0000 (Thu, 18 Dec 2008) Log Message: ----------- clean up prereqs; s/tclsh/wish/ so that gitk (and likely git-gui) actually works Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2008-12-18 16:41:24 UTC (rev 2660) +++ csw/mgar/pkg/git/trunk/Makefile 2008-12-18 21:07:42 UTC (rev 2661) @@ -3,8 +3,8 @@ CATEGORIES = devel PREREQUISITE_PKGS = CSWasciidoc CSWossldevel CSWxmlto CSWbash CSWcurl -PREREQUISITE_PKGS += CSWgsed CSWgnulinks CSWperl CSWtcl CSWtk CSWexpat -PREREQUISITE_PKGS += CSWzlib CSWpmerror CSWpmsvn +PREREQUISITE_PKGS += CSWgsed CSWgnulinks CSWperl CSWtk CSWexpat +PREREQUISITE_PKGS += CSWzlib CSWpmerror CSWpmsvn CSWcvs REQUIRED_PKGS_CSWgit = CSWzlib CSWperl CSWrsync CSWcurlrt CSWosslrt REQUIRED_PKGS_CSWgit += CSWossh CSWiconv CSWexpat CSWbash @@ -59,7 +59,7 @@ CONFIGURE_ARGS = $(DIRPATHS) --with-shell=$(bindir)/bash CONFIGURE_ARGS += --with-perl=$(bindir)/perl -CONFIGURE_ARGS += --with-tcltk=$(bindir)/tclsh +CONFIGURE_ARGS += --with-tcltk=$(bindir)/wish CONFIGURE_ARGS += --with-zlib=$(prefix) CONFIGURE_ARGS += --with-iconv=$(prefix) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 18 22:24:10 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 18 Dec 2008 21:24:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[2662] csw/mgar/pkg/expat/trunk/Makefile Message-ID: Revision: 2662 http://gar.svn.sourceforge.net/gar/?rev=2662&view=rev Author: wbonnet Date: 2008-12-18 21:24:09 +0000 (Thu, 18 Dec 2008) Log Message: ----------- fix UFILE_REGEXP Modified Paths: -------------- csw/mgar/pkg/expat/trunk/Makefile Modified: csw/mgar/pkg/expat/trunk/Makefile =================================================================== --- csw/mgar/pkg/expat/trunk/Makefile 2008-12-18 21:07:42 UTC (rev 2661) +++ csw/mgar/pkg/expat/trunk/Makefile 2008-12-18 21:24:09 UTC (rev 2662) @@ -15,7 +15,9 @@ DISTFILES += $(call admfiles,CSWexpat-devel,depend prototype) # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=10127 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = (\d+(?:\.\d+)*) # Compatibility libraries EXTLIBS += libexpat.so.0.4.0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 18 22:53:08 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 18 Dec 2008 21:53:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[2663] csw/mgar/pkg/freeciv/trunk/Makefile Message-ID: Revision: 2663 http://gar.svn.sourceforge.net/gar/?rev=2663&view=rev Author: wbonnet Date: 2008-12-18 21:53:07 +0000 (Thu, 18 Dec 2008) Log Message: ----------- Fix UFILE_REGEX Modified Paths: -------------- csw/mgar/pkg/freeciv/trunk/Makefile Modified: csw/mgar/pkg/freeciv/trunk/Makefile =================================================================== --- csw/mgar/pkg/freeciv/trunk/Makefile 2008-12-18 21:24:09 UTC (rev 2662) +++ csw/mgar/pkg/freeciv/trunk/Makefile 2008-12-18 21:53:07 UTC (rev 2663) @@ -12,7 +12,9 @@ DISTFILES += $(call admfiles,CSWfreeciv, depend prototype ) # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=138322 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = (\d+(?:\.\d+)*) GARCOMPILER = GNU This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 18 22:56:13 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 18 Dec 2008 21:56:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[2664] csw/mgar/pkg/freetype/trunk/Makefile Message-ID: Revision: 2664 http://gar.svn.sourceforge.net/gar/?rev=2664&view=rev Author: wbonnet Date: 2008-12-18 21:56:13 +0000 (Thu, 18 Dec 2008) Log Message: ----------- Fix UFILE_REGEX Modified Paths: -------------- csw/mgar/pkg/freetype/trunk/Makefile Modified: csw/mgar/pkg/freetype/trunk/Makefile =================================================================== --- csw/mgar/pkg/freetype/trunk/Makefile 2008-12-18 21:53:07 UTC (rev 2663) +++ csw/mgar/pkg/freetype/trunk/Makefile 2008-12-18 21:56:13 UTC (rev 2664) @@ -18,7 +18,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=3157 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = (\d+(?:\.\d+)*) CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 18 22:59:02 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 18 Dec 2008 21:59:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[2665] csw/mgar/pkg/gaim/trunk/Makefile Message-ID: Revision: 2665 http://gar.svn.sourceforge.net/gar/?rev=2665&view=rev Author: wbonnet Date: 2008-12-18 21:59:02 +0000 (Thu, 18 Dec 2008) Log Message: ----------- Fix UFILE_REGEX Modified Paths: -------------- csw/mgar/pkg/gaim/trunk/Makefile Modified: csw/mgar/pkg/gaim/trunk/Makefile =================================================================== --- csw/mgar/pkg/gaim/trunk/Makefile 2008-12-18 21:56:13 UTC (rev 2664) +++ csw/mgar/pkg/gaim/trunk/Makefile 2008-12-18 21:59:02 UTC (rev 2665) @@ -15,7 +15,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=3157 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = (\d+(?:\.\d+)*) ifneq ($(BUILD_XDEPS),0) LIBDEPS = lib/libao This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 18 23:00:22 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 18 Dec 2008 22:00:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[2666] csw/mgar/pkg/ganglia/trunk/Makefile Message-ID: Revision: 2666 http://gar.svn.sourceforge.net/gar/?rev=2666&view=rev Author: wbonnet Date: 2008-12-18 22:00:21 +0000 (Thu, 18 Dec 2008) Log Message: ----------- Fix UFILE_REGEX Modified Paths: -------------- csw/mgar/pkg/ganglia/trunk/Makefile Modified: csw/mgar/pkg/ganglia/trunk/Makefile =================================================================== --- csw/mgar/pkg/ganglia/trunk/Makefile 2008-12-18 21:59:02 UTC (rev 2665) +++ csw/mgar/pkg/ganglia/trunk/Makefile 2008-12-18 22:00:21 UTC (rev 2666) @@ -15,7 +15,9 @@ DISTFILES += $(call admfiles,CSWpackage,) # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=43021 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = (\d+(?:\.\d+)*) # This is attachment #45 from Ganglia bug # http://bugzilla.ganglia.info/cgi-bin/bugzilla/show_bug.cgi?id=77 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 Dec 19 03:49:13 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 19 Dec 2008 02:49:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[2667] csw/mgar/pkg/git/trunk/files Message-ID: Revision: 2667 http://gar.svn.sourceforge.net/gar/?rev=2667&view=rev Author: bdwalton Date: 2008-12-19 02:49:13 +0000 (Fri, 19 Dec 2008) Log Message: ----------- set arch=all on subpackges that don't have any binary files Modified Paths: -------------- csw/mgar/pkg/git/trunk/files/CSWgitcvs.gspec csw/mgar/pkg/git/trunk/files/CSWgitdoc.gspec csw/mgar/pkg/git/trunk/files/CSWgitemacs.gspec csw/mgar/pkg/git/trunk/files/CSWgitgui.gspec csw/mgar/pkg/git/trunk/files/CSWgitk.gspec csw/mgar/pkg/git/trunk/files/CSWgitsvn.gspec Modified: csw/mgar/pkg/git/trunk/files/CSWgitcvs.gspec =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgitcvs.gspec 2008-12-18 22:00:21 UTC (rev 2666) +++ csw/mgar/pkg/git/trunk/files/CSWgitcvs.gspec 2008-12-19 02:49:13 UTC (rev 2667) @@ -1,5 +1,6 @@ %var bitname git_cvs %var pkgname CSWgitcvs %var desc Git tools for working with CVS repositories +%var arch all %include url file://%{PKGLIB}/csw_dyndepend.gspec %copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Modified: csw/mgar/pkg/git/trunk/files/CSWgitdoc.gspec =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgitdoc.gspec 2008-12-18 22:00:21 UTC (rev 2666) +++ csw/mgar/pkg/git/trunk/files/CSWgitdoc.gspec 2008-12-19 02:49:13 UTC (rev 2667) @@ -1,5 +1,6 @@ %var bitname git_doc %var pkgname CSWgitdoc %var desc Documentation for Git +%var arch all %include url file://%{PKGLIB}/csw_dyndepend.gspec %copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Modified: csw/mgar/pkg/git/trunk/files/CSWgitemacs.gspec =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgitemacs.gspec 2008-12-18 22:00:21 UTC (rev 2666) +++ csw/mgar/pkg/git/trunk/files/CSWgitemacs.gspec 2008-12-19 02:49:13 UTC (rev 2667) @@ -1,5 +1,6 @@ %var bitname git_emacs %var pkgname CSWgitemacs %var desc A Git VCS mode for Emacs +%var arch all %include url file://%{PKGLIB}/csw_dyndepend.gspec %copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Modified: csw/mgar/pkg/git/trunk/files/CSWgitgui.gspec =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgitgui.gspec 2008-12-18 22:00:21 UTC (rev 2666) +++ csw/mgar/pkg/git/trunk/files/CSWgitgui.gspec 2008-12-19 02:49:13 UTC (rev 2667) @@ -1,5 +1,6 @@ %var bitname git_gui %var pkgname CSWgitgui %var desc Git GUI tool +%var arch all %include url file://%{PKGLIB}/csw_dyndepend.gspec %copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Modified: csw/mgar/pkg/git/trunk/files/CSWgitk.gspec =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgitk.gspec 2008-12-18 22:00:21 UTC (rev 2666) +++ csw/mgar/pkg/git/trunk/files/CSWgitk.gspec 2008-12-19 02:49:13 UTC (rev 2667) @@ -1,5 +1,6 @@ %var bitname gitk %var pkgname CSWgitk %var desc Git revision tree visualiser +%var arch all %include url file://%{PKGLIB}/csw_dyndepend.gspec %copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Modified: csw/mgar/pkg/git/trunk/files/CSWgitsvn.gspec =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgitsvn.gspec 2008-12-18 22:00:21 UTC (rev 2666) +++ csw/mgar/pkg/git/trunk/files/CSWgitsvn.gspec 2008-12-19 02:49:13 UTC (rev 2667) @@ -1,5 +1,6 @@ %var bitname git_svn %var pkgname CSWgitsvn %var desc Git tools for working with Subversion repositories +%var arch all %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 bdwalton at users.sourceforge.net Fri Dec 19 03:51:10 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 19 Dec 2008 02:51:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[2668] csw/mgar/pkg/git/trunk/checksums Message-ID: Revision: 2668 http://gar.svn.sourceforge.net/gar/?rev=2668&view=rev Author: bdwalton Date: 2008-12-19 02:51:10 +0000 (Fri, 19 Dec 2008) Log Message: ----------- checksums to match updated arch in gspec files Modified Paths: -------------- csw/mgar/pkg/git/trunk/checksums Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2008-12-19 02:49:13 UTC (rev 2667) +++ csw/mgar/pkg/git/trunk/checksums 2008-12-19 02:51:10 UTC (rev 2668) @@ -1,9 +1,8 @@ 899172ebeac65f7a09a8e204d4f87d8c download/git-1.6.0.5.tar.bz2 -61bd2360757ef9eb527763fb0947b4d8 download/CSWgitgui.gspec -82bc03b73b73a6f4b251992a1c671aab download/CSWgitk.gspec -721e03b218e0e5116372b971838fcd31 download/CSWgitemacs.gspec -5130143dc4cdba927534852fdd39d7c5 download/CSWgitdoc.gspec -20e88773629b851f5b986fa75f104813 download/CSWgitsvn.gspec -88464ba7e12561d3eb53e729c5a9600c download/CSWgitcvs.gspec +2ad395619c97ef714738778be9132e6e download/CSWgitgui.gspec +2dfce68b5746df8dfe8da8941f0d757b download/CSWgitk.gspec +393d10b23a1ecb60f91bdc5f2d12a75d download/CSWgitemacs.gspec +01901aa2ffdf51c89d5b7ffc28dc9cfc download/CSWgitcvs.gspec +15faf599c27b35aad91a0af518831b29 download/CSWgitdoc.gspec 57d2c46660773d3a1e87651447e3252a download/CSWgit.gspec 369547e8222dcf8be214b5013f28afcc download/doc-makefile.patch 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 Dec 19 03:55:24 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 19 Dec 2008 02:55:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[2669] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 2669 http://gar.svn.sourceforge.net/gar/?rev=2669&view=rev Author: bdwalton Date: 2008-12-19 02:55:24 +0000 (Fri, 19 Dec 2008) Log Message: ----------- simplified the PKGFILES_ definitions; git-svn still ends up in CSWgit for some reason. Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2008-12-19 02:51:10 UTC (rev 2668) +++ csw/mgar/pkg/git/trunk/Makefile 2008-12-19 02:55:24 UTC (rev 2669) @@ -27,29 +27,22 @@ endef MASTER_SITES = http://kernel.org/pub/software/scm/$(GARNAME)/ +DISTFILES += $(call admfiles,CSWgitsvn,) DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWgitgui,) DISTFILES += $(call admfiles,CSWgitk,) DISTFILES += $(call admfiles,CSWgitemacs,) -DISTFILES += $(call admfiles,CSWgitdoc,) -DISTFILES += $(call admfiles,CSWgitsvn,) DISTFILES += $(call admfiles,CSWgitcvs,) +DISTFILES += $(call admfiles,CSWgitdoc,) DISTFILES += $(call admfiles,CSWgit,) PATCHFILES = doc-makefile.patch -PKGFILES_CSWgitsvn = $(libexecdir)/git-core/*svn $(datadir)/doc/.*svn.* \ - $(mandir)/man1/.*svn.* -PKGFILES_CSWgitcvs = $(libexecdir)/git-core/.*cvs.* $(datadir)/doc/.*cvs.* \ - $(mandir)/man1/.*cvs.* $(mandir)/man7/.*cvs.* \ - $(bindir)/.*cvs.* -PKGFILES_CSWgitgui = $(bindir)/git-gui \ - $(mandir)/.*git-gui.* $(mandir)/.*git-citool.* \ - $(datadir)/git-gui/.* $(datadir)/doc/.*git-gui.* \ - $(libexecdir)/.*git-gui.* $(libexecdir)/.*git-citool -PKGFILES_CSWgitk = $(bindir)/gitk $(datadir)/doc/.*gitk.* $(datadir)/gitk.* \ - $(mandir)/man1/gitk.* -PKGFILES_CSWgitemacs = $(datadir)/emacs/.* +PKGFILES_CSWgitsvn = .*svn.* +PKGFILES_CSWgitgui = .*git-gui.* .*git-citool.* +PKGFILES_CSWgitk = .*gitk.* +PKGFILES_CSWgitemacs = .*emacs.* +PKGFILES_CSWgitcvs = .*cvs.* PKGFILES_CSWgitdoc = $(datadir)/doc/.* # We define upstream file regex so we can be notifed of new upstream software release This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Fri Dec 19 07:13:19 2008 From: dam at opencsw.org (Dagobert Michelsen) Date: Fri, 19 Dec 2008 07:13:19 +0100 Subject: [csw-devel] SF.net SVN: gar:[2669] csw/mgar/pkg/git/trunk/Makefile In-Reply-To: References: Message-ID: Hi Ben, Am 19.12.2008 um 03:55 schrieb bdwalton at users.sourceforge.net: > Revision: 2669 > http://gar.svn.sourceforge.net/gar/?rev=2669&view=rev > Author: bdwalton > Date: 2008-12-19 02:55:24 +0000 (Fri, 19 Dec 2008) > > Log Message: > ----------- > simplified the PKGFILES_ definitions; git-svn still ends up in > CSWgit for some reason. > > Modified Paths: > -------------- > csw/mgar/pkg/git/trunk/Makefile > > Modified: csw/mgar/pkg/git/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/git/trunk/Makefile 2008-12-19 02:51:10 UTC (rev 2668) > +++ csw/mgar/pkg/git/trunk/Makefile 2008-12-19 02:55:24 UTC (rev 2669) > @@ -27,29 +27,22 @@ > endef > > MASTER_SITES = http://kernel.org/pub/software/scm/$(GARNAME)/ > +DISTFILES += $(call admfiles,CSWgitsvn,) > DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 ?h, you set DISTFILES to CSWgitsvn and then ovewrite it (missing +=?) Best regards -- Dago > > DISTFILES += $(call admfiles,CSWgitgui,) > DISTFILES += $(call admfiles,CSWgitk,) > DISTFILES += $(call admfiles,CSWgitemacs,) > -DISTFILES += $(call admfiles,CSWgitdoc,) > -DISTFILES += $(call admfiles,CSWgitsvn,) > DISTFILES += $(call admfiles,CSWgitcvs,) > +DISTFILES += $(call admfiles,CSWgitdoc,) > DISTFILES += $(call admfiles,CSWgit,) > > PATCHFILES = doc-makefile.patch > > -PKGFILES_CSWgitsvn = $(libexecdir)/git-core/*svn $(datadir)/ > doc/.*svn.* \ > - $(mandir)/man1/.*svn.* > -PKGFILES_CSWgitcvs = $(libexecdir)/git-core/.*cvs.* $(datadir)/ > doc/.*cvs.* \ > - $(mandir)/man1/.*cvs.* $(mandir)/man7/.*cvs.* \ > - $(bindir)/.*cvs.* > -PKGFILES_CSWgitgui = $(bindir)/git-gui \ > - $(mandir)/.*git-gui.* $(mandir)/.*git-citool.* \ > - $(datadir)/git-gui/.* $(datadir)/doc/.*git-gui.* \ > - $(libexecdir)/.*git-gui.* $(libexecdir)/.*git-citool > -PKGFILES_CSWgitk = $(bindir)/gitk $(datadir)/doc/.*gitk.* $ > (datadir)/gitk.* \ > - $(mandir)/man1/gitk.* > -PKGFILES_CSWgitemacs = $(datadir)/emacs/.* > +PKGFILES_CSWgitsvn = .*svn.* > +PKGFILES_CSWgitgui = .*git-gui.* .*git-citool.* > +PKGFILES_CSWgitk = .*gitk.* > +PKGFILES_CSWgitemacs = .*emacs.* > +PKGFILES_CSWgitcvs = .*cvs.* > PKGFILES_CSWgitdoc = $(datadir)/doc/.* > > # We define upstream file regex so we can be notifed of new upstream > software release > > > 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 bwalton at opencsw.org Fri Dec 19 13:31:53 2008 From: bwalton at opencsw.org (Ben Walton) Date: Fri, 19 Dec 2008 07:31:53 -0500 Subject: [csw-devel] SF.net SVN: gar:[2669] csw/mgar/pkg/git/trunk/Makefile In-Reply-To: References: Message-ID: <1229689776-sup-1547@ntdws12.chass.utoronto.ca> Excerpts from Dagobert Michelsen's message of Fri Dec 19 01:13:19 -0500 2008: Hi Dago, > ?h, you set DISTFILES to CSWgitsvn and then ovewrite it > (missing +=?) That is kind of silly isn't it! :) I was rearranging lines thinking that something to do with the ordering of the gspec files in the list was breaking my PKGFILES_ regex globs below (eg: picking their files in the wrong order). I later discovered that I simply wasn't squishing the old prototype files...this likely explains why I didn't notice this breakage too! :) As always, thanks! -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 GPG Key Id: 8E89F6D2; Key Server: pgp.mit.edu Contact me to arrange for a CAcert assurance meeting. -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 189 bytes Desc: not available Url : http://lists.opencsw.org/pipermail/devel/attachments/20081219/413a42bb/attachment.asc From bdwalton at users.sourceforge.net Fri Dec 19 13:33:26 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 19 Dec 2008 12:33:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[2670] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 2670 http://gar.svn.sourceforge.net/gar/?rev=2670&view=rev Author: bdwalton Date: 2008-12-19 12:33:26 +0000 (Fri, 19 Dec 2008) Log Message: ----------- corrected ordering mistake Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2008-12-19 02:55:24 UTC (rev 2669) +++ csw/mgar/pkg/git/trunk/Makefile 2008-12-19 12:33:26 UTC (rev 2670) @@ -27,8 +27,8 @@ endef MASTER_SITES = http://kernel.org/pub/software/scm/$(GARNAME)/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWgitsvn,) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWgitgui,) DISTFILES += $(call admfiles,CSWgitk,) DISTFILES += $(call admfiles,CSWgitemacs,) 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 Dec 19 13:40:57 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 19 Dec 2008 12:40:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[2671] csw/mgar/pkg/git/trunk/checksums Message-ID: Revision: 2671 http://gar.svn.sourceforge.net/gar/?rev=2671&view=rev Author: bdwalton Date: 2008-12-19 12:40:56 +0000 (Fri, 19 Dec 2008) Log Message: ----------- updated makesums to reinclude missing .gspec Modified Paths: -------------- csw/mgar/pkg/git/trunk/checksums Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2008-12-19 12:33:26 UTC (rev 2670) +++ csw/mgar/pkg/git/trunk/checksums 2008-12-19 12:40:56 UTC (rev 2671) @@ -1,4 +1,5 @@ 899172ebeac65f7a09a8e204d4f87d8c download/git-1.6.0.5.tar.bz2 +e2124d3e47454df813a2085a7a85597e download/CSWgitsvn.gspec 2ad395619c97ef714738778be9132e6e download/CSWgitgui.gspec 2dfce68b5746df8dfe8da8941f0d757b download/CSWgitk.gspec 393d10b23a1ecb60f91bdc5f2d12a75d download/CSWgitemacs.gspec 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 Dec 19 16:11:29 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 19 Dec 2008 15:11:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[2672] csw/mgar/pkg/xmlto/trunk Message-ID: Revision: 2672 http://gar.svn.sourceforge.net/gar/?rev=2672&view=rev Author: bdwalton Date: 2008-12-19 15:11:29 +0000 (Fri, 19 Dec 2008) Log Message: ----------- Depend on gnulinks so that the options used in some of the scripts shipped can find options no present in sol8 cp. (Use gnu c locally, switch back when running on buildfarm.) Modified Paths: -------------- csw/mgar/pkg/xmlto/trunk/Makefile csw/mgar/pkg/xmlto/trunk/checksums Modified: csw/mgar/pkg/xmlto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlto/trunk/Makefile 2008-12-19 12:40:56 UTC (rev 2671) +++ csw/mgar/pkg/xmlto/trunk/Makefile 2008-12-19 15:11:29 UTC (rev 2672) @@ -2,7 +2,9 @@ GARVERSION = 0.0.21 CATEGORIES = utils -PREREQUISITE_PKGS = CSWmktemp CSWfindutils CSWdocbookxsl CSWlibxslt CSWflex CSWggetopt +PREREQUISITE_PKGS = CSWmktemp CSWfindutils CSWdocbookxsl CSWlibxslt +PREREQUISITE_PKGS = CSWflex CSWggetopt CSWgnulinks + REQUIRES_PKGS = CSWsgmlcommon CSWxmlcommon CSWlibxml2 CSWdocbookdtds REQUIRES_PKGS += CSWdocbookxsl CSWlibxslt CSWflex CSWw3m @@ -19,6 +21,8 @@ TEST_TARGET = check +GARCOMPILER = GNU + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 @@ -39,7 +43,7 @@ include gar/category.mk # We need this for 'tail -n' -PATH := /usr/xpg4/bin:/opt/csw/bin:$(PATH) +PATH := /opt/csw/gnu:/usr/xpg4/bin:/opt/csw/bin:$(PATH) #reset XML_CATALOG lookup (we rely on having packages that provide stylesheets #etc). Having xsltproc not find them during build makes us blow up!! Modified: csw/mgar/pkg/xmlto/trunk/checksums =================================================================== --- csw/mgar/pkg/xmlto/trunk/checksums 2008-12-19 12:40:56 UTC (rev 2671) +++ csw/mgar/pkg/xmlto/trunk/checksums 2008-12-19 15:11:29 UTC (rev 2672) @@ -1,3 +1,2 @@ cc2039dedc81f1a56b06e5fdac6f7570 download/xmlto-0.0.21.tar.bz2 -ca57ac3300751be169587c70ee43d421 download/CSWxmlto.gspec -0636e73ff0215e8d672dc4c32c317bb3 download/GPL +0eddffc425d6a0439d4ba307ec3a668b download/CSWxmlto.gspec 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 Dec 19 19:50:06 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 19 Dec 2008 18:50:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[2673] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 2673 http://gar.svn.sourceforge.net/gar/?rev=2673&view=rev Author: bdwalton Date: 2008-12-19 18:50:06 +0000 (Fri, 19 Dec 2008) Log Message: ----------- - Require emacs as a build dep (for compiling the .el files). - Setup the dependencies for CSWgitemacs. Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2008-12-19 15:11:29 UTC (rev 2672) +++ csw/mgar/pkg/git/trunk/Makefile 2008-12-19 18:50:06 UTC (rev 2673) @@ -4,7 +4,7 @@ PREREQUISITE_PKGS = CSWasciidoc CSWossldevel CSWxmlto CSWbash CSWcurl PREREQUISITE_PKGS += CSWgsed CSWgnulinks CSWperl CSWtk CSWexpat -PREREQUISITE_PKGS += CSWzlib CSWpmerror CSWpmsvn CSWcvs +PREREQUISITE_PKGS += CSWzlib CSWpmerror CSWpmsvn CSWcvs CSWemacs REQUIRED_PKGS_CSWgit = CSWzlib CSWperl CSWrsync CSWcurlrt CSWosslrt REQUIRED_PKGS_CSWgit += CSWossh CSWiconv CSWexpat CSWbash @@ -17,6 +17,8 @@ REQUIRED_PKGS_CSWgitcvs = CSWgit CSWcvs +REQUIRED_PKGS_CSWgitemacs = CSWgit CSWemacs + REQUIRED_PKGS_CSWgitdoc = CSWgit DESCRIPTION = Fast Version Control System This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Fri Dec 19 19:51:27 2008 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Fri, 19 Dec 2008 18:51:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[2674] csw/mgar/pkg/vim/trunk Message-ID: Revision: 2674 http://gar.svn.sourceforge.net/gar/?rev=2674&view=rev Author: harpchad Date: 2008-12-19 18:51:27 +0000 (Fri, 19 Dec 2008) Log Message: ----------- Updated for vim72, patches available from vim.org are no longer maintained in gar svn Modified Paths: -------------- csw/mgar/pkg/vim/trunk/Makefile csw/mgar/pkg/vim/trunk/checksums csw/mgar/pkg/vim/trunk/files/CSWvimrt.prototype csw/mgar/pkg/vim/trunk/files/config.mk csw/mgar/pkg/vim/trunk/files/patches.mk csw/mgar/pkg/vim/trunk/files/vimtutor.diff Removed Paths: ------------- csw/mgar/pkg/vim/trunk/files/7.1.001-147 Modified: csw/mgar/pkg/vim/trunk/Makefile =================================================================== --- csw/mgar/pkg/vim/trunk/Makefile 2008-12-19 18:50:06 UTC (rev 2673) +++ csw/mgar/pkg/vim/trunk/Makefile 2008-12-19 18:51:27 UTC (rev 2674) @@ -1,7 +1,7 @@ GARNAME = vim -DISTVERSION = 7.1 +DISTVERSION = 7.2 CATEGORIES = utils - +SPKG_SOURCEURL = http://www.vim.org/download.php DESCRIPTION = Vi IMproved define BLURB Vim is an almost fully-compatible version of the Unix editor Vi. Many new @@ -29,4 +29,3 @@ include gar/category.mk include files/rules.mk - Modified: csw/mgar/pkg/vim/trunk/checksums =================================================================== --- csw/mgar/pkg/vim/trunk/checksums 2008-12-19 18:50:06 UTC (rev 2673) +++ csw/mgar/pkg/vim/trunk/checksums 2008-12-19 18:51:27 UTC (rev 2674) @@ -1,10 +1,78 @@ -44c6b4914f38d6f9aa959640b89da329 download/vim-7.1.tar.bz2 -144aa049ba70621acf4247f0459f3ee7 download/vim-7.1-lang.tar.gz -605cc7ae31bcc9d7864bb0bb6025f55d download/vim-7.1-extra.tar.gz +7c2dc4a956cf315e546e347bc349968c download/7.2.001 +7f16f80814f1e071a689806c2056b39d download/7.2.002 +0de916fdfd450a4a0d95bed44ae2c398 download/7.2.003 +25cc99ad42b25b16a4610e2fad9cdab4 download/7.2.004 +a5b7b1c7c5b75aa7d730b0b9aa491558 download/7.2.005 +a93a72cd40c37da91dc634dc8dddefec download/7.2.006 +c2b2b63dea27ddad92668e63797406c5 download/7.2.007 +e65c8c2223eea5289d8cbef2e867a5de download/7.2.008 +ab1566b69bd0e0c82a866f00675ffe0e download/7.2.009 +d69f559bfb5436c157e8069a829ca50d download/7.2.010 +05334a6bb31402bfd49d82ea6f59a57b download/7.2.011 +a11dcd5552f36544a9e27978b5359935 download/7.2.012 +8bc70978291aadea9c82072b623c955d download/7.2.013 +a87826187cb77ad2e567a40c1609eea4 download/7.2.014 +47a466fbfdbca616f519fc4afa0432df download/7.2.015 +fd08bac73d7ffcabf53bd25a63dff893 download/7.2.016 +0f0284d87f6f52101802dbe1a45d54c3 download/7.2.017 +38d06ba325b716c1177c1012d781bada download/7.2.018 +661ca021fb70c24ef4df229512cfb14b download/7.2.019 +cb2c5ca0f9a9718fb635874925432dd8 download/7.2.020 +9073d2311ae7101c143237a45afb4efa download/7.2.021 +48ccb0deec77a3bb91bf967dacb43492 download/7.2.022 +d77ed8aa4de30d4dbd17a7998ae8f269 download/7.2.023 +cf983237e5e866ef459870fee2754bac download/7.2.024 +ab32defa4b2cfb509ccb34d4858b1223 download/7.2.025 +5e96c227c7765b1e0f03f44cb5b750f6 download/7.2.026 +f26b7ee0f271eacbb3652dbdf92dd860 download/7.2.027 +fc54a3d35bdc7b7a7660c6d2274f7b74 download/7.2.028 +d53630dc8f3a823f54dfba73dcd47b36 download/7.2.029 +208f8ed2db2665ebfc17674f78d47c6d download/7.2.030 +3387583af86faa78e10be979214071f3 download/7.2.031 +eca017686205ec8658bf9fa8c73f7af6 download/7.2.032 +88c91b84ffc772fd57f86475f7ba90f1 download/7.2.033 +c3d6eaaa0b74df423f90afaaafa3a0de download/7.2.034 +f4c35dae581d671dc271407d377f7199 download/7.2.035 +0ae8b6ed636fc013e2fa6bdabc182041 download/7.2.036 +1c6501c366cc8df205955f3e4d3ebba9 download/7.2.037 +ed3479ddb4ded7b74c82af5e50b0e4a6 download/7.2.038 +2a61f28f6f793c5a43abded6e59b6506 download/7.2.039 +4c493255ae227498016f30a0002ec1cc download/7.2.040 +66bde35426c09d9c666e23215f9a19c9 download/7.2.041 +99baedef8a9c908774b7ed74deacf184 download/7.2.042 +87035b208c9377c28d796b1e48ab8aac download/7.2.043 +b127def242996b4e7d7e870cab3e4b45 download/7.2.044 +5233327e4c97d310e3793b223892ea8d download/7.2.045 +9ecfa0454f5a329996b273cb12369962 download/7.2.046 +35e16f4e7198e861a71322fee2cb7909 download/7.2.047 +84ef9658181f49bfbd7a61ec87dd0b8d download/7.2.048 +fc9b65eef81954f6006c307ff11be925 download/7.2.049 +27a9700e39e266a31df702677acea52c download/7.2.050 +89ce3f5b513510fb288a4a301e7494c7 download/7.2.051 +5992bb56b07a9b9b4e3504f1f2f2c79c download/7.2.052 +3fe570c1317fee8a71ede17197358e02 download/7.2.053 +5b047e8e8413c4807d74a6d9716474a2 download/7.2.054 +c276080d95de2fafa9706f247c35ff74 download/7.2.055 +5b65e2654a78dcc4c15dc49dbce5418e download/7.2.056 +cab5a9ddf0ab180089d84bf9ec685574 download/7.2.057 +80991ff846f88222e3266dab6b07e2b8 download/7.2.058 +89cede639caf8beed5ea071790445e26 download/7.2.059 +9781d833263060308a9622dd097ad378 download/7.2.060 +71b4bc625bc1cdd68747262d329db551 download/7.2.061 +9243a773d19966dbfd98b7aff3fe3ab7 download/7.2.062 +08155711f8db2dfce217ec5a34253a76 download/7.2.063 +fd692f9624ec0170800b3d9a2a9a53cb download/7.2.064 +ee1a8dc311c7580608e3bd2196a7d042 download/7.2.065 +8d1d5f8aefabf0abcb54de5247893246 download/7.2.066 +fa0ccca2decdd2db64947658b04b8c99 download/7.2.067 +ca5ab057205023613020ca920d903028 download/7.2.068 +f3e6f3dd76278a9f7e396955faa4ca31 download/7.2.069 +198b5e809eddd24650dac5ab237e26d0 download/CSWvim.depend 59c166f15ad9e4db7aeef3ce7f6d89d9 download/CSWvim.gspec -198b5e809eddd24650dac5ab237e26d0 download/CSWvim.depend 7f886f132e8404332757262c82aac7af download/CSWvim.prototype c1ead6a1fa0f1a38b80689134cac8ca9 download/CSWvimrt.gspec -32117aac8751a78b7af78b9137922f85 download/CSWvimrt.prototype -79130ead83c4e2cd7dfdc9af4fc12fe5 download/7.1.001-147 -b07127874fa23a87bc703ec710be530c download/vimtutor.diff +9ca3e912af15f511018b08f568e9f9cf download/CSWvimrt.prototype +35e04482f07c57221c9a751aaa3b8dac download/vim-7.2-extra.tar.gz +d8884786979e0e520c112faf2e176f05 download/vim-7.2-lang.tar.gz +f0901284b338e448bfd79ccca0041254 download/vim-7.2.tar.bz2 +582717146f6bbd5b73db83a2f62e62a5 download/vimtutor.diff Deleted: csw/mgar/pkg/vim/trunk/files/7.1.001-147 =================================================================== --- csw/mgar/pkg/vim/trunk/files/7.1.001-147 2008-12-19 18:50:06 UTC (rev 2673) +++ csw/mgar/pkg/vim/trunk/files/7.1.001-147 2008-12-19 18:51:27 UTC (rev 2674) @@ -1,16747 +0,0 @@ -To: vim-dev at vim.org -Subject: patch 7.1.001 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.001 -Problem: Still can't build with Gnome libraries. -Solution: Fix typo in bind_textdomain_codeset. (Mike Kelly) -Files: src/gui_gtk.c, src/gui_gtk_x11.c - - -*** ../vim-7.1.000/src/gui_gtk.c Thu May 10 20:27:29 2007 ---- src/gui_gtk.c Mon May 14 14:40:54 2007 -*************** -*** 53,60 **** - # ifdef bindtextdomain - # undef bindtextdomain - # endif -! # ifdef bindtextdomain_codeset -! # undef bindtextdomain_codeset - # endif - # if defined(FEAT_GETTEXT) && !defined(ENABLE_NLS) - # define ENABLE_NLS /* so the texts in the dialog boxes are translated */ ---- 53,60 ---- - # ifdef bindtextdomain - # undef bindtextdomain - # endif -! # ifdef bind_textdomain_codeset -! # undef bind_textdomain_codeset - # endif - # if defined(FEAT_GETTEXT) && !defined(ENABLE_NLS) - # define ENABLE_NLS /* so the texts in the dialog boxes are translated */ -*** ../vim-7.1.000/src/gui_gtk_x11.c Thu May 10 21:17:51 2007 ---- src/gui_gtk_x11.c Mon May 14 14:41:06 2007 -*************** -*** 36,43 **** - # ifdef bindtextdomain - # undef bindtextdomain - # endif -! # ifdef bindtextdomain_codeset -! # undef bindtextdomain_codeset - # endif - # if defined(FEAT_GETTEXT) && !defined(ENABLE_NLS) - # define ENABLE_NLS /* so the texts in the dialog boxes are translated */ ---- 36,43 ---- - # ifdef bindtextdomain - # undef bindtextdomain - # endif -! # ifdef bind_textdomain_codeset -! # undef bind_textdomain_codeset - # endif - # if defined(FEAT_GETTEXT) && !defined(ENABLE_NLS) - # define ENABLE_NLS /* so the texts in the dialog boxes are translated */ -*** ../vim-7.1.000/src/version.c Sat May 12 16:34:15 2007 ---- src/version.c Mon May 14 14:42:19 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 1, - /**/ - --- -hundred-and-one symptoms of being an internet addict: -127. You bring your laptop and cellular phone to church. - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.002 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.002 -Problem: Oracle Pro*C/C++ files are not detected. -Solution: Add the missing star. (Micah J. Cowan) -Files: runtime/filetype.vim - - -*** ../vim-7.1.001/runtime/filetype.vim Thu May 10 20:42:30 2007 ---- runtime/filetype.vim Tue May 15 09:12:06 2007 -*************** -*** 1,7 **** - " Vim support file to detect file types - " - " Maintainer: Bram Moolenaar -! " Last Change: 2007 May 10 - - " Listen very carefully, I will say this only once - if exists("did_load_filetypes") ---- 1,7 ---- - " Vim support file to detect file types - " - " Maintainer: Bram Moolenaar -! " Last Change: 2007 May 15 - - " Listen very carefully, I will say this only once - if exists("did_load_filetypes") -*************** -*** 1286,1292 **** - au BufNewFile,BufRead *.it,*.ih setf ppwiz - - " Oracle Pro*C/C++ -! au BufNewFile,BufRead .pc setf proc - - " Privoxy actions file - au BufNewFile,BufRead *.action setf privoxy ---- 1286,1292 ---- - au BufNewFile,BufRead *.it,*.ih setf ppwiz - - " Oracle Pro*C/C++ -! au BufNewFile,BufRead *.pc setf proc - - " Privoxy actions file - au BufNewFile,BufRead *.action setf privoxy -*** ../vim-7.1.001/src/version.c Mon May 14 19:35:51 2007 ---- src/version.c Tue May 15 09:13:11 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 2, - /**/ - --- -hundred-and-one symptoms of being an internet addict: -132. You come back and check this list every half-hour. - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.003 (extra) -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.003 (extra) -Problem: The "Tear off this menu" message appears in the message history - when using a menu. (Yongwei Wu) -Solution: Disable message history when displaying the menu tip. -Files: src/gui_w32.c - - -*** ../vim-7.1.002/src/gui_w32.c Thu May 10 22:17:22 2007 ---- src/gui_w32.c Sat Jun 9 13:43:07 2007 -*************** -*** 1051,1057 **** ---- 1051,1059 ---- - if (pMenu != NULL && pMenu->strings[MENU_INDEX_TIP] != 0 - && GetMenuState(s_menuBar, pMenu->id, MF_BYCOMMAND) != -1) - { -+ ++msg_hist_off; - msg(pMenu->strings[MENU_INDEX_TIP]); -+ --msg_hist_off; - setcursor(); - out_flush(); - did_menu_tip = TRUE; -*** ../vim-7.1.002/src/version.c Tue May 15 09:14:33 2007 ---- src/version.c Tue Jun 19 10:08:17 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 3, - /**/ - --- -In his lifetime van Gogh painted 486 oil paintings. Oddly enough, 8975 -of them are to be found in the United States. - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.004 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.004 -Problem: Crash when doing ":next directory". (Raphael Finkel) -Solution: Do not use "buf", it may be invalid after autocommands. -Files: src/ex_cmds.c - - -*** ../vim-7.1.003/src/ex_cmds.c Thu May 10 21:24:24 2007 ---- src/ex_cmds.c Mon Jun 18 22:03:56 2007 -*************** -*** 3367,3373 **** - * was in this window (or another window). If not used - * before, reset the local window options to the global - * values. Also restores old folding stuff. */ -! get_winopts(buf); - #ifdef FEAT_SPELL - did_get_winopts = TRUE; - #endif ---- 3367,3373 ---- - * was in this window (or another window). If not used - * before, reset the local window options to the global - * values. Also restores old folding stuff. */ -! get_winopts(curbuf); - #ifdef FEAT_SPELL - did_get_winopts = TRUE; - #endif -*************** -*** 3649,3656 **** - #ifdef FEAT_SPELL - /* If the window options were changed may need to set the spell language. - * Can only do this after the buffer has been properly setup. */ -! if (did_get_winopts && curwin->w_p_spell && *buf->b_p_spl != NUL) -! did_set_spelllang(buf); - #endif - - if (command == NULL) ---- 3649,3656 ---- - #ifdef FEAT_SPELL - /* If the window options were changed may need to set the spell language. - * Can only do this after the buffer has been properly setup. */ -! if (did_get_winopts && curwin->w_p_spell && *curbuf->b_p_spl != NUL) -! did_set_spelllang(curbuf); - #endif - - if (command == NULL) -*** ../vim-7.1.003/src/version.c Tue Jun 19 10:09:15 2007 ---- src/version.c Tue Jun 19 11:53:34 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 4, - /**/ - --- -FIRST HEAD: Oh! quick! get the sword out I want to cut his head off. -THIRD HEAD: Oh, cut your own head off. -SECOND HEAD: Yes - do us all a favour. - "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.005 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.005 -Problem: "cit" used on deletes . Should not delete - anything and start insertion, like "ci'" does on "". (Michal - Bozon) -Solution: Handle an empty object specifically. Made it work consistent for - various text objects. -Files: src/search.c - - -*** ../vim-7.1.004/src/search.c Thu May 10 20:54:46 2007 ---- src/search.c Mon Jun 4 12:31:04 2007 -*************** -*** 3600,3612 **** - { - oap->start = start_pos; - oap->motion_type = MCHAR; - if (sol) -- { - incl(&curwin->w_cursor); -! oap->inclusive = FALSE; -! } -! else - oap->inclusive = TRUE; - } - - return OK; ---- 3600,3615 ---- - { - oap->start = start_pos; - oap->motion_type = MCHAR; -+ oap->inclusive = FALSE; - if (sol) - incl(&curwin->w_cursor); -! else if (lt(start_pos, curwin->w_cursor)) -! /* Include the character under the cursor. */ - oap->inclusive = TRUE; -+ else -+ /* End is before the start (no text in between <>, [], etc.): don't -+ * operate on any text. */ -+ curwin->w_cursor = start_pos; - } - - return OK; -*************** -*** 3734,3740 **** - - if (in_html_tag(FALSE)) - { -! /* cursor on start tag, move to just after it */ - while (*ml_get_cursor() != '>') - if (inc_cursor() < 0) - break; ---- 3737,3743 ---- - - if (in_html_tag(FALSE)) - { -! /* cursor on start tag, move to its '>' */ - while (*ml_get_cursor() != '>') - if (inc_cursor() < 0) - break; -*************** -*** 3838,3844 **** - /* Exclude the start tag. */ - curwin->w_cursor = start_pos; - while (inc_cursor() >= 0) -! if (*ml_get_cursor() == '>' && lt(curwin->w_cursor, end_pos)) - { - inc_cursor(); - start_pos = curwin->w_cursor; ---- 3841,3847 ---- - /* Exclude the start tag. */ - curwin->w_cursor = start_pos; - while (inc_cursor() >= 0) -! if (*ml_get_cursor() == '>') - { - inc_cursor(); - start_pos = curwin->w_cursor; -*************** -*** 3860,3866 **** - #ifdef FEAT_VISUAL - if (VIsual_active) - { -! if (*p_sel == 'e') - ++curwin->w_cursor.col; - VIsual = start_pos; - VIsual_mode = 'v'; ---- 3863,3873 ---- - #ifdef FEAT_VISUAL - if (VIsual_active) - { -! /* If the end is before the start there is no text between tags, select -! * the char under the cursor. */ -! if (lt(end_pos, start_pos)) -! curwin->w_cursor = start_pos; -! else if (*p_sel == 'e') - ++curwin->w_cursor.col; - VIsual = start_pos; - VIsual_mode = 'v'; -*************** -*** 3872,3878 **** - { - oap->start = start_pos; - oap->motion_type = MCHAR; -! oap->inclusive = TRUE; - } - retval = OK; - ---- 3879,3893 ---- - { - oap->start = start_pos; - oap->motion_type = MCHAR; -! if (lt(end_pos, start_pos)) -! { -! /* End is before the start: there is no text between tags; operate -! * on an empty area. */ -! curwin->w_cursor = start_pos; -! oap->inclusive = FALSE; -! } -! else -! oap->inclusive = TRUE; - } - retval = OK; - -*** ../vim-7.1.004/src/version.c Tue Jun 19 11:54:23 2007 ---- src/version.c Tue Jun 19 12:57:03 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 5, - /**/ - --- -Life would be so much easier if we could just look at the source code. - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.006 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.006 -Problem: Resetting 'modified' in a StdinReadPost autocommand doesn't work. -Solution: Set 'modified' before the autocommands instead of after it. -Files: src/buffer.c - - -*** ../vim-7.1.005/src/buffer.c Thu May 10 18:43:46 2007 ---- src/buffer.c Fri Jun 8 20:59:04 2007 -*************** -*** 171,176 **** ---- 171,183 ---- - /* Put the cursor on the first line. */ - curwin->w_cursor.lnum = 1; - curwin->w_cursor.col = 0; -+ -+ /* Set or reset 'modified' before executing autocommands, so that -+ * it can be changed there. */ -+ if (!readonlymode && !bufempty()) -+ changed(); -+ else if (retval != FAIL) -+ unchanged(curbuf, FALSE); - #ifdef FEAT_AUTOCMD - # ifdef FEAT_EVAL - apply_autocmds_retval(EVENT_STDINREADPOST, NULL, NULL, FALSE, -*************** -*** 194,209 **** - /* When reading stdin, the buffer contents always needs writing, so set - * the changed flag. Unless in readonly mode: "ls | gview -". - * When interrupted and 'cpoptions' contains 'i' set changed flag. */ -! if ((read_stdin && !readonlymode && !bufempty()) - #ifdef FEAT_AUTOCMD - || modified_was_set /* ":set modified" used in autocmd */ - # ifdef FEAT_EVAL - || (aborting() && vim_strchr(p_cpo, CPO_INTMOD) != NULL) - # endif - #endif -! || (got_int && vim_strchr(p_cpo, CPO_INTMOD) != NULL)) - changed(); -! else if (retval != FAIL) - unchanged(curbuf, FALSE); - save_file_ff(curbuf); /* keep this fileformat */ - ---- 201,216 ---- - /* When reading stdin, the buffer contents always needs writing, so set - * the changed flag. Unless in readonly mode: "ls | gview -". - * When interrupted and 'cpoptions' contains 'i' set changed flag. */ -! if ((got_int && vim_strchr(p_cpo, CPO_INTMOD) != NULL) - #ifdef FEAT_AUTOCMD - || modified_was_set /* ":set modified" used in autocmd */ - # ifdef FEAT_EVAL - || (aborting() && vim_strchr(p_cpo, CPO_INTMOD) != NULL) - # endif - #endif -! ) - changed(); -! else if (retval != FAIL && !read_stdin) - unchanged(curbuf, FALSE); - save_file_ff(curbuf); /* keep this fileformat */ - -*** ../vim-7.1.005/src/version.c Tue Jun 19 12:58:55 2007 ---- src/version.c Tue Jun 19 15:37:53 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 6, - /**/ - --- -If I tell you "you have a beautiful body", would you hold it against me? - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.007 (extra) -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.007 (extra) -Problem: Mac: Context menu doesn't work on Intel Macs. - Scrollbars are not dimmed when Vim is not the active application. -Solution: Remove the test whether context menus are supported. They are - always there in OS/X. Handle the dimming. (Nicolas Weber) -Files: src/gui_mac.c, src/gui.h - - -*** ../vim-7.1.006/src/gui_mac.c Thu May 10 20:07:25 2007 ---- src/gui_mac.c Sat Jun 9 14:19:25 2007 -*************** -*** 1676,1688 **** - /* TODO: NEEDED? */ - clickIsPopup = FALSE; - -! if ((gui.MacOSHaveCntxMenu) && (mouse_model_popup())) -! if (IsShowContextualMenuClick(theEvent)) -! { -! vimMouseButton = MOUSE_RIGHT; -! vimModifiers &= ~MOUSE_CTRL; -! clickIsPopup = TRUE; -! } - - /* Is it a double click ? */ - dblClick = ((theEvent->when - lastMouseTick) < GetDblTime()); ---- 1676,1687 ---- - /* TODO: NEEDED? */ - clickIsPopup = FALSE; - -! if (mouse_model_popup() && IsShowContextualMenuClick(theEvent)) -! { -! vimMouseButton = MOUSE_RIGHT; -! vimModifiers &= ~MOUSE_CTRL; -! clickIsPopup = TRUE; -! } - - /* Is it a double click ? */ - dblClick = ((theEvent->when - lastMouseTick) < GetDblTime()); -*************** -*** 1920,1943 **** - WindowPtr whichWindow; - - whichWindow = (WindowPtr) event->message; -! if ((event->modifiers) & activeFlag) -! /* Activate */ -! gui_focus_change(TRUE); -! else - { -! /* Deactivate */ -! gui_focus_change(FALSE); -! /* DON'T KNOW what the code below was doing -! found in the deactivate clause, but the -! clause writing TRUE into in_focus (BUG) -! */ -! -! #if 0 /* Removed by Dany as per above June 2001 */ -! a_bool = false; -! SetPreserveGlyph(a_bool); -! SetOutlinePreferred(a_bool); -! #endif - } - } - - ---- 1919,1937 ---- - WindowPtr whichWindow; - - whichWindow = (WindowPtr) event->message; -! /* Dim scrollbars */ -! if (whichWindow == gui.VimWindow) - { -! ControlRef rootControl; -! GetRootControl(gui.VimWindow, &rootControl); -! if ((event->modifiers) & activeFlag) -! ActivateControl(rootControl); -! else -! DeactivateControl(rootControl); - } -+ -+ /* Activate */ -+ gui_focus_change((event->modifiers) & activeFlag); - } - - -*************** -*** 2559,2574 **** - OSErr error; - - /* Handle contextual menu right now (if needed) */ -! if (gui.MacOSHaveCntxMenu) -! if (IsShowContextualMenuClick(event)) -! { - # if 0 -! gui_mac_handle_contextual_menu(event); - # else -! gui_mac_doMouseDownEvent(event); - # endif -! return; -! } - - /* Handle normal event */ - switch (event->what) ---- 2553,2567 ---- - OSErr error; - - /* Handle contextual menu right now (if needed) */ -! if (IsShowContextualMenuClick(event)) -! { - # if 0 -! gui_mac_handle_contextual_menu(event); - # else -! gui_mac_doMouseDownEvent(event); - # endif -! return; -! } - - /* Handle normal event */ - switch (event->what) -*************** -*** 2782,2795 **** - (void) InstallAEHandlers(); - #endif - -- if (Gestalt(gestaltContextualMenuAttr, &gestalt_rc) == noErr) -- gui.MacOSHaveCntxMenu = BitTst(&gestalt_rc, 31-gestaltContextualMenuTrapAvailable); -- else -- gui.MacOSHaveCntxMenu = false; -- -- if (gui.MacOSHaveCntxMenu) -- gui.MacOSHaveCntxMenu = (InitContextualMenus()==noErr); -- - pomme = NewMenu(256, "\p\024"); /* 0x14= = Apple Menu */ - - AppendMenu(pomme, "\pAbout VIM"); ---- 2775,2780 ---- -*************** -*** 2941,2946 **** ---- 2926,2932 ---- - #ifdef USE_CARBONKEYHANDLER - EventHandlerRef keyEventHandlerRef; - #endif -+ ControlRef rootControl; - - if (Gestalt(gestaltSystemVersion, &gMacSystemVersion) != noErr) - gMacSystemVersion = 0x1000; /* TODO: Default to minimum sensible value */ -*************** -*** 2954,2968 **** - (void) InstallAEHandlers(); - #endif - -- /* Ctrl click */ -- if (Gestalt(gestaltContextualMenuAttr, &gestalt_rc) == noErr) -- gui.MacOSHaveCntxMenu = BitTst(&gestalt_rc, 31-gestaltContextualMenuTrapAvailable); -- else -- gui.MacOSHaveCntxMenu = false; -- -- if (gui.MacOSHaveCntxMenu) -- gui.MacOSHaveCntxMenu = (InitContextualMenus()==noErr); -- - pomme = NewMenu(256, "\p\024"); /* 0x14= = Apple Menu */ - - AppendMenu(pomme, "\pAbout VIM"); ---- 2940,2945 ---- -*************** -*** 2981,2986 **** ---- 2958,2964 ---- - gui.VimWindow = NewCWindow(nil, &windRect, "\pgVim on Macintosh", true, - zoomDocProc, - (WindowPtr)-1L, true, 0); -+ CreateRootControl(gui.VimWindow, &rootControl); - InstallReceiveHandler((DragReceiveHandlerUPP)receiveHandler, - gui.VimWindow, NULL); - SetPortWindowPort(gui.VimWindow); -*** ../vim-7.1.006/src/gui.h Thu May 10 19:18:46 2007 ---- src/gui.h Sat Jun 9 14:10:34 2007 -*************** -*** 460,466 **** - WindowPtr VimWindow; - MenuHandle MacOSHelpMenu; /* Help menu provided by the MacOS */ - int MacOSHelpItems; /* Nr of help-items supplied by MacOS */ -- int MacOSHaveCntxMenu; /* Contextual menu available */ - WindowPtr wid; /* Window id of text area */ - int visibility; /* Is window partially/fully obscured? */ - #endif ---- 460,465 ---- -*** ../vim-7.1.006/src/version.c Tue Jun 19 15:40:51 2007 ---- src/version.c Tue Jun 19 15:44:15 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 7, - /**/ - --- - When danger reared its ugly head, - He bravely turned his tail and fled - Yes, Brave Sir Robin turned about - And gallantly he chickened out - Bravely taking to his feet - He beat a very brave retreat - Bravest of the brave Sir Robin - Petrified of being dead - Soiled his pants then brave Sir Robin - Turned away and fled. - "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.008 (correction -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Oops, forgot the src/version.c change. - -Patch 7.1.008 -Problem: getfsize() returns a negative number for very big files. -Solution: Check for overflow and return -2. -Files: runtime/doc/eval.txt, src/eval.c - - -*** ../vim-7.1.007/runtime/doc/eval.txt Sat May 12 16:38:23 2007 ---- runtime/doc/eval.txt Sat Jun 9 15:48:40 2007 -*************** -*** 1,4 **** -! *eval.txt* For Vim version 7.1. Last change: 2007 May 11 - - - VIM REFERENCE MANUAL by Bram Moolenaar ---- 1,4 ---- -! *eval.txt* For Vim version 7.1. Last change: 2007 Jun 09 - - - VIM REFERENCE MANUAL by Bram Moolenaar -*************** -*** 2824,2829 **** ---- 2824,2831 ---- - given file {fname}. - If {fname} is a directory, 0 is returned. - If the file {fname} can't be found, -1 is returned. -+ If the size of {fname} is too big to fit in a Number then -2 -+ is returned. - - getfontname([{name}]) *getfontname()* - Without an argument returns the name of the normal font being -*** ../vim-7.1.007/src/eval.c Thu May 10 21:30:00 2007 ---- src/eval.c Sat Jun 9 15:46:46 2007 -*************** -*** 10136,10142 **** ---- 10136,10148 ---- - if (mch_isdir(fname)) - rettv->vval.v_number = 0; - else -+ { - rettv->vval.v_number = (varnumber_T)st.st_size; -+ -+ /* non-perfect check for overflow */ -+ if ((off_t)rettv->vval.v_number != (off_t)st.st_size) -+ rettv->vval.v_number = -2; -+ } - } - else - rettv->vval.v_number = -1; -*** ../vim-7.1.007/src/version.c Tue Jun 19 16:33:53 2007 ---- src/version.c Tue Jun 19 17:30:50 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 8, - /**/ - - --- -ZOOT: I'm afraid our life must seem very dull and quiet compared to yours. - We are but eightscore young blondes, all between sixteen and - nineteen-and-a-half, cut off in this castle, with no one to protect us. - Oooh. It is a lonely life ... bathing ... dressing ... undressing ... - making exciting underwear.... - "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.009 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.009 -Problem: In diff mode, displaying the difference between a tab and spaces - is not highlighted correctly. -Solution: Only change highlighting at the end of displaying a tab. -Files: src/screen.c - - -*** ../vim-7.1.008/src/screen.c Thu May 10 20:15:31 2007 ---- src/screen.c Mon Jun 11 21:49:44 2007 -*************** -*** 3459,3467 **** - #ifdef FEAT_DIFF - if (diff_hlf != (hlf_T)0) - { -! if (diff_hlf == HLF_CHD && ptr - line >= change_start) - diff_hlf = HLF_TXD; /* changed text */ -! if (diff_hlf == HLF_TXD && ptr - line > change_end) - diff_hlf = HLF_CHD; /* changed line */ - line_attr = hl_attr(diff_hlf); - } ---- 3459,3469 ---- - #ifdef FEAT_DIFF - if (diff_hlf != (hlf_T)0) - { -! if (diff_hlf == HLF_CHD && ptr - line >= change_start -! && n_extra == 0) - diff_hlf = HLF_TXD; /* changed text */ -! if (diff_hlf == HLF_TXD && ptr - line > change_end -! && n_extra == 0) - diff_hlf = HLF_CHD; /* changed line */ - line_attr = hl_attr(diff_hlf); - } -*** ../vim-7.1.008/src/version.c Tue Jun 19 17:33:52 2007 ---- src/version.c Tue Jun 19 17:36:36 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 9, - /**/ - --- -Linux is just like a wigwam: no Windows, no Gates and an Apache inside. - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.010 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.010 -Problem: The Gnome session file doesn't restore tab pages. -Solution: Add SSOP_TABPAGES to the session flags. (Matias D'Ambrosio) -Files: src/gui_gtk_x11.c - - -*** ../vim-7.1.009/src/gui_gtk_x11.c Mon May 14 19:35:51 2007 ---- src/gui_gtk_x11.c Sat Jun 9 16:54:13 2007 -*************** -*** 2188,2195 **** - escaped_filename = vim_strsave_escaped(filename, escape_chars); - if (escaped_filename == NULL) - return FALSE; -! mksession_cmdline = g_strconcat("mksession ", (char *)escaped_filename, NULL); - vim_free(escaped_filename); - /* - * Use a reasonable hardcoded set of 'sessionoptions' flags to avoid - * unpredictable effects when the session is saved automatically. Also, ---- 2188,2197 ---- - escaped_filename = vim_strsave_escaped(filename, escape_chars); - if (escaped_filename == NULL) - return FALSE; -! mksession_cmdline = g_strconcat("mksession ", (char *)escaped_filename, -! NULL); - vim_free(escaped_filename); -+ - /* - * Use a reasonable hardcoded set of 'sessionoptions' flags to avoid - * unpredictable effects when the session is saved automatically. Also, -*************** -*** 2199,2205 **** - */ - save_ssop_flags = ssop_flags; - ssop_flags = (SSOP_BLANK|SSOP_CURDIR|SSOP_FOLDS|SSOP_GLOBALS -! |SSOP_HELP|SSOP_OPTIONS|SSOP_WINSIZE); - - do_cmdline_cmd((char_u *)"let Save_VV_this_session = v:this_session"); - failed = (do_cmdline_cmd((char_u *)mksession_cmdline) == FAIL); ---- 2201,2207 ---- - */ - save_ssop_flags = ssop_flags; - ssop_flags = (SSOP_BLANK|SSOP_CURDIR|SSOP_FOLDS|SSOP_GLOBALS -! |SSOP_HELP|SSOP_OPTIONS|SSOP_WINSIZE|SSOP_TABPAGES); - - do_cmdline_cmd((char_u *)"let Save_VV_this_session = v:this_session"); - failed = (do_cmdline_cmd((char_u *)mksession_cmdline) == FAIL); -*** ../vim-7.1.009/src/version.c Tue Jun 19 17:49:12 2007 ---- src/version.c Tue Jun 19 18:07:09 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 10, - /**/ - --- -GALAHAD: No look, really, this isn't nescess ... -PIGLET: We must examine you. -GALAHAD: There's nothing wrong with ... that. - "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.011 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.011 -Problem: Possible buffer overflow when $VIMRUNTIME is very long. (Victor - Stinner) -Solution: Use vim_snprintf(). -Files: src/main.c - - -*** ../vim-7.1.010/src/main.c Thu May 10 21:12:25 2007 ---- src/main.c Sat Jun 9 22:37:46 2007 -*************** -*** 1360,1367 **** - p = vim_getenv((char_u *)"VIMRUNTIME", &mustfree); - if (p != NULL && *p != NUL) - { -! STRCPY(NameBuff, p); -! STRCAT(NameBuff, "/lang"); - bindtextdomain(VIMPACKAGE, (char *)NameBuff); - } - if (mustfree) ---- 1360,1366 ---- - p = vim_getenv((char_u *)"VIMRUNTIME", &mustfree); - if (p != NULL && *p != NUL) - { -! vim_snprintf((char *)NameBuff, MAXPATHL, "%s/lang", p); - bindtextdomain(VIMPACKAGE, (char *)NameBuff); - } - if (mustfree) -*** ../vim-7.1.010/src/version.c Tue Jun 19 18:07:52 2007 ---- src/version.c Tue Jun 19 20:29:44 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 11, - /**/ - --- - GALAHAD hurries to the door and pushes through it. As he leaves the room - we CUT TO the reverse to show that he is now in a room full of bathing - and romping GIRLIES, all innocent, wide-eyed and beautiful. They smile - enchantingly at him as he tries to keep walking without being diverted by - the lovely sights assaulting his eyeballs. - "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.012 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.012 -Problem: ":let &shiftwidth = 'asdf'" doesn't produce an error message. -Solution: Check for a string argument. (Chris Lubinski) -Files: src/option.c - - -*** ../vim-7.1.011/src/option.c Sun May 6 15:37:32 2007 ---- src/option.c Tue Jun 19 20:56:36 2007 -*************** -*** 8219,8224 **** ---- 8219,8243 ---- - varp = get_varp(&options[opt_idx]); - if (varp != NULL) /* hidden option is not changed */ - { -+ if (number == 0 && string != NULL) -+ { -+ int index; -+ -+ /* Either we are given a string or we are setting option -+ * to zero. */ -+ for (index = 0; string[index] == '0'; ++index) -+ ; -+ if (string[index] != NUL || index == 0) -+ { -+ /* There's another character after zeros or the string -+ * is empty. In both cases, we are trying to set a -+ * num option using a string. */ -+ EMSG3(_("E521: Number required: &%s = '%s'"), -+ name, string); -+ return; /* do nothing as we hit an error */ -+ -+ } -+ } - if (flags & P_NUM) - (void)set_num_option(opt_idx, varp, number, - NULL, 0, opt_flags); -*** ../vim-7.1.011/src/version.c Tue Jun 19 20:30:46 2007 ---- src/version.c Tue Jun 19 20:53:15 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 12, - /**/ - --- -Ten million Linux users can't be wrong! - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.013 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.013 -Problem: ":syn include" only loads the first file, while it is documented - as doing the equivalent of ":runtime!". -Solution: Change the argument to source_runtime(). (James Vega) -Files: src/syntax.c - - -*** ../vim-7.1.012/src/syntax.c Thu May 10 20:54:33 2007 ---- src/syntax.c Sun Jun 17 22:03:30 2007 -*************** -*** 4460,4467 **** - current_syn_inc_tag = ++running_syn_inc_tag; - prev_toplvl_grp = curbuf->b_syn_topgrp; - curbuf->b_syn_topgrp = sgl_id; -! if (source ? do_source(eap->arg, FALSE, FALSE) == FAIL -! : source_runtime(eap->arg, DOSO_NONE) == FAIL) - EMSG2(_(e_notopen), eap->arg); - curbuf->b_syn_topgrp = prev_toplvl_grp; - current_syn_inc_tag = prev_syn_inc_tag; ---- 4460,4467 ---- - current_syn_inc_tag = ++running_syn_inc_tag; - prev_toplvl_grp = curbuf->b_syn_topgrp; - curbuf->b_syn_topgrp = sgl_id; -! if (source ? do_source(eap->arg, FALSE, DOSO_NONE) == FAIL -! : source_runtime(eap->arg, TRUE) == FAIL) - EMSG2(_(e_notopen), eap->arg); - curbuf->b_syn_topgrp = prev_toplvl_grp; - current_syn_inc_tag = prev_syn_inc_tag; -*** ../vim-7.1.012/src/version.c Tue Jun 19 20:56:52 2007 ---- src/version.c Thu Jun 28 11:58:25 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 13, - /**/ - --- -MORTICIAN: What? -CUSTOMER: Nothing -- here's your nine pence. -DEAD PERSON: I'm not dead! -MORTICIAN: Here -- he says he's not dead! -CUSTOMER: Yes, he is. -DEAD PERSON: I'm not! - The Quest for the Holy Grail (Monty Python) - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.014 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.014 -Problem: Crash when doing C indenting. (Chris Monson) -Solution: Obtain the current line again after invoking cin_islabel(). -Files: src/edit.c - - -*** ../vim-7.1.013/src/edit.c Thu May 10 20:44:18 2007 ---- src/edit.c Wed Jun 20 18:25:54 2007 -*************** -*** 7215,7220 **** ---- 7215,7222 ---- - p = ml_get_curline(); - if (cin_iscase(p) || cin_isscopedecl(p) || cin_islabel(30)) - return TRUE; -+ /* Need to get the line again after cin_islabel(). */ -+ p = ml_get_curline(); - if (curwin->w_cursor.col > 2 - && p[curwin->w_cursor.col - 1] == ':' - && p[curwin->w_cursor.col - 2] == ':') -*** ../vim-7.1.013/src/version.c Thu Jun 28 11:59:13 2007 ---- src/version.c Thu Jun 28 12:26:52 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 14, - /**/ - --- -Have you heard about the new Barbie doll? It's called Divorce -Barbie. It comes with all of Ken's stuff. - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.016 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.016 (after patch 7.1.012) -Problem: Error message about setting 'diff' to a string. -Solution: Don't pass an empty string to set_option_value() when setting - 'diff'. -Files: src/quickfix.c, src/popupmnu.c - - -*** ../vim-7.1.015/src/quickfix.c Sun Feb 4 02:58:00 2007 ---- src/quickfix.c Thu Jun 28 18:56:16 2007 -*************** -*** 2331,2337 **** - set_option_value((char_u *)"bt", 0L, (char_u *)"quickfix", - OPT_LOCAL); - set_option_value((char_u *)"bh", 0L, (char_u *)"wipe", OPT_LOCAL); -! set_option_value((char_u *)"diff", 0L, (char_u *)"", OPT_LOCAL); - } - - /* Only set the height when still in the same tab page and there is no ---- 2331,2337 ---- - set_option_value((char_u *)"bt", 0L, (char_u *)"quickfix", - OPT_LOCAL); - set_option_value((char_u *)"bh", 0L, (char_u *)"wipe", OPT_LOCAL); -! set_option_value((char_u *)"diff", 0L, NULL, OPT_LOCAL); - } - - /* Only set the height when still in the same tab page and there is no -*** ../vim-7.1.015/src/popupmnu.c Tue Mar 27 12:42:05 2007 ---- src/popupmnu.c Thu Jun 28 19:00:51 2007 -*************** -*** 466,472 **** - set_option_value((char_u *)"bh", 0L, - (char_u *)"wipe", OPT_LOCAL); - set_option_value((char_u *)"diff", 0L, -! (char_u *)"", OPT_LOCAL); - } - } - if (res == OK) ---- 466,472 ---- - set_option_value((char_u *)"bh", 0L, - (char_u *)"wipe", OPT_LOCAL); - set_option_value((char_u *)"diff", 0L, -! NULL, OPT_LOCAL); - } - } - if (res == OK) -*** ../vim-7.1.015/src/version.c Thu Jun 28 13:02:22 2007 ---- src/version.c Thu Jun 28 21:20:20 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 16, - /**/ - --- -We do not stumble over mountains, but over molehills. - Confucius - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.017 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.017 -Problem: ":confirm w" does give a prompt when 'readonly' is set, but not - when the file permissions are read-only. (Michael Schaap) -Solution: Provide a dialog in both situations. (Chris Lubinski) -Files: src/ex_cmds.c, src/fileio.c, src/proto/fileio.pro - - -*** ../vim-7.1.016/src/ex_cmds.c Tue Jun 19 11:54:23 2007 ---- src/ex_cmds.c Tue Jun 19 22:37:25 2007 -*************** -*** 2912,2933 **** - } - - /* -! * Check if a buffer is read-only. Ask for overruling in a dialog. -! * Return TRUE and give an error message when the buffer is readonly. - */ - static int - check_readonly(forceit, buf) - int *forceit; - buf_T *buf; - { -! if (!*forceit && buf->b_p_ro) - { - #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG) - if ((p_confirm || cmdmod.confirm) && buf->b_fname != NULL) - { - char_u buff[IOSIZE]; - -! dialog_msg(buff, _("'readonly' option is set for \"%s\".\nDo you wish to write anyway?"), - buf->b_fname); - - if (vim_dialog_yesno(VIM_QUESTION, NULL, buff, 2) == VIM_YES) ---- 2912,2946 ---- - } - - /* -! * Check if a buffer is read-only (either 'readonly' option is set or file is -! * read-only). Ask for overruling in a dialog. Return TRUE and give an error -! * message when the buffer is readonly. - */ - static int - check_readonly(forceit, buf) - int *forceit; - buf_T *buf; - { -! struct stat st; -! -! /* Handle a file being readonly when the 'readonly' option is set or when -! * the file exists and permissions are read-only. -! * We will send 0777 to check_file_readonly(), as the "perm" variable is -! * important for device checks but not here. */ -! if (!*forceit && (buf->b_p_ro -! || (mch_stat((char *)buf->b_ffname, &st) >= 0 -! && check_file_readonly(buf->b_ffname, 0777)))) - { - #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG) - if ((p_confirm || cmdmod.confirm) && buf->b_fname != NULL) - { - char_u buff[IOSIZE]; - -! if (buf->b_p_ro) -! dialog_msg(buff, _("'readonly' option is set for \"%s\".\nDo you wish to write anyway?"), -! buf->b_fname); -! else -! dialog_msg(buff, _("File permissions of \"%s\" are read-only.\nIt may still be possible to write it.\nDo you wish to try?"), - buf->b_fname); - - if (vim_dialog_yesno(VIM_QUESTION, NULL, buff, 2) == VIM_YES) -*************** -*** 2941,2949 **** ---- 2954,2967 ---- - } - else - #endif -+ if (buf->b_p_ro) - EMSG(_(e_readonly)); -+ else -+ EMSG2(_("E505: \"%s\" is read-only (add ! to override)"), -+ buf->b_fname); - return TRUE; - } -+ - return FALSE; - } - -*** ../vim-7.1.016/src/fileio.c Thu May 10 19:32:17 2007 ---- src/fileio.c Thu Jun 28 21:54:18 2007 -*************** -*** 424,430 **** - */ - if (!p_odev && mch_nodetype(fname) == NODE_WRITABLE) - { -! filemess(curbuf, fname, (char_u *)_("is a device (disabled with 'opendevice' option"), 0); - msg_end(); - msg_scroll = msg_save; - return FAIL; ---- 424,430 ---- - */ - if (!p_odev && mch_nodetype(fname) == NODE_WRITABLE) - { -! filemess(curbuf, fname, (char_u *)_("is a device (disabled with 'opendevice' option)"), 0); - msg_end(); - msg_scroll = msg_save; - return FAIL; -*************** -*** 2734,2739 **** ---- 2734,2765 ---- - #endif - - /* -+ * Return TRUE if a file appears to be read-only from the file permissions. -+ */ -+ int -+ check_file_readonly(fname, perm) -+ char_u *fname; /* full path to file */ -+ int perm; /* known permissions on file */ -+ { -+ #ifndef USE_MCH_ACCESS -+ int fd = 0; -+ #endif -+ -+ return ( -+ #ifdef USE_MCH_ACCESS -+ # ifdef UNIX -+ (perm & 0222) == 0 || -+ # endif -+ mch_access((char *)fname, W_OK) -+ #else -+ (fd = mch_open((char *)fname, O_RDWR | O_EXTRA, 0)) < 0 -+ ? TRUE : (close(fd), FALSE) -+ #endif -+ ); -+ } -+ -+ -+ /* - * buf_write() - write to file "fname" lines "start" through "end" - * - * We do our own buffering here because fwrite() is so slow. -*************** -*** 3219,3235 **** - * Check if the file is really writable (when renaming the file to - * make a backup we won't discover it later). - */ -! file_readonly = ( -! # ifdef USE_MCH_ACCESS -! # ifdef UNIX -! (perm & 0222) == 0 || -! # endif -! mch_access((char *)fname, W_OK) -! # else -! (fd = mch_open((char *)fname, O_RDWR | O_EXTRA, 0)) < 0 -! ? TRUE : (close(fd), FALSE) -! # endif -! ); - if (!forceit && file_readonly) - { - if (vim_strchr(p_cpo, CPO_FWRITE) != NULL) ---- 3245,3252 ---- - * Check if the file is really writable (when renaming the file to - * make a backup we won't discover it later). - */ -! file_readonly = check_file_readonly(fname, (int)perm); -! - if (!forceit && file_readonly) - { - if (vim_strchr(p_cpo, CPO_FWRITE) != NULL) -*** ../vim-7.1.016/src/proto/fileio.pro Sat May 5 19:59:00 2007 ---- src/proto/fileio.pro Thu Jun 28 21:09:59 2007 -*************** -*** 2,7 **** ---- 2,8 ---- - void filemess __ARGS((buf_T *buf, char_u *name, char_u *s, int attr)); - int readfile __ARGS((char_u *fname, char_u *sfname, linenr_T from, linenr_T lines_to_skip, linenr_T lines_to_read, exarg_T *eap, int flags)); - int prep_exarg __ARGS((exarg_T *eap, buf_T *buf)); -+ int check_file_readonly __ARGS((char_u *fname, int perm)); - int buf_write __ARGS((buf_T *buf, char_u *fname, char_u *sfname, linenr_T start, linenr_T end, exarg_T *eap, int append, int forceit, int reset_changed, int filtering)); - void msg_add_fname __ARGS((buf_T *buf, char_u *fname)); - void msg_add_lines __ARGS((int insert_space, long lnum, long nchars)); -*** ../vim-7.1.016/src/version.c Thu Jun 28 21:23:52 2007 ---- src/version.c Thu Jun 28 21:49:29 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 17, - /**/ - --- -CUSTOMER: Well, can you hang around a couple of minutes? He won't be - long. -MORTICIAN: Naaah, I got to go on to Robinson's -- they've lost nine today. -CUSTOMER: Well, when is your next round? -MORTICIAN: Thursday. -DEAD PERSON: I think I'll go for a walk. - The Quest for the Holy Grail (Monty Python) - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.018 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.018 -Problem: When 'virtualedit' is set a "p" of a block just past the end of - the line inserts before the cursor. (Engelke) -Solution: Check for the cursor being just after the line (Chris Lubinski) -Files: src/ops.c - - -*** ../vim-7.1.017/src/ops.c Thu May 10 20:34:55 2007 ---- src/ops.c Tue Jun 19 22:40:45 2007 -*************** -*** 3404,3410 **** - - #ifdef FEAT_VIRTUALEDIT - col += curwin->w_cursor.coladd; -! if (ve_flags == VE_ALL && curwin->w_cursor.coladd > 0) - { - if (dir == FORWARD && c == NUL) - ++col; ---- 3404,3412 ---- - - #ifdef FEAT_VIRTUALEDIT - col += curwin->w_cursor.coladd; -! if (ve_flags == VE_ALL -! && (curwin->w_cursor.coladd > 0 -! || endcol2 == curwin->w_cursor.col)) - { - if (dir == FORWARD && c == NUL) - ++col; -*** ../vim-7.1.017/src/version.c Thu Jun 28 21:57:08 2007 ---- src/version.c Thu Jun 28 22:12:49 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 18, - /**/ - --- - [clop clop] -MORTICIAN: Who's that then? -CUSTOMER: I don't know. -MORTICIAN: Must be a king. -CUSTOMER: Why? -MORTICIAN: He hasn't got shit all over him. - The Quest for the Holy Grail (Monty Python) - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.019 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.019 -Problem: ":py" asks for an argument, ":py asd" then gives the error that - ":py" isn't implemented. Should already happen for ":py". -Solution: Compare with ex_script_ni. (Chris Lubinski) -Files: src/ex_docmd.c - - -*** ../vim-7.1.018/src/ex_docmd.c Thu May 10 18:53:03 2007 ---- src/ex_docmd.c Sat Jun 23 13:36:37 2007 -*************** -*** 2118,2124 **** - #ifdef FEAT_USR_CMDS - !USER_CMDIDX(ea.cmdidx) && - #endif -! cmdnames[ea.cmdidx].cmd_func == ex_ni); - - #ifndef FEAT_EVAL - /* ---- 2118,2125 ---- - #ifdef FEAT_USR_CMDS - !USER_CMDIDX(ea.cmdidx) && - #endif -! (cmdnames[ea.cmdidx].cmd_func == ex_ni -! || cmdnames[ea.cmdidx].cmd_func == ex_script_ni)); - - #ifndef FEAT_EVAL - /* -*** ../vim-7.1.018/src/version.c Thu Jun 28 22:14:28 2007 ---- src/version.c Thu Jul 5 09:48:11 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 19, - /**/ - --- -MARTHA'S WAY: Don't throw out all that leftover wine. Freeze into ice cubes - for future use in casseroles and sauces. -MY WAY: What leftover wine? - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.020 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.020 -Problem: Reading from uninitialized memory when using a dialog. (Dominique - Pelle) -Solution: In msg_show_console_dialog() append a NUL after every appended - character. -Files: src/message.c - - -*** ../vim-7.1.019/src/message.c Thu May 10 18:49:39 2007 ---- src/message.c Sun Jul 1 12:06:52 2007 -*************** -*** 3456,3466 **** - /* advance to next hotkey and set default hotkey */ - #ifdef FEAT_MBYTE - if (has_mbyte) -! hotkp += (*mb_ptr2len)(hotkp); - else - #endif - ++hotkp; -! (void)copy_char(r + 1, hotkp, TRUE); - if (dfltbutton) - --dfltbutton; - ---- 3456,3466 ---- - /* advance to next hotkey and set default hotkey */ - #ifdef FEAT_MBYTE - if (has_mbyte) -! hotkp += STRLEN(hotkp); - else - #endif - ++hotkp; -! hotkp[copy_char(r + 1, hotkp, TRUE)] = NUL; - if (dfltbutton) - --dfltbutton; - -*************** -*** 3493,3499 **** - *msgp++ = (dfltbutton == 1) ? ']' : ')'; - - /* redefine hotkey */ -! (void)copy_char(r, hotkp, TRUE); - } - } - else ---- 3493,3499 ---- - *msgp++ = (dfltbutton == 1) ? ']' : ')'; - - /* redefine hotkey */ -! hotkp[copy_char(r, hotkp, TRUE)] = NUL; - } - } - else -*************** -*** 3519,3526 **** - *msgp++ = ':'; - *msgp++ = ' '; - *msgp = NUL; -- mb_ptr_adv(hotkp); -- *hotkp = NUL; - } - else - { ---- 3519,3524 ---- -*************** -*** 3555,3562 **** - msgp = confirm_msg + 1 + STRLEN(message); - hotkp = hotk; - -! /* define first default hotkey */ -! (void)copy_char(buttons, hotkp, TRUE); - - /* Remember where the choices start, displaying starts here when - * "hotkp" typed at the more prompt. */ ---- 3553,3561 ---- - msgp = confirm_msg + 1 + STRLEN(message); - hotkp = hotk; - -! /* Define first default hotkey. Keep the hotkey string NUL -! * terminated to avoid reading past the end. */ -! hotkp[copy_char(buttons, hotkp, TRUE)] = NUL; - - /* Remember where the choices start, displaying starts here when - * "hotkp" typed at the more prompt. */ -*** ../vim-7.1.019/src/version.c Thu Jul 5 09:53:20 2007 ---- src/version.c Thu Jul 5 10:09:34 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 20, - /**/ - --- -BLACK KNIGHT: Come on you pansy! - [hah] [parry thrust] - [ARTHUR chops the BLACK KNIGHT's right arm off] -ARTHUR: Victory is mine! [kneeling] - We thank thee Lord, that in thy merc- - [Black Knight kicks Arthur in the head while he is praying] - The Quest for the Holy Grail (Monty Python) - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.022 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.022 -Problem: When setting 'keymap' twice the b:keymap_name variable isn't set. - (Milan Berta) -Solution: Don't unlet b:keymap_name for ":loadkeymap". (Martin Toft) -Files: src/digraph.c - - -*** ../vim-7.1.021/src/digraph.c Wed May 3 00:07:11 2006 ---- src/digraph.c Mon Jul 2 21:24:30 2007 -*************** -*** 2349,2356 **** - - if (*curbuf->b_p_keymap == NUL) - { -! /* Stop any active keymap and clear the table. */ - keymap_unload(); - } - else - { ---- 2349,2358 ---- - - if (*curbuf->b_p_keymap == NUL) - { -! /* Stop any active keymap and clear the table. Also remove -! * b:keymap_unload, as no keymap is active now. */ - keymap_unload(); -+ do_cmdline_cmd((char_u *)"unlet! b:keymap_name"); - } - else - { -*************** -*** 2500,2506 **** - - ga_clear(&curbuf->b_kmap_ga); - curbuf->b_kmap_state &= ~KEYMAP_LOADED; -- do_cmdline_cmd((char_u *)"unlet! b:keymap_name"); - #ifdef FEAT_WINDOWS - status_redraw_curbuf(); - #endif ---- 2502,2507 ---- -*** ../vim-7.1.021/src/version.c Fri Jul 6 19:42:09 2007 ---- src/version.c Sat Jul 7 13:56:52 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 22, - /**/ - --- -If your life is a hard drive, -Christ can be your backup. - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.023 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.023 -Problem: "dw" in a line with one character deletes the line. Vi and nvi - don't do this. (Kjell Arne Rekaa) -Solution: Check for one-character words especially. -Files: src/search.c - - -*** ../vim-7.1.022/src/search.c Tue Jun 19 12:58:55 2007 ---- src/search.c Thu Jul 5 21:18:55 2007 -*************** -*** 2795,2801 **** - i = inc_cursor(); - if (i == -1 || (i >= 1 && last_line)) /* started at last char in file */ - return FAIL; -! if (i == 1 && eol && count == 0) /* started at last char in line */ - return OK; - - /* ---- 2802,2808 ---- - i = inc_cursor(); - if (i == -1 || (i >= 1 && last_line)) /* started at last char in file */ - return FAIL; -! if (i >= 1 && eol && count == 0) /* started at last char in line */ - return OK; - - /* -*** ../vim-7.1.022/src/version.c Sat Jul 7 13:57:39 2007 ---- src/version.c Tue Jul 10 12:35:36 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 23, - /**/ - --- -BRIDGEKEEPER: What is your favorite editor? -GAWAIN: Emacs ... No, Viiiiiiiiiiimmmmmmm! - "Monty Python and the Holy editor wars" PYTHON (MONTY) SOFTWARE LTD - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.024 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.024 -Problem: Using a pointer that has become invalid. (Chris Monson) -Solution: Obtain the line pointer again after we looked at another line. -Files: src/search.c - - -*** ../vim-7.1.023/src/search.c Tue Jul 10 12:36:51 2007 ---- src/search.c Thu Jul 5 21:18:55 2007 -*************** -*** 2124,2129 **** ---- 2128,2136 ---- - else if (!backwards) - inquote = TRUE; - } -+ -+ /* ml_get() only keeps one line, need to get linep again */ -+ linep = ml_get(pos.lnum); - } - } - } -*** ../vim-7.1.023/src/version.c Tue Jul 10 12:36:51 2007 ---- src/version.c Tue Jul 10 13:06:02 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 24, - /**/ - --- -Q: Why does /dev/null accept only integers? -A: You can't sink a float. - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.025 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.025 -Problem: search() and searchpos() don't use match under cursor at start of - line when using 'bc' flags. (Viktor Kojouharov) -Solution: Don't go to the previous line when the 'c' flag is present. - Also fix that "j" doesn't move the cursor to the right column. -Files: src/eval.c, src/search.c - - -*** ../vim-7.1.024/src/eval.c Tue Jun 19 17:23:46 2007 ---- src/eval.c Thu Jul 5 21:16:31 2007 -*************** -*** 13925,13930 **** ---- 13925,13932 ---- - /* If 'n' flag is used: restore cursor position. */ - if (flags & SP_NOMOVE) - curwin->w_cursor = save_cursor; -+ else -+ curwin->w_set_curswant = TRUE; - theend: - p_ws = save_p_ws; - -*** ../vim-7.1.024/src/search.c Tue Jul 10 13:07:08 2007 ---- src/search.c Thu Jul 5 21:18:55 2007 -*************** -*** 573,580 **** - /* - * Start searching in current line, unless searching backwards and - * we're in column 0. - */ -! if (dir == BACKWARD && start_pos.col == 0) - { - lnum = pos->lnum - 1; - at_first_line = FALSE; ---- 573,584 ---- - /* - * Start searching in current line, unless searching backwards and - * we're in column 0. -+ * If we are searching backwards, in column 0, and not including the -+ * current position, gain some efficiency by skipping back a line. -+ * Otherwise begin the search in the current line. - */ -! if (dir == BACKWARD && start_pos.col == 0 -! && (options & SEARCH_START) == 0) - { - lnum = pos->lnum - 1; - at_first_line = FALSE; -*** ../vim-7.1.024/src/version.c Tue Jul 10 13:07:08 2007 ---- src/version.c Tue Jul 10 13:26:13 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 25, - /**/ - --- -SIGFUN -- signature too funny (core dumped) - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.026 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.026 -Problem: "[p" doesn't work in Visual mode. (David Brown) -Solution: Use checkclearop() instead of checkclearopq(). -Files: src/normal.c - - -*** ../vim-7.1.025/src/normal.c Thu May 10 18:45:26 2007 ---- src/normal.c Wed Jul 4 21:16:36 2007 -*************** -*** 6379,6385 **** - */ - else if (cap->nchar == 'p' || cap->nchar == 'P') - { -! if (!checkclearopq(cap->oap)) - { - prep_redo_cmd(cap); - do_put(cap->oap->regname, ---- 6379,6385 ---- - */ - else if (cap->nchar == 'p' || cap->nchar == 'P') - { -! if (!checkclearop(cap->oap)) - { - prep_redo_cmd(cap); - do_put(cap->oap->regname, -*** ../vim-7.1.025/src/version.c Tue Jul 10 13:27:46 2007 ---- src/version.c Tue Jul 10 14:01:52 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 26, - /**/ - --- -BRIDGEKEEPER: What is the air-speed velocity of an unladen swallow? -ARTHUR: What do you mean? An African or European swallow? -BRIDGEKEEPER: Er ... I don't know that ... Aaaaarrrrrrggghhh! - BRIDGEKEEPER is cast into the gorge. - "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.027 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.027 -Problem: On Sun systems opening /dev/fd/N doesn't work, and they are used - by process substitutions. -Solution: Allow opening specific character special files for Sun systems. - (Gary Johnson) -Files: src/fileio.c, src/os_unix.h - - -*** ../vim-7.1.026/src/fileio.c Thu Jun 28 21:57:08 2007 ---- src/fileio.c Mon Jul 9 11:19:50 2007 -*************** -*** 44,49 **** ---- 44,53 ---- - /* Is there any system that doesn't have access()? */ - #define USE_MCH_ACCESS - -+ #if defined(sun) && defined(S_ISCHR) -+ # define OPEN_CHR_FILES -+ static int is_dev_fd_file(char_u *fname); -+ #endif - #ifdef FEAT_MBYTE - static char_u *next_fenc __ARGS((char_u **pp)); - # ifdef FEAT_EVAL -*************** -*** 406,411 **** ---- 410,419 ---- - # ifdef S_ISSOCK - && !S_ISSOCK(perm) /* ... or socket */ - # endif -+ # ifdef OPEN_CHR_FILES -+ && !(S_ISCHR(perm) && is_dev_fd_file(fname)) -+ /* ... or a character special file named /dev/fd/ */ -+ # endif - ) - { - if (S_ISDIR(perm)) -*************** -*** 2265,2270 **** ---- 2273,2285 ---- - } - # endif - # endif -+ # ifdef OPEN_CHR_FILES -+ if (S_ISCHR(perm)) /* or character special */ -+ { -+ STRCAT(IObuff, _("[character special]")); -+ c = TRUE; -+ } -+ # endif - #endif - if (curbuf->b_p_ro) - { -*************** -*** 2463,2468 **** ---- 2478,2502 ---- - return FAIL; - return OK; - } -+ -+ #ifdef OPEN_CHR_FILES -+ /* -+ * Returns TRUE if the file name argument is of the form "/dev/fd/\d\+", -+ * which is the name of files used for process substitution output by -+ * some shells on some operating systems, e.g., bash on SunOS. -+ * Do not accept "/dev/fd/[012]", opening these may hang Vim. -+ */ -+ static int -+ is_dev_fd_file(fname) -+ char_u *fname; -+ { -+ return (STRNCMP(fname, "/dev/fd/", 8) == 0 -+ && VIM_ISDIGIT(fname[8]) -+ && *skipdigits(fname + 9) == NUL -+ && (fname[9] != NUL -+ || (fname[8] != '0' && fname[8] != '1' && fname[8] != '2'))); -+ } -+ #endif - - #ifdef FEAT_MBYTE - -*** ../vim-7.1.026/src/os_unix.h Thu May 10 19:43:10 2007 ---- src/os_unix.h Sat Jul 7 13:08:56 2007 -*************** -*** 508,513 **** ---- 508,516 ---- - #if !defined(S_ISFIFO) && defined(S_IFIFO) - # define S_ISFIFO(m) (((m) & S_IFMT) == S_IFIFO) - #endif -+ #if !defined(S_ISCHR) && defined(S_IFCHR) -+ # define S_ISCHR(m) (((m) & S_IFMT) == S_IFCHR) -+ #endif - - /* Note: Some systems need both string.h and strings.h (Savage). However, - * some systems can't handle both, only use string.h in that case. */ -*** ../vim-7.1.026/src/version.c Tue Jul 10 14:02:51 2007 ---- src/version.c Tue Jul 10 17:00:43 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 27, - /**/ - --- -Every exit is an entrance into something else. - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.028 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.028 -Problem: Can't use last search pattern for ":sort". (Brian McKee) -Solution: When the pattern is emtpy use the last search pattern. (Martin - Toft) -Files: runtime/doc/change.txt, src/ex_cmds.c - - -*** ../vim-7.1.027/runtime/doc/change.txt Sat May 12 16:10:12 2007 ---- runtime/doc/change.txt Tue Jul 10 11:30:56 2007 -*************** -*** 1571,1576 **** ---- 1571,1580 ---- - in their original order, right before the sorted - lines. - -+ If {pattern} is empty (e.g. // is specified), the -+ last search pattern is used. This allows trying out -+ a pattern first. -+ - Note that using ":sort" with ":global" doesn't sort the matching lines, it's - quite useless. - -*** ../vim-7.1.027/src/ex_cmds.c Thu Jun 28 21:57:08 2007 ---- src/ex_cmds.c Tue Jul 10 17:25:10 2007 -*************** -*** 408,414 **** - goto sortend; - } - *s = NUL; -! regmatch.regprog = vim_regcomp(p + 1, RE_MAGIC); - if (regmatch.regprog == NULL) - goto sortend; - p = s; /* continue after the regexp */ ---- 408,418 ---- - goto sortend; - } - *s = NUL; -! /* Use last search pattern if sort pattern is empty. */ -! if (s == p + 1 && last_search_pat() != NULL) -! regmatch.regprog = vim_regcomp(last_search_pat(), RE_MAGIC); -! else -! regmatch.regprog = vim_regcomp(p + 1, RE_MAGIC); - if (regmatch.regprog == NULL) - goto sortend; - p = s; /* continue after the regexp */ -*** ../vim-7.1.027/src/version.c Tue Jul 10 17:09:51 2007 ---- src/version.c Tue Jul 10 17:20:01 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 28, - /**/ - --- -Every person is responsible for the choices he makes. - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.029 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.029 (after 7.1.019) -Problem: Can't compile when all interfaces are used. (Taylor Venable) -Solution: Only check for ex_script_ni when it's defined. -Files: src/ex_docmd.c - - -*** ../vim-7.1.028/src/ex_docmd.c Thu Jul 5 09:53:20 2007 ---- src/ex_docmd.c Sun Jul 15 17:20:09 2007 -*************** -*** 133,138 **** ---- 133,139 ---- - static void get_flags __ARGS((exarg_T *eap)); - #if !defined(FEAT_PERL) || !defined(FEAT_PYTHON) || !defined(FEAT_TCL) \ - || !defined(FEAT_RUBY) || !defined(FEAT_MZSCHEME) -+ # define HAVE_EX_SCRIPT_NI - static void ex_script_ni __ARGS((exarg_T *eap)); - #endif - static char_u *invalid_range __ARGS((exarg_T *eap)); -*************** -*** 2119,2125 **** - !USER_CMDIDX(ea.cmdidx) && - #endif - (cmdnames[ea.cmdidx].cmd_func == ex_ni -! || cmdnames[ea.cmdidx].cmd_func == ex_script_ni)); - - #ifndef FEAT_EVAL - /* ---- 2120,2129 ---- - !USER_CMDIDX(ea.cmdidx) && - #endif - (cmdnames[ea.cmdidx].cmd_func == ex_ni -! #ifdef HAVE_EX_SCRIPT_NI -! || cmdnames[ea.cmdidx].cmd_func == ex_script_ni -! #endif -! )); - - #ifndef FEAT_EVAL - /* -*************** -*** 3998,4005 **** - eap->errmsg = (char_u *)N_("E319: Sorry, the command is not available in this version"); - } - -! #if !defined(FEAT_PERL) || !defined(FEAT_PYTHON) || !defined(FEAT_TCL) \ -! || !defined(FEAT_RUBY) || !defined(FEAT_MZSCHEME) - /* - * Function called for script command which is Not Implemented. NI! - * Skips over ":perl <errmsg = (char_u *)N_("E319: Sorry, the command is not available in this version"); - } - -! #ifdef HAVE_EX_SCRIPT_NI - /* - * Function called for script command which is Not Implemented. NI! - * Skips over ":perl < -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.030 -Problem: The "vimtutor" shell script checks for "vim6" but not for "vim7". - (Christian Robinson) -Solution: Check for more versions, but prefer using "vim". -Files: src/vimtutor - - -*** ../vim-7.1.029/src/vimtutor Sun Jun 13 20:37:33 2004 ---- src/vimtutor Sun Jul 8 17:16:29 2007 -*************** -*** 39,56 **** - # remove the copy of the tutor on exit - trap "rm -rf $TODELETE" 0 1 2 3 9 11 13 15 - -! # Vim could be called "vim" or "vi". Also check for "vim6", for people who -! # have Vim 5.x installed as "vim" and Vim 6.0 as "vim6". -! testvim=`which vim6 2>/dev/null` -! if test -f "$testvim"; then -! VIM=vim6 -! else -! testvim=`which vim` - if test -f "$testvim"; then -! VIM=vim -! else -! VIM=vi - fi - fi - - # Use Vim to copy the tutor, it knows the value of $VIMRUNTIME ---- 39,60 ---- - # remove the copy of the tutor on exit - trap "rm -rf $TODELETE" 0 1 2 3 9 11 13 15 - -! # Vim could be called "vim" or "vi". Also check for "vimN", for people who -! # have Vim installed with its version number. -! # We anticipate up to a future Vim 8 version :-). -! seq="vim vim8 vim75 vim74 vim73 vim72 vim71 vim70 vim7 vim6 vi" -! for i in $seq; do -! testvim=`which $i 2>/dev/null` - if test -f "$testvim"; then -! VIM=$i -! break - fi -+ done -+ -+ # When no Vim version was found fall back to "vim", you'll get an error message -+ # below. -+ if test -z "$VIM"; then -+ VIM=vim - fi - - # Use Vim to copy the tutor, it knows the value of $VIMRUNTIME -*** ../vim-7.1.029/src/version.c Mon Jul 16 20:38:56 2007 ---- src/version.c Tue Jul 17 14:30:51 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 30, - /**/ - --- -BLACK KNIGHT: I'm invincible! -ARTHUR: You're a looney. - "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.031 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.031 -Problem: virtcol([123, '$']) doesn't work. (Michael Schaap) -Solution: When '$' is used for the column number get the last column. -Files: runtime/doc/eval.txt, src/eval.c - - -*** ../vim-7.1.030/runtime/doc/eval.txt Tue Jun 19 17:23:46 2007 ---- runtime/doc/eval.txt Wed Jul 11 21:21:28 2007 -*************** -*** 1,4 **** -! *eval.txt* For Vim version 7.1. Last change: 2007 Jun 09 - - - VIM REFERENCE MANUAL by Bram Moolenaar ---- 1,4 ---- -! *eval.txt* For Vim version 7.1. Last change: 2007 Jul 11 - - - VIM REFERENCE MANUAL by Bram Moolenaar -*************** -*** 2020,2025 **** ---- 2020,2029 ---- - number of characters in the cursor line plus one) - 'x position of mark x (if the mark is not set, 0 is - returned) -+ Additionally {expr} can be [lnum, col]: a |List| with the line -+ and column number. Most useful when the column is "$", to get -+ the las column of a specific line. When "lnum" or "col" is -+ out of range then col() returns zero. - To get the line number use |line()|. To get both use - |getpos()|. - For the screen column position use |virtcol()|. -*************** -*** 5024,5037 **** - position, the returned Number will be the column at the end of - the . For example, for a in column 1, with 'ts' - set to 8, it returns 8. -! For the use of {expr} see |col()|. Additionally you can use -! [lnum, col]: a |List| with the line and column number. When -! "lnum" or "col" is out of range then virtcol() returns zero. -! When 'virtualedit' is used it can be [lnum, col, off], where - "off" is the offset in screen columns from the start of the - character. E.g., a position within a or after the last - character. -- For the byte position use |col()|. - When Virtual editing is active in the current mode, a position - beyond the end of the line can be returned. |'virtualedit'| - The accepted positions are: ---- 5029,5040 ---- - position, the returned Number will be the column at the end of - the . For example, for a in column 1, with 'ts' - set to 8, it returns 8. -! For the byte position use |col()|. -! For the use of {expr} see |col()|. -! When 'virtualedit' is used {expr} can be [lnum, col, off], where - "off" is the offset in screen columns from the start of the - character. E.g., a position within a or after the last - character. - When Virtual editing is active in the current mode, a position - beyond the end of the line can be returned. |'virtualedit'| - The accepted positions are: -*** ../vim-7.1.030/src/eval.c Tue Jul 10 13:27:46 2007 ---- src/eval.c Wed Jul 11 19:50:27 2007 -*************** -*** 672,678 **** - static void f_writefile __ARGS((typval_T *argvars, typval_T *rettv)); - - static int list2fpos __ARGS((typval_T *arg, pos_T *posp, int *fnump)); -! static pos_T *var2fpos __ARGS((typval_T *varp, int lnum, int *fnum)); - static int get_env_len __ARGS((char_u **arg)); - static int get_id_len __ARGS((char_u **arg)); - static int get_name_len __ARGS((char_u **arg, char_u **alias, int evaluate, int verbose)); ---- 672,678 ---- - static void f_writefile __ARGS((typval_T *argvars, typval_T *rettv)); - - static int list2fpos __ARGS((typval_T *arg, pos_T *posp, int *fnump)); -! static pos_T *var2fpos __ARGS((typval_T *varp, int dollar_lnum, int *fnum)); - static int get_env_len __ARGS((char_u **arg)); - static int get_id_len __ARGS((char_u **arg)); - static int get_name_len __ARGS((char_u **arg, char_u **alias, int evaluate, int verbose)); -*************** -*** 16505,16513 **** - * Returns NULL when there is an error. - */ - static pos_T * -! var2fpos(varp, lnum, fnum) - typval_T *varp; -! int lnum; /* TRUE when $ is last line */ - int *fnum; /* set to fnum for '0, 'A, etc. */ - { - char_u *name; ---- 16508,16516 ---- - * Returns NULL when there is an error. - */ - static pos_T * -! var2fpos(varp, dollar_lnum, fnum) - typval_T *varp; -! int dollar_lnum; /* TRUE when $ is last line */ - int *fnum; /* set to fnum for '0, 'A, etc. */ - { - char_u *name; -*************** -*** 16520,16525 **** ---- 16523,16529 ---- - list_T *l; - int len; - int error = FALSE; -+ listitem_T *li; - - l = varp->vval.v_list; - if (l == NULL) -*************** -*** 16535,16540 **** ---- 16539,16552 ---- - if (error) - return NULL; - len = (long)STRLEN(ml_get(pos.lnum)); -+ -+ /* We accept "$" for the column number: last column. */ -+ li = list_find(l, 1L); -+ if (li != NULL && li->li_tv.v_type == VAR_STRING -+ && li->li_tv.vval.v_string != NULL -+ && STRCMP(li->li_tv.vval.v_string, "$") == 0) -+ pos.col = len + 1; -+ - /* Accept a position up to the NUL after the line. */ - if (pos.col == 0 || (int)pos.col > len + 1) - return NULL; /* invalid column number */ -*************** -*** 16567,16573 **** - pos.coladd = 0; - #endif - -! if (name[0] == 'w' && lnum) - { - pos.col = 0; - if (name[1] == '0') /* "w0": first visible line */ ---- 16579,16585 ---- - pos.coladd = 0; - #endif - -! if (name[0] == 'w' && dollar_lnum) - { - pos.col = 0; - if (name[1] == '0') /* "w0": first visible line */ -*************** -*** 16585,16591 **** - } - else if (name[0] == '$') /* last column or line */ - { -! if (lnum) - { - pos.lnum = curbuf->b_ml.ml_line_count; - pos.col = 0; ---- 16597,16603 ---- - } - else if (name[0] == '$') /* last column or line */ - { -! if (dollar_lnum) - { - pos.lnum = curbuf->b_ml.ml_line_count; - pos.col = 0; -*** ../vim-7.1.030/src/version.c Tue Jul 17 14:32:07 2007 ---- src/version.c Tue Jul 17 16:24:54 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 31, - /**/ - --- -CRONE: Who sent you? -ARTHUR: The Knights Who Say GNU! -CRONE: Aaaagh! (she looks around in rear) No! We have no licenses here. - "Monty Python and the Holy editor wars" PYTHON (MONTY) SOFTWARE LTD - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.032 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.032 -Problem: Potential crash when editing a command line. (Chris Monson) -Solution: Check the position to avoid access before the start of an array. -Files: src/ex_getln.c - - -*** ../vim-7.1.031/src/ex_getln.c Thu May 10 20:22:29 2007 ---- src/ex_getln.c Tue Jul 17 18:05:49 2007 -*************** -*** 484,490 **** - if (xpc.xp_context == EXPAND_MENUNAMES && p_wmnu) - { - /* Hitting after "emenu Name.": complete submenu */ -! if (ccline.cmdbuff[ccline.cmdpos - 1] == '.' && c == K_DOWN) - c = p_wc; - else if (c == K_UP) - { ---- 486,493 ---- - if (xpc.xp_context == EXPAND_MENUNAMES && p_wmnu) - { - /* Hitting after "emenu Name.": complete submenu */ -! if (c == K_DOWN && ccline.cmdpos > 0 -! && ccline.cmdbuff[ccline.cmdpos - 1] == '.') - c = p_wc; - else if (c == K_UP) - { -*************** -*** 533,541 **** - upseg[3] = PATHSEP; - upseg[4] = NUL; - -! if (ccline.cmdbuff[ccline.cmdpos - 1] == PATHSEP -! && c == K_DOWN -! && (ccline.cmdbuff[ccline.cmdpos - 2] != '.' - || ccline.cmdbuff[ccline.cmdpos - 3] != '.')) - { - /* go down a directory */ ---- 536,546 ---- - upseg[3] = PATHSEP; - upseg[4] = NUL; - -! if (c == K_DOWN -! && ccline.cmdpos > 0 -! && ccline.cmdbuff[ccline.cmdpos - 1] == PATHSEP -! && (ccline.cmdpos < 3 -! || ccline.cmdbuff[ccline.cmdpos - 2] != '.' - || ccline.cmdbuff[ccline.cmdpos - 3] != '.')) - { - /* go down a directory */ -*************** -*** 730,737 **** - /* In Ex mode a backslash escapes a newline. */ - if (exmode_active - && c != ESC -- && ccline.cmdpos > 0 - && ccline.cmdpos == ccline.cmdlen - && ccline.cmdbuff[ccline.cmdpos - 1] == '\\') - { - if (c == K_KENTER) ---- 735,742 ---- - /* In Ex mode a backslash escapes a newline. */ - if (exmode_active - && c != ESC - && ccline.cmdpos == ccline.cmdlen -+ && ccline.cmdpos > 0 - && ccline.cmdbuff[ccline.cmdpos - 1] == '\\') - { - if (c == K_KENTER) -*** ../vim-7.1.031/src/version.c Tue Jul 17 16:31:15 2007 ---- src/version.c Tue Jul 17 18:10:37 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 32, - /**/ - --- -ALL: A witch! A witch! -WITCH: It's a fair cop. -ALL: Burn her! Burn her! Let's make her into a ladder. - "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.033 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.033 -Problem: A buffer is marked modified when it was first deleted and then - added again using a ":next" command. (John Mullin) -Solution: When checking if a buffer is modified use the BF_NEVERLOADED flag. -Files: src/option.c - - -*** ../vim-7.1.032/src/option.c Tue Jun 19 20:56:52 2007 ---- src/option.c Sun Jul 22 16:42:47 2007 -*************** -*** 10624,10629 **** ---- 10624,10632 ---- - file_ff_differs(buf) - buf_T *buf; - { -+ /* In a buffer that was never loaded the options are not valid. */ -+ if (buf->b_flags & BF_NEVERLOADED) -+ return FALSE; - if ((buf->b_flags & BF_NEW) - && buf->b_ml.ml_line_count == 1 - && *ml_get_buf(buf, (linenr_T)1, FALSE) == NUL) -*** ../vim-7.1.032/src/version.c Tue Jul 17 18:14:14 2007 ---- src/version.c Mon Jul 23 09:45:44 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 33, - /**/ - --- -How To Keep A Healthy Level Of Insanity: -8. Don't use any punctuation marks. - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.034 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.034 -Problem: Win64: A few compiler warnings. Problems with optimizer. -Solution: Use int instead of size_t. Disable the optimizer in one function. - (George V. Reilly) -Files: src/eval.c, src/spell.c - - -*** ../vim-7.1.033/src/eval.c Tue Jul 17 16:31:15 2007 ---- src/eval.c Wed Jul 11 19:50:27 2007 -*************** -*** 992,1011 **** - char_u *value; - int value_len; - { -! size_t len; - - if (redir_lval == NULL) - return; - - if (value_len == -1) -! len = STRLEN(value); /* Append the entire string */ - else -! len = value_len; /* Append only "value_len" characters */ - -! if (ga_grow(&redir_ga, (int)len) == OK) - { - mch_memmove((char *)redir_ga.ga_data + redir_ga.ga_len, value, len); -! redir_ga.ga_len += (int)len; - } - else - var_redir_stop(); ---- 992,1011 ---- - char_u *value; - int value_len; - { -! int len; - - if (redir_lval == NULL) - return; - - if (value_len == -1) -! len = (int)STRLEN(value); /* Append the entire string */ - else -! len = value_len; /* Append only "value_len" characters */ - -! if (ga_grow(&redir_ga, len) == OK) - { - mch_memmove((char *)redir_ga.ga_data + redir_ga.ga_len, value, len); -! redir_ga.ga_len += len; - } - else - var_redir_stop(); -*** ../vim-7.1.033/src/spell.c Thu May 10 18:45:53 2007 ---- src/spell.c Sat Jul 14 17:17:52 2007 -*************** -*** 7829,7835 **** - # if (_MSC_VER <= 1200) - /* This line is required for VC6 without the service pack. Also see the - * matching #pragma below. */ -! /* # pragma optimize("", off) */ - # endif - #endif - ---- 7829,7835 ---- - # if (_MSC_VER <= 1200) - /* This line is required for VC6 without the service pack. Also see the - * matching #pragma below. */ -! # pragma optimize("", off) - # endif - #endif - -*************** -*** 7859,7865 **** - - #ifdef _MSC_VER - # if (_MSC_VER <= 1200) -! /* # pragma optimize("", on) */ - # endif - #endif - ---- 7859,7865 ---- - - #ifdef _MSC_VER - # if (_MSC_VER <= 1200) -! # pragma optimize("", on) - # endif - #endif - -*** ../vim-7.1.033/src/version.c Tue Jul 24 09:50:22 2007 ---- src/version.c Tue Jul 24 09:47:17 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 34, - /**/ - --- -How To Keep A Healthy Level Of Insanity: -17. When the money comes out the ATM, scream "I won!, I won! 3rd - time this week!!!!!" - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.035 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.035 -Problem: After ":s/./&/#" all listed lines have a line number. (Yakov - Lerner) -Solution: Reset the line number flag when not using the "&" flag. -Files: src/ex_cmds.c - - -*** ../vim-7.1.034/src/ex_cmds.c Tue Jul 10 17:25:20 2007 ---- src/ex_cmds.c Sat Jul 14 14:39:38 2007 -*************** -*** 4316,4321 **** ---- 4316,4322 ---- - do_error = TRUE; - do_print = FALSE; - do_count = FALSE; -+ do_number = FALSE; - do_ic = 0; - } - while (*cmd) -*** ../vim-7.1.034/src/version.c Tue Jul 24 10:44:10 2007 ---- src/version.c Tue Jul 24 11:15:09 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 35, - /**/ - --- -The startling truth finally became apparent, and it was this: Numbers -written on restaurant checks within the confines of restaurants do not follow -the same mathematical laws as numbers written on any other pieces of paper in -any other parts of the Universe. This single statement took the scientific -world by storm. So many mathematical conferences got held in such good -restaurants that many of the finest minds of a generation died of obesity and -heart failure, and the science of mathematics was put back by years. - -- Douglas Adams, "The Hitchhiker's Guide to the Galaxy" - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.036 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.036 -Problem: Completing ":echohl" argument should include "None". (Ori - Avtalion) ":match" should have "none" too. -Solution: Add flags to use expand_highlight(). Also fix that when disabling - FEAT_CMDL_COMPL compilation fails. (Chris Lubinski) -Files: src/eval.c, src/ex_docmd.c, src/ex_getln.c, src/proto/syntax.pro - src/syntax.c - - -*** ../vim-7.1.035/src/eval.c Tue Jul 24 10:44:10 2007 ---- src/eval.c Wed Jul 11 19:50:27 2007 -*************** -*** 1411,1417 **** - } - - -! #if (defined(FEAT_USR_CMDS) && defined(FEAT_CMDL_COMPL)) || defined(PROTO) - /* - * Call some vimL function and return the result in "*rettv". - * Uses argv[argc] for the function arguments. ---- 1411,1418 ---- - } - - -! #if (defined(FEAT_USR_CMDS) && defined(FEAT_CMDL_COMPL)) \ -! || defined(FEAT_COMPL_FUNC) || defined(PROTO) - /* - * Call some vimL function and return the result in "*rettv". - * Uses argv[argc] for the function arguments. -*************** -*** 1484,1489 **** ---- 1485,1491 ---- - return ret; - } - -+ # if (defined(FEAT_USR_CMDS) && defined(FEAT_CMDL_COMPL)) || defined(PROTO) - /* - * Call vimL function "func" and return the result as a string. - * Returns NULL when calling the function fails. -*************** -*** 1506,1513 **** - clear_tv(&rettv); - return retval; - } - -! #if defined(FEAT_COMPL_FUNC) || defined(PROTO) - /* - * Call vimL function "func" and return the result as a number. - * Returns -1 when calling the function fails. ---- 1508,1516 ---- - clear_tv(&rettv); - return retval; - } -+ # endif - -! # if defined(FEAT_COMPL_FUNC) || defined(PROTO) - /* - * Call vimL function "func" and return the result as a number. - * Returns -1 when calling the function fails. -*************** -*** 1530,1536 **** - clear_tv(&rettv); - return retval; - } -! #endif - - /* - * Call vimL function "func" and return the result as a list ---- 1533,1539 ---- - clear_tv(&rettv); - return retval; - } -! # endif - - /* - * Call vimL function "func" and return the result as a list -*************** -*** 1556,1563 **** - - return rettv.vval.v_list; - } -- - #endif - - /* - * Save the current function call pointer, and set it to NULL. ---- 1559,1566 ---- - - return rettv.vval.v_list; - } - #endif -+ - - /* - * Save the current function call pointer, and set it to NULL. -*** ../vim-7.1.035/src/ex_docmd.c Mon Jul 16 20:38:56 2007 ---- src/ex_docmd.c Sun Jul 15 17:20:09 2007 -*************** -*** 3406,3419 **** - case CMD_windo: - return arg; - -! #ifdef FEAT_SEARCH_EXTRA - case CMD_match: - if (*arg == NUL || !ends_excmd(*arg)) - { -! /* Dummy call to clear variables. */ -! set_context_in_highlight_cmd(xp, (char_u *)"link n"); -! xp->xp_context = EXPAND_HIGHLIGHT; -! xp->xp_pattern = arg; - arg = skipwhite(skiptowhite(arg)); - if (*arg != NUL) - { ---- 3406,3418 ---- - case CMD_windo: - return arg; - -! #ifdef FEAT_CMDL_COMPL -! # ifdef FEAT_SEARCH_EXTRA - case CMD_match: - if (*arg == NUL || !ends_excmd(*arg)) - { -! /* also complete "None" */ -! set_context_in_echohl_cmd(xp, arg); - arg = skipwhite(skiptowhite(arg)); - if (*arg != NUL) - { -*************** -*** 3422,3430 **** - } - } - return find_nextcmd(arg); -! #endif - -- #ifdef FEAT_CMDL_COMPL - /* - * All completion for the +cmdline_compl feature goes here. - */ ---- 3421,3428 ---- - } - } - return find_nextcmd(arg); -! # endif - - /* - * All completion for the +cmdline_compl feature goes here. - */ -*************** -*** 3622,3629 **** - break; - - case CMD_echohl: -! xp->xp_context = EXPAND_HIGHLIGHT; -! xp->xp_pattern = arg; - break; - #endif - case CMD_highlight: ---- 3620,3626 ---- - break; - - case CMD_echohl: -! set_context_in_echohl_cmd(xp, arg); - break; - #endif - case CMD_highlight: -*** ../vim-7.1.035/src/ex_getln.c Tue Jul 17 18:14:14 2007 ---- src/ex_getln.c Tue Jul 17 18:05:49 2007 -*************** -*** 268,274 **** ---- 268,276 ---- - { - xpc.xp_context = ccline.xp_context; - xpc.xp_pattern = ccline.cmdbuff; -+ # if defined(FEAT_USR_CMDS) && defined(FEAT_CMDL_COMPL) - xpc.xp_arg = ccline.xp_arg; -+ # endif - } - #endif - -*************** -*** 4151,4163 **** ---- 4153,4171 ---- - - #ifdef FEAT_EVAL - if (ccline.cmdfirstc == '=') -+ { -+ # ifdef FEAT_CMDL_COMPL - /* pass CMD_SIZE because there is no real command */ - set_context_for_expression(xp, str, CMD_SIZE); -+ # endif -+ } - else if (ccline.input_fn) - { - xp->xp_context = ccline.xp_context; - xp->xp_pattern = ccline.cmdbuff; -+ # if defined(FEAT_USR_CMDS) && defined(FEAT_CMDL_COMPL) - xp->xp_arg = ccline.xp_arg; -+ # endif - } - else - #endif -*************** -*** 4504,4509 **** ---- 4512,4523 ---- - /* Sort the results. Keep menu's in the specified order. */ - if (xp->xp_context != EXPAND_MENUNAMES && xp->xp_context != EXPAND_MENUS) - sort_strings(*file, *num_file); -+ -+ #ifdef FEAT_CMDL_COMPL -+ /* Reset the variables used for special highlight names expansion, so that -+ * they don't show up when getting normal highlight names by ID. */ -+ reset_expand_highlight(); -+ #endif - - return OK; - } -*** ../vim-7.1.035/src/proto/syntax.pro Sat May 5 19:23:52 2007 ---- src/proto/syntax.pro Fri Jul 13 19:51:43 2007 -*************** -*** 8,13 **** ---- 8,15 ---- - void syntax_clear __ARGS((buf_T *buf)); - void ex_syntax __ARGS((exarg_T *eap)); - int syntax_present __ARGS((buf_T *buf)); -+ void reset_expand_highlight __ARGS((void)); -+ void set_context_in_echohl_cmd __ARGS((expand_T *xp, char_u *arg)); - void set_context_in_syntax_cmd __ARGS((expand_T *xp, char_u *arg)); - char_u *get_syntax_name __ARGS((expand_T *xp, int idx)); - int syn_get_id __ARGS((win_T *wp, long lnum, colnr_T col, int trans, int *spellp)); -*** ../vim-7.1.035/src/syntax.c Thu Jun 28 11:59:13 2007 ---- src/syntax.c Fri Jul 13 19:51:39 2007 -*************** -*** 66,73 **** - #define HL_TABLE() ((struct hl_group *)((highlight_ga.ga_data))) - - #ifdef FEAT_CMDL_COMPL -! static int include_default = FALSE; /* include "default" for expansion */ -! static int include_link = FALSE; /* include "link" for expansion */ - #endif - - /* ---- 66,75 ---- - #define HL_TABLE() ((struct hl_group *)((highlight_ga.ga_data))) - - #ifdef FEAT_CMDL_COMPL -! /* Flags to indicate an additional string for highlight name completion. */ -! static int include_none = 0; /* when 1 include "None" */ -! static int include_default = 0; /* when 1 include "default" */ -! static int include_link = 0; /* when 2 include "link" and "clear" */ - #endif - - /* -*************** -*** 5968,5973 **** @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Fri Dec 19 20:11:49 2008 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Fri, 19 Dec 2008 19:11:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[2675] csw/mgar/pkg/gvim/trunk Message-ID: Revision: 2675 http://gar.svn.sourceforge.net/gar/?rev=2675&view=rev Author: harpchad Date: 2008-12-19 19:11:49 +0000 (Fri, 19 Dec 2008) Log Message: ----------- - Updated for vim72 - Removed patches available from vim.org from gar svn, they will be downloaded at build time - Added GNOME desktop integration (gvim.desktop) Modified Paths: -------------- csw/mgar/pkg/gvim/trunk/Makefile csw/mgar/pkg/gvim/trunk/checksums csw/mgar/pkg/gvim/trunk/files/CSWgvim.prototype Added Paths: ----------- csw/mgar/pkg/gvim/trunk/files/gvim.desktop Removed Paths: ------------- csw/mgar/pkg/gvim/trunk/files/7.1.001-147 Modified: csw/mgar/pkg/gvim/trunk/Makefile =================================================================== --- csw/mgar/pkg/gvim/trunk/Makefile 2008-12-19 18:51:27 UTC (rev 2674) +++ csw/mgar/pkg/gvim/trunk/Makefile 2008-12-19 19:11:49 UTC (rev 2675) @@ -1,7 +1,7 @@ GARNAME = vim -DISTVERSION = 7.1 +DISTVERSION = 7.2 CATEGORIES = utils - +SPKG_SOURCEURL = http://www.vim.org/download.php DESCRIPTION = Vi IMproved with GTK+ support define BLURB Vim is an almost fully-compatible version of the Unix editor Vi. Many new @@ -15,6 +15,7 @@ include ../vim/files/config.mk DISTFILES += $(call admfiles,CSWgvim,prototype depend) +DISTFILES += gvim.desktop CONFIGURE_ARGS += --with-vim-name="vim-x11" CONFIGURE_ARGS += --enable-gui=gnome2 @@ -31,7 +32,11 @@ # Don't install the runtime install-minimal: @$(INSTALL_ENV) $(MAKE) -C $(WORKSRC)/src \ - installvimbin installlinks installtools + installvimbin installlinks installtools installgtutorbin + mkdir -p $(DESTDIR)/opt/csw/share/pixmaps + cp $(WORKSRC)/runtime/vim48x48.png $(DESTDIR)/opt/csw/share/pixmaps/gvim.png + mkdir -p $(DESTDIR)/opt/csw/share/applications + cp $(DOWNLOADDIR)/gvim.desktop $(DESTDIR)/opt/csw/share/applications/gvim.desktop + mv $(DESTDIR)/opt/csw/bin/gvim-x11tutor $(DESTDIR)/opt/csw/bin/gvimtutor @$(MAKECOOKIE) $(DONADA) - Modified: csw/mgar/pkg/gvim/trunk/checksums =================================================================== --- csw/mgar/pkg/gvim/trunk/checksums 2008-12-19 18:51:27 UTC (rev 2674) +++ csw/mgar/pkg/gvim/trunk/checksums 2008-12-19 19:11:49 UTC (rev 2675) @@ -1,8 +1,77 @@ -44c6b4914f38d6f9aa959640b89da329 download/vim-7.1.tar.bz2 -144aa049ba70621acf4247f0459f3ee7 download/vim-7.1-lang.tar.gz -605cc7ae31bcc9d7864bb0bb6025f55d download/vim-7.1-extra.tar.gz +7c2dc4a956cf315e546e347bc349968c download/7.2.001 +7f16f80814f1e071a689806c2056b39d download/7.2.002 +0de916fdfd450a4a0d95bed44ae2c398 download/7.2.003 +25cc99ad42b25b16a4610e2fad9cdab4 download/7.2.004 +a5b7b1c7c5b75aa7d730b0b9aa491558 download/7.2.005 +a93a72cd40c37da91dc634dc8dddefec download/7.2.006 +c2b2b63dea27ddad92668e63797406c5 download/7.2.007 +e65c8c2223eea5289d8cbef2e867a5de download/7.2.008 +ab1566b69bd0e0c82a866f00675ffe0e download/7.2.009 +d69f559bfb5436c157e8069a829ca50d download/7.2.010 +05334a6bb31402bfd49d82ea6f59a57b download/7.2.011 +a11dcd5552f36544a9e27978b5359935 download/7.2.012 +8bc70978291aadea9c82072b623c955d download/7.2.013 +a87826187cb77ad2e567a40c1609eea4 download/7.2.014 +47a466fbfdbca616f519fc4afa0432df download/7.2.015 +fd08bac73d7ffcabf53bd25a63dff893 download/7.2.016 +0f0284d87f6f52101802dbe1a45d54c3 download/7.2.017 +38d06ba325b716c1177c1012d781bada download/7.2.018 +661ca021fb70c24ef4df229512cfb14b download/7.2.019 +cb2c5ca0f9a9718fb635874925432dd8 download/7.2.020 +9073d2311ae7101c143237a45afb4efa download/7.2.021 +48ccb0deec77a3bb91bf967dacb43492 download/7.2.022 +d77ed8aa4de30d4dbd17a7998ae8f269 download/7.2.023 +cf983237e5e866ef459870fee2754bac download/7.2.024 +ab32defa4b2cfb509ccb34d4858b1223 download/7.2.025 +5e96c227c7765b1e0f03f44cb5b750f6 download/7.2.026 +f26b7ee0f271eacbb3652dbdf92dd860 download/7.2.027 +fc54a3d35bdc7b7a7660c6d2274f7b74 download/7.2.028 +d53630dc8f3a823f54dfba73dcd47b36 download/7.2.029 +208f8ed2db2665ebfc17674f78d47c6d download/7.2.030 +3387583af86faa78e10be979214071f3 download/7.2.031 +eca017686205ec8658bf9fa8c73f7af6 download/7.2.032 +88c91b84ffc772fd57f86475f7ba90f1 download/7.2.033 +c3d6eaaa0b74df423f90afaaafa3a0de download/7.2.034 +f4c35dae581d671dc271407d377f7199 download/7.2.035 +0ae8b6ed636fc013e2fa6bdabc182041 download/7.2.036 +1c6501c366cc8df205955f3e4d3ebba9 download/7.2.037 +ed3479ddb4ded7b74c82af5e50b0e4a6 download/7.2.038 +2a61f28f6f793c5a43abded6e59b6506 download/7.2.039 +4c493255ae227498016f30a0002ec1cc download/7.2.040 +66bde35426c09d9c666e23215f9a19c9 download/7.2.041 +99baedef8a9c908774b7ed74deacf184 download/7.2.042 +87035b208c9377c28d796b1e48ab8aac download/7.2.043 +b127def242996b4e7d7e870cab3e4b45 download/7.2.044 +5233327e4c97d310e3793b223892ea8d download/7.2.045 +9ecfa0454f5a329996b273cb12369962 download/7.2.046 +35e16f4e7198e861a71322fee2cb7909 download/7.2.047 +84ef9658181f49bfbd7a61ec87dd0b8d download/7.2.048 +fc9b65eef81954f6006c307ff11be925 download/7.2.049 +27a9700e39e266a31df702677acea52c download/7.2.050 +89ce3f5b513510fb288a4a301e7494c7 download/7.2.051 +5992bb56b07a9b9b4e3504f1f2f2c79c download/7.2.052 +3fe570c1317fee8a71ede17197358e02 download/7.2.053 +5b047e8e8413c4807d74a6d9716474a2 download/7.2.054 +c276080d95de2fafa9706f247c35ff74 download/7.2.055 +5b65e2654a78dcc4c15dc49dbce5418e download/7.2.056 +cab5a9ddf0ab180089d84bf9ec685574 download/7.2.057 +80991ff846f88222e3266dab6b07e2b8 download/7.2.058 +89cede639caf8beed5ea071790445e26 download/7.2.059 +9781d833263060308a9622dd097ad378 download/7.2.060 +71b4bc625bc1cdd68747262d329db551 download/7.2.061 +9243a773d19966dbfd98b7aff3fe3ab7 download/7.2.062 +08155711f8db2dfce217ec5a34253a76 download/7.2.063 +fd692f9624ec0170800b3d9a2a9a53cb download/7.2.064 +ee1a8dc311c7580608e3bd2196a7d042 download/7.2.065 +8d1d5f8aefabf0abcb54de5247893246 download/7.2.066 +fa0ccca2decdd2db64947658b04b8c99 download/7.2.067 +ca5ab057205023613020ca920d903028 download/7.2.068 +f3e6f3dd76278a9f7e396955faa4ca31 download/7.2.069 +35e04482f07c57221c9a751aaa3b8dac download/vim-7.2-extra.tar.gz +d8884786979e0e520c112faf2e176f05 download/vim-7.2-lang.tar.gz +f0901284b338e448bfd79ccca0041254 download/vim-7.2.tar.bz2 +582717146f6bbd5b73db83a2f62e62a5 download/vimtutor.diff +2f6bf1938bfdc77a305903e70e3d1de2 download/CSWgvim.depend 3d2b62d6810417d562ed17aaada29868 download/CSWgvim.gspec -777d000bb1697e8ab2f16f2b9428c606 download/CSWgvim.prototype -2f6bf1938bfdc77a305903e70e3d1de2 download/CSWgvim.depend -79130ead83c4e2cd7dfdc9af4fc12fe5 download/7.1.001-147 -b07127874fa23a87bc703ec710be530c download/vimtutor.diff +2b8beca0088c83291df67af00616a197 download/CSWgvim.prototype +47396843634a6e3c05d4f5d6b4bf8a72 download/gvim.desktop Deleted: csw/mgar/pkg/gvim/trunk/files/7.1.001-147 =================================================================== --- csw/mgar/pkg/gvim/trunk/files/7.1.001-147 2008-12-19 18:51:27 UTC (rev 2674) +++ csw/mgar/pkg/gvim/trunk/files/7.1.001-147 2008-12-19 19:11:49 UTC (rev 2675) @@ -1 +0,0 @@ -link ../../vim/files/7.1.001-147 \ No newline at end of file Modified: csw/mgar/pkg/gvim/trunk/files/CSWgvim.prototype =================================================================== --- csw/mgar/pkg/gvim/trunk/files/CSWgvim.prototype 2008-12-19 18:51:27 UTC (rev 2674) +++ csw/mgar/pkg/gvim/trunk/files/CSWgvim.prototype 2008-12-19 19:11:49 UTC (rev 2675) @@ -1,7 +1,15 @@ d none /opt/csw/bin 0755 root bin f none /opt/csw/bin/vim-x11 0755 root bin +s none /opt/csw/bin/evim=vim-x11 +s none /opt/csw/bin/eview=vim-x11 s none /opt/csw/bin/gview=vim-x11 s none /opt/csw/bin/gvim=vim-x11 s none /opt/csw/bin/gvimdiff=vim-x11 s none /opt/csw/bin/rgview=vim-x11 s none /opt/csw/bin/rgvim=vim-x11 +f none /opt/csw/bin/gvimtutor 0755 root bin +d none /opt/csw/share 0755 root bin +d none /opt/csw/share/pixmaps 0755 root bin +f none /opt/csw/share/pixmaps/gvim.png 0644 root bin +d none /opt/csw/share/applications 0755 root bin +f none /opt/csw/share/applications/gvim.desktop 0644 root bin Added: csw/mgar/pkg/gvim/trunk/files/gvim.desktop =================================================================== --- csw/mgar/pkg/gvim/trunk/files/gvim.desktop (rev 0) +++ csw/mgar/pkg/gvim/trunk/files/gvim.desktop 2008-12-19 19:11:49 UTC (rev 2675) @@ -0,0 +1,79 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=GVim Text Editor +Comment=Edit text files +Comment[af]=Redigeer teksl?ers +Comment[am]=???? ???? ?????? +Comment[ar]=???? ????? ???? +Comment[az]=M?tn fayllar?n? redakt? edin +Comment[be]=???????????? ????????? ?????? +Comment[bg]=??????????? ?? ???????? ??????? +Comment[bn]=??????? ???? ???? ???? +Comment[bs]=Izmijeni tekstualne datoteke +Comment[ca]=Edita fitxers de text +Comment[cs]=?prava textov?ch soubor? +Comment[cy]=Golygu ffeiliau testun +Comment[da]=Redig?r tekstfiler +Comment[de]=Textdateien bearbeiten +Comment[el]=??????????? ??????? ???????? +Comment[en_CA]=Edit text files +Comment[en_GB]=Edit text files +Comment[es]=Edita archivos de texto +Comment[et]=Redigeeri tekstifaile +Comment[eu]=Editatu testu-fitxategiak +Comment[fa]=?????? ?????????? ???? +Comment[fi]=Muokkaa tekstitiedostoja +Comment[fr]=?dite des fichiers texte +Comment[ga]=Eagar comhad T?acs +Comment[gu]=???? ???????? ?????? ??? +Comment[he]=???? ???? ???? +Comment[hi]=??? ??????? ??????? ???? +Comment[hr]=Ure?ivanje tekstualne datoteke +Comment[hu]=Sz?vegf?jlok szerkeszt?se +Comment[id]=Edit file teks +Comment[it]=Modifica file di testo +Comment[ja]=??????????????? +Comment[kn]=???? ????????? ???????? +Comment[ko]=??? ??? ????? +Comment[lt]=Redaguoti tekstines bylas +Comment[lv]=Redi??t teksta failus +Comment[mk]=????? ?????????? ??????? +Comment[ml]=???? ?????? ????????? +Comment[mn]=????? ???? ???????????? +Comment[mr]=???? ???? ??????? ??? +Comment[ms]=Edit fail teks +Comment[nb]=Rediger tekstfiler +Comment[ne]=??? ??????? ?????? ????????? +Comment[nl]=Tekstbestanden bewerken +Comment[nn]=Rediger tekstfiler +Comment[no]=Rediger tekstfiler +Comment[or]=????? ??????????? ??????? ?????? +Comment[pa]=??? ?????? ?????? +Comment[pl]=Edytor plik?w tekstowych +Comment[pt]=Editar ficheiros de texto +Comment[pt_BR]=Edite arquivos de texto +Comment[ro]=Editare fi?iere text +Comment[ru]=???????? ????????? ?????? +Comment[sk]=?prava textov?ch s?borov +Comment[sl]=Urejanje datotek z besedili +Comment[sq]=P?rpuno files teksti +Comment[sr]=?????? ?????????? ???????? +Comment[sr at Latn]=Izmeni tekstualne datoteke +Comment[sv]=Redigera textfiler +Comment[ta]=??? ????????? ??????????? +Comment[th]=???????????????? +Comment[tk]=Metin fa?llary editle +Comment[tr]=Metin dosyalar?n? d?zenle +Comment[uk]=???????? ????????? ?????? +Comment[vi]=So?n th?o t?p tin v?n b?n +Comment[wa]=Asspougn? des fitch?s tecses +Comment[zh_CN]=?????? +Comment[zh_TW]=????? +Exec=gvim -f %F +Terminal=false +Type=Application +Icon=/opt/csw/share/pixmaps/gvim.png +Categories=Application;Utility;TextEditor; +StartupNotify=true +MimeType=text/plain; +NoDisplay=true This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Dec 20 15:18:23 2008 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 20 Dec 2008 14:18:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[2676] csw/mgar/pkg/cyrus_imapd/trunk Message-ID: Revision: 2676 http://gar.svn.sourceforge.net/gar/?rev=2676&view=rev Author: chninkel Date: 2008-12-20 14:18:23 +0000 (Sat, 20 Dec 2008) Log Message: ----------- cyrus_imapd: added mupdate in /etc/services Modified Paths: -------------- csw/mgar/pkg/cyrus_imapd/trunk/Makefile csw/mgar/pkg/cyrus_imapd/trunk/checksums csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW csw/mgar/pkg/cyrus_imapd/trunk/files/services Removed Paths: ------------- csw/mgar/pkg/cyrus_imapd/trunk/files/master-rename.patch Modified: csw/mgar/pkg/cyrus_imapd/trunk/Makefile =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2008-12-19 19:11:49 UTC (rev 2675) +++ csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2008-12-20 14:18:23 UTC (rev 2676) @@ -1,5 +1,5 @@ GARNAME = cyrus_imapd -GARVERSION = 2.3.11 +GARVERSION = 2.3.13 CATEGORIES = server DESCRIPTION = Pop and Imap server from the Cyrus mail system @@ -63,10 +63,6 @@ # contains bare newlines PATCHFILES += cyrus-imapd-2.3.7-nobarenewlinescheck.patch -# master is a too common name, so we rename it cyrus-master -# this patch does a part of this job -PATCHFILES += master-rename.patch - # the default value for allowplaintext changed since 2.3.9 # we restore the previous default value to avoid upgrade problem PATCHFILES += restore_allowplaintext_default.patch @@ -106,10 +102,14 @@ pre-patch: cp $(WORKDIR)/install-upgrade $(WORKSRC)/doc/text -pre-build: +pre-configure: # master is a too common name, so we rename it cyrus-master cp $(WORKSRC)/man/master.8 $(WORKSRC)/man/cyrus-master.8 cp $(WORKSRC)/doc/man/master.8.html $(WORKSRC)/doc/man/cyrus-master.8.html + find $(WORKSRC)/doc/ -type f -exec perl -pi -e 's/(cyrus-)?master/cyrus-master/g' '{}' ';' + find $(WORKSRC)/man/ -type f -exec perl -pi -e 's/(cyrus-)?master/cyrus-master/g' '{}' ';' + perl -pi -e 's/(cyrus-)?master/cyrus-master/' $(WORKSRC)/master/Makefile.in + # we delete autogenerated error files to force regeneration find $(WORKSRC) \( -name "*_err.c" -o -name "*_err.h" \) ! -name "com_err.*" -exec rm {} \; @@ -136,7 +136,7 @@ cp -r $(WORKSRC)/tools/* $(DESTDIR)$(sbindir) ginstall -D $(DESTDIR)$(sbindir)/arbitronsort.pl $(DESTDIR)$(sbindir)/arbitronsort - # we want perl script to use blastwave perl + # we want perl script to use opencsw perl perl -pi -e 's/exec\s+perl/exec \/opt\/csw\/bin\/perl/g' $(DESTDIR)$(sbindir)/* $(DESTDIR)$(bindir)/* ( for FILE in convert-sieve.pl mupdate-loadgen.pl translatesieve undohash upgradesieve arbitronsort; do \ perl -pi -e 's/^#!\/usr\/(local\/)?bin\/perl/#!\/usr\/bin\/perl/' $(DESTDIR)$(sbindir)/$$FILE; \ Modified: csw/mgar/pkg/cyrus_imapd/trunk/checksums =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/checksums 2008-12-19 19:11:49 UTC (rev 2675) +++ csw/mgar/pkg/cyrus_imapd/trunk/checksums 2008-12-20 14:18:23 UTC (rev 2676) @@ -1,14 +1,14 @@ -df632eb2a89e36e6296e4abd687435ed download/cyrus-imapd-2.3.11.tar.gz +7dc48324c3a99e210bf777ea74aae694 download/cyrus-imapd-2.3.13.tar.gz 7423d96cacb8162b7987c9983cc85171 download/CSWcyrusimapd.gspec a22944187eb6b75e2437aa9a4c754c07 download/CSWcyrusimapd.prototype 5111a5573aa6d4878b852780aeae8a27 download/CSWcyrusimapd.preinstall 46cfc3ee1f366efdd105963422b53fc6 download/CSWcyrusimapd.depend a55d22e88ee57fa81da2ea75c6e0e3d8 download/CSWcyrusimapd.checkinstall -1d1b48887178a20b74c7d8ed34e4723d download/cyrus_imapd.changelog.CSW +1218c3ab6c7d0d5ab996a309698a43c8 download/cyrus_imapd.changelog.CSW d0b97b33e75ac75f89ee6236a2d53f05 download/README.CSW 79211aee56db01e15566ced1ba4078da download/i.services 149ac6b6d82ef9ef4bb1b314f1a1cac4 download/r.services -d00c34fe0c54a4eb07389e2baf3af399 download/services +6dfee20f7c02139350caf9f75199e587 download/services 9b2ae27f98333b73ff2b16ed98ee896a download/i.conf 5d9e9fb1a5b6af82ce915f72ebc5e3b7 download/r.conf a5326ab0d66431d057db02c5ae9c5e4a download/cswcyrus.init @@ -22,15 +22,14 @@ d47ff67f45001cdda175616a543d7052 download/CSWcyrusimapdutils.gspec 7e99e825a1d6b134b91392beec1807f4 download/CSWcyrusimapdutils.prototype cba5a4c4a05d4af940a323c5d7d64ca0 download/CSWcyrusimapdutils.depend -292a334f016b2a6b7cfbc377234134c5 download/cyrus_imapd_utils.changelog.CSW -598fc0d014664de114f85d57728605af download/pm_cyrus.changelog.CSW +45211ad9938528d4e5e6333ac1ec1f33 download/cyrus_imapd_utils.changelog.CSW +a700bb603514320b6d7e7959ed71618e download/pm_cyrus.changelog.CSW 9cbebaeeafa6eb3320eafa594c253bc1 download/compile_et 5375c25c8bc325a90553d0be87a64a04 download/et_c.awk d1d86e61463a1dfefccbadedb11a8604 download/et_h.awk 14bb6e8c6d6914351f80df293982e88a download/install-upgrade -e2f3c6e948cc73e28c5a7a8e3e53854e download/cyrus-imapd-2.3.11-autocreate-0.10-0.diff -7177f3abd0736a14e11af4905decb6ff download/cyrus-imapd-2.3.11-autosieve-0.6.0.diff +f1957096f173dcc9ea94d0544a07e9db download/cyrus-imapd-2.3.13-autocreate-0.10-0.diff +cce2e7fbc847791182b8f431c59e473a download/cyrus-imapd-2.3.13-autosieve-0.6.0.diff 6127a7b62ec4679a54985f6a2d915e52 download/cyrus-imapd-acceptinvalidfrom.patch b4c99489eacf0fb7befeef5e3098a5c1 download/cyrus-imapd-2.3.7-nobarenewlinescheck.patch -0454ac02701faec98532669854f75724 download/master-rename.patch dce627f9a464ae4efe8a66c8dbd358d5 download/restore_allowplaintext_default.patch Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW 2008-12-19 19:11:49 UTC (rev 2675) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW 2008-12-20 14:18:23 UTC (rev 2676) @@ -1,3 +1,15 @@ +cyrus_imapd (2.3.13,REV=2008.12.20) unstable + + * Added mupdate service in /etc/services. + + -- Yann Rouillard Sat, 20 Dec 2008 15:13:33 +0100 + +cyrus_imapd (2.3.13,REV=2008.11.30) unstable + + * New upstream version. + + -- Yann Rouillard Sun, 30 Nov 2008 20:58:22 +0100 + cyrus_imapd (2.3.11,REV=2008.03.22) unstable * Added missing pcre dependancy (closes: #2830). Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW 2008-12-19 19:11:49 UTC (rev 2675) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW 2008-12-20 14:18:23 UTC (rev 2676) @@ -1,3 +1,15 @@ +cyrus_imapd_utils (2.3.13,REV=2008.12.20) unstable + + * Added mupdate service in /etc/services. + + -- Yann Rouillard Sat, 20 Dec 2008 15:13:33 +0100 + +cyrus_imapd_utils (2.3.13,REV=2008.11.30) unstable + + * New upstream version. + + -- Yann Rouillard Sun, 30 Nov 2008 20:58:22 +0100 + cyrus_imapd_utils (2.3.9,REV=2008.01.21) unstable * New upstream version. Deleted: csw/mgar/pkg/cyrus_imapd/trunk/files/master-rename.patch =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/master-rename.patch 2008-12-19 19:11:49 UTC (rev 2675) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/master-rename.patch 2008-12-20 14:18:23 UTC (rev 2676) @@ -1,957 +0,0 @@ -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/bugs.html cyrus-imapd-2.3.11/doc/bugs.html ---- cyrus-imapd-2.3.11.orig/doc/bugs.html 2006-11-30 12:11:16.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/bugs.html 2008-01-22 04:19:22.968333000 -0500 -@@ -33,12 +33,12 @@ -
  • during appendstage(), the message is parsed once per delivery, - not once at the beginning. - --
  • master should pay attention to processes that have told -+
  • cyrus-master should pay attention to processes that have told - it they are listening, and make sure they don't die abnormally. - likewise, it should be on the lookout for continually forking - services. - --
  • master should probably have a babysitting service -+
  • cyrus-master should probably have a babysitting service - ("always keep this process running"). - - -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/faq.html cyrus-imapd-2.3.11/doc/faq.html ---- cyrus-imapd-2.3.11.orig/doc/faq.html 2006-11-30 12:11:16.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/faq.html 2008-01-22 04:19:23.008338000 -0500 -@@ -78,7 +78,7 @@ -

    Troubleshooting

    - -
    --
    Q: I'm getting syslog'd messages from the master process -+
    Q: I'm getting syslog'd messages from the cyrus-master process - saying processes are "signaled to death by 10". What's up?
    - -
    -@@ -142,7 +142,7 @@ -
    -

    A: Remove all imap, pop, lmtp - and sieve lines from [x]inetd.conf and restart --[x]inetd. Cyrus is run out of its own "master" process.

    -+[x]inetd. Cyrus is run out of its own "cyrus-master" process.

    -
    - -
    Q: How do I use different SSL/TLS certificates for imap -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/install-configure.html cyrus-imapd-2.3.11/doc/install-configure.html ---- cyrus-imapd-2.3.11.orig/doc/install-configure.html 2006-11-30 12:11:16.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/install-configure.html 2008-01-22 04:19:23.038343000 -0500 -@@ -230,16 +230,16 @@ - enabling certain services, or to tune the number of preforked copies. - Be sure not to remove the entries that are labeled required. - --

  • Arrange to start "/usr/cyrus/bin/master" as root when -+

  • Arrange to start "/usr/cyrus/bin/cyrus-master" as root when - the system starts. It will bind some ports and then give up it's root --privileges. Until your system reboots, you can start the master -+privileges. Until your system reboots, you can start the cyrus-master - process by hand: - - 
    --   /usr/cyrus/bin/master &
-+   /usr/cyrus/bin/cyrus-master &
-
    - --

  • Monitor the progress of the master process by examining the -+

  • Monitor the progress of the cyrus-master process by examining the - imapd.log file. It should never exit by itself, but you can - shut down the mail system by sending it a signal with kill. - -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/install-perf.html cyrus-imapd-2.3.11/doc/install-perf.html ---- cyrus-imapd-2.3.11.orig/doc/install-perf.html 2003-01-02 14:23:11.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/install-perf.html 2008-01-22 04:19:23.078346000 -0500 -@@ -81,7 +81,7 @@ - don't leave them there.
    • - -
  • You may want to increase the listen queue value when starting --up the master process. For example, you may want to do this if you -+up the cyrus-master process. For example, you may want to do this if you - see the Listen queue drop counter increasing quickly. For example, - under Solaris, look at the variable tcpListenDrop (from netstat - -sP tcp).
    • -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/install-upgrade.html cyrus-imapd-2.3.11/doc/install-upgrade.html ---- cyrus-imapd-2.3.11.orig/doc/install-upgrade.html 2007-12-08 14:24:25.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/install-upgrade.html 2008-01-22 04:19:23.118352000 -0500 -@@ -229,7 +229,7 @@ - allowusermoves option, which defaults to off.
    • - -
  • If you use ptloader, it now runs as a regular cyrus --service. This means that you will need master to acquire and maintain -+service. This means that you will need cyrus-master to acquire and maintain - AFS tokens for it. You will also need to create the ptclient - directory under your imap configdirectory, to hold the PTS cache (now - a full-fledged cyrusdb) and UNIX socket. In cyrus.conf, -@@ -409,7 +409,7 @@ - popd3d lines need to be removed from /etc/inetd.conf - and inetd needs to be restarted. - --
  • master process configuration: You'll need to configure the master -+
  • cyrus-master process configuration: You'll need to configure the cyrus-master - process Cyrus process and ensure that it starts on boot. see this section of the - configuration instructions. -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/chk_cyrus.8.html cyrus-imapd-2.3.11/doc/man/chk_cyrus.8.html ---- cyrus-imapd-2.3.11.orig/doc/man/chk_cyrus.8.html 2007-12-10 10:24:05.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/man/chk_cyrus.8.html 2008-01-22 04:19:23.188360000 -0500 -@@ -120,7 +120,7 @@ - - - --

    imapd.conf(5), master(8)

    -+

    imapd.conf(5), cyrus-master(8)

    - - -
    -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/ctl_cyrusdb.8.html cyrus-imapd-2.3.11/doc/man/ctl_cyrusdb.8.html ---- cyrus-imapd-2.3.11.orig/doc/man/ctl_cyrusdb.8.html 2007-12-10 10:24:05.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/man/ctl_cyrusdb.8.html 2008-01-22 04:19:23.218363000 -0500 -@@ -140,7 +140,7 @@ - - - --

    imapd.conf(5), master(8)

    -+

    imapd.conf(5), cyrus-master(8)

    - - -
    -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/ctl_deliver.8.html cyrus-imapd-2.3.11/doc/man/ctl_deliver.8.html ---- cyrus-imapd-2.3.11.orig/doc/man/ctl_deliver.8.html 2007-12-10 10:24:05.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/man/ctl_deliver.8.html 2008-01-22 04:19:23.248368000 -0500 -@@ -129,7 +129,7 @@ - - - --

    imapd.conf(5), master(8)

    -+

    imapd.conf(5), cyrus-master(8)

    - - -
    -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/ctl_mboxlist.8.html cyrus-imapd-2.3.11/doc/man/ctl_mboxlist.8.html ---- cyrus-imapd-2.3.11.orig/doc/man/ctl_mboxlist.8.html 2007-12-10 10:24:05.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/man/ctl_mboxlist.8.html 2008-01-22 04:19:23.268371000 -0500 -@@ -259,7 +259,7 @@ - - - --

    imapd.conf(5), master(8)

    -+

    imapd.conf(5), cyrus-master(8)

    - - -
    -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/cyr_expire.8.html cyrus-imapd-2.3.11/doc/man/cyr_expire.8.html ---- cyrus-imapd-2.3.11.orig/doc/man/cyr_expire.8.html 2007-12-10 10:24:05.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/man/cyr_expire.8.html 2008-01-22 04:19:23.298374000 -0500 -@@ -220,7 +220,7 @@ - - - --

    imapd.conf(5), master(8)

    -+

    imapd.conf(5), cyrus-master(8)

    - - -
    -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/cyrus.conf.5.html cyrus-imapd-2.3.11/doc/man/cyrus.conf.5.html ---- cyrus-imapd-2.3.11.orig/doc/man/cyrus.conf.5.html 2007-12-10 10:24:05.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/man/cyrus.conf.5.html 2008-01-22 04:19:23.328380000 -0500 -@@ -563,7 +563,7 @@ - - - --

    master(8), imapd(8), pop3d(8), -+

    cyrus-master(8), imapd(8), pop3d(8), - lmtpd(8), timsieved(8), idled(8), - notifyd(8), ctl_cyrusdb(8), - ctl_deliver(8), tls_prune(8), -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/fud.8.html cyrus-imapd-2.3.11/doc/man/fud.8.html ---- cyrus-imapd-2.3.11.orig/doc/man/fud.8.html 2007-12-10 10:24:05.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/man/fud.8.html 2008-01-22 04:19:23.368382000 -0500 -@@ -50,7 +50,7 @@ - - -

    FUD is a long lived datagram daemon started from --master that provides information about when a user last read -+cyrus-master that provides information about when a user last read - their mail, when mail last arrived in a user’s - mailbox, and how many messages are recent for that user.

    - -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/idled.8.html cyrus-imapd-2.3.11/doc/man/idled.8.html ---- cyrus-imapd-2.3.11.orig/doc/man/idled.8.html 2007-12-10 10:24:05.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/man/idled.8.html 2008-01-22 04:19:23.398385000 -0500 -@@ -52,7 +52,7 @@ - receives notifications of mailbox changes and signals the - appropriate imapd to report the changes to the - client. Idled is usually started from --master.

    -+cyrus-master.

    - -

    Idled reads its configuration options out of the - imapd.conf(5) file unless specified otherwise by -@@ -97,7 +97,7 @@ - - - --

    imapd.conf(5), master(8)

    -+

    imapd.conf(5), cyrus-master(8)

    - - -
    -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/imapd.8.html cyrus-imapd-2.3.11/doc/man/imapd.8.html ---- cyrus-imapd-2.3.11.orig/doc/man/imapd.8.html 2007-12-10 10:24:05.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/man/imapd.8.html 2008-01-22 04:19:23.428390000 -0500 -@@ -52,7 +52,7 @@ - -

    Imapd is an IMAP4rev1 server. It accepts commands - on its standard input and responds on its standard output. --It MUST be invoked by master(8) with those -+It MUST be invoked by cyrus-master(8) with those - descriptors attached to a remote client connection.

    - -

    Imapd reads its configuration options out of the -@@ -199,7 +199,7 @@ - - - --

    imapd.conf(5), master(8)

    -+

    imapd.conf(5), cyrus-master(8)

    - - -
    -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/imapd.conf.5.html cyrus-imapd-2.3.11/doc/man/imapd.conf.5.html ---- cyrus-imapd-2.3.11.orig/doc/man/imapd.conf.5.html 2007-12-10 10:24:06.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/man/imapd.conf.5.html 2008-01-22 04:19:23.468400000 -0500 -@@ -4053,7 +4053,7 @@ - -

    imapd(8), pop3d(8), nntpd(8), - lmtpd(8), timsieved(8), idled(8), --notifyd(8), deliver(8), master(8), -+notifyd(8), deliver(8), cyrus-master(8), - ciphers(1)

    - -

    Allowed values: off, userid, on

    -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/lmtpd.8.html cyrus-imapd-2.3.11/doc/man/lmtpd.8.html ---- cyrus-imapd-2.3.11.orig/doc/man/lmtpd.8.html 2007-12-10 10:24:06.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/man/lmtpd.8.html 2008-01-22 04:19:23.508399000 -0500 -@@ -53,7 +53,7 @@ -

    Lmtpd is an LMTP server used to deliver mail to - the IMAP mailstore. It accepts commands on its standard - input and responds on its standard output. It MUST be --invoked by master(8) with those descriptors attached -+invoked by cyrus-master(8) with those descriptors attached - to a remote client connection.

    - -

    Lmtpd reads its configuration options out of the -@@ -164,7 +164,7 @@ - - - --

    imapd.conf(5), master(8)

    -+

    imapd.conf(5), cyrus-master(8)

    - - -
    -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/master.8.html cyrus-imapd-2.3.11/doc/man/master.8.html ---- cyrus-imapd-2.3.11.orig/doc/man/master.8.html 2007-12-10 10:24:06.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/man/master.8.html 2008-01-22 04:19:23.538404000 -0500 -@@ -4,11 +4,11 @@ - - - --MASTER -+CYRUS-MASTER - - - --

    MASTER

    -+

    CYRUS-MASTER

    - NAME
    - SYNOPSIS
    - DESCRIPTION
    -@@ -27,7 +27,7 @@ - - - --

    master − master Cyrus process

    -+

    cyrus-master − master Cyrus process

    - - - -@@ -38,7 +38,7 @@ - - - --

    master [ −C alternate -+

    cyrus-master [ −C alternate - imapd.conf ] [ −M alternate - cyrus.conf ] [ −l listen queue ] [ - −p pidfile ] [ −P snmp -@@ -55,7 +55,7 @@ - - - --

    Master is the process that controls all of the -+

    Cyrus-master is the process that controls all of the - Cyrus processes. This process is responsible for creating - all imapd, pop3d, lmtpd and sieved child processes. This - process also initializes the Berkeley DB code and performs -@@ -84,9 +84,9 @@ - - - --

    Specifies an alternate imapd.conf for use by master (note -+

    Specifies an alternate imapd.conf for use by cyrus-master (note - that this will not affect any sub-processes spawned by --master, you should specify those specifically in the -+cyrus-master, you should specify those specifically in the - respective entries in cyrus.conf).

    - - -@@ -104,7 +104,7 @@ - - - --

    Specifies an alternate cyrus.conf for use by master.

    -+

    Specifies an alternate cyrus.conf for use by cyrus-master.

    - - - -@@ -241,10 +241,10 @@ - - - --

    Upon execution, master reads its configuration -+

    Upon execution, cyrus-master reads its configuration - information out of the cyrus.conf(5) file.

    - --

    Master rereads its configuration file when it -+

    Cyrus-master rereads its configuration file when it - receives a hangup signal, SIGHUP. Services and events may be - added, deleted or modified when the configuration file is - reread. Any active services removed from the configuration -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/nntpd.8.html cyrus-imapd-2.3.11/doc/man/nntpd.8.html ---- cyrus-imapd-2.3.11.orig/doc/man/nntpd.8.html 2007-12-10 10:24:06.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/man/nntpd.8.html 2008-01-22 04:19:23.558406000 -0500 -@@ -53,7 +53,7 @@ - -

    Nntpd is a NNTP server. It accepts commands on its - standard input and responds on its standard output. It MUST --invoked by master(8) with those descriptors attached -+invoked by cyrus-master(8) with those descriptors attached - to a remote client connection.

    - -

    Nntpd reads its configuration options out of the -@@ -220,7 +220,7 @@ - - - --

    imapd.conf(5), master(8)

    -+

    imapd.conf(5), cyrus-master(8)

    - - -
    -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/notifyd.8.html cyrus-imapd-2.3.11/doc/man/notifyd.8.html ---- cyrus-imapd-2.3.11.orig/doc/man/notifyd.8.html 2007-12-10 10:24:06.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/man/notifyd.8.html 2008-01-22 04:19:23.588410000 -0500 -@@ -51,7 +51,7 @@ - - - --

    Notifyd is a daemon started from master(8) that -+

    Notifyd is a daemon started from cyrus-master(8) that - handles notification requests on behalf of lmtpd(8). - Notifyd accepts the request and performs the - notification using the method specified in the request.

    -@@ -235,7 +235,7 @@ - - -

    imapd.conf(5), cyrus.conf, --master(8), lmtpd(8)

    -+cyrus-master(8), lmtpd(8)

    - - -
    -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/pop3d.8.html cyrus-imapd-2.3.11/doc/man/pop3d.8.html ---- cyrus-imapd-2.3.11.orig/doc/man/pop3d.8.html 2007-12-10 10:24:06.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/man/pop3d.8.html 2008-01-22 04:19:23.618414000 -0500 -@@ -53,7 +53,7 @@ - -

    Pop3d is a POP3 server. It accepts commands on its - standard input and responds on its standard output. It MUST --invoked by master(8) with those descriptors attached -+invoked by cyrus-master(8) with those descriptors attached - to a remote client connection.

    - -

    Pop3d reads its configuration options out of the -@@ -198,7 +198,7 @@ - - - --

    imapd.conf(5), master(8)

    -+

    imapd.conf(5), cyrus-master(8)

    - - -
    -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/smmapd.8.html cyrus-imapd-2.3.11/doc/man/smmapd.8.html ---- cyrus-imapd-2.3.11.orig/doc/man/smmapd.8.html 2007-12-10 10:24:07.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/man/smmapd.8.html 2008-01-22 04:19:23.648417000 -0500 -@@ -53,7 +53,7 @@ - used to verify that a Cyrus mailbox exists, that it is - postable and it is under quota. It accepts commands on its - standard input and responds on its standard output. It MUST --be invoked by master(8) with those descriptors -+be invoked by cyrus-master(8) with those descriptors - attached to a remote client connection.

    - -

    SMMAPD reads its configuration options out of the -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/timsieved.8.html cyrus-imapd-2.3.11/doc/man/timsieved.8.html ---- cyrus-imapd-2.3.11.orig/doc/man/timsieved.8.html 2007-12-10 10:24:07.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/man/timsieved.8.html 2008-01-22 04:19:23.678421000 -0500 -@@ -52,7 +52,7 @@ -

    timsieved is a server that allows users to - remotely manage their sieve scripts kept on the server. It - accepts commands on its standard input and responds on its --standard output. It MUST be invoked by master(8) with -+standard output. It MUST be invoked by cyrus-master(8) with - those descriptors attached to a remote client - connection.

    - -@@ -102,7 +102,7 @@ - - - --

    imapd.conf(5), master(8)

    -+

    imapd.conf(5), cyrus-master(8)

    - - -
    -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/tls_prune.8.html cyrus-imapd-2.3.11/doc/man/tls_prune.8.html ---- cyrus-imapd-2.3.11.orig/doc/man/tls_prune.8.html 2007-12-10 10:24:07.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/man/tls_prune.8.html 2008-01-22 04:19:23.708425000 -0500 -@@ -96,7 +96,7 @@ - - - --

    imapd.conf(5), master(8)

    -+

    imapd.conf(5), cyrus-master(8)

    - - -
    -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man.html cyrus-imapd-2.3.11/doc/man.html ---- cyrus-imapd-2.3.11.orig/doc/man.html 2007-02-09 08:23:27.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/man.html 2008-01-22 04:19:23.158355000 -0500 -@@ -48,7 +48,7 @@ -
  • imapd(8) -
  • ipurge(8) -
  • lmtpd(8) --
  • master(8) -+
  • cyrus-master(8) -
  • mbexamine(8) -
  • mbpath(8) -
  • nntpd(8) -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/text/bugs cyrus-imapd-2.3.11/doc/text/bugs ---- cyrus-imapd-2.3.11.orig/doc/text/bugs 2007-12-10 10:24:08.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/text/bugs 2008-01-22 04:19:23.738429000 -0500 -@@ -16,10 +16,10 @@ - threadsafe. - * during appendstage(), the message is parsed once per delivery, not - once at the beginning. -- * master should pay attention to processes that have told it they are -+ * cyrus-master should pay attention to processes that have told it they are - listening, and make sure they don't die abnormally. likewise, it - should be on the lookout for continually forking services. -- * master should probably have a babysitting service ("always keep -+ * cyrus-master should probably have a babysitting service ("always keep - this process running"). - - proxyd and Cyrus Murder -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/text/faq cyrus-imapd-2.3.11/doc/text/faq ---- cyrus-imapd-2.3.11.orig/doc/text/faq 2007-12-10 10:24:08.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/text/faq 2008-01-22 04:19:23.768433000 -0500 -@@ -52,7 +52,7 @@ - - Troubleshooting - -- Q: I'm getting syslog'd messages from the master process saying -+ Q: I'm getting syslog'd messages from the cyrus-master process saying - processes are "signaled to death by 10". What's up? - - -@@ -98,7 +98,7 @@ - - A: Remove all imap, pop, lmtp and sieve lines from - [x]inetd.conf and restart [x]inetd. Cyrus is run out of its own -- "master" process. -+ "cyrus-master" process. - Q: How do I use different SSL/TLS certificates for imap and pop? - - -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/text/install-configure cyrus-imapd-2.3.11/doc/text/install-configure ---- cyrus-imapd-2.3.11.orig/doc/text/install-configure 2007-12-10 10:24:08.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/text/install-configure 2008-01-22 04:19:23.798438000 -0500 -@@ -160,7 +160,7 @@ - kpop, lmtp and sieve lines need to be removed from - /etc/[x]inetd.conf and [x]inetd needs to be restarted. - --Configuring the Master Process -+Configuring the Cyrus-master Process - - 1. Choose a configuration from the master/conf directory: - -@@ -186,14 +186,14 @@ - certain services, or to tune the number of preforked copies. Be - sure not to remove the entries that are labeled required. - -- 2. Arrange to start "/usr/cyrus/bin/master" as root when the system -+ 2. Arrange to start "/opt/csw/sbin/cyrus-master" as root when the system - starts. It will bind some ports and then give up it's root - privileges. Until your system reboots, you can start the master - process by hand: - -- /usr/cyrus/bin/master & -+ /usr/cyrus/bin/cyrus-master & - -- 3. Monitor the progress of the master process by examining the -+ 3. Monitor the progress of the cyrus-master process by examining the - imapd.log file. It should never exit by itself, but you can shut - down the mail system by sending it a signal with kill. - -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/text/install-perf cyrus-imapd-2.3.11/doc/text/install-perf ---- cyrus-imapd-2.3.11.orig/doc/text/install-perf 2007-12-10 10:24:08.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/text/install-perf 2008-01-22 04:19:23.828440000 -0500 -@@ -62,7 +62,7 @@ - /usr/lib/sasl2 and if you don't plan on using those mechanisms, - don't leave them there. - * You may want to increase the listen queue value when starting up -- the master process. For example, you may want to do this if you see -+ the cyrus-master process. For example, you may want to do this if you see - the Listen queue drop counter increasing quickly. For example, - under Solaris, look at the variable tcpListenDrop (from netstat -sP - tcp). -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/text/install-upgrade cyrus-imapd-2.3.11/doc/text/install-upgrade ---- cyrus-imapd-2.3.11.orig/doc/text/install-upgrade 2007-12-10 10:24:08.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/text/install-upgrade 2008-01-22 04:24:50.079616000 -0500 -@@ -134,7 +134,7 @@ - * User moves via RENAME and XFER are now controlled by the - allowusermoves option, which defaults to off. - * If you use ptloader, it now runs as a regular cyrus service. This -- means that you will need master to acquire and maintain AFS tokens -+ means that you will need cyrus-master to acquire and maintain AFS tokens - for it. You will also need to create the ptclient directory under - your imap configdirectory, to hold the PTS cache (now a - full-fledged cyrusdb) and UNIX socket. In cyrus.conf, ptloader -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/text/man cyrus-imapd-2.3.11/doc/text/man ---- cyrus-imapd-2.3.11.orig/doc/text/man 2007-12-10 10:24:08.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/text/man 2008-01-22 04:19:23.908450000 -0500 -@@ -39,7 +39,7 @@ - * imapd(8) - * ipurge(8) - * lmtpd(8) -- * master(8) -+ * cyrus-master(8) - * mbexamine(8) - * mbpath(8) - * nntpd(8) -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/lib/imapoptions cyrus-imapd-2.3.11/lib/imapoptions ---- cyrus-imapd-2.3.11.orig/lib/imapoptions 2007-10-18 14:14:48.000000000 -0400 -+++ cyrus-imapd-2.3.11/lib/imapoptions 2008-01-22 04:19:23.948460000 -0500 -@@ -1045,5 +1045,5 @@ - .PP - \fBimapd(8)\fR, \fBpop3d(8)\fR, \fBnntpd(8)\fR, \fBlmtpd(8)\fR, - \fBtimsieved(8)\fR, \fBidled(8)\fR, \fBnotifyd(8)\fR, --\fBdeliver(8)\fR, \fBmaster(8)\fR, \fBciphers(1)\fR -+\fBdeliver(8)\fR, \fBcyrus-master(8)\fR, \fBciphers(1)\fR - */ -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/Makefile.in cyrus-imapd-2.3.11/man/Makefile.in ---- cyrus-imapd-2.3.11.orig/man/Makefile.in 2007-10-18 14:14:48.000000000 -0400 -+++ cyrus-imapd-2.3.11/man/Makefile.in 2008-01-22 04:19:23.998461000 -0500 -@@ -61,7 +61,7 @@ - MAN8 = $(srcdir)/arbitron.8 $(srcdir)/cyr_expire.8 $(srcdir)/deliver.8 \ - $(srcdir)/fud.8 $(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/quota.8 \ - $(srcdir)/reconstruct.8 $(srcdir)/rmnews.8 $(srcdir)/syncnews.8 \ -- $(srcdir)/mbpath.8 $(srcdir)/timsieved.8 $(srcdir)/master.8 \ -+ $(srcdir)/mbpath.8 $(srcdir)/timsieved.8 $(srcdir)/cyrus-master.8 \ - $(srcdir)/lmtpd.8 $(srcdir)/idled.8 $(srcdir)/ctl_mboxlist.8 \ - $(srcdir)/ctl_deliver.8 $(srcdir)/ctl_cyrusdb.8 $(srcdir)/ipurge.8 \ - $(srcdir)/tls_prune.8 $(srcdir)/squatter.8 $(srcdir)/cvt_cyrusdb.8 \ -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/chk_cyrus.8 cyrus-imapd-2.3.11/man/chk_cyrus.8 ---- cyrus-imapd-2.3.11.orig/man/chk_cyrus.8 2006-06-19 09:05:54.000000000 -0400 -+++ cyrus-imapd-2.3.11/man/chk_cyrus.8 2008-01-22 04:19:24.028465000 -0500 -@@ -83,4 +83,4 @@ - .B /etc/imapd.conf - .SH SEE ALSO - .PP --\fBimapd.conf(5)\fR, \fBmaster(8)\fR -+\fBimapd.conf(5)\fR, \fBcyrus-master(8)\fR -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/ctl_cyrusdb.8 cyrus-imapd-2.3.11/man/ctl_cyrusdb.8 ---- cyrus-imapd-2.3.11.orig/man/ctl_cyrusdb.8 2003-08-09 19:43:14.000000000 -0400 -+++ cyrus-imapd-2.3.11/man/ctl_cyrusdb.8 2008-01-22 04:19:24.068470000 -0500 -@@ -94,4 +94,4 @@ - .B /etc/imapd.conf - .SH SEE ALSO - .PP --\fBimapd.conf(5)\fR, \fBmaster(8)\fR -+\fBimapd.conf(5)\fR, \fBcyrus-master(8)\fR -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/ctl_deliver.8 cyrus-imapd-2.3.11/man/ctl_deliver.8 ---- cyrus-imapd-2.3.11.orig/man/ctl_deliver.8 2003-10-22 14:50:13.000000000 -0400 -+++ cyrus-imapd-2.3.11/man/ctl_deliver.8 2008-01-22 04:19:24.098473000 -0500 -@@ -78,4 +78,4 @@ - .B /etc/imapd.conf - .SH SEE ALSO - .PP --\fBimapd.conf(5)\fR, \fBmaster(8)\fR -+\fBimapd.conf(5)\fR, \fBcyrus-master(8)\fR -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/ctl_mboxlist.8 cyrus-imapd-2.3.11/man/ctl_mboxlist.8 ---- cyrus-imapd-2.3.11.orig/man/ctl_mboxlist.8 2007-10-05 14:39:48.000000000 -0400 -+++ cyrus-imapd-2.3.11/man/ctl_mboxlist.8 2008-01-22 04:19:24.138477000 -0500 -@@ -166,4 +166,4 @@ - .B /etc/imapd.conf - .SH SEE ALSO - .PP --\fBimapd.conf(5)\fR, \fBmaster(8)\fR -+\fBimapd.conf(5)\fR, \fBcyrus-master(8)\fR -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/cyr_expire.8 cyrus-imapd-2.3.11/man/cyr_expire.8 ---- cyrus-imapd-2.3.11.orig/man/cyr_expire.8 2007-09-04 11:13:27.000000000 -0400 -+++ cyrus-imapd-2.3.11/man/cyr_expire.8 2008-01-22 04:19:24.178482000 -0500 -@@ -121,4 +121,4 @@ - .B /etc/imapd.conf - .SH SEE ALSO - .PP --\fBimapd.conf(5)\fR, \fBmaster(8)\fR -+\fBimapd.conf(5)\fR, \fBcyrus-master(8)\fR -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/cyrus.conf.5 cyrus-imapd-2.3.11/man/cyrus.conf.5 ---- cyrus-imapd-2.3.11.orig/man/cyrus.conf.5 2007-09-24 08:48:32.000000000 -0400 -+++ cyrus-imapd-2.3.11/man/cyrus.conf.5 2008-01-22 04:19:24.218489000 -0500 -@@ -44,9 +44,9 @@ - cyrus.conf \- Cyrus configuration file - .SH DESCRIPTION - \fB/etc/cyrus.conf\fR --is the configuration file for the Cyrus \fBmaster\fR process. It -+is the configuration file for the Cyrus \fBcyrus-master\fR process. It - defines the startup procedures, services and events to be spawned by --\fBmaster\fR. -+\fBcyrus-master\fR. - .PP - The \fB/etc/cyrus.conf\fR file consists of a series of entries divided - into sections of the form -@@ -177,6 +177,6 @@ - still have separate access control rules. - .SH SEE ALSO - .PP --\fBmaster(8)\fR, \fBimapd(8)\fR, \fBpop3d(8)\fR, \fBlmtpd(8)\fR, -+\fBcyrus-master(8)\fR, \fBimapd(8)\fR, \fBpop3d(8)\fR, \fBlmtpd(8)\fR, - \fBtimsieved(8)\fR, \fBidled(8)\fR, \fBnotifyd(8)\fR, \fBctl_cyrusdb(8)\fR, - \fBctl_deliver(8)\fR, \fBtls_prune(8)\fR, \fBhosts_access(5)\fR -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/fud.8 cyrus-imapd-2.3.11/man/fud.8 ---- cyrus-imapd-2.3.11.orig/man/fud.8 2003-10-22 14:50:13.000000000 -0400 -+++ cyrus-imapd-2.3.11/man/fud.8 2008-01-22 04:19:24.268494000 -0500 -@@ -61,7 +61,7 @@ - ] - .SH DESCRIPTION - .B FUD --is a long lived datagram daemon started from master that provides -+is a long lived datagram daemon started from cyrus-master that provides - information about when a user last - read their mail, when mail last arrived in a user's mailbox, and how - many messages are recent for that user. -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/idled.8 cyrus-imapd-2.3.11/man/idled.8 ---- cyrus-imapd-2.3.11.orig/man/idled.8 2003-08-09 19:43:14.000000000 -0400 -+++ cyrus-imapd-2.3.11/man/idled.8 2008-01-22 04:19:24.298497000 -0500 -@@ -56,7 +56,7 @@ - to report the changes to the client. - .I Idled - is usually started from --.I master. -+.I cyrus-master. - .PP - .I Idled - reads its configuration options out of the -@@ -75,4 +75,4 @@ - .B /etc/imapd.conf - .SH SEE ALSO - .PP --\fBimapd.conf(5)\fR, \fBmaster(8)\fR -+\fBimapd.conf(5)\fR, \fBcyrus-master(8)\fR -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/imapd.8 cyrus-imapd-2.3.11/man/imapd.8 ---- cyrus-imapd-2.3.11.orig/man/imapd.8 2002-10-03 15:02:41.000000000 -0400 -+++ cyrus-imapd-2.3.11/man/imapd.8 2008-01-22 04:19:24.338503000 -0500 -@@ -72,7 +72,7 @@ - is an IMAP4rev1 server. - It accepts commands on its standard input and responds on its standard output. - It MUST be invoked by --.IR master (8) -+.IR cyrus-master (8) - with those descriptors attached to a remote client connection. - .PP - .I Imapd -@@ -148,4 +148,4 @@ - .B /etc/imapd.conf - .SH SEE ALSO - .PP --\fBimapd.conf(5)\fR, \fBmaster(8)\fR -+\fBimapd.conf(5)\fR, \fBcyrus-master(8)\fR -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/imapd.conf.5 cyrus-imapd-2.3.11/man/imapd.conf.5 ---- cyrus-imapd-2.3.11.orig/man/imapd.conf.5 2007-12-10 10:24:04.000000000 -0500 -+++ cyrus-imapd-2.3.11/man/imapd.conf.5 2008-01-22 04:19:24.368513000 -0500 -@@ -872,7 +872,7 @@ - .PP - \fBimapd(8)\fR, \fBpop3d(8)\fR, \fBnntpd(8)\fR, \fBlmtpd(8)\fR, - \fBtimsieved(8)\fR, \fBidled(8)\fR, \fBnotifyd(8)\fR, --\fBdeliver(8)\fR, \fBmaster(8)\fR, \fBciphers(1)\fR -+\fBdeliver(8)\fR, \fBcyrus-master(8)\fR, \fBciphers(1)\fR - - - Allowed values: \fIoff\fR, \fIuserid\fR, \fIon\fR -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/lmtpd.8 cyrus-imapd-2.3.11/man/lmtpd.8 ---- cyrus-imapd-2.3.11.orig/man/lmtpd.8 2002-10-03 15:02:41.000000000 -0400 -+++ cyrus-imapd-2.3.11/man/lmtpd.8 2008-01-22 04:19:24.418512000 -0500 -@@ -68,7 +68,7 @@ - is an LMTP server used to deliver mail to the IMAP mailstore. - It accepts commands on its standard input and responds on its standard output. - It MUST be invoked by --.IR master (8) -+.IR cyrus-master (8) - with those descriptors attached to a remote client connection. - .PP - .I Lmtpd -@@ -101,4 +101,4 @@ - .B /etc/imapd.conf - .SH SEE ALSO - .PP --\fBimapd.conf(5)\fR, \fBmaster(8)\fR -+\fBimapd.conf(5)\fR, \fBcyrus-master(8)\fR -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/master.8 cyrus-imapd-2.3.11/man/master.8 ---- cyrus-imapd-2.3.11.orig/man/master.8 2006-11-30 12:11:23.000000000 -0500 -+++ cyrus-imapd-2.3.11/man/master.8 2008-01-22 04:19:24.448517000 -0500 -@@ -1,5 +1,5 @@ - .\" -*- nroff -*- --.TH MASTER 8 "Project Cyrus" CMU -+.TH CYRUS-MASTER 8 "Project Cyrus" CMU - .\" - .\" Copyright (c) 1996-2000 Carnegie Mellon University. All rights reserved. - .\" -@@ -41,9 +41,9 @@ - .\" - .\" $Id: master.8,v 1.14 2006/11/30 17:11:23 murch Exp $ - .SH NAME --master \- master Cyrus process -+cyrus-master \- master Cyrus process - .SH SYNOPSIS --.B master -+.B cyrus-master - [ - .B \-C - .I alternate imapd.conf -@@ -79,7 +79,7 @@ - .I snmp agentx socket - ] - .SH DESCRIPTION --.I Master -+.I Cyrus-master - is the process that controls all of the Cyrus processes. This process - is responsible for creating all imapd, pop3d, lmtpd and sieved child - processes. This process also initializes the Berkeley DB code and -@@ -92,12 +92,12 @@ - .SH OPTIONS - .TP - .BI \-C " alternate imapd.conf" --Specifies an alternate imapd.conf for use by master (note that this will --not affect any sub-processes spawned by master, you should specify those -+Specifies an alternate imapd.conf for use by cyrus-master (note that this will -+not affect any sub-processes spawned by cyrus-master, you should specify those - specifically in the respective entries in cyrus.conf). - .TP - .BI \-M " alternate cyrus.conf" --Specifies an alternate cyrus.conf for use by master. -+Specifies an alternate cyrus.conf for use by cyrus-master. - .TP - .BI \-l " listen queue backlog" - Increase the listen queue backlog. By default, the listen queue is set -@@ -132,12 +132,12 @@ - Requires net-snmp 5.0 or higher. - .SH CONFIGURATION - Upon execution, --.I master -+.I cyrus-master - reads its configuration information out of the - .IR cyrus.conf (5) - file. - .PP --.I Master -+.I Cyrus-master - rereads its configuration file when it receives a hangup signal, - SIGHUP. Services and events may be added, deleted or modified when the - configuration file is reread. Any active services removed from the -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/nntpd.8 cyrus-imapd-2.3.11/man/nntpd.8 ---- cyrus-imapd-2.3.11.orig/man/nntpd.8 2006-11-30 12:11:23.000000000 -0500 -+++ cyrus-imapd-2.3.11/man/nntpd.8 2008-01-22 04:19:24.488523000 -0500 -@@ -78,7 +78,7 @@ - is a NNTP server. - It accepts commands on its standard input and responds on its standard output. - It MUST invoked by --.IR master (8) -+.IR cyrus-master (8) - with those descriptors attached to a remote client connection. - .PP - .I Nntpd -@@ -153,4 +153,4 @@ - .B /etc/imapd.conf - .SH SEE ALSO - .PP --\fBimapd.conf(5)\fR, \fBmaster(8)\fR -+\fBimapd.conf(5)\fR, \fBcyrus-master(8)\fR -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/notifyd.8 cyrus-imapd-2.3.11/man/notifyd.8 ---- cyrus-imapd-2.3.11.orig/man/notifyd.8 2003-08-09 19:43:14.000000000 -0400 -+++ cyrus-imapd-2.3.11/man/notifyd.8 2008-01-22 04:19:24.538528000 -0500 -@@ -62,7 +62,7 @@ - ] - .SH DESCRIPTION - .B Notifyd --is a daemon started from master(8) that handles notification requests on -+is a daemon started from cyrus-master(8) that handles notification requests on - behalf of lmtpd(8). - .B Notifyd - accepts the request and performs the notification using the method -@@ -122,4 +122,4 @@ - Cyrus Master process configuration file. - .SH SEE ALSO - .PP --\fBimapd.conf(5)\fR, \fBcyrus.conf\fR, \fBmaster(8)\fR, \fBlmtpd(8)\fR -+\fBimapd.conf(5)\fR, \fBcyrus.conf\fR, \fBcyrus-master(8)\fR, \fBlmtpd(8)\fR -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/pop3d.8 cyrus-imapd-2.3.11/man/pop3d.8 ---- cyrus-imapd-2.3.11.orig/man/pop3d.8 2006-11-30 12:11:23.000000000 -0500 -+++ cyrus-imapd-2.3.11/man/pop3d.8 2008-01-22 04:19:24.568532000 -0500 -@@ -75,7 +75,7 @@ - is a POP3 server. - It accepts commands on its standard input and responds on its standard output. - It MUST invoked by --.IR master (8) -+.IR cyrus-master (8) - with those descriptors attached to a remote client connection. - .PP - .I Pop3d -@@ -132,4 +132,4 @@ - .B /etc/imapd.conf - .SH SEE ALSO - .PP --\fBimapd.conf(5)\fR, \fBmaster(8)\fR -+\fBimapd.conf(5)\fR, \fBcyrus-master(8)\fR -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/smmapd.8 cyrus-imapd-2.3.11/man/smmapd.8 ---- cyrus-imapd-2.3.11.orig/man/smmapd.8 2006-11-30 12:11:23.000000000 -0500 -+++ cyrus-imapd-2.3.11/man/smmapd.8 2008-01-22 04:19:24.608537000 -0500 -@@ -67,7 +67,7 @@ - It accepts commands on its standard input and responds on its standard - output. - It MUST be invoked by --.IR master (8) -+.IR cyrus-master (8) - with those descriptors attached to a remote client connection. - .PP - .B SMMAPD -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/timsieved.8 cyrus-imapd-2.3.11/man/timsieved.8 ---- cyrus-imapd-2.3.11.orig/man/timsieved.8 2006-11-30 12:11:23.000000000 -0500 -+++ cyrus-imapd-2.3.11/man/timsieved.8 2008-01-22 04:19:24.638540000 -0500 -@@ -53,7 +53,7 @@ - is a server that allows users to remotely manage their sieve scripts - kept on the server. It accepts commands on its standard input and - responds on its standard output. It MUST be invoked by --.IR master (8) -+.IR cyrus-master (8) - with those descriptors attached to a remote client connection. - .PP - Cyrus admins that authenticate and authorize as themselves (e.g. don't -@@ -73,4 +73,4 @@ - .B /etc/imapd.conf - .SH SEE ALSO - .PP --\fBimapd.conf(5)\fR, \fBmaster(8)\fR -+\fBimapd.conf(5)\fR, \fBcyrus-master(8)\fR -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/tls_prune.8 cyrus-imapd-2.3.11/man/tls_prune.8 ---- cyrus-imapd-2.3.11.orig/man/tls_prune.8 2003-08-09 19:43:15.000000000 -0400 -+++ cyrus-imapd-2.3.11/man/tls_prune.8 2008-01-22 04:19:24.678545000 -0500 -@@ -67,4 +67,4 @@ - .B /etc/imapd.conf - .SH SEE ALSO - .PP --\fBimapd.conf(5)\fR, \fBmaster(8)\fR -+\fBimapd.conf(5)\fR, \fBcyrus-master(8)\fR -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/master/Makefile.in cyrus-imapd-2.3.11/master/Makefile.in ---- cyrus-imapd-2.3.11.orig/master/Makefile.in 2007-09-24 08:48:32.000000000 -0400 -+++ cyrus-imapd-2.3.11/master/Makefile.in 2008-01-22 04:20:08.954063000 -0500 -@@ -71,7 +71,7 @@ - - LOBJS=service.o service-thread.o - --PROGS=master -+PROGS=cyrus-master - - all: $(PROGS) $(LOBJS) - -@@ -86,8 +86,8 @@ - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \ - $< - --master: master.o masterconf.o cyrusMasterMIB.o ../lib/lock_ at WITH_LOCK@.o -- $(CC) $(LDFLAGS) -o master master.o masterconf.o cyrusMasterMIB.o ../lib/lock_ at WITH_LOCK@.o $(LIBS) $(DEPLIBS) -+cyrus-master: master.o masterconf.o cyrusMasterMIB.o ../lib/lock_ at WITH_LOCK@.o -+ $(CC) $(LDFLAGS) -o cyrus-master master.o masterconf.o cyrusMasterMIB.o ../lib/lock_ at WITH_LOCK@.o $(LIBS) $(DEPLIBS) - - clean: - rm -f *.o *.a Makefile.bak $(PROGS) -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/master/master.c cyrus-imapd-2.3.11/master/master.c ---- cyrus-imapd-2.3.11.orig/master/master.c 2007-10-10 09:59:48.000000000 -0400 -+++ cyrus-imapd-2.3.11/master/master.c 2008-01-22 04:19:24.748554000 -0500 -@@ -1738,7 +1738,7 @@ - pid = fork(); - - if ((pid == -1) && (errno == EAGAIN)) { -- syslog(LOG_WARNING, "master fork failed (sleeping): %m"); -+ syslog(LOG_WARNING, "cyrus-master fork failed (sleeping): %m"); - sleep(5); - } - } while ((pid == -1) && (errno == EAGAIN)); -@@ -1799,7 +1799,7 @@ - /* Tell our parent that we failed. */ - write(startup_pipe[1], &exit_result, sizeof(exit_result)); - -- fatal("cannot get exclusive lock on pidfile (is another master still running?)", EX_OSERR); -+ fatal("cannot get exclusive lock on pidfile (is another cyrus-master still running?)", EX_OSERR); - } else { - int pidfd_flags = fcntl(pidfd, F_GETFD, 0); - if (pidfd_flags != -1) -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/master/service-thread.c cyrus-imapd-2.3.11/master/service-thread.c ---- cyrus-imapd-2.3.11.orig/master/service-thread.c 2006-11-30 12:11:23.000000000 -0500 -+++ cyrus-imapd-2.3.11/master/service-thread.c 2008-01-22 04:19:24.778558000 -0500 -@@ -79,11 +79,11 @@ - void notify_master(int fd, int msg) - { - struct notify_message notifymsg; -- if (verbose) syslog(LOG_DEBUG, "telling master %x", msg); -+ if (verbose) syslog(LOG_DEBUG, "telling cyrus-master %x", msg); - notifymsg.message = msg; - notifymsg.service_pid = getpid(); - if (write(fd, ¬ifymsg, sizeof(notifymsg)) != sizeof(notifymsg)) { -- syslog(LOG_ERR, "unable to tell master %x: %m", msg); -+ syslog(LOG_ERR, "unable to tell cyrus-master %x: %m", msg); - } - } - -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/master/service.c cyrus-imapd-2.3.11/master/service.c ---- cyrus-imapd-2.3.11.orig/master/service.c 2007-09-27 16:10:39.000000000 -0400 -+++ cyrus-imapd-2.3.11/master/service.c 2008-01-22 04:19:24.808564000 -0500 -@@ -86,11 +86,11 @@ - void notify_master(int fd, int msg) - { - struct notify_message notifymsg; -- if (verbose) syslog(LOG_DEBUG, "telling master %x", msg); -+ if (verbose) syslog(LOG_DEBUG, "telling cyrus-master %x", msg); - notifymsg.message = msg; - notifymsg.service_pid = getpid(); - if (write(fd, ¬ifymsg, sizeof(notifymsg)) != sizeof(notifymsg)) { -- syslog(LOG_ERR, "unable to tell master %x: %m", msg); -+ syslog(LOG_ERR, "unable to tell cyrus-master %x: %m", msg); - } - } - Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW 2008-12-19 19:11:49 UTC (rev 2675) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW 2008-12-20 14:18:23 UTC (rev 2676) @@ -1,3 +1,15 @@ +pm_cyrus (2.3.13,REV=2008.12.20) unstable + + * Added mupdate service in /etc/services. + + -- Yann Rouillard Sat, 20 Dec 2008 15:13:33 +0100 + +pm_cyrus (2.3.13,REV=2008.11.30) unstable + + * New upstream version. + + -- Yann Rouillard Sun, 30 Nov 2008 20:58:22 +0100 + pm_cyrus (2.3.9,REV=2008.01.21) unstable * New upstream version. Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/services =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/services 2008-12-19 19:11:49 UTC (rev 2675) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/services 2008-12-20 14:18:23 UTC (rev 2676) @@ -16,6 +16,7 @@ kpop 1109/tcp # Pop with Kerberos sieve 2000/tcp # Sieve mail filter daemon lmtp 2003/tcp # Local Mail Transfer Protocol +mupdate 3905/tcp fud 4201/udp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Dec 21 21:59:36 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 21 Dec 2008 20:59:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[2677] csw/mgar/pkg/x11/libXau/trunk Message-ID: Revision: 2677 http://gar.svn.sourceforge.net/gar/?rev=2677&view=rev Author: wbonnet Date: 2008-12-21 20:59:36 +0000 (Sun, 21 Dec 2008) Log Message: ----------- Update libXau makefiles Modified Paths: -------------- csw/mgar/pkg/x11/libXau/trunk/Makefile csw/mgar/pkg/x11/libXau/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/libXau/trunk/files/CSWlibxau.gspec csw/mgar/pkg/x11/libXau/trunk/files/CSWlibxaudevel.gspec Removed Paths: ------------- csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXau.depend csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXau.gspec csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXau.prototype csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXaudev.depend csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXaudev.gspec csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXaudev.prototype Modified: csw/mgar/pkg/x11/libXau/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libXau/trunk/Makefile 2008-12-20 14:18:23 UTC (rev 2676) +++ csw/mgar/pkg/x11/libXau/trunk/Makefile 2008-12-21 20:59:36 UTC (rev 2677) @@ -14,10 +14,10 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -DISTFILES += CSWlibXau.gspec CSWlibXau.prototype CSWlibXau.depend -DISTFILES += CSWlibXaudev.gspec CSWlibXaudev.prototype CSWlibXaudev.depend -# DISTFILES += $(call admfiles,CSWlibXau, depend) +DISTFILES += $(call admfiles,CSWlibxaudevel, ) +DISTFILES += $(call admfiles,CSWlibxau, ) +PKGFILES_CSWlibxaudevel = $(PKGFILES_DEVEL) include gar/category.mk Modified: csw/mgar/pkg/x11/libXau/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libXau/trunk/checksums 2008-12-20 14:18:23 UTC (rev 2676) +++ csw/mgar/pkg/x11/libXau/trunk/checksums 2008-12-21 20:59:36 UTC (rev 2677) @@ -1,7 +1,3 @@ 77c3de874155456c857b331063ad2fd9 download/libXau-1.0.4.tar.gz -d987d62443ccb06edc51d6984f9c5e00 download/CSWlibXau.gspec -d9dfaadc29ebcfddad888bb4d1ac347c download/CSWlibXau.prototype -c46676dbe305dd1a76701a52899afbf8 download/CSWlibXau.depend -6b9f39ea5225419f95cf6fd001505548 download/CSWlibXaudev.gspec -89680d18777fdcad32e518093adb0066 download/CSWlibXaudev.prototype -0a284be99d29cdfd141d0df6c13baa8e download/CSWlibXaudev.depend +03fd9250999932312a8f773cf5bc036d download/CSWlibxaudevel.gspec +4dba507bb4e471f3f15a039958063ee8 download/CSWlibxau.gspec Deleted: csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXau.depend =================================================================== --- csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXau.depend 2008-12-20 14:18:23 UTC (rev 2676) +++ csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXau.depend 2008-12-21 20:59:36 UTC (rev 2677) @@ -1,5 +0,0 @@ -P CSWfconfig -P CSWftype2 -P CSWpixman -P CSWpng -P CSWzlib Deleted: csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXau.gspec =================================================================== --- csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXau.gspec 2008-12-20 14:18:23 UTC (rev 2676) +++ csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXau.gspec 2008-12-21 20:59:36 UTC (rev 2677) @@ -1,4 +0,0 @@ -%var bitname libxau -%var pkgname CSWlibxau -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING Deleted: csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXau.prototype =================================================================== --- csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXau.prototype 2008-12-20 14:18:23 UTC (rev 2676) +++ csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXau.prototype 2008-12-21 20:59:36 UTC (rev 2677) @@ -1,20 +0,0 @@ -d none /opt/csw/lib 0755 root bin -f none /opt/csw/lib/libXau.la 0755 root bin -f none /opt/csw/lib/libXau.so.6.0.0 0755 root bin -s none /opt/csw/lib/libXau.so.6=libXau.so.6.0.0 -s none /opt/csw/lib/libXau.so=libXau.so.6.0.0 -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/Xau.3 0644 root bin -f none /opt/csw/share/man/man3/XauDisposeAuth.3 0644 root bin -f none /opt/csw/share/man/man3/XauFileName.3 0644 root bin -f none /opt/csw/share/man/man3/XauGetAuthByAddr.3 0644 root bin -f none /opt/csw/share/man/man3/XauGetBestAuthByAddr.3 0644 root bin -f none /opt/csw/share/man/man3/XauLockAuth.3 0644 root bin -f none /opt/csw/share/man/man3/XauReadAuth.3 0644 root bin -f none /opt/csw/share/man/man3/XauUnlockAuth.3 0644 root bin -f none /opt/csw/share/man/man3/XauWriteAuth.3 0644 root bin -i copyright=CSWlibXau.copyright -i depend=CSWlibXau.depend -i pkginfo=CSWlibXau.pkginfo Deleted: csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXaudev.depend =================================================================== --- csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXaudev.depend 2008-12-20 14:18:23 UTC (rev 2676) +++ csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXaudev.depend 2008-12-21 20:59:36 UTC (rev 2677) @@ -1 +0,0 @@ -P CSWlibxau Deleted: csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXaudev.gspec =================================================================== --- csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXaudev.gspec 2008-12-20 14:18:23 UTC (rev 2676) +++ csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXaudev.gspec 2008-12-21 20:59:36 UTC (rev 2677) @@ -1,4 +0,0 @@ -%var bitname libxau_dev -%var pkgname CSWlibxaudev -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING Deleted: csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXaudev.prototype =================================================================== --- csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXaudev.prototype 2008-12-20 14:18:23 UTC (rev 2676) +++ csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXaudev.prototype 2008-12-21 20:59:36 UTC (rev 2677) @@ -1,9 +0,0 @@ -d none /opt/csw/include/X11 0755 root bin -f none /opt/csw/include/X11/Xauth.h 0644 root bin -d none /opt/csw/lib 0755 root bin -f none /opt/csw/lib/libXau.a 0644 root bin -d none /opt/csw/lib/pkgconfig 0755 root bin -f none /opt/csw/lib/pkgconfig/xau.pc 0644 root bin -i copyright=CSWlibXaudev.copyright -i depend=CSWlibXaudev.depend -i pkginfo=CSWlibXaudev.pkginfo Copied: csw/mgar/pkg/x11/libXau/trunk/files/CSWlibxau.gspec (from rev 2660, csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXau.gspec) =================================================================== --- csw/mgar/pkg/x11/libXau/trunk/files/CSWlibxau.gspec (rev 0) +++ csw/mgar/pkg/x11/libXau/trunk/files/CSWlibxau.gspec 2008-12-21 20:59:36 UTC (rev 2677) @@ -0,0 +1,4 @@ +%var bitname libxau +%var pkgname CSWlibxau +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Copied: csw/mgar/pkg/x11/libXau/trunk/files/CSWlibxaudevel.gspec (from rev 2660, csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXaudev.gspec) =================================================================== --- csw/mgar/pkg/x11/libXau/trunk/files/CSWlibxaudevel.gspec (rev 0) +++ csw/mgar/pkg/x11/libXau/trunk/files/CSWlibxaudevel.gspec 2008-12-21 20:59:36 UTC (rev 2677) @@ -0,0 +1,4 @@ +%var bitname libxau_devel +%var pkgname CSWlibxaudevel +%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 trygvis at users.sourceforge.net Sun Dec 21 22:10:09 2008 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 21 Dec 2008 21:10:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[2678] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 2678 http://gar.svn.sourceforge.net/gar/?rev=2678&view=rev Author: trygvis Date: 2008-12-21 21:10:08 +0000 (Sun, 21 Dec 2008) Log Message: ----------- o Making sure checkpkg always is executed with the 'C' locale to prevent errors like 'ERROR: libxau_devel must be all lowercase'. Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2008-12-21 20:59:36 UTC (rev 2677) +++ csw/mgar/gar/v2/gar.pkg.mk 2008-12-21 21:10:08 UTC (rev 2678) @@ -247,7 +247,7 @@ pkgcheck-%: @echo " ==> Checking compliance: $*" - @( checkpkg $(SPKG_EXPORT)/`$(call _PKG_ENV,$1) mkpackage -qs $(WORKDIR)/$*.gspec -D pkgfile`.gz ) || exit 2 + @( LC_ALL=C checkpkg $(SPKG_EXPORT)/`$(call _PKG_ENV,$1) mkpackage -qs $(WORKDIR)/$*.gspec -D pkgfile`.gz ) || exit 2 pkgcheck-p: @$(foreach COOKIEFILE,$(PKGCHECK_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;) 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 Dec 21 22:55:24 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 21 Dec 2008 21:55:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[2679] csw/mgar/pkg Message-ID: Revision: 2679 http://gar.svn.sourceforge.net/gar/?rev=2679&view=rev Author: bonivart Date: 2008-12-21 21:55:24 +0000 (Sun, 21 Dec 2008) Log Message: ----------- dhcp: first commit Added Paths: ----------- csw/mgar/pkg/dhcp/ csw/mgar/pkg/dhcp/branches/ csw/mgar/pkg/dhcp/tags/ csw/mgar/pkg/dhcp/trunk/ csw/mgar/pkg/dhcp/trunk/Makefile csw/mgar/pkg/dhcp/trunk/checksums csw/mgar/pkg/dhcp/trunk/files/ csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.gspec Property changes on: csw/mgar/pkg/dhcp/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/dhcp/trunk/Makefile =================================================================== --- csw/mgar/pkg/dhcp/trunk/Makefile (rev 0) +++ csw/mgar/pkg/dhcp/trunk/Makefile 2008-12-21 21:55:24 UTC (rev 2679) @@ -0,0 +1,29 @@ +# split into devel package +# use cswclassutils for conf files and smf support (add init file) +# create doc dir with license + +GARNAME = dhcp +GARVERSION = 4.1.0 +CATEGORIES = net + +DESCRIPTION = ISC DHCP reference implementation +define BLURB + ISC DHCP is open-source software that implements the Dynamic Host + Configuration Protocols for connection to a local network. It is a reference + implementation of those protocols, but it is also production-grade software, + suitable for use in high-volume and high-reliability applications. +endef + +MASTER_SITES = http://ftp.isc.org/isc/dhcp/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWdhcp,) + +GARCOMPILER = GNU +TEST_TARGET = check + +CONFIGURE_ARGS = $(DIRPATHS) + +SPKG_SOURCEURL = https://www.isc.org/software/dhcp + +include gar/category.mk + Added: csw/mgar/pkg/dhcp/trunk/checksums =================================================================== --- csw/mgar/pkg/dhcp/trunk/checksums (rev 0) +++ csw/mgar/pkg/dhcp/trunk/checksums 2008-12-21 21:55:24 UTC (rev 2679) @@ -0,0 +1,2 @@ +1fffed2e8c3d67b111316d6a9b33db7a download/dhcp-4.1.0.tar.gz +688cb75529efcf37de7526cd4111eea9 download/CSWdhcp.gspec Added: csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.gspec =================================================================== --- csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.gspec (rev 0) +++ csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.gspec 2008-12-21 21:55:24 UTC (rev 2679) @@ -0,0 +1,7 @@ +%var bitname dhcp +%var pkgname CSWdhcp +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/dhcp/LICENSE for license information + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From william at wbonnet.net Sun Dec 21 23:11:34 2008 From: william at wbonnet.net (William Bonnet) Date: Sun, 21 Dec 2008 23:11:34 +0100 Subject: [csw-devel] Using dynamic prototype Message-ID: <494EBF16.6080700@wbonnet.net> Hi Dago, I am trying to switch my package to the use of dynamic prototypes, especially for devel and doc stuff. I tried to set it up in libXau package (under x11). But it seems that the devel package is empty, and as a newbie i don't really understand what i did wrong. Please can you tell me what is missing from my Makefile ? I am trying to create two packages, libxau and libxaudevel. The second one will include file under include, pkgconfig and the .a lib. Thanks in advance. I send this question to the list since it may serve as example to other. Cheers W. -- William http://www.wbonnet.net http://www.sunwizard.net Le site fran?ais des amateurs de stations Unix http://www.blastwave.org An OpenSolaris Community Site http://www.opencsw.org Community SoftWare for Solaris http://www.guses.org French speaking Solaris User Group From jake_goerzen at users.sourceforge.net Mon Dec 22 00:25:22 2008 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Sun, 21 Dec 2008 23:25:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[2680] csw/mgar/pkg/freeciv/trunk Message-ID: Revision: 2680 http://gar.svn.sourceforge.net/gar/?rev=2680&view=rev Author: jake_goerzen Date: 2008-12-21 23:25:22 +0000 (Sun, 21 Dec 2008) Log Message: ----------- update src to version 2.1.8 Modified Paths: -------------- csw/mgar/pkg/freeciv/trunk/Makefile csw/mgar/pkg/freeciv/trunk/checksums Modified: csw/mgar/pkg/freeciv/trunk/Makefile =================================================================== --- csw/mgar/pkg/freeciv/trunk/Makefile 2008-12-21 21:55:24 UTC (rev 2679) +++ csw/mgar/pkg/freeciv/trunk/Makefile 2008-12-21 23:25:22 UTC (rev 2680) @@ -1,5 +1,5 @@ GARNAME = freeciv -GARVERSION = 2.1.6 +GARVERSION = 2.1.8 CATEGORIES = apps DESCRIPTION = a free turn-based multiplayer strategy game Modified: csw/mgar/pkg/freeciv/trunk/checksums =================================================================== --- csw/mgar/pkg/freeciv/trunk/checksums 2008-12-21 21:55:24 UTC (rev 2679) +++ csw/mgar/pkg/freeciv/trunk/checksums 2008-12-21 23:25:22 UTC (rev 2680) @@ -1,4 +1,4 @@ -5446d2e759617c565d30c250cc22aa41 download/freeciv-2.1.6.tar.gz +3e9925e868a816c1fba58993cced92ef download/freeciv-2.1.8.tar.gz 4f6b34dbb2143663d82ebea710c56863 download/CSWfreeciv.gspec 8b2248c58bd3ed3d7ce1fb5274f0b0f7 download/CSWfreeciv.depend d3acfde4316e7011beccd69b21d2ad67 download/CSWfreeciv.prototype This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Dec 22 00:49:56 2008 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 21 Dec 2008 23:49:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[2681] csw/mgar/pkg Message-ID: Revision: 2681 http://gar.svn.sourceforge.net/gar/?rev=2681&view=rev Author: chninkel Date: 2008-12-21 23:49:55 +0000 (Sun, 21 Dec 2008) Log Message: ----------- ca_certificates: initial commit Added Paths: ----------- csw/mgar/pkg/ca_certificates/ csw/mgar/pkg/ca_certificates/branches/ csw/mgar/pkg/ca_certificates/tags/ csw/mgar/pkg/ca_certificates/trunk/ csw/mgar/pkg/ca_certificates/trunk/Makefile csw/mgar/pkg/ca_certificates/trunk/checksums csw/mgar/pkg/ca_certificates/trunk/files/ csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.depend csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.gspec csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postinstall csw/mgar/pkg/ca_certificates/trunk/files/certdata2pem.pl csw/mgar/pkg/ca_certificates/trunk/files/update-ca-certificates Property changes on: csw/mgar/pkg/ca_certificates/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 Added: csw/mgar/pkg/ca_certificates/trunk/Makefile =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/Makefile (rev 0) +++ csw/mgar/pkg/ca_certificates/trunk/Makefile 2008-12-21 23:49:55 UTC (rev 2681) @@ -0,0 +1,36 @@ +GARNAME = ca-certificates +GARVERSION = $(shell date '+%Y%m%d') +CATEGORIES = xtra + +DESCRIPTION = CA certificates +define BLURB + CA certificates +endef + +MASTER_SITES = http://hg.mozilla.org/mozilla-central/raw-file/default/security/nss/lib/ckfw/builtins/ +DISTFILES = certdata.txt certdata2pem.pl update-ca-certificates +DISTFILES += $(call admfiles,CSWcacertificates,depend postinstall) + +# We define upstream file regex so we can be notifed of new upstream software release +# UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +SPKG_CLASSES = none cswpreserveconf + +include gar/category.mk + + +install-custom: + ginstall -d "$(DESTDIR)/$(sysconfdir)/ssl/certs" + ginstall -d "$(DESTDIR)/$(sharedstatedir)/ca-certificates" + ginstall -D "$(CURDIR)/$(WORKDIR)/update-ca-certificates" "$(DESTDIR)/$(sbindir)/update-ca-certificates" + cd "$(DESTDIR)/$(sharedstatedir)/ca-certificates" && perl "$(CURDIR)/$(WORKDIR)/certdata2pem.pl" < "$(CURDIR)/$(WORKDIR)/certdata.txt" + cd "$(DESTDIR)/$(sharedstatedir)/ca-certificates" && ls -1 > "$(CURDIR)/$(WORKDIR)/ca-certificate.conf" + sed -ne '/BEGIN LICENSE BLOCK/,/END LICENSE BLOCK/p' "$(CURDIR)/$(WORKDIR)/certdata.txt" | grep -v "LICENSE BLOCK" \ + > "$(CURDIR)/$(WORKDIR)/LICENSE" Added: csw/mgar/pkg/ca_certificates/trunk/checksums =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/checksums (rev 0) +++ csw/mgar/pkg/ca_certificates/trunk/checksums 2008-12-21 23:49:55 UTC (rev 2681) @@ -0,0 +1,6 @@ +4dabeaecfd46395da152e51d312107e4 download/certdata.txt +6087aaa070808190680dcd5cb03c0cb9 download/certdata2pem.pl +f7b1df4e84e70b1cf7023779ba11698b download/update-ca-certificates +3bb0b5d545c0bd8f4381cfd2d500586c download/CSWcacertificates.gspec +df81c8c6eb55786ebefd47fc6400b8b6 download/CSWcacertificates.depend +48e4c60f385981c1430313584f527b50 download/CSWcacertificates.postinstall Added: csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.depend =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.depend (rev 0) +++ csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.depend 2008-12-21 23:49:55 UTC (rev 2681) @@ -0,0 +1,2 @@ +P CSWcswclassutils +P CSWosslutils Added: csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.gspec =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.gspec (rev 0) +++ csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.gspec 2008-12-21 23:49:55 UTC (rev 2681) @@ -0,0 +1,7 @@ +%var bitname ca_certificates +%var pkgname CSWcacertificates +%var arch all +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKDIR}/LICENSE +%prototype:merge +e cswpreserveconf /opt/csw/etc/ca-certificates.conf.csw=ca-certificate.conf 0644 root bin Added: csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postinstall =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postinstall (rev 0) +++ csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postinstall 2008-12-21 23:49:55 UTC (rev 2681) @@ -0,0 +1,7 @@ + +# Update ca lists +if [ -n "${BASEDIR}" ]; then + chroot ${BASEDIR} /opt/csw/sbin/update-ca-certificates +else + /opt/csw/sbin/update-ca-certificates +fi Added: csw/mgar/pkg/ca_certificates/trunk/files/certdata2pem.pl =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/files/certdata2pem.pl (rev 0) +++ csw/mgar/pkg/ca_certificates/trunk/files/certdata2pem.pl 2008-12-21 23:49:55 UTC (rev 2681) @@ -0,0 +1,64 @@ +#!/usr/bin/perl + +sub encode_base64 +{ + my $string = shift; + my $res = pack("u", $string); + # Remove first character of each line, remove newlines + $res =~ s/^.//mg; + $res =~ s/\n//g; + + $res =~ tr|` -_|AA-Za-z0-9+/|; # `# help emacs + # fix padding at the end + my $padding = (3 - length($string) % 3) % 3; + $res =~ s/.{$padding}$/'=' x $padding/e if $padding; + # break encoded string into lines of no more than 76 characters each + $res =~ s/(.{1,60})/$1\n/g; + + return $res; +} + + +while (my $line = ) { + next if $line =~ /^#/; + + if ($line =~ /^\s*$/) { + undef $fname; + next; + } + + chomp ($line); + + if ($line =~ /CKA_LABEL/) { + my ($label, $type, $val) = split (/ /, $line, 3); + $val =~ s/^"//; + $val =~ s/"$//; + $val =~ s/[\/\s,]/_/g; + $val =~ s/[()]//g; + $fname = $val . ".crt"; + next; + } + + if ($line =~ /CKA_VALUE MULTILINE_OCTAL/) { + if (not $fname) { + print "ERROR: unexpected CKA_VALUE MULTILINE_OCTAL\n"; + next; + } + my @cert_data; + while ($line = ) { + last if $line =~ /^END/; + chomp ($line); + my @data = split (/\\/, $line); + shift (@data); + push (@cert_data, @data); + } + @cert_data = map (oct, @cert_data); + @cert_data = map (chr, @cert_data); + open (FH, "> $fname"); + print FH "-----BEGIN CERTIFICATE-----\n"; + print FH encode_base64 (join ("", @cert_data)); + print FH "-----END CERTIFICATE-----\n"; + close (FH); + print "Created $fname certificate\n"; + } +} Added: csw/mgar/pkg/ca_certificates/trunk/files/update-ca-certificates =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/files/update-ca-certificates (rev 0) +++ csw/mgar/pkg/ca_certificates/trunk/files/update-ca-certificates 2008-12-21 23:49:55 UTC (rev 2681) @@ -0,0 +1,77 @@ +#!/bin/sh -e +# +# update-ca-certificates +# Debian script adapted for Solaris by Yann Rouillard +# +# Copyright (c) 2003 Fumitoshi UKAI +# Copyright (c) 2008 Yann Rouillard +# +# 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 2 of the License, 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# + +verbose=0 +fresh=0 +while [ $# -gt 0 ]; +do + case $1 in + --verbose|-v) + verbose=1;; + + --help|-h|*) + echo "$0: [--verbose] [--fresh]" + exit;; + esac + shift +done + +CERTSCONF=/opt/csw/etc/ca-certificates.conf +CERTSDIR=/opt/csw/share/ca-certificates +CERTBUNDLE=ca-certificates.crt +ETCCERTSDIR=/opt/csw/etc/ssl/certs + +if [ ! -f "$CERTSCONF" ]; then + echo "ERROR: $CERTSCONF doesn't exist !" >&2 + exit 2 +fi + +cd $ETCCERTSDIR +find . -type l -print | while read SYMLINK; do + test -f $SYMLINK || rm -f $SYMLINK +done + +printf "Updating certificates in $ETCCERTSDIR..." + +BUNDLETMP=`mktemp "${CERTBUNDLE}.tmp.XXXXXX"` +sed -e '/^#/g' "$CERTSCONF" | while read CERTFILE; do + if [ ! -f "$CERTFILE" ]; then + if [ ! -f "$CERTSDIR/$CERTFILE" ]; then + continue + fi + CERTFILE="$CERTSDIR/$CERTFILE" + fi + + cd "$ETCCERTSDIR" && ln -sf "$CERTFILE" "`basename $CERTFILE`.pem" +done + +cd "$ETCCERTSDIR" && cat *.pem > "$BUNDLETMP" +chmod 0644 "$BUNDLETMP" +mv -f "$BUNDLETMP" "$ETCCERTSDIR/$CERTBUNDLE" + +if [ "$verbose" = 0 ]; then + OPENSSL=/opt/csw/bin/openssl /opt/csw/bin/c_rehash . >/dev/null 2>&1 +else + OPENSSL=/opt/csw/bin/openssl /opt/csw/bin/c_rehash . +fi +echo "done." Property changes on: csw/mgar/pkg/ca_certificates/trunk/files/update-ca-certificates ___________________________________________________________________ Added: svn:executable + * 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 Mon Dec 22 02:28:00 2008 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Mon, 22 Dec 2008 01:28:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[2682] csw/mgar/pkg/wesnoth/trunk Message-ID: Revision: 2682 http://gar.svn.sourceforge.net/gar/?rev=2682&view=rev Author: jake_goerzen Date: 2008-12-22 01:28:00 +0000 (Mon, 22 Dec 2008) Log Message: ----------- update src to version 1.4.7 Modified Paths: -------------- csw/mgar/pkg/wesnoth/trunk/Makefile csw/mgar/pkg/wesnoth/trunk/checksums csw/mgar/pkg/wesnoth/trunk/files/CSWwesnoth.depend Modified: csw/mgar/pkg/wesnoth/trunk/Makefile =================================================================== --- csw/mgar/pkg/wesnoth/trunk/Makefile 2008-12-21 23:49:55 UTC (rev 2681) +++ csw/mgar/pkg/wesnoth/trunk/Makefile 2008-12-22 01:28:00 UTC (rev 2682) @@ -1,5 +1,5 @@ GARNAME = wesnoth -GARVERSION = 1.2.5 +GARVERSION = 1.4.7 CATEGORIES = apps DESCRIPTION = a free turn-based strategy game with a fanasy theme @@ -14,26 +14,20 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -GARCOMPILER ?= GNU +GARCOMPILER ?= SUN PATCHFILES = language.cpp.diff -CONFIGURE_ARGS = --prefix=$(prefix) --mandir=/opt/csw/share/man LDFLAGS='-lsunmath -lintl' -CONFIGURE_ARGS += LD_OPTIONS=-L/opt/csw/lib -CONFIGURE_ARGS += --with-server-uid=60001 -CONFIGURE_ARGS += --with-server-gid=60001 +CONFIGURE_ARGS = --prefix=$(prefix) +CONFIGURE_ARGS += CXXFLAGS='-features=extensions -library=stlport4' +CONFIGURE_ARGS += LDFLAGS='-L/opt/csw/lib -lstlport -lintl -lsocket -lboost_iostreams -lsunmath' CONFIGURE_ARGS += --disable-nls -CONFIGURE_ARGS += --enable-server -CONFIGURE_ARGS += --enable-campaign-server -CONFIGURE_ARGS += --enable-tools -CONFIGURE_ARGS += --enable-editor -CONFIGURE_ARGS += --with-kde -CONFIGURE_ARGS += --with-gnome +#CONFIGURE_ARGS += --enable-server +#CONFIGURE_ARGS += --enable-campaign-server +#CONFIGURE_ARGS += --enable-tools +#CONFIGURE_ARGS += --enable-editor +CONFIGURE_ARGS += --with-boost=/opt/csw TEST_SCRIPTS = include gar/category.mk - -#pre-configure: -# ( cd $(WORKSRC) ; aclocal ; autoconf ; automake -a ) -# @$(MAKECOOKIE) Modified: csw/mgar/pkg/wesnoth/trunk/checksums =================================================================== --- csw/mgar/pkg/wesnoth/trunk/checksums 2008-12-21 23:49:55 UTC (rev 2681) +++ csw/mgar/pkg/wesnoth/trunk/checksums 2008-12-22 01:28:00 UTC (rev 2682) @@ -1,4 +1,4 @@ -40e00ac97680fb69499191c30f130774 download/wesnoth-1.2.5.tar.bz2 +fdd341c3d66bf1bea2113c79db852d68 download/wesnoth-1.4.7.tar.bz2 724aaa92df2d85d3e69b96837786cb64 download/CSWwesnoth.gspec -9060626d8f3bebb849fcd169149c959a download/CSWwesnoth.depend +67b02fe682088a0450b99dc386884dcd download/CSWwesnoth.depend 59968804e93a18220d7d18e8252fff8d download/language.cpp.diff Modified: csw/mgar/pkg/wesnoth/trunk/files/CSWwesnoth.depend =================================================================== --- csw/mgar/pkg/wesnoth/trunk/files/CSWwesnoth.depend 2008-12-21 23:49:55 UTC (rev 2681) +++ csw/mgar/pkg/wesnoth/trunk/files/CSWwesnoth.depend 2008-12-22 01:28:00 UTC (rev 2682) @@ -1,6 +1,7 @@ P CSWftype2 -P CSWgcc3corert -P CSWgcc3g++rt +P CSWboostrt +P CSWpython +P CSWstlport P CSWggettext P CSWlibsdl P CSWpng @@ -10,3 +11,4 @@ P CSWsunmath P CSWzlib P CSWfribidi +P CSWcommon common - common files and dirs for CSW packages This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Mon Dec 22 12:31:17 2008 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Mon, 22 Dec 2008 11:31:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[2683] csw/mgar/gar/v2 Message-ID: Revision: 2683 http://gar.svn.sourceforge.net/gar/?rev=2683&view=rev Author: trygvis Date: 2008-12-22 11:31:17 +0000 (Mon, 22 Dec 2008) Log Message: ----------- o Adding some targets to work with svn. Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Added Paths: ----------- csw/mgar/gar/v2/bin/svnignore csw/mgar/gar/v2/gar.svn.mk csw/mgar/gar/v2/scm-help Added: csw/mgar/gar/v2/bin/svnignore =================================================================== --- csw/mgar/gar/v2/bin/svnignore (rev 0) +++ csw/mgar/gar/v2/bin/svnignore 2008-12-22 11:31:17 UTC (rev 2683) @@ -0,0 +1,28 @@ +#!/bin/sh +# +# Copyright 2008-2009 OpenCSW +# +# Redistribution and/or use, with or without modification, is +# permitted. This software is without warranty of any kind. The +# author(s) shall not be liable in the event that use of the +# software causes damage. +# +# gar.svn.mk - Targets for working with svn + +# Read the comma separated ignores from stdin and merges it with any existing +# ignores set on the directory. + +ignores=`mktemp`-ignores +existing_ignores=`mktemp`-existing +new_ignores=`mktemp`-new + +while [ "$1" != "" ]; do + echo $1 >> $ignores + shift +done + +svn pg svn:ignore . > $existing_ignores +cat $ignores $existing_ignores | sort | uniq > $new_ignores +svn ps svn:ignore . -F $new_ignores + +rm -rf $ignores $existing_ignores $new_ignores Property changes on: csw/mgar/gar/v2/bin/svnignore ___________________________________________________________________ Added: svn:executable + * Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2008-12-22 01:28:00 UTC (rev 2682) +++ csw/mgar/gar/v2/gar.conf.mk 2008-12-22 11:31:17 UTC (rev 2683) @@ -568,8 +568,7 @@ FILE_SITES = $(foreach DIR,$(FILEDIR) $(GARCHIVEPATH),file://$(DIR)/) # Extra libraries -EXTRA_LIBS = gar.pkg.mk gar.common.mk - +EXTRA_LIBS = gar.pkg.mk gar.common.mk gar.svn.mk ccenv: @echo " Compiler: $(GARCOMPILER)" @echo Added: csw/mgar/gar/v2/gar.svn.mk =================================================================== --- csw/mgar/gar/v2/gar.svn.mk (rev 0) +++ csw/mgar/gar/v2/gar.svn.mk 2008-12-22 11:31:17 UTC (rev 2683) @@ -0,0 +1,29 @@ +# vim: ft=make ts=4 sw=4 noet +# +# $Id$ +# +# Copyright 2008-2009 OpenCSW +# +# Redistribution and/or use, with or without modification, is +# permitted. This software is without warranty of any kind. The +# author(s) shall not be liable in the event that use of the +# software causes damage. +# +# gar.svn.mk - Targets for working with svn +# + +scm-help: + @cat $(GARDIR)/scm-help + +scm-update-all: scm-update-package scm-update-gar + +scm-update-package: + $(SVN) --ignore-externals up + +scm-update-gar: + cd $(GARDIR) && $(SVN) --ignore-externals up + +scm-update-ignores: + $(GARDIR)/bin/svnignore work cookies download + +.PHONY: scm-help scm-update-all scm-update-package scm-update-gar Added: csw/mgar/gar/v2/scm-help =================================================================== --- csw/mgar/gar/v2/scm-help (rev 0) +++ csw/mgar/gar/v2/scm-help 2008-12-22 11:31:17 UTC (rev 2683) @@ -0,0 +1,10 @@ +These are the available SCM targets + +scm-update-all: + Updates both the package files and the gar/ directory + +scm-update-package: + Updates the package files + +scm-update-gar: + Updates the contents of the gar/ directory This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Mon Dec 22 12:34:48 2008 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Mon, 22 Dec 2008 11:34:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[2684] csw/mgar/pkg Message-ID: Revision: 2684 http://gar.svn.sourceforge.net/gar/?rev=2684&view=rev Author: trygvis Date: 2008-12-22 11:34:48 +0000 (Mon, 22 Dec 2008) Log Message: ----------- o First version of ghc (Glasgow Haskell Compiler). Added Paths: ----------- csw/mgar/pkg/ghc/ csw/mgar/pkg/ghc/Makefile csw/mgar/pkg/ghc/branches/ csw/mgar/pkg/ghc/tags/ csw/mgar/pkg/ghc/trunk/ csw/mgar/pkg/ghc/trunk/Makefile csw/mgar/pkg/ghc/trunk/checksums csw/mgar/pkg/ghc/trunk/files/ csw/mgar/pkg/ghc/trunk/files/CSWghc-prof.gspec csw/mgar/pkg/ghc/trunk/files/CSWghc.gspec Added: csw/mgar/pkg/ghc/Makefile =================================================================== --- csw/mgar/pkg/ghc/Makefile (rev 0) +++ csw/mgar/pkg/ghc/Makefile 2008-12-22 11:34:48 UTC (rev 2684) @@ -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/ghc/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/ghc/trunk/Makefile =================================================================== --- csw/mgar/pkg/ghc/trunk/Makefile (rev 0) +++ csw/mgar/pkg/ghc/trunk/Makefile 2008-12-22 11:34:48 UTC (rev 2684) @@ -0,0 +1,73 @@ +# Copyright 2008 OpenCSW +# +# Redistribution and/or use, with or without modification, is +# permitted. This software is without warranty of any kind. The +# author(s) shall not be liable in the event that use of the +# software causes damage. + +# TODO: Unpack the bootstrap binaries. Right now they're assumed to be installed under /tmp/ghc. +# Might not be too useful when re-building this package. + +GARNAME = ghc +GARVERSION = 6.8.3 +CATEGORIES = apps + +DESCRIPTION = State-of-the-art, compiler and interactive environment for Haskell. +define BLURB +Haskell is an advanced purely functional programming language. An open source +product of more than twenty years of cutting edge research, it allows rapid +development of robust, concise, correct software. With strong support for +integration with other languages, built-in concurrency and parallelism, +debuggers, profilers, rich libraries and an active community, Haskell makes it +easier to produce flexible, maintainable high-quality software +endef + +GARCOMPILER = GCC4 + +# Calculate the correct platform specification for ghc to use when bootstrapping +ifeq ($(shell uname -p),sparc) +GHC_PLATFORM = sparc-sun +else +GHC_PLATFORM = i386-unknown +endif + +# The location of the solaris binaries seems to vary a bit from version to version + +MASTER_SITES = http://www.haskell.org/ghc/dist/$(GARVERSION)/ http://www.haskell.org/ghc/dist/$(GARVERSION)/maeder/ +DISTFILES = $(GARNAME)-$(GARVERSION)-src.tar.bz2 ghc-$(GARVERSION)-$(GHC_PLATFORM)-solaris2.tar.bz2 testsuite-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSW$(GARNAME),) +DISTFILES += $(call admfiles,CSW$(GARNAME)-prof,) + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARVERSION)/$(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +PKGFILES_CSWghc-prof = $(prefix)/.*\.p_hi + +CONFIGURE_ARGS = $(DIRPATHS) +# Disabled for now +TEST_SCRIPTS = +#TEST_SCRIPTS = custom + +include gar/category.mk + +PATH := /tmp/ghc/bin:$(PATH) + +LD_LIBRARY_PATH=/opt/csw/lib +export LD_LIBRARY_PATH + +# This might not be needed anymore +pre-build-modulated: + @( cd $(WORKSRC); $(MAKE) -C utils/pwd boot ) + +pre-test-custom: + @echo Extracting the testsuite + @( echo cd $(WORKSRC); echo gtar jxf $(DOWNLOADDIR)/testsuite-$(GARVERSION).tar.gz) + false + @$(MAKECOOKIE) + +test-custom: + @echo ******************************* + @echo *** RUNNING TESTS (not) + @echo ******************************* + @( cd $(WORKSRC)/testsuite/tests/ghc-regress; echo $(MAKE) stage=2 ) + @$(MAKECOOKIE) Added: csw/mgar/pkg/ghc/trunk/checksums =================================================================== --- csw/mgar/pkg/ghc/trunk/checksums (rev 0) +++ csw/mgar/pkg/ghc/trunk/checksums 2008-12-22 11:34:48 UTC (rev 2684) @@ -0,0 +1,5 @@ +dfa31028b4d06d1d226f55fe3a2ab7b3 download/ghc-6.8.3-src.tar.bz2 +907c15e1d7d33dfd5a829936fe18176a download/ghc-6.8.3-i386-unknown-solaris2.tar.bz2 +c92b368262a194e8b859815415bc10d0 download/testsuite-6.8.3.tar.gz +41b4ca8ae020320be23571cd8a71d4dd download/CSWghc.gspec +2c370b5638a7c14488b6844972e74aae download/CSWghc-prof.gspec Added: csw/mgar/pkg/ghc/trunk/files/CSWghc-prof.gspec =================================================================== --- csw/mgar/pkg/ghc/trunk/files/CSWghc-prof.gspec (rev 0) +++ csw/mgar/pkg/ghc/trunk/files/CSWghc-prof.gspec 2008-12-22 11:34:48 UTC (rev 2684) @@ -0,0 +1,7 @@ +%var bitname ghc_prof +%var pkgname CSWghc-prof +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/ghc_prof/LICENSE for license information + Added: csw/mgar/pkg/ghc/trunk/files/CSWghc.gspec =================================================================== --- csw/mgar/pkg/ghc/trunk/files/CSWghc.gspec (rev 0) +++ csw/mgar/pkg/ghc/trunk/files/CSWghc.gspec 2008-12-22 11:34:48 UTC (rev 2684) @@ -0,0 +1,7 @@ +%var bitname ghc +%var pkgname CSWghc +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/ghc/LICENSE for license information + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvel at opencsw.org Mon Dec 22 12:37:04 2008 From: trygvel at opencsw.org (=?ISO-8859-1?Q?Trygve_Laugst=F8l?=) Date: Mon, 22 Dec 2008 12:37:04 +0100 Subject: [csw-devel] [Fwd: SF.net SVN: gar:[2683] csw/mgar/gar/v2] Message-ID: <494F7BE0.7090303@opencsw.org> Hei! I've added some targets to gar [1] to make it easier to work with Subversion. Currently it support updating the package and updating gar. I'd like to get some feedback on the process that people are using when working with the source tree to create targets that match how people use it. Do an update of your gar/ directory and go "gmake scm-help" to get the overview (or just read further down in the email). [1]: only v2 for now until they're deemed useful for everyone. -- Trygve -------- Original Message -------- Subject: [csw-devel] SF.net SVN: gar:[2683] csw/mgar/gar/v2 Date: Mon, 22 Dec 2008 11:31:17 +0000 From: trygvis at users.sourceforge.net Reply-To: Developers list To: devel at lists.opencsw.org Revision: 2683 http://gar.svn.sourceforge.net/gar/?rev=2683&view=rev Author: trygvis Date: 2008-12-22 11:31:17 +0000 (Mon, 22 Dec 2008) Log Message: ----------- o Adding some targets to work with svn. Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Added Paths: ----------- csw/mgar/gar/v2/bin/svnignore csw/mgar/gar/v2/gar.svn.mk csw/mgar/gar/v2/scm-help Added: csw/mgar/gar/v2/bin/svnignore =================================================================== --- csw/mgar/gar/v2/bin/svnignore (rev 0) +++ csw/mgar/gar/v2/bin/svnignore 2008-12-22 11:31:17 UTC (rev 2683) @@ -0,0 +1,28 @@ +#!/bin/sh +# +# Copyright 2008-2009 OpenCSW +# +# Redistribution and/or use, with or without modification, is +# permitted. This software is without warranty of any kind. The +# author(s) shall not be liable in the event that use of the +# software causes damage. +# +# gar.svn.mk - Targets for working with svn + +# Read the comma separated ignores from stdin and merges it with any existing +# ignores set on the directory. + +ignores=`mktemp`-ignores +existing_ignores=`mktemp`-existing +new_ignores=`mktemp`-new + +while [ "$1" != "" ]; do + echo $1 >> $ignores + shift +done + +svn pg svn:ignore . > $existing_ignores +cat $ignores $existing_ignores | sort | uniq > $new_ignores +svn ps svn:ignore . -F $new_ignores + +rm -rf $ignores $existing_ignores $new_ignores Property changes on: csw/mgar/gar/v2/bin/svnignore ___________________________________________________________________ Added: svn:executable + * Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2008-12-22 01:28:00 UTC (rev 2682) +++ csw/mgar/gar/v2/gar.conf.mk 2008-12-22 11:31:17 UTC (rev 2683) @@ -568,8 +568,7 @@ FILE_SITES = $(foreach DIR,$(FILEDIR) $(GARCHIVEPATH),file://$(DIR)/) # Extra libraries -EXTRA_LIBS = gar.pkg.mk gar.common.mk - +EXTRA_LIBS = gar.pkg.mk gar.common.mk gar.svn.mk ccenv: @echo " Compiler: $(GARCOMPILER)" @echo Added: csw/mgar/gar/v2/gar.svn.mk =================================================================== --- csw/mgar/gar/v2/gar.svn.mk (rev 0) +++ csw/mgar/gar/v2/gar.svn.mk 2008-12-22 11:31:17 UTC (rev 2683) @@ -0,0 +1,29 @@ +# vim: ft=make ts=4 sw=4 noet +# +# $Id$ +# +# Copyright 2008-2009 OpenCSW +# +# Redistribution and/or use, with or without modification, is +# permitted. This software is without warranty of any kind. The +# author(s) shall not be liable in the event that use of the +# software causes damage. +# +# gar.svn.mk - Targets for working with svn +# + +scm-help: + @cat $(GARDIR)/scm-help + +scm-update-all: scm-update-package scm-update-gar + +scm-update-package: + $(SVN) --ignore-externals up + +scm-update-gar: + cd $(GARDIR) && $(SVN) --ignore-externals up + +scm-update-ignores: + $(GARDIR)/bin/svnignore work cookies download + +.PHONY: scm-help scm-update-all scm-update-package scm-update-gar Added: csw/mgar/gar/v2/scm-help =================================================================== --- csw/mgar/gar/v2/scm-help (rev 0) +++ csw/mgar/gar/v2/scm-help 2008-12-22 11:31:17 UTC (rev 2683) @@ -0,0 +1,10 @@ +These are the available SCM targets + +scm-update-all: + Updates both the package files and the gar/ directory + +scm-update-package: + Updates the package files + +scm-update-gar: + Updates the contents of the gar/ directory 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 bonivart at users.sourceforge.net Mon Dec 22 14:35:36 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 22 Dec 2008 13:35:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[2685] csw/mgar/pkg/dhcp/trunk Message-ID: Revision: 2685 http://gar.svn.sourceforge.net/gar/?rev=2685&view=rev Author: bonivart Date: 2008-12-22 13:35:36 +0000 (Mon, 22 Dec 2008) Log Message: ----------- dhcp: upgrade to 4.1.0 Modified Paths: -------------- csw/mgar/pkg/dhcp/trunk/Makefile csw/mgar/pkg/dhcp/trunk/checksums Added Paths: ----------- csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.README.CSW csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.cswdhcpd csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.preremove csw/mgar/pkg/dhcp/trunk/files/CSWdhcpdevel.gspec Modified: csw/mgar/pkg/dhcp/trunk/Makefile =================================================================== --- csw/mgar/pkg/dhcp/trunk/Makefile 2008-12-22 11:34:48 UTC (rev 2684) +++ csw/mgar/pkg/dhcp/trunk/Makefile 2008-12-22 13:35:36 UTC (rev 2685) @@ -1,7 +1,3 @@ -# split into devel package -# use cswclassutils for conf files and smf support (add init file) -# create doc dir with license - GARNAME = dhcp GARVERSION = 4.1.0 CATEGORIES = net @@ -16,14 +12,51 @@ MASTER_SITES = http://ftp.isc.org/isc/dhcp/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWdhcp,) +DISTFILES += $(call admfiles,CSWdhcp,preremove) +DISTFILES += $(call admfiles,CSWdhcpdevel,) +SPKG_DESC_CSWdhcp = ISC DHCP reference implementation + +REQUIRED_PKGS_CSWdhcp = CSWcswclassutils CSWosslrt +REQUIRED_PKGS_CSWdhcpdevel = CSWdhcp + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = (\d+(?:\.\d+)*) + GARCOMPILER = GNU TEST_TARGET = check CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw +CONFIGURE_ARGS += --localstatedir=/var/opt/csw/dhcp +EXTRA_MERGE_EXCLUDE_FILES = .*~ $(libdir)/.*\.a $(libdir)/.*\.la + +PKGFILES_CSWdhcpdevel = $(PKGFILES_DEVEL) + +ENABLE_CHECK = 0 + +INSTALL_SCRIPTS = custom + +PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswdhcpd$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/dhcpd.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } $$$$3 ~ /\/dhclient.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } { print }' + SPKG_SOURCEURL = https://www.isc.org/software/dhcp +SPKG_CLASSES_CSWdhcp = none cswcpsampleconf cswinitsmf include gar/category.mk +install-custom: + @echo " ==> Installing $(GARNAME) (custom)" + @( cd $(WORKSRC) ; \ + gmake DESTDIR=$(DESTDIR) install ) + @ginstall -d $(DESTDIR)/etc/opt/csw/init.d + @cp $(FILEDIR)/CSWdhcp.cswdhcpd $(DESTDIR)/etc/opt/csw/init.d/cswdhcpd + @( cd $(DESTDIR)/etc/opt/csw ; \ + mv dhcpd.conf dhcpd.conf.CSW ; \ + mv dhclient.conf dhclient.conf.CSW ) + @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) + @cp $(WORKSRC)/LICENSE $(DESTDIR)$(docdir)/$(GARNAME) + @cp $(FILEDIR)/CSWdhcp.README.CSW $(DESTDIR)$(docdir)/$(GARNAME)/README.CSW + @ginstall -d $(DESTDIR)/var/opt/csw/$(GARNAME) + @touch $(DESTDIR)/var/opt/csw/dhcp/dhcpd.pid + @$(MAKECOOKIE) Modified: csw/mgar/pkg/dhcp/trunk/checksums =================================================================== --- csw/mgar/pkg/dhcp/trunk/checksums 2008-12-22 11:34:48 UTC (rev 2684) +++ csw/mgar/pkg/dhcp/trunk/checksums 2008-12-22 13:35:36 UTC (rev 2685) @@ -1,2 +1,4 @@ 1fffed2e8c3d67b111316d6a9b33db7a download/dhcp-4.1.0.tar.gz 688cb75529efcf37de7526cd4111eea9 download/CSWdhcp.gspec +cceb064ddfcd48d8dbaba37f3fc7dbd3 download/CSWdhcp.preremove +5d8f4f34a43f235e28db4da8ecb1837d download/CSWdhcpdevel.gspec Added: csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.README.CSW =================================================================== --- csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.README.CSW (rev 0) +++ csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.README.CSW 2008-12-22 13:35:36 UTC (rev 2685) @@ -0,0 +1,17 @@ +README.CSW +========== + +Default locations +----------------- +Configuration directory: /etc/opt/csw. +Work directory: /var/opt/csw/dhcp. + +Installation +------------ +1. Modify the dhcpd.conf file in /etc/opt/csw. +2. Start DHCP with "/etc/init.d/cswdhcp start". + +More info here: http://www.isc.org/products/DHCP/. + + +bonivart/071024 Added: csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.cswdhcpd =================================================================== --- csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.cswdhcpd (rev 0) +++ csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.cswdhcpd 2008-12-22 13:35:36 UTC (rev 2685) @@ -0,0 +1,33 @@ +#!/sbin/sh + +# rc-script for CSW DHCP +# Peter Bonivart, 2008-12-21 + +PID=/var/opt/csw/dhcp/dhcpd.pid +#OPTIONS="-cf /opt/csw/etc/dhcpd.conf" # use old location of conf file + +ZONE= # used for initialization, do not change + +case "$1" in + 'start') + if [ -f /opt/csw/sbin/dhcpd -a -f /etc/opt/csw/dhcpd.conf ]; then + echo 'Starting dhcp.' + /opt/csw/sbin/dhcpd $OPTIONS & + fi + ;; + 'stop') + echo 'Shutting down dhcp.' + if [ -x /usr/bin/zonename ]; then + if [ "`/usr/bin/zonename`" = "global" ]; then + ZONE="-z global" + fi + fi + pkill $ZONE -x dhcpd + [ -f $PID ] && /usr/bin/rm $PID + exit 0 + ;; + *) + echo "Usage: $0 { start | stop }" + exit 1 + ;; +esac Added: csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.preremove =================================================================== --- csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.preremove (rev 0) +++ csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.preremove 2008-12-22 13:35:36 UTC (rev 2685) @@ -0,0 +1,12 @@ +#!/bin/sh + +# 2008-12-22 + +VAR=$PKG_INSTALL_ROOT/var/opt/csw/dhcp + +# clean up work dir +[ -f "$VAR/dhcpd.leases" -a ! -s "$VAR/dhcpd.leases" ] && /bin/rm "$VAR/dhcpd.leases" +[ -f "$VAR/dhcpd.leases~" -a ! -s "$VAR/dhcpd.leases~" ] && /bin/rm "$VAR/dhcpd.leases~" +[ -f "$VAR/dhcpd.pid" ] && /bin/rm "$VAR/dhcpd.pid" + +exit 0 Added: csw/mgar/pkg/dhcp/trunk/files/CSWdhcpdevel.gspec =================================================================== --- csw/mgar/pkg/dhcp/trunk/files/CSWdhcpdevel.gspec (rev 0) +++ csw/mgar/pkg/dhcp/trunk/files/CSWdhcpdevel.gspec 2008-12-22 13:35:36 UTC (rev 2685) @@ -0,0 +1,7 @@ +%var bitname dhcp_devel +%var pkgname CSWdhcpdevel +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/dhcp/LICENSE for license information + 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 Dec 22 14:37:15 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 22 Dec 2008 13:37:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[2686] csw/mgar/pkg/dhcp/trunk/checksums Message-ID: Revision: 2686 http://gar.svn.sourceforge.net/gar/?rev=2686&view=rev Author: bonivart Date: 2008-12-22 13:37:15 +0000 (Mon, 22 Dec 2008) Log Message: ----------- dhcp: checksums Modified Paths: -------------- csw/mgar/pkg/dhcp/trunk/checksums Modified: csw/mgar/pkg/dhcp/trunk/checksums =================================================================== --- csw/mgar/pkg/dhcp/trunk/checksums 2008-12-22 13:35:36 UTC (rev 2685) +++ csw/mgar/pkg/dhcp/trunk/checksums 2008-12-22 13:37:15 UTC (rev 2686) @@ -1,4 +1,4 @@ 1fffed2e8c3d67b111316d6a9b33db7a download/dhcp-4.1.0.tar.gz 688cb75529efcf37de7526cd4111eea9 download/CSWdhcp.gspec -cceb064ddfcd48d8dbaba37f3fc7dbd3 download/CSWdhcp.preremove +4c15df7a456274832321edd6c2c85ba4 download/CSWdhcp.preremove 5d8f4f34a43f235e28db4da8ecb1837d download/CSWdhcpdevel.gspec 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 Dec 22 19:37:35 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 22 Dec 2008 18:37:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[2687] csw/mgar/pkg/dhcp/trunk Message-ID: Revision: 2687 http://gar.svn.sourceforge.net/gar/?rev=2687&view=rev Author: bonivart Date: 2008-12-22 18:37:35 +0000 (Mon, 22 Dec 2008) Log Message: ----------- dhcp: removed preremove Modified Paths: -------------- csw/mgar/pkg/dhcp/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.preremove Modified: csw/mgar/pkg/dhcp/trunk/Makefile =================================================================== --- csw/mgar/pkg/dhcp/trunk/Makefile 2008-12-22 13:37:15 UTC (rev 2686) +++ csw/mgar/pkg/dhcp/trunk/Makefile 2008-12-22 18:37:35 UTC (rev 2687) @@ -12,7 +12,7 @@ MASTER_SITES = http://ftp.isc.org/isc/dhcp/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWdhcp,preremove) +DISTFILES += $(call admfiles,CSWdhcp,) DISTFILES += $(call admfiles,CSWdhcpdevel,) SPKG_DESC_CSWdhcp = ISC DHCP reference implementation @@ -38,7 +38,7 @@ INSTALL_SCRIPTS = custom -PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswdhcpd$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/dhcpd.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } $$$$3 ~ /\/dhclient.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } { print }' +PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswdhcpd$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/dhcpd.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } $$$$3 ~ /\/dhclient.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } $$$$3 ~ /\/dhcpd.leases.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } { print }' SPKG_SOURCEURL = https://www.isc.org/software/dhcp SPKG_CLASSES_CSWdhcp = none cswcpsampleconf cswinitsmf @@ -57,6 +57,6 @@ @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) @cp $(WORKSRC)/LICENSE $(DESTDIR)$(docdir)/$(GARNAME) @cp $(FILEDIR)/CSWdhcp.README.CSW $(DESTDIR)$(docdir)/$(GARNAME)/README.CSW - @ginstall -d $(DESTDIR)/var/opt/csw/$(GARNAME) - @touch $(DESTDIR)/var/opt/csw/dhcp/dhcpd.pid + @ginstall -d $(DESTDIR)/var/opt/csw/$(GARNAME)/db + @touch $(DESTDIR)/var/opt/csw/$(GARNAME)/db/dhcpd.leases.CSW @$(MAKECOOKIE) Deleted: csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.preremove =================================================================== --- csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.preremove 2008-12-22 13:37:15 UTC (rev 2686) +++ csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.preremove 2008-12-22 18:37:35 UTC (rev 2687) @@ -1,12 +0,0 @@ -#!/bin/sh - -# 2008-12-22 - -VAR=$PKG_INSTALL_ROOT/var/opt/csw/dhcp - -# clean up work dir -[ -f "$VAR/dhcpd.leases" -a ! -s "$VAR/dhcpd.leases" ] && /bin/rm "$VAR/dhcpd.leases" -[ -f "$VAR/dhcpd.leases~" -a ! -s "$VAR/dhcpd.leases~" ] && /bin/rm "$VAR/dhcpd.leases~" -[ -f "$VAR/dhcpd.pid" ] && /bin/rm "$VAR/dhcpd.pid" - -exit 0 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 Mon Dec 22 23:03:18 2008 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Mon, 22 Dec 2008 22:03:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[2688] csw/mgar/pkg/wesnoth/trunk Message-ID: Revision: 2688 http://gar.svn.sourceforge.net/gar/?rev=2688&view=rev Author: jake_goerzen Date: 2008-12-22 22:03:18 +0000 (Mon, 22 Dec 2008) Log Message: ----------- configured fifodir=/var/opt/csw/run/wesnothd, enabled NLS support, added new dependancies and removed unused dependancies Modified Paths: -------------- csw/mgar/pkg/wesnoth/trunk/Makefile csw/mgar/pkg/wesnoth/trunk/checksums csw/mgar/pkg/wesnoth/trunk/files/CSWwesnoth.depend Modified: csw/mgar/pkg/wesnoth/trunk/Makefile =================================================================== --- csw/mgar/pkg/wesnoth/trunk/Makefile 2008-12-22 18:37:35 UTC (rev 2687) +++ csw/mgar/pkg/wesnoth/trunk/Makefile 2008-12-22 22:03:18 UTC (rev 2688) @@ -20,8 +20,8 @@ CONFIGURE_ARGS = --prefix=$(prefix) CONFIGURE_ARGS += CXXFLAGS='-features=extensions -library=stlport4' -CONFIGURE_ARGS += LDFLAGS='-L/opt/csw/lib -lstlport -lintl -lsocket -lboost_iostreams -lsunmath' -CONFIGURE_ARGS += --disable-nls +CONFIGURE_ARGS += LDFLAGS='-L. -L/opt/csw/lib -lstlport -lintl -lsocket -lboost_iostreams -lsunmath -lSDL_ttf' +CONFIGURE_ARGS += --with-fifodir=/var/opt/csw/run/wesnothd #CONFIGURE_ARGS += --enable-server #CONFIGURE_ARGS += --enable-campaign-server #CONFIGURE_ARGS += --enable-tools Modified: csw/mgar/pkg/wesnoth/trunk/checksums =================================================================== --- csw/mgar/pkg/wesnoth/trunk/checksums 2008-12-22 18:37:35 UTC (rev 2687) +++ csw/mgar/pkg/wesnoth/trunk/checksums 2008-12-22 22:03:18 UTC (rev 2688) @@ -1,4 +1,4 @@ fdd341c3d66bf1bea2113c79db852d68 download/wesnoth-1.4.7.tar.bz2 724aaa92df2d85d3e69b96837786cb64 download/CSWwesnoth.gspec -67b02fe682088a0450b99dc386884dcd download/CSWwesnoth.depend +3ad3f94e881c3be62ec6424df8013ab4 download/CSWwesnoth.depend 59968804e93a18220d7d18e8252fff8d download/language.cpp.diff Modified: csw/mgar/pkg/wesnoth/trunk/files/CSWwesnoth.depend =================================================================== --- csw/mgar/pkg/wesnoth/trunk/files/CSWwesnoth.depend 2008-12-22 18:37:35 UTC (rev 2687) +++ csw/mgar/pkg/wesnoth/trunk/files/CSWwesnoth.depend 2008-12-22 22:03:18 UTC (rev 2688) @@ -2,13 +2,15 @@ P CSWboostrt P CSWpython P CSWstlport +P CSWiconv P CSWggettext P CSWlibsdl P CSWpng P CSWsdlimage P CSWsdlmixer P CSWsdlnet +P CSWsdlttf P CSWsunmath P CSWzlib P CSWfribidi -P CSWcommon common - common files and dirs for CSW packages +P CSWcommon common - common files and dirs for CSW packages This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Tue Dec 23 16:36:04 2008 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Tue, 23 Dec 2008 15:36:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[2689] csw/mgar/pkg/ghc/trunk Message-ID: Revision: 2689 http://gar.svn.sourceforge.net/gar/?rev=2689&view=rev Author: trygvis Date: 2008-12-23 15:36:04 +0000 (Tue, 23 Dec 2008) Log Message: ----------- o Downloading and extracting the bootstrap blob correctly. Modified Paths: -------------- csw/mgar/pkg/ghc/trunk/Makefile csw/mgar/pkg/ghc/trunk/checksums Modified: csw/mgar/pkg/ghc/trunk/Makefile =================================================================== --- csw/mgar/pkg/ghc/trunk/Makefile 2008-12-22 22:03:18 UTC (rev 2688) +++ csw/mgar/pkg/ghc/trunk/Makefile 2008-12-23 15:36:04 UTC (rev 2689) @@ -5,8 +5,7 @@ # author(s) shall not be liable in the event that use of the # software causes damage. -# TODO: Unpack the bootstrap binaries. Right now they're assumed to be installed under /tmp/ghc. -# Might not be too useful when re-building this package. +# TODO: Run the test suite GARNAME = ghc GARVERSION = 6.8.3 @@ -34,7 +33,9 @@ # The location of the solaris binaries seems to vary a bit from version to version MASTER_SITES = http://www.haskell.org/ghc/dist/$(GARVERSION)/ http://www.haskell.org/ghc/dist/$(GARVERSION)/maeder/ -DISTFILES = $(GARNAME)-$(GARVERSION)-src.tar.bz2 ghc-$(GARVERSION)-$(GHC_PLATFORM)-solaris2.tar.bz2 testsuite-$(GARVERSION).tar.gz +DISTFILES = $(GARNAME)-$(GARVERSION)-src.tar.bz2 testsuite-$(GARVERSION).tar.gz +DISTFILES += $(GARNAME)-$(GARVERSION)-sparc-sun-solaris2.tar.bz2 +DISTFILES += $(GARNAME)-$(GARVERSION)-i386-unknown-solaris2.tar.bz2 DISTFILES += $(call admfiles,CSW$(GARNAME),) DISTFILES += $(call admfiles,CSW$(GARNAME)-prof,) @@ -50,18 +51,41 @@ include gar/category.mk -PATH := /tmp/ghc/bin:$(PATH) +# Prevent the extracttion of the binary blobs. This has to be after GAR is included +tar-bz-extract-ghc-$(GARVERSION)-sparc-sun-solaris2.tar.bz2: + @$(MAKECOOKIE) +tar-bz-extract-ghc-$(GARVERSION)-i386-unknown-solaris2.tar.bz2: + @$(MAKECOOKIE) + +STAGE_1_FILE = $(DOWNLOADDIR)/$(GARNAME)-$(GARVERSION)-$(GHC_PLATFORM)-solaris2.tar.bz2 +STAGE_1_BASEDIR=$(WORKDIR)/stage1 +STAGE_1_SRC_DIR=$(STAGE_1_BASEDIR)/ghc-$(GARVERSION) +STAGE_1_DIR=$(shell mkdir -p $(STAGE_1_BASEDIR) && cd $(STAGE_1_BASEDIR) && pwd)/ghc + +PATH := $(STAGE_1_DIR)/bin:$(PATH) + LD_LIBRARY_PATH=/opt/csw/lib export LD_LIBRARY_PATH -# This might not be needed anymore -pre-build-modulated: - @( cd $(WORKSRC); $(MAKE) -C utils/pwd boot ) +$(STAGE_1_SRC_DIR): + @echo Extracting the bootstrap compiler + mkdir -p $(STAGE_1_BASEDIR) + cat $(STAGE_1_FILE) | ( cd $(STAGE_1_BASEDIR) && gtar jxf -) +$(STAGE_1_SRC_DIR)/Makefile: $(STAGE_1_SRC_DIR) + cd $(STAGE_1_SRC_DIR) && ./configure --prefix=$(STAGE_1_DIR) + +$(STAGE_1_DIR)/bin/ghc: $(STAGE_1_SRC_DIR)/Makefile + cd $(STAGE_1_SRC_DIR) && gmake install + +pre-configure-modulated: $(STAGE_1_DIR)/bin/ghc + echo $$PATH + @$(MAKECOOKIE) + pre-test-custom: @echo Extracting the testsuite - @( echo cd $(WORKSRC); echo gtar jxf $(DOWNLOADDIR)/testsuite-$(GARVERSION).tar.gz) + @( echo cd $(WORKSRC); echo gtar zxf $(DOWNLOADDIR)/testsuite-$(GARVERSION).tar.gz) false @$(MAKECOOKIE) Modified: csw/mgar/pkg/ghc/trunk/checksums =================================================================== --- csw/mgar/pkg/ghc/trunk/checksums 2008-12-22 22:03:18 UTC (rev 2688) +++ csw/mgar/pkg/ghc/trunk/checksums 2008-12-23 15:36:04 UTC (rev 2689) @@ -1,4 +1,5 @@ dfa31028b4d06d1d226f55fe3a2ab7b3 download/ghc-6.8.3-src.tar.bz2 +ee43ceea42b9353b6613db6d4058ab0a download/ghc-6.8.3-sparc-sun-solaris2.tar.bz2 907c15e1d7d33dfd5a829936fe18176a download/ghc-6.8.3-i386-unknown-solaris2.tar.bz2 c92b368262a194e8b859815415bc10d0 download/testsuite-6.8.3.tar.gz 41b4ca8ae020320be23571cd8a71d4dd download/CSWghc.gspec This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Dec 24 00:31:29 2008 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 23 Dec 2008 23:31:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[2690] csw/mgar/pkg/ca_certificates/trunk Message-ID: Revision: 2690 http://gar.svn.sourceforge.net/gar/?rev=2690&view=rev Author: chninkel Date: 2008-12-23 23:31:29 +0000 (Tue, 23 Dec 2008) Log Message: ----------- ca_certificates: improved certification selection configuration Modified Paths: -------------- csw/mgar/pkg/ca_certificates/trunk/Makefile csw/mgar/pkg/ca_certificates/trunk/checksums csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.depend csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.gspec csw/mgar/pkg/ca_certificates/trunk/files/certdata2pem.pl csw/mgar/pkg/ca_certificates/trunk/files/update-ca-certificates Modified: csw/mgar/pkg/ca_certificates/trunk/Makefile =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/Makefile 2008-12-23 15:36:04 UTC (rev 2689) +++ csw/mgar/pkg/ca_certificates/trunk/Makefile 2008-12-23 23:31:29 UTC (rev 2690) @@ -8,7 +8,7 @@ endef MASTER_SITES = http://hg.mozilla.org/mozilla-central/raw-file/default/security/nss/lib/ckfw/builtins/ -DISTFILES = certdata.txt certdata2pem.pl update-ca-certificates +DISTFILES = certdata.txt certdata2pem.pl update-ca-certificates ca-certificates.conf DISTFILES += $(call admfiles,CSWcacertificates,depend postinstall) # We define upstream file regex so we can be notifed of new upstream software release @@ -25,12 +25,21 @@ include gar/category.mk +$(WORKDIR)/hash.db: $(WORKDIR)/certdata.txt + rm -f $(WORKDIR)/hash.db + find "$(DESTDIR)/$(sharedstatedir)/ca-certificates" -name *.pem | while read FILE; do \ + echo "`basename $$FILE`=`/opt/csw/bin/openssl x509 -hash -fingerprint -noout -in "$$FILE" | head -n 1`.0" >> hash.db; \ + done -install-custom: +$(WORKDIR)/LICENSE: $(WORKDIR)/certdata.txt + sed -ne '/BEGIN LICENSE BLOCK/,/END LICENSE BLOCK/p' "$(WORKDIR)/certdata.txt" | grep -v "LICENSE BLOCK" \ + > "$(WORKDIR)/LICENSE" + +install-custom: $(WORKDIR)/hash.db $(WORKDIR)/LICENSE ginstall -d "$(DESTDIR)/$(sysconfdir)/ssl/certs" ginstall -d "$(DESTDIR)/$(sharedstatedir)/ca-certificates" - ginstall -D "$(CURDIR)/$(WORKDIR)/update-ca-certificates" "$(DESTDIR)/$(sbindir)/update-ca-certificates" - cd "$(DESTDIR)/$(sharedstatedir)/ca-certificates" && perl "$(CURDIR)/$(WORKDIR)/certdata2pem.pl" < "$(CURDIR)/$(WORKDIR)/certdata.txt" - cd "$(DESTDIR)/$(sharedstatedir)/ca-certificates" && ls -1 > "$(CURDIR)/$(WORKDIR)/ca-certificate.conf" - sed -ne '/BEGIN LICENSE BLOCK/,/END LICENSE BLOCK/p' "$(CURDIR)/$(WORKDIR)/certdata.txt" | grep -v "LICENSE BLOCK" \ - > "$(CURDIR)/$(WORKDIR)/LICENSE" + ginstall -D $(WORKDIR)/update-ca-certificates "$(DESTDIR)/$(sbindir)/update-ca-certificates" + ginstall -D hash.db "$(DESTDIR)/$(sharedstatedir)/ca-certificates/hash.db" + ginstall -d "$(DESTDIR)/$(sharedstatedir)/ca-certificates/mozilla" + cd "$(DESTDIR)/$(sharedstatedir)/ca-certificates/mozilla" && perl "$(CURDIR)/$(WORKDIR)/certdata2pem.pl" < "$(CURDIR)/$(WORKDIR)/certdata.txt" + Modified: csw/mgar/pkg/ca_certificates/trunk/checksums =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/checksums 2008-12-23 15:36:04 UTC (rev 2689) +++ csw/mgar/pkg/ca_certificates/trunk/checksums 2008-12-23 23:31:29 UTC (rev 2690) @@ -1,6 +1,7 @@ 4dabeaecfd46395da152e51d312107e4 download/certdata.txt -6087aaa070808190680dcd5cb03c0cb9 download/certdata2pem.pl -f7b1df4e84e70b1cf7023779ba11698b download/update-ca-certificates -3bb0b5d545c0bd8f4381cfd2d500586c download/CSWcacertificates.gspec -df81c8c6eb55786ebefd47fc6400b8b6 download/CSWcacertificates.depend -48e4c60f385981c1430313584f527b50 download/CSWcacertificates.postinstall +77fe4c8feb1b341814a6ed03d4ff764a download/certdata2pem.pl +e4b769f7250ea1c929252a13fe09e4ee download/update-ca-certificates +b4f6772525da6772d51eb30f90605d60 download/ca-certificates.conf +787d361f8d8b8ecf89e83bb813fdaec5 download/CSWcacertificates.gspec +31227010faaad1c2b9893ba91d6b16bb download/CSWcacertificates.depend +32e6ea27867c760d2279330fd4c480d3 download/CSWcacertificates.postinstall Modified: csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.depend =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.depend 2008-12-23 15:36:04 UTC (rev 2689) +++ csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.depend 2008-12-23 23:31:29 UTC (rev 2690) @@ -1,2 +1 @@ P CSWcswclassutils -P CSWosslutils Modified: csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.gspec =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.gspec 2008-12-23 15:36:04 UTC (rev 2689) +++ csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.gspec 2008-12-23 23:31:29 UTC (rev 2690) @@ -4,4 +4,4 @@ %include url file://%{PKGLIB}/csw_dyndepend.gspec %copyright url file://%{WORKDIR}/LICENSE %prototype:merge -e cswpreserveconf /opt/csw/etc/ca-certificates.conf.csw=ca-certificate.conf 0644 root bin +e cswpreserveconf /opt/csw/etc/ca-certificates.conf.csw=ca-certificates.conf 0644 root bin Modified: csw/mgar/pkg/ca_certificates/trunk/files/certdata2pem.pl =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/files/certdata2pem.pl 2008-12-23 15:36:04 UTC (rev 2689) +++ csw/mgar/pkg/ca_certificates/trunk/files/certdata2pem.pl 2008-12-23 23:31:29 UTC (rev 2690) @@ -35,7 +35,7 @@ $val =~ s/"$//; $val =~ s/[\/\s,]/_/g; $val =~ s/[()]//g; - $fname = $val . ".crt"; + $fname = $val . ".pem"; next; } Modified: csw/mgar/pkg/ca_certificates/trunk/files/update-ca-certificates =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/files/update-ca-certificates 2008-12-23 15:36:04 UTC (rev 2689) +++ csw/mgar/pkg/ca_certificates/trunk/files/update-ca-certificates 2008-12-23 23:31:29 UTC (rev 2690) @@ -1,7 +1,7 @@ #!/bin/sh -e # # update-ca-certificates -# Debian script adapted for Solaris by Yann Rouillard +# Script inspired by debian script update-ca-certificates # # Copyright (c) 2003 Fumitoshi UKAI # Copyright (c) 2008 Yann Rouillard @@ -21,13 +21,59 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -verbose=0 -fresh=0 -while [ $# -gt 0 ]; -do +CACERTS_CONF=/opt/csw/etc/ca-certificates.conf +CACERTS_DIR=/opt/csw/share/ca-certificates +CERTBUNDLE=ca-certificates.crt +CERTSDIR=/opt/csw/etc/ssl/certs + + +# find the certificate files corresponding to the given pattern +find_certfile () +{ + if [ -f "$CACERTS_DIR/$1" ]; then + echo "$CACERTS_DIR/$1" + elif [ -f "$1" ]; then + echo "$1" + else + # if the file doesn't exist we suppose it's a find pattern + # like *.crt + DIRNAME="`dirname "$1"`" + if [ "$DIRNAME" = "." ]; then + DIRNAME="$CACERTS_DIR" + fi + BASENAME="`basename "$1"`" + find $DIRNAME -name "$BASENAME" + fi +} + + +# return the full paths of all certificate files +get_certfile_list () +{ + # first we find all excluded certificates, excluding duplicates + sed -ne '/^ *!/s/^ *! *//p' "$CACERTS_CONF" | while read CERTFILE; do + [ -n "$CERTFILE" ] && find_certfile "$CERTFILE" + done | sort -u > /tmp/update-ca-certificates.tmp.$$ + + # then we find all certificates excluding duplicates + # and excluded certificates + sed -e '/^ *[#!]/d' "$CACERTS_CONF" | while read CERTFILE; do + [ -n "$CERTFILE" ] && find_certfile "$CERTFILE" + done | sort -u | { + while read CERTFILE; do + grep -w "$CERTFILE" /tmp/update-ca-certificates.tmp.$$ >/dev/null || echo "$CERTFILE" + done + } + + rm -f /tmp/update-ca-certificates.tmp.$$ +} + + +VERBOSE=0 +while [ $# -gt 0 ]; do case $1 in --verbose|-v) - verbose=1;; + VERBOSE=1;; --help|-h|*) echo "$0: [--verbose] [--fresh]" @@ -36,42 +82,59 @@ shift done -CERTSCONF=/opt/csw/etc/ca-certificates.conf -CERTSDIR=/opt/csw/share/ca-certificates -CERTBUNDLE=ca-certificates.crt -ETCCERTSDIR=/opt/csw/etc/ssl/certs -if [ ! -f "$CERTSCONF" ]; then - echo "ERROR: $CERTSCONF doesn't exist !" >&2 +if [ ! -f "$CACERTS_CONF" ]; then + echo "ERROR: $CACERTS_CONF doesn't exist !" >&2 exit 2 fi -cd $ETCCERTSDIR -find . -type l -print | while read SYMLINK; do - test -f $SYMLINK || rm -f $SYMLINK +printf "Updating certificates in $CERTSDIR..." + + +# first we remove the existing symlink +find "$CERTSDIR" -type l -print | while read SYMLINK; do + [ ! -L "$SYMLINK" ] || rm -f "$SYMLINK" done -printf "Updating certificates in $ETCCERTSDIR..." +# then we recreate them +get_certfile_list | while read CERTFILE; do + SYMLINK="`basename "$CERTFILE"`" + SYMLINK="`echo $SYMLINK | sed -e 's/\.[^\.]*$//'`.pem" -BUNDLETMP=`mktemp "${CERTBUNDLE}.tmp.XXXXXX"` -sed -e '/^#/g' "$CERTSCONF" | while read CERTFILE; do - if [ ! -f "$CERTFILE" ]; then - if [ ! -f "$CERTSDIR/$CERTFILE" ]; then - continue - fi - CERTFILE="$CERTSDIR/$CERTFILE" - fi - - cd "$ETCCERTSDIR" && ln -sf "$CERTFILE" "`basename $CERTFILE`.pem" + cd "$CERTSDIR" && ln -sf "$CERTFILE" "$SYMLINK" done -cd "$ETCCERTSDIR" && cat *.pem > "$BUNDLETMP" -chmod 0644 "$BUNDLETMP" -mv -f "$BUNDLETMP" "$ETCCERTSDIR/$CERTBUNDLE" +# we create the certificate bundle file which contains all the +# certificate, some software prefer to use this file +# (and this is mandatory for software linked with gnutls) +cat "$CERTSDIR/"*.pem > "$CERTSDIR/$CERTBUNDLE.tmp" 2>/dev/null || true +chmod 0644 "$CERTSDIR/$CERTBUNDLE.tmp" +mv -f "$CERTSDIR/$CERTBUNDLE.tmp" "$CERTSDIR/$CERTBUNDLE" -if [ "$verbose" = 0 ]; then - OPENSSL=/opt/csw/bin/openssl /opt/csw/bin/c_rehash . >/dev/null 2>&1 -else - OPENSSL=/opt/csw/bin/openssl /opt/csw/bin/c_rehash . + +# we create the hash links for certificate, openssl library need +# this link to be able to find a CA certificate +if { openssl version; } >/dev/null 2>&1; then + c_rehash "$CERTSDIR" >/dev/null 2>&1 + +elif { /opt/csw/bin/openssl version; } >/dev/null 2>&1; then + OPENSSL="/opt/csw/bin/openssl" /opt/csw/bin/c_rehash "$CERTSDIR" >/dev/null 2>&1 + +# openssl binary isn't available, so we fall back our own provided file containing +# hash value for certificates provided by this package +# this way, we don't stricly depend on the openssl_utils package +elif [ -f "$CACERTS_DIR/hash.db" ]; then + cd "$CERTSDIR" + for FILE in *.pem; do + HASH=`awk -F= " \\\$1 == \"$FILE\" { print \\\$2; exit 0 }" "$CACERTS_DIR/hash.db"` + if [ -n "$HASH" ]; then + ln -s "$FILE" "$HASH" + else + echo + echo "WARNING: a custom certificate was installed, you need to install openssl_utils so" + echo " update-ca-certificates is able to generate the hash of your custom certificate." + fi + done fi + echo "done." This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Dec 24 00:59:15 2008 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 23 Dec 2008 23:59:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[2691] csw/mgar/pkg/ca_certificates/trunk/files/ update-ca-certificates Message-ID: Revision: 2691 http://gar.svn.sourceforge.net/gar/?rev=2691&view=rev Author: chninkel Date: 2008-12-23 23:59:15 +0000 (Tue, 23 Dec 2008) Log Message: ----------- ca_certificates: fixed certificates exclusion Modified Paths: -------------- csw/mgar/pkg/ca_certificates/trunk/files/update-ca-certificates Modified: csw/mgar/pkg/ca_certificates/trunk/files/update-ca-certificates =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/files/update-ca-certificates 2008-12-23 23:31:29 UTC (rev 2690) +++ csw/mgar/pkg/ca_certificates/trunk/files/update-ca-certificates 2008-12-23 23:59:15 UTC (rev 2691) @@ -61,7 +61,7 @@ [ -n "$CERTFILE" ] && find_certfile "$CERTFILE" done | sort -u | { while read CERTFILE; do - grep -w "$CERTFILE" /tmp/update-ca-certificates.tmp.$$ >/dev/null || echo "$CERTFILE" + grep "^$CERTFILE$" /tmp/update-ca-certificates.tmp.$$ >/dev/null || echo "$CERTFILE" done } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Dec 24 01:21:36 2008 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 24 Dec 2008 00:21:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[2692] csw/mgar/pkg/ca_certificates/trunk Message-ID: Revision: 2692 http://gar.svn.sourceforge.net/gar/?rev=2692&view=rev Author: chninkel Date: 2008-12-24 00:21:36 +0000 (Wed, 24 Dec 2008) Log Message: ----------- ca_certificates: added symlinks removal upon package removal Modified Paths: -------------- csw/mgar/pkg/ca_certificates/trunk/Makefile csw/mgar/pkg/ca_certificates/trunk/checksums Added Paths: ----------- csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postremove Modified: csw/mgar/pkg/ca_certificates/trunk/Makefile =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/Makefile 2008-12-23 23:59:15 UTC (rev 2691) +++ csw/mgar/pkg/ca_certificates/trunk/Makefile 2008-12-24 00:21:36 UTC (rev 2692) @@ -9,7 +9,7 @@ MASTER_SITES = http://hg.mozilla.org/mozilla-central/raw-file/default/security/nss/lib/ckfw/builtins/ DISTFILES = certdata.txt certdata2pem.pl update-ca-certificates ca-certificates.conf -DISTFILES += $(call admfiles,CSWcacertificates,depend postinstall) +DISTFILES += $(call admfiles,CSWcacertificates,depend postinstall postremove) # 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/ca_certificates/trunk/checksums =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/checksums 2008-12-23 23:59:15 UTC (rev 2691) +++ csw/mgar/pkg/ca_certificates/trunk/checksums 2008-12-24 00:21:36 UTC (rev 2692) @@ -1,7 +1,8 @@ 4dabeaecfd46395da152e51d312107e4 download/certdata.txt 77fe4c8feb1b341814a6ed03d4ff764a download/certdata2pem.pl -e4b769f7250ea1c929252a13fe09e4ee download/update-ca-certificates +86f62a09c9a90d0257a738656a3ed9f3 download/update-ca-certificates b4f6772525da6772d51eb30f90605d60 download/ca-certificates.conf 787d361f8d8b8ecf89e83bb813fdaec5 download/CSWcacertificates.gspec 31227010faaad1c2b9893ba91d6b16bb download/CSWcacertificates.depend 32e6ea27867c760d2279330fd4c480d3 download/CSWcacertificates.postinstall +0e166bd746f506c06e1001b0c6274958 download/CSWcacertificates.postremove Added: csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postremove =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postremove (rev 0) +++ csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postremove 2008-12-24 00:21:36 UTC (rev 2692) @@ -0,0 +1,10 @@ + +# We remove all dead links in /opt/csw/etc/ssl/certs/, +# that should remove all the links to the cerfificates +# provided in this package +find /opt/csw/etc/ssl/certs/ -type l | while read FILE; do + [ -f "$FILE" ] || rm -f "$FILE" +done +rm -f /opt/csw/etc/ssl/certs/ca-certificates.crt + +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 Wed Dec 24 02:04:51 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 24 Dec 2008 01:04:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[2693] csw/mgar/pkg/docbook-dtds/trunk Message-ID: Revision: 2693 http://gar.svn.sourceforge.net/gar/?rev=2693&view=rev Author: bdwalton Date: 2008-12-24 01:04:51 +0000 (Wed, 24 Dec 2008) Log Message: ----------- dropped openjade dependency; ripped out the part of the postinstall script that required openjade Modified Paths: -------------- csw/mgar/pkg/docbook-dtds/trunk/Makefile csw/mgar/pkg/docbook-dtds/trunk/checksums csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.preremove Modified: csw/mgar/pkg/docbook-dtds/trunk/Makefile =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/Makefile 2008-12-24 00:21:36 UTC (rev 2692) +++ csw/mgar/pkg/docbook-dtds/trunk/Makefile 2008-12-24 01:04:51 UTC (rev 2693) @@ -13,7 +13,7 @@ PATCHLEVEL = 30.1 CATEGORIES = xtra -REQUIRED_PKGS = CSWsgmlcommon CSWxmlcommon CSWopenjade CSWlibxml2 +REQUIRED_PKGS = CSWsgmlcommon CSWxmlcommon CSWlibxml2 DESCRIPTION = SGML and XML document type definitions for DocBook. define BLURB Modified: csw/mgar/pkg/docbook-dtds/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/checksums 2008-12-24 00:21:36 UTC (rev 2692) +++ csw/mgar/pkg/docbook-dtds/trunk/checksums 2008-12-24 01:04:51 UTC (rev 2693) @@ -10,8 +10,8 @@ f89e1bd0b2c7a361e3f1f739e16b5d0d download/docbook-4.4.zip cbb04e9a700955d88c50962ef22c1634 download/docbook-xml-4.4.zip 536104a1ab1e8eac583cf27f4f8844a4 download/CSWdocbookdtds.gspec -15aa1d4d660b64c96f0e68bdaa04facb download/CSWdocbookdtds.postinstall -140c5f6cda37568a76f43f349bef8453 download/CSWdocbookdtds.preremove +58c926e94c472fd0842d7850732cbcc8 download/CSWdocbookdtds.postinstall +935e0f00b12f0a6888839bccac460eb8 download/CSWdocbookdtds.preremove 318742d3a6648a6905727f071cbc9847 download/docbook-4.2-euro.patch e3067045964536cc7445d5c3f1e99916 download/docbook-dtd30-sgml-1.0.catalog.patch 856d40f5d1e3fc8fd939b88bf5fedc87 download/docbook-dtd31-sgml-1.0.catalog.patch Modified: csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall 2008-12-24 00:21:36 UTC (rev 2692) +++ csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall 2008-12-24 01:04:51 UTC (rev 2693) @@ -10,15 +10,12 @@ esac XMLCAT=/opt/csw/bin/xmlcatalog -INSTCAT=/opt/csw/bin/install-catalog CSWSGMLCNF=/opt/csw/etc/sgml CSWSGML=/opt/csw/share/sgml VERSION=1.0 RELEASE=30.1 -OPENJADEVER=1.3.2 - ## ## SGML catalog ## @@ -112,100 +109,6 @@ $CSWSGMLCNF/xml-docbook-4.4-$VERSION-$RELEASE.cat \ $CSWSGML/docbook/xml-dtd-4.4-$VERSION-$RELEASE/catalog -# The following lines are for the case in which the style sheets -# were installed after another DTD but before this DTD -SS=`echo $PKG_INSTALL_ROOT/$CSWSGML/docbook/dsssl-stylesheets-*` -STYLESHEETS=`echo $SS | sed 's#[^ ]*/dsssl-stylesheets-##g'` -if [ "$STYLESHEETS" != "*" ]; then - # DocBook V3.0 - $PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/sgml-docbook-3.0-$VERSION-$RELEASE.cat \ - $CSWSGML/openjade-$OPENJADEVER/catalog - $PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/sgml-docbook-3.0-$VERSION-$RELEASE.cat \ - $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog - - # DocBook V3.1 - $PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/sgml-docbook-3.1-$VERSION-$RELEASE.cat \ - $CSWSGML/openjade-$OPENJADEVER/catalog - $PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/sgml-docbook-3.1-$VERSION-$RELEASE.cat \ - $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog - - # DocBook V4.0 - $PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/sgml-docbook-4.0-$VERSION-$RELEASE.cat \ - $CSWSGML/openjade-$OPENJADEVER/catalog - $PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/sgml-docbook-4.0-$VERSION-$RELEASE.cat \ - $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog - - # DocBook V4.1 - $PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/sgml-docbook-4.1-$VERSION-$RELEASE.cat \ - $CSWSGML/openjade-$OPENJADEVER/catalog - $PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/sgml-docbook-4.1-$VERSION-$RELEASE.cat \ - $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog - - # DocBook XML V4.1.2 - $PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/xml-docbook-4.1.2-$VERSION-$RELEASE.cat \ - $CSWSGML/openjade-$OPENJADEVER/catalog - $PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/xml-docbook-4.1.2-$VERSION-$RELEASE.cat \ - $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog - - # DocBook V4.2 - $PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/sgml-docbook-4.2-$VERSION-$RELEASE.cat \ - $CSWSGML/openjade-$OPENJADEVER/catalog - $PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/sgml-docbook-4.2-$VERSION-$RELEASE.cat \ - $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog - - # DocBook XML V4.2 - $PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/xml-docbook-4.2-$VERSION-$RELEASE.cat \ - $CSWSGML/openjade-$OPENJADEVER/catalog - $PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/xml-docbook-4.2-$VERSION-$RELEASE.cat \ - $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog - - # DocBook V4.3 - $PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/sgml-docbook-4.3-$VERSION-$RELEASE.cat \ - $CSWSGML/openjade-$OPENJADEVER/catalog - $PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/sgml-docbook-4.3-$VERSION-$RELEASE.cat \ - $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog - - # DocBook XML V4.3 - $PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/xml-docbook-4.3-$VERSION-$RELEASE.cat \ - $CSWSGML/openjade-$OPENJADEVER/catalog - $PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/xml-docbook-4.3-$VERSION-$RELEASE.cat \ - $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog - - # DocBook V4.4 - $PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/sgml-docbook-4.4-$VERSION-$RELEASE.cat \ - $CSWSGML/openjade-$OPENJADEVER/catalog - $PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/sgml-docbook-4.4-$VERSION-$RELEASE.cat \ - $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog - - # DocBook XML V4.4 - $PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/xml-docbook-4.4-$VERSION-$RELEASE.cat \ - $CSWSGML/openjade-$OPENJADEVER/catalog - $PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/xml-docbook-4.4-$VERSION-$RELEASE.cat \ - $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog -fi - # Fix up SGML super catalog so that there isn't an XML DTD before an # SGML one. We need to do this (*sigh*) because xmlcatalog messes up # the order of the lines, and SGML tools don't like to see XML things Modified: csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.preremove =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.preremove 2008-12-24 00:21:36 UTC (rev 2692) +++ csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.preremove 2008-12-24 01:04:51 UTC (rev 2693) @@ -16,8 +16,6 @@ VERSION=1.0 RELEASE=30.1 -OPENJADEVER=1.3.2 - ## ## SGML catalog ## 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 Dec 24 02:14:56 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 24 Dec 2008 01:14:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[2694] csw/mgar/pkg/docbook-dtds/trunk Message-ID: Revision: 2694 http://gar.svn.sourceforge.net/gar/?rev=2694&view=rev Author: bdwalton Date: 2008-12-24 01:14:55 +0000 (Wed, 24 Dec 2008) Log Message: ----------- corrected preremove script to remove all catalogs properly. Modified Paths: -------------- csw/mgar/pkg/docbook-dtds/trunk/checksums csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.preremove Modified: csw/mgar/pkg/docbook-dtds/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/checksums 2008-12-24 01:04:51 UTC (rev 2693) +++ csw/mgar/pkg/docbook-dtds/trunk/checksums 2008-12-24 01:14:55 UTC (rev 2694) @@ -11,7 +11,7 @@ cbb04e9a700955d88c50962ef22c1634 download/docbook-xml-4.4.zip 536104a1ab1e8eac583cf27f4f8844a4 download/CSWdocbookdtds.gspec 58c926e94c472fd0842d7850732cbcc8 download/CSWdocbookdtds.postinstall -935e0f00b12f0a6888839bccac460eb8 download/CSWdocbookdtds.preremove +81e9ec3839d7fc7585515aaf6d412135 download/CSWdocbookdtds.preremove 318742d3a6648a6905727f071cbc9847 download/docbook-4.2-euro.patch e3067045964536cc7445d5c3f1e99916 download/docbook-dtd30-sgml-1.0.catalog.patch 856d40f5d1e3fc8fd939b88bf5fedc87 download/docbook-dtd31-sgml-1.0.catalog.patch Modified: csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.preremove =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.preremove 2008-12-24 01:04:51 UTC (rev 2693) +++ csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.preremove 2008-12-24 01:14:55 UTC (rev 2694) @@ -29,7 +29,7 @@ # DocBook V3.1 $PREFIX $XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ $CSWSGMLCNF/sgml-docbook-3.1-$VERSION-$RELEASE.cat -rm -f $PKG_INSTALL_ROOT/CSWSGMLCNF/sgml-docbook-3.1-$VERSION-$RELEASE.cat +rm -f $PKG_INSTALL_ROOT/$CSWSGMLCNF/sgml-docbook-3.1-$VERSION-$RELEASE.cat # DocBook V4.0 $PREFIX $XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Dec 24 16:12:48 2008 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 24 Dec 2008 15:12:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[2695] csw/mgar/pkg/ca_certificates/trunk Message-ID: Revision: 2695 http://gar.svn.sourceforge.net/gar/?rev=2695&view=rev Author: chninkel Date: 2008-12-24 15:12:48 +0000 (Wed, 24 Dec 2008) Log Message: ----------- ca_certificates: handles the case where openssl_rt is not installed but openssl_utils is Modified Paths: -------------- csw/mgar/pkg/ca_certificates/trunk/checksums csw/mgar/pkg/ca_certificates/trunk/files/update-ca-certificates Modified: csw/mgar/pkg/ca_certificates/trunk/checksums =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/checksums 2008-12-24 01:14:55 UTC (rev 2694) +++ csw/mgar/pkg/ca_certificates/trunk/checksums 2008-12-24 15:12:48 UTC (rev 2695) @@ -1,6 +1,6 @@ 4dabeaecfd46395da152e51d312107e4 download/certdata.txt 77fe4c8feb1b341814a6ed03d4ff764a download/certdata2pem.pl -86f62a09c9a90d0257a738656a3ed9f3 download/update-ca-certificates +8163827375c4cb08f9734930adb06ee2 download/update-ca-certificates b4f6772525da6772d51eb30f90605d60 download/ca-certificates.conf 787d361f8d8b8ecf89e83bb813fdaec5 download/CSWcacertificates.gspec 31227010faaad1c2b9893ba91d6b16bb download/CSWcacertificates.depend Modified: csw/mgar/pkg/ca_certificates/trunk/files/update-ca-certificates =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/files/update-ca-certificates 2008-12-24 01:14:55 UTC (rev 2694) +++ csw/mgar/pkg/ca_certificates/trunk/files/update-ca-certificates 2008-12-24 15:12:48 UTC (rev 2695) @@ -114,12 +114,33 @@ # we create the hash links for certificate, openssl library need # this link to be able to find a CA certificate -if { openssl version; } >/dev/null 2>&1; then - c_rehash "$CERTSDIR" >/dev/null 2>&1 -elif { /opt/csw/bin/openssl version; } >/dev/null 2>&1; then - OPENSSL="/opt/csw/bin/openssl" /opt/csw/bin/c_rehash "$CERTSDIR" >/dev/null 2>&1 +PATH="$PATH:/opt/csw/bin:" +OIFS="$IFS"; IFS=":" +set -- $PATH +IFS="$OIFS" +OPENSSL="" +while [ $# -ne 0 ]; do + if [ -x "$1/openssl" ] && [ -x "$1/c_rehash" ]; then + + # update-ca-certificates might be called when openssl_rt is removed + # that would mean that openssl binary is present but wouldn't work + # because of missing libraries so we test that case + if LANG=C ldd /opt/csw/bin/openssl | grep "not found" >/dev/null; then + shift + continue + fi + OPENSSL="$1/openssl" + C_REHASH="$1/c_rehash" + break + fi + shift +done + +if [ -n "$OPENSSL" ]; then + OPENSSL="$OPENSSL" "$C_REHASH" "$CERTSDIR" >/dev/null 2>&1 + # openssl binary isn't available, so we fall back our own provided file containing # hash value for certificates provided by this package # this way, we don't stricly depend on the openssl_utils package This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Thu Dec 25 14:07:54 2008 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Thu, 25 Dec 2008 13:07:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[2696] csw/mgar/pkg/apache2/trunk Message-ID: Revision: 2696 http://gar.svn.sourceforge.net/gar/?rev=2696&view=rev Author: idogan23 Date: 2008-12-25 13:07:54 +0000 (Thu, 25 Dec 2008) Log Message: ----------- apache2: updated to 2.2.11 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 2008-12-24 15:12:48 UTC (rev 2695) +++ csw/mgar/pkg/apache2/trunk/Makefile 2008-12-25 13:07:54 UTC (rev 2696) @@ -1,5 +1,5 @@ GARNAME = httpd -GARVERSION = 2.2.10 +GARVERSION = 2.2.11 CATEGORIES = server DESCRIPTION = A high performance Unix-based HTTP server. Modified: csw/mgar/pkg/apache2/trunk/checksums =================================================================== --- csw/mgar/pkg/apache2/trunk/checksums 2008-12-24 15:12:48 UTC (rev 2695) +++ csw/mgar/pkg/apache2/trunk/checksums 2008-12-25 13:07:54 UTC (rev 2696) @@ -1,4 +1,4 @@ -f611aff3ddba114499e623a5259faa5c download/httpd-2.2.10.tar.gz +03e0a99a5de0f3f568a0087fb9993af9 download/httpd-2.2.11.tar.gz a7467a756cbd980d4cfe3c2cfb6a9e35 download/config.layout a8d5878f31f6a2081bc178351b2dda1e download/CSWapache2.gspec 44ec414654dec572fd43d6a45c001746 download/CSWapache2.depend This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Thu Dec 25 15:08:24 2008 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Thu, 25 Dec 2008 14:08:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[2697] csw/mgar/pkg/amavisd-new/trunk Message-ID: Revision: 2697 http://gar.svn.sourceforge.net/gar/?rev=2697&view=rev Author: idogan23 Date: 2008-12-25 14:08:24 +0000 (Thu, 25 Dec 2008) Log Message: ----------- amavsid-new: update to 2.6.2 Modified Paths: -------------- csw/mgar/pkg/amavisd-new/trunk/Makefile csw/mgar/pkg/amavisd-new/trunk/checksums csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.prototype Modified: csw/mgar/pkg/amavisd-new/trunk/Makefile =================================================================== --- csw/mgar/pkg/amavisd-new/trunk/Makefile 2008-12-25 13:07:54 UTC (rev 2696) +++ csw/mgar/pkg/amavisd-new/trunk/Makefile 2008-12-25 14:08:24 UTC (rev 2697) @@ -1,5 +1,5 @@ GARNAME = amavisd-new -GARVERSION = 2.6.1 +GARVERSION = 2.6.2 CATEGORIES = server DESCRIPTION = Interface between MTA and content checkers Modified: csw/mgar/pkg/amavisd-new/trunk/checksums =================================================================== --- csw/mgar/pkg/amavisd-new/trunk/checksums 2008-12-25 13:07:54 UTC (rev 2696) +++ csw/mgar/pkg/amavisd-new/trunk/checksums 2008-12-25 14:08:24 UTC (rev 2697) @@ -1,9 +1,9 @@ -2474d4c034f96a58e5b8af91af514689 download/amavisd-new-2.6.1.tar.gz +0b3b0ef8771af8e4a950e7381d42adbd download/amavisd-new-2.6.2.tar.gz 979fd28f16513f660912311c3566786d download/CSWamavisdnew.gspec 1a54bc6b9d92afadc704c394cb93fa00 download/CSWamavisdnew.depend 65f66fb3036b7949057733aa99cff724 download/CSWamavisdnew.postinstall 171767585ab6662c0cbedae26e9baa2c download/CSWamavisdnew.preinstall -6061cecc2d1bdc09e05ac39ea7d2c20f download/CSWamavisdnew.prototype +631e33b02eb813b9f3f13db03b5c12eb download/CSWamavisdnew.prototype b9cafe6715bc2703ac9411f24f248cd3 download/amavisd-agent.diff 3e81998c8b933129870e3cab68d40261 download/amavisd-nanny.diff f218d10e5280940268a3ffaa125a00ae download/amavisd-release.diff Modified: csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.prototype =================================================================== --- csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.prototype 2008-12-25 13:07:54 UTC (rev 2696) +++ csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.prototype 2008-12-25 14:08:24 UTC (rev 2697) @@ -67,7 +67,6 @@ f none /opt/csw/share/doc/amavisd-new/README_FILES/images/toc-plus.png 0644 root bin f none /opt/csw/share/doc/amavisd-new/README_FILES/images/up.png 0644 root bin f none /opt/csw/share/doc/amavisd-new/README_FILES/images/warning.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/rfc4871.txt 0644 root bin f none /opt/csw/share/doc/amavisd-new/README_FILES/screen.css 0644 root bin f none /opt/csw/share/doc/amavisd-new/RELEASE_NOTES 0644 root bin f none /opt/csw/share/doc/amavisd-new/amavisd.conf-default 0644 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Thu Dec 25 15:21:48 2008 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Thu, 25 Dec 2008 14:21:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[2698] csw/mgar/pkg/syslog_ng/trunk Message-ID: Revision: 2698 http://gar.svn.sourceforge.net/gar/?rev=2698&view=rev Author: idogan23 Date: 2008-12-25 14:21:48 +0000 (Thu, 25 Dec 2008) Log Message: ----------- syslog_ng: updated to 2.0.10 Modified Paths: -------------- csw/mgar/pkg/syslog_ng/trunk/Makefile csw/mgar/pkg/syslog_ng/trunk/checksums Modified: csw/mgar/pkg/syslog_ng/trunk/Makefile =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/Makefile 2008-12-25 14:08:24 UTC (rev 2697) +++ csw/mgar/pkg/syslog_ng/trunk/Makefile 2008-12-25 14:21:48 UTC (rev 2698) @@ -1,5 +1,5 @@ GARNAME = syslog-ng -GARVERSION = 2.0.9 +GARVERSION = 2.0.10 CATEGORIES = server DESCRIPTION = A powerful syslogd replacement Modified: csw/mgar/pkg/syslog_ng/trunk/checksums =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/checksums 2008-12-25 14:08:24 UTC (rev 2697) +++ csw/mgar/pkg/syslog_ng/trunk/checksums 2008-12-25 14:21:48 UTC (rev 2698) @@ -1,4 +1,4 @@ -2d4232f7167c2b4f48794e4f8f80e863 download/syslog-ng-2.0.9.tar.gz +3f96ccf13dda0b9e150e511bcffde795 download/syslog-ng-2.0.10.tar.gz 6726e851fa8e6e6658584faaeaa6716d download/CSWsyslogng.gspec 3de835dbfde225227a1ed36f548e1d34 download/CSWsyslogng.postinstall bb5490a23e8480b6e9d625389885c346 download/CSWsyslogng.depend This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Fri Dec 26 13:41:09 2008 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Fri, 26 Dec 2008 12:41:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[2699] csw/mgar/pkg/rrdtool/trunk Message-ID: Revision: 2699 http://gar.svn.sourceforge.net/gar/?rev=2699&view=rev Author: idogan23 Date: 2008-12-26 12:41:09 +0000 (Fri, 26 Dec 2008) Log Message: ----------- rrdtool: update to 1.3.5 Modified Paths: -------------- csw/mgar/pkg/rrdtool/trunk/Makefile csw/mgar/pkg/rrdtool/trunk/checksums csw/mgar/pkg/rrdtool/trunk/files/CSWrrdtool.prototype Modified: csw/mgar/pkg/rrdtool/trunk/Makefile =================================================================== --- csw/mgar/pkg/rrdtool/trunk/Makefile 2008-12-25 14:21:48 UTC (rev 2698) +++ csw/mgar/pkg/rrdtool/trunk/Makefile 2008-12-26 12:41:09 UTC (rev 2699) @@ -1,5 +1,5 @@ GARNAME = rrdtool -GARVERSION = 1.3.4 +GARVERSION = 1.3.5 CATEGORIES = utils DESCRIPTION = time-series data logging and graphing. @@ -17,9 +17,10 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz # Patch to make it build on x86 -PATCHFILES += rrd_config.diff +#PATCHFILES += rrd_config.diff CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --docdir=$(prefix)/doc/$(GARNAME) CONFIGURE_ARGS += --disable-python CONFIGURE_ARGS += --disable-ruby CONFIGURE_ARGS += --disable-libintl Modified: csw/mgar/pkg/rrdtool/trunk/checksums =================================================================== --- csw/mgar/pkg/rrdtool/trunk/checksums 2008-12-25 14:21:48 UTC (rev 2698) +++ csw/mgar/pkg/rrdtool/trunk/checksums 2008-12-26 12:41:09 UTC (rev 2699) @@ -1,4 +1,3 @@ -7db3bffc3f3b24e828a88fe02165266f download/rrdtool-1.3.4.tar.gz +3f14381e64c2037f40af16380be9e9f3 download/rrdtool-1.3.5.tar.gz 52bb91d1dad69b8911e787e9347b4e8a download/CSWrrdtool.gspec -9be46cfbb1068056b1466d79cbebbff6 download/CSWrrdtool.prototype -6d78fae545c47faa61f37b216eeeda90 download/rrd_config.diff +a59044180a9795b229c1ea1667fec2f0 download/CSWrrdtool.prototype Modified: csw/mgar/pkg/rrdtool/trunk/files/CSWrrdtool.prototype =================================================================== --- csw/mgar/pkg/rrdtool/trunk/files/CSWrrdtool.prototype 2008-12-25 14:21:48 UTC (rev 2698) +++ csw/mgar/pkg/rrdtool/trunk/files/CSWrrdtool.prototype 2008-12-26 12:41:09 UTC (rev 2699) @@ -7,114 +7,102 @@ f none /opt/csw/include/rrd_format.h 0644 root bin d none /opt/csw/lib 0755 root bin f none /opt/csw/lib/librrd.a 0644 root bin -f none /opt/csw/lib/librrd.so.4.0.3 0755 root bin -s none /opt/csw/lib/librrd.so.4=librrd.so.4.0.3 -s none /opt/csw/lib/librrd.so=librrd.so.4.0.3 +f none /opt/csw/lib/librrd.so.4.0.4 0755 root bin +s none /opt/csw/lib/librrd.so.4=librrd.so.4.0.4 +s none /opt/csw/lib/librrd.so=librrd.so.4.0.4 f none /opt/csw/lib/librrd_th.a 0644 root bin -f none /opt/csw/lib/librrd_th.so.4.0.3 0755 root bin -s none /opt/csw/lib/librrd_th.so.4=librrd_th.so.4.0.3 -s none /opt/csw/lib/librrd_th.so=librrd_th.so.4.0.3 -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/5.8.8 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -f none /opt/csw/lib/perl/csw/RRDs.pm 0444 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin +f none /opt/csw/lib/librrd_th.so.4.0.4 0755 root bin +s none /opt/csw/lib/librrd_th.so.4=librrd_th.so.4.0.4 +s none /opt/csw/lib/librrd_th.so=librrd_th.so.4.0.4 d none /opt/csw/lib/perl/csw/auto/RRDp 0755 root bin f none /opt/csw/lib/perl/csw/auto/RRDp/.packlist 0644 root bin d none /opt/csw/lib/perl/csw/auto/RRDs 0755 root bin f none /opt/csw/lib/perl/csw/auto/RRDs/.packlist 0644 root bin -f none /opt/csw/lib/perl/csw/auto/RRDs/RRDs.bs 0444 root bin -f none /opt/csw/lib/perl/csw/auto/RRDs/RRDs.so 0555 root bin -f none /opt/csw/lib/perl/csw/ntmake.pl 0444 root bin d none /opt/csw/lib/pkgconfig 0755 root bin f none /opt/csw/lib/pkgconfig/librrd.pc 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/doc 0755 root bin -d none /opt/csw/share/doc/rrdtool-1.3.4 0755 root bin -d none /opt/csw/share/doc/rrdtool-1.3.4/html 0755 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/RRDp.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/RRDs.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/bin_dec_hex.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/cdeftutorial.html 0644 root bin -s none /opt/csw/share/doc/rrdtool-1.3.4/html/index.html=rrdtool.html -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rpntutorial.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rrd-beginners.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rrdbuild.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rrdcgi.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rrdcreate.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rrddump.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rrdfetch.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rrdfirst.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rrdgraph.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rrdgraph_data.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rrdgraph_examples.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rrdgraph_graph.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rrdgraph_rpn.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rrdinfo.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rrdlast.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rrdlastupdate.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rrdresize.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rrdrestore.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rrdthreads.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rrdtool.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rrdtune.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rrdtutorial.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rrdupdate.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rrdxport.html 0644 root bin -d none /opt/csw/share/doc/rrdtool-1.3.4/txt 0755 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/bin_dec_hex.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/bin_dec_hex.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/cdeftutorial.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/cdeftutorial.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rpntutorial.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rpntutorial.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrd-beginners.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrd-beginners.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdbuild.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdbuild.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdcgi.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdcgi.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdcreate.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdcreate.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrddump.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrddump.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdfetch.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdfetch.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdfirst.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdfirst.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdgraph.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdgraph.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdgraph_data.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdgraph_data.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdgraph_examples.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdgraph_examples.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdgraph_graph.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdgraph_graph.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdgraph_rpn.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdgraph_rpn.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdinfo.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdinfo.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdlast.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdlast.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdlastupdate.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdlastupdate.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdresize.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdresize.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdrestore.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdrestore.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdthreads.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdthreads.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdtool.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdtool.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdtune.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdtune.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdtutorial.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdtutorial.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdupdate.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdupdate.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdxport.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdxport.txt 0644 root bin -d none /opt/csw/share/man 0755 root bin +d none /opt/csw/share/doc/rrdtool-1.3.5/html 0755 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/RRDp.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/RRDs.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/bin_dec_hex.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/cdeftutorial.html 0644 root bin +s none /opt/csw/share/doc/rrdtool-1.3.5/html/index.html=rrdtool.html +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rpntutorial.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rrd-beginners.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rrdbuild.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rrdcgi.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rrdcreate.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rrddump.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rrdfetch.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rrdfirst.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rrdgraph.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rrdgraph_data.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rrdgraph_examples.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rrdgraph_graph.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rrdgraph_rpn.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rrdinfo.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rrdlast.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rrdlastupdate.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rrdresize.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rrdrestore.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rrdthreads.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rrdtool.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rrdtune.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rrdtutorial.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rrdupdate.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rrdxport.html 0644 root bin +d none /opt/csw/share/doc/rrdtool-1.3.5/txt 0755 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/bin_dec_hex.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/bin_dec_hex.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/cdeftutorial.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/cdeftutorial.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rpntutorial.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rpntutorial.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrd-beginners.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrd-beginners.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdbuild.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdbuild.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdcgi.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdcgi.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdcreate.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdcreate.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrddump.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrddump.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdfetch.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdfetch.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdfirst.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdfirst.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdgraph.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdgraph.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdgraph_data.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdgraph_data.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdgraph_examples.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdgraph_examples.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdgraph_graph.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdgraph_graph.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdgraph_rpn.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdgraph_rpn.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdinfo.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdinfo.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdlast.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdlast.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdlastupdate.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdlastupdate.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdresize.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdresize.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdrestore.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdrestore.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdthreads.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdthreads.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdtool.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdtool.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdtune.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdtune.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdtutorial.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdtutorial.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdupdate.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdupdate.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdxport.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdxport.txt 0644 root bin d none /opt/csw/share/man/man1 0755 root bin f none /opt/csw/share/man/man1/bin_dec_hex.1 0644 root bin f none /opt/csw/share/man/man1/cdeftutorial.1 0644 root bin @@ -142,13 +130,6 @@ f none /opt/csw/share/man/man1/rrdtutorial.1 0644 root bin f none /opt/csw/share/man/man1/rrdupdate.1 0644 root bin f none /opt/csw/share/man/man1/rrdxport.1 0644 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/RRDp.3perl 0444 root bin -f none /opt/csw/share/man/man3/RRDs.3perl 0444 root bin -d none /opt/csw/share/perl 0755 root bin -d none /opt/csw/share/perl/csw 0755 root bin -f none /opt/csw/share/perl/csw/RRDp.pm 0444 root bin -d none /opt/csw/share/rrdtool 0755 root bin d none /opt/csw/share/rrdtool/examples 0755 root bin f none /opt/csw/share/rrdtool/examples/4charts.pl 0755 root bin f none /opt/csw/share/rrdtool/examples/bigtops.pl 0755 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Fri Dec 26 16:24:21 2008 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 26 Dec 2008 15:24:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[2700] csw/mgar/pkg/openssl/trunk Message-ID: Revision: 2700 http://gar.svn.sourceforge.net/gar/?rev=2700&view=rev Author: chninkel Date: 2008-12-26 15:24:20 +0000 (Fri, 26 Dec 2008) Log Message: ----------- openssl: added scripts to migrate certificates in /opt/csw/etc/ssl/certs Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile csw/mgar/pkg/openssl/trunk/checksums csw/mgar/pkg/openssl/trunk/files/CSWossl.prototype csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-i386 csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-sparc csw/mgar/pkg/openssl/trunk/files/CSWosslrt.checkinstall csw/mgar/pkg/openssl/trunk/files/CSWosslrt.depend csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-i386 csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-sparc csw/mgar/pkg/openssl/trunk/files/CSWosslutils.prototype csw/mgar/pkg/openssl/trunk/files/changelog.CSW Added Paths: ----------- csw/mgar/pkg/openssl/trunk/files/CSWosslrt.postinstall csw/mgar/pkg/openssl/trunk/files/CSWosslrt.preinstall csw/mgar/pkg/openssl/trunk/files/README.CSW Removed Paths: ------------- csw/mgar/pkg/openssl/trunk/files/certs.tar.gz Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2008-12-26 12:41:09 UTC (rev 2699) +++ csw/mgar/pkg/openssl/trunk/Makefile 2008-12-26 15:24:20 UTC (rev 2700) @@ -21,12 +21,14 @@ DISTNAME = $(GARNAME)-$(GARVERSION) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWossl,depend prototype) -DISTFILES += $(call admfiles,CSWosslrt,checkinstall depend prototype-i386 prototype-sparc) +DISTFILES += $(call admfiles,CSWosslrt,checkinstall preinstall postinstall depend prototype-i386 prototype-sparc) DISTFILES += $(call admfiles,CSWossldevel,depend prototype-i386 prototype-sparc) DISTFILES += $(call admfiles,CSWosslutils,depend prototype) -DISTFILES += changelog.CSW +DISTFILES += changelog.CSW README.CSW DISTFILES += i.conf r.conf +DOCFILES = CHANGES CHANGES.SSLeay PROBLEMS README FAQ README.ASN1 INSTALL NEWS README.ENGINE + SPKG_CLASSES = none conf PATCHFILES = openssl.$(OPENSSL_VERSION).patch @@ -105,13 +107,14 @@ ginstall -D $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/changelog.CSW $(SPKG_PKGBASE)/changelog.CSW @$(MAKECOOKIE) +install-doc: + cd $(WORKSRC_FIRSTMOD)/ && ginstall $(DOCFILES) $(SPKG_PKGBASE)/ + ginstall -D $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/README.CSW $(SPKG_PKGBASE)/README.CSW + @$(MAKECOOKIE) + install-certs: [ -f $(PKGROOT)$(prefix)/ssl/openssl.cnf ] && \ ginstall -D $(PKGROOT)$(prefix)/ssl/openssl.cnf $(PKGROOT)$(sysconfdir)/ssl/openssl.cnf - gunzip --stdout $(CURDIR)/$(FILEDIR)/certs.tar.gz | (cd $(PKGROOT)$(prefix)/ssl/certs && tar xf -) - cp -r $(WORKSRC_FIRSTMOD)/certs/* $(PKGROOT)$(prefix)/ssl/certs - OPENSSL=$(PKGROOT)/$(bindir)/openssl $(PKGROOT)/$(bindir)/c_rehash $(PKGROOT)/$(prefix)/ssl/certs/ - @$(MAKECOOKIE) install-oldlibs: $(addprefix install-oldlibs-,$(OLDLIBS)) install-oldlibs-%: @@ -119,4 +122,4 @@ cd $(PKGROOT) && gunzip -c $(CURDIR)/$(FILEDIR)/oldlibs.$*-$(GARCH).tar.gz | tar xvf - @$(MAKECOOKIE) -post-merge: install-certs install-oldlibs install-changelog +post-merge: install-certs install-oldlibs install-changelog install-doc Modified: csw/mgar/pkg/openssl/trunk/checksums =================================================================== --- csw/mgar/pkg/openssl/trunk/checksums 2008-12-26 12:41:09 UTC (rev 2699) +++ csw/mgar/pkg/openssl/trunk/checksums 2008-12-26 15:24:20 UTC (rev 2700) @@ -1,20 +1,23 @@ 561e00f18821c74b2b86c8c7786f9d8b download/openssl-0.9.8i.tar.gz b5ded4412606a0996595015bc2ff6974 download/CSWossl.gspec 05b45e7124833dee48e5f3c45591e95b download/CSWossl.depend -7fe01ca4ef9d0e971d57b00f4d0b168b download/CSWossl.prototype +bd9bb4dfb9602fba461b21fa37f97765 download/CSWossl.prototype 83480e01971e71d037bd44fa5ed4e4e5 download/CSWosslrt.gspec -78c26f65b14f3ebf4a29069a3f675285 download/CSWosslrt.checkinstall -d41d8cd98f00b204e9800998ecf8427e download/CSWosslrt.depend -cba143e52cb08dd3ee39f275aefa075d download/CSWosslrt.prototype-i386 -ceeb4a59f1c31ae4deac9f2b61dadca2 download/CSWosslrt.prototype-sparc +44afcc5a68551370907b9da130acc62b download/CSWosslrt.checkinstall +c9de908daad1a31fca20329cb043ad3c download/CSWosslrt.preinstall +990506284d440001e4f23f7fbffa404a download/CSWosslrt.postinstall +cbf34987267073fb1f60bff86492dd8b download/CSWosslrt.depend +e4ae37693f304010a024329151d7620e download/CSWosslrt.prototype-i386 +b71924fca6e324743e6977f370cce76b download/CSWosslrt.prototype-sparc 2ac43ebf4689d236540e22171541be4e download/CSWossldevel.gspec 37995caa7f4155066b00fb7503e853da download/CSWossldevel.depend -45161ff3a5b00fd6942f63b77c0b0ed1 download/CSWossldevel.prototype-i386 -7b1dd2e8c78b033ca2a8be4de097b147 download/CSWossldevel.prototype-sparc +e85eb38fc1a7301fa4951355859ee5e9 download/CSWossldevel.prototype-i386 +427edaecb41b1536013db23a02d69f42 download/CSWossldevel.prototype-sparc eec77249fb642c525cad67dcd055fb77 download/CSWosslutils.gspec 37995caa7f4155066b00fb7503e853da download/CSWosslutils.depend -6e0c86ddc23d044757810cca6f31f017 download/CSWosslutils.prototype -1bd6e7ee77845fc4de843d7479a4bdb9 download/changelog.CSW +a441995e4e3c95497e77aa613d2c673c download/CSWosslutils.prototype +1b23306c534a4c0a3920bdf1984b39bd download/changelog.CSW +b78faa440d6f6a2a07663de331678648 download/README.CSW 7fdc09cd3c11db459c83c8946f7872f6 download/i.conf a454ac09091085813ec8900f5a0c917c download/r.conf 64f7c3f3a6cae483209b69c31c82557d download/openssl.0.9.8.patch Modified: csw/mgar/pkg/openssl/trunk/files/CSWossl.prototype =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWossl.prototype 2008-12-26 12:41:09 UTC (rev 2699) +++ csw/mgar/pkg/openssl/trunk/files/CSWossl.prototype 2008-12-26 15:24:20 UTC (rev 2700) @@ -1,2 +1,12 @@ d none /opt/csw/share/doc/openssl 0755 root bin f none /opt/csw/share/doc/openssl/changelog.CSW=changelog.CSW 644 root bin +f none /opt/csw/share/doc/openssl/CHANGES=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl/CHANGES.SSLeay=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl/PROBLEMS=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl/README=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl/FAQ=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl/README.ASN1=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl/INSTALL=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl/NEWS=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl/README.ENGINE=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl/README.CSW=README.CSW 644 root bin Modified: csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-i386 =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-i386 2008-12-26 12:41:09 UTC (rev 2699) +++ csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-i386 2008-12-26 15:24:20 UTC (rev 2700) @@ -1042,3 +1042,14 @@ f none /opt/csw/share/man/man3/ui.3 0644 root bin f none /opt/csw/share/man/man3/ui_compat.3 0644 root bin f none /opt/csw/share/man/man3/x509.3 0644 root bin +f none /opt/csw/share/doc/openssl_devel/changelog.CSW=changelog.CSW 644 root bin +f none /opt/csw/share/doc/openssl_devel/CHANGES=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl_devel/CHANGES.SSLeay=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl_devel/PROBLEMS=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl_devel/README=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl_devel/FAQ=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl_devel/README.ASN1=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl_devel/INSTALL=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl_devel/NEWS=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl_devel/README.ENGINE=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl_devel/README.CSW=README.CSW 644 root bin Modified: csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-sparc =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-sparc 2008-12-26 12:41:09 UTC (rev 2699) +++ csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-sparc 2008-12-26 15:24:20 UTC (rev 2700) @@ -1042,3 +1042,14 @@ f none /opt/csw/share/man/man3/ui.3 0644 root bin f none /opt/csw/share/man/man3/ui_compat.3 0644 root bin f none /opt/csw/share/man/man3/x509.3 0644 root bin +f none /opt/csw/share/doc/openssl_devel/changelog.CSW=changelog.CSW 644 root bin +f none /opt/csw/share/doc/openssl_devel/CHANGES=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl_devel/CHANGES.SSLeay=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl_devel/PROBLEMS=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl_devel/README=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl_devel/FAQ=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl_devel/README.ASN1=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl_devel/INSTALL=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl_devel/NEWS=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl_devel/README.ENGINE=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl_devel/README.CSW=README.CSW 644 root bin Modified: csw/mgar/pkg/openssl/trunk/files/CSWosslrt.checkinstall =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWosslrt.checkinstall 2008-12-26 12:41:09 UTC (rev 2699) +++ csw/mgar/pkg/openssl/trunk/files/CSWosslrt.checkinstall 2008-12-26 15:24:20 UTC (rev 2700) @@ -26,4 +26,23 @@ fi fi +# Certification Authority have been moved under /opt/csw/etc/ssl/certs +# under the ca_certificates package control +# and /opt/csw/ssl/certs is now a symbolic links + +# we test if certificates were manually installed in this directory +if [ ! -L "/opt/csw/ssl/certs" ] && [ -n "`ls -1 /opt/csw/ssl/certs/`" ]; then + + echo "Custom certificates have been installed in /opt/csw/ssl/certs/." + echo "They will be moved under /opt/csw/etc/ssl/certs." + echo "see /opt/csw/share/doc/openssl_rt/README.CSW for more information" + echo "about CA." + + # we define the MOVE_CERTS variable so preinstall and postinstall scripts + # will now they have to do something about theses certificates + cat >>$1 < Revision: 2701 http://gar.svn.sourceforge.net/gar/?rev=2701&view=rev Author: chninkel Date: 2008-12-26 16:07:08 +0000 (Fri, 26 Dec 2008) Log Message: ----------- openssl: revmoed debug mode for update-ca-certificates Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/checksums csw/mgar/pkg/openssl/trunk/files/CSWosslrt.postinstall Modified: csw/mgar/pkg/openssl/trunk/checksums =================================================================== --- csw/mgar/pkg/openssl/trunk/checksums 2008-12-26 15:24:20 UTC (rev 2700) +++ csw/mgar/pkg/openssl/trunk/checksums 2008-12-26 16:07:08 UTC (rev 2701) @@ -5,7 +5,7 @@ 83480e01971e71d037bd44fa5ed4e4e5 download/CSWosslrt.gspec 44afcc5a68551370907b9da130acc62b download/CSWosslrt.checkinstall c9de908daad1a31fca20329cb043ad3c download/CSWosslrt.preinstall -990506284d440001e4f23f7fbffa404a download/CSWosslrt.postinstall +1c3f600eaf942a18ecab3637e1fc32bd download/CSWosslrt.postinstall cbf34987267073fb1f60bff86492dd8b download/CSWosslrt.depend e4ae37693f304010a024329151d7620e download/CSWosslrt.prototype-i386 b71924fca6e324743e6977f370cce76b download/CSWosslrt.prototype-sparc Modified: csw/mgar/pkg/openssl/trunk/files/CSWosslrt.postinstall =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWosslrt.postinstall 2008-12-26 15:24:20 UTC (rev 2700) +++ csw/mgar/pkg/openssl/trunk/files/CSWosslrt.postinstall 2008-12-26 16:07:08 UTC (rev 2701) @@ -3,7 +3,7 @@ # we regenerate the certificate hash if we moved certificates from the old /opt/csw/ssl/certs # directory to /opt/csw/etc/ssl/certs if [ "$MOVE_CERTS" = "Yes" ]; then - [ ! -x "/opt/csw/sbin/update-ca-certificates" ] || sh -xe /opt/csw/sbin/update-ca-certificates + [ ! -x "/opt/csw/sbin/update-ca-certificates" ] || /opt/csw/sbin/update-ca-certificates fi true This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Sat Dec 27 20:04:05 2008 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sat, 27 Dec 2008 19:04:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[2702] csw/mgar/pkg Message-ID: Revision: 2702 http://gar.svn.sourceforge.net/gar/?rev=2702&view=rev Author: idogan23 Date: 2008-12-27 19:04:05 +0000 (Sat, 27 Dec 2008) Log Message: ----------- libytnef: initial commit Added Paths: ----------- csw/mgar/pkg/libytnef/ csw/mgar/pkg/libytnef/branches/ csw/mgar/pkg/libytnef/tags/ csw/mgar/pkg/libytnef/trunk/ csw/mgar/pkg/libytnef/trunk/Makefile csw/mgar/pkg/libytnef/trunk/checksums csw/mgar/pkg/libytnef/trunk/files/ csw/mgar/pkg/libytnef/trunk/files/CSWlibytnef.gspec Property changes on: csw/mgar/pkg/libytnef/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 Added: csw/mgar/pkg/libytnef/trunk/Makefile =================================================================== --- csw/mgar/pkg/libytnef/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libytnef/trunk/Makefile 2008-12-27 19:04:05 UTC (rev 2702) @@ -0,0 +1,31 @@ +GARNAME = libytnef +GARVERSION = 1.5 +CATEGORIES = lib + +DESCRIPTION = Brief description +define BLURB + This is the library needed to YTNEF application. + This program decodes those annoying application/ms-tnef MIME attachments that + Microsoft mail servers helpfully use to encapsulate your already MIME encoded + attachments. + The YTNEF program allows one to unpack the attachments which were encapsulated + into the YTNEF attachment. Thus alleviating the need to use Microsoft Outlook + to view them. +endef + +MASTER_SITES = http://ytnef.sourceforge.net/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWlibytnef,) + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +UPSTREAM_MASTER_SITES = http://ovh.dl.sourceforge.net/sourceforge/ytnef/ + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_SCRIPTS = + +include gar/category.mk Added: csw/mgar/pkg/libytnef/trunk/checksums =================================================================== --- csw/mgar/pkg/libytnef/trunk/checksums (rev 0) +++ csw/mgar/pkg/libytnef/trunk/checksums 2008-12-27 19:04:05 UTC (rev 2702) @@ -0,0 +1,2 @@ +6c44b955f33cf714c75a7bbe895cc352 download/libytnef-1.5.tar.gz +1a4a0d9a1f8654a3b6e3c7968cd5017c download/CSWpackage.gspec Added: csw/mgar/pkg/libytnef/trunk/files/CSWlibytnef.gspec =================================================================== --- csw/mgar/pkg/libytnef/trunk/files/CSWlibytnef.gspec (rev 0) +++ csw/mgar/pkg/libytnef/trunk/files/CSWlibytnef.gspec 2008-12-27 19:04:05 UTC (rev 2702) @@ -0,0 +1,4 @@ +%var bitname libytnef +%var pkgname CSWlibytnef +%include url file://%{PKGLIB}/csw_dyndepend.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 idogan23 at users.sourceforge.net Sat Dec 27 20:08:05 2008 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sat, 27 Dec 2008 19:08:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[2703] csw/mgar/pkg/libytnef/trunk/checksums Message-ID: Revision: 2703 http://gar.svn.sourceforge.net/gar/?rev=2703&view=rev Author: idogan23 Date: 2008-12-27 19:07:57 +0000 (Sat, 27 Dec 2008) Log Message: ----------- libytnef: forgot to run gmake makesum before commit Modified Paths: -------------- csw/mgar/pkg/libytnef/trunk/checksums Modified: csw/mgar/pkg/libytnef/trunk/checksums =================================================================== --- csw/mgar/pkg/libytnef/trunk/checksums 2008-12-27 19:04:05 UTC (rev 2702) +++ csw/mgar/pkg/libytnef/trunk/checksums 2008-12-27 19:07:57 UTC (rev 2703) @@ -1,2 +1,2 @@ 6c44b955f33cf714c75a7bbe895cc352 download/libytnef-1.5.tar.gz -1a4a0d9a1f8654a3b6e3c7968cd5017c download/CSWpackage.gspec +1a4a0d9a1f8654a3b6e3c7968cd5017c download/CSWlibytnef.gspec 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 Dec 28 03:02:57 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 28 Dec 2008 02:02:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[2704] csw/mgar/pkg/docbook-style-xsl/trunk/checksums Message-ID: Revision: 2704 http://gar.svn.sourceforge.net/gar/?rev=2704&view=rev Author: bdwalton Date: 2008-12-28 02:02:56 +0000 (Sun, 28 Dec 2008) Log Message: ----------- forgot to update checksums with prior checkin Modified Paths: -------------- csw/mgar/pkg/docbook-style-xsl/trunk/checksums Modified: csw/mgar/pkg/docbook-style-xsl/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/checksums 2008-12-27 19:07:57 UTC (rev 2703) +++ csw/mgar/pkg/docbook-style-xsl/trunk/checksums 2008-12-28 02:02:56 UTC (rev 2704) @@ -3,7 +3,7 @@ 4120f10e50070dd8fc2284d5214bf51d download/CSWdocbookxsl.gspec 8911f851d78a1ab1a21c49286f37f6cb download/CSWdocbookxsl.postinstall 88f331d079de730ef77a5091e69989e2 download/CSWdocbookxsl.preremove -2da0402bea01c8235e6fffac147382d5 download/CSWdocbookxsldoc.gspec +a0c6ee83fdef595158d9eed95d508d8f download/CSWdocbookxsldoc.gspec 84b37b559cc95c747e39a5a8f79558a3 download/docbook-xsl-pagesetup.patch 1d1ff63f5ebd3527c925f68e55138b6f download/docbook-xsl-marginleft.patch cec8c281ed1c9be99ad47a74362248d5 download/docbook-xsl-lists.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Sun Dec 28 05:29:27 2008 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Sun, 28 Dec 2008 04:29:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[2705] csw/mgar/pkg/vim/trunk Message-ID: Revision: 2705 http://gar.svn.sourceforge.net/gar/?rev=2705&view=rev Author: harpchad Date: 2008-12-28 04:29:26 +0000 (Sun, 28 Dec 2008) Log Message: ----------- Update to patch level 75 Modified Paths: -------------- csw/mgar/pkg/vim/trunk/checksums csw/mgar/pkg/vim/trunk/files/patches.mk Modified: csw/mgar/pkg/vim/trunk/checksums =================================================================== --- csw/mgar/pkg/vim/trunk/checksums 2008-12-28 02:02:56 UTC (rev 2704) +++ csw/mgar/pkg/vim/trunk/checksums 2008-12-28 04:29:26 UTC (rev 2705) @@ -67,6 +67,12 @@ fa0ccca2decdd2db64947658b04b8c99 download/7.2.067 ca5ab057205023613020ca920d903028 download/7.2.068 f3e6f3dd76278a9f7e396955faa4ca31 download/7.2.069 +805cdc76da46e73ae908038e09efae16 download/7.2.070 +9224b5e9c85fa4d47d418c248aff542e download/7.2.071 +45ca3d6526b653253b05d91a1e89bd3d download/7.2.072 +0d77ee653eabe4b7fdb640d768d7c1be download/7.2.073 +5b0a423e9f3ca07e5c62d4f0f5803a5c download/7.2.074 +d7eccf57f8fc04cf0385f85eff3d989a download/7.2.075 198b5e809eddd24650dac5ab237e26d0 download/CSWvim.depend 59c166f15ad9e4db7aeef3ce7f6d89d9 download/CSWvim.gspec 7f886f132e8404332757262c82aac7af download/CSWvim.prototype Modified: csw/mgar/pkg/vim/trunk/files/patches.mk =================================================================== --- csw/mgar/pkg/vim/trunk/files/patches.mk 2008-12-28 02:02:56 UTC (rev 2704) +++ csw/mgar/pkg/vim/trunk/files/patches.mk 2008-12-28 04:29:26 UTC (rev 2705) @@ -1,5 +1,5 @@ # Vim 72 patchset -PATCHREV = 069 +PATCHREV = 075 PATCHDIRLEVEL = 0 GARVERSION = $(DISTVERSION).$(PATCHREV) PATCHFILES += $(foreach T,$(shell gseq -f "%03g" 001 $(PATCHREV)),$(DISTVERSION).$(T)) 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 Dec 28 14:34:11 2008 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 28 Dec 2008 13:34:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[2706] csw/mgar/pkg Message-ID: Revision: 2706 http://gar.svn.sourceforge.net/gar/?rev=2706&view=rev Author: idogan23 Date: 2008-12-28 13:34:11 +0000 (Sun, 28 Dec 2008) Log Message: ----------- smartmontools: initial commit Added Paths: ----------- csw/mgar/pkg/smartmontools/ csw/mgar/pkg/smartmontools/branches/ csw/mgar/pkg/smartmontools/tags/ csw/mgar/pkg/smartmontools/trunk/ csw/mgar/pkg/smartmontools/trunk/Makefile csw/mgar/pkg/smartmontools/trunk/checksums csw/mgar/pkg/smartmontools/trunk/files/ csw/mgar/pkg/smartmontools/trunk/files/CSWsmartmontools.depend csw/mgar/pkg/smartmontools/trunk/files/CSWsmartmontools.gspec csw/mgar/pkg/smartmontools/trunk/files/CSWsmartmontools.postinstall csw/mgar/pkg/smartmontools/trunk/files/CSWsmartmontools.prototype Property changes on: csw/mgar/pkg/smartmontools/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 Added: csw/mgar/pkg/smartmontools/trunk/Makefile =================================================================== --- csw/mgar/pkg/smartmontools/trunk/Makefile (rev 0) +++ csw/mgar/pkg/smartmontools/trunk/Makefile 2008-12-28 13:34:11 UTC (rev 2706) @@ -0,0 +1,48 @@ +GARNAME = smartmontools +GARVERSION = 5.38 +CATEGORIES = utils + +DESCRIPTION = S.M.A.R.T. disk monitoring tools +define BLURB + The smartmontools package contains two utility programs (smartctl and smartd) + to control and monitor storage systems using the Self-Monitoring, Analysis + and Reporting Technology System (S.M.A.R.T.) built into most modern ATA and + SCSI hard disks. It is derived from the smartsuite package, and includes + support for ATA/ATAPI-5 disks. +endef + +MASTER_SITES = http://smartmontools.sourceforge.net/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWsmartmontools, postinstall depend prototype) + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +UPSTREAM_MASTER_SITES = http://surfnet.dl.sourceforge.net/sourceforge/smartmontools/ + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-docdir=$(sharedstatedir)/doc/$(GARNAME) +CONFIGURE_ARGS += --with-initscriptdir=/etc/opt/csw/init.d + +TEST_TARGET = check + +# moving configuration file +post-install: + (cd $(DESTDIR)$(prefix)/etc; \ + for i in smartd.conf; do \ + if [ -r "$$i" ]; then \ + echo "$$i -> $$i.CSW"; \ + mv "$$i" "$$i.CSW"; \ + fi \ + done) + (cd $(DESTDIR)/etc/opt/csw/init.d; \ + for i in smartd; do \ + if [ -r "$$i" ]; then \ + echo "$$i -> csw$$i"; \ + mv "$$i" "csw$$i"; \ + fi \ + done) + +include gar/category.mk Added: csw/mgar/pkg/smartmontools/trunk/checksums =================================================================== --- csw/mgar/pkg/smartmontools/trunk/checksums (rev 0) +++ csw/mgar/pkg/smartmontools/trunk/checksums 2008-12-28 13:34:11 UTC (rev 2706) @@ -0,0 +1,5 @@ +a282846532ecbd6b4a28072373b3a70b download/smartmontools-5.38.tar.gz +28e1281d77b7c5920cb90f4d6c97f7df download/CSWsmartmontools.gspec +307c061f168249834c527eeb8d6e0501 download/CSWsmartmontools.postinstall +e5586868ebec465f4b66d0da3c1eedda download/CSWsmartmontools.depend +9e07053388cfc10816db34c6053af0a9 download/CSWsmartmontools.prototype Added: csw/mgar/pkg/smartmontools/trunk/files/CSWsmartmontools.depend =================================================================== --- csw/mgar/pkg/smartmontools/trunk/files/CSWsmartmontools.depend (rev 0) +++ csw/mgar/pkg/smartmontools/trunk/files/CSWsmartmontools.depend 2008-12-28 13:34:11 UTC (rev 2706) @@ -0,0 +1,2 @@ +P CSWcommon +P CSWcswclassutils Added: csw/mgar/pkg/smartmontools/trunk/files/CSWsmartmontools.gspec =================================================================== --- csw/mgar/pkg/smartmontools/trunk/files/CSWsmartmontools.gspec (rev 0) +++ csw/mgar/pkg/smartmontools/trunk/files/CSWsmartmontools.gspec 2008-12-28 13:34:11 UTC (rev 2706) @@ -0,0 +1,4 @@ +%var bitname smartmontools +%var pkgname CSWsmartmontools +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKSRC}/COPYING Added: csw/mgar/pkg/smartmontools/trunk/files/CSWsmartmontools.postinstall =================================================================== --- csw/mgar/pkg/smartmontools/trunk/files/CSWsmartmontools.postinstall (rev 0) +++ csw/mgar/pkg/smartmontools/trunk/files/CSWsmartmontools.postinstall 2008-12-28 13:34:11 UTC (rev 2706) @@ -0,0 +1,3 @@ +if [ ! -f $BASEDIR/opt/csw/etc/smartd.conf ] ; then + cp $BASEDIR/opt/csw/etc/smartd.conf.CSW $BASEDIR/opt/csw/etc/smartd.conf +fi Added: csw/mgar/pkg/smartmontools/trunk/files/CSWsmartmontools.prototype =================================================================== --- csw/mgar/pkg/smartmontools/trunk/files/CSWsmartmontools.prototype (rev 0) +++ csw/mgar/pkg/smartmontools/trunk/files/CSWsmartmontools.prototype 2008-12-28 13:34:11 UTC (rev 2706) @@ -0,0 +1,30 @@ +d none /opt/csw/etc 0755 root bin +f none /opt/csw/etc/smartd.conf.CSW 0644 root bin +d none /opt/csw/sbin 0755 root bin +f none /opt/csw/sbin/smartctl 0755 root bin +f none /opt/csw/sbin/smartd 0755 root bin +d none /opt/csw/share 0755 root bin +d none /opt/csw/share/doc 0755 root bin +d none /opt/csw/share/doc/smartmontools 0755 root bin +f none /opt/csw/share/doc/smartmontools/AUTHORS 0644 root bin +f none /opt/csw/share/doc/smartmontools/CHANGELOG 0644 root bin +f none /opt/csw/share/doc/smartmontools/COPYING 0644 root bin +f none /opt/csw/share/doc/smartmontools/INSTALL 0644 root bin +f none /opt/csw/share/doc/smartmontools/NEWS 0644 root bin +f none /opt/csw/share/doc/smartmontools/README 0644 root bin +f none /opt/csw/share/doc/smartmontools/TODO 0644 root bin +f none /opt/csw/share/doc/smartmontools/WARNINGS 0644 root bin +d none /opt/csw/share/doc/smartmontools/examplescripts 0755 root bin +f none /opt/csw/share/doc/smartmontools/examplescripts/Example1 0755 root bin +f none /opt/csw/share/doc/smartmontools/examplescripts/Example2 0755 root bin +f none /opt/csw/share/doc/smartmontools/examplescripts/Example3 0755 root bin +f none /opt/csw/share/doc/smartmontools/examplescripts/Example4 0755 root bin +f none /opt/csw/share/doc/smartmontools/examplescripts/README 0644 root bin +f none /opt/csw/share/doc/smartmontools/smartd.conf 0644 root bin +d none /opt/csw/share/man 0755 root bin +d none /opt/csw/share/man/man1m 0755 root bin +f none /opt/csw/share/man/man1m/smartctl.1m 0644 root bin +f none /opt/csw/share/man/man1m/smartd.1m 0644 root bin +d none /opt/csw/share/man/man4 0755 root bin +f none /opt/csw/share/man/man4/smartd.conf.4 0644 root bin +f cswinitsmf /etc/opt/csw/init.d/cswsmartd 0755 root bin 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 Dec 28 14:37:59 2008 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 28 Dec 2008 13:37:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[2707] csw/mgar/pkg/syslog_ng/trunk Message-ID: Revision: 2707 http://gar.svn.sourceforge.net/gar/?rev=2707&view=rev Author: idogan23 Date: 2008-12-28 13:37:59 +0000 (Sun, 28 Dec 2008) Log Message: ----------- syslog_ng: fixed dependency to cswaclassutils Modified Paths: -------------- csw/mgar/pkg/syslog_ng/trunk/checksums csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.prototype Modified: csw/mgar/pkg/syslog_ng/trunk/checksums =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/checksums 2008-12-28 13:34:11 UTC (rev 2706) +++ csw/mgar/pkg/syslog_ng/trunk/checksums 2008-12-28 13:37:59 UTC (rev 2707) @@ -2,6 +2,6 @@ 6726e851fa8e6e6658584faaeaa6716d download/CSWsyslogng.gspec 3de835dbfde225227a1ed36f548e1d34 download/CSWsyslogng.postinstall bb5490a23e8480b6e9d625389885c346 download/CSWsyslogng.depend -a36e217b9ee103b28eb8946e6622a235 download/CSWsyslogng.prototype +d906b84aa704d887fc98179d49dd5db2 download/CSWsyslogng.prototype ae942a41cbdc6fb0f8a4438d7f5a00d5 download/syslog-ng.conf.CSW 168ce024423e8dbee8c1597d8a1ef3ef download/cswsyslog_ng Modified: csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.prototype =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.prototype 2008-12-28 13:34:11 UTC (rev 2706) +++ csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.prototype 2008-12-28 13:37:59 UTC (rev 2707) @@ -10,4 +10,4 @@ f none /opt/csw/share/man/man5/syslog-ng.conf.5 0644 root bin d none /opt/csw/share/man/man8 0755 root bin f none /opt/csw/share/man/man8/syslog-ng.8 0644 root bin -f none /etc/opt/csw/init.d/cswsyslog_ng 0755 root bin +f cswinitsmf /etc/opt/csw/init.d/cswsyslog_ng 0755 root bin 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 Dec 28 17:31:12 2008 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 28 Dec 2008 16:31:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[2708] csw/mgar/pkg Message-ID: Revision: 2708 http://gar.svn.sourceforge.net/gar/?rev=2708&view=rev Author: idogan23 Date: 2008-12-28 16:31:12 +0000 (Sun, 28 Dec 2008) Log Message: ----------- gnupg: initial commit Added Paths: ----------- csw/mgar/pkg/gnupg/ csw/mgar/pkg/gnupg/branches/ csw/mgar/pkg/gnupg/tags/ csw/mgar/pkg/gnupg/trunk/ csw/mgar/pkg/gnupg/trunk/Makefile csw/mgar/pkg/gnupg/trunk/checksums csw/mgar/pkg/gnupg/trunk/files/ csw/mgar/pkg/gnupg/trunk/files/CSWgnupg.depend csw/mgar/pkg/gnupg/trunk/files/CSWgnupg.gspec csw/mgar/pkg/gnupg/trunk/files/CSWgnupg.prototype Property changes on: csw/mgar/pkg/gnupg/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 Added: csw/mgar/pkg/gnupg/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnupg/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gnupg/trunk/Makefile 2008-12-28 16:31:12 UTC (rev 2708) @@ -0,0 +1,31 @@ +GARNAME = gnupg +GARVERSION = 1.4.9 +CATEGORIES = apps + +DESCRIPTION = RFC 2440 compliant tool for secure communication and data storage +define BLURB + GnuPG is a complete and free replacement for PGP. +endef + +MASTER_SITES = http://www.gnupg.org/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWgnupg, depend prototype) + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +UPSTREAM_MASTER_SITES = ftp://ftp.gnupg.org/gcrypt/gnupg/ + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-libcurl +CONFIGURE_ARGS += --with-ldap +CONFIGURE_ARGS += --with-zlib +CONFIGURE_ARGS += --with-bzip2 +CONFIGURE_ARGS += --with-readline +CONFIGURE_ARGS += --enable-threads=solaris + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/gnupg/trunk/checksums =================================================================== --- csw/mgar/pkg/gnupg/trunk/checksums (rev 0) +++ csw/mgar/pkg/gnupg/trunk/checksums 2008-12-28 16:31:12 UTC (rev 2708) @@ -0,0 +1,4 @@ +3537dedea45cc09e8d88d1ef4f774246 download/gnupg-1.4.9.tar.gz +7978eaabeceaa781a1600ede3a6d3f67 download/CSWgnupg.gspec +7c870727fcc4d65844d7ccca2d609cab download/CSWgnupg.depend +d403a353dd4eca4185b00f2cc80a17fd download/CSWgnupg.prototype Added: csw/mgar/pkg/gnupg/trunk/files/CSWgnupg.depend =================================================================== --- csw/mgar/pkg/gnupg/trunk/files/CSWgnupg.depend (rev 0) +++ csw/mgar/pkg/gnupg/trunk/files/CSWgnupg.depend 2008-12-28 16:31:12 UTC (rev 2708) @@ -0,0 +1,11 @@ +P CSWcommon +P CSWbzip2 +P CSWcurlrt +P CSWggettext +P CSWiconv +P CSWlibidn +P CSWoldaprt +P CSWosslrt +P CSWreadline +P CSWzlib +P CSWtexinfo Added: csw/mgar/pkg/gnupg/trunk/files/CSWgnupg.gspec =================================================================== --- csw/mgar/pkg/gnupg/trunk/files/CSWgnupg.gspec (rev 0) +++ csw/mgar/pkg/gnupg/trunk/files/CSWgnupg.gspec 2008-12-28 16:31:12 UTC (rev 2708) @@ -0,0 +1,4 @@ +%var bitname gnupg +%var pkgname CSWgnupg +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKSRC}/COPYING Added: csw/mgar/pkg/gnupg/trunk/files/CSWgnupg.prototype =================================================================== --- csw/mgar/pkg/gnupg/trunk/files/CSWgnupg.prototype (rev 0) +++ csw/mgar/pkg/gnupg/trunk/files/CSWgnupg.prototype 2008-12-28 16:31:12 UTC (rev 2708) @@ -0,0 +1,115 @@ +d none /opt/csw/bin 0755 root bin +f none /opt/csw/bin/gpg 0755 root bin +f none /opt/csw/bin/gpg-zip 0755 root bin +f none /opt/csw/bin/gpgsplit 0755 root bin +f none /opt/csw/bin/gpgv 0755 root bin +d none /opt/csw/libexec 0755 root bin +d none /opt/csw/libexec/gnupg 0755 root bin +f none /opt/csw/libexec/gnupg/gpgkeys_curl 0755 root bin +f none /opt/csw/libexec/gnupg/gpgkeys_finger 0755 root bin +f none /opt/csw/libexec/gnupg/gpgkeys_hkp 0755 root bin +f none /opt/csw/libexec/gnupg/gpgkeys_ldap 0755 root bin +d none /opt/csw/share 0755 root bin +d none /opt/csw/share/gnupg 0755 root bin +f none /opt/csw/share/gnupg/FAQ 0644 root bin +f none /opt/csw/share/gnupg/faq.html 0644 root bin +f none /opt/csw/share/gnupg/options.skel 0644 root bin +f none /opt/csw/share/info/gnupg1.info 0644 root bin +d none /opt/csw/share/locale 0755 root bin +d none /opt/csw/share/locale/be 0755 root bin +d none /opt/csw/share/locale/be/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/be/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/ca 0755 root bin +d none /opt/csw/share/locale/ca/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/ca/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/cs 0755 root bin +d none /opt/csw/share/locale/cs/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/cs/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/da 0755 root bin +d none /opt/csw/share/locale/da/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/da/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/de 0755 root bin +d none /opt/csw/share/locale/de/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/de/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/el 0755 root bin +d none /opt/csw/share/locale/el/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/el/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/en at boldquot 0755 root bin +d none /opt/csw/share/locale/en at boldquot/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/en at boldquot/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/en at quot 0755 root bin +d none /opt/csw/share/locale/en at quot/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/en at quot/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/eo 0755 root bin +d none /opt/csw/share/locale/eo/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/eo/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/es 0755 root bin +d none /opt/csw/share/locale/es/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/es/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/et 0755 root bin +d none /opt/csw/share/locale/et/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/et/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/fi 0755 root bin +d none /opt/csw/share/locale/fi/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/fi/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/fr 0755 root bin +d none /opt/csw/share/locale/fr/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/fr/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/gl 0755 root bin +d none /opt/csw/share/locale/gl/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/gl/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/hu 0755 root bin +d none /opt/csw/share/locale/hu/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/hu/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/id 0755 root bin +d none /opt/csw/share/locale/id/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/id/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/it 0755 root bin +d none /opt/csw/share/locale/it/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/it/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/ja 0755 root bin +d none /opt/csw/share/locale/ja/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/ja/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/nb 0755 root bin +d none /opt/csw/share/locale/nb/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/nb/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/nl 0755 root bin +d none /opt/csw/share/locale/nl/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/nl/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/pl 0755 root bin +d none /opt/csw/share/locale/pl/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/pl/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/pt 0755 root bin +d none /opt/csw/share/locale/pt/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/pt/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/pt_BR 0755 root bin +d none /opt/csw/share/locale/pt_BR/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/pt_BR/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/ro 0755 root bin +d none /opt/csw/share/locale/ro/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/ro/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/ru 0755 root bin +d none /opt/csw/share/locale/ru/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/ru/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/sk 0755 root bin +d none /opt/csw/share/locale/sk/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/sk/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/sv 0755 root bin +d none /opt/csw/share/locale/sv/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/sv/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/tr 0755 root bin +d none /opt/csw/share/locale/tr/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/tr/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/zh_CN 0755 root bin +d none /opt/csw/share/locale/zh_CN/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/zh_CN/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/zh_TW 0755 root bin +d none /opt/csw/share/locale/zh_TW/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/zh_TW/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/man 0755 root bin +d none /opt/csw/share/man/man1 0755 root bin +f none /opt/csw/share/man/man1/gpg.1 0644 root bin +f none /opt/csw/share/man/man1/gpg.ru.1 0644 root bin +f none /opt/csw/share/man/man1/gpgv.1 0644 root bin +d none /opt/csw/share/man/man7 0755 root bin +f none /opt/csw/share/man/man7/gnupg.7 0644 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Mon Dec 29 22:25:22 2008 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Mon, 29 Dec 2008 21:25:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[2709] csw/mgar/pkg Message-ID: Revision: 2709 http://gar.svn.sourceforge.net/gar/?rev=2709&view=rev Author: harpchad Date: 2008-12-29 21:25:20 +0000 (Mon, 29 Dec 2008) Log Message: ----------- Add meanwhile gar profile Added Paths: ----------- csw/mgar/pkg/meanwhile/ csw/mgar/pkg/meanwhile/branches/ csw/mgar/pkg/meanwhile/tags/ csw/mgar/pkg/meanwhile/trunk/ csw/mgar/pkg/meanwhile/trunk/Makefile csw/mgar/pkg/meanwhile/trunk/checksums csw/mgar/pkg/meanwhile/trunk/files/ csw/mgar/pkg/meanwhile/trunk/files/CSWmeanwhile.depend csw/mgar/pkg/meanwhile/trunk/files/CSWmeanwhile.gspec csw/mgar/pkg/meanwhile/trunk/files/CSWmeanwhile.prototype csw/mgar/pkg/meanwhile/trunk/files/doc_dir.patch csw/mgar/pkg/meanwhile/trunk/files/ft_fix.patch csw/mgar/pkg/meanwhile/trunk/files/presence_fix_v2.patch csw/mgar/pkg/meanwhile/trunk/files/status_timestamp_workaround.patch Property changes on: csw/mgar/pkg/meanwhile/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 Added: csw/mgar/pkg/meanwhile/trunk/Makefile =================================================================== --- csw/mgar/pkg/meanwhile/trunk/Makefile (rev 0) +++ csw/mgar/pkg/meanwhile/trunk/Makefile 2008-12-29 21:25:20 UTC (rev 2709) @@ -0,0 +1,33 @@ +GARNAME = meanwhile +GARVERSION = 1.0.2 +CATEGORIES = lib + +#Need to use either gcc or studio 12 with -features=extensions +GARCOMPILER = GNU + +DESCRIPTION = Open implementation of the lotus sametime community client +define BLURB + The Meanwhile project is an open implementation of the Lotus Sametime client protocol. The project provides a library written in C, a python module, and a Gaim plugin utilizing the library. +endef + +MASTER_SITES = $(SF_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWmeanwhile,depend prototype) +PATCHFILES += ft_fix.patch +PATCHFILES += presence_fix_v2.patch +PATCHFILES += status_timestamp_workaround.patch +PATCHFILES += doc_dir.patch + +#No tests +TEST_SCRIPTS = + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/meanwhile/trunk/checksums =================================================================== --- csw/mgar/pkg/meanwhile/trunk/checksums (rev 0) +++ csw/mgar/pkg/meanwhile/trunk/checksums 2008-12-29 21:25:20 UTC (rev 2709) @@ -0,0 +1,8 @@ +bf4ced109a367b4c5d71fe63c043270e download/meanwhile-1.0.2.tar.gz +5a1ed24a8d6778dcf79373a6b5d512db download/CSWmeanwhile.depend +16c8ea92ec1e7d763ab92aab8f7f6559 download/CSWmeanwhile.gspec +5d4bb9c3a21bec7f9eefa14db1bc1c03 download/CSWmeanwhile.prototype +85017081328f7ddd4968f6f6f18a55ec download/ft_fix.patch +7637b2f7dfe8ec2516dd6aa5f66d90c6 download/presence_fix_v2.patch +692c92e2a4e099b27a83667009e430f5 download/status_timestamp_workaround.patch +c1fdb077407e627ae8ed9b726f5b07ef download/doc_dir.patch Added: csw/mgar/pkg/meanwhile/trunk/files/CSWmeanwhile.depend =================================================================== --- csw/mgar/pkg/meanwhile/trunk/files/CSWmeanwhile.depend (rev 0) +++ csw/mgar/pkg/meanwhile/trunk/files/CSWmeanwhile.depend 2008-12-29 21:25:20 UTC (rev 2709) @@ -0,0 +1,5 @@ +P CSWggettext ggettext - GNU gettext +P CSWiconv libiconv - GNU iconv library +P CSWsunmath libsunmath - Sun maths library +P CSWglib2 glib2 - The low-level core lib for GNOME and GTK+ +P CSWgcc3corert gcc3corert - GNU C Compiler Run Time Added: csw/mgar/pkg/meanwhile/trunk/files/CSWmeanwhile.gspec =================================================================== --- csw/mgar/pkg/meanwhile/trunk/files/CSWmeanwhile.gspec (rev 0) +++ csw/mgar/pkg/meanwhile/trunk/files/CSWmeanwhile.gspec 2008-12-29 21:25:20 UTC (rev 2709) @@ -0,0 +1,4 @@ +%var bitname meanwhile +%var pkgname CSWmeanwhile +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKSRC}/LICENSE Added: csw/mgar/pkg/meanwhile/trunk/files/CSWmeanwhile.prototype =================================================================== --- csw/mgar/pkg/meanwhile/trunk/files/CSWmeanwhile.prototype (rev 0) +++ csw/mgar/pkg/meanwhile/trunk/files/CSWmeanwhile.prototype 2008-12-29 21:25:20 UTC (rev 2709) @@ -0,0 +1,278 @@ +d none /opt/csw/include 0755 root bin +d none /opt/csw/include/meanwhile 0755 root bin +f none /opt/csw/include/meanwhile/mw_message.h 0644 root bin +f none /opt/csw/include/meanwhile/mw_srvc_dir.h 0644 root bin +f none /opt/csw/include/meanwhile/mw_common.h 0644 root bin +f none /opt/csw/include/meanwhile/mw_error.h 0644 root bin +f none /opt/csw/include/meanwhile/mw_channel.h 0644 root bin +f none /opt/csw/include/meanwhile/mw_st_list.h 0644 root bin +f none /opt/csw/include/meanwhile/mw_session.h 0644 root bin +f none /opt/csw/include/meanwhile/mw_srvc_resolve.h 0644 root bin +f none /opt/csw/include/meanwhile/mw_srvc_place.h 0644 root bin +f none /opt/csw/include/meanwhile/mw_srvc_im.h 0644 root bin +f none /opt/csw/include/meanwhile/mw_srvc_aware.h 0644 root bin +f none /opt/csw/include/meanwhile/mw_service.h 0644 root bin +f none /opt/csw/include/meanwhile/mw_srvc_ft.h 0644 root bin +f none /opt/csw/include/meanwhile/mw_cipher.h 0644 root bin +f none /opt/csw/include/meanwhile/mw_srvc_store.h 0644 root bin +f none /opt/csw/include/meanwhile/mw_srvc_conf.h 0644 root bin +d none /opt/csw/share 0755 root bin +d none /opt/csw/share/doc 0755 root bin +d none /opt/csw/share/doc/meanwhile 0755 root bin +d none /opt/csw/share/doc/meanwhile/html 0755 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__srvc__store_8h-source.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__channel_8h.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_0x70.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_0x6c.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/todo.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_0x68.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwDirectoryMember.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__srvc__aware_8h.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwDirectoryHandler.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwAwareList.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwMsgChannelSend.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_0x74.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__util_8h-source.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwUserStatus.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__st__list_8h-source.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwCipherInstance.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__error_8h-source.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwServiceAware.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmw__datum.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwChannel.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwMsgAnnounce.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwServiceFileTransfer.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwConference.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_type.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwFileTransferHandler.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwConversation.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_0x64.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwServiceIm.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwUserItem.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwMsgHandshakeAck.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwSametimeUser.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/pages.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__srvc__store_8h.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_func.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwMsgHandshake.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwService.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwServicePlace.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__srvc__resolve_8h-source.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__cipher_8h.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__channel_8h-source.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__debug_8h.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_0x61.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwMsgLoginContinue.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__srvc__dir_8h-source.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwGetBuffer.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__session_8h-source.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwAddressBook.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__session_8h.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwStorage.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_0x65.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwEncryptAccept.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwAwareSnapshot.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__srvc__resolve_8h.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwServiceDirectory.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/doxygen.png 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwMsgSetPrivacyList.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/tab_r.gif 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__error_8h.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwPutBuffer.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwMsgLoginAck.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__service_8h-source.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwMsgAdmin.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwAwareHandler.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwEncryptItem.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/doxygen.css 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_0x6b.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__srvc__conf_8h.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_0x69.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwFileTransfer.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwChannelSet.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwCipher.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_0x75.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/files.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwImHandler.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__util_8h.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwIdBlock.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__srvc__im_8h.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwConferenceHandler.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwMsgSenseService.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/classes.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_0x63.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__srvc__ft_8h-source.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwSession.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__cipher_8h-source.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_defs.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_0x67.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwMsgChannelCreate.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwMessage.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_eval.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__srvc__conf_8h-source.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwServiceConference.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_0x73.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__srvc__im_8h-source.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwMsgChannelDestroy.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwEncryptOffer.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/functions_rela.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__common_8h.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__service_8h.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_0x77.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwDirectory.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwAwareAttribute.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/annotated.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__message_8h-source.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwResolveMatch.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwMsgChannelAccept.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwMsgLoginRedirect.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_0x6d.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/functions.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwAwareListHandler.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwPlaceHandler.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/functions_vars.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwMsgSetUserStatus.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/tab_l.gif 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwSametimeList.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_0x72.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_func_0x6d.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__srvc__place_8h-source.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwPlace.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/index.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/tab_b.gif 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwLoginInfo.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwOpaque.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_0x76.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwMsgLogin.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwMpi.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_enum.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__srvc__dir_8h.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_0x6e.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwAwareIdBlock.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/tabs.css 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_0x62.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwPrivacyInfo.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__common_8h-source.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwServiceStorage.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__srvc__place_8h.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwServiceResolve.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__srvc__aware_8h-source.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__srvc__ft_8h.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwSametimeGroup.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__st__list_8h.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_0x66.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__debug_8h-source.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwResolveResult.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__message_8h.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwSessionHandler.html 0644 root bin +d none /opt/csw/share/doc/meanwhile/latex 0755 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwConference.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwResolveResult.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwSametimeUser.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwIdBlock.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/mw__channel_8h.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/mw__srvc__store_8h.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwMsgAnnounce.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwSession.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/files.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwMsgLoginContinue.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwPlace.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/mw__common_8h.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwMsgChannelCreate.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwConferenceHandler.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/mw__cipher_8h.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwCipherInstance.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwMsgAdmin.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwDirectory.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/annotated.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/mw__srvc__resolve_8h.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwMpi.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/Makefile 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwMsgHandshake.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/mw__srvc__conf_8h.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwServiceStorage.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwAwareSnapshot.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwMsgLoginAck.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/mw__error_8h.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwService.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwDirectoryHandler.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwUserStatus.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwServiceConference.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwUserItem.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwSametimeList.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwDirectoryMember.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwPlaceHandler.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwServiceAware.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/mw__srvc__place_8h.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwFileTransfer.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwChannelSet.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/todo.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/mw__session_8h.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwAwareListHandler.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwFileTransferHandler.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwPutBuffer.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/FreeSans.ttf 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwMsgSetUserStatus.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwEncryptOffer.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwMsgSenseService.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/mw__util_8h.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/mw__srvc__ft_8h.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/mw__srvc__dir_8h.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/pages.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwLoginInfo.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwCipher.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwSametimeGroup.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/mw__message_8h.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwConversation.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwSessionHandler.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwMsgChannelSend.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwMsgSetPrivacyList.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwPrivacyInfo.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/mw__debug_8h.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/refman.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwOpaque.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwMsgChannelDestroy.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/mw__st__list_8h.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwAwareList.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwServiceDirectory.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwMsgLoginRedirect.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwImHandler.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/mw__srvc__aware_8h.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwServiceFileTransfer.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwChannel.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwResolveMatch.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwAwareHandler.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/mw__service_8h.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwMessage.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/mw__srvc__im_8h.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwAwareAttribute.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwMsgHandshakeAck.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwAwareIdBlock.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwEncryptAccept.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwEncryptItem.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/doxygen.sty 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwGetBuffer.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwStorage.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwAddressBook.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwServiceIm.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwServicePlace.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmw__datum.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwServiceResolve.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwMsgChannelAccept.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwMsgLogin.tex 0644 root bin +d none /opt/csw/share/doc/meanwhile/samples 0755 root bin +f none /opt/csw/share/doc/meanwhile/samples/nocipher_proxy.c 0644 root bin +f none /opt/csw/share/doc/meanwhile/samples/login_server.c 0644 root bin +f none /opt/csw/share/doc/meanwhile/samples/sendmessage.c 0644 root bin +f none /opt/csw/share/doc/meanwhile/samples/redirect_server.c 0644 root bin +f none /opt/csw/share/doc/meanwhile/samples/socket.c 0644 root bin +f none /opt/csw/share/doc/meanwhile/samples/build 0755 root bin +f none /opt/csw/share/doc/meanwhile/samples/README 0644 root bin +f none /opt/csw/share/doc/meanwhile/samples/logging_proxy.c 0644 root bin +d none /opt/csw/lib 0755 root bin +s none /opt/csw/lib/libmeanwhile.so=libmeanwhile.so.1.0.2 +f none /opt/csw/lib/libmeanwhile.so.1.0.2 0755 root bin +s none /opt/csw/lib/libmeanwhile.so.1=libmeanwhile.so.1.0.2 +d none /opt/csw/lib/pkgconfig 0755 root bin +f none /opt/csw/lib/pkgconfig/meanwhile.pc 0644 root bin Added: csw/mgar/pkg/meanwhile/trunk/files/doc_dir.patch =================================================================== --- csw/mgar/pkg/meanwhile/trunk/files/doc_dir.patch (rev 0) +++ csw/mgar/pkg/meanwhile/trunk/files/doc_dir.patch 2008-12-29 21:25:20 UTC (rev 2709) @@ -0,0 +1,68 @@ +diff -rud meanwhile-1.0.2.o/doc/Makefile.am meanwhile-1.0.2/doc/Makefile.am +--- meanwhile-1.0.2.o/doc/Makefile.am 2005-10-28 21:22:38.000000000 -0500 ++++ meanwhile-1.0.2/doc/Makefile.am 2008-12-29 13:37:18.400083313 -0600 +@@ -5,10 +5,10 @@ + if ENABLE_DOXYGEN + + htmldoc_DATA = html/* +-htmldocdir = $(datadir)/doc/@PACKAGE at -doc-@VERSION@/html ++htmldocdir = $(datadir)/doc/@PACKAGE@/html + + latexdoc_DATA = latex/* +-latexdocdir = $(datadir)/doc/@PACKAGE at -doc-@VERSION@/latex ++latexdocdir = $(datadir)/doc/@PACKAGE@@/latex + + docdata = $(htmldoc_DATA) $(latexdoc_DATA) + +diff -rud meanwhile-1.0.2.o/doc/Makefile.in meanwhile-1.0.2/doc/Makefile.in +--- meanwhile-1.0.2.o/doc/Makefile.in 2005-12-29 19:55:16.000000000 -0600 ++++ meanwhile-1.0.2/doc/Makefile.in 2008-12-29 13:37:18.398638856 -0600 +@@ -172,9 +172,9 @@ + target_alias = @target_alias@ + noinst_DATA = Doxyfile + @ENABLE_DOXYGEN_TRUE at htmldoc_DATA = html/* +- at ENABLE_DOXYGEN_TRUE@htmldocdir = $(datadir)/doc/@PACKAGE at -doc-@VERSION@/html ++ at ENABLE_DOXYGEN_TRUE@htmldocdir = $(datadir)/doc/@PACKAGE@/html + @ENABLE_DOXYGEN_TRUE at latexdoc_DATA = latex/* +- at ENABLE_DOXYGEN_TRUE@latexdocdir = $(datadir)/doc/@PACKAGE at -doc-@VERSION@/latex ++ at ENABLE_DOXYGEN_TRUE@latexdocdir = $(datadir)/doc/@PACKAGE@/latex + @ENABLE_DOXYGEN_TRUE at docdata = $(htmldoc_DATA) $(latexdoc_DATA) + all: all-am + +diff -rud meanwhile-1.0.2.o/meanwhile.spec.in meanwhile-1.0.2/meanwhile.spec.in +--- meanwhile-1.0.2.o/meanwhile.spec.in 2005-12-29 20:05:55.000000000 -0600 ++++ meanwhile-1.0.2/meanwhile.spec.in 2008-12-29 13:33:36.734731451 -0600 +@@ -89,7 +89,7 @@ + + %files doc + %defattr(-,root,root,-) +-%{_datadir}/doc/%{name}-doc-%{version}/ ++%{_datadir}/doc/%{name}/ + %endif + + +diff -rud meanwhile-1.0.2.o/samples/Makefile.am meanwhile-1.0.2/samples/Makefile.am +--- meanwhile-1.0.2.o/samples/Makefile.am 2008-12-29 13:59:26.003161765 -0600 ++++ meanwhile-1.0.2/samples/Makefile.am 2008-12-29 14:00:22.451646848 -0600 +@@ -19,7 +19,7 @@ + $(SAMPLES_SRC) + + +-sampledir = $(datadir)/doc/@PACKAGE at -doc-@VERSION@/samples ++sampledir = $(datadir)/doc/@PACKAGE@/samples + + + EXTRA_DIST = $(sample_DATA) $(sample_SCRIPTS) + +diff -rud meanwhile-1.0.2.o/samples/Makefile.in meanwhile-1.0.2/samples/Makefile.in +--- meanwhile-1.0.2.o/samples/Makefile.in 2008-12-29 14:03:42.998631273 -0600 ++++ meanwhile-1.0.2/samples/Makefile.in 2008-12-29 14:04:01.256144581 -0600 +@@ -188,7 +188,7 @@ + README \ + $(SAMPLES_SRC) + +-sampledir = $(datadir)/doc/@PACKAGE at -doc-@VERSION@/samples ++sampledir = $(datadir)/doc/@PACKAGE@/samples + EXTRA_DIST = $(sample_DATA) $(sample_SCRIPTS) + all: all-am + Added: csw/mgar/pkg/meanwhile/trunk/files/ft_fix.patch =================================================================== --- csw/mgar/pkg/meanwhile/trunk/files/ft_fix.patch (rev 0) +++ csw/mgar/pkg/meanwhile/trunk/files/ft_fix.patch 2008-12-29 21:25:20 UTC (rev 2709) @@ -0,0 +1,21 @@ +# User Mikael Berthe +# Date 1194544713 -3600 +Fix file transfers with recent Sametime servers + +It seems that the last guint32_get() fails when Meanwhile receives +the FT offer. +I think we can skip it -- works for me but I can't check it with an +older server. + +diff -r 4aabc56c0e5f src/srvc_ft.c +--- a/src/srvc_ft.c Tue Nov 06 11:46:26 2007 +0100 ++++ b/src/srvc_ft.c Thu Nov 08 18:58:33 2007 +0100 +@@ -142,7 +142,7 @@ static void recv_channelCreate(struct mw + mwString_get(b, &fnm); /* offered filename */ + mwString_get(b, &txt); /* offering message */ + guint32_get(b, &size); /* size of offered file */ +- guint32_get(b, &junk); /* unknown */ ++ /* guint32_get(b, &junk); */ /* unknown */ + /* and we just skip an unknown guint16 at the end */ + + b_err = mwGetBuffer_error(b); Added: csw/mgar/pkg/meanwhile/trunk/files/presence_fix_v2.patch =================================================================== --- csw/mgar/pkg/meanwhile/trunk/files/presence_fix_v2.patch (rev 0) +++ csw/mgar/pkg/meanwhile/trunk/files/presence_fix_v2.patch 2008-12-29 21:25:20 UTC (rev 2709) @@ -0,0 +1,41 @@ +# User Mikael Berthe +# Date 1194208892 -3600 +Fix Awareness Snapshots with recent Sametime servers + +With recent Sametime servers there seem to be 2 bytes +after the Snapshot Message Blocks. +This patch tries to use the end of block offset provided +by the server. + +diff -r be8d8f1d3ebc src/common.c +--- a/src/common.c Sun Nov 04 18:48:00 2007 +0100 ++++ b/src/common.c Tue Nov 06 11:46:26 2007 +0100 +@@ -878,23 +878,24 @@ gboolean mwAwareIdBlock_equal(const stru + /* 8.4.2.4 Snapshot */ + + void mwAwareSnapshot_get(struct mwGetBuffer *b, struct mwAwareSnapshot *idb) { +- guint32 junk; +- char *empty = NULL; ++ guint32 end_of_block; + + g_return_if_fail(b != NULL); + g_return_if_fail(idb != NULL); + +- guint32_get(b, &junk); ++ guint32_get(b, &end_of_block); + mwAwareIdBlock_get(b, &idb->id); + mwString_get(b, &idb->group); + gboolean_get(b, &idb->online); +- +- g_free(empty); + + if(idb->online) { + mwString_get(b, &idb->alt_id); + mwUserStatus_get(b, &idb->status); + mwString_get(b, &idb->name); ++ } ++ ++ if( b->ptr < b->buf + end_of_block ) { ++ mwGetBuffer_advance(b, b->buf + end_of_block - b->ptr); + } + } Added: csw/mgar/pkg/meanwhile/trunk/files/status_timestamp_workaround.patch =================================================================== --- csw/mgar/pkg/meanwhile/trunk/files/status_timestamp_workaround.patch (rev 0) +++ csw/mgar/pkg/meanwhile/trunk/files/status_timestamp_workaround.patch 2008-12-29 21:25:20 UTC (rev 2709) @@ -0,0 +1,19 @@ +# User Mikael Berthe +# Date 1195749751 -3600 +Fix Awareness status timestamps with recent Sametime clients + +For some reason the status timestamps I receive from people with a recent +Sametime client make no sense. This patch simply sets the timestamp to 0, +as I have no idea how to interpret these time values. + +diff -r 17977a4e7da1 -r e7601af90b31 src/common.c +--- a/src/common.c Thu Nov 08 18:58:33 2007 +0100 ++++ b/src/common.c Thu Nov 22 17:42:31 2007 +0100 +@@ -688,6 +688,9 @@ void mwUserStatus_get(struct mwGetBuffer + guint16_get(b, &stat->status); + guint32_get(b, &stat->time); + mwString_get(b, &stat->desc); ++ ++ // Quick'n ugly hack for recent Sametime clients ++ stat->time = 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 Dec 30 05:28:52 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 30 Dec 2008 04:28:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[2710] csw/mgar/pkg Message-ID: Revision: 2710 http://gar.svn.sourceforge.net/gar/?rev=2710&view=rev Author: bdwalton Date: 2008-12-30 04:28:48 +0000 (Tue, 30 Dec 2008) Log Message: ----------- docbook dsssl stub Added Paths: ----------- csw/mgar/pkg/docbook-style-dsssl/ csw/mgar/pkg/docbook-style-dsssl/branches/ csw/mgar/pkg/docbook-style-dsssl/tags/ csw/mgar/pkg/docbook-style-dsssl/trunk/ csw/mgar/pkg/docbook-style-dsssl/trunk/Makefile csw/mgar/pkg/docbook-style-dsssl/trunk/files/ csw/mgar/pkg/docbook-style-dsssl/trunk/files/CSWdocbookdsssl.gspec Property changes on: csw/mgar/pkg/docbook-style-dsssl/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/docbook-style-dsssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/docbook-style-dsssl/trunk/Makefile (rev 0) +++ csw/mgar/pkg/docbook-style-dsssl/trunk/Makefile 2008-12-30 04:28:48 UTC (rev 2710) @@ -0,0 +1,34 @@ +GARNAME = docbookdsssl +GARVERSION = 1.79 +PATCHLEVEL = 4.1 +CATEGORIES = xtra + +DESCRIPTION = Norman Walsh's modular stylesheets for DocBook +define BLURB +These DSSSL stylesheets allow to convert any DocBook document to another +printed (for example, RTF or PostScript) or online (for example, HTML) +format. They are highly customizable. +endef + +SF_PROJ = docbook +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = docbook-dsssl-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWdocbookdsssl,) + +REQUIRED_PKGS = CSWdocbookdtds CSWsgmlcommon CSWopenjade + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +#nothing to configure or test +CONFIGURE_SCRIPTS = +TEST_SCRIPTS = + +BUILD_ARGS = DESTDIR=$(DESTDIR) VERSION=$(GARVERSION)-$(PATCHLEVEL) +BUILD_ARGS += bindir=$(bindir) datadir=$(datadir) + +include gar/category.mk Added: csw/mgar/pkg/docbook-style-dsssl/trunk/files/CSWdocbookdsssl.gspec =================================================================== --- csw/mgar/pkg/docbook-style-dsssl/trunk/files/CSWdocbookdsssl.gspec (rev 0) +++ csw/mgar/pkg/docbook-style-dsssl/trunk/files/CSWdocbookdsssl.gspec 2008-12-30 04:28:48 UTC (rev 2710) @@ -0,0 +1,4 @@ +%var bitname docbookdsssl +%var pkgname CSWdocbookdsssl +%include url file://%{PKGLIB}/csw_dyndepend.gspec + 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 Dec 30 05:35:25 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 30 Dec 2008 04:35:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[2711] csw/mgar/pkg/docbook-style-dsssl/trunk Message-ID: Revision: 2711 http://gar.svn.sourceforge.net/gar/?rev=2711&view=rev Author: bdwalton Date: 2008-12-30 04:35:22 +0000 (Tue, 30 Dec 2008) Log Message: ----------- revert to gar1 (temporary); add checksums Added Paths: ----------- csw/mgar/pkg/docbook-style-dsssl/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/docbook-style-dsssl/trunk/ Property changes on: csw/mgar/pkg/docbook-style-dsssl/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 Added: csw/mgar/pkg/docbook-style-dsssl/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-style-dsssl/trunk/checksums (rev 0) +++ csw/mgar/pkg/docbook-style-dsssl/trunk/checksums 2008-12-30 04:35:22 UTC (rev 2711) @@ -0,0 +1,2 @@ +8459913bbd8a5724a6fe4b9ed5bab5af download/docbook-dsssl-1.79.tar.gz +a5f6d634639ce7d3259c07d0a68734da download/CSWdocbookdsssl.gspec 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 Dec 30 05:37:44 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 30 Dec 2008 04:37:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[2712] csw/mgar/pkg/docbook-style-dsssl/trunk/ Message-ID: Revision: 2712 http://gar.svn.sourceforge.net/gar/?rev=2712&view=rev Author: bdwalton Date: 2008-12-30 04:37:44 +0000 (Tue, 30 Dec 2008) Log Message: ----------- back to gar2 Property Changed: ---------------- csw/mgar/pkg/docbook-style-dsssl/trunk/ Property changes on: csw/mgar/pkg/docbook-style-dsssl/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Tue Dec 30 18:06:57 2008 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Tue, 30 Dec 2008 17:06:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[2713] csw/mgar/pkg Message-ID: Revision: 2713 http://gar.svn.sourceforge.net/gar/?rev=2713&view=rev Author: harpchad Date: 2008-12-30 17:06:57 +0000 (Tue, 30 Dec 2008) Log Message: ----------- Add gar profile for libgadu Added Paths: ----------- csw/mgar/pkg/libgadu/ csw/mgar/pkg/libgadu/branches/ csw/mgar/pkg/libgadu/tags/ csw/mgar/pkg/libgadu/trunk/ csw/mgar/pkg/libgadu/trunk/Makefile csw/mgar/pkg/libgadu/trunk/checksums csw/mgar/pkg/libgadu/trunk/files/ csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.depend csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.gspec csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.prototype Property changes on: csw/mgar/pkg/libgadu/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 Added: csw/mgar/pkg/libgadu/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgadu/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libgadu/trunk/Makefile 2008-12-30 17:06:57 UTC (rev 2713) @@ -0,0 +1,27 @@ +GARNAME = libgadu +GARVERSION = 1.8.2 +CATEGORIES = lib +SPKG_SOURCEURL = http://toxygen.net/libgadu + +#Need to use either gcc or studio 12 with -features=extensions +GARCOMPILER = GNU + +DESCRIPTION = Gadu-Gadu protocol implementation library + +MASTER_SITES = http://toxygen.net/libgadu/files/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWlibgadu,depend prototype) + +#No tests +TEST_SCRIPTS = + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/libgadu/trunk/checksums =================================================================== --- csw/mgar/pkg/libgadu/trunk/checksums (rev 0) +++ csw/mgar/pkg/libgadu/trunk/checksums 2008-12-30 17:06:57 UTC (rev 2713) @@ -0,0 +1,4 @@ +f64d4d0222c7adf37aed7a8ef98059a7 download/CSWlibgadu.depend +c5145da14173d6e111f8b45ef8510f3a download/CSWlibgadu.gspec +dff83971a51fe7177617fb3dbc749757 download/CSWlibgadu.prototype +1090f82f8a1bb99e9cdf5853188f625f download/libgadu-1.8.2.tar.gz Added: csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.depend =================================================================== --- csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.depend (rev 0) +++ csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.depend 2008-12-30 17:06:57 UTC (rev 2713) @@ -0,0 +1,2 @@ +P CSWosslrt openssl_rt - Openssl runtime libraries +P CSWgcc3corert gcc3corert - GNU C Compiler Run Time Added: csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.gspec =================================================================== --- csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.gspec (rev 0) +++ csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.gspec 2008-12-30 17:06:57 UTC (rev 2713) @@ -0,0 +1,4 @@ +%var bitname libgadu +%var pkgname CSWlibgadu +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKSRC}/COPYING Added: csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.prototype =================================================================== --- csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.prototype (rev 0) +++ csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.prototype 2008-12-30 17:06:57 UTC (rev 2713) @@ -0,0 +1,8 @@ +d none /opt/csw/lib 0755 root bin +d none /opt/csw/lib/pkgconfig 0755 root bin +f none /opt/csw/lib/pkgconfig/libgadu.pc 0644 root bin +s none /opt/csw/lib/libgadu.so.3=libgadu.so.3.9.0 +f none /opt/csw/lib/libgadu.so.3.9.0 0755 root bin +s none /opt/csw/lib/libgadu.so=libgadu.so.3.9.0 +d none /opt/csw/include 0755 root bin +f none /opt/csw/include/libgadu.h 0644 root bin 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 Dec 30 19:55:26 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 30 Dec 2008 18:55:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[2714] csw/mgar/pkg/docbook-style-dsssl/trunk Message-ID: Revision: 2714 http://gar.svn.sourceforge.net/gar/?rev=2714&view=rev Author: bdwalton Date: 2008-12-30 18:55:26 +0000 (Tue, 30 Dec 2008) Log Message: ----------- install works; set arch=all; patch in a Makefile to install files Modified Paths: -------------- csw/mgar/pkg/docbook-style-dsssl/trunk/Makefile csw/mgar/pkg/docbook-style-dsssl/trunk/checksums csw/mgar/pkg/docbook-style-dsssl/trunk/files/CSWdocbookdsssl.gspec Added Paths: ----------- csw/mgar/pkg/docbook-style-dsssl/trunk/files/add_makefile.patch Modified: csw/mgar/pkg/docbook-style-dsssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/docbook-style-dsssl/trunk/Makefile 2008-12-30 17:06:57 UTC (rev 2713) +++ csw/mgar/pkg/docbook-style-dsssl/trunk/Makefile 2008-12-30 18:55:26 UTC (rev 2714) @@ -14,6 +14,7 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = docbook-dsssl-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWdocbookdsssl,) +PATCHFILES = add_makefile.patch REQUIRED_PKGS = CSWdocbookdtds CSWsgmlcommon CSWopenjade @@ -24,11 +25,23 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = +tar-gz-extract-docbook-dsssl-$(GARVERSION).tar.gz: + @echo " ==> Extracting $(DOWNLOADDIR)/docbook-dsssl-$(GARVERSION).tar.gz" + @mkdir -p $(WORKSRC) + gzip -dc $(DOWNLOADDIR)/docbook-dsssl-$(GARVERSION).tar.gz | gtar $(TAR_ARGS) -xf - -C $(WORKSRC) --strip-components 1 + @$(MAKECOOKIE) + #nothing to configure or test CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = TEST_SCRIPTS = -BUILD_ARGS = DESTDIR=$(DESTDIR) VERSION=$(GARVERSION)-$(PATCHLEVEL) -BUILD_ARGS += bindir=$(bindir) datadir=$(datadir) +INSTALL_ARGS = DESTDIR=$(DESTDIR) VERSION=$(GARVERSION) +INSTALL_ARGS += bindir=$(bindir) datadir=$(datadir) +post-install-modulated: + @echo "Symlinking dsssl-stylesheets" + @(cd $(INSTALLISADIR)/$(datadir)/sgml/docbook; \ + ln -s dsssl-stylesheets-$(GARVERSION) dsssl-stylesheets ) + include gar/category.mk Modified: csw/mgar/pkg/docbook-style-dsssl/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-style-dsssl/trunk/checksums 2008-12-30 17:06:57 UTC (rev 2713) +++ csw/mgar/pkg/docbook-style-dsssl/trunk/checksums 2008-12-30 18:55:26 UTC (rev 2714) @@ -1,2 +1,3 @@ 8459913bbd8a5724a6fe4b9ed5bab5af download/docbook-dsssl-1.79.tar.gz -a5f6d634639ce7d3259c07d0a68734da download/CSWdocbookdsssl.gspec +02510cf81c864e00a76bcda6c479341b download/CSWdocbookdsssl.gspec +08e9e44df56f41c8f5f700114fe69b58 download/add_makefile.patch Modified: csw/mgar/pkg/docbook-style-dsssl/trunk/files/CSWdocbookdsssl.gspec =================================================================== --- csw/mgar/pkg/docbook-style-dsssl/trunk/files/CSWdocbookdsssl.gspec 2008-12-30 17:06:57 UTC (rev 2713) +++ csw/mgar/pkg/docbook-style-dsssl/trunk/files/CSWdocbookdsssl.gspec 2008-12-30 18:55:26 UTC (rev 2714) @@ -1,4 +1,5 @@ %var bitname docbookdsssl %var pkgname CSWdocbookdsssl +%var arch all %include url file://%{PKGLIB}/csw_dyndepend.gspec Added: csw/mgar/pkg/docbook-style-dsssl/trunk/files/add_makefile.patch =================================================================== --- csw/mgar/pkg/docbook-style-dsssl/trunk/files/add_makefile.patch (rev 0) +++ csw/mgar/pkg/docbook-style-dsssl/trunk/files/add_makefile.patch 2008-12-30 18:55:26 UTC (rev 2714) @@ -0,0 +1,55 @@ +--- /dev/null 2008-12-30 05:37:09.000000000 +0100 ++++ docbook-dsssl-1.79/Makefile 2008-12-30 05:40:27.256449575 +0100 +@@ -0,0 +1,52 @@ ++BINDIR = $(DESTDIR)/$(bindir) ++DEST = $(DESTDIR)/$(datadir)/sgml/docbook/dsssl-stylesheets-$(VERSION) ++DOCS = $(DESTDIR)/$(datadir)/doc/docbookdsssl-$(VERSION) ++ ++INSTALLDATA = ginstall -c -m 0644 ++INSTALLDIR = ginstall -c -m 0755 -d ++ ++all: install ++ ++install: install-bin install-dtd install-dsl install-img install-misc install-doc ++ ++install-doc: ++ $(INSTALLDIR) $(DOCS) ++ $(INSTALLDATA) BUGS ChangeLog README WhatsNew $(DOCS) ++ ++install-bin: ++ $(INSTALLDIR) $(BINDIR) ++ $(INSTALLDATA) bin/collateindex.pl $(BINDIR) ++ chmod 755 $(BINDIR)/* ++ ++install-dtd: ++ for d in decls dbdsssl html imagelib olink; do \ ++ $(INSTALLDIR) $(DEST)/dtds/$$d; \ ++ done ++ $(INSTALLDATA) dtds/decls/docbook.dcl $(DEST)/dtds/decls ++ $(INSTALLDATA) dtds/decls/xml.dcl $(DEST)/dtds/decls ++ $(INSTALLDATA) dtds/dbdsssl/dbdsssl.dtd $(DEST)/dtds/dbdsssl ++ $(INSTALLDATA) dtds/html/dbhtml.dtd $(DEST)/dtds/html ++ $(INSTALLDATA) dtds/html/ISOlat1.gml $(DEST)/dtds/html ++ $(INSTALLDATA) dtds/imagelib/imagelib.dtd $(DEST)/dtds/imagelib ++ $(INSTALLDATA) dtds/olink/olinksum.dtd $(DEST)/dtds/olink ++ ++install-dsl: ++ @for d in lib common html print olink; do \ ++ $(INSTALLDIR) $(DEST)/$$d; \ ++ done ++ $(INSTALLDATA) lib/dblib.dsl $(DEST)/lib ++ $(INSTALLDATA) common/*.dsl $(DEST)/common ++ $(INSTALLDATA) common/*.ent $(DEST)/common ++ $(INSTALLDATA) html/*.dsl $(DEST)/html ++ $(INSTALLDATA) lib/dblib.dsl $(DEST)/lib ++ $(INSTALLDATA) print/*.dsl $(DEST)/print ++ $(INSTALLDATA) olink/*.dsl $(DEST)/olink ++ ++install-img: ++ $(INSTALLDIR) $(DEST)/images/callouts ++ $(INSTALLDATA) images/*.gif $(DEST)/images ++ $(INSTALLDATA) images/callouts/*.gif $(DEST)/images/callouts ++ ++install-misc: ++ $(INSTALLDATA) catalog $(DEST) ++ $(INSTALLDATA) VERSION $(DEST) 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 Dec 30 20:06:08 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 30 Dec 2008 19:06:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[2715] csw/mgar/pkg/docbook-style-dsssl/trunk Message-ID: Revision: 2715 http://gar.svn.sourceforge.net/gar/?rev=2715&view=rev Author: bdwalton Date: 2008-12-30 19:06:08 +0000 (Tue, 30 Dec 2008) Log Message: ----------- added perl dependency; patch path in script that is installed; install manpage for script Modified Paths: -------------- csw/mgar/pkg/docbook-style-dsssl/trunk/Makefile csw/mgar/pkg/docbook-style-dsssl/trunk/checksums csw/mgar/pkg/docbook-style-dsssl/trunk/files/add_makefile.patch Added Paths: ----------- csw/mgar/pkg/docbook-style-dsssl/trunk/files/fix_perl_path.patch Modified: csw/mgar/pkg/docbook-style-dsssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/docbook-style-dsssl/trunk/Makefile 2008-12-30 18:55:26 UTC (rev 2714) +++ csw/mgar/pkg/docbook-style-dsssl/trunk/Makefile 2008-12-30 19:06:08 UTC (rev 2715) @@ -14,9 +14,9 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = docbook-dsssl-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWdocbookdsssl,) -PATCHFILES = add_makefile.patch +PATCHFILES = add_makefile.patch fix_perl_path.patch -REQUIRED_PKGS = CSWdocbookdtds CSWsgmlcommon CSWopenjade +REQUIRED_PKGS = CSWdocbookdtds CSWsgmlcommon CSWopenjade CSWperl # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz @@ -28,7 +28,7 @@ tar-gz-extract-docbook-dsssl-$(GARVERSION).tar.gz: @echo " ==> Extracting $(DOWNLOADDIR)/docbook-dsssl-$(GARVERSION).tar.gz" @mkdir -p $(WORKSRC) - gzip -dc $(DOWNLOADDIR)/docbook-dsssl-$(GARVERSION).tar.gz | gtar $(TAR_ARGS) -xf - -C $(WORKSRC) --strip-components 1 + @gzip -dc $(DOWNLOADDIR)/docbook-dsssl-$(GARVERSION).tar.gz | gtar $(TAR_ARGS) -xf - -C $(WORKSRC) --strip-components 1 @$(MAKECOOKIE) #nothing to configure or test Modified: csw/mgar/pkg/docbook-style-dsssl/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-style-dsssl/trunk/checksums 2008-12-30 18:55:26 UTC (rev 2714) +++ csw/mgar/pkg/docbook-style-dsssl/trunk/checksums 2008-12-30 19:06:08 UTC (rev 2715) @@ -1,3 +1,4 @@ 8459913bbd8a5724a6fe4b9ed5bab5af download/docbook-dsssl-1.79.tar.gz 02510cf81c864e00a76bcda6c479341b download/CSWdocbookdsssl.gspec -08e9e44df56f41c8f5f700114fe69b58 download/add_makefile.patch +0ef217556ebfc23d51bc90684464dd6e download/add_makefile.patch +bcd9c3faeba3e034152c26b489f2abcc download/fix_perl_path.patch Modified: csw/mgar/pkg/docbook-style-dsssl/trunk/files/add_makefile.patch =================================================================== --- csw/mgar/pkg/docbook-style-dsssl/trunk/files/add_makefile.patch 2008-12-30 18:55:26 UTC (rev 2714) +++ csw/mgar/pkg/docbook-style-dsssl/trunk/files/add_makefile.patch 2008-12-30 19:06:08 UTC (rev 2715) @@ -1,6 +1,6 @@ --- /dev/null 2008-12-30 05:37:09.000000000 +0100 +++ docbook-dsssl-1.79/Makefile 2008-12-30 05:40:27.256449575 +0100 -@@ -0,0 +1,52 @@ +@@ -0,0 +1,54 @@ +BINDIR = $(DESTDIR)/$(bindir) +DEST = $(DESTDIR)/$(datadir)/sgml/docbook/dsssl-stylesheets-$(VERSION) +DOCS = $(DESTDIR)/$(datadir)/doc/docbookdsssl-$(VERSION) @@ -15,6 +15,8 @@ +install-doc: + $(INSTALLDIR) $(DOCS) + $(INSTALLDATA) BUGS ChangeLog README WhatsNew $(DOCS) ++ $(INSTALLDIR) $(DESTDIR)/$(datadir)/man/man1 ++ $(INSTALLDATA) bin/collateindex.pl.1 $(DESTDIR)/$(datadir)/man/man1 + +install-bin: + $(INSTALLDIR) $(BINDIR) Added: csw/mgar/pkg/docbook-style-dsssl/trunk/files/fix_perl_path.patch =================================================================== --- csw/mgar/pkg/docbook-style-dsssl/trunk/files/fix_perl_path.patch (rev 0) +++ csw/mgar/pkg/docbook-style-dsssl/trunk/files/fix_perl_path.patch 2008-12-30 19:06:08 UTC (rev 2715) @@ -0,0 +1,8 @@ +--- docbookdsssl-1.79/bin/collateindex.pl.orig 2008-12-30 19:56:58.997386933 +0100 ++++ docbookdsssl-1.79/bin/collateindex.pl 2008-12-30 19:57:22.214915722 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -- # -*- Perl -*- ++#!/opt/csw/bin/perl -- # -*- Perl -*- + # + # $Id: collateindex.pl,v 1.10 2004/10/24 17:05:41 petere78 Exp $ + 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 Dec 30 21:59:54 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 30 Dec 2008 20:59:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[2716] csw/mgar/pkg/gtar/trunk Message-ID: Revision: 2716 http://gar.svn.sourceforge.net/gar/?rev=2716&view=rev Author: dmichelsen Date: 2008-12-30 20:59:53 +0000 (Tue, 30 Dec 2008) Log Message: ----------- gtar: Update to 1.21 Modified Paths: -------------- csw/mgar/pkg/gtar/trunk/Makefile csw/mgar/pkg/gtar/trunk/checksums Modified: csw/mgar/pkg/gtar/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtar/trunk/Makefile 2008-12-30 19:06:08 UTC (rev 2715) +++ csw/mgar/pkg/gtar/trunk/Makefile 2008-12-30 20:59:53 UTC (rev 2716) @@ -1,5 +1,5 @@ GARNAME = tar -GARVERSION = 1.20 +GARVERSION = 1.21 CATEGORIES = utils DESCRIPTION = GNU tape archiver Modified: csw/mgar/pkg/gtar/trunk/checksums =================================================================== --- csw/mgar/pkg/gtar/trunk/checksums 2008-12-30 19:06:08 UTC (rev 2715) +++ csw/mgar/pkg/gtar/trunk/checksums 2008-12-30 20:59:53 UTC (rev 2716) @@ -1,3 +1,3 @@ -c1a4ff43157ac60dd4b96dab09a3197c download/tar-1.20.tar.gz +e7ae56b3bf924d5108b57b544b247c50 download/tar-1.21.tar.gz ccf6b6c60769531581e94a45d24283be download/CSWgtar.gspec 5237ff9f4dbe4ec493425d4ffc5fc51a download/CSWgtar.depend This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Tue Dec 30 22:28:28 2008 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Tue, 30 Dec 2008 21:28:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[2717] csw/mgar/pkg Message-ID: Revision: 2717 http://gar.svn.sourceforge.net/gar/?rev=2717&view=rev Author: harpchad Date: 2008-12-30 21:28:28 +0000 (Tue, 30 Dec 2008) Log Message: ----------- Add gar profile for silctoolkit Added Paths: ----------- csw/mgar/pkg/silctoolkit/ csw/mgar/pkg/silctoolkit/branches/ csw/mgar/pkg/silctoolkit/tags/ csw/mgar/pkg/silctoolkit/trunk/ csw/mgar/pkg/silctoolkit/trunk/Makefile csw/mgar/pkg/silctoolkit/trunk/checksums csw/mgar/pkg/silctoolkit/trunk/files/ csw/mgar/pkg/silctoolkit/trunk/files/CSWsilctoolkit.gspec csw/mgar/pkg/silctoolkit/trunk/files/CSWsilctoolkit.prototype csw/mgar/pkg/silctoolkit/trunk/files/function.patch Property changes on: csw/mgar/pkg/silctoolkit/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 Added: csw/mgar/pkg/silctoolkit/trunk/Makefile =================================================================== --- csw/mgar/pkg/silctoolkit/trunk/Makefile (rev 0) +++ csw/mgar/pkg/silctoolkit/trunk/Makefile 2008-12-30 21:28:28 UTC (rev 2717) @@ -0,0 +1,28 @@ +GARNAME = silc-toolkit +GARVERSION = 1.1.8 +CATEGORIES = lib +SPKG_SOURCEURL = http://silcnet.org/software/download/toolkit/ + +DESCRIPTION = secure internet live conferencing toolkit +define BLURB + SILC Project develops the Secure Internet Live Conferencing protocol, which provides secure conferencing services. +endef + +MASTER_SITES = http://silcnet.org/download/toolkit/sources/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWsilctoolkit,prototype) +PATCHFILES += function.patch + +#No tests +TEST_SCRIPTS = + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/silctoolkit/trunk/checksums =================================================================== --- csw/mgar/pkg/silctoolkit/trunk/checksums (rev 0) +++ csw/mgar/pkg/silctoolkit/trunk/checksums 2008-12-30 21:28:28 UTC (rev 2717) @@ -0,0 +1,4 @@ +17915a1b0ad602fa31fff47f6bd7471b download/silc-toolkit-1.1.8.tar.gz +de3f8fbb54aacfa9f4f83938601ce676 download/CSWsilctoolkit.gspec +b73e637b218248a68cf955483ddb3085 download/CSWsilctoolkit.prototype +245879ba88f7159d1062e05307de9633 download/function.patch Added: csw/mgar/pkg/silctoolkit/trunk/files/CSWsilctoolkit.gspec =================================================================== --- csw/mgar/pkg/silctoolkit/trunk/files/CSWsilctoolkit.gspec (rev 0) +++ csw/mgar/pkg/silctoolkit/trunk/files/CSWsilctoolkit.gspec 2008-12-30 21:28:28 UTC (rev 2717) @@ -0,0 +1,4 @@ +%var bitname silctoolkit +%var pkgname CSWsilctoolkit +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKSRC}/COPYING Added: csw/mgar/pkg/silctoolkit/trunk/files/CSWsilctoolkit.prototype =================================================================== --- csw/mgar/pkg/silctoolkit/trunk/files/CSWsilctoolkit.prototype (rev 0) +++ csw/mgar/pkg/silctoolkit/trunk/files/CSWsilctoolkit.prototype 2008-12-30 21:28:28 UTC (rev 2717) @@ -0,0 +1,1593 @@ +d none /opt/csw/include 0755 root bin +f none /opt/csw/include/silcmessage_i.h 0644 root bin +f none /opt/csw/include/silcbuffmt.h 0644 root bin +f none /opt/csw/include/silcske_groups.h 0644 root bin +f none /opt/csw/include/silcber.h 0644 root bin +f none /opt/csw/include/silchmac.h 0644 root bin +f none /opt/csw/include/tma_class.h 0644 root bin +f none /opt/csw/include/silcattrs.h 0644 root bin +f none /opt/csw/include/tma_superclass.h 0644 root bin +f none /opt/csw/include/stacktrace.h 0644 root bin +f none /opt/csw/include/silccond.h 0644 root bin +f none /opt/csw/include/silcpubkey.h 0644 root bin +f none /opt/csw/include/silcnet.h 0644 root bin +f none /opt/csw/include/silcske_i.h 0644 root bin +f none /opt/csw/include/silcske.h 0644 root bin +f none /opt/csw/include/silcclient_entry.h 0644 root bin +f none /opt/csw/include/silcatomic.h 0644 root bin +f none /opt/csw/include/silcdlist.h 0644 root bin +f none /opt/csw/include/silcsocketstream.h 0644 root bin +f none /opt/csw/include/silcasn1_i.h 0644 root bin +f none /opt/csw/include/silcmode.h 0644 root bin +f none /opt/csw/include/silcstrutil.h 0644 root bin +f none /opt/csw/include/silcnotify.h 0644 root bin +f none /opt/csw/include/silcstack.h 0644 root bin +f none /opt/csw/include/silcfsm_i.h 0644 root bin +f none /opt/csw/include/silcskr.h 0644 root bin +f none /opt/csw/include/silcmutex.h 0644 root bin +f none /opt/csw/include/silcasync.h 0644 root bin +f none /opt/csw/include/mp_gmp.h 0644 root bin +f none /opt/csw/include/silcske_payload.h 0644 root bin +f none /opt/csw/include/silcidcache.h 0644 root bin +f none /opt/csw/include/silcargument.h 0644 root bin +f none /opt/csw/include/silcschedule.h 0644 root bin +f none /opt/csw/include/silcmime_i.h 0644 root bin +f none /opt/csw/include/silcconfig.h 0644 root bin +f none /opt/csw/include/silccommand.h 0644 root bin +f none /opt/csw/include/tma.h 0644 root bin +f none /opt/csw/include/silcfileutil.h 0644 root bin +f none /opt/csw/include/silcrng.h 0644 root bin +f none /opt/csw/include/silcutf8.h 0644 root bin +f none /opt/csw/include/client.h 0644 root bin +f none /opt/csw/include/silcsimutil.h 0644 root bin +f none /opt/csw/include/silcsim.h 0644 root bin +f none /opt/csw/include/silclog_i.h 0644 root bin +f none /opt/csw/include/silcbuffer.h 0644 root bin +f none /opt/csw/include/silcsocketstream_i.h 0644 root bin +f none /opt/csw/include/silcmemory.h 0644 root bin +f none /opt/csw/include/silcutil.h 0644 root bin +f none /opt/csw/include/silcasync_i.h 0644 root bin +f none /opt/csw/include/silcstringprep.h 0644 root bin +f none /opt/csw/include/silctime.h 0644 root bin +f none /opt/csw/include/silctypes.h 0644 root bin +f none /opt/csw/include/silcversion.h 0644 root bin +f none /opt/csw/include/silcskr_i.h 0644 root bin +f none /opt/csw/include/silcthread.h 0644 root bin +f none /opt/csw/include/silcfdstream.h 0644 root bin +f none /opt/csw/include/silcmp.h 0644 root bin +f none /opt/csw/include/silchttpphp.h 0644 root bin +f none /opt/csw/include/silcnet_i.h 0644 root bin +f none /opt/csw/include/silcmessage.h 0644 root bin +f none /opt/csw/include/silcmime.h 0644 root bin +f none /opt/csw/include/silcasn1.h 0644 root bin +f none /opt/csw/include/silcpk.h 0644 root bin +f none /opt/csw/include/silcclient.h 0644 root bin +f none /opt/csw/include/silcauth.h 0644 root bin +f none /opt/csw/include/silchashtable.h 0644 root bin +f none /opt/csw/include/silcchannel.h 0644 root bin +f none /opt/csw/include/silccipher.h 0644 root bin +f none /opt/csw/include/silc.h 0644 root bin +f none /opt/csw/include/silcid.h 0644 root bin +f none /opt/csw/include/silcsftp.h 0644 root bin +f none /opt/csw/include/silcsftp_fs.h 0644 root bin +f none /opt/csw/include/silchttpserver.h 0644 root bin +f none /opt/csw/include/silcpkcs1.h 0644 root bin +f none /opt/csw/include/silcsnprintf.h 0644 root bin +f none /opt/csw/include/silcschedule_i.h 0644 root bin +f none /opt/csw/include/silcpkcs.h 0644 root bin +f none /opt/csw/include/silclog.h 0644 root bin +f none /opt/csw/include/silcmath.h 0644 root bin +f none /opt/csw/include/mp_tma.h 0644 root bin +f none /opt/csw/include/silcstack_i.h 0644 root bin +f none /opt/csw/include/silcwin32.h 0644 root bin +f none /opt/csw/include/silcvcard.h 0644 root bin +f none /opt/csw/include/silcconnauth.h 0644 root bin +f none /opt/csw/include/silcsymbian.h 0644 root bin +f none /opt/csw/include/silcfsm.h 0644 root bin +f none /opt/csw/include/silcapputil.h 0644 root bin +f none /opt/csw/include/silcpacket.h 0644 root bin +f none /opt/csw/include/silcstatus.h 0644 root bin +f none /opt/csw/include/silclist.h 0644 root bin +f none /opt/csw/include/silchash.h 0644 root bin +f none /opt/csw/include/silcstream.h 0644 root bin +d none /opt/csw/share 0755 root bin +d none /opt/csw/share/doc 0755 root bin +d none /opt/csw/share/doc/silc-toolkit 0755 root bin +f none /opt/csw/share/doc/silc-toolkit/CREDITS 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/draft-riikonen-silc-multimedia-session-00.txt 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/TODO 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/draft-riikonen-silc-flags-payloads-04.txt 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/README.CVS 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/draft-riikonen-silc-spec-09.txt 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/draft-riikonen-silc-pp-09.txt 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/COPYING 0644 root bin +d none /opt/csw/share/doc/silc-toolkit/toolkit 0755 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmutex-silc_mutex_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-silc_hash_fingerprint.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccond-silc_cond_wait.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_inc16.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcClientFileMonitor.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-silc_auth_verify_data.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-SilcGetChannelCallback.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-silc_ske_get_security_properties.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_put_head.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_add_int8.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng_intro.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_command_pending.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfdstream.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_find_set_context.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccommand-SilcCommandPayload.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcdlist-SilcDList.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-SILC_ID_SERVER_COMPARE.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclientlib.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstrutil-silc_base_decode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_thread_init.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccipher-silc_cipher_get_iv.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_verify.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccipher-silc_cipher_register.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-silc_ske_parse_version.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_scopy.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_set_context.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcdlist-silc_dlist_del.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstrutil-silc_strncat.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_hash_string_compare.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_finish.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-silc_schedule_set_notify.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpubkey.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmath-silc_math_prime_test.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_senlarge.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_len.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_set_ui.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpk_i.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-silc_log_reset_callbacks.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcClientConnectionParams.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccond-silc_cond_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcchannel-silc_channel_payload_parse.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-SilcPacketError.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_private_message_wait_init.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconfig-SilcConfigCallback.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SILC_GET32_LSB.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_mp2bin_noalloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclist-silc_list_end.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-silc_attribute_get_data.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-silc_hash_unregister_all.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchttpserver.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_stream_is_udp.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_lstat.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-SilcClientID.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-silc_hash_table_add_ext.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-silc_auth_get_public_data.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutf8-silc_utf8_valid.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_data.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_salloc_size.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmemory-silc_srealloc_ua.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-silc_schedule_task_add_timeout.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmime.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_get_sender.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-SILC_STR_DATA.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_VISIBLE_STRING.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_dec16.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmode-ChannelUserModes.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-SilcFSMThreadStruct.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-silc_schedule_get_context.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-SilcTaskNotifyCb.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasync-SilcAsyncOperation.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_init32.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_get_int8.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng-silc_rng_global_uninit.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp_fs-silc_sftp_fs_memory_add_dir.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_push_tail.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccommand-silc_command_reply_payload_encode_vap.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil-silc_client_chumode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_load_public_key.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske_payload.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng-silc_rng_global_add_noise.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp_fs-silc_sftp_fs_memory_add_file.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccipher-silc_cipher_register_default.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclist-silc_list_init_prev.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcidcache-silc_idcache_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcargument-silc_argument_get_arg_num.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctime-silc_time_generalized_string.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcchannel.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-silc_attribute_payload_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcserver_params-silc_server_params_add_hash.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_get_engine.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcKeyAgreementCallback.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-SILC_ID_CLIENT_COMPARE.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_UNIVERSAL_STRING.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutf8-silc_utf8_encode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng-silc_rng_init.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccommand-silc_command_set_command.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_file_close.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconfig-SilcConfigFile.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-silc_log_set_callback.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_get_username.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp_fs-silc_sftp_fs_memory_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstatus.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_to_upper.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcdlist.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcserver-silc_server_run(1).html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcdlist-silc_dlist_end.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-SilcBufferUnformatFunc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmutex.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccipher-SilcCipher.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SILC_SWAB_32.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-SILC_FSM_EVENT_SIGNAL.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SilcUInt32.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfileutil.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfdstream-silc_fd_stream_create2.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_hash_utf8_compare.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-SilcSKERekeyMaterial.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstream-silc_stream_read.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil-silc_channel_name_verify.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-SilcBufferParamType.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-SilcHashTable.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_stream_set_iv_included.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_pow.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-SilcAtomicPointer.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-SilcAttributeFlags.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil-silc_show_public_key.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcClientMonitorStatus.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-silc_key_agreement_payload_encode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-silc_hash_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclist-silc_list_del.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_set_ids.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconnauth-silc_connauth_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_datalen.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsocketstream-SilcSocketStreamCallback.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-silc_log_set_debug_string.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_stream_is_valid.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstrutil.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-silc_id_id2str.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsocketstream-silc_socket_stream_get_error.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_ref_channel.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcber-silc_ber_encoded_len.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstream-silc_stream_set_notifier.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_perform_key_agreement_stream.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_hash_data_compare.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_stat.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac-SilcHmac.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_unlock_server.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-silc_asn1_init.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasync.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-silc_auth_public_key_auth_verify.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_unref_client.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_mul_2exp.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasync-silc_async_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcserver_params-silc_server_params_add_connparam.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/programming_conv.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SILC_GET16_MSB.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog_i.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmessage_i.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclist-silc_list_insert.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-silc_schedule_uninit.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcber-silc_ber_encode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcdh-silc_dh_compute_public.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng-silc_rng_get_rn16.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnotify-silc_notify_payload_encode_args.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-silc_id_get_len.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_event_init.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfileutil-silc_file_close.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp_fs-silc_sftp_fs_memory_del_file.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcChannelUser.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_client_start.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_realloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcvcard-silc_vcard_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_set_int16.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-silc_hash_table_get.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsocketstream-silc_socket_stream_set_info.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-SilcChannelEntry.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcClientConnectCallback.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcdlist-silc_dlist_init.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-silc_asn1_decode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske_groups-silc_ske_get_supported_groups.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske_payload-silc_ske_payload_ke_encode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-SilcPacketCallbacks.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-SilcSKEKeyMaterial.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_get_clients_whois.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac-silc_hmac_init.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-silc_auth_get_method.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-SilcTask.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmutex-silc_mutex_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm_i.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_public_key_compare.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_get_client_by_id.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac-silc_hmac_update.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-SilcIDPayload.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconnauth.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccond-silc_cond_signal.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_udp_send.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmemory-silc_scalloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-SilcHashForeach.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-silc_asn1_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/box2.gif 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs1.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_attributes_request.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmemory-silc_calloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsocketstream.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-SilcBufferFormatFunc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_sign.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_load_private_key.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-silc_attribute_payload_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchttpphp.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac-silc_hmac_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasync-silc_async_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-silc_schedule_wakeup.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet_i.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmime-silc_mime_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-silc_id_payload_get_data.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmessage-SilcMessageFlags.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-silc_log_flushdelay.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_del_private_message_key.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_set_context.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-silc_log_reset_all.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcserver_params-silc_server_params_set_serverinfo.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconnauth-silc_connauth_get_ske.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_get_channel_resolve.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_extended.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconfig.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-SilcSFTPHandle.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclist-SilcList.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_list_private_message_keys.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_del_channel_private_keys.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SILC_PUT32_LSB.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_alloc_size.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccond-SilcCond.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcAskPassphrase.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_truelen.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng-silc_rng_global_init.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_init.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_hash_public_key_compare.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-SilcServerID.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_wait.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_readlink.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-silc_attribute_payload_encode_data.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcvcard-silc_vcard_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcdlist-silc_dlist_count.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-silc_hash_make.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske_groups.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_BMP_STRING.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasync-silc_async_halt.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_free_private_message_keys.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmath.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpubkey-silc_public_key_payload_encode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-SilcNetResolveCallback.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcargument-silc_argument_get_first_arg.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-SilcAttributeDevice.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsocketstream-silc_socket_tcp_stream_create.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccipher-silc_cipher_get_iv_len.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac-silc_hmac_get_supported.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_to_lower.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_uninit16.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-silc_schedule_task_del_by_all.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_perform_key_agreement.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_set_keys.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcserver_params.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconnauth-silc_connauth_initiator.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_find_set_email.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-SilcAtomic16.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_event_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac-silc_hmac_make_truncated.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccipher-silc_cipher_get_supported.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-silc_buffer_unformat.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/index.tmpl 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_or.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil-silc_create_key_pair.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcidcache-silc_idcache_find_by_context.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac-silc_hmac_unregister_all.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SilcBool.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske_payload-silc_ske_payload_start_decode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctime-silc_time_value.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-SILC_FSM_YIELD.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_stream_destroy.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_gethostbyname_async.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_set_str.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-SILC_ID_GET_ID.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_find_set_realname.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-silc_hash_table_del_by_context.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_END.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcexample-SilcExampleType.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_mul.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-SilcSFTPHandleCallback.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfileutil-silc_file_readfile.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcidcache.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-SILC_FSM_THREAD_WAIT.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-silc_ske_rekey_initiator.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_gcdext.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-silc_key_agreement_get_hostname.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcchannel-silc_channel_get_id_parse.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-SilcSFTPAttributes.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-silc_id_payload_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng-silc_rng_global_get_rn16.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_rmdir.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp_fs-SilcSFTPFSMemoryPerm.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SILC_PTR_TO_32.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcidcache-silc_idcache_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_GEN_TIME.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchttplib.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmessage-silc_message_get_flags.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstrutil-silc_string_match.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_thread_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_add_public_key.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-SilcAuthMethod.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_SET_OF.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcber.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil-silc_channel_name_check.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-silc_ske_get_context.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-SILC_STRFMT_END.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-silc_hash_table_add.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_find_pkcs.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcdh.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_find_add_pkcs_type.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil-silc_load_key_pair.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_NUMERIC_STRING.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutf8-silc_utf8_w2c.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_unregister.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstream-SilcStream.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_unref_server.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_check_host_by_sock.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs1-SilcPkcs1BlockType.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_del_public_key.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_unlock_client.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/index_pic.gif 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-SILC_STR_*_INT.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_set.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-SilcID.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_unicode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmemory.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-SilcIdType.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_send_va.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_add_private_message_key.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstream-SilcStreamOps.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcchannel-silc_channel_get_mode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpk-silc_pkcs_silc_public_key_version.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconfig-silc_config_register.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SILC_PUT16_MSB.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-SilcSKEStatus.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmessage-silc_message_get_mac.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-SILC_ID_CHANNEL_COMPARE.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_pow_ui.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsnprintf-silc_vsnprintf.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_init8.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcPrivateMessageKeys.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-silc_schedule_get_fd_events.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_public_key_copy.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsocketstream_i.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-SilcSFTPErrorCallback.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske_groups-silc_ske_group_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil-silc_get_mode_list.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_del_channel_private_key.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctime-silc_usleep.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnotify-SilcNotifyType.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-silc_auth_public_key_auth_generate_wpub.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_pull_tail.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_push.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmode-SilcUserMode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_clone.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmutex-silc_rwlock_unlock.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccommand-silc_command_set_ident.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-SilcPacketEosCb.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftplib.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-silc_schedule_task_add_signal.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_run.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconfig-silc_config_read_current_line.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_save_private_key.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconfig-SilcConfigErrno.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstringprep-SilcStringprepFlags.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccommand-silc_command_payload_encode_vap.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_mod.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SilcUInt16.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-SilcKeyAgreementPayload.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcClientConnectionStatus.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_write.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_get_str.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_hash_id_compare.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-SilcSKESecurityPropertyFlag.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SILC_SWAB_16.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfdstream-silc_fd_stream_file.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmessage-silc_message_signed_get_public_key.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_SET.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-silc_hash_table_list_reset.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasync-SilcAsyncOperationStruct.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-SilcServerEntry.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-silc_ske_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_mod_2exp.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_send_ext.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcserver_params-silc_server_params_add_cipher.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_public_key_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcserver_params-silc_server_params_serverinfo_alloc(1).html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_is_ip.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-SilcAttributeObjGeo.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchttpphp-silc_http_php.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_fsetstat.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SILC_PTR_TO_64.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_BIT_STRING.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-silc_ske_rekey_responder.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfileutil-silc_file_writefile_mode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_start.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcidcache-SilcIDCacheEntry.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-silc_id_payload_parse.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutf8-silc_utf8_decoded_len.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_unregister_all.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_end.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcchannel-silc_channel_key_get_cipher.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-SilcBufferSUnformatFunc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcvcard-silc_vcard_encode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccipher-silc_cipher_set_key.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcidcache-silc_idcache_del_by_id.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclist-silc_list_init.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-SilcSFTPNameCallback.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcargument-silc_argument_payload_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccommand-silc_command_get_args.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_srealloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-silc_attribute_payload_encode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcaputillib.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_public_key_export.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccipher.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutf8.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnotify-silc_notify_payload_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcexample.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccommand.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-SILC_LOG_DEBUG.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_SEQUENCE.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmime-silc_mime_is_multipart.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconfig-silc_config_close.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpk-SilcSILCPrivateKey.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng-silc_rng_get_rn32.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/platforms.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SilcUInt8.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcvcard-SilcVCard.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcchannel-silc_channel_key_payload_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske_groups-silc_ske_group_get_by_number.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-SilcSFTP.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-silc_hash_block_len.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmime-silc_mime_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcber-SilcBerEncoding.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_inc32.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccommand-silc_command_payload_parse.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_tcp_create_listener.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsnprintf-silc_snprintf.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccommand-SilcCommandFlags.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsymbiansocketstream.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_IA5_STRING.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-silc_hash_alloc_by_oid.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsim.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcchannel-silc_channel_key_payload_encode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_va_copy.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_udp_receive.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcClientConnection.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconnauth-silc_connauth_responder.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstrutil-silc_base64_encode_file.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-silc_log_get_file.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-silc_hash_table_del_ext.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_fingerprint.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_send_key_agreement.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstringprep-silc_stringprep.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcdh-silc_dh_remote_public(1).html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcidcache-silc_idcache_add.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpk.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnotify-silc_notify_payload_parse.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmessage-silc_message_payload_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_add_channel_private_key.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclist.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-SILC_LOG_HEXDUMP.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccommand-silc_command_get.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccond-silc_cond_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfileutil-silc_file_read.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp_fs-silc_sftp_fs_memory_del_dir.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasync-SilcAsyncOperationPause.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-silc_hash_table_rehash.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchttpserver-silc_http_server_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-SilcSKEVerifyCb.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_hash_utf8_string.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil-silc_identifier_check.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-SilcNetStatus.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_read.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-SilcHashObject.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-silc_id_str2id.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_get_server_by_id.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-silc_hash_table_del_by_context_ext.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_format.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_put.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-silc_auth_payload_parse.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_private_key_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconfig-SilcConfigEntity.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpk-silc_pkcs_silc_encode_identifier.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-SILC_STR_BUFFER.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_div.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng-silc_rng_get_byte.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-SilcMPInt.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmessage-silc_message_payload_decrypt.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-silc_attribute_get_verify_data.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcserver_params-silc_server_params_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmemory-silc_smalloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp_fs.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_tcp_connect.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_server_start.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_abs.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccommand-silc_command_reply_payload_encode_va.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_next.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-silc_auth_verify.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_init16.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmemory-silc_malloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-silc_key_agreement_payload_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske_payload-SilcSKEStartPayload.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_get_state_context.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_list_channel_private_keys.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-SilcAtomic8.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_dec32.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_is_ip4.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcClientCommandReply.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_stream_wrap.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-SilcPacket.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstack-SilcStackFrame.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchttpserver-SilcHttpServer.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_init.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-silc_schedule_unset_listen_fd.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1_i.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs1_i.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-SILC_LOG_INFO.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctime-silc_compare_timeval.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmime-silc_mime_assemble.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_algorithm_register.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnotify.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_attribute_add.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_pow_mod_ui.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng-silc_rng_global_get_rn_string.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_div_2exp_qr.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_check_line.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconfig-silc_config_strerror.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-SilcPacketErrorCb.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-silc_hash_table_find_ext.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-SilcPKCSType.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_init.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_client_shutdown.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-SilcSKECompletionCb.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmime-silc_mime_get_field.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-SilcBuffer.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_continue_sync.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsnprintf.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-silc_schedule_task_del_by_callback.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_send_channel_message.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcthread-SilcThread.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfileutil-silc_file_open.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcserver_params-silc_server_params_add_admin.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconfig-silc_config_get_line.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctime.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-SilcPacketStream.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmutex-silc_rwlock_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs1-silc_pkcs1_encode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcClientMessageType.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/space.gif 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-SilcTaskEvent.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-SilcFSM.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_check_local_by_sock.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-SilcSKRFindCallback.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-silc_asn1_uninit.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng-silc_rng_global_get_rn32.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_sqrt.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcClientStopped.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-silc_hash_table_find_by_context.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_private_message_key_is_set.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_ANY_PRIMITIVE.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_OID.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_mod_ui.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil-silc_get_command_name.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconfig-silc_config_main.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-silc_log_reset_debug_callbacks.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_list_free_server.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmime-silc_mime_get_multiparts.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_get_socket_opt.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasync_i.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-silc_hash_unregister.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccipher-silc_cipher_get_name.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske_i.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsocketstream-silc_socket_udp_stream_create.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpk-SilcSILCPublicKey.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_list_free_channel.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/toolkit_index.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnotify-silc_notify_get_type.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-silc_attribute_payload_parse.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_enlarge.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-SILC_FSM_FINISH.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-SilcAttribute.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-SilcSKRStatus.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_server_set_monitor.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_bin2mp.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_div_2exp.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnotify-SilcNotifyPayload.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SilcUInt64.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-silc_buffer_sstrformat.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstream-SilcStreamStatus.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcidcache-silc_idcache_get_all.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-SilcSFTPStatusCallback.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmessage-silc_message_payload_parse.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-SilcAttributeObjPk.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-silc_log_flush_all.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_get_clients.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcargument-silc_argument_get_decoded.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-silc_hash_is_supported.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_hash_ptr.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-SilcClientEntry.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule_i.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-SilcPacketReceiveCb.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsimutil.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_taillen.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_start_sync.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_realpath.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcserver.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-SilcAttributePayload.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske_payload-SilcSKEKEPayload.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstringprep.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-SILC_LOG_ERROR.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_open.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_get_ids.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstream-SilcStreamNotifier.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconnauth-SilcConnectionType.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_salloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasync-silc_async_resume.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-SILC_STR_ADVANCE.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcexample-SilcExampleStruct.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_add.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcchannel-silc_channel_key_get_id.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_set_int32.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcidcache-silc_idcache_del_by_context.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_hash_id_compare_full.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmime-silc_mime_add_field.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/porting.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmime_i.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccond.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng-silc_rng_global_get_byte.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutf8-silc_utf8_encoded_len.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstream-silc_stream_close.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-silc_schedule_task_del.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-SILC_STR_OFFSET.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-silc_attribute_get_object.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_ANY.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccommand-silc_command_payload_encode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmessage.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstatus-silc_status_get_args.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_clear.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclist-silc_list_count.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcthread.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmime-silc_mime_encode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmime-silc_mime_assembler_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr_i.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutf8-silc_utf8_strcasecmp.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_wait_uninit.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng-silc_rng_get_rn_data.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_SEQUENCE_OF.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske_groups-silc_ske_group_get_by_name.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-silc_buffer_format_vp.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-silc_buffer_unformat_vp.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcvcard-silc_vcard_fprintf.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-silc_hash_init.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_set_pointer.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnotify-silc_notify_get_arg_num.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_close_listener.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_encrypt.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_unref_public_key.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconfig-SILC_CONFIG_CALLBACK.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcserver-SilcServerRunning.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-SILC_FSM_CALL.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-SilcPacketWrapCoder.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcClientFileName.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskrlib.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-silc_hash_table_replace.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstack.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_save_public_key.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmutex-silc_mutex_lock.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_sizeinbase.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_add_private_message_key_ske.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstream.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_cmp_si.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-silc_log_quick.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_GENERAL_STRING.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmemory-silc_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac-silc_hmac_make.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng-silc_rng_get_byte_fast.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_get_pkcs.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-SilcHash.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_realloc_size.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_hash_id.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmime-silc_mime_add_multipart.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstringprep-SilcStringprepStatus.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_hash_uint.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-SilcSchedule.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstack_i.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasync-silc_async_abort.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcargument.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-SilcPKCSFileEncoding.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp_fs-silc_sftp_fs_memory_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil-silc_client_chumode_char.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcClientFileAskName.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcidcache-silc_idcache_find_by_name_one.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcidcache-silc_idcache_find_by_id.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_opendir.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_OCTET_STRING.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccipher-silc_cipher_decrypt.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-SilcSKEParams.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-SilcAtomic32.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcthread-silc_thread_yield.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_uninit32.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SilcAsn1Struct.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcvcard.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcGetAuthMeth.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-silc_key_agreement_payload_parse.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-silc_hash_transform.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_set_int8.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_get_server.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-SilcSKRKey.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SilcInt32.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_get_machine.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_get_context.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfileutil-silc_file_open_mode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutf8-silc_utf8_strncasecmp.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil-silc_parse_version_string.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_wait_init.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-silc_id_payload_get_len.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_find_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcdlist-silc_dlist_get.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-SilcLogDebugCb.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1_i.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_steal.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs1_i.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_string_is_ascii.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-silc_hash_table_list.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-SILC_FSM_EVENT_TIMEDWAIT.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-SilcSKEPKType.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_stream_create.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_stop.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_stream_link.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_public_key_get_len.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-silc_id_payload_get_type.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcvcardlib.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_remove.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsnprintf-silc_asprintf.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_get_remote_port.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_fstat.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_get_context.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_listener_get_hostname.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-SilcSFTPStatus.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp_fs.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-SilcHashCompare.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclist-silc_list_add.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmath-silc_math_gen_prime.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-silc_buffer_sunformat_vp.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac-silc_hmac_make_with_key.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstream-silc_stream_destroy.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SILC_GET64_MSB.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctime-silc_time_generalized.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_add_int32.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-silc_id_dup.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconfig-silc_config_register_table.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclist.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_get_type.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-SilcSFTPVersionCallback.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil-silc_id_render.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_purge.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_cas16.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpk.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_set.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_is_started.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-silc_ske_free_rekey_material.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_attributes_get.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-SilcSFTPName.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-SilcBufferSFormatFunc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-SilcPacketFlags.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng-silc_rng_global_get_byte_fast.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctime-silc_timezone.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-FALSE.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil-silc_version_to_num.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_ref_public_key.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_init.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcdh-SilcDH.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmessage-silc_message_signed_verify.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-silc_ske_process_key_material_data.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_find_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-SilcFSMEvent.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil-silc_client_chmode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_find_set_username.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-SILC_ASSERT.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_close.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_mp2bin.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_reset.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-SilcFSMThread.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_accept_connection.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac-silc_hmac_get_hash.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsymbiansocketstream.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsim.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SILC_32_TO_PTR.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_uninit_pointer.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccipher.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstack-silc_stack_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutf8.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmemory-silc_sstrdup.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_private_key_get_len.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/zlib.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_sub_ui.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-silc_hash_table_find_foreach.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstrutil-silc_base64_encode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccommand-silc_command_payload_encode_payload.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-SilcSKR.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng-silc_rng_get_rn_string.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_sub_int32.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-SilcFSMEventStruct.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnotify-silc_notify_get_args.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcexample.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmime-silc_mime_set_multipart.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccommand.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-TRUE.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_sub.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcargument-silc_argument_payload_encode_one.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_setstat.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccipher-silc_cipher_get_mode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-silc_auth_payload_encode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-SILC_FSM_CONTINUE.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_add_public_key_simple.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcClientOperations.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SilcSocket.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-silc_ske_initiator.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_PRINTABLE_STRING.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac-silc_hmac_get_key.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_cas_pointer.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcthread-silc_thread_self.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-SilcIDIP.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-silc_ske_map_status.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-silc_hash_update.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcserver_params-silc_server_params_add_hmac.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_pow_mod.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcchannel-silc_channel_payload_encode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-silc_auth_public_key_auth_generate.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_nickname_format.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsocketstream-silc_socket_stream_is_udp.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmutex-silc_mutex_assert_locked.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcserver_params-silc_server_params_add_client.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-silc_auth_get_data.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsocketstream-SilcSocketStreamStatus.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/command_reply_args.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-silc_schedule_set_listen_fd.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_dec8.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_get_clients_local.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_hash_client_id_hash.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-SilcSFTPExtendedCallback.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-silc_id_payload_parse_id.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac-silc_hmac_register_default.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/box.gif 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-SilcSKRKeyUsage.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_get_client_by_id_resolve.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcdlist-silc_dlist_add.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac-silc_hmac_final.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-silc_buffer_format.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_get_int32.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-silc_hash_register.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_inc8.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_localip.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_div_ui.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctime-silc_gettimeofday.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-SilcPrivateKey.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsocketstream_i.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_lock_client.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutf8-silc_utf8_c2w.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-silc_hash_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcdh-silc_dh_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcvcard-silc_vcard_decode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp_fs-SilcSFTPFilesystemOps.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconnauth-SilcConnAuth.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_gethostbyaddr_async.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmemory-silc_srealloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_is_ip6.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_file_send.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil-silc_identifier_verify.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcdoc_xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclist-silc_list_get.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_register_default.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-silc_log_timestamp.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_nickname_parse.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcargument.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_get_error_string.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcthread-SilcThreadStart.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmime-silc_mime_decode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_SHORT_INT.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-SILC_FSM_EVENT_WAIT.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_register.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-SilcAttributeMood.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_uninit.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcvcard.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_public_key_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac-silc_hmac_is_supported.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcidcache-silc_idcache_update_by_context.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_get_keys.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchttpserver-silc_http_server_send.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_copy.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-silc_log_debug.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SilcInt8.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconnauth-silc_connauth_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_find_set_country.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmime-silc_mime_steal_data.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconfig-silc_config_get_filename.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_get_server_by_id_resolve.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcargument-silc_argument_list_parse_decoded.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_pull.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-SilcAttributeObjDevice.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SILC_PUT64_MSB.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_rename.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstream.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-silc_hash_final.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac-silc_hmac_register.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_localhost.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_stream_unref.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchttpserver-silc_http_server_send_error.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstack_i.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_continue.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcchannel-silc_channel_payload_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_get_algorithm.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_listener_get_ip.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccryptlib.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-silc_hash_table_del.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcthread-silc_thread_create.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-SILC_LOG_WARNING.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstack-silc_stack_pop.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcchannel-silc_channel_key_get_key.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_get_context.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-SilcFSMThreadDestructor.html 0644 root bin @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Tue Dec 30 23:21:47 2008 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Tue, 30 Dec 2008 22:21:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[2718] csw/mgar/pkg Message-ID: Revision: 2718 http://gar.svn.sourceforge.net/gar/?rev=2718&view=rev Author: harpchad Date: 2008-12-30 22:21:47 +0000 (Tue, 30 Dec 2008) Log Message: ----------- intltool: Initial commit Added Paths: ----------- csw/mgar/pkg/intltool/ csw/mgar/pkg/intltool/branches/ csw/mgar/pkg/intltool/tags/ csw/mgar/pkg/intltool/trunk/ csw/mgar/pkg/intltool/trunk/Makefile csw/mgar/pkg/intltool/trunk/checksums csw/mgar/pkg/intltool/trunk/files/ csw/mgar/pkg/intltool/trunk/files/CSWintltool.gspec Property changes on: csw/mgar/pkg/intltool/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 Added: csw/mgar/pkg/intltool/trunk/Makefile =================================================================== --- csw/mgar/pkg/intltool/trunk/Makefile (rev 0) +++ csw/mgar/pkg/intltool/trunk/Makefile 2008-12-30 22:21:47 UTC (rev 2718) @@ -0,0 +1,29 @@ +GARNAME = intltool +MAJOR_VER = 0.40 +MINOR_VER = 5 +GARVERSION = $(MAJOR_VER).$(MINOR_VER) +GNOME_SUBV = $(MAJOR_VER) +CATEGORIES = utils + +DESCRIPTION = A collection of tools for internationalization +define BLURB + The intltool package is a set of tools for translating the contents of data files using the gettext translation framework. +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWintltool,) + +#No tests +TEST_SCRIPTS = + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/intltool/trunk/checksums =================================================================== --- csw/mgar/pkg/intltool/trunk/checksums (rev 0) +++ csw/mgar/pkg/intltool/trunk/checksums 2008-12-30 22:21:47 UTC (rev 2718) @@ -0,0 +1,2 @@ +157e0570774dd76b59126d3908d5675f download/intltool-0.40.5.tar.gz +37feb95db3f5a2e184a2c45b254e2788 download/CSWintltool.gspec Added: csw/mgar/pkg/intltool/trunk/files/CSWintltool.gspec =================================================================== --- csw/mgar/pkg/intltool/trunk/files/CSWintltool.gspec (rev 0) +++ csw/mgar/pkg/intltool/trunk/files/CSWintltool.gspec 2008-12-30 22:21:47 UTC (rev 2718) @@ -0,0 +1,4 @@ +%var bitname intltool +%var pkgname CSWintltool +%include url file://%{PKGLIB}/csw_dyndepend.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 harpchad at users.sourceforge.net Tue Dec 30 23:39:19 2008 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Tue, 30 Dec 2008 22:39:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[2719] csw/mgar/pkg/intltool/trunk Message-ID: Revision: 2719 http://gar.svn.sourceforge.net/gar/?rev=2719&view=rev Author: harpchad Date: 2008-12-30 22:39:19 +0000 (Tue, 30 Dec 2008) Log Message: ----------- Add .depend Modified Paths: -------------- csw/mgar/pkg/intltool/trunk/Makefile csw/mgar/pkg/intltool/trunk/checksums Added Paths: ----------- csw/mgar/pkg/intltool/trunk/files/CSWintltool.depend Modified: csw/mgar/pkg/intltool/trunk/Makefile =================================================================== --- csw/mgar/pkg/intltool/trunk/Makefile 2008-12-30 22:21:47 UTC (rev 2718) +++ csw/mgar/pkg/intltool/trunk/Makefile 2008-12-30 22:39:19 UTC (rev 2719) @@ -12,7 +12,7 @@ MASTER_SITES = $(GNOME_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWintltool,) +DISTFILES += $(call admfiles,CSWintltool,depend) #No tests TEST_SCRIPTS = Modified: csw/mgar/pkg/intltool/trunk/checksums =================================================================== --- csw/mgar/pkg/intltool/trunk/checksums 2008-12-30 22:21:47 UTC (rev 2718) +++ csw/mgar/pkg/intltool/trunk/checksums 2008-12-30 22:39:19 UTC (rev 2719) @@ -1,2 +1,3 @@ 157e0570774dd76b59126d3908d5675f download/intltool-0.40.5.tar.gz 37feb95db3f5a2e184a2c45b254e2788 download/CSWintltool.gspec +fd19c6295f6211062d4e4cdd93bc3278 download/CSWintltool.depend Added: csw/mgar/pkg/intltool/trunk/files/CSWintltool.depend =================================================================== --- csw/mgar/pkg/intltool/trunk/files/CSWintltool.depend (rev 0) +++ csw/mgar/pkg/intltool/trunk/files/CSWintltool.depend 2008-12-30 22:39:19 UTC (rev 2719) @@ -0,0 +1 @@ +P CSWperl perl - A high-level, general-purpose programming language. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Tue Dec 30 23:54:19 2008 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Tue, 30 Dec 2008 22:54:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[2720] csw/mgar/pkg/intltool/trunk Message-ID: Revision: 2720 http://gar.svn.sourceforge.net/gar/?rev=2720&view=rev Author: harpchad Date: 2008-12-30 22:54:19 +0000 (Tue, 30 Dec 2008) Log Message: ----------- - Add prototype - Change to arch=all Modified Paths: -------------- csw/mgar/pkg/intltool/trunk/Makefile csw/mgar/pkg/intltool/trunk/checksums csw/mgar/pkg/intltool/trunk/files/CSWintltool.gspec Added Paths: ----------- csw/mgar/pkg/intltool/trunk/files/CSWintltool.prototype Modified: csw/mgar/pkg/intltool/trunk/Makefile =================================================================== --- csw/mgar/pkg/intltool/trunk/Makefile 2008-12-30 22:39:19 UTC (rev 2719) +++ csw/mgar/pkg/intltool/trunk/Makefile 2008-12-30 22:54:19 UTC (rev 2720) @@ -12,7 +12,7 @@ MASTER_SITES = $(GNOME_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWintltool,depend) +DISTFILES += $(call admfiles,CSWintltool,depend prototype) #No tests TEST_SCRIPTS = Modified: csw/mgar/pkg/intltool/trunk/checksums =================================================================== --- csw/mgar/pkg/intltool/trunk/checksums 2008-12-30 22:39:19 UTC (rev 2719) +++ csw/mgar/pkg/intltool/trunk/checksums 2008-12-30 22:54:19 UTC (rev 2720) @@ -1,3 +1,4 @@ 157e0570774dd76b59126d3908d5675f download/intltool-0.40.5.tar.gz -37feb95db3f5a2e184a2c45b254e2788 download/CSWintltool.gspec fd19c6295f6211062d4e4cdd93bc3278 download/CSWintltool.depend +792a4a570fa86f7a275114b99fc9adbe download/CSWintltool.gspec +7ea28b8cc2a8f3179d50cd2a5c66c04e download/CSWintltool.prototype Modified: csw/mgar/pkg/intltool/trunk/files/CSWintltool.gspec =================================================================== --- csw/mgar/pkg/intltool/trunk/files/CSWintltool.gspec 2008-12-30 22:39:19 UTC (rev 2719) +++ csw/mgar/pkg/intltool/trunk/files/CSWintltool.gspec 2008-12-30 22:54:19 UTC (rev 2720) @@ -1,4 +1,5 @@ %var bitname intltool %var pkgname CSWintltool +%var arch all %include url file://%{PKGLIB}/csw_dyndepend.gspec %copyright url file://%{WORKSRC}/COPYING Added: csw/mgar/pkg/intltool/trunk/files/CSWintltool.prototype =================================================================== --- csw/mgar/pkg/intltool/trunk/files/CSWintltool.prototype (rev 0) +++ csw/mgar/pkg/intltool/trunk/files/CSWintltool.prototype 2008-12-30 22:54:19 UTC (rev 2720) @@ -0,0 +1,16 @@ +d none /opt/csw/bin 0755 root bin +f none /opt/csw/bin/intltool-extract 0755 root bin +f none /opt/csw/bin/intltool-merge 0755 root bin +f none /opt/csw/bin/intltool-prepare 0755 root bin +f none /opt/csw/bin/intltool-update 0755 root bin +f none /opt/csw/bin/intltoolize 0755 root bin +d none /opt/csw/share/aclocal 0755 root bin +f none /opt/csw/share/aclocal/intltool.m4 0644 root bin +d none /opt/csw/share/intltool 0755 root bin +f none /opt/csw/share/intltool/Makefile.in.in 0644 root bin +d none /opt/csw/share/man/man8 0755 root bin +f none /opt/csw/share/man/man8/intltool-extract.8 0644 root bin +f none /opt/csw/share/man/man8/intltool-merge.8 0644 root bin +f none /opt/csw/share/man/man8/intltool-prepare.8 0644 root bin +f none /opt/csw/share/man/man8/intltool-update.8 0644 root bin +f none /opt/csw/share/man/man8/intltoolize.8 0644 root bin 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 Dec 31 14:35:13 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 31 Dec 2008 13:35:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[2721] csw/mgar/pkg/docbook-style-dsssl/trunk Message-ID: Revision: 2721 http://gar.svn.sourceforge.net/gar/?rev=2721&view=rev Author: bdwalton Date: 2008-12-31 13:35:12 +0000 (Wed, 31 Dec 2008) Log Message: ----------- added a postinstall script; still need preremove Modified Paths: -------------- csw/mgar/pkg/docbook-style-dsssl/trunk/Makefile csw/mgar/pkg/docbook-style-dsssl/trunk/checksums Added Paths: ----------- csw/mgar/pkg/docbook-style-dsssl/trunk/files/CSWdocbookdsssl.postinstall Modified: csw/mgar/pkg/docbook-style-dsssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/docbook-style-dsssl/trunk/Makefile 2008-12-30 22:54:19 UTC (rev 2720) +++ csw/mgar/pkg/docbook-style-dsssl/trunk/Makefile 2008-12-31 13:35:12 UTC (rev 2721) @@ -13,7 +13,7 @@ SF_PROJ = docbook MASTER_SITES = $(SF_MIRRORS) DISTFILES = docbook-dsssl-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWdocbookdsssl,) +DISTFILES += $(call admfiles,CSWdocbookdsssl,postinstall) PATCHFILES = add_makefile.patch fix_perl_path.patch REQUIRED_PKGS = CSWdocbookdtds CSWsgmlcommon CSWopenjade CSWperl Modified: csw/mgar/pkg/docbook-style-dsssl/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-style-dsssl/trunk/checksums 2008-12-30 22:54:19 UTC (rev 2720) +++ csw/mgar/pkg/docbook-style-dsssl/trunk/checksums 2008-12-31 13:35:12 UTC (rev 2721) @@ -1,4 +1,5 @@ 8459913bbd8a5724a6fe4b9ed5bab5af download/docbook-dsssl-1.79.tar.gz 02510cf81c864e00a76bcda6c479341b download/CSWdocbookdsssl.gspec +ca3151dd10e081a972d51cd1421ec933 download/CSWdocbookdsssl.postinstall 0ef217556ebfc23d51bc90684464dd6e download/add_makefile.patch bcd9c3faeba3e034152c26b489f2abcc download/fix_perl_path.patch Added: csw/mgar/pkg/docbook-style-dsssl/trunk/files/CSWdocbookdsssl.postinstall =================================================================== --- csw/mgar/pkg/docbook-style-dsssl/trunk/files/CSWdocbookdsssl.postinstall (rev 0) +++ csw/mgar/pkg/docbook-style-dsssl/trunk/files/CSWdocbookdsssl.postinstall 2008-12-31 13:35:12 UTC (rev 2721) @@ -0,0 +1,38 @@ +#!/bin/sh + +PATH=/opt/csw/bin:$PATH +export PATH + +case "$PKG_INSTALL_ROOT" in + ""|"/") PREFIX= ;; + *) PREFIX="chroot $PKG_INSTALL_ROOT";; +esac + +# set SGML_BASE_DIR and SGML_CATALOGS_DIR +. `$PKG_INSTALL_ROOT/opt/csw/bin/sgmlwhich` + +dsssldir=$SGML_BASE_DIR/docbook/dsssl-stylesheets +ojadedir=`$PREFIX echo $SGML_BASE_DIR/openjade-*` + +rel=`echo $PKG_INSTALL_ROOT/$SGML_CATALOGS_DIR/sgml-docbook-3.0-*.cat | sed 's#.*-##; s/\.cat//'` + +#clean up _any_ old entries +for cat in $PKG_INSTALL_ROOT/$SGML_CATALOGS_DIR/*-docbook-*.cat; do + if [ "x$PKG_INSTALL_ROOT" != "x" ]; then + cat=`echo $cat | sed "s#$PKG_INSTALL_ROOT##"` + fi + catalog=`echo $cat | sed 's#//#/#g'` + + echo $PREFIX install-catalog --remove $catalog $dsssldir/catalog +done + +#add new entries for the current release of the docbook dtds. +for cat in $PKG_INSTALL_ROOT/$SGML_CATALOGS_DIR/*-docbook-*$rel.cat; do + if [ "x$PKG_INSTALL_ROOT" != "x" ]; then + cat=`echo $cat | sed "s#$PKG_INSTALL_ROOT##; s#//#/#g"` + fi + catalog=`echo $cat | sed 's#//#/#g'` + + echo $PREFIX install-catalog --add $catalog $ojadedir/catalog + echo $PREFIX install-catalog --add $catalog $dsssldir/catalog +done \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Wed Dec 31 18:47:52 2008 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Wed, 31 Dec 2008 17:47:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[2722] csw/mgar/pkg/curl/trunk Message-ID: Revision: 2722 http://gar.svn.sourceforge.net/gar/?rev=2722&view=rev Author: harpchad Date: 2008-12-31 17:47:52 +0000 (Wed, 31 Dec 2008) Log Message: ----------- - Update for curl 7.19.2 - Seperate into the two currently offered packages (CSWcurl, CSWcurlrt) Modified Paths: -------------- csw/mgar/pkg/curl/trunk/Makefile csw/mgar/pkg/curl/trunk/checksums csw/mgar/pkg/curl/trunk/files/CSWcurl.gspec Added Paths: ----------- csw/mgar/pkg/curl/trunk/files/CSWcurl.depend csw/mgar/pkg/curl/trunk/files/CSWcurl.prototype csw/mgar/pkg/curl/trunk/files/CSWcurlrt.depend csw/mgar/pkg/curl/trunk/files/CSWcurlrt.gspec csw/mgar/pkg/curl/trunk/files/CSWcurlrt.prototype Modified: csw/mgar/pkg/curl/trunk/Makefile =================================================================== --- csw/mgar/pkg/curl/trunk/Makefile 2008-12-31 13:35:12 UTC (rev 2721) +++ csw/mgar/pkg/curl/trunk/Makefile 2008-12-31 17:47:52 UTC (rev 2722) @@ -1,5 +1,5 @@ GARNAME = curl -GARVERSION = 7.15.3 +GARVERSION = 7.19.2 CATEGORIES = net DESCRIPTION = Command line tool and library for client-side URL transfers. @@ -15,7 +15,8 @@ MASTER_SITES = http://curl.haxx.se/download/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += $(call admfiles,CSWcurl,) +DISTFILES += $(call admfiles,CSWcurl,prototype depend) +DISTFILES += $(call admfiles,CSWcurlrt,prototype depend) # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 Modified: csw/mgar/pkg/curl/trunk/checksums =================================================================== --- csw/mgar/pkg/curl/trunk/checksums 2008-12-31 13:35:12 UTC (rev 2721) +++ csw/mgar/pkg/curl/trunk/checksums 2008-12-31 17:47:52 UTC (rev 2722) @@ -1,2 +1,7 @@ -d71b2ee8febfde2c7dc30a43638ec0d9 download/curl-7.15.3.tar.bz2 -1436ae206adad60b90563d6e34405693 download/CSWcurl.gspec +3a461b145a4a31fe7d5a44684e7fbdbc download/curl-7.19.2.tar.bz2 +6ca086ce31b3036a315f9d29ac648056 download/CSWcurl.depend +a5a35282d48619f9a94d768b3bb5a525 download/CSWcurl.gspec +2c5cb969b0409caa925504686cefe0df download/CSWcurl.prototype +5b7397f8f7cab315bec471d05c7f5036 download/CSWcurlrt.gspec +49c05ba155f955632e624f08b076de51 download/CSWcurlrt.prototype +7298b0ca5c36e82d12cb46cd9fc621dc download/CSWcurlrt.depend Added: csw/mgar/pkg/curl/trunk/files/CSWcurl.depend =================================================================== --- csw/mgar/pkg/curl/trunk/files/CSWcurl.depend (rev 0) +++ csw/mgar/pkg/curl/trunk/files/CSWcurl.depend 2008-12-31 17:47:52 UTC (rev 2722) @@ -0,0 +1,9 @@ +P CSWcommon common - common files and dirs for CSW packages +P CSWiconv libiconv - GNU iconv library +P CSWlibidn libidn - Implementation of the Stringprep, Punycode and IDNA +P CSWlibnet libnet - the libnet packet construction library +P CSWoldaprt openldap_rt - OpenLDAP runtime libraries (oldaprt) +P CSWosslrt openssl_rt - Openssl runtime libraries +P CSWsasl sasl - Simple Authentication and Security Layer +P CSWzlib zlib - Zlib Data Compression Library +P CSWcurlrt curlrt - Library for common Internet protocols Runtime Modified: csw/mgar/pkg/curl/trunk/files/CSWcurl.gspec =================================================================== --- csw/mgar/pkg/curl/trunk/files/CSWcurl.gspec 2008-12-31 13:35:12 UTC (rev 2721) +++ csw/mgar/pkg/curl/trunk/files/CSWcurl.gspec 2008-12-31 17:47:52 UTC (rev 2722) @@ -1,4 +1,4 @@ %var bitname curl %var pkgname CSWcurl %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYRIGHT +%copyright url file://%{WORKSRC}/COPYING Added: csw/mgar/pkg/curl/trunk/files/CSWcurl.prototype =================================================================== --- csw/mgar/pkg/curl/trunk/files/CSWcurl.prototype (rev 0) +++ csw/mgar/pkg/curl/trunk/files/CSWcurl.prototype 2008-12-31 17:47:52 UTC (rev 2722) @@ -0,0 +1,5 @@ +d none /opt/csw/bin 0755 root bin +f none /opt/csw/bin/curl 0755 root bin +d none /opt/csw/share/man 0755 root bin +d none /opt/csw/share/man/man1 0755 root bin +f none /opt/csw/share/man/man1/curl.1 0644 root bin Added: csw/mgar/pkg/curl/trunk/files/CSWcurlrt.depend =================================================================== --- csw/mgar/pkg/curl/trunk/files/CSWcurlrt.depend (rev 0) +++ csw/mgar/pkg/curl/trunk/files/CSWcurlrt.depend 2008-12-31 17:47:52 UTC (rev 2722) @@ -0,0 +1,4 @@ +P CSWlibidn libidn - Implementation of the Stringprep, Punycode and IDNA +P CSWoldaprt openldap_rt - OpenLDAP runtime libraries (oldaprt) +P CSWosslrt openssl_rt - Openssl runtime libraries +P CSWzlib zlib - Zlib Data Compression Library Added: csw/mgar/pkg/curl/trunk/files/CSWcurlrt.gspec =================================================================== --- csw/mgar/pkg/curl/trunk/files/CSWcurlrt.gspec (rev 0) +++ csw/mgar/pkg/curl/trunk/files/CSWcurlrt.gspec 2008-12-31 17:47:52 UTC (rev 2722) @@ -0,0 +1,4 @@ +%var bitname curlrt +%var pkgname CSWcurlrt +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKSRC}/COPYING Added: csw/mgar/pkg/curl/trunk/files/CSWcurlrt.prototype =================================================================== --- csw/mgar/pkg/curl/trunk/files/CSWcurlrt.prototype (rev 0) +++ csw/mgar/pkg/curl/trunk/files/CSWcurlrt.prototype 2008-12-31 17:47:52 UTC (rev 2722) @@ -0,0 +1,77 @@ +d none /opt/csw/bin 0755 root bin +f none /opt/csw/bin/curl-config 0755 root bin +d none /opt/csw/include 0755 root bin +d none /opt/csw/include/curl 0755 root bin +f none /opt/csw/include/curl/curl.h 0644 root bin +f none /opt/csw/include/curl/curlbuild.h 0644 root bin +f none /opt/csw/include/curl/curlrules.h 0644 root bin +f none /opt/csw/include/curl/curlver.h 0644 root bin +f none /opt/csw/include/curl/easy.h 0644 root bin +f none /opt/csw/include/curl/mprintf.h 0644 root bin +f none /opt/csw/include/curl/multi.h 0644 root bin +f none /opt/csw/include/curl/stdcheaders.h 0644 root bin +f none /opt/csw/include/curl/typecheck-gcc.h 0644 root bin +f none /opt/csw/include/curl/types.h 0644 root bin +d none /opt/csw/lib 0755 root bin +f none /opt/csw/lib/libcurl.a 0644 root bin +f none /opt/csw/lib/libcurl.so.4.1.1 0755 root bin +s none /opt/csw/lib/libcurl.so.4=libcurl.so.4.1.1 +s none /opt/csw/lib/libcurl.so=libcurl.so.4.1.1 +d none /opt/csw/lib/pkgconfig 0755 root bin +f none /opt/csw/lib/pkgconfig/libcurl.pc 0644 root bin +d none /opt/csw/share/man 0755 root bin +d none /opt/csw/share/man/man1 0755 root bin +f none /opt/csw/share/man/man1/curl-config.1 0644 root bin +d none /opt/csw/share/man/man3 0755 root bin +f none /opt/csw/share/man/man3/curl_easy_cleanup.3 0644 root bin +f none /opt/csw/share/man/man3/curl_easy_duphandle.3 0644 root bin +f none /opt/csw/share/man/man3/curl_easy_escape.3 0644 root bin +f none /opt/csw/share/man/man3/curl_easy_getinfo.3 0644 root bin +f none /opt/csw/share/man/man3/curl_easy_init.3 0644 root bin +f none /opt/csw/share/man/man3/curl_easy_pause.3 0644 root bin +f none /opt/csw/share/man/man3/curl_easy_perform.3 0644 root bin +f none /opt/csw/share/man/man3/curl_easy_recv.3 0644 root bin +f none /opt/csw/share/man/man3/curl_easy_reset.3 0644 root bin +f none /opt/csw/share/man/man3/curl_easy_send.3 0644 root bin +f none /opt/csw/share/man/man3/curl_easy_setopt.3 0644 root bin +f none /opt/csw/share/man/man3/curl_easy_strerror.3 0644 root bin +f none /opt/csw/share/man/man3/curl_easy_unescape.3 0644 root bin +f none /opt/csw/share/man/man3/curl_escape.3 0644 root bin +f none /opt/csw/share/man/man3/curl_formadd.3 0644 root bin +f none /opt/csw/share/man/man3/curl_formfree.3 0644 root bin +f none /opt/csw/share/man/man3/curl_formget.3 0644 root bin +f none /opt/csw/share/man/man3/curl_free.3 0644 root bin +f none /opt/csw/share/man/man3/curl_getdate.3 0644 root bin +f none /opt/csw/share/man/man3/curl_getenv.3 0644 root bin +f none /opt/csw/share/man/man3/curl_global_cleanup.3 0644 root bin +f none /opt/csw/share/man/man3/curl_global_init.3 0644 root bin +f none /opt/csw/share/man/man3/curl_global_init_mem.3 0644 root bin +f none /opt/csw/share/man/man3/curl_mprintf.3 0644 root bin +f none /opt/csw/share/man/man3/curl_multi_add_handle.3 0644 root bin +f none /opt/csw/share/man/man3/curl_multi_assign.3 0644 root bin +f none /opt/csw/share/man/man3/curl_multi_cleanup.3 0644 root bin +f none /opt/csw/share/man/man3/curl_multi_fdset.3 0644 root bin +f none /opt/csw/share/man/man3/curl_multi_info_read.3 0644 root bin +f none /opt/csw/share/man/man3/curl_multi_init.3 0644 root bin +f none /opt/csw/share/man/man3/curl_multi_perform.3 0644 root bin +f none /opt/csw/share/man/man3/curl_multi_remove_handle.3 0644 root bin +f none /opt/csw/share/man/man3/curl_multi_setopt.3 0644 root bin +f none /opt/csw/share/man/man3/curl_multi_socket.3 0644 root bin +f none /opt/csw/share/man/man3/curl_multi_strerror.3 0644 root bin +f none /opt/csw/share/man/man3/curl_multi_timeout.3 0644 root bin +f none /opt/csw/share/man/man3/curl_share_cleanup.3 0644 root bin +f none /opt/csw/share/man/man3/curl_share_init.3 0644 root bin +f none /opt/csw/share/man/man3/curl_share_setopt.3 0644 root bin +f none /opt/csw/share/man/man3/curl_share_strerror.3 0644 root bin +f none /opt/csw/share/man/man3/curl_slist_append.3 0644 root bin +f none /opt/csw/share/man/man3/curl_slist_free_all.3 0644 root bin +f none /opt/csw/share/man/man3/curl_strequal.3 0644 root bin +f none /opt/csw/share/man/man3/curl_unescape.3 0644 root bin +f none /opt/csw/share/man/man3/curl_version.3 0644 root bin +f none /opt/csw/share/man/man3/curl_version_info.3 0644 root bin +f none /opt/csw/share/man/man3/libcurl-easy.3 0644 root bin +f none /opt/csw/share/man/man3/libcurl-errors.3 0644 root bin +f none /opt/csw/share/man/man3/libcurl-multi.3 0644 root bin +f none /opt/csw/share/man/man3/libcurl-share.3 0644 root bin +f none /opt/csw/share/man/man3/libcurl-tutorial.3 0644 root bin +f none /opt/csw/share/man/man3/libcurl.3 0644 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Wed Dec 31 18:58:34 2008 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Wed, 31 Dec 2008 17:58:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[2723] csw/mgar/pkg/curl/trunk Message-ID: Revision: 2723 http://gar.svn.sourceforge.net/gar/?rev=2723&view=rev Author: harpchad Date: 2008-12-31 17:58:34 +0000 (Wed, 31 Dec 2008) Log Message: ----------- Remove redundant dependency Modified Paths: -------------- csw/mgar/pkg/curl/trunk/checksums csw/mgar/pkg/curl/trunk/files/CSWcurl.depend Modified: csw/mgar/pkg/curl/trunk/checksums =================================================================== --- csw/mgar/pkg/curl/trunk/checksums 2008-12-31 17:47:52 UTC (rev 2722) +++ csw/mgar/pkg/curl/trunk/checksums 2008-12-31 17:58:34 UTC (rev 2723) @@ -1,5 +1,5 @@ 3a461b145a4a31fe7d5a44684e7fbdbc download/curl-7.19.2.tar.bz2 -6ca086ce31b3036a315f9d29ac648056 download/CSWcurl.depend +8413cf2aff529cb995c14a57bd41a10a download/CSWcurl.depend a5a35282d48619f9a94d768b3bb5a525 download/CSWcurl.gspec 2c5cb969b0409caa925504686cefe0df download/CSWcurl.prototype 5b7397f8f7cab315bec471d05c7f5036 download/CSWcurlrt.gspec Modified: csw/mgar/pkg/curl/trunk/files/CSWcurl.depend =================================================================== --- csw/mgar/pkg/curl/trunk/files/CSWcurl.depend 2008-12-31 17:47:52 UTC (rev 2722) +++ csw/mgar/pkg/curl/trunk/files/CSWcurl.depend 2008-12-31 17:58:34 UTC (rev 2723) @@ -1,4 +1,3 @@ -P CSWcommon common - common files and dirs for CSW packages P CSWiconv libiconv - GNU iconv library P CSWlibidn libidn - Implementation of the Stringprep, Punycode and IDNA P CSWlibnet libnet - the libnet packet construction library This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Wed Dec 31 19:32:13 2008 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Wed, 31 Dec 2008 18:32:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[2724] csw/mgar/pkg/vim/trunk Message-ID: Revision: 2724 http://gar.svn.sourceforge.net/gar/?rev=2724&view=rev Author: harpchad Date: 2008-12-31 18:32:13 +0000 (Wed, 31 Dec 2008) Log Message: ----------- Update to patch level 77 Modified Paths: -------------- csw/mgar/pkg/vim/trunk/checksums csw/mgar/pkg/vim/trunk/files/patches.mk Modified: csw/mgar/pkg/vim/trunk/checksums =================================================================== --- csw/mgar/pkg/vim/trunk/checksums 2008-12-31 17:58:34 UTC (rev 2723) +++ csw/mgar/pkg/vim/trunk/checksums 2008-12-31 18:32:13 UTC (rev 2724) @@ -69,10 +69,12 @@ f3e6f3dd76278a9f7e396955faa4ca31 download/7.2.069 805cdc76da46e73ae908038e09efae16 download/7.2.070 9224b5e9c85fa4d47d418c248aff542e download/7.2.071 -45ca3d6526b653253b05d91a1e89bd3d download/7.2.072 +ab9250d36651dde9267d1241cac9fb74 download/7.2.072 0d77ee653eabe4b7fdb640d768d7c1be download/7.2.073 5b0a423e9f3ca07e5c62d4f0f5803a5c download/7.2.074 d7eccf57f8fc04cf0385f85eff3d989a download/7.2.075 +99750c988d0c48f56cb12a04b78aebc2 download/7.2.076 +1967f5e7fa4cec07bd67cc47925ec3c8 download/7.2.077 198b5e809eddd24650dac5ab237e26d0 download/CSWvim.depend 59c166f15ad9e4db7aeef3ce7f6d89d9 download/CSWvim.gspec 7f886f132e8404332757262c82aac7af download/CSWvim.prototype Modified: csw/mgar/pkg/vim/trunk/files/patches.mk =================================================================== --- csw/mgar/pkg/vim/trunk/files/patches.mk 2008-12-31 17:58:34 UTC (rev 2723) +++ csw/mgar/pkg/vim/trunk/files/patches.mk 2008-12-31 18:32:13 UTC (rev 2724) @@ -1,5 +1,5 @@ # Vim 72 patchset -PATCHREV = 075 +PATCHREV = 077 PATCHDIRLEVEL = 0 GARVERSION = $(DISTVERSION).$(PATCHREV) PATCHFILES += $(foreach T,$(shell gseq -f "%03g" 001 $(PATCHREV)),$(DISTVERSION).$(T)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Wed Dec 31 19:56:47 2008 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Wed, 31 Dec 2008 18:56:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[2725] csw/mgar/pkg/gvim/trunk/checksums Message-ID: Revision: 2725 http://gar.svn.sourceforge.net/gar/?rev=2725&view=rev Author: harpchad Date: 2008-12-31 18:56:46 +0000 (Wed, 31 Dec 2008) Log Message: ----------- Updated to patch level 77 Modified Paths: -------------- csw/mgar/pkg/gvim/trunk/checksums Modified: csw/mgar/pkg/gvim/trunk/checksums =================================================================== --- csw/mgar/pkg/gvim/trunk/checksums 2008-12-31 18:32:13 UTC (rev 2724) +++ csw/mgar/pkg/gvim/trunk/checksums 2008-12-31 18:56:46 UTC (rev 2725) @@ -67,6 +67,14 @@ fa0ccca2decdd2db64947658b04b8c99 download/7.2.067 ca5ab057205023613020ca920d903028 download/7.2.068 f3e6f3dd76278a9f7e396955faa4ca31 download/7.2.069 +805cdc76da46e73ae908038e09efae16 download/7.2.070 +9224b5e9c85fa4d47d418c248aff542e download/7.2.071 +ab9250d36651dde9267d1241cac9fb74 download/7.2.072 +0d77ee653eabe4b7fdb640d768d7c1be download/7.2.073 +5b0a423e9f3ca07e5c62d4f0f5803a5c download/7.2.074 +d7eccf57f8fc04cf0385f85eff3d989a download/7.2.075 +99750c988d0c48f56cb12a04b78aebc2 download/7.2.076 +1967f5e7fa4cec07bd67cc47925ec3c8 download/7.2.077 35e04482f07c57221c9a751aaa3b8dac download/vim-7.2-extra.tar.gz d8884786979e0e520c112faf2e176f05 download/vim-7.2-lang.tar.gz f0901284b338e448bfd79ccca0041254 download/vim-7.2.tar.bz2 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 Dec 1 15:58:47 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 01 Dec 2008 14:58:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[2419] csw/mgar/pkg Message-ID: Revision: 2419 http://gar.svn.sourceforge.net/gar/?rev=2419&view=rev Author: bdwalton Date: 2008-12-01 14:58:46 +0000 (Mon, 01 Dec 2008) Log Message: ----------- Skeleton of the new docbook-dtds package. Added Paths: ----------- csw/mgar/pkg/docbook-dtds/ csw/mgar/pkg/docbook-dtds/branches/ csw/mgar/pkg/docbook-dtds/tags/ csw/mgar/pkg/docbook-dtds/trunk/ csw/mgar/pkg/docbook-dtds/trunk/Makefile csw/mgar/pkg/docbook-dtds/trunk/files/ Property changes on: csw/mgar/pkg/docbook-dtds/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 Added: csw/mgar/pkg/docbook-dtds/trunk/Makefile =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/Makefile (rev 0) +++ csw/mgar/pkg/docbook-dtds/trunk/Makefile 2008-12-01 14:58:46 UTC (rev 2419) @@ -0,0 +1,16 @@ +GARNAME = package +GARVERSION = 1.0 +CATEGORIES = category + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWpackage,) + +CONFIGURE_ARGS = $(DIRPATHS) + +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 Mon Dec 1 19:24:02 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 01 Dec 2008 18:24:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[2420] csw/mgar/pkg/docbook-dtds/trunk Message-ID: Revision: 2420 http://gar.svn.sourceforge.net/gar/?rev=2420&view=rev Author: bdwalton Date: 2008-12-01 18:24:02 +0000 (Mon, 01 Dec 2008) Log Message: ----------- Horrible extract process works. Overrode zip-extract-FOO for each source file so that they could go to a specific location (non-standard). Patched updated to reflect csw/gar needs as opposed to the rhel5 rpm spec usage. Modified Paths: -------------- csw/mgar/pkg/docbook-dtds/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/docbook-dtds/trunk/checksums csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.gspec csw/mgar/pkg/docbook-dtds/trunk/files/docbook-4.2-euro.patch csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtd30-sgml-1.0.catalog.patch csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtd31-sgml-1.0.catalog.patch csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtd40-sgml-1.0.catalog.patch csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtd41-sgml-1.0.catalog.patch csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtd42-sgml-1.0.catalog.patch csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtds-ents.patch Modified: csw/mgar/pkg/docbook-dtds/trunk/Makefile =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/Makefile 2008-12-01 14:58:46 UTC (rev 2419) +++ csw/mgar/pkg/docbook-dtds/trunk/Makefile 2008-12-01 18:24:02 UTC (rev 2420) @@ -1,16 +1,138 @@ -GARNAME = package -GARVERSION = 1.0 -CATEGORIES = category +GARNAME = docbookdtds +GARVERSION = 1.0.30 +PATCHLEVEL = 1 +CATEGORIES = xtra -DESCRIPTION = Brief description +PREREQUISITES = CSWunzip + +DESCRIPTION = SGML and XML document type definitions for DocBook. define BLURB - Long description +The DocBook Document Type Definition (DTD) describes the syntax of +technical documentation texts (articles, books and manual pages). +This syntax is XML-compliant and is developed by the OASIS consortium. +This package contains SGML and XML versions of the DocBook DTD. endef -MASTER_SITES = -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWpackage,) +# The following is from the rhel5 1.0.3.1 docbook-dtds spec file. Given +# this list, we put together the insane list of master_sites and distfiles +# below...the initial wget kinda stinks, but it gets the job done. -CONFIGURE_ARGS = $(DIRPATHS) +# Source0: http://www.oasis-open.org/docbook/sgml/3.0/docbk30.zip +# Source1: http://www.oasis-open.org/docbook/sgml/3.1/docbk31.zip +# Source2: http://www.oasis-open.org/docbook/sgml/4.0/docbk40.zip +# Source3: http://www.oasis-open.org/docbook/sgml/4.1/docbk41.zip +# Source4: http://www.oasis-open.org/docbook/xml/4.1.2/docbkx412.zip +# Source5: http://www.oasis-open.org/docbook/sgml/4.2/docbook-4.2.zip +# Source6: http://www.oasis-open.org/docbook/xml/4.2/docbook-xml-4.2.zip +# Source7: http://www.docbook.org/sgml/4.3/docbook-4.3.zip +# Source8: http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip +# Source9: http://www.docbook.org/sgml/4.4/docbook-4.4.zip +# Source10: http://www.docbook.org/xml/4.4/docbook-xml-4.4.zip +OASIS = http://www.oasis-open.org/docbook +DOCBOOK = http://www.docbook.org + +# based on the above, we'll need to look for files in the following locations +# ...basically one file per url. that blows, eh? +O_SRC = $(OASIS)/sgml/3.0/ $(OASIS)/sgml/3.1/ $(OASIS)/sgml/4.0/ +O_SRC += $(OASIS)/sgml/4.1/ $(OASIS)/xml/4.1.2/ $(OASIS)/sgml/4.2/ +O_SRC += $(OASIS)/xml/4.2/ +D_SRC = $(DOCBOOK)/sgml/4.3/ $(DOCBOOK)/xml/4.3/ $(DOCBOOK)/sgml/4.4/ +D_SRC += $(DOCBOOK)/xml/4.4/ + +# the various files we'll need to fetch from the various sources +DBFILES = docbk30.zip docbk31.zip docbk40.zip docbk41.zip docbkx412.zip +DBFILES += docbook-4.2.zip docbook-xml-4.2.zip docbook-4.3.zip +DBFILES += docbook-xml-4.3.zip docbook-4.4.zip docbook-xml-4.4.zip + +MASTER_SITES = $(O_SRC) $(D_SRC) +DISTFILES = $(DBFILES) + +PATCHFILES = docbook-4.2-euro.patch docbook-dtd30-sgml-1.0.catalog.patch +PATCHFILES += docbook-dtd31-sgml-1.0.catalog.patch +PATCHFILES += docbook-dtd40-sgml-1.0.catalog.patch +PATCHFILES += docbook-dtd41-sgml-1.0.catalog.patch +PATCHFILES += docbook-dtd42-sgml-1.0.catalog.patch +PATCHFILES += docbook-dtds-ents.patch + +#CONFIGURE_ARGS = $(DIRPATHS) + include gar/category.mk + +# BuildArch: noarch + +# Patch0: docbook-dtd30-sgml-1.0.catalog.patch +# Patch1: docbook-dtd31-sgml-1.0.catalog.patch +# Patch2: docbook-dtd40-sgml-1.0.catalog.patch +# Patch3: docbook-dtd41-sgml-1.0.catalog.patch +# Patch4: docbook-dtd42-sgml-1.0.catalog.patch +# Patch5: docbook-4.2-euro.patch +# Patch6: docbook-dtds-ents.patch + +local-zip-%: + @echo " ==> Extracting $(DOWNLOADDIR)/$*" + @unzip $(DOWNLOADDIR)/$* -d $(EXTRACTDIR) + @$(MAKECOOKIE) + +SGMLDIRS = 3.0 3.1 4.0 4.1 4.2 4.3 4.4 +XMLDIRS = 4.1.2 4.2 4.3 4.4 + + +# ok, for each source, we make an explicit target that overrides the implicit +# zip-extract-% targets in GAR. +zip-extract-docbk30.zip: + unzip $(DOWNLOADDIR)/docbk30.zip -d $(WORKSRC)/3.0-sgml + @$(MAKECOOKIE) + +zip-extract-docbk31.zip: + unzip $(DOWNLOADDIR)/docbk31.zip -d $(WORKSRC)/3.1-sgml + @$(MAKECOOKIE) + +zip-extract-docbk40.zip: + unzip $(DOWNLOADDIR)/docbk40.zip -d $(WORKSRC)/4.0-sgml + @$(MAKECOOKIE) + +zip-extract-docbk41.zip: + unzip $(DOWNLOADDIR)/docbk41.zip -d $(WORKSRC)/4.1-sgml + @$(MAKECOOKIE) + +zip-extract-docbook-4.2.zip: + unzip $(DOWNLOADDIR)/docbook-4.2.zip -d $(WORKSRC)/4.2-sgml + @$(MAKECOOKIE) + +zip-extract-docbkx412.zip: + unzip $(DOWNLOADDIR)/docbkx412.zip -d $(WORKSRC)/4.1.2-xml + @$(MAKECOOKIE) + + +zip-extract-docbook-4.3.zip: + unzip $(DOWNLOADDIR)/docbook-4.3.zip -d $(WORKSRC)/4.3-sgml + @$(MAKECOOKIE) + +zip-extract-docbook-4.4.zip: + unzip $(DOWNLOADDIR)/docbook-4.4.zip -d $(WORKSRC)/4.4-sgml + @$(MAKECOOKIE) + +zip-extract-docbook-xml-4.2.zip: + unzip $(DOWNLOADDIR)/docbook-xml-4.2.zip -d $(WORKSRC)/4.2-xml + @$(MAKECOOKIE) + +zip-extract-docbook-xml-4.3.zip: + unzip $(DOWNLOADDIR)/docbook-xml-4.3.zip -d $(WORKSRC)/4.3-xml + @$(MAKECOOKIE) + +zip-extract-docbook-xml-4.4.zip: + unzip $(DOWNLOADDIR)/docbook-xml-4.4.zip -d $(WORKSRC)/4.4-xml + @$(MAKECOOKIE) + +# we override extract for our needs...man this is horrible! (note the cookie +# madness) +pre-extract: $(WORKSRC) + ( cd $(WORKSRC); \ + for d in $(SGMLDIRS); do \ + mkdir $$d-sgml; \ + done; \ + for d in $(XMLDIRS); do \ + mkdir $$d-xml; \ + done ) + @$(MAKECOOKIE) \ No newline at end of file Added: csw/mgar/pkg/docbook-dtds/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/checksums (rev 0) +++ csw/mgar/pkg/docbook-dtds/trunk/checksums 2008-12-01 18:24:02 UTC (rev 2420) @@ -0,0 +1,18 @@ +9a7f5b1b7dd52d0ca4fb080619f0459c download/docbk30.zip +432749c0c806dbae81c8bcb70da3b5d3 download/docbk31.zip +fabcf7dd1d88b94797b7e5344389eab9 download/docbk40.zip +489f6ff2a2173eb1e14216c10533ede2 download/docbk41.zip +900d7609fb7e6d78901b357e4acfbc17 download/docbkx412.zip +0dfeb94569334dd22a62d90d99fc0630 download/docbook-4.2.zip +73fe50dfe74ca631c1602f558ed8961f download/docbook-xml-4.2.zip +e3beb1b0b2923c24fa55a68e88654b01 download/docbook-4.3.zip +ab200202b9e136a144db1e0864c45074 download/docbook-xml-4.3.zip +f89e1bd0b2c7a361e3f1f739e16b5d0d download/docbook-4.4.zip +cbb04e9a700955d88c50962ef22c1634 download/docbook-xml-4.4.zip +318742d3a6648a6905727f071cbc9847 download/docbook-4.2-euro.patch +e3067045964536cc7445d5c3f1e99916 download/docbook-dtd30-sgml-1.0.catalog.patch +856d40f5d1e3fc8fd939b88bf5fedc87 download/docbook-dtd31-sgml-1.0.catalog.patch +8167663f53857ded5095768a85eee387 download/docbook-dtd40-sgml-1.0.catalog.patch +e976c302070ec2e14316d4a601c224cb download/docbook-dtd41-sgml-1.0.catalog.patch +0ee42c28835cd448b6b47b2345394b28 download/docbook-dtd42-sgml-1.0.catalog.patch +1dae3f33fe7dda3fd68a4d4a3df2c653 download/docbook-dtds-ents.patch Added: csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.gspec =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.gspec (rev 0) +++ csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.gspec 2008-12-01 18:24:02 UTC (rev 2420) @@ -0,0 +1,4 @@ +%var bitname package +%var pkgname CSWpackage +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKSRC}/LICENSE Added: csw/mgar/pkg/docbook-dtds/trunk/files/docbook-4.2-euro.patch =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/docbook-4.2-euro.patch (rev 0) +++ csw/mgar/pkg/docbook-dtds/trunk/files/docbook-4.2-euro.patch 2008-12-01 18:24:02 UTC (rev 2420) @@ -0,0 +1,22 @@ +--- docbook-dtds-1.0/4.2-sgml/docbookx.dtd.euro 2003-07-15 09:07:58.000000000 +0100 ++++ docbook-dtds-1.0/4.2-sgml/docbookx.dtd 2003-07-15 09:08:12.000000000 +0100 +@@ -106,7 +106,7 @@ + ++ + ]]> + +--- docbook-dtds-1.0/4.2-xml/docbookx.dtd.euro 2003-07-15 09:08:02.000000000 +0100 ++++ docbook-dtds-1.0/4.2-xml/docbookx.dtd 2003-07-15 09:08:21.000000000 +0100 +@@ -106,7 +106,7 @@ + ++ + ]]> + Added: csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtd30-sgml-1.0.catalog.patch =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtd30-sgml-1.0.catalog.patch (rev 0) +++ csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtd30-sgml-1.0.catalog.patch 2008-12-01 18:24:02 UTC (rev 2420) @@ -0,0 +1,41 @@ +--- docbook-1.0.30/3.0-sgml/docbook.cat Tue Dec 10 16:35:22 1996 ++++ docbook-1.0.30/3.0-sgml/catalog Mon Jun 5 11:08:34 2000 +@@ -27,7 +27,7 @@ + -- ...................................................................... -- + -- SGML declaration associated with DocBook ............................. -- + +-DTDDECL "-//Davenport//DTD DocBook V3.0//EN" "docbook.dcl" ++SGMLDECL "docbook.dcl" + + -- ...................................................................... -- + -- DocBook driver file .................................................. -- +@@ -41,29 +41,6 @@ + PUBLIC "-//Davenport//ELEMENTS DocBook Information Pool V3.0//EN" "dbpool.mod" + PUBLIC "-//Davenport//ELEMENTS DocBook Document Hierarchy V3.0//EN" "dbhier.mod" + PUBLIC "-//Davenport//ENTITIES DocBook Additional General Entities V3.0//EN" "dbgenent.mod" +- +- -- ...................................................................... -- +- -- ISO entity sets ...................................................... -- +- +-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml" +-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml" + + -- End of catalog data for DocBook V3.0 ................................. -- + -- ...................................................................... -- Added: csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtd31-sgml-1.0.catalog.patch =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtd31-sgml-1.0.catalog.patch (rev 0) +++ csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtd31-sgml-1.0.catalog.patch 2008-12-01 18:24:02 UTC (rev 2420) @@ -0,0 +1,41 @@ +--- docbook-1.0.30/3.1-sgml/docbook.cat Tue Feb 2 06:53:32 1999 ++++ docbook-1.0.30/3.1-sgml/catalog Thu May 25 11:45:01 2000 +@@ -19,7 +19,7 @@ + -- ...................................................................... -- + -- SGML declaration associated with DocBook ............................. -- + +-DTDDECL "-//OASIS//DTD DocBook V3.1//EN" "docbook.dcl" ++SGMLDECL "docbook.dcl" + + -- ...................................................................... -- + -- DocBook driver file .................................................. -- +@@ -35,29 +35,6 @@ + PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V3.1//EN" "dbgenent.mod" + PUBLIC "-//OASIS//ENTITIES DocBook Notations V3.1//EN" "dbnotn.mod" + PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V3.1//EN" "dbcent.mod" +- +- -- ...................................................................... -- +- -- ISO entity sets ...................................................... -- +- +-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml" +-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml" + + -- End of catalog data for DocBook V3.1 ................................. -- + -- ...................................................................... -- Added: csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtd40-sgml-1.0.catalog.patch =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtd40-sgml-1.0.catalog.patch (rev 0) +++ csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtd40-sgml-1.0.catalog.patch 2008-12-01 18:24:02 UTC (rev 2420) @@ -0,0 +1,41 @@ +--- docbook-1.0.30/4.0-sgml/docbook.cat Mon May 22 22:38:05 2000 ++++ docbook-1.0.30/4.0-sgml/catalog Mon May 22 22:12:36 2000 +@@ -19,7 +19,7 @@ + -- ...................................................................... -- + -- SGML declaration associated with DocBook ............................. -- + +-DTDDECL "-//OASIS//DTD DocBook V4.0//EN" "docbook.dcl" ++SGMLDECL "docbook.dcl" + + -- ...................................................................... -- + -- DocBook driver file .................................................. -- +@@ -35,29 +35,6 @@ + PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.0//EN" "dbgenent.mod" + PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.0//EN" "dbnotn.mod" + PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.0//EN" "dbcent.mod" +- +- -- ...................................................................... -- +- -- ISO entity sets ...................................................... -- +- +-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml" +-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml" + + -- End of catalog data for DocBook V4.0 ................................. -- + -- ...................................................................... -- Added: csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtd41-sgml-1.0.catalog.patch =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtd41-sgml-1.0.catalog.patch (rev 0) +++ csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtd41-sgml-1.0.catalog.patch 2008-12-01 18:24:02 UTC (rev 2420) @@ -0,0 +1,41 @@ +--- docbook-1.0.30/4.1-sgml/docbook.cat Mon May 22 22:38:05 2000 ++++ docbook-1.0.30/4.1-sgml/catalog Mon May 22 22:12:36 2000 +@@ -19,7 +19,7 @@ + -- ...................................................................... -- + -- SGML declaration associated with DocBook ............................. -- + +-DTDDECL "-//OASIS//DTD DocBook V4.1//EN" "docbook.dcl" ++SGMLDECL "docbook.dcl" + + -- ...................................................................... -- + -- DocBook driver file .................................................. -- +@@ -35,29 +35,6 @@ + PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.1//EN" "dbgenent.mod" + PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.1//EN" "dbnotn.mod" + PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.1//EN" "dbcent.mod" +- +- -- ...................................................................... -- +- -- ISO entity sets ...................................................... -- +- +-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml" +-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml" +-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml" + + -- End of catalog data for DocBook V4.1 ................................. -- + -- ...................................................................... -- Added: csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtd42-sgml-1.0.catalog.patch =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtd42-sgml-1.0.catalog.patch (rev 0) +++ csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtd42-sgml-1.0.catalog.patch 2008-12-01 18:24:02 UTC (rev 2420) @@ -0,0 +1,68 @@ +--- docbook-1.0.30/4.2-sgml/docbook.cat.orig 2002-07-17 17:14:28.000000000 +0100 ++++ docbook-1.0.30/4.2-sgml/docbook.cat 2002-07-17 21:58:24.000000000 +0100 +@@ -49,65 +49,5 @@ + PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.2//EN" + "dbcentx.mod" + +- -- ...................................................................... -- +- -- ISO entity sets ...................................................... -- +- +-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" +- "iso-dia.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" +- "iso-num.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" +- "iso-pub.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" +- "iso-tech.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" +- "iso-lat1.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" +- "iso-lat2.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" +- "iso-grk1.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" +- "iso-grk2.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" +- "iso-grk3.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" +- "iso-grk4.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" +- "iso-amsa.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" +- "iso-amsb.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" +- "iso-amsc.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" +- "iso-amsn.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" +- "iso-amso.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" +- "iso-amsr.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" +- "iso-box.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" +- "iso-cyr1.gml" +- +-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" +- "iso-cyr2.gml" +- + -- End of catalog data for DocBook V4.2 ................................. -- + -- ...................................................................... -- Added: csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtds-ents.patch =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtds-ents.patch (rev 0) +++ csw/mgar/pkg/docbook-dtds/trunk/files/docbook-dtds-ents.patch 2008-12-01 18:24:02 UTC (rev 2420) @@ -0,0 +1,34 @@ +--- docbook-dtds-1.0/4.3-sgml/docbook.cat.ents 2005-12-13 13:14:24.000000000 +0000 ++++ docbook-dtds-1.0/4.3-sgml/docbook.cat 2005-12-13 13:14:38.000000000 +0000 +@@ -51,6 +51,7 @@ + + -- ...................................................................... -- + -- ISO entity sets ...................................................... -- ++-- + + PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" + "iso-dia.gml" +@@ -109,5 +110,6 @@ + PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" + "iso-cyr2.gml" + ++-- + -- End of catalog data for DocBook V4.3 ................................. -- + -- ...................................................................... -- +--- docbook-dtds-1.0/4.4-sgml/docbook.cat.ents 2005-12-13 13:14:51.000000000 +0000 ++++ docbook-dtds-1.0/4.4-sgml/docbook.cat 2005-12-13 13:14:59.000000000 +0000 +@@ -54,6 +54,7 @@ + + -- ...................................................................... -- + -- ISO entity sets ...................................................... -- ++-- + + PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" + "iso-dia.gml" +@@ -112,5 +113,6 @@ + PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" + "iso-cyr2.gml" + ++-- + -- End of catalog data for DocBook V4.4 ................................. -- + -- ...................................................................... -- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Dec 1 21:16:21 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 01 Dec 2008 20:16:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[2421] csw/mgar/gar/v1/gar.lib.mk Message-ID: Revision: 2421 http://gar.svn.sourceforge.net/gar/?rev=2421&view=rev Author: wbonnet Date: 2008-12-01 20:16:21 +0000 (Mon, 01 Dec 2008) Log Message: ----------- Fix default master site and empty file list Modified Paths: -------------- csw/mgar/gar/v1/gar.lib.mk Modified: csw/mgar/gar/v1/gar.lib.mk =================================================================== --- csw/mgar/gar/v1/gar.lib.mk 2008-12-01 18:24:02 UTC (rev 2420) +++ csw/mgar/gar/v1/gar.lib.mk 2008-12-01 20:16:21 UTC (rev 2421) @@ -105,6 +105,7 @@ # check a new upstream files are available +UPSTREAM_MASTER_SITES ?= $(MASTER_SITES) UW_ARGS = $(addprefix -u ,$(UPSTREAM_MASTER_SITES)) ifneq ($(UFILES_REGEX), "") FILES2CHECK = $(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/upstream_watch $(UW_ARGS) $(addsuffix ',$(addprefix ',$(UFILES_REGEX)))) @@ -124,7 +125,7 @@ fi; \ $(MAKE) checknew-$$FILE >/dev/null; \ done; \ - if [ ! "$$NEW_FILES" -eq "" ]; then \ + if test -z "$$NEW_FILES" ; then \ { echo ""; \ echo "Hello dear $(GARNAME) maintainer,"; \ echo ""; \ @@ -141,7 +142,7 @@ echo "---"; \ echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ else \ - if [ ! -n "$(UFILES_REGEX)" ]; then \ + if [ ! -n '$(UFILES_REGEX)' ]; then \ { echo ""; \ echo "Hello dear $(GARNAME) maintainer,"; \ echo ""; \ @@ -168,13 +169,16 @@ fi; \ $(MAKE) checknew-$$FILE >/dev/null; \ done; \ - if [ ! "$$NEW_FILES" -eq "" ]; then \ - echo "$(GARNAME): new upstream files available: $$NEW_FILES"; \ - else \ - if [ ! -n "$(UFILES_REGEX)" ]; then \ + if test -z "$$NEW_FILES" ; then \ + if [ ! -n '$(UFILES_REGEX)' ]; then \ echo "$(GARNAME): Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \ fi; \ + else \ + echo "$(GARNAME): new upstream files available: $$NEW_FILES"; \ fi; \ +else \ +echo "UPSTREAM_MASTER_SITES : $(UPSTREAM_MASTER_SITES)"; \ +echo "MASTER_SITES : $(MASTER_SITES)"; \ fi checknew-%: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Dec 1 21:26:45 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 01 Dec 2008 20:26:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[2422] csw/mgar/gar/v1/gar.lib.mk Message-ID: Revision: 2422 http://gar.svn.sourceforge.net/gar/?rev=2422&view=rev Author: wbonnet Date: 2008-12-01 20:26:45 +0000 (Mon, 01 Dec 2008) Log Message: ----------- Remove extra comments Modified Paths: -------------- csw/mgar/gar/v1/gar.lib.mk Modified: csw/mgar/gar/v1/gar.lib.mk =================================================================== --- csw/mgar/gar/v1/gar.lib.mk 2008-12-01 20:16:21 UTC (rev 2421) +++ csw/mgar/gar/v1/gar.lib.mk 2008-12-01 20:26:45 UTC (rev 2422) @@ -176,9 +176,6 @@ else \ echo "$(GARNAME): new upstream files available: $$NEW_FILES"; \ fi; \ -else \ -echo "UPSTREAM_MASTER_SITES : $(UPSTREAM_MASTER_SITES)"; \ -echo "MASTER_SITES : $(MASTER_SITES)"; \ fi checknew-%: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Dec 1 23:48:53 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 01 Dec 2008 22:48:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[2423] csw/mgar/gar/v1/gar.lib.mk Message-ID: Revision: 2423 http://gar.svn.sourceforge.net/gar/?rev=2423&view=rev Author: wbonnet Date: 2008-12-01 22:48:53 +0000 (Mon, 01 Dec 2008) Log Message: ----------- Add warning when the upstream url is invalid Modified Paths: -------------- csw/mgar/gar/v1/gar.lib.mk Modified: csw/mgar/gar/v1/gar.lib.mk =================================================================== --- csw/mgar/gar/v1/gar.lib.mk 2008-12-01 20:26:45 UTC (rev 2422) +++ csw/mgar/gar/v1/gar.lib.mk 2008-12-01 22:48:53 UTC (rev 2423) @@ -156,25 +156,38 @@ fi; \ fi - check-upstream: @if [ -n '$(FILES2CHECK)' ]; then \ NEW_FILES=""; \ + PACKAGE_UP_TO_DATE=0; \ for FILE in $(FILES2CHECK) ""; do \ [ -n "$$FILE" ] || continue; \ - if test -f $(COOKIEDIR)/checknew-$$FILE || echo $(DISTFILES) | grep -w $$FILE >/dev/null; then \ - : ; \ + if test -f $(COOKIEDIR)/checknew-$$FILE ; then \ + PACKAGE_UP_TO_DATE=1; \ else \ - NEW_FILES="$$FILE $$NEW_FILES"; \ + if echo $(DISTFILES) | grep -w $$FILE >/dev/null; then \ + PACKAGE_UP_TO_DATE=1; \ + echo "$(GARNAME) : Package is up-to-date. Current version is $$FILE" ; \ + else \ + NEW_FILES="$$FILE $$NEW_FILES"; \ + fi; \ fi; \ $(MAKE) checknew-$$FILE >/dev/null; \ done; \ if test -z "$$NEW_FILES" ; then \ if [ ! -n '$(UFILES_REGEX)' ]; then \ - echo "$(GARNAME): Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \ + echo "$(GARNAME) : Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \ + else \ + if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ + echo "$(GARNAME) : Warning no files to check ! $(FILES2CHECK)" ; \ + echo "$(GARNAME) : UPSTREAM_MASTER_SITES is $(UPSTREAM_MASTER_SITES)" ; \ + echo "$(GARNAME) : DISTNAME is $(DISTNAME)" ; \ + echo "$(GARNAME) : UFILES_REGEX is : $(UFILES_REGEX)" ; \ + echo "$(GARNAME) : Please check configuration" ; \ + fi; \ fi; \ else \ - echo "$(GARNAME): new upstream files available: $$NEW_FILES"; \ + echo "$(GARNAME) : new upstream files available: $$NEW_FILES"; \ fi; \ fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Dec 1 23:57:14 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 01 Dec 2008 22:57:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[2424] csw/mgar/pkg/xfce Message-ID: Revision: 2424 http://gar.svn.sourceforge.net/gar/?rev=2424&view=rev Author: wbonnet Date: 2008-12-01 22:57:13 +0000 (Mon, 01 Dec 2008) Log Message: ----------- Add check upstream support Modified Paths: -------------- csw/mgar/pkg/xfce/appfinder/trunk/Makefile csw/mgar/pkg/xfce/desktop/trunk/Makefile csw/mgar/pkg/xfce/devtools/trunk/Makefile csw/mgar/pkg/xfce/exo/trunk/Makefile csw/mgar/pkg/xfce/gtk-xfce-engine/trunk/Makefile csw/mgar/pkg/xfce/icon-theme/trunk/Makefile csw/mgar/pkg/xfce/libxfce4mcs/trunk/Makefile csw/mgar/pkg/xfce/libxfce4util/trunk/Makefile csw/mgar/pkg/xfce/libxfcegui4/trunk/Makefile csw/mgar/pkg/xfce/mcs-manager/trunk/Makefile csw/mgar/pkg/xfce/mcs-plugins/trunk/Makefile csw/mgar/pkg/xfce/mixer/trunk/Makefile csw/mgar/pkg/xfce/mousepad/trunk/Makefile csw/mgar/pkg/xfce/orage/trunk/Makefile csw/mgar/pkg/xfce/panel/trunk/Makefile csw/mgar/pkg/xfce/print/trunk/Makefile csw/mgar/pkg/xfce/session/trunk/Makefile csw/mgar/pkg/xfce/terminal/trunk/Makefile csw/mgar/pkg/xfce/thunar/trunk/Makefile csw/mgar/pkg/xfce/utils/trunk/Makefile csw/mgar/pkg/xfce/xfwm4/trunk/Makefile csw/mgar/pkg/xfce/xfwm4-themes/trunk/Makefile Modified: csw/mgar/pkg/xfce/appfinder/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/appfinder/trunk/Makefile 2008-12-01 22:48:53 UTC (rev 2423) +++ csw/mgar/pkg/xfce/appfinder/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) @@ -10,6 +10,9 @@ # DISTFILES += CSWxfceappfinder.depend CSWxfceappfinder.gspec CSWxfceappfinder.prototype DISTFILES += $(call admfiles,CSWxfceappfinder, depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + TEST_SCRIPTS = none include gar/category.mk Modified: csw/mgar/pkg/xfce/desktop/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/desktop/trunk/Makefile 2008-12-01 22:48:53 UTC (rev 2423) +++ csw/mgar/pkg/xfce/desktop/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) @@ -11,6 +11,9 @@ # DISTFILES += CSWxfcedesktopdoc.depend CSWxfcedesktopdoc.gspec CSWxfcedesktopdoc.prototype DISTFILES += $(call admfiles,CSWxfcedesktop, depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + TEST_SCRIPTS = none CONFIGURE_ARGS += --enable-desktop-icons Modified: csw/mgar/pkg/xfce/devtools/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/devtools/trunk/Makefile 2008-12-01 22:48:53 UTC (rev 2423) +++ csw/mgar/pkg/xfce/devtools/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) @@ -9,6 +9,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWxfcedevtools, depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + include gar/category.mk post-install: Modified: csw/mgar/pkg/xfce/exo/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/exo/trunk/Makefile 2008-12-01 22:48:53 UTC (rev 2423) +++ csw/mgar/pkg/xfce/exo/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) @@ -14,6 +14,9 @@ # DISTFILES += CSWxfcelibexodev.depend CSWxfcelibexodev.gspec CSWxfcelibexodev.prototype DISTFILES += $(call admfiles,CSWxfceexo, depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + # Patch for the exo-mount.c file # PATCHFILES = exo.diff Modified: csw/mgar/pkg/xfce/gtk-xfce-engine/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/gtk-xfce-engine/trunk/Makefile 2008-12-01 22:48:53 UTC (rev 2423) +++ csw/mgar/pkg/xfce/gtk-xfce-engine/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) @@ -11,6 +11,9 @@ # DISTFILES += CSWgtkxfceengine.depend CSWgtkxfceengine.gspec CSWgtkxfceengine.prototype DISTFILES += $(call admfiles,CSWgtkxfceengine, depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + TEST_SCRIPTS = none include gar/category.mk Modified: csw/mgar/pkg/xfce/icon-theme/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/icon-theme/trunk/Makefile 2008-12-01 22:48:53 UTC (rev 2423) +++ csw/mgar/pkg/xfce/icon-theme/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) @@ -9,6 +9,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += CSWxfceicontheme.depend CSWxfceicontheme.gspec CSWxfceicontheme.prototype +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + TEST_SCRIPTS = none include gar/category.mk Modified: csw/mgar/pkg/xfce/libxfce4mcs/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/libxfce4mcs/trunk/Makefile 2008-12-01 22:48:53 UTC (rev 2423) +++ csw/mgar/pkg/xfce/libxfce4mcs/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) @@ -12,6 +12,9 @@ # DISTFILES += CSWlibxfce4mcsdev.depend CSWlibxfce4mcsdev.gspec CSWlibxfce4mcsdev.prototype DISTFILES += $(call admfiles,CSWlibxfce4mcs, depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + TEST_SCRIPTS = none include gar/category.mk Modified: csw/mgar/pkg/xfce/libxfce4util/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/libxfce4util/trunk/Makefile 2008-12-01 22:48:53 UTC (rev 2423) +++ csw/mgar/pkg/xfce/libxfce4util/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) @@ -12,6 +12,9 @@ DISTFILES += CSWlibxfce4utildev.depend CSWlibxfce4utildev.gspec CSWlibxfce4utildev.prototype # DISTFILES += $(call admfiles,CSWlibxfce4util, depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + PATCHFILES += gar-base.diff TEST_SCRIPTS = none Modified: csw/mgar/pkg/xfce/libxfcegui4/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/libxfcegui4/trunk/Makefile 2008-12-01 22:48:53 UTC (rev 2423) +++ csw/mgar/pkg/xfce/libxfcegui4/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) @@ -13,6 +13,9 @@ DISTFILES += CSWlibxfcegui4dev.depend CSWlibxfcegui4dev.gspec CSWlibxfcegui4dev.prototype # DISTFILES += $(call admfiles,CSWlibxfcegui4, depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + LIBDEPS = xfce/libxfce4util TEST_SCRIPTS = none Modified: csw/mgar/pkg/xfce/mcs-manager/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/mcs-manager/trunk/Makefile 2008-12-01 22:48:53 UTC (rev 2423) +++ csw/mgar/pkg/xfce/mcs-manager/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) @@ -13,6 +13,9 @@ DISTFILES += $(call admfiles,CSWxfcemcsmanager, depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + LIBDEPS = xfce/libxfce4util TEST_SCRIPTS = none Modified: csw/mgar/pkg/xfce/mcs-plugins/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/mcs-plugins/trunk/Makefile 2008-12-01 22:48:53 UTC (rev 2423) +++ csw/mgar/pkg/xfce/mcs-plugins/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) @@ -12,6 +12,9 @@ DISTFILES += $(call admfiles,CSWxfcemcsplugins, depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + # PATCHFILES += configure.in.diff # PATCHFILES += configure.diff Modified: csw/mgar/pkg/xfce/mixer/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/mixer/trunk/Makefile 2008-12-01 22:48:53 UTC (rev 2423) +++ csw/mgar/pkg/xfce/mixer/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) @@ -10,6 +10,9 @@ # DISTFILES += CSWxfcemixer.depend CSWxfcemixer.gspec CSWxfcemixer.prototype DISTFILES += $(call admfiles,CSWxfcemixer, depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + TEST_SCRIPTS = none include gar/category.mk Modified: csw/mgar/pkg/xfce/mousepad/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/mousepad/trunk/Makefile 2008-12-01 22:48:53 UTC (rev 2423) +++ csw/mgar/pkg/xfce/mousepad/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) @@ -11,6 +11,9 @@ # DISTFILES += CSWxfcemousepad.depend CSWxfcemousepad.gspec CSWxfcemousepad.prototype DISTFILES += $(call admfiles,CSWxfcemousepad, depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + TEST_SCRIPTS = none include gar/category.mk Modified: csw/mgar/pkg/xfce/orage/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/orage/trunk/Makefile 2008-12-01 22:48:53 UTC (rev 2423) +++ csw/mgar/pkg/xfce/orage/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) @@ -11,6 +11,9 @@ # DISTFILES += CSWxfceorage.depend CSWxfceorage.gspec CSWxfceorage.prototype # DISTFILES += CSWxfceoragedoc.depend CSWxfceoragedoc.gspec CSWxfceoragedoc.prototype +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + TEST_SCRIPTS = none include gar/category.mk Modified: csw/mgar/pkg/xfce/panel/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/panel/trunk/Makefile 2008-12-01 22:48:53 UTC (rev 2423) +++ csw/mgar/pkg/xfce/panel/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) @@ -12,6 +12,9 @@ # DISTFILES += CSWlibxfcepanel.depend CSWlibxfcepanel.gspec CSWlibxfcepanel.prototype # DISTFILES += CSWxfcepanel.depend CSWxfcepanel.gspec CSWxfcepanel.prototype +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + DISTFILES += $(call admfiles,CSWxfcepanel, depend) TEST_SCRIPTS = none Modified: csw/mgar/pkg/xfce/print/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/print/trunk/Makefile 2008-12-01 22:48:53 UTC (rev 2423) +++ csw/mgar/pkg/xfce/print/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) @@ -12,6 +12,9 @@ # DISTFILES += CSWlibxfceprint.depend CSWlibxfceprint.gspec CSWlibxfceprint.prototype # DISTFILES += CSWlibxfceprintdev.depend CSWlibxfceprintdev.gspec CSWlibxfceprintdev.prototype +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + DISTFILES += $(call admfiles,CSWxfceprint, depend) TEST_SCRIPTS = none Modified: csw/mgar/pkg/xfce/session/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/session/trunk/Makefile 2008-12-01 22:48:53 UTC (rev 2423) +++ csw/mgar/pkg/xfce/session/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) @@ -12,6 +12,9 @@ # DISTFILES += CSWxfcesessiondoc.depend CSWxfcesessiondoc.gspec CSWxfcesessiondoc.prototype # DISTFILES += CSWlibxfcesessiondev.depend CSWlibxfcesessiondev.gspec CSWlibxfcesessiondev.prototype +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + DISTFILES += $(call admfiles,CSWxfcesession, depend) TEST_SCRIPTS = none Modified: csw/mgar/pkg/xfce/terminal/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/terminal/trunk/Makefile 2008-12-01 22:48:53 UTC (rev 2423) +++ csw/mgar/pkg/xfce/terminal/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) @@ -16,6 +16,9 @@ DISTFILES += $(call admfiles,CSWxfceterminal, depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + TEST_SCRIPTS = none include gar/category.mk Modified: csw/mgar/pkg/xfce/thunar/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/thunar/trunk/Makefile 2008-12-01 22:48:53 UTC (rev 2423) +++ csw/mgar/pkg/xfce/thunar/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) @@ -18,6 +18,9 @@ # PATCHFILES = thunar-vfs-path-private.h.diff # PATCHFILES += thunar-vfs-thumb-jpeg.c.diff +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + TEST_SCRIPTS = none include gar/category.mk Modified: csw/mgar/pkg/xfce/utils/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/utils/trunk/Makefile 2008-12-01 22:48:53 UTC (rev 2423) +++ csw/mgar/pkg/xfce/utils/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) @@ -12,6 +12,9 @@ # PATCHFILES = xinitrc.patch +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + TEST_SCRIPTS = none include gar/category.mk Modified: csw/mgar/pkg/xfce/xfwm4/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/xfwm4/trunk/Makefile 2008-12-01 22:48:53 UTC (rev 2423) +++ csw/mgar/pkg/xfce/xfwm4/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) @@ -12,6 +12,9 @@ # PATCHFILES = frame.c.diff +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + LIBDEPS = xfce/mcs-mananager TEST_SCRIPTS = none Modified: csw/mgar/pkg/xfce/xfwm4-themes/trunk/Makefile =================================================================== --- csw/mgar/pkg/xfce/xfwm4-themes/trunk/Makefile 2008-12-01 22:48:53 UTC (rev 2423) +++ csw/mgar/pkg/xfce/xfwm4-themes/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) @@ -10,6 +10,9 @@ # DISTFILES += CSWxfcexfwm4themes.depend CSWxfcexfwm4themes.gspec CSWxfcexfwm4themes.prototype DISTFILES += $(call admfiles,CSWxfcexfwm4themes, depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + TEST_SCRIPTS = none include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Dec 2 00:29:33 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 01 Dec 2008 23:29:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[2425] csw/mgar/pkg Message-ID: Revision: 2425 http://gar.svn.sourceforge.net/gar/?rev=2425&view=rev Author: wbonnet Date: 2008-12-01 23:29:31 +0000 (Mon, 01 Dec 2008) Log Message: ----------- Add check upstream support to some package upstream master sites and regexp have to be fixed for some packages Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile csw/mgar/pkg/a52dec/trunk/Makefile csw/mgar/pkg/amarok/trunk/Makefile csw/mgar/pkg/amavisd-new/trunk/Makefile csw/mgar/pkg/apache/trunk/Makefile csw/mgar/pkg/apcupsd/trunk/Makefile csw/mgar/pkg/apg/trunk/Makefile csw/mgar/pkg/apr/trunk/Makefile csw/mgar/pkg/apr-util/trunk/Makefile csw/mgar/pkg/asciidoc/trunk/Makefile csw/mgar/pkg/atk/trunk/Makefile csw/mgar/pkg/audiofile/trunk/Makefile csw/mgar/pkg/authz-tools/trunk/Makefile csw/mgar/pkg/avantfax/trunk/Makefile csw/mgar/pkg/balance/trunk/Makefile csw/mgar/pkg/bdb4/trunk/Makefile csw/mgar/pkg/bdb43/trunk/Makefile csw/mgar/pkg/bdb44/trunk/Makefile csw/mgar/pkg/bdb46/trunk/Makefile csw/mgar/pkg/bind/trunk/Makefile csw/mgar/pkg/bison/trunk/Makefile csw/mgar/pkg/boost/trunk/Makefile csw/mgar/pkg/bugzilla/trunk/Makefile csw/mgar/pkg/cabextract/trunk/Makefile csw/mgar/pkg/cadaver/trunk/Makefile csw/mgar/pkg/cfengine/trunk/Makefile csw/mgar/pkg/clearsilver/trunk/Makefile csw/mgar/pkg/climm/trunk/Makefile csw/mgar/pkg/clusterit/trunk/Makefile csw/mgar/pkg/clusterssh/trunk/Makefile csw/mgar/pkg/cmake/trunk/Makefile csw/mgar/pkg/coreutils/trunk/Makefile csw/mgar/pkg/cronolog/trunk/Makefile csw/mgar/pkg/ctags/trunk/Makefile csw/mgar/pkg/cups/trunk/Makefile csw/mgar/pkg/curl/trunk/Makefile csw/mgar/pkg/cvs/trunk/Makefile csw/mgar/pkg/cyrus_imapd/trunk/Makefile csw/mgar/pkg/daemontools/trunk/Makefile csw/mgar/pkg/dbus/trunk/Makefile csw/mgar/pkg/dbus-glib/trunk/Makefile csw/mgar/pkg/ddd/trunk/Makefile csw/mgar/pkg/diffutils/trunk/Makefile csw/mgar/pkg/distcc/trunk/Makefile csw/mgar/pkg/docbook/trunk/Makefile csw/mgar/pkg/easytag/trunk/Makefile csw/mgar/pkg/elinks/trunk/Makefile csw/mgar/pkg/emacs/trunk/Makefile csw/mgar/pkg/esvn/trunk/Makefile csw/mgar/pkg/ethereal/trunk/Makefile csw/mgar/pkg/eventlog/trunk/Makefile csw/mgar/pkg/exim/trunk/Makefile csw/mgar/pkg/expat/trunk/Makefile csw/mgar/pkg/fastcgi/trunk/Makefile csw/mgar/pkg/figlet/trunk/Makefile csw/mgar/pkg/fileutils/trunk/Makefile csw/mgar/pkg/findutils/trunk/Makefile csw/mgar/pkg/flac/trunk/Makefile csw/mgar/pkg/flphoto/trunk/Makefile csw/mgar/pkg/fltk/trunk/Makefile csw/mgar/pkg/fontconfig/trunk/Makefile csw/mgar/pkg/fox/trunk/Makefile csw/mgar/pkg/freeciv/trunk/Makefile csw/mgar/pkg/freetype/trunk/Makefile csw/mgar/pkg/gaim/trunk/Makefile csw/mgar/pkg/ganglia/trunk/Makefile csw/mgar/pkg/gawk/trunk/Makefile csw/mgar/pkg/gd/trunk/Makefile csw/mgar/pkg/gdbm/trunk/Makefile csw/mgar/pkg/gettext/trunk/Makefile csw/mgar/pkg/gforth/trunk/Makefile csw/mgar/pkg/gftp/trunk/Makefile csw/mgar/pkg/git/trunk/Makefile csw/mgar/pkg/gkrellm/trunk/Makefile csw/mgar/pkg/gmp/trunk/Makefile csw/mgar/pkg/gperf/trunk/Makefile csw/mgar/pkg/gphoto2/trunk/Makefile csw/mgar/pkg/graphviz/trunk/Makefile csw/mgar/pkg/graphviz2/trunk/Makefile csw/mgar/pkg/grep/trunk/Makefile csw/mgar/pkg/groff/trunk/Makefile csw/mgar/pkg/gtar/trunk/Makefile csw/mgar/pkg/gtkpod/trunk/Makefile csw/mgar/pkg/guile/trunk/Makefile csw/mgar/pkg/hicolor-icon-theme/trunk/Makefile csw/mgar/pkg/hylafax/trunk/Makefile csw/mgar/pkg/hypermail/trunk/Makefile csw/mgar/pkg/imapfilter/trunk/Makefile csw/mgar/pkg/inputproto/trunk/Makefile csw/mgar/pkg/iozone/trunk/Makefile csw/mgar/pkg/irssi/trunk/Makefile csw/mgar/pkg/jboss4/trunk/Makefile csw/mgar/pkg/jetty6/trunk/Makefile csw/mgar/pkg/jhead/trunk/Makefile csw/mgar/pkg/jicmp/trunk/Makefile csw/mgar/pkg/joe/trunk/Makefile csw/mgar/pkg/jrrd/trunk/Makefile csw/mgar/pkg/kbproto/trunk/Makefile csw/mgar/pkg/kdesvn/trunk/Makefile csw/mgar/pkg/kile/trunk/Makefile csw/mgar/pkg/koffice/trunk/Makefile csw/mgar/pkg/krb5/trunk/Makefile csw/mgar/pkg/ksh/trunk/Makefile csw/mgar/pkg/ldapvi/trunk/Makefile csw/mgar/pkg/less/trunk/Makefile csw/mgar/pkg/libX11/trunk/Makefile csw/mgar/pkg/libao/trunk/Makefile csw/mgar/pkg/libart/trunk/Makefile csw/mgar/pkg/libcairo/trunk/Makefile csw/mgar/pkg/libdvdcss/trunk/Makefile csw/mgar/pkg/libdvdread/trunk/Makefile csw/mgar/pkg/libevent/trunk/Makefile csw/mgar/pkg/libglade/trunk/Makefile csw/mgar/pkg/libgphoto2/trunk/Makefile csw/mgar/pkg/libgpod/trunk/Makefile csw/mgar/pkg/libgsasl/trunk/Makefile csw/mgar/pkg/libmp4v2/trunk/Makefile csw/mgar/pkg/libntlm/trunk/Makefile csw/mgar/pkg/libogg/trunk/Makefile csw/mgar/pkg/libpcap/trunk/Makefile csw/mgar/pkg/libpthread-stubs/trunk/Makefile csw/mgar/pkg/libsamplerate/trunk/Makefile csw/mgar/pkg/libsdl/trunk/Makefile csw/mgar/pkg/libtool/trunk/Makefile csw/mgar/pkg/libvorbis/trunk/Makefile Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -15,6 +15,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION)-$(GARSUBREV).tar.bz2 DISTFILES += $(call admfiles,CSWimagick,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)-(\d+).tar.bz2 + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-perl=$(bindir)/perl CONFIGURE_ARGS += --enable-shared --disable-static Modified: csw/mgar/pkg/a52dec/trunk/Makefile =================================================================== --- csw/mgar/pkg/a52dec/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/a52dec/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWliba52, depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) --enable-shared --disable-static Modified: csw/mgar/pkg/amarok/trunk/Makefile =================================================================== --- csw/mgar/pkg/amarok/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/amarok/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -12,6 +12,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWamarok,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + PATCHFILES = disable-broken-languages.diff PATCHFILES += gpod-stdint.h.diff Modified: csw/mgar/pkg/amavisd-new/trunk/Makefile =================================================================== --- csw/mgar/pkg/amavisd-new/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/amavisd-new/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWamavisdnew, depend postinstall preinstall prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + PATCHFILES += amavisd-agent.diff PATCHFILES += amavisd-nanny.diff PATCHFILES += amavisd-release.diff Modified: csw/mgar/pkg/apache/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/apache/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -11,6 +11,9 @@ MASTER_SITES = http://www.ibiblio.org/pub/mirrors/apache/httpd/ DISTFILES = $(GARNAME)_$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)_(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-apr=$(prefix) CONFIGURE_ARGS += --with-apr-util=$(prefix) Modified: csw/mgar/pkg/apcupsd/trunk/Makefile =================================================================== --- csw/mgar/pkg/apcupsd/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/apcupsd/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -15,6 +15,9 @@ DISTFILES += $(call admfiles,CSWapcupsd, depend prototype postinstall) DISTFILES += cswapcupsd +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + SPKG_CLASSES = none cswinitsmf CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/apg/trunk/Makefile =================================================================== --- csw/mgar/pkg/apg/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/apg/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -10,6 +10,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWapg) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk Modified: csw/mgar/pkg/apr/trunk/Makefile =================================================================== --- csw/mgar/pkg/apr/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/apr/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -15,6 +15,9 @@ DISTFILES += $(call admfiles,CSWapr-devel,depend prototype) DISTFILES += config.layout +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = --prefix=$(prefix) CONFIGURE_ARGS += --enable-layout=csw CONFIGURE_ARGS += --enable-threads Modified: csw/mgar/pkg/apr-util/trunk/Makefile =================================================================== --- csw/mgar/pkg/apr-util/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/apr-util/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -17,6 +17,9 @@ DISTFILES += $(call admfiles,CSWaprutil-devel,depend prototype) DISTFILES += config.layout +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # Force use of GNU iconv PATCHFILES += iconv.diff Modified: csw/mgar/pkg/asciidoc/trunk/Makefile =================================================================== --- csw/mgar/pkg/asciidoc/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/asciidoc/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -20,6 +20,9 @@ DISTFILES += CSWasciidoc.gspec CSWasciidoc.depend DISTFILES += $(AUTOFILES) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk Modified: csw/mgar/pkg/atk/trunk/Makefile =================================================================== --- csw/mgar/pkg/atk/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/atk/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -14,6 +14,9 @@ MASTER_SITES = http://ftp.gnome.org/pub/gnome/sources/atk/1.6/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + LIBDEPS += lib/glib2 CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/audiofile/trunk/Makefile =================================================================== --- csw/mgar/pkg/audiofile/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/audiofile/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -16,6 +16,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWaudiofile) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/authz-tools/trunk/Makefile =================================================================== --- csw/mgar/pkg/authz-tools/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/authz-tools/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -18,6 +18,9 @@ #DISTFILES += $(call admfiles,CSWauthztools,depend,prototype) DISTFILES += $(call admfiles,CSWauthztools,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = Modified: csw/mgar/pkg/avantfax/trunk/Makefile =================================================================== --- csw/mgar/pkg/avantfax/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/avantfax/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -16,6 +16,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tgz DISTFILES += $(call admfiles,CSWavantfax,depend preinstall postinstall) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = Modified: csw/mgar/pkg/balance/trunk/Makefile =================================================================== --- csw/mgar/pkg/balance/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/balance/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -13,6 +13,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWbalance,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # Configure for build with SunONE PATCHFILES = build.diff Modified: csw/mgar/pkg/bdb4/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb4/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/bdb4/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -17,6 +17,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += CSWbdb4.gspec +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # See http://www.sleepycat.com/update/4.1.25/patch.4.1.25.html PATCHFILES += 4.1.25.1.diff 4.1.25.2.diff PATCHDIRLEVEL = 0 Modified: csw/mgar/pkg/bdb43/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb43/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/bdb43/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -19,6 +19,9 @@ DISTFILES += $(call admfiles,CSWbdb43-devel,depend prototype) DISTFILES += $(call admfiles,CSWbdb43-doc,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/build_unix CONFIGURE_SCRIPTS = dist Modified: csw/mgar/pkg/bdb44/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb44/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/bdb44/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -19,6 +19,9 @@ DISTFILES += $(call admfiles,CSWbdb44-devel,depend prototype) DISTFILES += $(call admfiles,CSWbdb44-doc,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/build_unix Modified: csw/mgar/pkg/bdb46/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb46/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/bdb46/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -19,6 +19,9 @@ DISTFILES += $(call admfiles,CSWbdb46-devel,depend prototype) DISTFILES += $(call admfiles,CSWbdb46-doc,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)/build_unix Modified: csw/mgar/pkg/bind/trunk/Makefile =================================================================== --- csw/mgar/pkg/bind/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/bind/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -14,10 +14,14 @@ high-volume and high-reliability applications. endef +UPSTREAM_MASTER_SITES = http://ftp.isc.org/isc/bind9/ MASTER_SITES = http://ftp.isc.org/isc/bind9/$(GARVERSION)-$(RELEASE)/ DISTFILES = $(GARNAME)-$(GARVERSION)-$(RELEASE).tar.gz DISTFILES += $(call admfiles,CSWbind,preinstall postinstall preremove) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = (\d+(?:\.\d+)*)-([A-Z][0-9]) + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-libtool CONFIGURE_ARGS += --with-openssl=/opt/csw Modified: csw/mgar/pkg/bison/trunk/Makefile =================================================================== --- csw/mgar/pkg/bison/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/bison/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -12,6 +12,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWbison,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + TAR_ARGS = CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/boost/trunk/Makefile =================================================================== --- csw/mgar/pkg/boost/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/boost/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -20,6 +20,9 @@ DISTFILES = $(GARNAME)_$(DISTVERSION).tar.bz2 DISTFILES += CSWboost.gspec +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + WORKSRC = $(WORKDIR)/$(GARNAME)_$(DISTVERSION) CONFIGURE_SCRIPTS = Modified: csw/mgar/pkg/bugzilla/trunk/Makefile =================================================================== --- csw/mgar/pkg/bugzilla/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/bugzilla/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWbugzilla,prototype depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # Adjust the shebang path for all scripts PATCHFILES += perlpath.diff Modified: csw/mgar/pkg/cabextract/trunk/Makefile =================================================================== --- csw/mgar/pkg/cabextract/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/cabextract/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -16,6 +16,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWcabextract,prototype depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) # cabextract doesn't have a test target Modified: csw/mgar/pkg/cadaver/trunk/Makefile =================================================================== --- csw/mgar/pkg/cadaver/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/cadaver/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -9,6 +9,7 @@ endef MASTER_SITES = http://www.webdav.org/cadaver/ +UPSTREAM_MASTER_SITES = http://www.webdav.org/cadaver/ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -17,6 +18,9 @@ DISTFILES += $(call admfiles,CSWcadav,prototype depend) DISTFILES += changelog.CSW +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # add destdir support to makefile PATCHFILES = destdir.patch Modified: csw/mgar/pkg/cfengine/trunk/Makefile =================================================================== --- csw/mgar/pkg/cfengine/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/cfengine/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -17,6 +17,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWcfengine,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # Requires GNU texi PATCHFILES = nodoc.diff Modified: csw/mgar/pkg/clearsilver/trunk/Makefile =================================================================== --- csw/mgar/pkg/clearsilver/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/clearsilver/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -16,6 +16,9 @@ DISTFILES += $(call admfiles,CSWpmcs,depend prototype) DISTFILES += $(call admfiles,CSWpycs,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # Remove an unneeded linux-only header PATCHFILES += linuxheader.diff Modified: csw/mgar/pkg/climm/trunk/Makefile =================================================================== --- csw/mgar/pkg/climm/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/climm/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -13,6 +13,9 @@ DISTFILES += $(call admfiles,CSWclimm,prototype depend) DISTFILES += climm.patch +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz + PATCHFILES = climm.patch CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/clusterit/trunk/Makefile =================================================================== --- csw/mgar/pkg/clusterit/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/clusterit/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -12,6 +12,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWclusterit,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + PREFIX = /opt/csw/$(GARNAME) CONFIGURE_ARGS = --prefix=$(PREFIX) Modified: csw/mgar/pkg/clusterssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/clusterssh/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/clusterssh/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -12,6 +12,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWclusterssh,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + PREFIX = /opt/csw/ CONFIGURE_ARGS = --prefix=$(PREFIX) Modified: csw/mgar/pkg/cmake/trunk/Makefile =================================================================== --- csw/mgar/pkg/cmake/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/cmake/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -12,10 +12,14 @@ generation, code generation, and template instantiation. endef +UPSTREAM_MASTER_SITES = http://www.cmake.org/files/ MASTER_SITES = http://www.cmake.org/files/v2.6/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWcmake) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = (\d+(?:\.\d+)*) + datadir = /share/$(GARNAME)-$(GARVERSION) sharedstatedir = /share docdir = /share/doc/$(GARNAME)-$(GARVERSION) Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -16,6 +16,9 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + # Prevent autoconf from running --recheck PATCHFILES += autoconf.diff Modified: csw/mgar/pkg/cronolog/trunk/Makefile =================================================================== --- csw/mgar/pkg/cronolog/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/cronolog/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -14,6 +14,9 @@ MASTER_SITES = http://www.cronolog.org/download/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk Modified: csw/mgar/pkg/ctags/trunk/Makefile =================================================================== --- csw/mgar/pkg/ctags/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/ctags/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -15,6 +15,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += CSWctags.gspec CSWctags.prototype +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # Respect DESTDIR PATCHFILES += install.diff Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/cups/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -32,6 +32,9 @@ DISTFILES += i.smfyes i.smfno space checkinstall +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = cups-(\d+(?:\.\d+)*)-source.tar.bz2 + LD_OPTIONS = -R/opt/csw/lib/\$$ISALIST -R/opt/csw/lib CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/curl/trunk/Makefile =================================================================== --- csw/mgar/pkg/curl/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/curl/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -17,6 +17,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWcurl,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + LIBDEPS += lib/openssl CONFIGURE_ARGS = $(DIRPATHS) --with-ssl Modified: csw/mgar/pkg/cvs/trunk/Makefile =================================================================== --- csw/mgar/pkg/cvs/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/cvs/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -16,11 +16,15 @@ endef MASTER_SITES = http://ftp.gnu.org/non-gnu/cvs/source/stable/$(GARVERSION)/ +UPSTREAM_MASTER_SITES = http://ftp.gnu.org/non-gnu/cvs/source/stable/ DISTFILES = $(DISTNAME).tar.bz2 DISTFILES += $(call admfiles,CSWcvs,) CONFIGURE_ARGS = $(DIRPATHS) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = (\d+(?:\.\d+)*) + TEST_TARGET = check # Test suite won't run as root! Modified: csw/mgar/pkg/cyrus_imapd/trunk/Makefile =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -33,6 +33,9 @@ DISTFILES += cyrus_imapd_utils.changelog.CSW DISTFILES += pm_cyrus.changelog.CSW +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(shell echo $(GARNAME) | tr '_' '-')-(\d+(?:\.\d+)*).tar.gz + # compile_et is not provided by krb5lib_dev so we must provide our own version # taken from the krb5 source. DISTFILES += compile_et et_c.awk et_h.awk Modified: csw/mgar/pkg/daemontools/trunk/Makefile =================================================================== --- csw/mgar/pkg/daemontools/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/daemontools/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -14,6 +14,10 @@ #PATCHFILES = daemontools-0.70-man.diff.bz2 +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + + CONFIGURE_SCRIPTS = custom BUILD_SCRIPTS = custom INSTALL_SCRIPTS = custom Modified: csw/mgar/pkg/dbus/trunk/Makefile =================================================================== --- csw/mgar/pkg/dbus/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/dbus/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -18,6 +18,9 @@ DISTFILES += CSWlibdbusdev.gspec CSWlibdbusdev.prototype CSWlibdbusdev.depend # DISTFILES += $(call admfiles,CSWdbus, depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CFLAGS += -xlibmil -errtags=yes -erroff=E_EMPTY_DECLARATION CXXFLAGS += -xlibmil -xlibmopt -features=tmplife -norunpath LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib Modified: csw/mgar/pkg/dbus-glib/trunk/Makefile =================================================================== --- csw/mgar/pkg/dbus-glib/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/dbus-glib/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -13,6 +13,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + DISTFILES += CSWdbusglib.gspec CSWdbusglib.prototype CSWdbusglib.depend DISTFILES += CSWdbusglibdev.gspec CSWdbusglibdev.prototype CSWdbusglibdev.depend # DISTFILES += $(call admfiles,CSWdbusglib, depend) Modified: csw/mgar/pkg/ddd/trunk/Makefile =================================================================== --- csw/mgar/pkg/ddd/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/ddd/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -13,6 +13,9 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + ifneq ($(BUILD_XDEPS),0) LIBDEPS = lib/ncurses lib/readline endif Modified: csw/mgar/pkg/diffutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/diffutils/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/diffutils/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -10,6 +10,9 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/distcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/distcc/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/distcc/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -19,6 +19,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWdistcc,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/docbook/trunk/Makefile =================================================================== --- csw/mgar/pkg/docbook/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/docbook/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -14,6 +14,10 @@ MASTER_SITES = $(SF_MIRROR)/$(GARNAME)/ DISTFILES = $(GARNAME)-xsl-$(GARVERSION).tar.bz2 +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-xsl-(\d+(?:\.\d+)*).tar.bz2 + + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = Modified: csw/mgar/pkg/easytag/trunk/Makefile =================================================================== --- csw/mgar/pkg/easytag/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/easytag/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -11,6 +11,8 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWeasytag,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 GARCOMPILER = GNU Modified: csw/mgar/pkg/elinks/trunk/Makefile =================================================================== --- csw/mgar/pkg/elinks/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/elinks/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -19,6 +19,9 @@ DISTFILES += $(call admfiles,CSWelinks,prototype depend) DISTFILES += changelog.CSW +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + # suppress the rdynamic test which doesn't # work correctly # PATCHFILES = configure_no_rdynamic.patch Modified: csw/mgar/pkg/emacs/trunk/Makefile =================================================================== --- csw/mgar/pkg/emacs/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/emacs/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -17,6 +17,9 @@ #DISTFILES += CSWemacsrt.gspec CSWemacs.gspec CSWxemacs.gspec #DISTFILES += CSWemacsrt.prototype CSWemacs.prototype CSWxemacs.prototype +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)([a-z]).tar.gz + # Force make to acknowledge DESTDIR #PATCHFILES += destdir.diff Modified: csw/mgar/pkg/esvn/trunk/Makefile =================================================================== --- csw/mgar/pkg/esvn/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/esvn/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -12,6 +12,9 @@ DISTFILES = $(GARNAME)-$(DISTVERSION).tar.gz WORKSRC = $(WORKDIR)/$(GARNAME) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # Specs and pre-built prototypes #DISTFILES += CSWesvn.gspec #DISTFILES += CSWesvn.gspec CSWesvn.prototype Modified: csw/mgar/pkg/ethereal/trunk/Makefile =================================================================== --- csw/mgar/pkg/ethereal/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/ethereal/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -13,6 +13,9 @@ MASTER_SITES = http://www.ethereal.com/distribution/ DISTFILES = $(DISTNAME).tar.bz2 +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + DEPENDS += lib/libpcap DEPENDS += lib/gtk2 Modified: csw/mgar/pkg/eventlog/trunk/Makefile =================================================================== --- csw/mgar/pkg/eventlog/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/eventlog/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -18,6 +18,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWeventlog,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) GARCOMPILER = GNU Modified: csw/mgar/pkg/exim/trunk/Makefile =================================================================== --- csw/mgar/pkg/exim/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/exim/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -21,6 +21,9 @@ DISTFILES += Makefile.patch exim_install.patch spf2.patch DISTFILES += i.smfyes i.smfno +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + PATCHFILES = Makefile.patch exim_install.patch spf2.patch LD_OPTIONS = -R/opt/csw/lib/\$$ISALIST -R/opt/csw/lib Modified: csw/mgar/pkg/expat/trunk/Makefile =================================================================== --- csw/mgar/pkg/expat/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/expat/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -14,6 +14,9 @@ DISTFILES += $(call admfiles,CSWexpat,depend prototype) DISTFILES += $(call admfiles,CSWexpat-devel,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # Compatibility libraries EXTLIBS += libexpat.so.0.4.0 EXTLIBS += libexpat.so.0.5.0 Modified: csw/mgar/pkg/fastcgi/trunk/Makefile =================================================================== --- csw/mgar/pkg/fastcgi/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/fastcgi/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -19,6 +19,10 @@ DISTFILES += CSWfastcgi.gspec CSWfastcgi.depend CSWfastcgi.prototype #DISTFILES += CSWfastcgidoc.gspec CSWfastcgidoc.depend CSWfastcgidoc.prototype +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = fcgi-(\d+(?:\.\d+)*).tar.gz + + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/figlet/trunk/Makefile =================================================================== --- csw/mgar/pkg/figlet/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/figlet/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -21,6 +21,9 @@ DISTNAME = $(GARNAME)$(RELEASE) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)(\d+(?:\.\d+)*).tar.gz + # We don't have this modern autoconfig-doodle-crap CONFIGURE_SCRIPTS = Modified: csw/mgar/pkg/fileutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/fileutils/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/fileutils/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -10,6 +10,9 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/findutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/findutils/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/findutils/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -16,6 +16,9 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # Fix up prototypes PATCHFILES = prototypes.patch Modified: csw/mgar/pkg/flac/trunk/Makefile =================================================================== --- csw/mgar/pkg/flac/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/flac/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -18,6 +18,10 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWflac,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + + LIBDEPS += lib/libogg CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/flphoto/trunk/Makefile =================================================================== --- csw/mgar/pkg/flphoto/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/flphoto/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -11,6 +11,10 @@ DISTFILES = $(GARNAME)-$(GARVERSION)-source.tar.gz DISTFILES += $(call admfiles,CSWflphoto, prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + + PATCHFILES = Fl_Image_Display.cxx.diff PATCHFILES = gamma.cxx.diff PATCHFILES = export.cxx.diff Modified: csw/mgar/pkg/fltk/trunk/Makefile =================================================================== --- csw/mgar/pkg/fltk/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/fltk/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -8,9 +8,14 @@ endef MASTER_SITES = http://ftp.easysw.com/pub/fltk/1.1.7/ +UPSTREAM_MASTER_SITES = http://ftp.easysw.com/pub/fltk/ + DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWfltk,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = (\d+(?:\.\d+)*) + PATCHFILES = makeincludes.diff CONFIGURE_ARGS = $(DIRPATHS) --mandir=/opt/csw/share/man --disable-localpng --disable-localjpeg --disable-localzlib --enable-shared Modified: csw/mgar/pkg/fontconfig/trunk/Makefile =================================================================== --- csw/mgar/pkg/fontconfig/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/fontconfig/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -14,6 +14,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWfconfig,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk Modified: csw/mgar/pkg/fox/trunk/Makefile =================================================================== --- csw/mgar/pkg/fox/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/fox/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -12,6 +12,9 @@ DISTFILES += $(call admfiles,CSWfoxrt, depend prototype ) DISTFILES += $(call admfiles,CSWfox, depend prototype ) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + LD=CC CONFIGURE_ARGS = $(DIRPATHS) --enable-release --with-shape=no --with-xshm=no --disable-threadsafe Modified: csw/mgar/pkg/freeciv/trunk/Makefile =================================================================== --- csw/mgar/pkg/freeciv/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/freeciv/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWfreeciv, depend prototype ) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + GARCOMPILER = GNU PATCHFILES = dataio.c.diff Modified: csw/mgar/pkg/freetype/trunk/Makefile =================================================================== --- csw/mgar/pkg/freetype/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/freetype/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -17,6 +17,9 @@ MASTER_SITES = $(SF_MIRROR)/$(GARNAME)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/gaim/trunk/Makefile =================================================================== --- csw/mgar/pkg/gaim/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/gaim/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -14,6 +14,9 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + ifneq ($(BUILD_XDEPS),0) LIBDEPS = lib/libao endif Modified: csw/mgar/pkg/ganglia/trunk/Makefile =================================================================== --- csw/mgar/pkg/ganglia/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/ganglia/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -14,6 +14,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWpackage,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # This is attachment #45 from Ganglia bug # http://bugzilla.ganglia.info/cgi-bin/bugzilla/show_bug.cgi?id=77 PATCHFILES = $(GARNAME)-$(GARVERSION)-solaris-cc.patch Modified: csw/mgar/pkg/gawk/trunk/Makefile =================================================================== --- csw/mgar/pkg/gawk/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/gawk/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -11,6 +11,9 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) INSTALL_ARGS = $(foreach VAR, bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir infodir mandir includedir,$(VAR)=$($(VAR))) Modified: csw/mgar/pkg/gd/trunk/Makefile =================================================================== --- csw/mgar/pkg/gd/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/gd/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -13,6 +13,9 @@ DISTFILES += $(call admfiles,CSWgd,depend prototype) DISTFILES += $(call admfiles,CSWgd-devel,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk Modified: csw/mgar/pkg/gdbm/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdbm/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/gdbm/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -13,6 +13,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWgdbm,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # Makefile install permissions patch PATCHFILES = perms.diff Modified: csw/mgar/pkg/gettext/trunk/Makefile =================================================================== --- csw/mgar/pkg/gettext/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/gettext/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -10,6 +10,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWggettext) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + EXTRA_BUILD_ISAS_sparc = sparcv9 EXTRA_BUILD_ISAS_i386 = amd64 Modified: csw/mgar/pkg/gforth/trunk/Makefile =================================================================== --- csw/mgar/pkg/gforth/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/gforth/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -16,6 +16,9 @@ DISTFILES += $(call admfiles,CSWgforth,prototype) PATCHFILES = gforth-DESTDIR.diff +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # Compile with GCC GARCOMPILER = GNU Modified: csw/mgar/pkg/gftp/trunk/Makefile =================================================================== --- csw/mgar/pkg/gftp/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/gftp/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -14,6 +14,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWgftp, depend ) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + CONFIGURE_ARGS = $(DIRPATHS) --disable-nls TEST_TARGET = check Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/git/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -13,6 +13,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWgit,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + PREREQUISITE_PKGS = CSWasciidoc CSWossldevel CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/gkrellm/trunk/Makefile =================================================================== --- csw/mgar/pkg/gkrellm/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/gkrellm/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -18,6 +18,9 @@ MASTER_SITES = http://members.dslextreme.com/users/billw/$(GARNAME)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + # Patch up makefile to honor environment variables PATCHFILES = suncc.diff Modified: csw/mgar/pkg/gmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/gmp/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/gmp/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -21,6 +21,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWgmp,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + TEST_TARGET = check CONFIGURE_ARGS = ABI=32 $(DIRPATHS) Modified: csw/mgar/pkg/gperf/trunk/Makefile =================================================================== --- csw/mgar/pkg/gperf/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/gperf/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -15,6 +15,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWgperf) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/gphoto2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gphoto2/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/gphoto2/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -15,6 +15,9 @@ # 'cc' is a shell script to hack around libtool craziness DISTFILES += cc +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + DEPENDS += lib/libgphoto2 PWD = $(shell pwd) Modified: csw/mgar/pkg/graphviz/trunk/Makefile =================================================================== --- csw/mgar/pkg/graphviz/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/graphviz/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -13,6 +13,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWgraphviz,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/graphviz2/trunk/Makefile =================================================================== --- csw/mgar/pkg/graphviz2/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/graphviz2/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -12,6 +12,9 @@ MASTER_SITES = http://www.graphviz.org/pub/graphviz/ARCHIVE/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/grep/trunk/Makefile =================================================================== --- csw/mgar/pkg/grep/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/grep/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -17,6 +17,9 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + # Patch makefile to honor DESTDIR PATCHFILES = install.diff Modified: csw/mgar/pkg/groff/trunk/Makefile =================================================================== --- csw/mgar/pkg/groff/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/groff/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -16,6 +16,9 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) INSTALL_OVERRIDE_DIRS = bindir datadir Modified: csw/mgar/pkg/gtar/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtar/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/gtar/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -18,6 +18,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWgtar,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) --program-prefix=g TEST_SCRIPTS = Modified: csw/mgar/pkg/gtkpod/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtkpod/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/gtkpod/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -17,6 +17,9 @@ DISTFILES += $(call admfiles,CSWgtkpod) PATCHFILES = file_convert.diff +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + GARCOMPILER = GNU LIBDEPS += lib/libgpod Modified: csw/mgar/pkg/guile/trunk/Makefile =================================================================== --- csw/mgar/pkg/guile/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/guile/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -12,6 +12,9 @@ DISTFILES += $(call admfiles,CSWguile,$(ADMSTANDARD)) DISTFILES += $(call admfiles,CSWguilelib12,$(ADMSTANDARD)) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) TEST_SCRIPTS = Modified: csw/mgar/pkg/hicolor-icon-theme/trunk/Makefile =================================================================== --- csw/mgar/pkg/hicolor-icon-theme/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/hicolor-icon-theme/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -10,6 +10,9 @@ MASTER_SITES = http://freedesktop.org/Software/icon-theme/releases/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_SCRIPTS = $(WORKSRC)/configure BUILD_SCRIPTS = $(WORKSRC)/Makefile INSTALL_SCRIPTS = $(WORKSRC)/Makefile Modified: csw/mgar/pkg/hylafax/trunk/Makefile =================================================================== --- csw/mgar/pkg/hylafax/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/hylafax/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -13,6 +13,9 @@ DISTFILES += config.site.CSW #DISTFILES += cswhylafax.init cswhylafax.xml svc-cswhylafax +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + PATCHFILES = patch-hylafax.diff PREREQUISITE_PKGS = CSWoldapdevel Modified: csw/mgar/pkg/hypermail/trunk/Makefile =================================================================== --- csw/mgar/pkg/hypermail/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/hypermail/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -17,6 +17,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWhypermail,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # configure cancels out env LDFLAGS by default PATCHFILES += ldflag.diff # force Makefiles to honor DESTDIR Modified: csw/mgar/pkg/imapfilter/trunk/Makefile =================================================================== --- csw/mgar/pkg/imapfilter/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/imapfilter/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -16,6 +16,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += CSWimapfilter.gspec CSWimapfilter.depend CSWimapfilter.prototype +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + # Remove anti-social makeflags PATCHFILES += make.diff Modified: csw/mgar/pkg/inputproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/inputproto/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/inputproto/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + DISTFILES += $(call admfiles,CSWinputproto, depend) LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib Modified: csw/mgar/pkg/iozone/trunk/Makefile =================================================================== --- csw/mgar/pkg/iozone/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/iozone/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -19,6 +19,9 @@ DISTNAME = $(GARNAME)$(VERSION) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)(\d+(?:\.\d+)*).tar + PATCHFILES = patch-vx_ioctl.diff DOCS = IOzone_msword_98.pdf Modified: csw/mgar/pkg/irssi/trunk/Makefile =================================================================== --- csw/mgar/pkg/irssi/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/irssi/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -15,6 +15,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWirssi, postinstall depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-ipv6 CONFIGURE_ARGS += --with-socks Modified: csw/mgar/pkg/jboss4/trunk/Makefile =================================================================== --- csw/mgar/pkg/jboss4/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/jboss4/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -13,6 +13,9 @@ DISTFILES += CSWjboss4.gspec CSWjboss4.prototype CSWjboss4.depend preremove postinstall preinstall checkinstall space i.smfno i.smfyes svc-jboss4 jboss4.xml jboss4.conf cswjboss4 # DISTFILES += $(call admfiles, CSWjboss4, depend ) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = jboss-(\d+(?:\.\d+)*).zip + CONFIGURE_SCRIPTS = none BUILD_SCRIPTS = none TEST_SCRIPTS = none Modified: csw/mgar/pkg/jetty6/trunk/Makefile =================================================================== --- csw/mgar/pkg/jetty6/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/jetty6/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -21,6 +21,9 @@ DISTFILES += $(call admfiles,CSW$(GARNAME),prototype csw_usrgrp_config postinstall) DISTFILES += $(call admfiles,CSW$(GARNAME)doc,prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = jetty-(\d+(?:\.\d+)*).zip + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = Modified: csw/mgar/pkg/jhead/trunk/Makefile =================================================================== --- csw/mgar/pkg/jhead/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/jhead/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += CSWjhead.gspec CSWjhead.prototype +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + PATCHFILES = makefile.patch # jhead doesn't use configure Modified: csw/mgar/pkg/jicmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/jicmp/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/jicmp/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -8,6 +8,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWjicmp,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + PATCHFILES = gar-base.diff CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/joe/trunk/Makefile =================================================================== --- csw/mgar/pkg/joe/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/joe/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -22,6 +22,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWjoe,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) # joe doesn't have a test target Modified: csw/mgar/pkg/jrrd/trunk/Makefile =================================================================== --- csw/mgar/pkg/jrrd/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/jrrd/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -8,6 +8,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWjrrd,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-java=/usr/jdk/latest CONFIGURE_ARGS += --disable-rpm-rules Modified: csw/mgar/pkg/kbproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/kbproto/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/kbproto/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + DISTFILES += $(call admfiles,CSWkbproto, depend) LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib Modified: csw/mgar/pkg/kdesvn/trunk/Makefile =================================================================== --- csw/mgar/pkg/kdesvn/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/kdesvn/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -15,6 +15,9 @@ DISTFILES += $(call admfiles,CSWkdesvn,) #DISTFILES += $(call admfiles,CSWkdesvn,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + #CONFIGURE_ARGS = $(DIRPATHS) LD_OPTIONS = -R/opt/csw/kde-gcc/lib -R/opt/csw/lib/\$$ISALIST -R/opt/csw/lib Modified: csw/mgar/pkg/kile/trunk/Makefile =================================================================== --- csw/mgar/pkg/kile/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/kile/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -14,6 +14,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWkile,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + # Compile with GCC GARCOMPILER = GNU Modified: csw/mgar/pkg/koffice/trunk/Makefile =================================================================== --- csw/mgar/pkg/koffice/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/koffice/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -11,6 +11,8 @@ #DISTFILES += Templates, addons, etc... DISTFILES += $(call admfiles,CSWkofficegcc,) DISTFILES += $(call admfiles,CSWkofficeaddons,) +# We define upstream file regex so we can be notifed of new upstream software release +#UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz DEPENDS += Modified: csw/mgar/pkg/krb5/trunk/Makefile =================================================================== --- csw/mgar/pkg/krb5/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/krb5/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -20,6 +20,9 @@ DISTFILES += $(call admfiles,CSWkrb5libdev,depend) DISTFILES += $(call admfiles,CSWkrb5user,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)-signed.tar + PATCHFILES = patch-man2html-perl.diff PATCHFILES += patch-ldap-const.diff Modified: csw/mgar/pkg/ksh/trunk/Makefile =================================================================== --- csw/mgar/pkg/ksh/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/ksh/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -15,6 +15,9 @@ #DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWksh,) +# We define upstream file regex so we can be notifed of new upstream software release +# UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk Modified: csw/mgar/pkg/ldapvi/trunk/Makefile =================================================================== --- csw/mgar/pkg/ldapvi/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/ldapvi/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -13,6 +13,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWldapvi,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + PATCHFILES = patch-putenv.diff PREREQUISITE_PKGS = CSWoldapdevel Modified: csw/mgar/pkg/less/trunk/Makefile =================================================================== --- csw/mgar/pkg/less/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/less/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -12,6 +12,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWless,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + PREREQUISITE_PKGS = CSWncurses CSWggettext CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/libX11/trunk/Makefile =================================================================== --- csw/mgar/pkg/libX11/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/libX11/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + DISTFILES += CSWlibX11.gspec CSWlibX11.prototype CSWlibX11.depend DISTFILES += CSWlibX11dev.gspec CSWlibX11dev.prototype CSWlibX11dev.depend # DISTFILES += $(call admfiles,CSWlibX11, depend) Modified: csw/mgar/pkg/libao/trunk/Makefile =================================================================== --- csw/mgar/pkg/libao/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/libao/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -13,6 +13,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWlibao,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/libart/trunk/Makefile =================================================================== --- csw/mgar/pkg/libart/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/libart/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -42,6 +42,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWlibart) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + WORKDIR = $(WORKROOTDIR)/$(DESTIMG).d/$(ISA) COOKIEROOTDIR = cookies.$(ISA) COOKIEDIR = $(COOKIEROOTDIR) Modified: csw/mgar/pkg/libcairo/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcairo/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/libcairo/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -21,6 +21,9 @@ export CFLAGS CXXFLAGS LDFLAGS +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + GREP = ggrep include gar/category.mk Modified: csw/mgar/pkg/libdvdcss/trunk/Makefile =================================================================== --- csw/mgar/pkg/libdvdcss/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/libdvdcss/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWlibdvdcss, depend ) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + GARCOMPILER ?= GNU CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/libdvdread/trunk/Makefile =================================================================== --- csw/mgar/pkg/libdvdread/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/libdvdread/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWlibdvdread, depend ) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) TEST_SCRIPTS = Modified: csw/mgar/pkg/libevent/trunk/Makefile =================================================================== --- csw/mgar/pkg/libevent/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/libevent/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -17,6 +17,9 @@ DISTFILES += $(call admfiles,CSWlibevent,depend prototype) DISTFILES += $(call admfiles,CSWlibevent-devel,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + GARCOMPILER = GNU # Adjust test.sh shell Modified: csw/mgar/pkg/libglade/trunk/Makefile =================================================================== --- csw/mgar/pkg/libglade/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/libglade/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWlibglade,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) --disable-nls TEST_SCRIPTS = Modified: csw/mgar/pkg/libgphoto2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgphoto2/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/libgphoto2/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -20,6 +20,9 @@ # 'cc' is a shell script to hack around libtool craziness DISTFILES += cc +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + LD_OPTIONS = -R/opt/csw/lib/\$$ISALIST -R/opt/csw/lib # We need these directories in EXTRA_INC to make sure they appear before Modified: csw/mgar/pkg/libgpod/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgpod/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/libgpod/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -15,6 +15,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWlibgpod,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + GARCOMPILER = GNU #GCC4 won't work. There are too many libtool deps using GCC3 GNU_CC_HOME = /opt/csw/gcc3 Modified: csw/mgar/pkg/libgsasl/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgsasl/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/libgsasl/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -14,6 +14,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWlibgsasl,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + PREREQUISITE_PKGS = CSWkrb5libdev CSWlibntlm CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/libmp4v2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmp4v2/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/libmp4v2/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -17,6 +17,9 @@ PATCHFILES += include-limits.h.diff PATCHFILES += stdint-to-inttypes.h.diff +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + GARCOMPILER = GNU CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/libntlm/trunk/Makefile =================================================================== --- csw/mgar/pkg/libntlm/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/libntlm/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -15,6 +15,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWlibntlm,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/libogg/trunk/Makefile =================================================================== --- csw/mgar/pkg/libogg/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/libogg/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -12,6 +12,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWlibogg,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/libpcap/trunk/Makefile =================================================================== --- csw/mgar/pkg/libpcap/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/libpcap/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWlibpcap,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # Shared libraries patch PATCHFILES = solib.diff Modified: csw/mgar/pkg/libpthread-stubs/trunk/Makefile =================================================================== --- csw/mgar/pkg/libpthread-stubs/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/libpthread-stubs/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # DISTFILES += CSWlibpthreadstubs.gspec CSWlibpthreadstubs.prototype CSWlibpthreadstubs.depend # DISTFILES += CSWlibpthreadstubsdev.gspec CSWlibpthreadstubsdev.prototype CSWlibpthreadstubsdev.depend DISTFILES += $(call admfiles,CSWlibpthreadstubs, depend) Modified: csw/mgar/pkg/libsamplerate/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsamplerate/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/libsamplerate/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -15,6 +15,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWlibsamplerate,prototype depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + PATCHFILES += $(notdir $(wildcard $(FILEDIR)/*.patch)) CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/libsdl/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsdl/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/libsdl/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -13,6 +13,7 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWlibsdl) +# We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/libtool/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtool/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/libtool/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -15,7 +15,8 @@ DISTFILES += $(call admfiles,CSWlibtoolrt,prototype) DISTFILES += $(foreach ARCH,i386 sparc,$(ARCH)-gcc2.conf $(ARCH)-gcc2.tags $(ARCH)-gcc3.conf $(ARCH)-gcc3.tags) -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/libvorbis/trunk/Makefile =================================================================== --- csw/mgar/pkg/libvorbis/trunk/Makefile 2008-12-01 22:57:13 UTC (rev 2424) +++ csw/mgar/pkg/libvorbis/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) @@ -13,6 +13,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWlibvorbis,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + LIBDEPS += lib/libogg CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From william at wbonnet.net Tue Dec 2 00:59:38 2008 From: william at wbonnet.net (William Bonnet) Date: Tue, 02 Dec 2008 00:59:38 +0100 Subject: [csw-devel] Upstream check Message-ID: <49347A6A.5040609@wbonnet.net> Hi, Today I have made several minor modification to gar scripts to support source update detection (check-upstream target). I also added the basic regexp definition to most of the makefiles (but cpan stuff). Now i will start to iterate on test loop to check each master site url and reg exp to detect notification errors (i won't prevent from building don't worry...) and fix them. It may take some time depending on how much error i'll get ;) Please blame me i created error in your makefile ;) cheers -- William http://www.wbonnet.net http://www.sunwizard.net Le site fran?ais des amateurs de stations Unix http://www.blastwave.org An OpenSolaris Community Site http://www.opencsw.org Community SoftWare for Solaris http://www.guses.org French speaking Solaris User Group From wbonnet at users.sourceforge.net Tue Dec 2 01:03:56 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 02 Dec 2008 00:03:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[2426] csw/mgar/pkg Message-ID: Revision: 2426 http://gar.svn.sourceforge.net/gar/?rev=2426&view=rev Author: wbonnet Date: 2008-12-02 00:03:53 +0000 (Tue, 02 Dec 2008) Log Message: ----------- Add upstream check to some more makefiles URL for upstream master site and reg exp will now be checked one by one Modified Paths: -------------- csw/mgar/pkg/libXau/trunk/Makefile csw/mgar/pkg/libXdmcp/trunk/Makefile csw/mgar/pkg/libxcb/trunk/Makefile csw/mgar/pkg/libxine/trunk/Makefile csw/mgar/pkg/listadmin/trunk/Makefile csw/mgar/pkg/lsof/trunk/Makefile csw/mgar/pkg/lua/trunk/Makefile csw/mgar/pkg/lynx/trunk/Makefile csw/mgar/pkg/lyx/trunk/Makefile csw/mgar/pkg/m4/trunk/Makefile csw/mgar/pkg/make/trunk/Makefile csw/mgar/pkg/mantis/trunk/Makefile csw/mgar/pkg/maven2/trunk/Makefile csw/mgar/pkg/memcached/trunk/Makefile csw/mgar/pkg/mercurial/trunk/Makefile csw/mgar/pkg/mktemp/trunk/Makefile csw/mgar/pkg/mm/trunk/Makefile csw/mgar/pkg/mod_auth_mysql/trunk/Makefile csw/mgar/pkg/mod_auth_pam/trunk/Makefile csw/mgar/pkg/mod_evasive/trunk/Makefile csw/mgar/pkg/mod_fastcgi/trunk/Makefile csw/mgar/pkg/mod_geoip/trunk/Makefile csw/mgar/pkg/mod_highlight/trunk/Makefile csw/mgar/pkg/mod_jk/trunk/Makefile csw/mgar/pkg/mod_proxy_html/trunk/Makefile csw/mgar/pkg/mod_python/trunk/Makefile csw/mgar/pkg/mod_ruby/trunk/Makefile csw/mgar/pkg/mod_transform/trunk/Makefile csw/mgar/pkg/mono/trunk/Makefile csw/mgar/pkg/mpd/trunk/Makefile csw/mgar/pkg/mplayer/trunk/Makefile csw/mgar/pkg/mrtg/trunk/Makefile csw/mgar/pkg/msmtp/trunk/Makefile csw/mgar/pkg/mysql-python/trunk/Makefile csw/mgar/pkg/mysql-ruby/trunk/Makefile csw/mgar/pkg/mysql4/trunk/Makefile csw/mgar/pkg/namazu/trunk/Makefile csw/mgar/pkg/ncftp/trunk/Makefile csw/mgar/pkg/ncmpc/trunk/Makefile csw/mgar/pkg/neon/trunk/Makefile csw/mgar/pkg/ngrep/trunk/Makefile csw/mgar/pkg/nmap/trunk/Makefile csw/mgar/pkg/nspr/trunk/Makefile csw/mgar/pkg/ntop/trunk/Makefile csw/mgar/pkg/ogle/trunk/Makefile csw/mgar/pkg/ogle_gui/trunk/Makefile csw/mgar/pkg/openal/trunk/Makefile csw/mgar/pkg/openexr/trunk/Makefile csw/mgar/pkg/opengrok/trunk/Makefile csw/mgar/pkg/openldap/trunk/Makefile csw/mgar/pkg/openvpn/trunk/Makefile csw/mgar/pkg/opera/trunk/Makefile csw/mgar/pkg/orca/trunk/Makefile csw/mgar/pkg/pango/trunk/Makefile csw/mgar/pkg/pari/trunk/Makefile csw/mgar/pkg/patch/trunk/Makefile csw/mgar/pkg/pca/trunk/Makefile csw/mgar/pkg/pcre/trunk/Makefile csw/mgar/pkg/pixman/trunk/Makefile csw/mgar/pkg/pkgconfig/trunk/Makefile csw/mgar/pkg/pkgutil/trunk/Makefile csw/mgar/pkg/postfix/trunk/Makefile csw/mgar/pkg/pound/trunk/Makefile csw/mgar/pkg/proftpd/trunk/Makefile csw/mgar/pkg/pth/trunk/Makefile csw/mgar/pkg/pubcookie/trunk/Makefile csw/mgar/pkg/pv/trunk/Makefile csw/mgar/pkg/pydocutils/trunk/Makefile csw/mgar/pkg/pysetuptools/trunk/Makefile csw/mgar/pkg/pysqlite/trunk/Makefile csw/mgar/pkg/pysqlite2/trunk/Makefile csw/mgar/pkg/python/trunk/Makefile csw/mgar/pkg/python25/trunk/Makefile csw/mgar/pkg/qt4/trunk/Makefile csw/mgar/pkg/qt4-gcc/trunk/Makefile csw/mgar/pkg/quanta/trunk/Makefile csw/mgar/pkg/rake/trunk/Makefile csw/mgar/pkg/rapidsvn/trunk/Makefile csw/mgar/pkg/readline/trunk/Makefile csw/mgar/pkg/recode/trunk/Makefile csw/mgar/pkg/renderproto/trunk/Makefile csw/mgar/pkg/resin/trunk/Makefile csw/mgar/pkg/rl/trunk/Makefile csw/mgar/pkg/rrdtool/trunk/Makefile csw/mgar/pkg/ruby/trunk/Makefile csw/mgar/pkg/rubygems/trunk/Makefile csw/mgar/pkg/sasl/trunk/Makefile csw/mgar/pkg/sdlimage/trunk/Makefile csw/mgar/pkg/sdlmixer/trunk/Makefile csw/mgar/pkg/sdlnet/trunk/Makefile csw/mgar/pkg/sdlsound/trunk/Makefile csw/mgar/pkg/sdlttf/trunk/Makefile csw/mgar/pkg/sed/trunk/Makefile csw/mgar/pkg/setoolkit/trunk/Makefile csw/mgar/pkg/sgml-xml-common/trunk/Makefile csw/mgar/pkg/sh-utils/trunk/Makefile csw/mgar/pkg/silvercity/trunk/Makefile csw/mgar/pkg/sloccount/trunk/Makefile csw/mgar/pkg/slrn/trunk/Makefile csw/mgar/pkg/smbldap-tools/trunk/Makefile csw/mgar/pkg/snort/trunk/Makefile csw/mgar/pkg/socat/trunk/Makefile csw/mgar/pkg/spamassassin/trunk/Makefile csw/mgar/pkg/spidermonkey/trunk/Makefile csw/mgar/pkg/sqlite3/trunk/Makefile csw/mgar/pkg/squidpurge/trunk/Makefile csw/mgar/pkg/subversion/trunk/Makefile csw/mgar/pkg/sudo/trunk/Makefile csw/mgar/pkg/sudo-ldap/trunk/Makefile csw/mgar/pkg/swaks/trunk/Makefile csw/mgar/pkg/swig/trunk/Makefile csw/mgar/pkg/sword/trunk/Makefile csw/mgar/pkg/synergy/trunk/Makefile csw/mgar/pkg/sysbench/trunk/Makefile csw/mgar/pkg/syslog_ng/trunk/Makefile csw/mgar/pkg/sysstat/trunk/Makefile csw/mgar/pkg/system-tray-applet/trunk/Makefile csw/mgar/pkg/tcp_wrappers/trunk/Makefile csw/mgar/pkg/template/trunk/Makefile csw/mgar/pkg/texinfo/trunk/Makefile csw/mgar/pkg/textutils/trunk/Makefile csw/mgar/pkg/tin/trunk/Makefile csw/mgar/pkg/tme/trunk/Makefile csw/mgar/pkg/tnef/trunk/Makefile csw/mgar/pkg/tomcat4/trunk/Makefile csw/mgar/pkg/tomcat5/trunk/Makefile csw/mgar/pkg/tomcat6/trunk/Makefile csw/mgar/pkg/trac/trunk/Makefile csw/mgar/pkg/tsclient/trunk/Makefile csw/mgar/pkg/vorbis-tools/trunk/Makefile csw/mgar/pkg/wesnoth/trunk/Makefile csw/mgar/pkg/wget/trunk/Makefile csw/mgar/pkg/xcb-proto/trunk/Makefile csw/mgar/pkg/xchat/trunk/Makefile csw/mgar/pkg/xextproto/trunk/Makefile csw/mgar/pkg/xft/trunk/Makefile csw/mgar/pkg/xine-ui/trunk/Makefile csw/mgar/pkg/xinetd/trunk/Makefile csw/mgar/pkg/xmlstarlet/trunk/Makefile csw/mgar/pkg/xmlto/trunk/Makefile csw/mgar/pkg/xmms/trunk/Makefile csw/mgar/pkg/xproto/trunk/Makefile csw/mgar/pkg/xrender/trunk/Makefile csw/mgar/pkg/xrestop/trunk/Makefile csw/mgar/pkg/xtrans/trunk/Makefile csw/mgar/pkg/zsh/trunk/Makefile Modified: csw/mgar/pkg/libXau/trunk/Makefile =================================================================== --- csw/mgar/pkg/libXau/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/libXau/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + DISTFILES += CSWlibXau.gspec CSWlibXau.prototype CSWlibXau.depend DISTFILES += CSWlibXaudev.gspec CSWlibXaudev.prototype CSWlibXaudev.depend # DISTFILES += $(call admfiles,CSWlibXau, depend) Modified: csw/mgar/pkg/libXdmcp/trunk/Makefile =================================================================== --- csw/mgar/pkg/libXdmcp/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/libXdmcp/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + DISTFILES += CSWlibXdmcp.gspec CSWlibXdmcp.prototype CSWlibXdmcp.depend DISTFILES += CSWlibXdmcpdev.gspec CSWlibXdmcpdev.prototype CSWlibXdmcpdev.depend # DISTFILES += $(call admfiles,CSWlibXdmcp, depend) Modified: csw/mgar/pkg/libxcb/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxcb/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/libxcb/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + DISTFILES += CSWlibxcb.gspec CSWlibxcb.prototype CSWlibxcb.depend DISTFILES += CSWlibxcbdev.gspec CSWlibxcbdev.prototype CSWlibxcbdev.depend # DISTFILES += $(call admfiles,CSWlibxcb, depend) Modified: csw/mgar/pkg/libxine/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxine/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/libxine/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ DISTFILES = xine-lib-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWlibxine,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + PATCHFILES = int_fast-defs-sol8.diff PATCHFILES += bswap-for-sol8-i386.diff PATCHFILES += configure-v8only.diff Modified: csw/mgar/pkg/listadmin/trunk/Makefile =================================================================== --- csw/mgar/pkg/listadmin/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/listadmin/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -8,6 +8,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWlistadmin,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + PATCHFILES = gar-base.diff # This package doesn't use ./configure Modified: csw/mgar/pkg/lsof/trunk/Makefile =================================================================== --- csw/mgar/pkg/lsof/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/lsof/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -17,6 +17,9 @@ #DISTFILES = $(TOPDIST).tar.bz2 WORKSRC = $(WORKDIR)/$(TOPDIST)/$(SRCDIST) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)_(\d+(?:\.\d+)*).tar.bz2 + CONFIGURE_SCRIPTS = custom CONFIGURE_ARGS = -n solariscc Modified: csw/mgar/pkg/lua/trunk/Makefile =================================================================== --- csw/mgar/pkg/lua/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/lua/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz #DISTFILES += CSWlua.gspec CSWlua.prototype CSWlua.depend +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + #LIBDEPS += lib/db lib/gdbm # Configuration flags Modified: csw/mgar/pkg/lynx/trunk/Makefile =================================================================== --- csw/mgar/pkg/lynx/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/lynx/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -15,6 +15,9 @@ DISTFILES = $(GARNAME)$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWlynx,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + WORKSRC = $(WORKDIR)/$(subst .,-,$(GARNAME)$(GARVERSION)) #LIBDEPS += lib/ncurses lib/openssl Modified: csw/mgar/pkg/lyx/trunk/Makefile =================================================================== --- csw/mgar/pkg/lyx/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/lyx/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWlyx,depend prototype postinstall) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + PATCHFILES = solaris.patch CONFIGURE_ARGS = PATH="/opt/csw/kde-gcc/bin:$$PATH" Modified: csw/mgar/pkg/m4/trunk/Makefile =================================================================== --- csw/mgar/pkg/m4/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/m4/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -14,6 +14,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWgm4,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) --program-prefix=g TEST_SCRIPTS = Modified: csw/mgar/pkg/make/trunk/Makefile =================================================================== --- csw/mgar/pkg/make/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/make/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -15,6 +15,9 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/mantis/trunk/Makefile =================================================================== --- csw/mgar/pkg/mantis/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/mantis/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -16,6 +16,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWmantis,depend preinstall postinstall) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = Modified: csw/mgar/pkg/maven2/trunk/Makefile =================================================================== --- csw/mgar/pkg/maven2/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/maven2/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -27,6 +27,9 @@ DISTFILES += $(call admfiles,CSWmaven2,) DISTFILES += bin-mvn +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = apache-maven-(\d+(?:\.\d+)*)-bin.tar.gz + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = Modified: csw/mgar/pkg/memcached/trunk/Makefile =================================================================== --- csw/mgar/pkg/memcached/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/memcached/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWmemcached,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + GARCOMPILER = GNU DEPENDS += lib/libevent Modified: csw/mgar/pkg/mercurial/trunk/Makefile =================================================================== --- csw/mgar/pkg/mercurial/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -10,6 +10,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWmercurial,prototype changelog.CSW) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = $(WORKSRC)/setup.py TEST_TARGET = Modified: csw/mgar/pkg/mktemp/trunk/Makefile =================================================================== --- csw/mgar/pkg/mktemp/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/mktemp/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -14,6 +14,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWmktemp) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + PATCHFILES = makefile-destdir.patch CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/mm/trunk/Makefile =================================================================== --- csw/mgar/pkg/mm/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/mm/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -18,6 +18,9 @@ DISTFILES += $(call admfiles,CSWlibmm,prototype) DISTFILES += libmm.so.13.0.20.bz2 +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-static Modified: csw/mgar/pkg/mod_auth_mysql/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_auth_mysql/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/mod_auth_mysql/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ ADMFILES = depend prototype postinstall preremove copyright DISTFILES += $(call admfiles,CSWap2modauthmysql,$(ADMFILES)) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # Restore deprecated (removed) macros PATCHFILES += apr.diff Modified: csw/mgar/pkg/mod_auth_pam/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_auth_pam/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/mod_auth_pam/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -17,6 +17,9 @@ CSWadmin = depend prototype postinstall preremove space DISTFILES += $(call admfiles,CSWap2modauthpam,$(CSWadmin)) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)-(\d+(?:\.\d+)*).tar.gz + # Fix up installation routine PATCHFILES += install.diff Modified: csw/mgar/pkg/mod_evasive/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_evasive/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/mod_evasive/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -15,6 +15,9 @@ DISTFILES += $(GARNAME)_$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWap2modevasive,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)_(\d+(?:\.\d+)*).tar.gz + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = custom INSTALL_SCRIPTS = custom Modified: csw/mgar/pkg/mod_fastcgi/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_fastcgi/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/mod_fastcgi/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ ADMFILES = depend prototype postinstall preremove copyright DISTFILES += $(call admfiles,CSWap2modfastcgi,$(ADMFILES)) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # Allow fcgi to compile against Apache 2.2. From # http://www.fastcgi.com/archives/fastcgi-developers/2005-December/004060.html # with blastwave modifications. Modified: csw/mgar/pkg/mod_geoip/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_geoip/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/mod_geoip/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -16,6 +16,9 @@ DISTFILES = $(SPKG_NAME)2_$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWap2modgeoip,depend postinstall preremove) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(SPKG_NAME)2-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = custom INSTALL_SCRIPTS = custom Modified: csw/mgar/pkg/mod_highlight/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_highlight/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/mod_highlight/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -17,6 +17,9 @@ DISTFILES += CSWap2modhighlight.prototype CSWap2modhighlight.depend DISTFILES += CSWap2modhighlight.postinstall CSWap2modhighlight.preremove +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-apxs=$(prefix)/apache2/sbin/apxs Modified: csw/mgar/pkg/mod_jk/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_jk/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/mod_jk/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -26,6 +26,9 @@ DISTFILES += $(call admfiles,CSWap2modjk,$(ADMINFILES)) DISTFILES += httpd-jk.conf.CSW +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)-src.tar.gz + AUXCONFIG += workers.properties AUXCONFIG += workers.properties.minimal AUXCONFIG += uriworkermap.properties Modified: csw/mgar/pkg/mod_proxy_html/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_proxy_html/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/mod_proxy_html/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -15,6 +15,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).c DISTFILES += $(call admfiles,CSWap2modproxyhtml,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).c + PREREQUISITE_PKGS = CSWapache2-devel CSWapache2 CSWlibxml2 WORKSRC = $(WORKDIR) Modified: csw/mgar/pkg/mod_python/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_python/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/mod_python/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -14,6 +14,9 @@ pkgfiles = depend prototype postinstall preremove space DISTFILES += $(call admfiles,CSWap2modpython,$(pkgfiles)) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz + #DEPENDS += lang/python CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/mod_ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_ruby/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/mod_ruby/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -18,6 +18,9 @@ #DISTFILES += CSWap2modruby.preremove #DISTFILES += CSWap2modruby.space +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_SCRIPTS = ruby CONFIGURE_ARGS = --prefix=$(prefix) Modified: csw/mgar/pkg/mod_transform/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_transform/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/mod_transform/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -17,6 +17,9 @@ DISTFILES += CSWap2modtransform.prototype CSWap2modtransform.depend DISTFILES += CSWap2modtransform.postinstall CSWap2modtransform.preremove +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # Anti-social GCC only behavior PATCHFILES += gcc.diff # Don't use APXS to install the module Modified: csw/mgar/pkg/mono/trunk/Makefile =================================================================== --- csw/mgar/pkg/mono/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/mono/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -14,6 +14,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += CSWmono.gspec CSWmono.depend CSWmono.prototype +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/mpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/mpd/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/mpd/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -18,6 +18,9 @@ DISTFILES += cswmpd.xml svc-cswmpd cswmpd DISTFILES += CSWmpd.csw_usrgrp_config +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + TEST_TARGET = check include gar/category.mk Modified: csw/mgar/pkg/mplayer/trunk/Makefile =================================================================== --- csw/mgar/pkg/mplayer/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/mplayer/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -23,6 +23,9 @@ DISTFILES += Blue-1.7.tar.bz2 DISTFILES += $(call admfiles,CSWmplayer,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + PATCHFILES = fix-configure.diff PATCHFILES += fix-libavcodec-gcc-bug.diff PATCHFILES += fix-manpage-macros.diff Modified: csw/mgar/pkg/mrtg/trunk/Makefile =================================================================== --- csw/mgar/pkg/mrtg/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/mrtg/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWmrtg, depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-gd=/opt/csw CONFIGURE_ARGS += --with-gd-lib=/opt/csw/lib Modified: csw/mgar/pkg/msmtp/trunk/Makefile =================================================================== --- csw/mgar/pkg/msmtp/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/msmtp/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -26,6 +26,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWmsmtp,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/mysql-python/trunk/Makefile =================================================================== --- csw/mgar/pkg/mysql-python/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/mysql-python/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWpymysql,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = $(WORKSRC)/setup.py TEST_SCRIPTS = Modified: csw/mgar/pkg/mysql-ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/mysql-ruby/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/mysql-ruby/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWrbmysql,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + #DEPENDS += lang/ruby server/mysql4 CONFIGURE_SCRIPTS = ruby Modified: csw/mgar/pkg/mysql4/trunk/Makefile =================================================================== --- csw/mgar/pkg/mysql4/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/mysql4/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWmysql4,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + DB_USER = mysqld CONFIGURE_ARGS = --prefix=$(prefix)/mysql4 Modified: csw/mgar/pkg/namazu/trunk/Makefile =================================================================== --- csw/mgar/pkg/namazu/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/namazu/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ DISTFILES = $(DISTNAME).tar.gz DISTFILES += CSWnamazu.gspec CSWnamazu.depend CSWnamazu.prototype +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS += $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/ncftp/trunk/Makefile =================================================================== --- csw/mgar/pkg/ncftp/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/ncftp/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION)-src.tar.bz2 DISTFILES += $(call admfiles,CSWncftp,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)-src.tar.bz2 + WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) CONFIGURE_ARGS = $(DIRPATHS) --without-ncurses Modified: csw/mgar/pkg/ncmpc/trunk/Makefile =================================================================== --- csw/mgar/pkg/ncmpc/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/ncmpc/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -18,6 +18,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWncmpc,prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + TEST_TARGET = include gar/category.mk Modified: csw/mgar/pkg/neon/trunk/Makefile =================================================================== --- csw/mgar/pkg/neon/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/neon/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -22,6 +22,9 @@ DISTFILES += $(call admfiles,CSWneon-devel,$(ADMSTANDARD)) #DISTFILES += $(COMPATLIBS) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shared CONFIGURE_ARGS += --with-ssl=openssl Modified: csw/mgar/pkg/ngrep/trunk/Makefile =================================================================== --- csw/mgar/pkg/ngrep/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/ngrep/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -19,6 +19,9 @@ DISTFILES += $(call admfiles,CSWngrep,depend) PATCHFILES = gar-base.diff +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = Modified: csw/mgar/pkg/nmap/trunk/Makefile =================================================================== --- csw/mgar/pkg/nmap/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/nmap/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -17,6 +17,9 @@ MASTER_SITES = http://download.insecure.org/nmap/dist/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + # Compile against gtk+-2.0 (2.4.0) PATCHFILES = gtk20.diff Modified: csw/mgar/pkg/nspr/trunk/Makefile =================================================================== --- csw/mgar/pkg/nspr/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/nspr/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ DISTFILES += $(call admfiles,CSWnspr, depend ) # DISTFILES += CSWnspr.depend CSWnspr.gspec CSWnspr.prototype +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + PERL="/opt/csw/bin/perl" CFLAGS=-xlibmil CXXFLAGS="-xlibmil -xlibmopt -features=tmplife -norunpath" Modified: csw/mgar/pkg/ntop/trunk/Makefile =================================================================== --- csw/mgar/pkg/ntop/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/ntop/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -16,6 +16,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tgz DISTFILES += $(call admfiles,CSWntop,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + LIBDEPS += utils/rrdtool CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/ogle/trunk/Makefile =================================================================== --- csw/mgar/pkg/ogle/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/ogle/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWogle, depend ) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + #PATCHFILES = configure.in.diff CONFIGURE_ARGS = $(DIRPATHS) --disable-mmx Modified: csw/mgar/pkg/ogle_gui/trunk/Makefile =================================================================== --- csw/mgar/pkg/ogle_gui/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/ogle_gui/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWogle_gui, depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + GARCOMPILER ?= GNU CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/openal/trunk/Makefile =================================================================== --- csw/mgar/pkg/openal/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/openal/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES =$(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWopenal,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + PATCHFILES = al_main.diff GARCOMPILER = GNU Modified: csw/mgar/pkg/openexr/trunk/Makefile =================================================================== --- csw/mgar/pkg/openexr/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/openexr/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWopenexr,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) TEST_SCRIPTS = Modified: csw/mgar/pkg/opengrok/trunk/Makefile =================================================================== --- csw/mgar/pkg/opengrok/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/opengrok/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -17,6 +17,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWopengrok,depend postinstall preremove) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = Modified: csw/mgar/pkg/openldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/openldap/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/openldap/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -20,6 +20,9 @@ DISTFILES += $(call admfiles,CSWoldaprt,depend) DISTFILES += README.CSW openldaprc +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + PATCHFILES = patch-oldap-2.3.24-ntlm.diff DISTFILES += $(PATCHFILES) Modified: csw/mgar/pkg/openvpn/trunk/Makefile =================================================================== --- csw/mgar/pkg/openvpn/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/openvpn/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWopenvpn, prototype ) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = --prefix=$(prefix) --mandir=/opt/csw/share/man TEST_SCRIPTS = Modified: csw/mgar/pkg/opera/trunk/Makefile =================================================================== --- csw/mgar/pkg/opera/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/opera/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).gcc3-static-qt3.tar.gz DISTFILES += $(call admfiles,CSWopera, depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + PATCHFILES += bin-opera.diff WORKSRC = $(WORKDIR)/$(DISTNAME)-2466.gcc3-static-qt3 Modified: csw/mgar/pkg/orca/trunk/Makefile =================================================================== --- csw/mgar/pkg/orca/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/orca/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -35,6 +35,9 @@ PATCHFILES = $(GARNAME)-$(GARVERSION)-se-3.5.0.patch +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + PREREQUISITE_PKGS = CSWperl CSWpmtimedate CSWpmmathinterpolate CSWrrd CSWgawk CSWbzip2 CSWsetoolkit #libdir = $(exec_prefix)/lib/$(GARNAME) Modified: csw/mgar/pkg/pango/trunk/Makefile =================================================================== --- csw/mgar/pkg/pango/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/pango/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -14,6 +14,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWpango,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + LIBDEPS += lib/xft CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/pari/trunk/Makefile =================================================================== --- csw/mgar/pkg/pari/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/pari/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tgz DISTFILES += $(call admfiles,CSWparigp,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_SCRIPTS = custom CONFIGURE_ARGS = --prefix=$(prefix) CONFIGURE_ARGS += --miscdir=$(docdir)/pari Modified: csw/mgar/pkg/patch/trunk/Makefile =================================================================== --- csw/mgar/pkg/patch/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/patch/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -10,6 +10,9 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) INSTALL_OVERRIDE_DIRS = prefix exec_prefix bindir mandir Modified: csw/mgar/pkg/pca/trunk/Makefile =================================================================== --- csw/mgar/pkg/pca/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/pca/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -17,6 +17,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION) DISTFILES += $(call admfiles,CSWpca) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*) + WORKSRC = $(WORKDIR) CONFIGURE_SCRIPTS = Modified: csw/mgar/pkg/pcre/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcre/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/pcre/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -15,6 +15,9 @@ DISTFILES += $(call admfiles,CSWpcrert,depend prototype) DISTFILES += $(call admfiles,CSWpcre,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-unicode-properties CONFIGURE_ARGS += --enable-pcregrep-libz Modified: csw/mgar/pkg/pixman/trunk/Makefile =================================================================== --- csw/mgar/pkg/pixman/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/pixman/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ DISTFILES += CSWpixmandev.gspec CSWpixmandev.prototype CSWpixmandev.depend # DISTFILES += $(call admfiles,CSWpixman, depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CFLAGS += -xlibmil -errtags=yes -erroff=E_EMPTY_DECLARATION CXXFLAGS += -xlibmil -xlibmopt -features=tmplife -norunpath LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib Modified: csw/mgar/pkg/pkgconfig/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgconfig/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/pkgconfig/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -16,6 +16,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWpkgconfig,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + PATCHFILES = gsed-check.patch PREREQUISITE_PKGS = CSWggettext CSWglib2 CSWiconv CSWsunmath Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -14,6 +14,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).zip DISTFILES += $(call admfiles,CSWpkgutil,prototype postinstall preremove) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).zip + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = Modified: csw/mgar/pkg/postfix/trunk/Makefile =================================================================== --- csw/mgar/pkg/postfix/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/postfix/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -17,6 +17,9 @@ DISTFILES += $(call admfiles,CSWpostfix,prototype csw_conf_config csw_usrgrp_config postinstall postremove) DISTFILES += cswpostfix.xml svc-cswpostfix cswpostfix +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + PREREQUISITE_PKGS = CSWbdb4 CSWmysql4devel CSWlibpq CSWossldevel CSWoldapdevel SPKG_CLASSES = none csw_conf Modified: csw/mgar/pkg/pound/trunk/Makefile =================================================================== --- csw/mgar/pkg/pound/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/pound/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -15,6 +15,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tgz DISTFILES += $(call admfiles,CSWpound,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz + # Install properly when # (a) destdir does not exist, and # (b) installing as non root. Modified: csw/mgar/pkg/proftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/proftpd/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/proftpd/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -16,6 +16,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWproftpd,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + CONFIGURE_ARGS = $(DIRPATHS) # No test suite Modified: csw/mgar/pkg/pth/trunk/Makefile =================================================================== --- csw/mgar/pkg/pth/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/pth/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWpth,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk Modified: csw/mgar/pkg/pubcookie/trunk/Makefile =================================================================== --- csw/mgar/pkg/pubcookie/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/pubcookie/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -15,6 +15,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWpubcookie) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + PREREQUISITE_PKGS = CSWapache2-devel CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/pv/trunk/Makefile =================================================================== --- csw/mgar/pkg/pv/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/pv/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -20,6 +20,8 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += CSWpv.gspec CSWpv.depend CSWpv.prototype +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/pydocutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/pydocutils/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/pydocutils/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWpydocutils,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = $(WORKSRC)/setup.py TEST_SCRIPTS = Modified: csw/mgar/pkg/pysetuptools/trunk/Makefile =================================================================== --- csw/mgar/pkg/pysetuptools/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/pysetuptools/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWpysetuptools,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # Use versionless python lib PATCHFILES += pyversion.diff Modified: csw/mgar/pkg/pysqlite/trunk/Makefile =================================================================== --- csw/mgar/pkg/pysqlite/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/pysqlite/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -12,6 +12,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += CSWpysqlite.gspec +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = $(WORKSRC)/setup.py TEST_SCRIPTS = Modified: csw/mgar/pkg/pysqlite2/trunk/Makefile =================================================================== --- csw/mgar/pkg/pysqlite2/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/pysqlite2/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWpysqlite2,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = $(WORKSRC)/setup.py TEST_SCRIPTS = Modified: csw/mgar/pkg/python/trunk/Makefile =================================================================== --- csw/mgar/pkg/python/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/python/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -16,6 +16,9 @@ MASTER_SITES = http://www.python.org/ftp/python/$(GARVERSION)/ DISTFILES = Python-$(GARVERSION).tar.bz2 +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = Python-(\d+(?:\.\d+)*).tar.bz2 + # Configure some site specific variables PATCHFILES = site-config.diff Modified: csw/mgar/pkg/python25/trunk/Makefile =================================================================== --- csw/mgar/pkg/python25/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/python25/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -19,11 +19,15 @@ endef MASTER_SITES = http://www.python.org/ftp/python/$(GARVERSION)/ +UPSTREAM_MASTER_SITES = http://www.python.org/ftp/python/ DISTFILES = $(DISTNAME).tar.bz2 DISTFILES += $(call admfiles,CSWpython,depend prototype) DISTFILES += $(call admfiles,CSWpython-tk,depend prototype) DISTFILES += $(call admfiles,CSWidle,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = (\d+(?:\.\d+)*) + # Configure PATCHFILES += setup.diff Modified: csw/mgar/pkg/qt4/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/qt4/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -39,6 +39,9 @@ DISTFILES += $(call admfiles,CSWqt4-devel,depend prototype-sparc prototype-i386) DISTFILES += $(call admfiles,CSWqt4-docs,prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = qt-x11-opensource-src-(\d+(?:\.\d+)*).tar.gz + WORKDIR = $(WORKROOTDIR)/$(DESTIMG).d/$(PLATFORM) COOKIEROOTDIR = cookies.$(PLATFORM) Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -16,6 +16,9 @@ #DISTFILES += $(call admfiles,CSWqt4gcc,depend prototype) DISTFILES += $(call admfiles,CSWqt4gcc,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = qt-x11-opensource-src-(\d+(?:\.\d+)*).tar.gz + #TMP_DIRPATHS = --prefix=$(prefix) --exec_prefix=$(exec_prefix) --bindir=$(bindir #) --sbindir=$(sbindir) --libexecdir=$(libexecdir) --datadir=$(datadir) --sysconf #dir=$(sysconfdir) --sharedstatedir=$(sharedstatedir) --localstatedir=$(localstat Modified: csw/mgar/pkg/quanta/trunk/Makefile =================================================================== --- csw/mgar/pkg/quanta/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/quanta/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -9,6 +9,9 @@ PKGDIST = kdewebdev-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWquantagcc,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = kdewebdev-(\d+(?:\.\d+)*).tar.bz2 + DEPENDS += CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/rake/trunk/Makefile =================================================================== --- csw/mgar/pkg/rake/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/rake/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tgz DISTFILES += CSWrake.gspec CSWrake.depend CSWrake.prototype +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + BUILD_SCRIPTS = CONFIGURE_SCRIPTS = INSTALL_SCRIPTS = ruby Modified: csw/mgar/pkg/rapidsvn/trunk/Makefile =================================================================== --- csw/mgar/pkg/rapidsvn/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/rapidsvn/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -12,6 +12,9 @@ DISTFILES += $(call admfiles,CSWrapidsvn,depend prototype) DISTFILES += $(call admfiles,CSWsvncpp,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # RapidSVN 0.9.1 omits the manpage from the dist archive DISTFILES += rapidsvn.xml Modified: csw/mgar/pkg/readline/trunk/Makefile =================================================================== --- csw/mgar/pkg/readline/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/readline/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -16,6 +16,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWreadline,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + LIBDEPS += lib/ncurses CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/recode/trunk/Makefile =================================================================== --- csw/mgar/pkg/recode/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/recode/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -16,6 +16,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWrecode,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # I did some more tests. The faulted tests have something to do # with compiler optimization: # Modified: csw/mgar/pkg/renderproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/renderproto/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/renderproto/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + DISTFILES += $(call admfiles,CSWrenderproto, depend) LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib Modified: csw/mgar/pkg/resin/trunk/Makefile =================================================================== --- csw/mgar/pkg/resin/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/resin/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -17,6 +17,9 @@ #DEPENDS = server/apache2 +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = --prefix=$(prefix)/resin CONFIGURE_ARGS += --enable-jni CONFIGURE_ARGS += --enable-ssl Modified: csw/mgar/pkg/rl/trunk/Makefile =================================================================== --- csw/mgar/pkg/rl/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/rl/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWrl,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) # Not gonna do it TEST_SCRIPTS = Modified: csw/mgar/pkg/rrdtool/trunk/Makefile =================================================================== --- csw/mgar/pkg/rrdtool/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/rrdtool/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWrrdtool,prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # Patch to make it build on x86 PATCHFILES += rrd_config.diff Modified: csw/mgar/pkg/ruby/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/ruby/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -22,6 +22,9 @@ DISTFILES = $(GARNAME)-$(DISTVERSION)-$(PATCHLEVEL).tar.bz2 +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)-p(\d+).tar.bz2 + DISTFILES += CSWruby.gspec CSWruby.depend CSWruby.prototype DISTFILES += CSWrubytk.gspec CSWrubytk.depend CSWrubytk.prototype Modified: csw/mgar/pkg/rubygems/trunk/Makefile =================================================================== --- csw/mgar/pkg/rubygems/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/rubygems/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -14,6 +14,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tgz DISTFILES += $(call admfiles,CSWrubygems,depend copyright) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz + # Redirect Gem installation to $(DESTDIR) #PATCHFILES += postinstall.diff Modified: csw/mgar/pkg/sasl/trunk/Makefile =================================================================== --- csw/mgar/pkg/sasl/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/sasl/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -21,6 +21,9 @@ DISTFILES = cyrus-$(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = cyrus-$(GARNAME)-(\d+(?:\.\d+)*).tar.gz + BUILD_ENV = _REENTRANT=1 TEST_TARGET = check Modified: csw/mgar/pkg/sdlimage/trunk/Makefile =================================================================== --- csw/mgar/pkg/sdlimage/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/sdlimage/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWsdlimage,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) TEST_SCRIPTS = include gar/category.mk Modified: csw/mgar/pkg/sdlmixer/trunk/Makefile =================================================================== --- csw/mgar/pkg/sdlmixer/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/sdlmixer/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWsdlmixer, depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = --prefix=$(prefix) LDFLAGS=-lsunmath TEST_SCRIPTS = Modified: csw/mgar/pkg/sdlnet/trunk/Makefile =================================================================== --- csw/mgar/pkg/sdlnet/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/sdlnet/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWsdlnet,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) TEST_SCRIPTS = Modified: csw/mgar/pkg/sdlsound/trunk/Makefile =================================================================== --- csw/mgar/pkg/sdlsound/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/sdlsound/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWsdlsound,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) TEST_SCRIPTS = Modified: csw/mgar/pkg/sdlttf/trunk/Makefile =================================================================== --- csw/mgar/pkg/sdlttf/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/sdlttf/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWsdlttf,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + #PATCHFILES = SDL_ttf.c.diff TEST_SCRIPTS = Modified: csw/mgar/pkg/sed/trunk/Makefile =================================================================== --- csw/mgar/pkg/sed/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/sed/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/setoolkit/trunk/Makefile =================================================================== --- csw/mgar/pkg/setoolkit/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/setoolkit/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -35,6 +35,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWsetoolkit,prototype depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + WORKDIR = $(WORKROOTDIR)/$(DESTIMG).d/$(ISA) COOKIEROOTDIR = cookies.$(ISA) Modified: csw/mgar/pkg/sgml-xml-common/trunk/Makefile =================================================================== --- csw/mgar/pkg/sgml-xml-common/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/sgml-xml-common/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -22,6 +22,9 @@ DISTFILES += CSWxmlcommon.gspec CSWxmlcommon.prototype DISTFILES += $(EXTRA_FILES) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + PATCHFILES = sgml-common-0.6.3-docdir.patch sgml-common-automake.patch PATCHFILES += sgml-common-quotes.patch sgml-common-umask.patch PATCHFILES += sgml-common-xmldir.patch install-catalog-sanity.patch Modified: csw/mgar/pkg/sh-utils/trunk/Makefile =================================================================== --- csw/mgar/pkg/sh-utils/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/sh-utils/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -10,6 +10,9 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # Chinese translation has errors PATCHFILES = zh.diff Modified: csw/mgar/pkg/silvercity/trunk/Makefile =================================================================== --- csw/mgar/pkg/silvercity/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/silvercity/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -12,6 +12,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWsilvercity,depend prototype copyright) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = $(WORKSRC)/setup.py TEST_SCRIPTS = Modified: csw/mgar/pkg/sloccount/trunk/Makefile =================================================================== --- csw/mgar/pkg/sloccount/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/sloccount/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -15,6 +15,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += CSWsloc.gspec +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # Listen to the environment... PATCHFILES = make.diff Modified: csw/mgar/pkg/slrn/trunk/Makefile =================================================================== --- csw/mgar/pkg/slrn/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/slrn/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -18,6 +18,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWslrn,prototype depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + LD_OPTIONS = -R/opt/csw/lib/\$$ISALIST -R/opt/csw/lib CONFIGURE_ARGS = $(DIRPATHS) --with-ssl=/opt/csw Modified: csw/mgar/pkg/smbldap-tools/trunk/Makefile =================================================================== --- csw/mgar/pkg/smbldap-tools/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/smbldap-tools/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -12,6 +12,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tgz DISTFILES += $(call admfiles,CSWsmbldap-tools,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + #PREREQUISITE_PKGS = CSWpmldap CSWpmdigestsha1 CSWpmunicodemap PATCHFILES = header-confdir-fix.diff Modified: csw/mgar/pkg/snort/trunk/Makefile =================================================================== --- csw/mgar/pkg/snort/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/snort/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWsnort, depend ) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) --libdir=/opt/csw/lib CONFIGURE_ARGS += --enable-dynamicplugin Modified: csw/mgar/pkg/socat/trunk/Makefile =================================================================== --- csw/mgar/pkg/socat/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/socat/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -19,6 +19,9 @@ DISTFILES += changelog.CSW +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # Disable gcc specific options PATCHFILES = cc_compile.patch Modified: csw/mgar/pkg/spamassassin/trunk/Makefile =================================================================== --- csw/mgar/pkg/spamassassin/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/spamassassin/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -14,6 +14,9 @@ DISTFILES = $(SPKG_NAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWspamassassin,checkinstall depend postinstall) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(SPKG_NAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_SCRIPTS = custom BUILD_SCRIPTS = custom TEST_SCRIPTS = custom Modified: csw/mgar/pkg/spidermonkey/trunk/Makefile =================================================================== --- csw/mgar/pkg/spidermonkey/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/spidermonkey/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -14,6 +14,9 @@ # we are using our own DISTFILES += SunOS5.8_i86pc.mk +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = js-(\d+(?:\.\d+)*).tar.gz + DISTNAME = js # we find the os string used by the makefile by using Modified: csw/mgar/pkg/sqlite3/trunk/Makefile =================================================================== --- csw/mgar/pkg/sqlite3/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/sqlite3/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -15,6 +15,9 @@ DISTFILES += COPYING # DISTFILES += $(call admfiles,CSWsqlite3, depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = sqlite-(\d+(?:\.\d+)*).tar.gz + CFLAGS += -xlibmil -errtags=yes -erroff=E_EMPTY_DECLARATION CXXFLAGS += -xlibmil -xlibmopt -features=tmplife -norunpath LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib Modified: csw/mgar/pkg/squidpurge/trunk/Makefile =================================================================== --- csw/mgar/pkg/squidpurge/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/squidpurge/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -16,6 +16,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION)-src.tar.gz WORKSRC = $(WORKDIR)/$(GARNAME) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)-src.tar.gz + DISTFILES += $(call admfiles,CSWsquidpurge,prototype copyright) # Build with SunONE Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/subversion/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -17,6 +17,9 @@ DISTFILES = $(GARNAME)-$(DISTVERSION).tar.bz2 +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + # JUnit #MASTER_SITES += $(SF_MIRROR)/junit/ #DISTFILES += junit3.8.1.zip Modified: csw/mgar/pkg/sudo/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/sudo/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ MASTER_SITES = ftp://ftp.sudo.ws/pub/sudo/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + DISTFILES += CSWsudo.gspec CSWsudo.postinstall DISTFILES += CSWsudo.prototype CSWsudo.depend DISTFILES += CSWsudo.space CSWsudo.postremove Modified: csw/mgar/pkg/sudo-ldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo-ldap/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/sudo-ldap/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ MASTER_SITES = ftp://ftp.sudo.ws/pub/sudo/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + DISTFILES += CSWsudo-ldap.gspec CSWsudo-ldap.postinstall DISTFILES += CSWsudo-ldap.prototype CSWsudo-ldap.depend DISTFILES += CSWsudo-ldap.space CSWsudo-ldap.postremove Modified: csw/mgar/pkg/swaks/trunk/Makefile =================================================================== --- csw/mgar/pkg/swaks/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/swaks/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION) DISTFILES += $(call admfiles,CSW$(GARNAME), depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*) + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = INSTALL_SCRIPTS = custom Modified: csw/mgar/pkg/swig/trunk/Makefile =================================================================== --- csw/mgar/pkg/swig/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/swig/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -20,6 +20,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWswig,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # Prevent automake from attempting to regenerate everything PATCHFILES += am.diff Modified: csw/mgar/pkg/sword/trunk/Makefile =================================================================== --- csw/mgar/pkg/sword/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/sword/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -8,9 +8,13 @@ endef MASTER_SITES = http://crosswire.org/ftpmirror/pub/sword/source/v1.5 +UPSTREAM_MASTER_SITES = http://crosswire.org/ftpmirror/pub/sword/source/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWsword, depend ) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = v(\d+(?:\.\d+)*) + GARCOMPILER ?= GNU CPPFLAGS=-D_REENTRANT Modified: csw/mgar/pkg/synergy/trunk/Makefile =================================================================== --- csw/mgar/pkg/synergy/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/synergy/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -15,6 +15,9 @@ DISTFILES = synergy-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWsynergy) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = synergy-(\d+(?:\.\d+)*).tar.gz + # Adjust code so that it compiles with Sun Studio Compiler # https://sourceforge.net/tracker/index.php?func=detail&aid=1574331&group_id=59275&atid=490469 PATCHFILES = suncc.diff Modified: csw/mgar/pkg/sysbench/trunk/Makefile =================================================================== --- csw/mgar/pkg/sysbench/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/sysbench/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -21,6 +21,9 @@ #DISTFILES += $(call admfiles,CSWsysbench,) DISTFILES += $(call admfiles,CSWsysbench,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = Modified: csw/mgar/pkg/syslog_ng/trunk/Makefile =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/syslog_ng/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -15,6 +15,9 @@ DISTFILES += syslog-ng.conf.CSW DISTFILES += cswsyslog_ng +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + SPKG_CLASSES = none cswinitsmf PREREQUISITE_PKGS = CSWeventlog Modified: csw/mgar/pkg/sysstat/trunk/Makefile =================================================================== --- csw/mgar/pkg/sysstat/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/sysstat/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -20,6 +20,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tgz DISTFILES += $(call admfiles,CSWsysstat,prototype-sparc prototype-i386 depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + SPKG_SOURCEURL = http://www.maier-komor.de/sysstat.html PATCHFILES = patch-onlyisaexec-sysstatd.diff Modified: csw/mgar/pkg/system-tray-applet/trunk/Makefile =================================================================== --- csw/mgar/pkg/system-tray-applet/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/system-tray-applet/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -10,6 +10,9 @@ MASTER_SITES = http://ftp.gnome.org/pub/GNOME/sources/$(GARNAME)/$(GARVERSION)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + CONFIGURE_ARGS = $(DIRPATHS) # No test suite Modified: csw/mgar/pkg/tcp_wrappers/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcp_wrappers/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/tcp_wrappers/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -12,6 +12,9 @@ DISTFILES = $(DISTNAME).tar.gz WORKSRC = $(WORKDIR)/$(DISTNAME) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)_(\d+(?:\.\d+)*).tar.gz + #BUILD_ARGS = REAL_DAEMON_DIR=/foo/bar BUILD_ARGS += STYLE=-DPROCESS_OPTIONS Modified: csw/mgar/pkg/template/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/template/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWpackage,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) # Remove the following rules and uncomment the Modified: csw/mgar/pkg/texinfo/trunk/Makefile =================================================================== --- csw/mgar/pkg/texinfo/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/texinfo/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk Modified: csw/mgar/pkg/textutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/textutils/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/textutils/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -10,6 +10,9 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/tin/trunk/Makefile =================================================================== --- csw/mgar/pkg/tin/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/tin/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWtin,prototype depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + PATCHFILES = configure.patch CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/tme/trunk/Makefile =================================================================== --- csw/mgar/pkg/tme/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/tme/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -15,6 +15,9 @@ MASTER_SITES = http://people.csail.mit.edu/fredette/tme/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # -- ROM Images -- # Sun 2 Multibus Rev R ROM: Modified: csw/mgar/pkg/tnef/trunk/Makefile =================================================================== --- csw/mgar/pkg/tnef/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/tnef/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWtnef,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) TEST_SCRIPTS = custom Modified: csw/mgar/pkg/tomcat4/trunk/Makefile =================================================================== --- csw/mgar/pkg/tomcat4/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/tomcat4/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -7,12 +7,16 @@ Apache Tomcat is the servlet container that is used in the official Reference Implementation for the Java Servlet and JavaServer Pages technologies. The Java Servlet and JavaServer Pages specifications are developed by Sun under the Java Community Process. endef +UPSTREAM_MASTER_SITES = http://mir2.ovh.net/ftp.apache.org/dist/jakarta/tomcat-4/ MASTER_SITES = http://mir2.ovh.net/ftp.apache.org/dist/jakarta/tomcat-4/v$(GARVERSION)/bin/ DISTFILES = apache-tomcat-$(GARVERSION).tar.gz PKGDIST = apache-tomcat-$(GARVERSION).tar.gz DISTFILES += CSWtomcat4.gspec CSWtomcat4.prototype CSWtomcat4.depend preremove postinstall preinstall checkinstall space i.smfno i.smfyes svc-tomcat4 tomcat4.xml tomcat4 cswtomcat4 # DISTFILES += $(call admfiles, CSWtomcat4, depend ) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = v(\d+(?:\.\d+)*) + CONFIGURE_SCRIPTS = none BUILD_SCRIPTS = none TEST_SCRIPTS = none Modified: csw/mgar/pkg/tomcat5/trunk/Makefile =================================================================== --- csw/mgar/pkg/tomcat5/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/tomcat5/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -7,12 +7,16 @@ Apache Tomcat is the servlet container that is used in the official Reference Implementation for the Java Servlet and JavaServer Pages technologies. The Java Servlet and JavaServer Pages specifications are developed by Sun under the Java Community Process. endef +UPSTREAM_MASTER_SITES = http://mir2.ovh.net/ftp.apache.org/dist/jakarta/tomcat-5/ MASTER_SITES = http://mir2.ovh.net/ftp.apache.org/dist/jakarta/tomcat-5/v$(GARVERSION)/bin/ DISTFILES = apache-tomcat-$(GARVERSION).tar.gz PKGDIST = apache-tomcat-$(GARVERSION).tar.gz DISTFILES += CSWtomcat5.gspec CSWtomcat5.prototype CSWtomcat5.depend preremove postinstall preinstall checkinstall space i.smfno i.smfyes svc-tomcat5 tomcat5.xml tomcat5 cswtomcat5 # DISTFILES += $(call admfiles, CSWtomcat5, depend ) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = v(\d+(?:\.\d+)*) + CONFIGURE_SCRIPTS = none BUILD_SCRIPTS = none TEST_SCRIPTS = none Modified: csw/mgar/pkg/tomcat6/trunk/Makefile =================================================================== --- csw/mgar/pkg/tomcat6/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/tomcat6/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -7,12 +7,16 @@ Apache Tomcat is the servlet container that is used in the official Reference Implementation for the Java Servlet and JavaServer Pages technologies. The Java Servlet and JavaServer Pages specifications are developed by Sun under the Java Community Process. endef +UPSTREAM_MASTER_SITES = http://mir2.ovh.net/ftp.apache.org/dist/jakarta/tomcat-6/ MASTER_SITES = http://mir2.ovh.net/ftp.apache.org/dist/jakarta/tomcat-6/v$(GARVERSION)/bin/ DISTFILES = apache-tomcat-$(GARVERSION).tar.gz PKGDIST = apache-tomcat-$(GARVERSION).tar.gz DISTFILES += CSWtomcat6.gspec CSWtomcat6.prototype CSWtomcat6.depend preremove postinstall preinstall checkinstall space i.smfno i.smfyes svc-tomcat6 tomcat6.xml tomcat6 cswtomcat6 # DISTFILES += $(call admfiles, CSWtomcat6, depend ) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = v(\d+(?:\.\d+)*) + CONFIGURE_SCRIPTS = none BUILD_SCRIPTS = none TEST_SCRIPTS = none Modified: csw/mgar/pkg/trac/trunk/Makefile =================================================================== --- csw/mgar/pkg/trac/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/trac/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -15,6 +15,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWtrac,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + SPKG_SOURCEURL = http://trac.edgewall.org/wiki/TracDownload CONFIGURE_SCRIPTS = Modified: csw/mgar/pkg/tsclient/trunk/Makefile =================================================================== --- csw/mgar/pkg/tsclient/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/tsclient/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -12,6 +12,9 @@ PATCHFILES = support.c.diff CONFIGURE_ARGS = --prefix=$(prefix) LD_OPTIONS='-lsocket -lnsl' +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + TEST_SCRIPTS = include gar/category.mk Modified: csw/mgar/pkg/vorbis-tools/trunk/Makefile =================================================================== --- csw/mgar/pkg/vorbis-tools/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/vorbis-tools/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -10,9 +10,13 @@ simple commentor. endef +UPSTREAM_MASTER_SITES = http://www.vorbis.com/files/ MASTER_SITES = http://www.vorbis.com/files/1.0.1/unix/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = (\d+(?:\.\d+)*) + DEPENDS = lib/libvorbis CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/wesnoth/trunk/Makefile =================================================================== --- csw/mgar/pkg/wesnoth/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/wesnoth/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWwesnoth, depend ) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + GARCOMPILER ?= GNU PATCHFILES = language.cpp.diff Modified: csw/mgar/pkg/wget/trunk/Makefile =================================================================== --- csw/mgar/pkg/wget/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/wget/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -16,6 +16,9 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + LIBDEPS += lib/openssl CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/xcb-proto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xcb-proto/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/xcb-proto/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + DISTFILES += $(call admfiles,CSWxcb-proto, depend) LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib Modified: csw/mgar/pkg/xchat/trunk/Makefile =================================================================== --- csw/mgar/pkg/xchat/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/xchat/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -16,6 +16,9 @@ DISTFILES += CSWxchat-py.gspec CSWxchat-py.depend CSWxchat-py.prototype DISTFILES += CSWxchat-tcl.gspec CSWxchat-tcl.depend CSWxchat-tcl.prototype +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + # Remove hardcoded use of -lutil for the python plugin PATCHFILES += pylibs.diff Modified: csw/mgar/pkg/xextproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xextproto/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/xextproto/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + DISTFILES += $(call admfiles,CSWxextproto, depend) LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib Modified: csw/mgar/pkg/xft/trunk/Makefile =================================================================== --- csw/mgar/pkg/xft/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/xft/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = libXft-$(GARVERSION).tar.gz PKGDIST = libXft-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + DISTFILES += CSWlibxft2.gspec CSWlibxft2.prototype CSWlibxft2.depend DISTFILES += CSWlibxft2dev.gspec CSWlibxft2dev.prototype CSWlibxft2dev.depend # DISTFILES += $(call admfiles,CSWlibxft2, depend) Modified: csw/mgar/pkg/xine-ui/trunk/Makefile =================================================================== --- csw/mgar/pkg/xine-ui/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/xine-ui/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + LIBDEPS = lib/xine-lib CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/xinetd/trunk/Makefile =================================================================== --- csw/mgar/pkg/xinetd/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/xinetd/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -15,6 +15,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWxinetd,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + LIBDEPS += lib/tcp_wrappers CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/xmlstarlet/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlstarlet/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/xmlstarlet/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -16,6 +16,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWxmlstarlet,depend prototype) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + PATCHFILES = $(GARNAME)-$(GARVERSION)-cc.patch include gar/category.mk Modified: csw/mgar/pkg/xmlto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlto/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/xmlto/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -10,6 +10,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWxmlto) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-mktemp=/opt/csw/bin/mktemp CONFIGURE_ARGS += --with-find=/opt/csw/bin/gfind Modified: csw/mgar/pkg/xmms/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmms/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/xmms/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ MASTER_SITES = http://www.xmms.org/files/1.2.x/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + DEPENDS = lib/libvorbis CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/xproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xproto/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/xproto/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + DISTFILES += $(call admfiles,CSWxproto, depend) LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib Modified: csw/mgar/pkg/xrender/trunk/Makefile =================================================================== --- csw/mgar/pkg/xrender/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/xrender/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = libXrender-$(GARVERSION).tar.gz PKGDIST = libXrender-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + DISTFILES += CSWlibxrender.gspec CSWlibxrender.prototype CSWlibxrender.depend DISTFILES += CSWrenderdev.gspec CSWrenderdev.prototype CSWrenderdev.depend # DISTFILES += $(call admfiles,CSWxrender, depend) Modified: csw/mgar/pkg/xrestop/trunk/Makefile =================================================================== --- csw/mgar/pkg/xrestop/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/xrestop/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -16,4 +16,7 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWxrestop,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + include gar/category.mk Modified: csw/mgar/pkg/xtrans/trunk/Makefile =================================================================== --- csw/mgar/pkg/xtrans/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/xtrans/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -11,6 +11,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # DISTFILES += CSWxtrans.gspec CSWxtrans.prototype CSWxtrans.depend # DISTFILES += CSWxtransdev.gspec CSWxtransdev.prototype CSWxtransdev.depend DISTFILES += $(call admfiles,CSWxtrans, depend) Modified: csw/mgar/pkg/zsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/zsh/trunk/Makefile 2008-12-01 23:29:31 UTC (rev 2425) +++ csw/mgar/pkg/zsh/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) @@ -13,6 +13,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWzsh,depend postinstall postremove) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-maildir-support CONFIGURE_ARGS += --enable-fndir=$(sharedstatedir)/$(GARNAME)/functions This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Dec 2 07:53:18 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 02 Dec 2008 06:53:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[2427] csw/mgar/pkg/ethereal/trunk/Makefile Message-ID: Revision: 2427 http://gar.svn.sourceforge.net/gar/?rev=2427&view=rev Author: wbonnet Date: 2008-12-02 06:53:17 +0000 (Tue, 02 Dec 2008) Log Message: ----------- Comment UREG_FILEs something is blocking the parser, will fix it later Modified Paths: -------------- csw/mgar/pkg/ethereal/trunk/Makefile Modified: csw/mgar/pkg/ethereal/trunk/Makefile =================================================================== --- csw/mgar/pkg/ethereal/trunk/Makefile 2008-12-02 00:03:53 UTC (rev 2426) +++ csw/mgar/pkg/ethereal/trunk/Makefile 2008-12-02 06:53:17 UTC (rev 2427) @@ -14,7 +14,7 @@ DISTFILES = $(DISTNAME).tar.bz2 # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +# UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 DEPENDS += lib/libpcap DEPENDS += lib/gtk2 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 Dec 2 16:49:33 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Dec 2008 15:49:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[2428] csw/mgar Message-ID: Revision: 2428 http://gar.svn.sourceforge.net/gar/?rev=2428&view=rev Author: dmichelsen Date: 2008-12-02 15:49:33 +0000 (Tue, 02 Dec 2008) Log Message: ----------- mGAR v1: Added new target 'pkglist' Modified Paths: -------------- csw/mgar/gar/v1/gar.pkg.mk csw/mgar/pkg/Makefile Modified: csw/mgar/gar/v1/gar.pkg.mk =================================================================== --- csw/mgar/gar/v1/gar.pkg.mk 2008-12-02 06:53:17 UTC (rev 2427) +++ csw/mgar/gar/v1/gar.pkg.mk 2008-12-02 15:49:33 UTC (rev 2428) @@ -195,3 +195,22 @@ pkgenv: @$(PKG_ENV) env + +# pkglist - list the packages to be built with GAR pathname, catalog name and package name +# + +define _pkglist_pkgname +$(shell perl -F'\s+' -ane 'print "$$F[2]" if( $$F[0] eq "%var" && $$F[1] eq "pkgname")' files/$(1).gspec) +endef + +define _pkglist_catalogname +$(shell perl -F'\s+' -ane 'print "$$F[2]" if( $$F[0] eq "%var" && $$F[1] eq "bitname")' files/$(1).gspec) +endef + +define _pkglist_one +$(shell /usr/bin/echo "$(patsubst $(realpath $(shell pwd)/$(GARDIR))/%,%,$(realpath .))\t$(call _pkglist_catalogname,$(1))\t$(call _pkglist_pkgname,$(1))") +endef + +pkglist: + @echo "G: $(GARDIR) - $(shell pwd) - $(realpath $(shell pwd)/$(GARDIR)) - $(realpath .)" + @$(foreach SPEC,$(SPKG_SPECS),echo "$(call _pkglist_one,$(SPEC))";) Modified: csw/mgar/pkg/Makefile =================================================================== --- csw/mgar/pkg/Makefile 2008-12-02 06:53:17 UTC (rev 2427) +++ csw/mgar/pkg/Makefile 2008-12-02 15:49:33 UTC (rev 2428) @@ -22,6 +22,11 @@ $(MAKE) -C $$i $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG); \ done +pkglist: + @for i in $(filter-out $(FILTER_DIRS),$(wildcard */)) ; do \ + $(MAKE) -s -C $$i/trunk pkglist ; \ + done + newpkg-%: @svn mkdir $* $*/tags $*/branches $*/trunk $*/trunk/files @(echo "GARNAME = package"; \ 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 Dec 2 17:18:42 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Dec 2008 16:18:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[2429] csw/branches/dam/automatic-multiarch-compile Message-ID: Revision: 2429 http://gar.svn.sourceforge.net/gar/?rev=2429&view=rev Author: dmichelsen Date: 2008-12-02 16:18:42 +0000 (Tue, 02 Dec 2008) Log Message: ----------- automatic-multiarch-compile: Last LDFLAGS fix before merge Modified Paths: -------------- csw/branches/dam/automatic-multiarch-compile/gar.conf.mk csw/branches/dam/automatic-multiarch-compile/gar.mk Modified: csw/branches/dam/automatic-multiarch-compile/gar.conf.mk =================================================================== --- csw/branches/dam/automatic-multiarch-compile/gar.conf.mk 2008-12-02 15:49:33 UTC (rev 2428) +++ csw/branches/dam/automatic-multiarch-compile/gar.conf.mk 2008-12-02 16:18:42 UTC (rev 2429) @@ -330,28 +330,15 @@ # Subdirectories for specialized binaries and libraries # Use defaults for sparcv8 and i386 as those are symlinks -ISALIBDIR_sparcv9+fmuladd ?= sparcv9+fmuladd -ISALIBDIR_sparcv9+vis2 ?= sparcv9+vis2 -ISALIBDIR_sparcv9+vis ?= sparcv9+vis -ISALIBDIR_sparcv9 ?= sparcv9 -ISALIBDIR_sparcv8plus+fmuladd ?= sparcv8plus+fmuladd -ISALIBDIR_sparcv8plus+vis2 ?= sparcv8plus+vis2 -ISALIBDIR_sparcv8plus+vis ?= sparcv8plus+vis -ISALIBDIR_sparcv8plus ?= sparcv8plus ISALIBDIR_sparcv8 ?= . -ISALIBDIR_sparcv8-fsmuld ?= sparcv8-fsmuld -ISALIBDIR_amd64 ?= amd64 -ISALIBDIR_pentium_pro+mmx ?= pentium_pro+mmx -ISALIBDIR_pentium_pro ?= pentium_pro -ISALIBDIR_pentium+mmx ?= pentium+mmx -ISALIBDIR_pentium ?= pentium ISALIBDIR_i386 ?= . +$(foreach I,$(ISALIST),$(eval ISALIBDIR_$(I) ?= $I)) # These are the directories where the optimized libraries should go to ISALIBDIR ?= $(ISALIBDIR_$(ISA)) # These are the directories where the optimized binaries should go to -$(foreach ARCH,$(ISALIST), $(eval ISABINDIR_$(ARCH) ?= $(ISALIBDIR_$(ARCH)))) +$(foreach I,$(ISALIST), $(eval ISABINDIR_$(I) ?= $(ISALIBDIR_$(I)))) ISABINDIR ?= $(ISABINDIR_$(ISA)) # @@ -428,16 +415,15 @@ # the links 32 and 64. ifeq ($(origin LINKER_FLAGS), undefined) ifdef NOISALIST -LINKER_FLAGS = $(foreach ELIB,$(libdir)/$(MM_LIBDIR) $(EXTRA_LIB),-L$(ELIB) -R$(ELIB)) +LINKER_FLAGS = $(foreach ELIB,$(libdir) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR)) -R$(abspath $(ELIB)/$(MM_LIBDIR)) else # If we use $ISALIST it is a good idea to also add $MM_LIBDIR as there # may not be a subdirectory for the 32-bit standard case (this would normally -# be a symlink of the form lib/sparcv8 -> . and lib/i386 -> .) -LINKER_FLAGS = $(foreach ELIB,$(libdir) $(EXTRA_LIB),-L$(ELIB)/$(MM_LIBDIR) -R'$(ELIB)/\$$$$''ISALIST' -R$(ELIB)/$(MM_LIBDIR)) +# be a symlink of the form lib/sparcv8 -> . and lib/i386 -> .). This is most likely +# the case for libraries in $(EXTRA_LIBS) for which no links generated in CSWcommon. +LINKER_FLAGS = $(foreach ELIB,$(libdir) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR)) -R$(ELIB)/\\\\\\\$$\$$ISALIST -R$(abspath $(ELIB)/$(MM_LIBDIR))) +#LINKER_FLAGS = $(foreach ELIB,$(libdir) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR)) -R'$(abspath $(ELIB)/\$$ISALIST)' -R$(abspath $(ELIB)/$(MM_LIBDIR))) endif -#LINKER_FLAGS = $(foreach ELIB,$(EXTRA_LIB) $(abspath $(libdir)/$(MM_LIBDIR)),-L$(ELIB) -R$(ELIB)) -# DESTDIR is an old concept, disable for now -#LINKER_FLAGS += $(if $(IGNORE_DESTDIR),,-L$(abspath $(DESTDIR)$(libdir)/$(MM_LIBDIR))) endif CC_HOME = $($(GARCOMPILER)_CC_HOME) @@ -471,11 +457,9 @@ PATH = $(if $(filter SOS12,$(GARCOMPILER)),$(abspath $(GARBIN)/sos12-wrappers):)$(if $(IGNORE_DESTDIR),,$(abspath $(DESTDIR)$(bindir)/$(MM_BINDIR)):$(DESTDIR)$(bindir):$(abspath $(DESTDIR)$(sbindir)/$(MM_BINDIR)):$(DESTDIR)$(sbindir):)$(abspath $(bindir)/$(MM_BINDIR)):$(bindir):$(abspath $(sbindir)/$(MM_BINDIR)):$(sbindir):$(CC_HOME)/bin:$(abspath $(GARBIN)):/usr/bin:/usr/sbin:/usr/java/bin:/usr/ccs/bin # This is for foo-config chaos -PKG_CONFIG_PATH := $(abspath $(libdir)/$(MM_LIBDIR)/pkgconfig):$(libdir)/pkgconfig:$(PKG_CONFIG_PATH) -# DESTDIR is an old concept, disable for now. -#ifneq ($(IGNORE_DESTDIR),1) -#PKG_CONFIG_PATH := $(abspath $(DESTDIR)$(libdir)/$(MM_LIBDIR)/pkgconfig):$(DESTDIR)$(libdir)/pkgconfig:$(PKG_CONFIG_PATH) -#endif +#PKG_CONFIG_PATH := $(abspath $(libdir)/$(MM_LIBDIR)/pkgconfig):$(libdir)/pkgconfig:$(PKG_CONFIG_PATH) +PKG_CONFIG_DIRS ?= $(libdir) $(EXTRA_PKG_CONFIG_DIRS) +PKG_CONFIG_PATH ?= $(foreach D,$(PKG_CONFIG_DIRS),$(abspath $D/$(MM_LIBDIR)/pkgconfig)) # # Mirror Sites @@ -492,6 +476,10 @@ # Keep this for compatibility SF_MIRROR = $(firstword $(SF_MIRRORS)) +# Google Code +GOOGLE_PROJECT ?= $(GARNAME) +GOOGLE_MIRROR ?= http://$(GOOGLE_PROJECT).googlecode.com/files/ + # GNU GNU_SITE = http://mirrors.kernel.org/ GNU_GNUROOT = $(GNU_SITE)/gnu @@ -522,7 +510,6 @@ ifeq ($(origin COMPILER_EXPORTS), undefined) COMPILER_EXPORTS = CPPFLAGS CFLAGS CXXFLAGS LDFLAGS -#COMPILER_EXPORTS += ASFLAGS OPTFLAGS CC CXX LD_OPTIONS COMPILER_EXPORTS += ASFLAGS OPTFLAGS CC CXX COMPILER_EXPORTS += CC_HOME CC_VERSION CXX_VERSION endif @@ -534,15 +521,15 @@ COMMON_EXPORTS ?= $(DIRECTORY_EXPORTS) $(COMPILER_EXPORTS) $(GARPKG_EXPORTS) $(EXTRA_COMMON_EXPORTS) -CONFIGURE_EXPORTS ?= $(COMMON_EXPORTS) PKG_CONFIG_PATH DESTDIR -BUILD_EXPORTS ?= $(COMMON_EXPORTS) -TEST_EXPORTS ?= $(COMMON_EXPORTS) -INSTALL_EXPORTS ?= $(COMMON_EXPORTS) DESTDIR +CONFIGURE_EXPORTS ?= $(COMMON_EXPORTS) $(EXTRA_CONFIGURE_EXPORTS) PKG_CONFIG_PATH DESTDIR +BUILD_EXPORTS ?= $(COMMON_EXPORTS) $(EXTRA_BUILD_EXPORTS) +TEST_EXPORTS ?= $(COMMON_EXPORTS) $(EXTRA_TEST_EXPORTS) +INSTALL_EXPORTS ?= $(COMMON_EXPORTS) $(EXTRA_INSTALL_EXPORTS) DESTDIR -CONFIGURE_ENV ?= $(foreach TTT,$(CONFIGURE_EXPORTS) $(EXTRA_CONFIGURE_EXPORTS),$(TTT)="$($(TTT))") -BUILD_ENV ?= $(foreach TTT,$(BUILD_EXPORTS) $(EXTRA_BUILD_EXPORTS),$(TTT)="$($(TTT))") -TEST_ENV ?= $(foreach TTT,$(TEST_EXPORTS) $(EXTRA_TEST_EXPORTS),$(TTT)="$($(TTT))") -INSTALL_ENV ?= $(foreach TTT,$(INSTALL_EXPORTS) $(EXTRA_INSTALL_EXPORTS),$(TTT)="$($(TTT))") +CONFIGURE_ENV ?= $(foreach TTT,$(CONFIGURE_EXPORTS),$(TTT)="$($(TTT))") +BUILD_ENV ?= $(foreach TTT,$(BUILD_EXPORTS),$(TTT)="$($(TTT))") +TEST_ENV ?= $(foreach TTT,$(TEST_EXPORTS),$(TTT)="$($(TTT))") +INSTALL_ENV ?= $(foreach TTT,$(INSTALL_EXPORTS),$(TTT)="$($(TTT))") # Standard Scripts CONFIGURE_SCRIPTS ?= $(WORKSRC)/configure Modified: csw/branches/dam/automatic-multiarch-compile/gar.mk =================================================================== --- csw/branches/dam/automatic-multiarch-compile/gar.mk 2008-12-02 15:49:33 UTC (rev 2428) +++ csw/branches/dam/automatic-multiarch-compile/gar.mk 2008-12-02 16:18:42 UTC (rev 2429) @@ -582,7 +582,8 @@ _MERGE_INCLUDE_FILES += $(EXTRA_MERGE_INCLUDE_FILES) $(EXTRA_MERGE_INCLUDE_FILES_$(MODULATION)) MERGE_EXCLUDE_INFODIR ?= $(sharedstatedir)/info/dir -MERGE_EXCLUDE_DEFAULT ?= $(MERGE_EXCLUDE_INFODIR) $(libdir)/.*\.a $(libdir)/.*\.la +#MERGE_EXCLUDE_DEFAULT ?= $(MERGE_EXCLUDE_INFODIR) $(libdir)/.*\.a $(libdir)/.*\.la +MERGE_EXCLUDE_DEFAULT ?= $(MERGE_EXCLUDE_INFODIR) $(libdir)/.*\.a # Exclude these files ifeq ($(origin MERGE_EXCLUDE_FILES_$(MODULATION)), undefined) 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 Dec 2 17:21:00 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Dec 2008 16:21:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[2430] csw/mgar/gar/v2 Message-ID: Revision: 2430 http://gar.svn.sourceforge.net/gar/?rev=2430&view=rev Author: dmichelsen Date: 2008-12-02 16:20:57 +0000 (Tue, 02 Dec 2008) Log Message: ----------- mGAR v2: Merge [2429] from private branch Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2008-12-02 16:18:42 UTC (rev 2429) +++ csw/mgar/gar/v2/gar.conf.mk 2008-12-02 16:20:57 UTC (rev 2430) @@ -330,28 +330,15 @@ # Subdirectories for specialized binaries and libraries # Use defaults for sparcv8 and i386 as those are symlinks -ISALIBDIR_sparcv9+fmuladd ?= sparcv9+fmuladd -ISALIBDIR_sparcv9+vis2 ?= sparcv9+vis2 -ISALIBDIR_sparcv9+vis ?= sparcv9+vis -ISALIBDIR_sparcv9 ?= sparcv9 -ISALIBDIR_sparcv8plus+fmuladd ?= sparcv8plus+fmuladd -ISALIBDIR_sparcv8plus+vis2 ?= sparcv8plus+vis2 -ISALIBDIR_sparcv8plus+vis ?= sparcv8plus+vis -ISALIBDIR_sparcv8plus ?= sparcv8plus ISALIBDIR_sparcv8 ?= . -ISALIBDIR_sparcv8-fsmuld ?= sparcv8-fsmuld -ISALIBDIR_amd64 ?= amd64 -ISALIBDIR_pentium_pro+mmx ?= pentium_pro+mmx -ISALIBDIR_pentium_pro ?= pentium_pro -ISALIBDIR_pentium+mmx ?= pentium+mmx -ISALIBDIR_pentium ?= pentium ISALIBDIR_i386 ?= . +$(foreach I,$(ISALIST),$(eval ISALIBDIR_$(I) ?= $I)) # These are the directories where the optimized libraries should go to ISALIBDIR ?= $(ISALIBDIR_$(ISA)) # These are the directories where the optimized binaries should go to -$(foreach ARCH,$(ISALIST), $(eval ISABINDIR_$(ARCH) ?= $(ISALIBDIR_$(ARCH)))) +$(foreach I,$(ISALIST), $(eval ISABINDIR_$(I) ?= $(ISALIBDIR_$(I)))) ISABINDIR ?= $(ISABINDIR_$(ISA)) # @@ -428,16 +415,15 @@ # the links 32 and 64. ifeq ($(origin LINKER_FLAGS), undefined) ifdef NOISALIST -LINKER_FLAGS = $(foreach ELIB,$(libdir)/$(MM_LIBDIR) $(EXTRA_LIB),-L$(ELIB) -R$(ELIB)) +LINKER_FLAGS = $(foreach ELIB,$(libdir) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR)) -R$(abspath $(ELIB)/$(MM_LIBDIR)) else # If we use $ISALIST it is a good idea to also add $MM_LIBDIR as there # may not be a subdirectory for the 32-bit standard case (this would normally -# be a symlink of the form lib/sparcv8 -> . and lib/i386 -> .) -LINKER_FLAGS = $(foreach ELIB,$(libdir) $(EXTRA_LIB),-L$(ELIB)/$(MM_LIBDIR) -R'$(ELIB)/\$$$$''ISALIST' -R$(ELIB)/$(MM_LIBDIR)) +# be a symlink of the form lib/sparcv8 -> . and lib/i386 -> .). This is most likely +# the case for libraries in $(EXTRA_LIBS) for which no links generated in CSWcommon. +LINKER_FLAGS = $(foreach ELIB,$(libdir) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR)) -R$(ELIB)/\\\\\\\$$\$$ISALIST -R$(abspath $(ELIB)/$(MM_LIBDIR))) +#LINKER_FLAGS = $(foreach ELIB,$(libdir) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR)) -R'$(abspath $(ELIB)/\$$ISALIST)' -R$(abspath $(ELIB)/$(MM_LIBDIR))) endif -#LINKER_FLAGS = $(foreach ELIB,$(EXTRA_LIB) $(abspath $(libdir)/$(MM_LIBDIR)),-L$(ELIB) -R$(ELIB)) -# DESTDIR is an old concept, disable for now -#LINKER_FLAGS += $(if $(IGNORE_DESTDIR),,-L$(abspath $(DESTDIR)$(libdir)/$(MM_LIBDIR))) endif CC_HOME = $($(GARCOMPILER)_CC_HOME) @@ -471,11 +457,9 @@ PATH = $(if $(filter SOS12,$(GARCOMPILER)),$(abspath $(GARBIN)/sos12-wrappers):)$(if $(IGNORE_DESTDIR),,$(abspath $(DESTDIR)$(bindir)/$(MM_BINDIR)):$(DESTDIR)$(bindir):$(abspath $(DESTDIR)$(sbindir)/$(MM_BINDIR)):$(DESTDIR)$(sbindir):)$(abspath $(bindir)/$(MM_BINDIR)):$(bindir):$(abspath $(sbindir)/$(MM_BINDIR)):$(sbindir):$(CC_HOME)/bin:$(abspath $(GARBIN)):/usr/bin:/usr/sbin:/usr/java/bin:/usr/ccs/bin # This is for foo-config chaos -PKG_CONFIG_PATH := $(abspath $(libdir)/$(MM_LIBDIR)/pkgconfig):$(libdir)/pkgconfig:$(PKG_CONFIG_PATH) -# DESTDIR is an old concept, disable for now. -#ifneq ($(IGNORE_DESTDIR),1) -#PKG_CONFIG_PATH := $(abspath $(DESTDIR)$(libdir)/$(MM_LIBDIR)/pkgconfig):$(DESTDIR)$(libdir)/pkgconfig:$(PKG_CONFIG_PATH) -#endif +#PKG_CONFIG_PATH := $(abspath $(libdir)/$(MM_LIBDIR)/pkgconfig):$(libdir)/pkgconfig:$(PKG_CONFIG_PATH) +PKG_CONFIG_DIRS ?= $(libdir) $(EXTRA_PKG_CONFIG_DIRS) +PKG_CONFIG_PATH ?= $(foreach D,$(PKG_CONFIG_DIRS),$(abspath $D/$(MM_LIBDIR)/pkgconfig)) # # Mirror Sites @@ -492,6 +476,10 @@ # Keep this for compatibility SF_MIRROR = $(firstword $(SF_MIRRORS)) +# Google Code +GOOGLE_PROJECT ?= $(GARNAME) +GOOGLE_MIRROR ?= http://$(GOOGLE_PROJECT).googlecode.com/files/ + # GNU GNU_SITE = http://mirrors.kernel.org/ GNU_GNUROOT = $(GNU_SITE)/gnu @@ -522,7 +510,6 @@ ifeq ($(origin COMPILER_EXPORTS), undefined) COMPILER_EXPORTS = CPPFLAGS CFLAGS CXXFLAGS LDFLAGS -#COMPILER_EXPORTS += ASFLAGS OPTFLAGS CC CXX LD_OPTIONS COMPILER_EXPORTS += ASFLAGS OPTFLAGS CC CXX COMPILER_EXPORTS += CC_HOME CC_VERSION CXX_VERSION endif @@ -534,15 +521,15 @@ COMMON_EXPORTS ?= $(DIRECTORY_EXPORTS) $(COMPILER_EXPORTS) $(GARPKG_EXPORTS) $(EXTRA_COMMON_EXPORTS) -CONFIGURE_EXPORTS ?= $(COMMON_EXPORTS) PKG_CONFIG_PATH DESTDIR -BUILD_EXPORTS ?= $(COMMON_EXPORTS) -TEST_EXPORTS ?= $(COMMON_EXPORTS) -INSTALL_EXPORTS ?= $(COMMON_EXPORTS) DESTDIR +CONFIGURE_EXPORTS ?= $(COMMON_EXPORTS) $(EXTRA_CONFIGURE_EXPORTS) PKG_CONFIG_PATH DESTDIR +BUILD_EXPORTS ?= $(COMMON_EXPORTS) $(EXTRA_BUILD_EXPORTS) +TEST_EXPORTS ?= $(COMMON_EXPORTS) $(EXTRA_TEST_EXPORTS) +INSTALL_EXPORTS ?= $(COMMON_EXPORTS) $(EXTRA_INSTALL_EXPORTS) DESTDIR -CONFIGURE_ENV ?= $(foreach TTT,$(CONFIGURE_EXPORTS) $(EXTRA_CONFIGURE_EXPORTS),$(TTT)="$($(TTT))") -BUILD_ENV ?= $(foreach TTT,$(BUILD_EXPORTS) $(EXTRA_BUILD_EXPORTS),$(TTT)="$($(TTT))") -TEST_ENV ?= $(foreach TTT,$(TEST_EXPORTS) $(EXTRA_TEST_EXPORTS),$(TTT)="$($(TTT))") -INSTALL_ENV ?= $(foreach TTT,$(INSTALL_EXPORTS) $(EXTRA_INSTALL_EXPORTS),$(TTT)="$($(TTT))") +CONFIGURE_ENV ?= $(foreach TTT,$(CONFIGURE_EXPORTS),$(TTT)="$($(TTT))") +BUILD_ENV ?= $(foreach TTT,$(BUILD_EXPORTS),$(TTT)="$($(TTT))") +TEST_ENV ?= $(foreach TTT,$(TEST_EXPORTS),$(TTT)="$($(TTT))") +INSTALL_ENV ?= $(foreach TTT,$(INSTALL_EXPORTS),$(TTT)="$($(TTT))") # Standard Scripts CONFIGURE_SCRIPTS ?= $(WORKSRC)/configure Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2008-12-02 16:18:42 UTC (rev 2429) +++ csw/mgar/gar/v2/gar.mk 2008-12-02 16:20:57 UTC (rev 2430) @@ -582,7 +582,8 @@ _MERGE_INCLUDE_FILES += $(EXTRA_MERGE_INCLUDE_FILES) $(EXTRA_MERGE_INCLUDE_FILES_$(MODULATION)) MERGE_EXCLUDE_INFODIR ?= $(sharedstatedir)/info/dir -MERGE_EXCLUDE_DEFAULT ?= $(MERGE_EXCLUDE_INFODIR) $(libdir)/.*\.a $(libdir)/.*\.la +#MERGE_EXCLUDE_DEFAULT ?= $(MERGE_EXCLUDE_INFODIR) $(libdir)/.*\.a $(libdir)/.*\.la +MERGE_EXCLUDE_DEFAULT ?= $(MERGE_EXCLUDE_INFODIR) $(libdir)/.*\.a # Exclude these files ifeq ($(origin MERGE_EXCLUDE_FILES_$(MODULATION)), undefined) 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 Dec 2 17:23:52 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Dec 2008 16:23:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[2431] csw/mgar/pkg/setoolkit/trunk/ Message-ID: Revision: 2431 http://gar.svn.sourceforge.net/gar/?rev=2431&view=rev Author: dmichelsen Date: 2008-12-02 16:23:52 +0000 (Tue, 02 Dec 2008) Log Message: ----------- setoolkit: Move to mGAR v2, delete old stuff Removed Paths: ------------- csw/mgar/pkg/setoolkit/trunk/ 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 Dec 2 17:27:24 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Dec 2008 16:27:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[2432] csw/mgar/pkg/setoolkit/trunk/ Message-ID: Revision: 2432 http://gar.svn.sourceforge.net/gar/?rev=2432&view=rev Author: dmichelsen Date: 2008-12-02 16:27:24 +0000 (Tue, 02 Dec 2008) Log Message: ----------- setoolkit: Move to mGAR v2, pull in Added Paths: ----------- csw/mgar/pkg/setoolkit/trunk/ Property changes on: csw/mgar/pkg/setoolkit/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 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 Dec 2 17:28:21 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 02 Dec 2008 16:28:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[2433] csw/mgar/pkg/docbook-dtds/trunk Message-ID: Revision: 2433 http://gar.svn.sourceforge.net/gar/?rev=2433&view=rev Author: bdwalton Date: 2008-12-02 16:28:21 +0000 (Tue, 02 Dec 2008) Log Message: ----------- Crafted a Makefile to actually install all these catalogs and descriptions. Modified Paths: -------------- csw/mgar/pkg/docbook-dtds/trunk/Makefile csw/mgar/pkg/docbook-dtds/trunk/checksums Added Paths: ----------- csw/mgar/pkg/docbook-dtds/trunk/files/Makefile Modified: csw/mgar/pkg/docbook-dtds/trunk/Makefile =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/Makefile 2008-12-02 16:27:24 UTC (rev 2432) +++ csw/mgar/pkg/docbook-dtds/trunk/Makefile 2008-12-02 16:28:21 UTC (rev 2433) @@ -1,6 +1,9 @@ +# Replicate the RHEL5 docbook-dtds-1.0.30.1 rpm for CSW. Patches are taken +# from that srpm and modified (so paths work for GAR). + GARNAME = docbookdtds -GARVERSION = 1.0.30 -PATCHLEVEL = 1 +GARVERSION = 1.0 +PATCHLEVEL = 30.1 CATEGORIES = xtra PREREQUISITES = CSWunzip @@ -46,7 +49,7 @@ DBFILES += docbook-xml-4.3.zip docbook-4.4.zip docbook-xml-4.4.zip MASTER_SITES = $(O_SRC) $(D_SRC) -DISTFILES = $(DBFILES) +DISTFILES = $(DBFILES) Makefile PATCHFILES = docbook-4.2-euro.patch docbook-dtd30-sgml-1.0.catalog.patch PATCHFILES += docbook-dtd31-sgml-1.0.catalog.patch @@ -55,25 +58,18 @@ PATCHFILES += docbook-dtd42-sgml-1.0.catalog.patch PATCHFILES += docbook-dtds-ents.patch -#CONFIGURE_ARGS = $(DIRPATHS) +# we don't need no stinkin' configure! :) +CONFIGURE_SCRIPTS = +# no tests either. +TEST_SCRIPTS = -include gar/category.mk +# nothing to build either... +BUILD_SCRIPTS = -# BuildArch: noarch +INSTALL_ARGS = DESTDIR=$(DESTDIR) GARVERSION=$(GARVERSION) PATCHLEVEL=$(PATCHLEVEL) -# Patch0: docbook-dtd30-sgml-1.0.catalog.patch -# Patch1: docbook-dtd31-sgml-1.0.catalog.patch -# Patch2: docbook-dtd40-sgml-1.0.catalog.patch -# Patch3: docbook-dtd41-sgml-1.0.catalog.patch -# Patch4: docbook-dtd42-sgml-1.0.catalog.patch -# Patch5: docbook-4.2-euro.patch -# Patch6: docbook-dtds-ents.patch +include gar/category.mk -local-zip-%: - @echo " ==> Extracting $(DOWNLOADDIR)/$*" - @unzip $(DOWNLOADDIR)/$* -d $(EXTRACTDIR) - @$(MAKECOOKIE) - SGMLDIRS = 3.0 3.1 4.0 4.1 4.2 4.3 4.4 XMLDIRS = 4.1.2 4.2 4.3 4.4 @@ -130,9 +126,17 @@ pre-extract: $(WORKSRC) ( cd $(WORKSRC); \ for d in $(SGMLDIRS); do \ - mkdir $$d-sgml; \ + [ -d $$d-sgml ] || mkdir $$d-sgml; \ done; \ for d in $(XMLDIRS); do \ - mkdir $$d-xml; \ + [ -d $$d-xml ] || mkdir $$d-xml; \ done ) + @$(MAKECOOKIE) + +post-extract: + # Increase NAMELEN (bug #36058, bug #159382). [bug references from + # rpm .spec file] + ( cd $(WORKSRC); \ + gsed -e's,\(NAMELEN\s\+\)44\(\s\*\)\?,\1256,' -i.namelen */docbook.dcl; \ + cp ../Makefile .) @$(MAKECOOKIE) \ No newline at end of file Modified: csw/mgar/pkg/docbook-dtds/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/checksums 2008-12-02 16:27:24 UTC (rev 2432) +++ csw/mgar/pkg/docbook-dtds/trunk/checksums 2008-12-02 16:28:21 UTC (rev 2433) @@ -9,6 +9,7 @@ ab200202b9e136a144db1e0864c45074 download/docbook-xml-4.3.zip f89e1bd0b2c7a361e3f1f739e16b5d0d download/docbook-4.4.zip cbb04e9a700955d88c50962ef22c1634 download/docbook-xml-4.4.zip +9f1b87ab4fa6da7b7284a1c7edd1e3da download/Makefile 318742d3a6648a6905727f071cbc9847 download/docbook-4.2-euro.patch e3067045964536cc7445d5c3f1e99916 download/docbook-dtd30-sgml-1.0.catalog.patch 856d40f5d1e3fc8fd939b88bf5fedc87 download/docbook-dtd31-sgml-1.0.catalog.patch Added: csw/mgar/pkg/docbook-dtds/trunk/files/Makefile =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/Makefile (rev 0) +++ csw/mgar/pkg/docbook-dtds/trunk/files/Makefile 2008-12-02 16:28:21 UTC (rev 2433) @@ -0,0 +1,52 @@ +prefix = /opt/csw +datadir = $(prefix)/share + +INSTALL = /opt/csw/bin/ginstall -c +INSTALL_DATA = $(INSTALL) -m 0644 +INSTALL_DIR = $(INSTALL) -m 0755 -d + +docbookdir = $(datadir)/sgml/docbook + +SGML = $(wildcard *-sgml) +XML = $(wildcard *-xml) + +SGMLTARG = $(patsubst %,inst-%,$(SGML)) +XMLTARG = $(patsubst %,inst-%,$(XML)) + +.PHONY: $(SGML) $(XMLT) + +all: build + +install: $(SGMLTARG) $(XMLTARG) + +inst-%-sgml: DD=$(DESTDIR)/$(docbookdir)/sgml-dtd-$*$(GARVERSION)-$(PATCHLEVEL) +inst-%-sgml: + @echo Installing $*-sgml + @( cd $*-sgml; \ + gmkdir -p $(DD); \ + $(INSTALL_DATA) *dtd *mod $(DD)/; \ + [ -n "`ls *dcl 2>/dev/null`" ] && $(INSTALL_DATA) *dcl $(DD); \ + $(INSTALL_DATA) docbook.cat $(DD)/; \ + if [ -d ent ]; then \ + $(INSTALL_DIR) $(DD)/ent; \ + $(INSTALL_DATA) ent/* $(DD)/ent/; \ + fi ) + +inst-%-xml: DD=$(DESTDIR)/$(docbookdir)/xml-dtd-$*$(GARVERSION)-$(PATCHLEVEL) +inst-%-xml: + @echo Installing $*-xml + @( cd $*-xml; \ + gmkdir -p $(DD); \ + $(INSTALL_DATA) *dtd *mod $(DD)/; \ + [ -n "`ls *dcl 2>/dev/null`" ] && $(INSTALL_DATA) *dcl $(DD); \ + $(INSTALL_DATA) docbook.cat $(DD)/; \ + if [ -d ent ]; then \ + $(INSTALL_DIR) $(DD)/ent; \ + $(INSTALL_DATA) ent/* $(DD)/ent/; \ + fi ) + +build: + @echo Nothing to build...dummy statement in action. + +showtarg: + @echo $(SGMLTARG) $(XMLTARG) 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 Dec 2 17:30:51 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Dec 2008 16:30:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[2434] csw/mgar/pkg/setoolkit/trunk/Makefile Message-ID: Revision: 2434 http://gar.svn.sourceforge.net/gar/?rev=2434&view=rev Author: dmichelsen Date: 2008-12-02 16:30:51 +0000 (Tue, 02 Dec 2008) Log Message: ----------- setoolkit: Move to mGAR v2, reapply [2426] Modified Paths: -------------- csw/mgar/pkg/setoolkit/trunk/Makefile Modified: csw/mgar/pkg/setoolkit/trunk/Makefile =================================================================== --- csw/mgar/pkg/setoolkit/trunk/Makefile 2008-12-02 16:28:21 UTC (rev 2433) +++ csw/mgar/pkg/setoolkit/trunk/Makefile 2008-12-02 16:30:51 UTC (rev 2434) @@ -18,6 +18,9 @@ DISTFILES = $(DISTNAME).tar.gz DISTFILES += $(call admfiles,CSWsetoolkit,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) BUILD64 = 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 Dec 2 18:05:31 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Dec 2008 17:05:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[2435] csw/mgar/pkg/libtool/trunk/ Message-ID: Revision: 2435 http://gar.svn.sourceforge.net/gar/?rev=2435&view=rev Author: dmichelsen Date: 2008-12-02 17:05:31 +0000 (Tue, 02 Dec 2008) Log Message: ----------- libtool: Move to mGAR v2, remove old trunk/ Removed Paths: ------------- csw/mgar/pkg/libtool/trunk/ 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 Dec 2 18:07:07 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Dec 2008 17:07:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[2436] csw/mgar/pkg/setoolkit/trunk/Makefile Message-ID: Revision: 2436 http://gar.svn.sourceforge.net/gar/?rev=2436&view=rev Author: dmichelsen Date: 2008-12-02 17:07:07 +0000 (Tue, 02 Dec 2008) Log Message: ----------- setoolkit: Fix GAR include Modified Paths: -------------- csw/mgar/pkg/setoolkit/trunk/Makefile Modified: csw/mgar/pkg/setoolkit/trunk/Makefile =================================================================== --- csw/mgar/pkg/setoolkit/trunk/Makefile 2008-12-02 17:05:31 UTC (rev 2435) +++ csw/mgar/pkg/setoolkit/trunk/Makefile 2008-12-02 17:07:07 UTC (rev 2436) @@ -36,4 +36,4 @@ SKIPTEST = 1 -include ../category.mk +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 Tue Dec 2 18:10:13 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Dec 2008 17:10:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[2437] csw/mgar/pkg/libtool Message-ID: Revision: 2437 http://gar.svn.sourceforge.net/gar/?rev=2437&view=rev Author: dmichelsen Date: 2008-12-02 17:10:12 +0000 (Tue, 02 Dec 2008) Log Message: ----------- libtool: Move to mGAR v2, pull in from private branch Modified Paths: -------------- csw/mgar/pkg/libtool/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/libtool/trunk/ Property changes on: csw/mgar/pkg/libtool/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/libtool/trunk/Makefile =================================================================== --- csw/branches/dam/automatic-multiarch-compile/devel/libtool/Makefile 2008-10-28 16:25:47 UTC (rev 2195) +++ csw/mgar/pkg/libtool/trunk/Makefile 2008-12-02 17:10:12 UTC (rev 2437) @@ -19,6 +19,9 @@ DISTFILES += $(call admfiles,CSWlibtoolrt) #NOEXTRACT = $(filter-out $(GARNAME)-$(GARVERSION).tar.gz, $(SOURCEFILES)) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) BUILD64 = 1 @@ -47,7 +50,7 @@ # Move runtime stuff to CSWlibtoolrt and put the rest in CSWlibtool PKGFILES_CSWlibtoolrt_EXCLUSIVE = $(PKGFILES_RT) -include ../category.mk +include gar/category.mk #pre-package: # @(for VERSION in $(OLD_VERSIONS); do gmake GARVERSION=$$VERSION install; done) 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 Dec 2 18:19:14 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Dec 2008 17:19:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[2438] csw/trunk/ Message-ID: Revision: 2438 http://gar.svn.sourceforge.net/gar/?rev=2438&view=rev Author: dmichelsen Date: 2008-12-02 17:19:13 +0000 (Tue, 02 Dec 2008) Log Message: ----------- Legacy GAR: Remove trunk/, use 'svn cp -r ' to get back old versions Removed Paths: ------------- csw/trunk/ 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 Dec 2 18:19:48 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Dec 2008 17:19:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[2439] csw/tags/ Message-ID: Revision: 2439 http://gar.svn.sourceforge.net/gar/?rev=2439&view=rev Author: dmichelsen Date: 2008-12-02 17:19:41 +0000 (Tue, 02 Dec 2008) Log Message: ----------- Legacy GAR: Remove tags/ as it is empty Removed Paths: ------------- csw/tags/ 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 Dec 2 18:20:43 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Dec 2008 17:20:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[2440] csw/branches/joyent/ Message-ID: Revision: 2440 http://gar.svn.sourceforge.net/gar/?rev=2440&view=rev Author: dmichelsen Date: 2008-12-02 17:20:43 +0000 (Tue, 02 Dec 2008) Log Message: ----------- Legacy GAR: Remove branches/joyent/ as it never had any changes Removed Paths: ------------- csw/branches/joyent/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Tue Dec 2 18:24:48 2008 From: dam at opencsw.org (Dagobert Michelsen) Date: Tue, 2 Dec 2008 18:24:48 +0100 Subject: [csw-devel] Legacy GAR is now gone Message-ID: Hi, I just deleted the old trunk/, tags/ and branches/joyent/. If you still need anything please either use the web repository browser with or pull in old versions of your files with svn cp -r 2437 https://gar.svn.sf.net/svnroot/gar/csw/trunk/... (Revision 2437 was the last before the first deletion) Best regards and have fun with mGAR -- Dago From dmichelsen at users.sourceforge.net Tue Dec 2 18:26:04 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Dec 2008 17:26:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[2441] csw/branches/modularpkg/ Message-ID: Revision: 2441 http://gar.svn.sourceforge.net/gar/?rev=2441&view=rev Author: dmichelsen Date: 2008-12-02 17:26:04 +0000 (Tue, 02 Dec 2008) Log Message: ----------- Legacy GAR: Remove branches/modularpkg as this was only a study for mGAR which is now live Removed Paths: ------------- csw/branches/modularpkg/ 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 Dec 2 18:27:04 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 02 Dec 2008 17:27:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[2442] csw/mgar/pkg Message-ID: Revision: 2442 http://gar.svn.sourceforge.net/gar/?rev=2442&view=rev Author: bdwalton Date: 2008-12-02 17:27:03 +0000 (Tue, 02 Dec 2008) Log Message: ----------- Initial stub package for openjade. Added Paths: ----------- csw/mgar/pkg/openjade/ csw/mgar/pkg/openjade/branches/ csw/mgar/pkg/openjade/tags/ csw/mgar/pkg/openjade/trunk/ csw/mgar/pkg/openjade/trunk/Makefile csw/mgar/pkg/openjade/trunk/files/ csw/mgar/pkg/openjade/trunk/files/CSWopenjade.gspec Property changes on: csw/mgar/pkg/openjade/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 Added: csw/mgar/pkg/openjade/trunk/Makefile =================================================================== --- csw/mgar/pkg/openjade/trunk/Makefile (rev 0) +++ csw/mgar/pkg/openjade/trunk/Makefile 2008-12-02 17:27:03 UTC (rev 2442) @@ -0,0 +1,16 @@ +GARNAME = package +GARVERSION = 1.0 +CATEGORIES = category + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWpackage,) + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/openjade/trunk/files/CSWopenjade.gspec =================================================================== --- csw/mgar/pkg/openjade/trunk/files/CSWopenjade.gspec (rev 0) +++ csw/mgar/pkg/openjade/trunk/files/CSWopenjade.gspec 2008-12-02 17:27:03 UTC (rev 2442) @@ -0,0 +1,4 @@ +%var bitname package +%var pkgname CSWpackage +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKSRC}/LICENSE 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 Dec 2 18:33:10 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Dec 2008 17:33:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[2443] csw/mgar/pkg Message-ID: Revision: 2443 http://gar.svn.sourceforge.net/gar/?rev=2443&view=rev Author: dmichelsen Date: 2008-12-02 17:33:10 +0000 (Tue, 02 Dec 2008) Log Message: ----------- libxml2: Pull in mGAR v2 from private branch Modified Paths: -------------- csw/mgar/pkg/libxml2/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/libxml2/ csw/mgar/pkg/libxml2/branches/ csw/mgar/pkg/libxml2/tags/ csw/mgar/pkg/libxml2/trunk/ Property changes on: csw/mgar/pkg/libxml2/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 Modified: csw/mgar/pkg/libxml2/trunk/Makefile =================================================================== --- csw/branches/dam/automatic-multiarch-compile/lib/libxml2/Makefile 2008-11-21 14:49:42 UTC (rev 2336) +++ csw/mgar/pkg/libxml2/trunk/Makefile 2008-12-02 17:33:10 UTC (rev 2443) @@ -13,6 +13,9 @@ DISTFILES += $(call admfiles,CSWlibxml2,depend) DISTFILES += $(call admfiles,CSWlibxml2devel,depend) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # We don't have 64 bit Python yet CONFIGURE_ARGS_32 = --with-python=$(prefix) CONFIGURE_ARGS_64 = --without-python @@ -33,5 +36,5 @@ PKGFILES_CSWpylibxml2_EXCLUSIVE = $(libdir)/python/.* PKGFILES_CSWpylibxml2_EXCLUSIVE += $(docdir)/libxml2-python-$(GARVERSION)/.* -include ../category.mk +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 Tue Dec 2 18:34:22 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Dec 2008 17:34:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[2444] csw/mgar/pkg/libxml2/trunk/ Message-ID: Revision: 2444 http://gar.svn.sourceforge.net/gar/?rev=2444&view=rev Author: dmichelsen Date: 2008-12-02 17:34:22 +0000 (Tue, 02 Dec 2008) Log Message: ----------- libxml2: Fix external to use v2 Property Changed: ---------------- csw/mgar/pkg/libxml2/trunk/ Property changes on: csw/mgar/pkg/libxml2/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 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 Dec 2 18:40:48 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 02 Dec 2008 17:40:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[2445] csw/mgar/pkg Message-ID: Revision: 2445 http://gar.svn.sourceforge.net/gar/?rev=2445&view=rev Author: bdwalton Date: 2008-12-02 17:40:48 +0000 (Tue, 02 Dec 2008) Log Message: ----------- Stub package for opensp. [Yet another git-doc dependency...sheesh!] Added Paths: ----------- csw/mgar/pkg/opensp/ csw/mgar/pkg/opensp/branches/ csw/mgar/pkg/opensp/tags/ csw/mgar/pkg/opensp/trunk/ csw/mgar/pkg/opensp/trunk/Makefile csw/mgar/pkg/opensp/trunk/files/ csw/mgar/pkg/opensp/trunk/files/CSWopensp.gspec Property changes on: csw/mgar/pkg/opensp/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 Added: csw/mgar/pkg/opensp/trunk/Makefile =================================================================== --- csw/mgar/pkg/opensp/trunk/Makefile (rev 0) +++ csw/mgar/pkg/opensp/trunk/Makefile 2008-12-02 17:40:48 UTC (rev 2445) @@ -0,0 +1,16 @@ +GARNAME = package +GARVERSION = 1.0 +CATEGORIES = category + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWpackage,) + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/opensp/trunk/files/CSWopensp.gspec =================================================================== --- csw/mgar/pkg/opensp/trunk/files/CSWopensp.gspec (rev 0) +++ csw/mgar/pkg/opensp/trunk/files/CSWopensp.gspec 2008-12-02 17:40:48 UTC (rev 2445) @@ -0,0 +1,4 @@ +%var bitname package +%var pkgname CSWpackage +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKSRC}/LICENSE 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 Dec 2 19:04:36 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Dec 2008 18:04:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[2446] csw/mgar/pkg/mktemp/trunk Message-ID: Revision: 2446 http://gar.svn.sourceforge.net/gar/?rev=2446&view=rev Author: dmichelsen Date: 2008-12-02 18:04:36 +0000 (Tue, 02 Dec 2008) Log Message: ----------- mktemp: Update to 1.6 Modified Paths: -------------- csw/mgar/pkg/mktemp/trunk/Makefile csw/mgar/pkg/mktemp/trunk/checksums csw/mgar/pkg/mktemp/trunk/files/makefile-destdir.patch Modified: csw/mgar/pkg/mktemp/trunk/Makefile =================================================================== --- csw/mgar/pkg/mktemp/trunk/Makefile 2008-12-02 17:40:48 UTC (rev 2445) +++ csw/mgar/pkg/mktemp/trunk/Makefile 2008-12-02 18:04:36 UTC (rev 2446) @@ -1,8 +1,8 @@ GARNAME = mktemp -GARVERSION = 1.5 +GARVERSION = 1.6 CATEGORIES = utils -DESCRIPTION = A small program to allow safe temporary file creation from shell scripts. +DESCRIPTION = A small program to allow safe temporary file creation from shell scripts define BLURB The mktemp utility takes the given filename template and overwrites a portion of it to create a unique filename. The template may be any file- Modified: csw/mgar/pkg/mktemp/trunk/checksums =================================================================== --- csw/mgar/pkg/mktemp/trunk/checksums 2008-12-02 17:40:48 UTC (rev 2445) +++ csw/mgar/pkg/mktemp/trunk/checksums 2008-12-02 18:04:36 UTC (rev 2446) @@ -1,3 +1,3 @@ -9a35c59502a228c6ce2be025fc6e3ff2 download/mktemp-1.5.tar.gz +3e66f91f8a39c7dc0a67b158aeb9c2ac download/mktemp-1.6.tar.gz 2ec4d62640c1aec1a2fd0faead07de1f download/CSWmktemp.gspec -c7c80a55d51073e9a45cbac799e7968f download/makefile-destdir.patch +9e53911c3dce0236badb46a801a834f6 download/makefile-destdir.patch Modified: csw/mgar/pkg/mktemp/trunk/files/makefile-destdir.patch =================================================================== --- csw/mgar/pkg/mktemp/trunk/files/makefile-destdir.patch 2008-12-02 17:40:48 UTC (rev 2445) +++ csw/mgar/pkg/mktemp/trunk/files/makefile-destdir.patch 2008-12-02 18:04:36 UTC (rev 2446) @@ -1,7 +1,7 @@ -diff --speed-large-files --minimal -Nru mktemp-1.5.orig/Makefile.in mktemp-1.5/Makefile.in ---- mktemp-1.5.orig/Makefile.in 2003-03-24 02:09:56.000000000 +0100 -+++ mktemp-1.5/Makefile.in 2008-02-18 20:30:33.583292000 +0100 -@@ -65,12 +65,12 @@ +diff --speed-large-files --minimal -Nru mktemp-1.6.orig/Makefile.in mktemp-1.6/Makefile.in +--- mktemp-1.6.orig/Makefile.in 2008-08-17 17:38:34.000000000 +0200 ++++ mktemp-1.6/Makefile.in 2008-12-02 18:53:03.208788742 +0100 +@@ -65,13 +65,14 @@ mantype = @MANTYPE@ # Where to install things... @@ -11,21 +11,15 @@ -sbindir = @sbindir@ -sysconfdir = @sysconfdir@ -mandir = @mandir@ +-datarootdir = @datarootdir@ +prefix = $(DESTDIR)@prefix@ +exec_prefix = $(DESTDIR)@exec_prefix@ +bindir = $(DESTDIR)@bindir@ +sbindir = $(DESTDIR)@sbindir@ +sysconfdir = $(DESTDIR)@sysconfdir@ +mandir = $(DESTDIR)@mandir@ ++datarootdir = $(DESTDIR)@datarootdir@ ++ #### End of system configuration section. #### -@@ -98,7 +98,7 @@ - $(CC) -c $(CPPFLAGS) $(CFLAGS) $< - - $(PROG): $(OBJS) -- $(CC) -o $@ $(OBJS) $(LIBS) -+ $(CC) -o $@ $(OBJS) $(LDFLAGS) $(LIBS) - - $(OBJS): config.h - 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 Dec 2 22:31:25 2008 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 02 Dec 2008 21:31:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[2447] csw/mgar/pkg/synergy/trunk/Makefile Message-ID: Revision: 2447 http://gar.svn.sourceforge.net/gar/?rev=2447&view=rev Author: skayser Date: 2008-12-02 21:31:25 +0000 (Tue, 02 Dec 2008) Log Message: ----------- synergy: Fixed documentation folder path Modified Paths: -------------- csw/mgar/pkg/synergy/trunk/Makefile Modified: csw/mgar/pkg/synergy/trunk/Makefile =================================================================== --- csw/mgar/pkg/synergy/trunk/Makefile 2008-12-02 18:04:36 UTC (rev 2446) +++ csw/mgar/pkg/synergy/trunk/Makefile 2008-12-02 21:31:25 UTC (rev 2447) @@ -43,14 +43,19 @@ post-install: @ginstall -d $(DESTDIR)$(sysconfdir) - @ginstall -m 644 $(WORKSRC)/examples/synergy.conf \ + @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME)/images + @ginstall -m 644 \ + $(WORKSRC)/examples/synergy.conf \ $(DESTDIR)$(sysconfdir)/synergy.conf.example - @ginstall -d $(DESTDIR)$(docdir)/images - @ginstall -m 644 $(WORKSRC)/README $(DESTDIR)$(docdir) - @ginstall -m 644 $(WORKSRC)/AUTHORS $(DESTDIR)$(docdir) - @ginstall -m 644 $(WORKSRC)/NEWS $(DESTDIR)$(docdir) - @ginstall -m 644 $(WORKSRC)/doc/*.html $(DESTDIR)$(docdir) - @ginstall -m 644 $(WORKSRC)/doc/images/* $(DESTDIR)$(docdir)/images + @ginstall -m 644 \ + $(WORKSRC)/README \ + $(WORKSRC)/AUTHORS \ + $(WORKSRC)/NEWS \ + $(WORKSRC)/doc/*.html \ + $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 644 \ + $(WORKSRC)/doc/images/* \ + $(DESTDIR)$(docdir)/$(GARNAME)/images @$(MAKECOOKIE) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Dec 2 23:17:29 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 02 Dec 2008 22:17:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[2448] csw/mgar/gar/v1/gar.lib.mk Message-ID: Revision: 2448 http://gar.svn.sourceforge.net/gar/?rev=2448&view=rev Author: wbonnet Date: 2008-12-02 22:17:29 +0000 (Tue, 02 Dec 2008) Log Message: ----------- Add more verbose output Modified Paths: -------------- csw/mgar/gar/v1/gar.lib.mk Modified: csw/mgar/gar/v1/gar.lib.mk =================================================================== --- csw/mgar/gar/v1/gar.lib.mk 2008-12-02 21:31:25 UTC (rev 2447) +++ csw/mgar/gar/v1/gar.lib.mk 2008-12-02 22:17:29 UTC (rev 2448) @@ -142,17 +142,17 @@ echo "---"; \ echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ else \ - if [ ! -n '$(UFILES_REGEX)' ]; then \ - { echo ""; \ - echo "Hello dear $(GARNAME) maintainer,"; \ - echo ""; \ - echo "The upstream notification job has detected that $(GARNAME) is not configured for automatic upstream file update detection."; \ - echo ""; \ - echo "Please consider updating your package. Documentation is available from this link : http://www.opencsw.org" ; \ - echo ""; \ - echo "---"; \ - echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ - fi; \ +# if [ ! -n '$(UFILES_REGEX)' ]; then \ +# { echo ""; \ +# echo "Hello dear $(GARNAME) maintainer,"; \ +# echo ""; \ +# echo "The upstream notification job has detected that $(GARNAME) is not configured for automatic upstream file update detection."; \ +# echo ""; \ +# echo "Please consider updating your package. Documentation is available from this link : http://www.opencsw.org" ; \ +# echo ""; \ +# echo "---"; \ +# echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ +# fi; \ fi; \ fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Dec 2 23:25:06 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 02 Dec 2008 22:25:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[2449] csw/mgar/gar Message-ID: Revision: 2449 http://gar.svn.sourceforge.net/gar/?rev=2449&view=rev Author: wbonnet Date: 2008-12-02 22:25:06 +0000 (Tue, 02 Dec 2008) Log Message: ----------- Add bcc to uwatch at opencsw.org to keep a track of notification sent Port modification to gar V2 Modified Paths: -------------- csw/mgar/gar/v1/gar.lib.mk csw/mgar/gar/v2/bin/mail2maintainer csw/mgar/gar/v2/bin/upstream_watch csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v1/gar.lib.mk =================================================================== --- csw/mgar/gar/v1/gar.lib.mk 2008-12-02 22:17:29 UTC (rev 2448) +++ csw/mgar/gar/v1/gar.lib.mk 2008-12-02 22:25:06 UTC (rev 2449) @@ -140,7 +140,7 @@ echo "Please consider updating your package." ; \ echo ""; \ echo "---"; \ - echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ + echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -b uwatch at opencsw.org -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ else \ # if [ ! -n '$(UFILES_REGEX)' ]; then \ # { echo ""; \ @@ -151,7 +151,7 @@ # echo "Please consider updating your package. Documentation is available from this link : http://www.opencsw.org" ; \ # echo ""; \ # echo "---"; \ -# echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ +# echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -b uwatch at opencsw.org -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ # fi; \ fi; \ fi Modified: csw/mgar/gar/v2/bin/mail2maintainer =================================================================== --- csw/mgar/gar/v2/bin/mail2maintainer 2008-12-02 22:17:29 UTC (rev 2448) +++ csw/mgar/gar/v2/bin/mail2maintainer 2008-12-02 22:25:06 UTC (rev 2449) @@ -23,7 +23,7 @@ function get_package_maintainer { _PACKAGE="$1" - _MAINTAINER="`wget -q http://securebar.secure-tunnel.com/cgi-bin/nph-freebar.cgi/110110/http/www.blastwave.org/packages.php/$_PACKAGE -O- | grep Maintainer | sed -e "s,.*/maintainers/\([^\'\\\"]*\).*,\1,g"`" + _MAINTAINER="`wget -q http://www.opencsw.org/packages.php/$_PACKAGE -O- | grep Maintainer | sed -e "s,.*/maintainers/\([^\'\\\"]*\).*,\1,g"`" echo "$_MAINTAINER" } @@ -38,7 +38,7 @@ function maintainer2mail { _MAINTAINER="$1" - echo "$_MAINTAINER at blastwave.org" + echo "$_MAINTAINER at opencsw.org" } PATH=$PATH:/opt/csw/bin:/usr/sfw/bin @@ -46,7 +46,7 @@ if [[ -z "$1" ]]; then cat </dev/null |"); + open (FH, "lftp -q -c \"set net:timeout 10; set net:max-retries 16; $ftp_proxy_cmd $http_proxy_cmd open $url/ && ls\" 2>/dev/null |"); while (my $line = ) { my @cols = split (/\s+/, $line); Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2008-12-02 22:17:29 UTC (rev 2448) +++ csw/mgar/gar/v2/gar.lib.mk 2008-12-02 22:25:06 UTC (rev 2449) @@ -103,11 +103,10 @@ #################### CHECKNEW RULES #################### -# check a new upstream files are available - -UW_ARGS = $(addprefix -u ,$(MASTER_SITES)) -ifneq ($(UFILES_REGEX),) - FILES2CHECK = $(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/upstream_watch $(UW_ARGS) $(addsuffix ',$(addprefix ',$(UFILES_REGEX)))) +UPSTREAM_MASTER_SITES ?= $(MASTER_SITES) +UW_ARGS = $(addprefix -u ,$(UPSTREAM_MASTER_SITES)) +ifneq ($(UFILES_REGEX), "") + FILES2CHECK = $(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/upstream_watch $(UW_ARGS) $(addsuffix ',$(addprefix ',$(UFILES_REGEX)))) else FILES2CHECK = "" endif @@ -124,7 +123,7 @@ fi; \ $(MAKE) checknew-$$FILE >/dev/null; \ done; \ - if [ -n "$$NEW_FILES" ]; then \ + if test -z "$$NEW_FILES" ; then \ { echo ""; \ echo "Hello dear $(GARNAME) maintainer,"; \ echo ""; \ @@ -134,31 +133,60 @@ echo " $$NEW_FILES"; \ echo ""; \ echo "is/are available at the following url(s):"; \ - echo " $(MASTER_SITES)"; \ + echo " $(UPSTREAM_MASTER_SITES)"; \ echo ""; \ echo "Please consider updating your package." ; \ echo ""; \ echo "---"; \ - echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '$(GARNAME) upstream update notification' $(GARNAME); \ - fi; \ + echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -b uwatch at opencsw.org -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ + else \ +# if [ ! -n '$(UFILES_REGEX)' ]; then \ +# { echo ""; \ +# echo "Hello dear $(GARNAME) maintainer,"; \ +# echo ""; \ +# echo "The upstream notification job has detected that $(GARNAME) is not configured for automatic upstream file update detection."; \ +# echo ""; \ +# echo "Please consider updating your package. Documentation is available from this link : http://www.opencsw.org" ; \ +# echo ""; \ +# echo "---"; \ +# echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -b uwatch at opencsw.org -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ +# fi; \ + fi; \ fi - check-upstream: @if [ -n '$(FILES2CHECK)' ]; then \ NEW_FILES=""; \ + PACKAGE_UP_TO_DATE=0; \ for FILE in $(FILES2CHECK) ""; do \ [ -n "$$FILE" ] || continue; \ - if test -f $(COOKIEDIR)/checknew-$$FILE || echo $(DISTFILES) | grep -w $$FILE >/dev/null; then \ - : ; \ + if test -f $(COOKIEDIR)/checknew-$$FILE ; then \ + PACKAGE_UP_TO_DATE=1; \ else \ - NEW_FILES="$$FILE $$NEW_FILES"; \ + if echo $(DISTFILES) | grep -w $$FILE >/dev/null; then \ + PACKAGE_UP_TO_DATE=1; \ + echo "$(GARNAME) : Package is up-to-date. Current version is $$FILE" ; \ + else \ + NEW_FILES="$$FILE $$NEW_FILES"; \ + fi; \ fi; \ $(MAKE) checknew-$$FILE >/dev/null; \ done; \ - if [ -n "$$NEW_FILES" ]; then \ - echo "$(GARNAME): new upstream files available: $$NEW_FILES"; \ - fi; \ + if test -z "$$NEW_FILES" ; then \ + if [ ! -n '$(UFILES_REGEX)' ]; then \ + echo "$(GARNAME) : Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \ + else \ + if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ + echo "$(GARNAME) : Warning no files to check ! $(FILES2CHECK)" ; \ + echo "$(GARNAME) : UPSTREAM_MASTER_SITES is $(UPSTREAM_MASTER_SITES)" ; \ + echo "$(GARNAME) : DISTNAME is $(DISTNAME)" ; \ + echo "$(GARNAME) : UFILES_REGEX is : $(UFILES_REGEX)" ; \ + echo "$(GARNAME) : Please check configuration" ; \ + fi; \ + fi; \ + else \ + echo "$(GARNAME) : new upstream files available: $$NEW_FILES"; \ + fi; \ fi checknew-%: 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 Dec 2 23:37:48 2008 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 02 Dec 2008 22:37:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[2450] csw/mgar/pkg/pv/trunk Message-ID: Revision: 2450 http://gar.svn.sourceforge.net/gar/?rev=2450&view=rev Author: skayser Date: 2008-12-02 22:37:48 +0000 (Tue, 02 Dec 2008) Log Message: ----------- pv: Updated to 1.1.4 Modified Paths: -------------- csw/mgar/pkg/pv/trunk/Makefile csw/mgar/pkg/pv/trunk/checksums csw/mgar/pkg/pv/trunk/files/CSWpv.gspec Added Paths: ----------- csw/mgar/pkg/pv/trunk/files/fix-test-010.diff Removed Paths: ------------- csw/mgar/pkg/pv/trunk/files/CSWpv.depend csw/mgar/pkg/pv/trunk/files/CSWpv.prototype Modified: csw/mgar/pkg/pv/trunk/Makefile =================================================================== --- csw/mgar/pkg/pv/trunk/Makefile 2008-12-02 22:25:06 UTC (rev 2449) +++ csw/mgar/pkg/pv/trunk/Makefile 2008-12-02 22:37:48 UTC (rev 2450) @@ -1,8 +1,8 @@ GARNAME = pv -GARVERSION = 0.9.2 +GARVERSION = 1.1.4 CATEGORIES = utils -DESCRIPTION = pipeviewer, like cat with progress indications +DESCRIPTION = Monitor the progress of data through a pipe define BLURB Pipe Viewer is a terminal-based tool for monitoring the progress of data through a pipeline. It can be inserted into any normal @@ -16,17 +16,23 @@ SPKG_SOURCEURL = http://www.ivarch.com/programs/pv.shtml # Source files -MASTER_SITES = http://unc.dl.sourceforge.net/sourceforge/pipeviewer/ +MASTER_SITES = http://pipeviewer.googlecode.com/files/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += CSWpv.gspec CSWpv.depend CSWpv.prototype +DISTFILES += $(call admfiles,CSWpv) # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +# Trim extra whitespaces from Solaris wc +PATCHFILES = fix-test-010.diff + CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk post-install: - @gunzip $(DESTDIR)$(infodir)/pv.info.gz $(DESTDIR)$(mandir)/man1/pv.1.gz - + @gunzip $(DESTDIR)$(mandir)/man1/pv.1.gz + @ginstall -d -m 755 $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 644 \ + $(WORKSRC)/doc/NEWS \ + $(DESTDIR)$(docdir)/$(GARNAME) Modified: csw/mgar/pkg/pv/trunk/checksums =================================================================== --- csw/mgar/pkg/pv/trunk/checksums 2008-12-02 22:25:06 UTC (rev 2449) +++ csw/mgar/pkg/pv/trunk/checksums 2008-12-02 22:37:48 UTC (rev 2450) @@ -1,4 +1,3 @@ -a8e31f4e38088b905f5d4f13c670315c download/pv-0.9.2.tar.gz -21a2120662bb32256fe233ba6a982168 download/CSWpv.gspec -573b8784f4f5f70bb86196a72b0979b6 download/CSWpv.depend -c4ee27ed85a7e450a84757e5cf6fd617 download/CSWpv.prototype +8d0eda2182640919daaf6186cd816a13 download/pv-1.1.4.tar.gz +6e307b98bc517acb6353981bee5e686c download/CSWpv.gspec +0ea366b818f877857288b2a9a732a6d4 download/fix-test-010.diff Deleted: csw/mgar/pkg/pv/trunk/files/CSWpv.depend =================================================================== --- csw/mgar/pkg/pv/trunk/files/CSWpv.depend 2008-12-02 22:25:06 UTC (rev 2449) +++ csw/mgar/pkg/pv/trunk/files/CSWpv.depend 2008-12-02 22:37:48 UTC (rev 2450) @@ -1,2 +0,0 @@ -P CSWggettext ggettext - GNU gettext -P CSWiconv libiconv - GNU iconv library Modified: csw/mgar/pkg/pv/trunk/files/CSWpv.gspec =================================================================== --- csw/mgar/pkg/pv/trunk/files/CSWpv.gspec 2008-12-02 22:25:06 UTC (rev 2449) +++ csw/mgar/pkg/pv/trunk/files/CSWpv.gspec 2008-12-02 22:37:48 UTC (rev 2450) @@ -1,6 +1,4 @@ %var bitname pv %var pkgname CSWpv %include url file://%{PKGLIB}/csw_dyndepend.gspec -%postinstall url file://%{PKGLIB}/csw/geninfodir -%postremove url file://%{PKGLIB}/csw/geninfodir %copyright url file://%{WORKSRC}/doc/COPYING Deleted: csw/mgar/pkg/pv/trunk/files/CSWpv.prototype =================================================================== --- csw/mgar/pkg/pv/trunk/files/CSWpv.prototype 2008-12-02 22:25:06 UTC (rev 2449) +++ csw/mgar/pkg/pv/trunk/files/CSWpv.prototype 2008-12-02 22:37:48 UTC (rev 2450) @@ -1,21 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/pv 0755 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/info 0755 root bin -f none /opt/csw/share/info/pv.info 0644 root bin -d none /opt/csw/share/locale 0755 root bin -d none /opt/csw/share/locale/de 0755 root bin -d none /opt/csw/share/locale/de/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/de/LC_MESSAGES/pv.mo 0644 root bin -d none /opt/csw/share/locale/fr 0755 root bin -d none /opt/csw/share/locale/fr/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/fr/LC_MESSAGES/pv.mo 0644 root bin -d none /opt/csw/share/locale/pl 0755 root bin -d none /opt/csw/share/locale/pl/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/pl/LC_MESSAGES/pv.mo 0644 root bin -d none /opt/csw/share/locale/pt 0755 root bin -d none /opt/csw/share/locale/pt/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/pt/LC_MESSAGES/pv.mo 0644 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man1 0755 root bin -f none /opt/csw/share/man/man1/pv.1 0644 root bin Added: csw/mgar/pkg/pv/trunk/files/fix-test-010.diff =================================================================== --- csw/mgar/pkg/pv/trunk/files/fix-test-010.diff (rev 0) +++ csw/mgar/pkg/pv/trunk/files/fix-test-010.diff 2008-12-02 22:37:48 UTC (rev 2450) @@ -0,0 +1,12 @@ +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-01 15:02:00.375332231 +0100 +@@ -5,7 +5,7 @@ + #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` ++COUNT2=`$PROG -B 100000 -q /dev/zero | dd bs=100000 count=1000 2>/dev/null | wc -c | tr -d ' '` + + #echo "[$COUNT1] [$COUNT2]" + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Dec 3 00:10:55 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 02 Dec 2008 23:10:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[2451] csw/mgar/gar Message-ID: Revision: 2451 http://gar.svn.sourceforge.net/gar/?rev=2451&view=rev Author: wbonnet Date: 2008-12-02 23:10:55 +0000 (Tue, 02 Dec 2008) Log Message: ----------- Add default upstream master site and regexp for cpan modules Modified Paths: -------------- csw/mgar/gar/v1/categories/cpan/category.mk csw/mgar/gar/v2/categories/cpan/category.mk Modified: csw/mgar/gar/v1/categories/cpan/category.mk =================================================================== --- csw/mgar/gar/v1/categories/cpan/category.mk 2008-12-02 22:37:48 UTC (rev 2450) +++ csw/mgar/gar/v1/categories/cpan/category.mk 2008-12-02 23:10:55 UTC (rev 2451) @@ -26,6 +26,11 @@ TOLOWER = $(shell echo $(1) | tr '[A-Z]' '[a-z]') SPKG_SOURCEURL = http://search.cpan.org SPKG_SOURCEURL := $(SPKG_SOURCEURL)/~$(call TOLOWER,$(AUTHOR)) + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +USTREAM_MASTER_SITE = $(SPKG_SOURCEURL) + SPKG_SOURCEURL := $(SPKG_SOURCEURL)/$(GARNAME) _PREREQUISITE_BASE_PKGS += CSWperl Modified: csw/mgar/gar/v2/categories/cpan/category.mk =================================================================== --- csw/mgar/gar/v2/categories/cpan/category.mk 2008-12-02 22:37:48 UTC (rev 2450) +++ csw/mgar/gar/v2/categories/cpan/category.mk 2008-12-02 23:10:55 UTC (rev 2451) @@ -26,6 +26,11 @@ TOLOWER = $(shell echo $(1) | tr '[A-Z]' '[a-z]') SPKG_SOURCEURL = http://search.cpan.org SPKG_SOURCEURL := $(SPKG_SOURCEURL)/~$(call TOLOWER,$(AUTHOR)) + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +USTREAM_MASTER_SITE = $(SPKG_SOURCEURL) + SPKG_SOURCEURL := $(SPKG_SOURCEURL)/$(GARNAME) include gar/gar.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 Dec 3 12:15:29 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 03 Dec 2008 11:15:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[2452] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 2452 http://gar.svn.sourceforge.net/gar/?rev=2452&view=rev Author: dmichelsen Date: 2008-12-03 11:15:28 +0000 (Wed, 03 Dec 2008) Log Message: ----------- mGAR v2: Remove old -isa comments Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2008-12-02 23:10:55 UTC (rev 2451) +++ csw/mgar/gar/v2/gar.mk 2008-12-03 11:15:28 UTC (rev 2452) @@ -199,13 +199,6 @@ @echo "Modulations: $(MODULATIONS)" @echo "M: $(call expand_modulator_1,ISA)" -#patch-isa-%: -# @echo " ==> Patching for ISA $*" -# @$(MAKE) ISA=$* pre-patch-isa-$* patch-isa post-patch-isa-$* -# @$(DONADA) - - - # ========================= MAIN RULES ========================= # The main rules are the ones that the user can specify as a # target on the "make" command-line. Currently, they are: @@ -230,9 +223,6 @@ announce: @echo "[===== NOW BUILDING: $(DISTNAME) =====]" -#announce-isa: -# @echo "[===== NOW BUILDING: $(DISTNAME) ISA: $(ISA) =====]" - announce-modulation: @echo "[===== NOW BUILDING: $(DISTNAME) MODULATION $(MODULATION): $(foreach M,$(MODULATORS),$M=$($M)) =====]" @@ -309,7 +299,6 @@ # We call an additional extract-modulated without resetting any variables so # a complete unpacked set goes to the global dir for packaging (like gspec) -#extract: checksum $(COOKIEDIR) pre-extract extract-isa $(addprefix extract-isa-,$(BUILD_ISAS)) post-extract extract: checksum $(COOKIEDIR) pre-extract extract-modulated $(addprefix extract-,$(MODULATIONS)) post-extract @$(DONADA) @@ -319,10 +308,6 @@ pre-extract-modulated $(EXTRACT_TARGETS) post-extract-modulated @$(DONADA) -#extract-isa-%: -# @$(MAKE) ISA=$* pre-extract-isa-$* extract-isa post-extract-isa-$* -# @$(MAKECOOKIE) - # returns true if extract has completed successfully, false # otherwise extract-p: @@ -338,18 +323,11 @@ # patch - Apply any provided patches to the source. PATCH_TARGETS = $(addprefix patch-extract-,$(PATCHFILES)) -#patch: pre-patch $(addprefix patch-isa-,$(BUILD_ISAS)) post-patch patch: pre-patch $(addprefix patch-,$(MODULATIONS)) post-patch @$(DONADA) -#patch-isa: extract-isa $(WORKSRC) pre-patch-isa $(PATCH_TARGETS) post-patch-isa patch-modulated: extract-modulated $(WORKSRC) pre-patch-modulated $(PATCH_TARGETS) post-patch-modulated -#patch-isa-%: -# @echo " ==> Patching for ISA $*" -# @$(MAKE) ISA=$* pre-patch-isa-$* patch-isa post-patch-isa-$* -# @$(DONADA) - # returns true if patch has completed successfully, false # otherwise patch-p: @@ -395,36 +373,21 @@ configure: pre-configure $(addprefix configure-,$(MODULATIONS)) post-configure $(DONADA) -#configure-isa: patch-isa $(CONFIGURE_IMGDEPS) $(CONFIGURE_BUILDDEPS) $(CONFIGURE_DEPS) \ -# $(addprefix srcdep-$(GARDIR)/,$(SOURCEDEPS)) \ -# pre-configure-isa $(CONFIGURE_TARGETS) post-configure-isa configure-modulated: verify-isa patch-modulated $(CONFIGURE_IMGDEPS) $(CONFIGURE_BUILDDEPS) $(CONFIGURE_DEPS) \ $(addprefix srcdep-$(GARDIR)/,$(SOURCEDEPS)) \ pre-configure-modulated $(CONFIGURE_TARGETS) post-configure-modulated -#configure-isa-%: -# @echo " ==> Configuring for ISA $*" -# @$(MAKE) ISA=$* pre-configure-isa-$* configure-isa post-configure-isa-$* -# @$(DONADA) - .PHONY: reset-configure reset-configure-modulated reconfigure: reset-configure configure -reset-configure: +reset-configure-isa: -reconfigure-isa-%: - reset-configure: @$(foreach ISA,$(NEEDED_ISAS),$(MAKE) -s ISA=$(ISA) reset-configure-isa;) reconfigure-isa-%: @$(MAKE) -s ISA=$* reset-configure-isa configure-isa -#reset-configure-isa: -# @echo " ==> Reset configure state for ISA $(ISA)" -# @rm -rf xxx -# @$(MAKE) -s ISA=$* reset-configure-isa - # returns true if configure has completed successfully, false # otherwise configure-p: @@ -437,8 +400,6 @@ $(DONADA) # Build for a specific architecture -#build-isa: configure-isa pre-build-isa $(BUILD_TARGETS) post-build-isa -# @$(MAKECOOKIE) build-modulated-check: $(if $(filter ERROR,$(ARCHFLAGS_$(GARCOMPILER)_$*)), \ $(error Code for the architecture $* can not be produced with the compiler $(GARCOMPILER)) \ @@ -447,15 +408,6 @@ build-modulated: verify-isa configure-modulated pre-build-modulated $(BUILD_TARGETS) post-build-modulated @$(MAKECOOKIE) -# Build for a certain architecture -#build-isa-%: -# @echo " ==> Building for ISA $*" -# $(if $(filter ERROR,$(ARCHFLAGS_$(GARCOMPILER)_$*)), \ -# $(error Code for the architecture $* can not be produced with the compiler $(GARCOMPILER)) \ -# ) -# @$(MAKE) ISA=$* pre-build-isa-$* build-isa post-build-isa-$* -# @$(MAKECOOKIE) - # returns true if build has completed successfully, false # otherwise build-p: @@ -469,11 +421,6 @@ test-modulated: build-modulated pre-test $(TEST_TARGETS) post-test $(DONADA) -#test-isa-%: -# @echo " ==> Testing for ISA $*" -# @$(MAKE) ISA=$* test-isa -# @$(MAKECOOKIE) - # strip - Strip executables POST_INSTALL_TARGETS := strip $(POST_INSTALL_TARGETS) strip: 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 Dec 3 13:45:05 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 03 Dec 2008 12:45:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[2453] csw/mgar/gar/v1/gar.pkg.mk Message-ID: Revision: 2453 http://gar.svn.sourceforge.net/gar/?rev=2453&view=rev Author: dmichelsen Date: 2008-12-03 12:45:04 +0000 (Wed, 03 Dec 2008) Log Message: ----------- mGAR v1: Fix revision in PSTAMP regarding external references Modified Paths: -------------- csw/mgar/gar/v1/gar.pkg.mk Modified: csw/mgar/gar/v1/gar.pkg.mk =================================================================== --- csw/mgar/gar/v1/gar.pkg.mk 2008-12-03 11:15:28 UTC (rev 2452) +++ csw/mgar/gar/v1/gar.pkg.mk 2008-12-03 12:45:04 UTC (rev 2453) @@ -17,30 +17,15 @@ GAWK ?= /opt/csw/bin/gawk # We have to deal with four cases here: -# 1. There is no svn binary -# 2. There is a svn binary, but the directory does not belong to a repository -# 3. There is a svn binary, but not everything was committed properly -# 4. There is a svn binary and everything was committed +# 1. There is no svn binary -> NOSVN +# 2. There is a svn binary, but the directory does not belong to a repository -> NOTVERSIONED +# 3. There is a svn binary, but not everything was committed properly -> UNCOMMITTED +# 4. There is a svn binary and everything was committed -> r -_HAS_SVN = $(shell if test -x $(SVN); then echo yes; fi) -ifneq ($(_HAS_SVN),yes) - # Case 1: There is no svn binary - SVN_REV = NOSVN -else - ifneq ($(shell $(SVN) info >/dev/null 2>&1; echo $$?),0) - # Case 2: The directory does not belong to a repository - SVN_REV = NOTVERSIONED - else - # Case 3+4: The directory belongs to a repository - ifneq ($(shell $(SVN) status 2>/dev/null),) - # Case 3: Not everything was committed properly - _SVN_UNCOMMITTED = UNCOMMITTED - endif - SVN_REV = $(shell $(SVN) info --recursive 2>/dev/null | \ - $(GAWK) '$$1 == "Revision:" && MAX < $$2 { MAX = $$2 } \ - END { print "r" MAX }')$(_SVN_UNCOMMITTED) - endif -endif +# Calculating the revision can be time consuming, so we do this on demand +define _REVISION +$(if $(shell if test -x $(SVN); then echo yes; fi),$(if $(shell $(SVN) info >/dev/null 2>&1; if test $$? -eq 0; then echo YES; fi),$(if $(shell $(SVN) status --ignore-externals 2>/dev/null | grep -v '^X'),UNCOMMITTED,$(shell $(SVN) info --recursive 2>/dev/null | $(GAWK) '$$1 == "Revision:" && MAX < $$2 { MAX = $$2 } END {print "r" MAX }')),NOTVERSIONED),NOSVN) +endef SPKG_DESC ?= $(DESCRIPTION) SPKG_VERSION ?= $(GARVERSION) @@ -49,7 +34,7 @@ SPKG_PACKAGER ?= Unknown SPKG_VENDOR ?= $(SPKG_SOURCEURL) packaged for CSW by $(SPKG_PACKAGER) SPKG_EMAIL ?= Unknown -SPKG_PSTAMP ?= $(LOGNAME)@$(shell hostname)-$(SVN_REV)-$(shell date '+%Y%m%d%H%M%S') +SPKG_PSTAMP ?= $(LOGNAME)@$(shell hostname)-$(call _REVISION)-$(shell date '+%Y%m%d%H%M%S') SPKG_BASEDIR ?= $(prefix) SPKG_CLASSES ?= none SPKG_OSNAME ?= $(shell uname -s)$(shell uname -r) 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 Dec 3 19:16:48 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 03 Dec 2008 18:16:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[2454] csw/mgar/pkg/Makefile Message-ID: Revision: 2454 http://gar.svn.sourceforge.net/gar/?rev=2454&view=rev Author: dmichelsen Date: 2008-12-03 18:16:48 +0000 (Wed, 03 Dec 2008) Log Message: ----------- mGAR: Add target 'garlinks' to use symlinks instead of externals Modified Paths: -------------- csw/mgar/pkg/Makefile Modified: csw/mgar/pkg/Makefile =================================================================== --- csw/mgar/pkg/Makefile 2008-12-03 12:45:04 UTC (rev 2453) +++ csw/mgar/pkg/Makefile 2008-12-03 18:16:48 UTC (rev 2454) @@ -2,28 +2,47 @@ # This makefile is to be included from Makefiles in each category # directory. +# This contains all directories containing packages +SUBDIRS = cpan xfce + +FILTER_DIRS = CVS/ + default: @echo "You are in the pkg/ directory." %: - @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + @for i in $(filter-out $(FILTER_DIRS),$(wildcard */)) ; do \ $(MAKE) -C $$i $* ; \ done paranoid-%: - @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + @for i in $(filter-out $(FILTER_DIRS),$(wildcard */)) ; do \ $(MAKE) -C $$i $* || exit 2; \ done export BUILDLOG ?= $(shell pwd)/buildlog.txt report-%: - @for i in $(filter-out CVS/,$(wildcard */)) ; do \ + @for i in $(filter-out $(FILTER_DIRS),$(wildcard */)) ; do \ $(MAKE) -C $$i $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG); \ done +# When the complete package tree is checked out there would be literally hundreds +# of instances of GAR as they are referenced as external references. Alternatively +# you can check out the tree with +# svn co --ignore-externals https://.../pkg +# and then run +# gmake garlinks +# to generate symbolic links instead of externally checked out dirs + +# Lines returned by 'svn propget -R' look like this: +# cpan/Test-Memory-Cycle/trunk - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + +garlinks: + @(svn propget svn:externals -R | perl -ane 'next if( /^$$/ );($$path,$$sep,$$dir,$$link)=@F;($$upsteps=$$path)=~s![^/]+!..!g;(($$linkdest=$$link))=~ s!https://gar.svn.sf.net/svnroot/gar/csw/mgar!$$upsteps!;print "Linking $$path/$$dir to ../$$linkdest", symlink("../$$linkdest","$$path/$$dir") ? "" : " failed", "\n";') + pkglist: - @for i in $(filter-out $(FILTER_DIRS),$(wildcard */)) ; do \ + @for i in $(filter-out $(FILTER_DIRS),$(foreach D,. $(SUBDIRS),$(wildcard $D/*/))) ; do \ $(MAKE) -s -C $$i/trunk pkglist ; \ 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 Wed Dec 3 20:44:49 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 03 Dec 2008 19:44:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[2455] csw/mgar/pkg/openjade/trunk Message-ID: Revision: 2455 http://gar.svn.sourceforge.net/gar/?rev=2455&view=rev Author: bdwalton Date: 2008-12-03 19:44:48 +0000 (Wed, 03 Dec 2008) Log Message: ----------- First working package run for openjade. Still needs the postinstall preuninstall scripts added. Modified Paths: -------------- csw/mgar/pkg/openjade/trunk/Makefile csw/mgar/pkg/openjade/trunk/files/CSWopenjade.gspec Added Paths: ----------- csw/mgar/pkg/openjade/trunk/checksums csw/mgar/pkg/openjade/trunk/files/CSWopenjade.depend csw/mgar/pkg/openjade/trunk/files/openjade-1.3.1-nsl.patch csw/mgar/pkg/openjade/trunk/files/openjade.spec Modified: csw/mgar/pkg/openjade/trunk/Makefile =================================================================== --- csw/mgar/pkg/openjade/trunk/Makefile 2008-12-03 18:16:48 UTC (rev 2454) +++ csw/mgar/pkg/openjade/trunk/Makefile 2008-12-03 19:44:48 UTC (rev 2455) @@ -1,16 +1,68 @@ -GARNAME = package -GARVERSION = 1.0 -CATEGORIES = category +GARNAME = openjade +GARVERSION = 1.3.2 +PATCHLEVEL = 27 +CATEGORIES = apps -DESCRIPTION = Brief description +PREREQUISITES = CSWopensp + +DESCRIPTION = A DSSSL implementation. define BLURB - Long description + OpenJade is an implementation of the ISO/IEC 10179:1996 standard DSSSL + (Document Style Semantics and Specification Language). OpenJade is + based on James Clark's Jade implementation of DSSSL. OpenJade is a + command-line application and a set of components. The DSSSL engine + inputs an SGML or XML document and can output a variety of formats: + XML, RTF, TeX, MIF (FrameMaker), SGML, or XML. endef -MASTER_SITES = +MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWpackage,) +DISTFILES += $(call admfiles,CSWopenjade,depend) -CONFIGURE_ARGS = $(DIRPATHS) +PATCHFILES = openjade-1.3.1-nsl.patch +# use gnu c/c++ for this one...(matches opensp and the c++ doesn't want to +# play with sun_cc...) +GARCOMPILER = GNU +GNU_CC_HOME = /opt/csw/gcc3 + +CONFIGURE_ARGS = $(DIRPATHS) --disable-static +CONFIGURE_ARGS += --datadir=$(datadir)/sgml/$(GARNAME)-$(GARVERSION) +CONFIGURE_ARGS += --enable-splibdir=$(libdir) + +TEST_SCRIPTS = + +INSTALL_ARGS = install install-man + include gar/category.mk + +sgmldir = $(DESTDIR)/$(datadir)/sgml/$(GARNAME)-$(GARVERSION) +sgmldoc = $(DESTDIR)/$(docdir)/$(GARNAME) +INSTALL = /opt/csw/bin/ginstall -c +INSTALL_DATA = $(INSTALL) -m 0644 +INSTALL_DIR = $(INSTALL) -m 0755 -d + +post-install: + @echo Installing catalog files. + @( cd $(WORKSRC); \ + $(INSTALL_DIR) $(sgmldir)/; \ + $(INSTALL_DATA) dsssl/catalog $(sgmldir)/; \ + $(INSTALL_DATA) dsssl/dsssl.dtd $(sgmldir)/; \ + $(INSTALL_DATA) dsssl/fot.dtd $(sgmldir)/; \ + $(INSTALL_DATA) dsssl/style-sheet.dtd $(sgmldir); \ + $(INSTALL_DIR) $(DESTDIR)/$(sysconfdir)/sgml; \ + cd $(DESTDIR)/$(sysconfdir)/sgml; \ + touch $(GARNAME)-$(GARVERSION)-$(PATCHLEVEL).soc; \ + ln -s $(GARNAME)-$(GARVERSION)-$(PATCHLEVEL).soc $(GARNAME).soc; \ + ) + + @echo Installing docs. + @( cd $(WORKSRC); \ + $(INSTALL_DIR) $(sgmldoc); \ + $(INSTALL_DATA) jadedoc/*htm jadedoc/*txt $(sgmldoc)/; \ + $(INSTALL_DIR) $(sgmldoc)/images; \ + $(INSTALL_DATA) jadedoc/images/* $(sgmldoc)/images/; \ + $(INSTALL_DATA) dsssl/README.jadetex $(sgmldoc)/; \ + $(INSTALL_DATA) README COPYING VERSION $(sgmldoc)/; \ + ) + @$(MAKECOOKIE) \ No newline at end of file Added: csw/mgar/pkg/openjade/trunk/checksums =================================================================== --- csw/mgar/pkg/openjade/trunk/checksums (rev 0) +++ csw/mgar/pkg/openjade/trunk/checksums 2008-12-03 19:44:48 UTC (rev 2455) @@ -0,0 +1,4 @@ +7df692e3186109cc00db6825b777201e download/openjade-1.3.2.tar.gz +3bceb78eeb9bdb38e98e75c6fb20714e download/CSWopenjade.gspec +ea3dd2c469bf7e8efd183f82b743c90f download/CSWopenjade.depend +ca3a0ff43d8ed182f432d723927cd2e9 download/openjade-1.3.1-nsl.patch Added: csw/mgar/pkg/openjade/trunk/files/CSWopenjade.depend =================================================================== --- csw/mgar/pkg/openjade/trunk/files/CSWopenjade.depend (rev 0) +++ csw/mgar/pkg/openjade/trunk/files/CSWopenjade.depend 2008-12-03 19:44:48 UTC (rev 2455) @@ -0,0 +1,12 @@ +P CSWcommon common - common files and dirs for CSW packages +P CSWgcc3core gcc3core - GNU C Compiler +P CSWgcc3corert gcc3corert - GNU C Compiler Run Time +P CSWgcc3g++ gcc3g++ - GNU C++ Compiler +P CSWgcc3g++rt gcc3g++rt - GNU C++ Compiler Run Time +P CSWgcc4corert gcc4corert - GNU C Compiler Run Time +P CSWgcc4g++rt gcc4g++rt - GNU C++ Compiler Run Time +P CSWggettext ggettext - GNU gettext +P CSWiconv libiconv - GNU iconv library +P CSWopensp opensp - a SGML parser called OpenSP +P CSWsgmlcommon sgmlcommon - A collection of entities and DTDs +P CSWxmlcommon xmlcommon - A collection of entities and DTDs Modified: csw/mgar/pkg/openjade/trunk/files/CSWopenjade.gspec =================================================================== --- csw/mgar/pkg/openjade/trunk/files/CSWopenjade.gspec 2008-12-03 18:16:48 UTC (rev 2454) +++ csw/mgar/pkg/openjade/trunk/files/CSWopenjade.gspec 2008-12-03 19:44:48 UTC (rev 2455) @@ -1,4 +1,4 @@ -%var bitname package -%var pkgname CSWpackage +%var bitname openjade +%var pkgname CSWopenjade %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/LICENSE +%copyright url file://%{WORKSRC}/COPYING Added: csw/mgar/pkg/openjade/trunk/files/openjade-1.3.1-nsl.patch =================================================================== --- csw/mgar/pkg/openjade/trunk/files/openjade-1.3.1-nsl.patch (rev 0) +++ csw/mgar/pkg/openjade/trunk/files/openjade-1.3.1-nsl.patch 2008-12-03 19:44:48 UTC (rev 2455) @@ -0,0 +1,21 @@ +--- openjade-1.3.1/config/configure.in.lr 2003-09-12 08:03:22.000000000 -0600 ++++ openjade-1.3.1/config/configure.in 2003-09-12 08:03:44.000000000 -0600 +@@ -156,7 +156,6 @@ + then + AC_MSG_RESULT(yes) + AC_DEFINE(SP_HAVE_SOCKET) +- AC_CHECK_LIB(nsl,main,LIBS="$LIBS -lnsl") + AC_CHECK_LIB(socket,main,LIBS="$LIBS -lsocket") + AC_MSG_CHECKING(h_errno in netdb.h) + AC_EGREP_HEADER(h_errno,netdb.h, +--- openjade-1.3.1/configure.lr 2003-09-12 08:35:55.000000000 -0600 ++++ openjade-1.3.1/configure 2003-09-12 08:36:07.000000000 -0600 +@@ -5530,7 +5530,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lnsl $LIBS" ++LIBS="-lXXXnsl $LIBS" + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" + #include "confdefs.h" Added: csw/mgar/pkg/openjade/trunk/files/openjade.spec =================================================================== --- csw/mgar/pkg/openjade/trunk/files/openjade.spec (rev 0) +++ csw/mgar/pkg/openjade/trunk/files/openjade.spec 2008-12-03 19:44:48 UTC (rev 2455) @@ -0,0 +1,348 @@ +Summary: A DSSSL implementation. +Name: openjade +Version: 1.3.2 +Release: 27 +Prereq: sgml-common >= 0.5 +Source: http://download.sourceforge.net/openjade/openjade-%{version}.tar.gz +Patch0: openjade-ppc64.patch +Patch1: openjade-1.3.1-nsl.patch +Patch2: openjade-deplibs.patch +License: Distributable +Group: Applications/Text +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Prefix: /usr +Obsoletes: openjade-devel < 1.3.2-17 +Obsoletes: jade +Provides: jade + +BuildRequires: opensp-devel + +%description +OpenJade is an implementation of the ISO/IEC 10179:1996 standard DSSSL +(Document Style Semantics and Specification Language). OpenJade is +based on James Clark's Jade implementation of DSSSL. OpenJade is a +command-line application and a set of components. The DSSSL engine +inputs an SGML or XML document and can output a variety of formats: +XML, RTF, TeX, MIF (FrameMaker), SGML, or XML. + + +%prep +%setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 -b .deplibs + + +%build +%configure --disable-static --datadir=%{_datadir}/sgml/%{name}-%{version} \ + --enable-splibdir=%{_libdir} +make %{?_smp_mflags} + + +%install +rm -rf $RPM_BUILD_ROOT + +make install install-man DESTDIR=$RPM_BUILD_ROOT + +# Fix up libtool libraries +find $RPM_BUILD_ROOT -name '*.la' | \ + xargs perl -p -i -e "s|-L$RPM_BUILD_DIR[\w/.-]*||g" + +# oMy, othis ois osilly. +ln -s openjade $RPM_BUILD_ROOT/%{prefix}/bin/jade +echo ".so man1/openjade.1" > $RPM_BUILD_ROOT/%{_mandir}/man1/jade.1 + +# install jade/jade $RPM_BUILD_ROOT/%{prefix}/bin/jade +cp dsssl/catalog $RPM_BUILD_ROOT/%{_datadir}/sgml/%{name}-%{version}/ +cp dsssl/{dsssl,style-sheet,fot}.dtd $RPM_BUILD_ROOT/%{_datadir}/sgml/%{name}-%{version}/ + +# add unversioned/versioned catalog and symlink +mkdir -p $RPM_BUILD_ROOT/etc/sgml +cd $RPM_BUILD_ROOT/etc/sgml +touch %{name}-%{version}-%{release}.soc +ln -s %{name}-%{version}-%{release}.soc %{name}.soc +cd - + + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +/sbin/ldconfig +/usr/bin/install-catalog --add /etc/sgml/%{name}-%{version}-%{release}.soc \ + %{_datadir}/sgml/%{name}-%{version}/catalog >/dev/null 2>/dev/null || : + +%preun +/usr/bin/install-catalog --remove /etc/sgml/%{name}-%{version}-%{release}.soc \ + %{_datadir}/sgml/%{name}-%{version}/catalog >/dev/null 2>/dev/null || : + +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root) +%doc jadedoc/* dsssl/README.jadetex +%doc README COPYING VERSION +%ghost /etc/sgml/%{name}-%{version}-%{release}.soc +/etc/sgml/%{name}.soc +%{_bindir}/* +%{_libdir}/*.so +%{_libdir}/*.so.* +%{_mandir}/*/* +%{_datadir}/sgml/%{name}-%{version} +%{_libdir}/*.la + +%changelog +* Mon Jul 17 2006 Tim Waugh 1.3.2-27 +- Rebuilt. + +* Mon Jul 10 2006 Tim Waugh 1.3.2-26 +- Fix dependent libs for libogrove (bug #198232). + +* Mon Jun 26 2006 Florian La Roche 1.3.2-25 +- add redirection to /dev/null for preun + +* Tue Jun 13 2006 Tim Waugh 1.3.2-24 +- Rebuild against opensp. + +* Fri Feb 10 2006 Jesse Keating - 1.3.2-23.2 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 1.3.2-23.1 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Fri Jan 6 2006 Tim Waugh 1.3.2-23 +- Rebuild against new opensp. + +* Mon Dec 19 2005 Tim Waugh 1.3.2-22 +- Fix SOC files. +- Quieten scriptlets. + +* Mon Dec 19 2005 Tim Waugh 1.3.2-21 +- Fix location of catalog. + +* Tue Dec 13 2005 Tim Waugh 1.3.2-20 +- Use --enable-splibdir to prevent ambiguity. +- Move 'install-catalog --remove' to %%preun section (bug #60409). + +* Thu Dec 8 2005 Terje Bless - 1.3.2-19 +- Drop -devel subpackage. + +* Sun Dec 4 2005 Ville Skytt? - 1.3.2-18 +- Really BuildRequire opensp-devel. +- Clean up unneeded build dependencies and configure options. +- Drop dependency on docbook-dtds. +- Fix %%post(un) syntax and catalog installation. + +* Wed Nov 30 2005 Terje Bless 1.3.2-17 +- Split opensp out into its own package. +- BuildRequire OpenSP-devel, Require OpenSP. +- Drop openjade-1.3.1-manpage.patch (it patches opensp, not openjade, and is + obsolete with external opensp). + +* Tue Mar 1 2005 Tim Waugh 1.3.2-16 +- Rebuilt for new GCC. + +* Wed Feb 9 2005 Tim Waugh 1.3.2-15 +- Rebuilt. + +* Tue Oct 5 2004 Tim Waugh 1.3.2-14 +- Build requires gettext-devel (bug #134672). + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Fri Mar 19 2004 Tim Waugh 1.3.2-11.2 +- Rebuilt. + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Sat Jan 31 2004 Tim Waugh 1.3.2-10 +- More C++ fixes (for GCC 3.4). + +* Thu Dec 4 2003 Tim Waugh 1.3.2-9 +- No longer need httphost patch. + +* Mon Oct 20 2003 Tim Waugh 1.3.2-8 +- Rebuilt. + +* Tue Sep 23 2003 Florian La Roche 1.3.2-7 +- do not link against -lnsl + +* Thu Aug 7 2003 Tim Waugh 1.3.2-6 +- Rebootstrap to create a libtool that actually works. + +* Wed Aug 6 2003 Tim Waugh 1.3.2-5 +- Rebuilt. + +* Wed Jun 04 2003 Elliot Lee 1.3.2-4 +- rebuilt + +* Thu May 22 2003 Tim Waugh 1.3.2-3 +- Fixes for GCC 3.3. +- Use --parents for %doc. + +* Tue Mar 18 2003 Tim Waugh 1.3.2-2 +- Provide sgml2xml man page (bug #83759). +- Add devel subpackage. + +* Fri Mar 14 2003 Tim Waugh 1.3.2-1 +- OpenSP 1.5, openjade 1.3.2. +- Renumber patches. + +* Thu Feb 13 2003 Elliot Lee 1.3.1-13 +- Add openjade-ppc64.patch + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Tue Jan 7 2003 Jeff Johnson 1.3.1-11 +- don't include -debuginfo files in package. + +* Thu Dec 12 2002 Tim Waugh +- Fix typo in description (bug #79395). + +* Mon Nov 4 2002 Tim Waugh 1.3.1-10 +- Fix DTD retrieval from virtual hosts (bug #77137). + +* Sat Aug 10 2002 Elliot Lee +- rebuilt with gcc-3.2 (we hope) + +* Mon Jul 22 2002 Tim Powers 1.3.1-8 +- rebuild using gcc-3.2-0.1 + +* Fri Jun 21 2002 Tim Powers 1.3.1-7 +- automated rebuild + +* Thu Jun 13 2002 Tim Waugh 1.3.1-6 +- Fix sgmlnorm(1) man page (bug #64136). +- Fix %%files list (bug #64323). + +* Thu May 23 2002 Tim Powers 1.3.1-5 +- automated rebuild + +* Thu Feb 21 2002 Tim Waugh 1.3.1-4 +- Avoid bad triggers. + +* Thu Feb 21 2002 Tim Waugh 1.3.1-3 +- Rebuild in new environment. + +* Mon Jan 28 2002 Tim Waugh 1.3.1-2 +- Ship man pages. + +* Mon Jan 28 2002 Tim Waugh 1.3.1-1 +- 1.3.1. +- Patches no longer needed: decl, strdup, foo, size_t, 31525, indev, + ligature, twosidestartonright. +- Updated lt patch. + +* Mon Jan 14 2002 Tim Waugh 1.3-22 +- Enable build on GCC 3.0 onwards. +- Run libtoolize. + +* Fri Nov 2 2001 Tim Waugh 1.3-21 +- Enable HTTP support. Now a DocBook XML document can be processed by + either xsltproc or openjade. + +* Tue Oct 30 2001 Tim Waugh 1.3-20 +- Apply twosidestartonright patch from Ian Castle. + +* Thu Oct 11 2001 Tim Waugh 1.3-19 +- s/Copyright:/License:/ +- Use %%{_tmppath}. +- Fix up libtool libraries (bug #46212). + +* Wed Sep 12 2001 Tim Powers 1.3-18 +- rebuild with new gcc and binutils + +* Fri Jun 15 2001 Tim Waugh 1.3-17 +- Apply patch from CVS to break up unintentional ligatures (bugs #11497, + #11779) + +* Mon Jun 4 2001 Tim Waugh 1.3-16 +- Apply the iNdev openjade-1.3.patch patch. + +* Tue May 29 2001 Tim Waugh 1.3-15 +- ldconfig (bug #32824). +- Fix up some libtool problems. + +* Fri Apr 27 2001 Bill Nottingham 1.3-14 +- rebuild for C++ exception handling on ia64 +- build with optimization on ia64 + +* Tue Mar 13 2001 Tim Waugh +- Avoid creating bogus TeX output for section headings containing + special characters (#bug 31525). + +* Mon Jan 22 2001 Florian La Roche +- Apply original autoconf patch to s390 s390x only. This patch can + be deleted once s390* uses a current compiler. + +* Thu Jan 19 2001 Tim Waugh +- Don't conflict with stylesheets; require sgml-common >= 0.5 instead. +- Revert autoconf change, as it's still broken. + +* Wed Jan 17 2001 Florian La Roche +- fix this autoconf macro to work on all archs :-) + +* Wed Jan 17 2001 Florian La Roche +- apply patch from Fritz Elfert + - removed explicit stripping + - Added autoconf macro for correctly recognizing if size_t + is unsigned int + +* Tue Jan 16 2001 Tim Waugh +- Default catalog file is /etc/sgml/catalog. + +* Mon Jan 08 2001 Tim Waugh +- Conflict with stylesheets (new-trials location changes). +- /usr/lib/sgml -> /usr/share/sgml/%%{name}-%%{version}. +- Remove %%post and %%postun. + +* Wed Oct 18 2000 Matt Wilson +- rebuilt against g++-2.96-60, fixes jade on alpha + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Tue Jul 4 2000 Jakub Jelinek +- Rebuild with new C++ + +* Wed May 31 2000 Matt Wilson +- fix several C++ build problems (declarations) +- build against new libstdc++ + +* Wed May 17 2000 Matt Wilson +- build with -O0 on alpha +- fix -j testing + +* Thu May 5 2000 Bill Nottingham +- openjade is maintained, and actually builds. Let's try that. + +* Thu Mar 9 2000 Bill Nottingham +- this package is way too huge. strip *everything* + +* Mon Feb 21 2000 Matt Wilson +- build with CXXFLAGS="-O2 -ggdb" to work around segfault on alpha + +* Thu Feb 3 2000 Bill Nottingham +- strip binaries + +* Wed Jan 5 2000 Bill Nottingham +- sanitize spec file some + +* Tue Aug 17 1999 Tim Powers +- fixed conflict problem with sgml-tools + +* Sat Jul 17 1999 Tim Powers +- changed buildroot path to /var/tmp +- rebuilt for 6.1 + +* Fri Apr 23 1999 Michael K. Johnson +- quiet scripts + +* Thu Apr 23 1999 Owen Taylor +- Made requires for sgml-common into prereq This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From william at wbonnet.net Wed Dec 3 21:32:50 2008 From: william at wbonnet.net (William Bonnet) Date: Wed, 03 Dec 2008 21:32:50 +0100 Subject: [csw-devel] External dependencies Message-ID: <4936ECF2.4080403@wbonnet.net> Hi In the GAR tree, each package has under its trunk an external dependencies linking to gar scripts. On my different boxes svn update process is really slow because of the update of this dependencies. Is there a way to it up ? I guess that each package use the same version of gar since it is link to the same external think. Isn't there a way to have a single external reference for all the package instead of having one per package ? Actually it looks like if it is running on svn update for each package. cheers -- William http://www.wbonnet.net http://www.sunwizard.net Le site fran?ais des amateurs de stations Unix http://www.blastwave.org An OpenSolaris Community Site http://www.opencsw.org Community SoftWare for Solaris http://www.guses.org French speaking Solaris User Group From dam at opencsw.org Wed Dec 3 22:27:45 2008 From: dam at opencsw.org (Dagobert Michelsen) Date: Wed, 3 Dec 2008 22:27:45 +0100 Subject: [csw-devel] External dependencies In-Reply-To: <4936ECF2.4080403@wbonnet.net> References: <4936ECF2.4080403@wbonnet.net> Message-ID: <60E6EB6A-EDA9-46A1-9DAC-0F07E61C65D6@opencsw.org> Hi William, Am 03.12.2008 um 21:32 schrieb William Bonnet: > In the GAR tree, each package has under its trunk an external > dependencies linking to gar scripts. On my different boxes svn update > process is really slow because of the update of this dependencies. Is > there a way to it up ? I guess that each package use the same > version of > gar since it is link to the same external think. No, it is not. Especially my packages use gar/v2 and more will follow when I fixed the open issues. This way the packages can be transitioned one-at-a-time. > Isn't there a way to have a single external reference for all the > package instead of having one per package ? Actually it looks like > if it > is running on svn update for each package. William, my friend, this is exactly what I have implemented today during an otherwise unproductive traintrip: What you do now is ? svn co --ignore-externals https://gar.svn.sf.net/svnroot/gar/csw/mgar ? cd mgar/pkg; gmake garlinks This reads all the external references from GAR and makes symbolic links instead. Best regards -- Dago From william at wbonnet.net Wed Dec 3 22:34:02 2008 From: william at wbonnet.net (William Bonnet) Date: Wed, 03 Dec 2008 22:34:02 +0100 Subject: [csw-devel] External dependencies In-Reply-To: <60E6EB6A-EDA9-46A1-9DAC-0F07E61C65D6@opencsw.org> References: <4936ECF2.4080403@wbonnet.net> <60E6EB6A-EDA9-46A1-9DAC-0F07E61C65D6@opencsw.org> Message-ID: <4936FB4A.7070907@wbonnet.net> Hi > No, it is not. Especially my packages use gar/v2 and more > will follow when I fixed the open issues. This way the > packages can be transitioned one-at-a-time. > humm... ok :) > William, my friend, this is exactly what I have implemented > today during an otherwise unproductive traintrip: > > > > What you do now is > > ? svn co --ignore-externals https://gar.svn.sf.net/svnroot/gar/csw/mgar > ? cd mgar/pkg; gmake garlinks > > This reads all the external references from GAR and makes symbolic > links instead. > Great ! :) Thanks, I am going to test it Cheers -- William http://www.wbonnet.net http://www.sunwizard.net Le site fran?ais des amateurs de stations Unix http://www.blastwave.org An OpenSolaris Community Site http://www.opencsw.org Community SoftWare for Solaris http://www.guses.org French speaking Solaris User Group From william at wbonnet.net Wed Dec 3 22:33:52 2008 From: william at wbonnet.net (William Bonnet) Date: Wed, 03 Dec 2008 22:33:52 +0100 Subject: [csw-devel] External dependencies In-Reply-To: <60E6EB6A-EDA9-46A1-9DAC-0F07E61C65D6@opencsw.org> References: <4936ECF2.4080403@wbonnet.net> <60E6EB6A-EDA9-46A1-9DAC-0F07E61C65D6@opencsw.org> Message-ID: <4936FB40.9020609@wbonnet.net> Hi > No, it is not. Especially my packages use gar/v2 and more > will follow when I fixed the open issues. This way the > packages can be transitioned one-at-a-time. > humm... ok :) > William, my friend, this is exactly what I have implemented > today during an otherwise unproductive traintrip: > > > > What you do now is > > ? svn co --ignore-externals https://gar.svn.sf.net/svnroot/gar/csw/mgar > ? cd mgar/pkg; gmake garlinks > > This reads all the external references from GAR and makes symbolic > links instead. > Great ! :) I am going to test it Cheers -- William http://www.wbonnet.net http://www.sunwizard.net Le site fran?ais des amateurs de stations Unix http://www.blastwave.org An OpenSolaris Community Site http://www.opencsw.org Community SoftWare for Solaris http://www.guses.org French speaking Solaris User Group From william at wbonnet.net Thu Dec 4 00:23:56 2008 From: william at wbonnet.net (William Bonnet) Date: Thu, 04 Dec 2008 00:23:56 +0100 Subject: [csw-devel] Packages age Message-ID: <4937150C.6080907@wbonnet.net> Hi You'll find attached an ordered by date list of package for the three sources, stable, unstable, testing. This list includes only packages with "REV=" in file name. Details are in attached files, number of package per year of genera are Stable source : 1997 1 1998 1 2001 3 2002 3 2003 27 2004 101 2005 179 2006 211 2007 288 2008 177 Unstable source 1997 1 1998 1 2001 3 2002 4 2003 26 2004 107 2005 184 2006 208 2007 207 2008 395 testing source (all from 2008, display months) 09 9 10 4 11 42 12 5 Which is pretty good for testing packages. But it is clear that many stable and unstable package have to be updated Cheers -- William http://www.wbonnet.net http://www.sunwizard.net Le site fran?ais des amateurs de stations Unix http://www.blastwave.org An OpenSolaris Community Site http://www.opencsw.org Community SoftWare for Solaris http://www.guses.org French speaking Solaris User Group -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: stable.package.age URL: -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: testing.package.age URL: -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: unstable.package.age URL: From trygvel at opencsw.org Thu Dec 4 08:23:42 2008 From: trygvel at opencsw.org (=?windows-1252?Q?Trygve_Laugst=F8l?=) Date: Thu, 04 Dec 2008 08:23:42 +0100 Subject: [csw-devel] External dependencies In-Reply-To: <60E6EB6A-EDA9-46A1-9DAC-0F07E61C65D6@opencsw.org> References: <4936ECF2.4080403@wbonnet.net> <60E6EB6A-EDA9-46A1-9DAC-0F07E61C65D6@opencsw.org> Message-ID: <4937857E.1060801@opencsw.org> Dagobert Michelsen wrote: > Hi William, > > Am 03.12.2008 um 21:32 schrieb William Bonnet: >> In the GAR tree, each package has under its trunk an external >> dependencies linking to gar scripts. On my different boxes svn update >> process is really slow because of the update of this dependencies. Is >> there a way to it up ? I guess that each package use the same >> version of >> gar since it is link to the same external think. > > No, it is not. Especially my packages use gar/v2 and more > will follow when I fixed the open issues. This way the > packages can be transitioned one-at-a-time. > >> Isn't there a way to have a single external reference for all the >> package instead of having one per package ? Actually it looks like >> if it >> is running on svn update for each package. > > William, my friend, this is exactly what I have implemented > today during an otherwise unproductive traintrip: > References: <4936ECF2.4080403@wbonnet.net> <60E6EB6A-EDA9-46A1-9DAC-0F07E61C65D6@opencsw.org> <4937857E.1060801@opencsw.org> Message-ID: <625385e30812032359xeb9cc4akd89c6a9c54eca97d@mail.gmail.com> On Thu, Dec 4, 2008 at 8:23 AM, Trygve Laugst?l wrote: >> William, my friend, this is exactly what I have implemented >> today during an otherwise unproductive traintrip: >> > Hm, why is this not at wiki.opencsw.org? Dagobert wanted to keep everything GAR related on SF. Maybe we should set up a GAR page on the wiki linking to SF so people can find the documentation from there too? -- /peter From dam at opencsw.org Thu Dec 4 09:14:01 2008 From: dam at opencsw.org (Dagobert Michelsen) Date: Thu, 4 Dec 2008 09:14:01 +0100 Subject: [csw-devel] External dependencies In-Reply-To: <625385e30812032359xeb9cc4akd89c6a9c54eca97d@mail.gmail.com> References: <4936ECF2.4080403@wbonnet.net> <60E6EB6A-EDA9-46A1-9DAC-0F07E61C65D6@opencsw.org> <4937857E.1060801@opencsw.org> <625385e30812032359xeb9cc4akd89c6a9c54eca97d@mail.gmail.com> Message-ID: Hi, Am 04.12.2008 um 08:59 schrieb Peter Bonivart: > On Thu, Dec 4, 2008 at 8:23 AM, Trygve Laugst?l > wrote: >>> William, my friend, this is exactly what I have implemented >>> today during an otherwise unproductive traintrip: >>> >> #Checking_out_all_packages >> >> Hm, why is this not at wiki.opencsw.org? > > Dagobert wanted to keep everything GAR related on SF. Mainly to have some neutral ground which makes it easy for other packaging projects to join in. > Maybe we should > set up a GAR page on the wiki linking to SF so people can find the > documentation from there too? Yes. Just a stub? Best regards -- Dago From bonivart at opencsw.org Thu Dec 4 09:33:03 2008 From: bonivart at opencsw.org (Peter Bonivart) Date: Thu, 4 Dec 2008 09:33:03 +0100 Subject: [csw-devel] External dependencies In-Reply-To: References: <4936ECF2.4080403@wbonnet.net> <60E6EB6A-EDA9-46A1-9DAC-0F07E61C65D6@opencsw.org> <4937857E.1060801@opencsw.org> <625385e30812032359xeb9cc4akd89c6a9c54eca97d@mail.gmail.com> Message-ID: <625385e30812040033o33538b28g9710be68add2c652@mail.gmail.com> On Thu, Dec 4, 2008 at 9:14 AM, Dagobert Michelsen wrote: >> Maybe we should >> set up a GAR page on the wiki linking to SF so people can find the >> documentation from there too? > > Yes. Just a stub? I have added a Build info-link under the Tech-section. :-) I started with a link to the official OpenCSW standard and one to your GAR documentation. -- /peter From trygvel at opencsw.org Thu Dec 4 09:34:46 2008 From: trygvel at opencsw.org (=?ISO-8859-1?Q?Trygve_Laugst=F8l?=) Date: Thu, 04 Dec 2008 09:34:46 +0100 Subject: [csw-devel] External dependencies In-Reply-To: <625385e30812032359xeb9cc4akd89c6a9c54eca97d@mail.gmail.com> References: <4936ECF2.4080403@wbonnet.net> <60E6EB6A-EDA9-46A1-9DAC-0F07E61C65D6@opencsw.org> <4937857E.1060801@opencsw.org> <625385e30812032359xeb9cc4akd89c6a9c54eca97d@mail.gmail.com> Message-ID: <49379626.4010806@opencsw.org> Peter Bonivart wrote: > On Thu, Dec 4, 2008 at 8:23 AM, Trygve Laugst?l wrote: >>> William, my friend, this is exactly what I have implemented >>> today during an otherwise unproductive traintrip: >>> > Hm, why is this not at wiki.opencsw.org? > > Dagobert wanted to keep everything GAR related on SF. Maybe we should > set up a GAR page on the wiki linking to SF so people can find the > documentation from there too? Yeah, they should certainly be linked together. -- Trygve From dam at opencsw.org Thu Dec 4 12:14:49 2008 From: dam at opencsw.org (Dagobert Michelsen) Date: Thu, 4 Dec 2008 12:14:49 +0100 Subject: [csw-devel] Fwd: CSWrrd References: <4937A430.4090702@opencsw.org> Message-ID: <3E0A424E-2071-4EE4-8EF9-0FB1CDA960B9@opencsw.org> Hi Ihsan, Anfang der weitergeleiteten E-Mail: > K?nntest du nicht auf den Buildserver CSWrrd deinstallieren? CSWrrd has been deinstalled on all buildservers. Best regards -- Dago From bdwalton at users.sourceforge.net Thu Dec 4 17:56:20 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 04 Dec 2008 16:56:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[2456] csw/mgar/pkg/sgml-xml-common/trunk Message-ID: Revision: 2456 http://gar.svn.sourceforge.net/gar/?rev=2456&view=rev Author: bdwalton Date: 2008-12-04 16:56:18 +0000 (Thu, 04 Dec 2008) Log Message: ----------- Explicitly set the PATH in install-catalog as we can't assume that /opt/csw/bin is on the path like the linux version can (safely) assume /usr/bin is available. This was breaking the preremove script in openjade. Modified Paths: -------------- csw/mgar/pkg/sgml-xml-common/trunk/checksums csw/mgar/pkg/sgml-xml-common/trunk/files/install-catalog-sanity.patch Modified: csw/mgar/pkg/sgml-xml-common/trunk/checksums =================================================================== --- csw/mgar/pkg/sgml-xml-common/trunk/checksums 2008-12-03 19:44:48 UTC (rev 2455) +++ csw/mgar/pkg/sgml-xml-common/trunk/checksums 2008-12-04 16:56:18 UTC (rev 2456) @@ -13,7 +13,7 @@ 24ff49d6310889d0f423b35893623151 download/sgml-common-quotes.patch b51552a733ae70753b6e7ea997a4e482 download/sgml-common-umask.patch d36dcc47efa67f41d7e406386754bb67 download/sgml-common-xmldir.patch -c88f3684fc232953555393fb8e0de9e4 download/install-catalog-sanity.patch +78febdc7f5b8535ef5e90e2c94a6e804 download/install-catalog-sanity.patch b35d53333ca6dbc6cd96f0135cd4f85d download/sgmlwhich-sanity.patch 99ac766ea29643aa33236a39596d943c download/configure-man.patch 12b32f2a5ad0ab2edb70bfb83f3aecd6 download/install-catalog-man.patch Modified: csw/mgar/pkg/sgml-xml-common/trunk/files/install-catalog-sanity.patch =================================================================== --- csw/mgar/pkg/sgml-xml-common/trunk/files/install-catalog-sanity.patch 2008-12-03 19:44:48 UTC (rev 2455) +++ csw/mgar/pkg/sgml-xml-common/trunk/files/install-catalog-sanity.patch 2008-12-04 16:56:18 UTC (rev 2456) @@ -1,8 +1,11 @@ --- sgml-common-0.6.3/bin/install-catalog.in.orig 2008-11-28 19:54:27.707251610 +0100 +++ sgml-common-0.6.3/bin/install-catalog.in 2008-11-28 21:43:50.645887927 +0100 -@@ -1,4 +1,4 @@ +@@ -1,4 +1,7 @@ -#!/bin/sh +#!/opt/csw/bin/bash ++ ++# make sure we can find ggrep and gsed ++PATH=/opt/csw/bin:$PATH # Script to install a catalog in the centralized SGML catalog # Send any comments to Eric Bischoff # This program is under GPL license. See LICENSE file for details. 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 Dec 4 19:01:13 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 04 Dec 2008 18:01:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[2457] csw/mgar/pkg/sgml-xml-common/trunk Message-ID: Revision: 2457 http://gar.svn.sourceforge.net/gar/?rev=2457&view=rev Author: bdwalton Date: 2008-12-04 18:01:12 +0000 (Thu, 04 Dec 2008) Log Message: ----------- Depend on gsed. Modified Paths: -------------- csw/mgar/pkg/sgml-xml-common/trunk/checksums csw/mgar/pkg/sgml-xml-common/trunk/files/CSWsgmlcommon.depend Modified: csw/mgar/pkg/sgml-xml-common/trunk/checksums =================================================================== --- csw/mgar/pkg/sgml-xml-common/trunk/checksums 2008-12-04 16:56:18 UTC (rev 2456) +++ csw/mgar/pkg/sgml-xml-common/trunk/checksums 2008-12-04 18:01:12 UTC (rev 2457) @@ -1,7 +1,7 @@ 103c9828f24820df86e55e7862e28974 download/sgml-common-0.6.3.tgz 8344f78748603b2870f2d7f401ef49eb download/CSWsgmlcommon.gspec fc5cd6cb77e22b8a1e21d0d9f662f891 download/CSWsgmlcommon.prototype -a4bb3b3487dcd7f6c16ec4ecb799253b download/CSWsgmlcommon.depend +48a802f691734579ef4afefaad1a5423 download/CSWsgmlcommon.depend f68c56d0904b311d4d254130a63eeee6 download/CSWxmlcommon.gspec cd5928d3ad12438a4725b3469a6b98fd download/CSWxmlcommon.prototype 9ef2e183281920ecced665a3f644bace download/xml.dcl Modified: csw/mgar/pkg/sgml-xml-common/trunk/files/CSWsgmlcommon.depend =================================================================== --- csw/mgar/pkg/sgml-xml-common/trunk/files/CSWsgmlcommon.depend 2008-12-04 16:56:18 UTC (rev 2456) +++ csw/mgar/pkg/sgml-xml-common/trunk/files/CSWsgmlcommon.depend 2008-12-04 18:01:12 UTC (rev 2457) @@ -1,3 +1,5 @@ P CSWbash bash - A sh-compatible command language interpreter P CSWggrep ggrep - GNU grep +P CSWgsed gsed - The GNU non-interactive text Stream-oriented EDitor (sed) + 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 Dec 4 21:32:13 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 04 Dec 2008 20:32:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[2458] csw/mgar/pkg/openjade/trunk Message-ID: Revision: 2458 http://gar.svn.sourceforge.net/gar/?rev=2458&view=rev Author: bdwalton Date: 2008-12-04 20:32:11 +0000 (Thu, 04 Dec 2008) Log Message: ----------- Added postinstall and preremove scripts to register/unregister the sgml/xml stuff that gets installed. chroot is used to handle the case where PKG_INSTALL_ROOT is set and isn't '/'. Modified Paths: -------------- csw/mgar/pkg/openjade/trunk/Makefile csw/mgar/pkg/openjade/trunk/checksums Added Paths: ----------- csw/mgar/pkg/openjade/trunk/files/CSWopenjade.postinstall csw/mgar/pkg/openjade/trunk/files/CSWopenjade.preremove Modified: csw/mgar/pkg/openjade/trunk/Makefile =================================================================== --- csw/mgar/pkg/openjade/trunk/Makefile 2008-12-04 18:01:12 UTC (rev 2457) +++ csw/mgar/pkg/openjade/trunk/Makefile 2008-12-04 20:32:11 UTC (rev 2458) @@ -17,7 +17,7 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWopenjade,depend) +DISTFILES += $(call admfiles,CSWopenjade,depend postinstall preremove) PATCHFILES = openjade-1.3.1-nsl.patch Modified: csw/mgar/pkg/openjade/trunk/checksums =================================================================== --- csw/mgar/pkg/openjade/trunk/checksums 2008-12-04 18:01:12 UTC (rev 2457) +++ csw/mgar/pkg/openjade/trunk/checksums 2008-12-04 20:32:11 UTC (rev 2458) @@ -1,4 +1,6 @@ 7df692e3186109cc00db6825b777201e download/openjade-1.3.2.tar.gz 3bceb78eeb9bdb38e98e75c6fb20714e download/CSWopenjade.gspec ea3dd2c469bf7e8efd183f82b743c90f download/CSWopenjade.depend +a31c09c1e08da2712e87446762d9fcdc download/CSWopenjade.postinstall +b35aca62389881efb0c0ebb296d9ae14 download/CSWopenjade.preremove ca3a0ff43d8ed182f432d723927cd2e9 download/openjade-1.3.1-nsl.patch Added: csw/mgar/pkg/openjade/trunk/files/CSWopenjade.postinstall =================================================================== --- csw/mgar/pkg/openjade/trunk/files/CSWopenjade.postinstall (rev 0) +++ csw/mgar/pkg/openjade/trunk/files/CSWopenjade.postinstall 2008-12-04 20:32:11 UTC (rev 2458) @@ -0,0 +1,29 @@ +#!/bin/sh + +CONFCAT=/opt/csw/etc/sgml/openjade-1.3.2-27.soc +CATALOG=/opt/csw/share/sgml/openjade-1.3.2/catalog + +insterror() +{ + cat < Revision: 2459 http://gar.svn.sourceforge.net/gar/?rev=2459&view=rev Author: dmichelsen Date: 2008-12-05 07:39:49 +0000 (Fri, 05 Dec 2008) Log Message: ----------- mGAR v2: Merge [2428] 'new target pkglist' Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2008-12-04 20:32:11 UTC (rev 2458) +++ csw/mgar/gar/v2/gar.pkg.mk 2008-12-05 07:39:49 UTC (rev 2459) @@ -243,3 +243,22 @@ pkgenv: @$(PKG_ENV) env + +# pkglist - list the packages to be built with GAR pathname, catalog name and package name +# + +define _pkglist_pkgname +$(shell perl -F'\s+' -ane 'print "$$F[2]" if( $$F[0] eq "%var" && $$F[1] eq "pkgname")' files/$(1).gspec) +endef + +define _pkglist_catalogname +$(shell perl -F'\s+' -ane 'print "$$F[2]" if( $$F[0] eq "%var" && $$F[1] eq "bitname")' files/$(1).gspec) +endef + +define _pkglist_one +$(shell /usr/bin/echo "$(patsubst $(realpath $(shell pwd)/$(GARDIR))/%,%,$(realpath .))\t$(call _pkglist_catalogname,$(1))\t$(call _pkglist_pkgname,$(1))") +endef + +pkglist: + @echo "G: $(GARDIR) - $(shell pwd) - $(realpath $(shell pwd)/$(GARDIR)) - $(realpath .)" + @$(foreach SPEC,$(SPKG_SPECS),echo "$(call _pkglist_one,$(SPEC))";) 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 Dec 5 09:06:08 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 05 Dec 2008 08:06:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[2460] csw/mgar/pkg/jdk6/trunk Message-ID: Revision: 2460 http://gar.svn.sourceforge.net/gar/?rev=2460&view=rev Author: dmichelsen Date: 2008-12-05 08:06:08 +0000 (Fri, 05 Dec 2008) Log Message: ----------- jdk6: Unified JDK/JRE package Modified Paths: -------------- csw/mgar/pkg/jdk6/trunk/Makefile csw/mgar/pkg/jdk6/trunk/checksums Added Paths: ----------- csw/mgar/pkg/jdk6/trunk/files/CSWjdk.depend csw/mgar/pkg/jdk6/trunk/files/CSWjdk.gspec csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.depend csw/mgar/pkg/jdk6/trunk/files/CSWjre.depend csw/mgar/pkg/jdk6/trunk/files/CSWjre.gspec csw/mgar/pkg/jdk6/trunk/files/CSWjre6.gspec Modified: csw/mgar/pkg/jdk6/trunk/Makefile =================================================================== --- csw/mgar/pkg/jdk6/trunk/Makefile 2008-12-05 07:39:49 UTC (rev 2459) +++ csw/mgar/pkg/jdk6/trunk/Makefile 2008-12-05 08:06:08 UTC (rev 2460) @@ -18,15 +18,33 @@ DISTNAME = jdk$(SPKG_VERSION) DISTFILES = $(foreach S,$(SUFFIXES),jdk-$(GARVERSION)-solaris-$S.sh) NOEXTRACT = $(foreach S,$(filter-out $(SUFFIXES_$(GARCH)),$(SUFFIXES)),jdk-$(GARVERSION)-solaris-$S.sh) -DISTFILES += $(call admfiles,CSWjdk6) +DISTFILES += $(call admfiles,CSWjdk6,depend) +DISTFILES += $(call admfiles,CSWjre6) +DISTFILES += $(call admfiles,CSWjdk,depend) +DISTFILES += $(call admfiles,CSWjre,depend) -SPKG_SOURCEURL = http://java.sun.com/products/archive/ +SPKG_SOURCEURL = http://java.sun.com/javase/downloads/index.jsp +MANPAGES_JRE = java.1 javaws.1 keytool.1 orbd.1 pack200.1 policytool.1 rmid.1 rmiregistry.1 +MANPAGES_JRE += servertool.1 tnameserv.1 unpack200.1 + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = INSTALL_SCRIPTS = custom +PKGFILES_CSWjdk = $(prefix)/java/jdk/latest + +PKGFILES_CSWjre = $(prefix)/java/jre/latest +PKGFILES_CSWjre += $(prefix)/java/man + +PKGFILES_CSWjre6 = $(prefix)/java/jdk/$(DISTNAME)/jre/.* +PKGFILES_CSWjre6 += $(prefix)/java/jdk/$(DISTNAME)/man/.*/(java|javaws|keytool|orbd|pack200|policytool|rmid|rmiregistry|servertool|tnameserv|unpack200)\.1 +PKGFILES_CSWjre6 += $(prefix)/java/jre/jre$(SPKG_VERSION) +PKGFILES_CSWjre6 += $(prefix)/java/jre/jre6 + +# CSWjdk6 gets all the rest + # Tell the user to download the file manually manual//%: @echo @@ -39,21 +57,34 @@ @echo # rule to extract files with shell -shell-extract-%: +shell-extract-archive-%: @echo " ==> Extracting $(DOWNLOADDIR)/$*" @echo "yes" | (D=$(abspath $(DOWNLOADDIR)/$*); cd $(EXTRACTDIR); MORE="-10000" sh $$D) @$(MAKECOOKIE) -extract-%.sh: shell-extract-%.sh +extract-archive-%.sh: shell-extract-archive-%.sh @$(MAKECOOKIE) include gar/category.mk install-custom: @echo " ==> Installing $(GARNAME)" - @rm -rf $(DESTDIR)$(prefix)/$(DISTNAME) - @ginstall -d $(DESTDIR)$(prefix) - @(cd $(WORKDIR); pax -r -w -v $(DISTNAME) $(DESTDIR)$(prefix)) - @rm -f $(DESTDIR)$(prefix)/$(GARNAME) - @gln -sf $(DISTNAME) $(DESTDIR)$(prefix)/$(GARNAME) + + @rm -rf $(DESTDIR)$(prefix)/java + @ginstall -d $(DESTDIR)$(prefix)/java/jdk + @(cd $(WORKDIR); pax -r -w $(DISTNAME) $(DESTDIR)$(prefix)/java/jdk) + @rm -f $(DESTDIR)$(prefix)/java/jdk/latest + @gln -sf jdk6 $(DESTDIR)$(prefix)/java/jdk/latest + @rm -f $(DESTDIR)$(prefix)/java/jdk/jdk6 + @gln -sf $(DISTNAME) $(DESTDIR)$(prefix)/java/jdk/jdk6 + + @ginstall -d $(DESTDIR)$(prefix)/java/jre + @rm -f $(DESTDIR)$(prefix)/java/jre/jre$(SPKG_VERSION) + @gln -sf ../jdk/$(DISTNAME)/jre $(DESTDIR)$(prefix)/java/jre/jre$(SPKG_VERSION) + @rm -f $(DESTDIR)$(prefix)/java/jre/latest + @gln -sf jre6 $(DESTDIR)$(prefix)/java/jre/latest + @rm -f $(DESTDIR)$(prefix)/java/jre/jre6 + @gln -sf jre$(SPKG_VERSION) $(DESTDIR)$(prefix)/java/jre/jre6 + + @gln -sf ../man $(DESTDIR)$(prefix)/java/jdk/$(DISTNAME)/jre/man @$(MAKECOOKIE) Modified: csw/mgar/pkg/jdk6/trunk/checksums =================================================================== --- csw/mgar/pkg/jdk6/trunk/checksums 2008-12-05 07:39:49 UTC (rev 2459) +++ csw/mgar/pkg/jdk6/trunk/checksums 2008-12-05 08:06:08 UTC (rev 2460) @@ -3,3 +3,9 @@ e31c6cf8ada23cde243656f7ef435ce3 download/jdk-6u10-solaris-i586.sh c837fbdd49b772255a255802552c8da6 download/jdk-6u10-solaris-x64.sh d2ea0d736a7cf088ed9d452f3b1ecb1d download/CSWjdk6.gspec +a077039adebc66db2f7316e387ba13eb download/CSWjdk6.depend +d085818ed2ca9c777c85b3c9553a41f5 download/CSWjre6.gspec +8b98539f0a2211e965cc9bb2d42024f3 download/CSWjdk.gspec +e1aeb08d2dbb21e9b61598bc1dde0094 download/CSWjdk.depend +873b8c1f59485f78eb87ad67fe4c4dc4 download/CSWjre.gspec +a077039adebc66db2f7316e387ba13eb download/CSWjre.depend Added: csw/mgar/pkg/jdk6/trunk/files/CSWjdk.depend =================================================================== --- csw/mgar/pkg/jdk6/trunk/files/CSWjdk.depend (rev 0) +++ csw/mgar/pkg/jdk6/trunk/files/CSWjdk.depend 2008-12-05 08:06:08 UTC (rev 2460) @@ -0,0 +1 @@ +P CSWjdk6 jdk6 - Java Development Kit 6 Copied: csw/mgar/pkg/jdk6/trunk/files/CSWjdk.gspec (from rev 2353, csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.gspec) =================================================================== --- csw/mgar/pkg/jdk6/trunk/files/CSWjdk.gspec (rev 0) +++ csw/mgar/pkg/jdk6/trunk/files/CSWjdk.gspec 2008-12-05 08:06:08 UTC (rev 2460) @@ -0,0 +1,4 @@ +%var bitname jdk +%var pkgname CSWjdk +%include url file://%{PKGLIB}/csw_standard.gspec +%copyright url file://%{WORKSRC}/LICENSE Added: csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.depend =================================================================== --- csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.depend (rev 0) +++ csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.depend 2008-12-05 08:06:08 UTC (rev 2460) @@ -0,0 +1 @@ +P CSWjre6 jre6 - Java Runtime Environment 6 Added: csw/mgar/pkg/jdk6/trunk/files/CSWjre.depend =================================================================== --- csw/mgar/pkg/jdk6/trunk/files/CSWjre.depend (rev 0) +++ csw/mgar/pkg/jdk6/trunk/files/CSWjre.depend 2008-12-05 08:06:08 UTC (rev 2460) @@ -0,0 +1 @@ +P CSWjre6 jre6 - Java Runtime Environment 6 Copied: csw/mgar/pkg/jdk6/trunk/files/CSWjre.gspec (from rev 2353, csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.gspec) =================================================================== --- csw/mgar/pkg/jdk6/trunk/files/CSWjre.gspec (rev 0) +++ csw/mgar/pkg/jdk6/trunk/files/CSWjre.gspec 2008-12-05 08:06:08 UTC (rev 2460) @@ -0,0 +1,4 @@ +%var bitname jre +%var pkgname CSWjre +%include url file://%{PKGLIB}/csw_standard.gspec +%copyright url file://%{WORKSRC}/LICENSE Copied: csw/mgar/pkg/jdk6/trunk/files/CSWjre6.gspec (from rev 2353, csw/mgar/pkg/jre6/trunk/files/CSWjre6.gspec) =================================================================== --- csw/mgar/pkg/jdk6/trunk/files/CSWjre6.gspec (rev 0) +++ csw/mgar/pkg/jdk6/trunk/files/CSWjre6.gspec 2008-12-05 08:06:08 UTC (rev 2460) @@ -0,0 +1,4 @@ +%var bitname jre6 +%var pkgname CSWjre6 +%include url file://%{PKGLIB}/csw_standard.gspec +%copyright url file://%{WORKSRC}/LICENSE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Fri Dec 5 11:46:45 2008 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Fri, 05 Dec 2008 10:46:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[2461] csw/mgar/pkg/rrdtool/trunk Message-ID: Revision: 2461 http://gar.svn.sourceforge.net/gar/?rev=2461&view=rev Author: idogan23 Date: 2008-12-05 10:46:44 +0000 (Fri, 05 Dec 2008) Log Message: ----------- rrdtool: changed package name to CSWrrd Modified Paths: -------------- csw/mgar/pkg/rrdtool/trunk/checksums csw/mgar/pkg/rrdtool/trunk/files/CSWrrdtool.gspec Modified: csw/mgar/pkg/rrdtool/trunk/checksums =================================================================== --- csw/mgar/pkg/rrdtool/trunk/checksums 2008-12-05 08:06:08 UTC (rev 2460) +++ csw/mgar/pkg/rrdtool/trunk/checksums 2008-12-05 10:46:44 UTC (rev 2461) @@ -1,4 +1,4 @@ 7db3bffc3f3b24e828a88fe02165266f download/rrdtool-1.3.4.tar.gz -b91af3ac17057e09f6a0fdc1a3edbe86 download/CSWrrdtool.gspec +52bb91d1dad69b8911e787e9347b4e8a download/CSWrrdtool.gspec 9be46cfbb1068056b1466d79cbebbff6 download/CSWrrdtool.prototype 6d78fae545c47faa61f37b216eeeda90 download/rrd_config.diff Modified: csw/mgar/pkg/rrdtool/trunk/files/CSWrrdtool.gspec =================================================================== --- csw/mgar/pkg/rrdtool/trunk/files/CSWrrdtool.gspec 2008-12-05 08:06:08 UTC (rev 2460) +++ csw/mgar/pkg/rrdtool/trunk/files/CSWrrdtool.gspec 2008-12-05 10:46:44 UTC (rev 2461) @@ -1,4 +1,4 @@ %var bitname rrdtool -%var pkgname CSWrrdtool +%var pkgname CSWrrd %include url file://%{GARDIR}/pkglib/csw_dyndepend.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 chninkel at users.sourceforge.net Sat Dec 6 15:57:20 2008 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 06 Dec 2008 14:57:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[2462] csw/mgar/pkg/openssh/trunk Message-ID: Revision: 2462 http://gar.svn.sourceforge.net/gar/?rev=2462&view=rev Author: chninkel Date: 2008-12-06 14:57:20 +0000 (Sat, 06 Dec 2008) Log Message: ----------- openssh: added test for configuration file existence in sysV init script (Closes: #2878) Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/checksums csw/mgar/pkg/openssh/trunk/files/changelog.CSW csw/mgar/pkg/openssh/trunk/files/cswopenssh Modified: csw/mgar/pkg/openssh/trunk/checksums =================================================================== --- csw/mgar/pkg/openssh/trunk/checksums 2008-12-05 10:46:44 UTC (rev 2461) +++ csw/mgar/pkg/openssh/trunk/checksums 2008-12-06 14:57:20 UTC (rev 2462) @@ -5,9 +5,9 @@ 0993813fa5c752215f892cb67c86816f download/CSWossh.preinstall e9e93bfda8a883bca632c712d9c359f6 download/CSWossh.postinstall 25f7a58f2a19feb40811e9d7df5bca26 download/CSWossh.prototype -4c0b25ac3197b44664ce7978203a3e2d download/changelog.CSW +7614576845be17fc3ee2f6fea7b83695 download/changelog.CSW 0c7fca2f4bee3ecd489ebd85fdd8cdee download/sshd_config -c4aef2f34e6c249a06e2ef9603047652 download/cswopenssh +73416a82ca98ba40e7b86ea94d0339cf download/cswopenssh 8e23e1f856f36e8e084a9283d22a7cbf download/svc-cswopenssh 547a915f1712c35dc79dc41378001ca9 download/cswopenssh.xml dc212745af1f549ce2a236401bf97c1b download/i.conf Modified: csw/mgar/pkg/openssh/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2008-12-05 10:46:44 UTC (rev 2461) +++ csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2008-12-06 14:57:20 UTC (rev 2462) @@ -1,3 +1,10 @@ +openssh (5.1,REV=2008.12.06_rev=p1) unstable + + * Added test for configuration file existence in sysV init script + (Closes: #2878) + + -- Yann Rouillard Sat, 06 Dec 2008 15:36:48 +0100 + openssh (5.1,REV=2008.10.04_rev=p1) unstable * New upstream version. Modified: csw/mgar/pkg/openssh/trunk/files/cswopenssh =================================================================== --- csw/mgar/pkg/openssh/trunk/files/cswopenssh 2008-12-05 10:46:44 UTC (rev 2461) +++ csw/mgar/pkg/openssh/trunk/files/cswopenssh 2008-12-06 14:57:20 UTC (rev 2462) @@ -20,7 +20,7 @@ fi fi - [ -x /opt/csw/sbin/sshd ] && /opt/csw/sbin/sshd & + [ -x /opt/csw/sbin/sshd ] && [ -f /opt/csw/etc/ssh/sshd_config ] && /opt/csw/sbin/sshd & ;; 'stop') # This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Dec 6 16:03:15 2008 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 06 Dec 2008 15:03:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[2463] csw/mgar/pkg/vsftpd/trunk/Makefile Message-ID: Revision: 2463 http://gar.svn.sourceforge.net/gar/?rev=2463&view=rev Author: chninkel Date: 2008-12-06 15:03:15 +0000 (Sat, 06 Dec 2008) Log Message: ----------- vsftpd: verbose pre-install step in Makefile Modified Paths: -------------- csw/mgar/pkg/vsftpd/trunk/Makefile Modified: csw/mgar/pkg/vsftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/vsftpd/trunk/Makefile 2008-12-06 14:57:20 UTC (rev 2462) +++ csw/mgar/pkg/vsftpd/trunk/Makefile 2008-12-06 15:03:15 UTC (rev 2463) @@ -89,7 +89,8 @@ # we create the csw directory hierarchy pre-install: - @( install -d $(DESTDIR)$(sbindir); \ + @echo "Creating csw directories" + ( install -d $(DESTDIR)$(sbindir); \ install -d $(DESTDIR)$(mandir)/man5; \ install -d $(DESTDIR)$(mandir)/man8; \ ln -sf $(DESTDIR)$(mandir) $(DESTDIR)$(prefix)/man; \ 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 Dec 6 19:07:57 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 06 Dec 2008 18:07:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[2464] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 2464 http://gar.svn.sourceforge.net/gar/?rev=2464&view=rev Author: bonivart Date: 2008-12-06 18:07:57 +0000 (Sat, 06 Dec 2008) Log Message: ----------- pkgutil: updates to prepare for 1.3 Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile csw/mgar/pkg/pkgutil/trunk/checksums csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype Removed Paths: ------------- csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.copyright Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2008-12-06 15:03:15 UTC (rev 2463) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2008-12-06 18:07:57 UTC (rev 2464) @@ -1,8 +1,8 @@ GARNAME = pkgutil -GARVERSION = 1.2.1 +GARVERSION = 1.3b2 CATEGORIES = utils -DESCRIPTION = install Solaris packages the easy way +DESCRIPTION = Installs Solaris packages easily define BLURB Pkgutil, written in Perl and licensed under GPL, is a tool to make installation of packages in Solaris easier. It handles package @@ -25,28 +25,29 @@ include gar/category.mk WORKSRC = $(WORKDIR) -SPKG_SOURCEURL = http://wiki.opencsw.org/pkgutil/ -SPKG_CLASSES = none cswpkgutil +SPKG_SOURCEURL = http://pkgutil.wikidot.com/ +#SPKG_CLASSES = none cswpkgutil install-custom: @echo " ==> Installing $(GARNAME) (custom)" @rm -rf $(DESTDIR) - @ginstall -d $(DESTDIR)/etc/opt/csw +# @ginstall -d $(DESTDIR)/etc/opt/csw @ginstall -d $(DESTDIR)/opt/csw/bin @ginstall -d $(DESTDIR)/opt/csw/etc @ginstall -d $(DESTDIR)/opt/csw/libexec/pkgutil @ginstall -d $(DESTDIR)/opt/csw/share/doc/pkgutil @ginstall -d $(DESTDIR)$(mandir)/man1 - @ginstall -d $(DESTDIR)/usr/sadm/install/scripts +# @ginstall -d $(DESTDIR)/usr/sadm/install/scripts @ginstall -d $(DESTDIR)/var/opt/csw/pkgutil/packages @pod2man --section=1 $(WORKSRC)/$(GARNAME) > $(DESTDIR)$(mandir)/man1/pkgutil.1 - @cp -r $(WORKSRC)/$(GARNAME).conf $(DESTDIR)/etc/opt/csw/$(GARNAME).conf.CSW -# @cp -r $(WORKSRC)/$(GARNAME).conf $(DESTDIR)/opt/csw/etc/$(GARNAME).conf.CSW +# @cp -r $(WORKSRC)/$(GARNAME).conf $(DESTDIR)/etc/opt/csw/$(GARNAME).conf.CSW + @cp -r $(WORKSRC)/$(GARNAME).conf $(DESTDIR)/opt/csw/etc/$(GARNAME).conf.CSW @cp -r $(WORKSRC)/$(GARNAME) $(DESTDIR)/opt/csw/bin/ @cp -r $(WORKSRC)/bldcat $(DESTDIR)/opt/csw/bin/ @cp -r $(WORKSRC)/chkcat $(DESTDIR)/opt/csw/bin/ @cp -r $(WORKSRC)/readme $(DESTDIR)/opt/csw/share/doc/pkgutil/ - @cp -r $(FILEDIR)/CSWpkgutil.copyright $(DESTDIR)/opt/csw/share/doc/pkgutil/LICENSE +# @cp -r $(FILEDIR)/CSWpkgutil.copyright $(DESTDIR)/opt/csw/share/doc/pkgutil/LICENSE + @cp -r $(WORKSRC)/copyright $(DESTDIR)$(docdir)/pkgutil/LICENSE # @cp -r $(FILEDIR)/CSWpkgutil.i.cswpkgutil $(DESTDIR)/usr/sadm/install/scripts/i.cswpkgutil # @cp -r $(FILEDIR)/CSWpkgutil.r.cswpkgutil $(DESTDIR)/usr/sadm/install/scripts/r.cswpkgutil @cp -r $(WORKSRC)/admin $(DESTDIR)/var/opt/csw/pkgutil/admin.CSW Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2008-12-06 15:03:15 UTC (rev 2463) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2008-12-06 18:07:57 UTC (rev 2464) @@ -1,5 +1,5 @@ -0a6b4b39688a67617ffa39eb4ec2e8d0 download/pkgutil-1.2.1.zip +3973b2172d45390dc9884f83109671a8 download/pkgutil-1.3b2.zip 805cd30ad9f21cb1167d166fa99b5891 download/CSWpkgutil.gspec -0633b5672d89536454f92b8e8c40eabf download/CSWpkgutil.prototype +2f561d7f40289fac9bd02d2504b73693 download/CSWpkgutil.prototype bea1e5ef39a8389b9feaa18938993205 download/CSWpkgutil.postinstall 5b83368c47fc309a69a1a5020d55385b download/CSWpkgutil.preremove Deleted: csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.copyright =================================================================== --- csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.copyright 2008-12-06 15:03:15 UTC (rev 2463) +++ csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.copyright 2008-12-06 18:07:57 UTC (rev 2464) @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU 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. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), 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 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 show them these terms so they know 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. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - 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 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 derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 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 License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -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. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary 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 - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 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 Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing 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 for copying, distributing or modifying -the Program or works based on it. - - 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. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. 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 this 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 -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. 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 - - 11. 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. - - 12. 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 - - 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 the public, 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 2 of the License, 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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) 19yy 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 is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. Modified: csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype =================================================================== --- csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype 2008-12-06 15:03:15 UTC (rev 2463) +++ csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.prototype 2008-12-06 18:07:57 UTC (rev 2464) @@ -2,13 +2,13 @@ i copyright=CSWpkgutil.copyright i postinstall=CSWpkgutil.postinstall i preremove=CSWpkgutil.preremove -d none /etc/opt/csw 0755 root bin -f none /etc/opt/csw/pkgutil.conf.CSW 644 root bin d none /opt/csw 0755 root bin d none /opt/csw/bin 0755 root bin f none /opt/csw/bin/pkgutil 755 root bin f none /opt/csw/bin/bldcat 755 root bin f none /opt/csw/bin/chkcat 755 root bin +d none /opt/csw/etc 0755 root bin +f none /opt/csw/etc/pkgutil.conf.CSW 644 root bin d none /opt/csw/libexec 0755 root bin d none /opt/csw/libexec/pkgutil 0755 root bin f none /opt/csw/libexec/pkgutil/wget 755 root bin 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 Dec 7 02:29:43 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 07 Dec 2008 01:29:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[2465] csw/mgar/pkg Message-ID: Revision: 2465 http://gar.svn.sourceforge.net/gar/?rev=2465&view=rev Author: bonivart Date: 2008-12-07 01:29:43 +0000 (Sun, 07 Dec 2008) Log Message: ----------- clamav: initial commit Added Paths: ----------- csw/mgar/pkg/clamav/ csw/mgar/pkg/clamav/branches/ csw/mgar/pkg/clamav/tags/ csw/mgar/pkg/clamav/trunk/ csw/mgar/pkg/clamav/trunk/Makefile csw/mgar/pkg/clamav/trunk/checksums csw/mgar/pkg/clamav/trunk/files/ csw/mgar/pkg/clamav/trunk/files/CSWclamav.copyright csw/mgar/pkg/clamav/trunk/files/CSWclamav.gspec csw/mgar/pkg/clamav/trunk/files/CSWlibclamav.copyright csw/mgar/pkg/clamav/trunk/files/CSWlibclamav.gspec Property changes on: csw/mgar/pkg/clamav/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 Added: csw/mgar/pkg/clamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamav/trunk/Makefile (rev 0) +++ csw/mgar/pkg/clamav/trunk/Makefile 2008-12-07 01:29:43 UTC (rev 2465) @@ -0,0 +1,41 @@ +GARNAME = clamav +GARVERSION = 0.94.2 +CATEGORIES = apps + +DESCRIPTION = Clam AntiVirus +define BLURB + Clam AntiVirus is an open source (GPL) anti-virus toolkit for UNIX, designed + especially for e-mail scanning on mail gateways. It provides a number of + utilities including a flexible and scalable multi-threaded daemon, a command + line scanner and advanced tool for automatic database updates. The core of + the package is an anti-virus engine available in a form of shared library. +endef + +MASTER_SITES = http://freshmeat.net/redir/clamav/29355/url_tgz/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWclamav,) +#DISTFILES += $(call admfiles,CSWlibclamav,) + +GARCOMPILER = GNU +GNU_CC_HOME = /opt/csw/gcc3 + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-user=nobody +CONFIGURE_ARGS += --with-group=nobody +CONFIGURE_ARGS += --enable-milter +CONFIGURE_ARGS += --with-sendmail=/opt/csw/lib/sendmail +CONFIGURE_ARGS += --with-dbdir=/var/opt/csw/$(GARNAME)/db +CONFIGURE_ARGS += --localstatedir=/var/opt/csw/$(GARNAME) + +include gar/category.mk + +pre-package: + @echo " ==> Pre-package for $(GARNAME)" + @find $(DESTDIR) -type f -name "*~" -exec rm {} \; + @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 644 $(WORKSRC)/AUTHORS $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 644 $(WORKSRC)/COPYING $(DESTDIR)$(docdir)/$(GARNAME)/LICENSE + @ginstall -m 644 $(WORKSRC)/FAQ $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 644 $(WORKSRC)/NEWS $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 644 $(WORKSRC)/README $(DESTDIR)$(docdir)/$(GARNAME) + @$(MAKECOOKIE) Added: csw/mgar/pkg/clamav/trunk/checksums =================================================================== --- csw/mgar/pkg/clamav/trunk/checksums (rev 0) +++ csw/mgar/pkg/clamav/trunk/checksums 2008-12-07 01:29:43 UTC (rev 2465) @@ -0,0 +1,2 @@ +1181e6d62341b84708f126cc353f7ebf download/clamav-0.94.2.tar.gz +df9572dc44907a1ceff3561f9b834e20 download/CSWclamav.gspec Added: csw/mgar/pkg/clamav/trunk/files/CSWclamav.copyright =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWclamav.copyright (rev 0) +++ csw/mgar/pkg/clamav/trunk/files/CSWclamav.copyright 2008-12-07 01:29:43 UTC (rev 2465) @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU 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. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), 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 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 show them these terms so they know 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. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + 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 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 derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 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 License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +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. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary 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 + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 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 Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing 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 for copying, distributing or modifying +the Program or works based on it. + + 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. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. 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 this 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 +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. 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 + + 11. 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. + + 12. 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 + + 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 the public, 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 2 of the License, 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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) 19yy 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 is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. Added: csw/mgar/pkg/clamav/trunk/files/CSWclamav.gspec =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWclamav.gspec (rev 0) +++ csw/mgar/pkg/clamav/trunk/files/CSWclamav.gspec 2008-12-07 01:29:43 UTC (rev 2465) @@ -0,0 +1,7 @@ +%var bitname clamav +%var pkgname CSWclamav +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/clamav/copyright for license information. + Added: csw/mgar/pkg/clamav/trunk/files/CSWlibclamav.copyright =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWlibclamav.copyright (rev 0) +++ csw/mgar/pkg/clamav/trunk/files/CSWlibclamav.copyright 2008-12-07 01:29:43 UTC (rev 2465) @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU 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. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), 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 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 show them these terms so they know 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. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + 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 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 derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 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 License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +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. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary 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 + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 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 Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing 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 for copying, distributing or modifying +the Program or works based on it. + + 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. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. 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 this 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 +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. 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 + + 11. 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. + + 12. 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 + + 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 the public, 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 2 of the License, 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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) 19yy 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 is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. Added: csw/mgar/pkg/clamav/trunk/files/CSWlibclamav.gspec =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWlibclamav.gspec (rev 0) +++ csw/mgar/pkg/clamav/trunk/files/CSWlibclamav.gspec 2008-12-07 01:29:43 UTC (rev 2465) @@ -0,0 +1,7 @@ +%var bitname libclamav +%var pkgname CSWlibclamav +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/libclamav/copyright for license information. + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Sun Dec 7 13:03:14 2008 From: dam at opencsw.org (Dagobert Michelsen) Date: Sun, 7 Dec 2008 13:03:14 +0100 Subject: [csw-devel] libtool reordering runpath and LD_OPTIONS Message-ID: <627731CF-D4B6-4319-9B92-63BBD440C4D7@opencsw.org> Hi, I'm still working on automated 32/64 bit builds and still encounter new strange things. This time I have an issue with libtool. This command is issues during make when comiling libvorbis/trunk/work/build-isa-amd64/libvorbis-1.2.0/examples opencsw# /bin/bash ../libtool --tag=CC --mode=link /opt/studio/SOS11/ SUNWspro/bin/cc -O -xO3 -xarch=amd64 -I/opt/csw/include - DUSE_MEMORY_H -xarch=amd64 -L/opt/csw/lib/64 -R/opt/csw/lib/\\\ $ISALIST -R/opt/csw/lib/64 -o seeking_example seeking_example.o ../lib/ libvorbisfile.la ../lib/libvorbis.la This looks good, but libtool reorders the runpath: /opt/studio/SOS11/SUNWspro/bin/cc -O -xO3 -xarch=amd64 -I/opt/csw/ include -DUSE_MEMORY_H -xarch=amd64 -o .libs/seeking_example seeking_example.o -L/opt/csw/lib/64 ../lib/.libs/libvorbisfile.so / root/mgar/pkg/libvorbis/trunk/work/build-isa-amd64/libvorbis-1.2.0/ lib/.libs/libvorbis.so ../lib/.libs/libvorbis.so /opt/csw/lib/64/ libogg.so -lm -R/opt/csw/lib/64 -R/opt/csw/lib/\$ISALIST ld: warning: file ../lib/.libs/libvorbis.so: linked to /root/mgar/pkg/ libvorbis/trunk/work/build-isa-amd64/libvorbis-1.2.0/lib/.libs/ libvorbis.so: attempted multiple inclusion of file creating seeking_example Putting -R/opt/csw/lib/64 before $ISALIST is pretty pointless as $ISALIST then never will be used as the library is found earlier. Debugging the libtool-shellscript, umh, does not reveal any secrets. It looks like libtool assembles the runpath dynamically from all runpathes from libraries the to be linked lib depends on and than reorders it somehow. If I use LD_OPTIONS I can get it to work, but I understood from the past discussions that LD_OPTIONS is a Bad Thing(tm). Any libtool experts around who can enlighten me how to do this right? Best regards -- Dago From bonivart at users.sourceforge.net Sun Dec 7 13:47:24 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 07 Dec 2008 12:47:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[2466] csw/mgar/pkg/clamav/trunk Message-ID: Revision: 2466 http://gar.svn.sourceforge.net/gar/?rev=2466&view=rev Author: bonivart Date: 2008-12-07 12:47:24 +0000 (Sun, 07 Dec 2008) Log Message: ----------- clamav: more stuff added Modified Paths: -------------- csw/mgar/pkg/clamav/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/clamav/trunk/files/CSWclamav.copyright csw/mgar/pkg/clamav/trunk/files/CSWlibclamav.copyright Modified: csw/mgar/pkg/clamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamav/trunk/Makefile 2008-12-07 01:29:43 UTC (rev 2465) +++ csw/mgar/pkg/clamav/trunk/Makefile 2008-12-07 12:47:24 UTC (rev 2466) @@ -1,3 +1,17 @@ +# add re for update notification +# split into multiple packages: clamav, libclamav +# put libs in lib/32? +# add depend files +# add rc/smf support +# add pre/post scripts +# add etc/clamav-milter +# add etc/clamd? +# add doc/README.CSW, INSTALL.clamav-milter.CSW +# check mantis bugs +# + add contrib +# + add html docs and some pdf:s +# + remove *.a, *.la from libs + GARNAME = clamav GARVERSION = 0.94.2 CATEGORIES = apps @@ -29,13 +43,31 @@ include gar/category.mk +SPKG_SOURCEURL = http://www.clamav.net/ + pre-package: - @echo " ==> Pre-package for $(GARNAME)" + @echo " ==> Pre-package for $(GARNAME)" @find $(DESTDIR) -type f -name "*~" -exec rm {} \; - @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) + @find $(DESTDIR)/opt/csw/lib -type f -name "*.a" -exec rm {} \; + @find $(DESTDIR)/opt/csw/lib -type f -name "*.la" -exec rm {} \; + @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME)/html + @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME)/contrib @ginstall -m 644 $(WORKSRC)/AUTHORS $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 644 $(WORKSRC)/BUGS $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 644 $(WORKSRC)/ChangeLog $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 644 $(WORKSRC)/docs/clamav-mirror-howto.pdf $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 644 $(WORKSRC)/docs/clamdoc.pdf $(DESTDIR)$(docdir)/$(GARNAME) @ginstall -m 644 $(WORKSRC)/COPYING $(DESTDIR)$(docdir)/$(GARNAME)/LICENSE @ginstall -m 644 $(WORKSRC)/FAQ $(DESTDIR)$(docdir)/$(GARNAME) @ginstall -m 644 $(WORKSRC)/NEWS $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 644 $(WORKSRC)/docs/phishsigs_howto.pdf $(DESTDIR)$(docdir)/$(GARNAME) @ginstall -m 644 $(WORKSRC)/README $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 644 $(WORKSRC)/docs/signatures.pdf $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 644 $(WORKSRC)/UPGRADE $(DESTDIR)$(docdir)/$(GARNAME) + @ginstall -m 644 $(WORKSRC)/contrib/clamdwatch/* $(DESTDIR)$(docdir)/$(GARNAME)/contrib + @ginstall -m 644 $(WORKSRC)/contrib/init/Solaris10/* $(DESTDIR)$(docdir)/$(GARNAME)/contrib + @ginstall -m 644 $(WORKSRC)/contrib/cleanup-partial.pl $(DESTDIR)$(docdir)/$(GARNAME)/contrib + @for file in $(WORKSRC)/docs/html/*; do \ + cp $$file $(DESTDIR)$(docdir)/$(GARNAME)/html ; \ + done @$(MAKECOOKIE) Deleted: csw/mgar/pkg/clamav/trunk/files/CSWclamav.copyright =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWclamav.copyright 2008-12-07 01:29:43 UTC (rev 2465) +++ csw/mgar/pkg/clamav/trunk/files/CSWclamav.copyright 2008-12-07 12:47:24 UTC (rev 2466) @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU 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. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), 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 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 show them these terms so they know 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. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - 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 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 derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 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 License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -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. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary 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 - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 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 Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing 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 for copying, distributing or modifying -the Program or works based on it. - - 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. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. 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 this 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 -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. 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 - - 11. 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. - - 12. 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 - - 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 the public, 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 2 of the License, 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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) 19yy 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 is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. Deleted: csw/mgar/pkg/clamav/trunk/files/CSWlibclamav.copyright =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWlibclamav.copyright 2008-12-07 01:29:43 UTC (rev 2465) +++ csw/mgar/pkg/clamav/trunk/files/CSWlibclamav.copyright 2008-12-07 12:47:24 UTC (rev 2466) @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU 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. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), 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 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 show them these terms so they know 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. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - 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 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 derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 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 License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -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. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary 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 - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 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 Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing 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 for copying, distributing or modifying -the Program or works based on it. - - 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. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. 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 this 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 -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. 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 - - 11. 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. - - 12. 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 - - 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 the public, 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 2 of the License, 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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) 19yy 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 is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. 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 Dec 7 14:33:01 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 07 Dec 2008 13:33:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[2467] csw/mgar/pkg/clamav/trunk Message-ID: Revision: 2467 http://gar.svn.sourceforge.net/gar/?rev=2467&view=rev Author: bonivart Date: 2008-12-07 13:33:00 +0000 (Sun, 07 Dec 2008) Log Message: ----------- clamav: multiple packages Modified Paths: -------------- csw/mgar/pkg/clamav/trunk/Makefile csw/mgar/pkg/clamav/trunk/checksums Modified: csw/mgar/pkg/clamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamav/trunk/Makefile 2008-12-07 12:47:24 UTC (rev 2466) +++ csw/mgar/pkg/clamav/trunk/Makefile 2008-12-07 13:33:00 UTC (rev 2467) @@ -1,5 +1,6 @@ -# add re for update notification -# split into multiple packages: clamav, libclamav +# clamav, Peter Bonivart +# files outside /opt/csw are not included, need to fix gspec and cswproto +# split into multiple packages: clamav, libclamav, clamavdb? # put libs in lib/32? # add depend files # add rc/smf support @@ -8,6 +9,7 @@ # add etc/clamd? # add doc/README.CSW, INSTALL.clamav-milter.CSW # check mantis bugs +# + add re for update notification # + add contrib # + add html docs and some pdf:s # + remove *.a, *.la from libs @@ -27,9 +29,12 @@ MASTER_SITES = http://freshmeat.net/redir/clamav/29355/url_tgz/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWlibclamav,) DISTFILES += $(call admfiles,CSWclamav,) -#DISTFILES += $(call admfiles,CSWlibclamav,) +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + GARCOMPILER = GNU GNU_CC_HOME = /opt/csw/gcc3 @@ -43,6 +48,9 @@ include gar/category.mk +PKGFILE_CSWlibclamav_EXCLUSIVE = $(libdir)/.* +PKGFILE_CSWlibclamav_EXCLUSIVE += $(includedir)/.* + SPKG_SOURCEURL = http://www.clamav.net/ pre-package: Modified: csw/mgar/pkg/clamav/trunk/checksums =================================================================== --- csw/mgar/pkg/clamav/trunk/checksums 2008-12-07 12:47:24 UTC (rev 2466) +++ csw/mgar/pkg/clamav/trunk/checksums 2008-12-07 13:33:00 UTC (rev 2467) @@ -1,2 +1,3 @@ 1181e6d62341b84708f126cc353f7ebf download/clamav-0.94.2.tar.gz df9572dc44907a1ceff3561f9b834e20 download/CSWclamav.gspec +6edc8660bde0b27d3676699eacb51884 download/CSWlibclamav.gspec This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Dec 7 16:36:30 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 07 Dec 2008 15:36:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[2468] csw/mgar/pkg/libxml2/trunk/Makefile Message-ID: Revision: 2468 http://gar.svn.sourceforge.net/gar/?rev=2468&view=rev Author: dmichelsen Date: 2008-12-07 15:36:30 +0000 (Sun, 07 Dec 2008) Log Message: ----------- libxml2: Fix PKGFILES for new mGAR v2 syntax Modified Paths: -------------- csw/mgar/pkg/libxml2/trunk/Makefile Modified: csw/mgar/pkg/libxml2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxml2/trunk/Makefile 2008-12-07 13:33:00 UTC (rev 2467) +++ csw/mgar/pkg/libxml2/trunk/Makefile 2008-12-07 15:36:30 UTC (rev 2468) @@ -27,14 +27,14 @@ NO_ISAEXEC = 1 MERGE_EXCLUDE_FILES = .*\.la -PKGFILES_CSWlibxml2devel_EXCLUSIVE = $(PKGFILES_DEVEL) -PKGFILES_CSWlibxml2devel_EXCLUSIVE += $(docdir)/libxml2-$(GARVERSION)/.* -PKGFILES_CSWlibxml2devel_EXCLUSIVE += $(sharedstatedir)/gtk-doc/.* -PKGFILES_CSWlibxml2devel_EXCLUSIVE += $(libdir)/xml2Conf.sh -PKGFILES_CSWlibxml2devel_EXCLUSIVE += $(call isadirs,$(libdir),xml2Conf.sh) +PKGFILES_CSWlibxml2devel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibxml2devel += $(docdir)/libxml2-$(GARVERSION)/.* +PKGFILES_CSWlibxml2devel += $(sharedstatedir)/gtk-doc/.* +PKGFILES_CSWlibxml2devel += $(libdir)/xml2Conf.sh +PKGFILES_CSWlibxml2devel += $(call isadirs,$(libdir),xml2Conf.sh) -PKGFILES_CSWpylibxml2_EXCLUSIVE = $(libdir)/python/.* -PKGFILES_CSWpylibxml2_EXCLUSIVE += $(docdir)/libxml2-python-$(GARVERSION)/.* +PKGFILES_CSWpylibxml2 = $(libdir)/python/.* +PKGFILES_CSWpylibxml2 += $(docdir)/libxml2-python-$(GARVERSION)/.* 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 Sun Dec 7 17:11:54 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 07 Dec 2008 16:11:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[2469] csw/mgar/pkg/jdk6/trunk Message-ID: Revision: 2469 http://gar.svn.sourceforge.net/gar/?rev=2469&view=rev Author: dmichelsen Date: 2008-12-07 16:11:54 +0000 (Sun, 07 Dec 2008) Log Message: ----------- jdk6: Update to u11 Modified Paths: -------------- csw/mgar/pkg/jdk6/trunk/Makefile csw/mgar/pkg/jdk6/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/jdk6/trunk/ Property changes on: csw/mgar/pkg/jdk6/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/jdk6/trunk/Makefile =================================================================== --- csw/mgar/pkg/jdk6/trunk/Makefile 2008-12-07 15:36:30 UTC (rev 2468) +++ csw/mgar/pkg/jdk6/trunk/Makefile 2008-12-07 16:11:54 UTC (rev 2469) @@ -1,6 +1,6 @@ GARNAME = jdk6 -SPKG_VERSION = 1.6.0_10 -GARVERSION = 6u10 +SPKG_VERSION = 1.6.0_11 +GARVERSION = 6u11 CATEGORIES = lang DESCRIPTION = Java Development Kit 6 Modified: csw/mgar/pkg/jdk6/trunk/checksums =================================================================== --- csw/mgar/pkg/jdk6/trunk/checksums 2008-12-07 15:36:30 UTC (rev 2468) +++ csw/mgar/pkg/jdk6/trunk/checksums 2008-12-07 16:11:54 UTC (rev 2469) @@ -1,7 +1,7 @@ -ae351518b83f44f0a947dd0d7be96e15 download/jdk-6u10-solaris-sparc.sh -d1841c956f43bb3a7bf53d7721d82833 download/jdk-6u10-solaris-sparcv9.sh -e31c6cf8ada23cde243656f7ef435ce3 download/jdk-6u10-solaris-i586.sh -c837fbdd49b772255a255802552c8da6 download/jdk-6u10-solaris-x64.sh +ab4534bfca054a3fffebc384390ad54a download/jdk-6u11-solaris-sparc.sh +2f5b20118c85533854720ebbfb428758 download/jdk-6u11-solaris-sparcv9.sh +e460101ca2d718b98a65c432753e9684 download/jdk-6u11-solaris-i586.sh +c103e6c5d4d42a8ab162804a7b01c3c2 download/jdk-6u11-solaris-x64.sh d2ea0d736a7cf088ed9d452f3b1ecb1d download/CSWjdk6.gspec a077039adebc66db2f7316e387ba13eb download/CSWjdk6.depend d085818ed2ca9c777c85b3c9553a41f5 download/CSWjre6.gspec This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Dec 7 17:35:37 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 07 Dec 2008 16:35:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[2470] csw/mgar/pkg/libogg/trunk Message-ID: Revision: 2470 http://gar.svn.sourceforge.net/gar/?rev=2470&view=rev Author: dmichelsen Date: 2008-12-07 16:35:37 +0000 (Sun, 07 Dec 2008) Log Message: ----------- libogg: Update to mGAR v2 Modified Paths: -------------- csw/mgar/pkg/libogg/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/libogg/trunk/ Property changes on: csw/mgar/pkg/libogg/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/libogg/trunk/Makefile =================================================================== --- csw/mgar/pkg/libogg/trunk/Makefile 2008-12-07 16:11:54 UTC (rev 2469) +++ csw/mgar/pkg/libogg/trunk/Makefile 2008-12-07 16:35:37 UTC (rev 2470) @@ -15,8 +15,11 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +BUILD64 = 1 + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check +SKIPTEST = 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 Sun Dec 7 17:45:33 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 07 Dec 2008 16:45:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[2471] csw/mgar/gar/v2 Message-ID: Revision: 2471 http://gar.svn.sourceforge.net/gar/?rev=2471&view=rev Author: dmichelsen Date: 2008-12-07 16:45:33 +0000 (Sun, 07 Dec 2008) Log Message: ----------- mGAR v2: Adjust ISA installation pathes and other fixes Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk csw/mgar/gar/v2/gar.mk csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2008-12-07 16:35:37 UTC (rev 2470) +++ csw/mgar/gar/v2/gar.conf.mk 2008-12-07 16:45:33 UTC (rev 2471) @@ -17,7 +17,6 @@ DOWNLOADDIR ?= download PARTIALDIR ?= $(DOWNLOADDIR)/partial WORKROOTDIR ?= work -#WORKDIR ?= $(WORKROOTDIR)/build-$(ISA) WORKDIR ?= $(WORKROOTDIR)/build-$(MODULATION) COOKIEROOTDIR ?= cookies COOKIEDIR ?= $(COOKIEROOTDIR)/$(MODULATION) @@ -31,8 +30,8 @@ LOGDIR ?= log # Outbound proxies -http_proxy ?= http://svn:8080 -ftp_proxy ?= http://svn:8080 +http_proxy ?= +ftp_proxy ?= export http_proxy ftp_proxy # Don't do full-dependency builds by default @@ -41,10 +40,10 @@ # A directory containing cached files. It can be created # manually, or with 'make garchive' once you've started # downloading required files (say with 'make paranoid-checksum'. -GARCHIVEDIR ?= /export/medusa/src +GARCHIVEDIR ?= /home/src # Space separated list of paths to search for DISTFILES. -GARCHIVEPATH ?= /export/medusa/src +GARCHIVEPATH ?= $(GARCHIVEDIR) # Select compiler # GARCOMPILER can be either GNU/SUN which selects the default @@ -78,30 +77,34 @@ # These are the standard directory name variables from all GNU # makefiles. They're also used by autoconf, and can be adapted # for a variety of build systems. -BUILD_PREFIX ?= /opt/csw +BUILD_PREFIX ?= /opt/csw -prefix ?= $(BUILD_PREFIX) -exec_prefix ?= $(prefix) -bindir ?= $(exec_prefix)/bin -gnudir ?= $(exec_prefix)/gnu -sbindir ?= $(exec_prefix)/sbin -libexecdir ?= $(exec_prefix)/libexec -datadir ?= $(prefix)/share -sysconfdir ?= $(prefix)/etc -sharedstatedir ?= $(prefix)/share -localstatedir ?= $(prefix)/var -libdir ?= $(exec_prefix)/lib -infodir ?= $(sharedstatedir)/info -lispdir ?= $(sharedstatedir)/emacs/site-lisp -includedir ?= $(prefix)/include -mandir ?= $(sharedstatedir)/man -docdir ?= $(sharedstatedir)/doc -sourcedir ?= $(prefix)/src -licensedir ?= $(prefix)/licenses -sharedperl ?= $(sharedstatedir)/perl -perllib ?= $(libdir)/perl -perlcswlib ?= $(perllib)/csw -perlpackroot ?= $(perlcswlib)/auto +prefix ?= $(BUILD_PREFIX) +exec_prefix ?= $(prefix) +bindir_install ?= $(exec_prefix)/bin +bindir ?= $(abspath $(bindir_install)/$(MM_BINDIR)) +gnudir ?= $(exec_prefix)/gnu +sbindir_install ?= $(exec_prefix)/sbin +sbindir ?= $(abspath $(sbindir_install)/$(MM_BINDIR)) +libexecdir_install ?= $(exec_prefix)/libexec +libexecdir ?= $(abspath $(libexecdir_install)/$(MM_BINDIR)) +datadir ?= $(prefix)/share +sysconfdir ?= $(prefix)/etc +sharedstatedir ?= $(prefix)/share +localstatedir ?= $(prefix)/var +libdir_install ?= $(exec_prefix)/lib +libdir ?= $(abspath $(libdir_install)/$(MM_LIBDIR)) +infodir ?= $(sharedstatedir)/info +lispdir ?= $(sharedstatedir)/emacs/site-lisp +includedir ?= $(prefix)/include +mandir ?= $(sharedstatedir)/man +docdir ?= $(sharedstatedir)/doc +sourcedir ?= $(prefix)/src +licensedir ?= $(prefix)/licenses +sharedperl ?= $(sharedstatedir)/perl +perllib ?= $(libdir)/perl +perlcswlib ?= $(perllib)/csw +perlpackroot ?= $(perlcswlib)/auto # DESTDIR is used at INSTALL TIME ONLY to determine what the # filesystem root should be. @@ -415,14 +418,16 @@ # the links 32 and 64. ifeq ($(origin LINKER_FLAGS), undefined) ifdef NOISALIST -LINKER_FLAGS = $(foreach ELIB,$(libdir) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR)) -R$(abspath $(ELIB)/$(MM_LIBDIR)) +LINKER_FLAGS = $(foreach ELIB,$(libdir_install) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR)) -R$(abspath $(ELIB)/$(MM_LIBDIR)) else # If we use $ISALIST it is a good idea to also add $MM_LIBDIR as there # may not be a subdirectory for the 32-bit standard case (this would normally # be a symlink of the form lib/sparcv8 -> . and lib/i386 -> .). This is most likely # the case for libraries in $(EXTRA_LIBS) for which no links generated in CSWcommon. -LINKER_FLAGS = $(foreach ELIB,$(libdir) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR)) -R$(ELIB)/\\\\\\\$$\$$ISALIST -R$(abspath $(ELIB)/$(MM_LIBDIR))) -#LINKER_FLAGS = $(foreach ELIB,$(libdir) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR)) -R'$(abspath $(ELIB)/\$$ISALIST)' -R$(abspath $(ELIB)/$(MM_LIBDIR))) +# The quoting of $ISALIST is unfortunately dependend on how often the linker flags +# are expanded until execution. The definition here is suitable for autotools. +# For other buildtools it may be suitable to add definitions with other quotings. +LINKER_FLAGS = $(foreach ELIB,$(libdir_install) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR)) -R$(ELIB)/\\\\\\\$$\$$ISALIST -R$(abspath $(ELIB)/$(MM_LIBDIR))) endif endif @@ -454,12 +459,11 @@ # 1. Make sure everything works fine for SOS12 # 2. Allow us to use programs we just built. This is a bit complicated, # but we want PATH to be a recursive variable, or 'gmake isaenv' won't work -PATH = $(if $(filter SOS12,$(GARCOMPILER)),$(abspath $(GARBIN)/sos12-wrappers):)$(if $(IGNORE_DESTDIR),,$(abspath $(DESTDIR)$(bindir)/$(MM_BINDIR)):$(DESTDIR)$(bindir):$(abspath $(DESTDIR)$(sbindir)/$(MM_BINDIR)):$(DESTDIR)$(sbindir):)$(abspath $(bindir)/$(MM_BINDIR)):$(bindir):$(abspath $(sbindir)/$(MM_BINDIR)):$(sbindir):$(CC_HOME)/bin:$(abspath $(GARBIN)):/usr/bin:/usr/sbin:/usr/java/bin:/usr/ccs/bin +PATH = $(if $(filter SOS12,$(GARCOMPILER)),$(abspath $(GARBIN)/sos12-wrappers):)$(if $(IGNORE_DESTDIR),,$(abspath $(DESTDIR)$(bindir_install)/$(MM_BINDIR)):$(DESTDIR)$(bindir_install):$(abspath $(DESTDIR)$(sbindir_install)/$(MM_BINDIR)):$(DESTDIR)$(sbindir_install):)$(abspath $(bindir_install)/$(MM_BINDIR)):$(bindir_install):$(abspath $(sbindir_install)/$(MM_BINDIR)):$(sbindir_install):$(CC_HOME)/bin:$(abspath $(GARBIN)):/usr/bin:/usr/sbin:/usr/java/bin:/usr/ccs/bin # This is for foo-config chaos -#PKG_CONFIG_PATH := $(abspath $(libdir)/$(MM_LIBDIR)/pkgconfig):$(libdir)/pkgconfig:$(PKG_CONFIG_PATH) -PKG_CONFIG_DIRS ?= $(libdir) $(EXTRA_PKG_CONFIG_DIRS) -PKG_CONFIG_PATH ?= $(foreach D,$(PKG_CONFIG_DIRS),$(abspath $D/$(MM_LIBDIR)/pkgconfig)) +PKG_CONFIG_DIRS ?= $(libdir_install) $(EXTRA_PKG_CONFIG_DIRS) +PKG_CONFIG_PATH ?= $(call MAKEPATH,$(foreach D,$(PKG_CONFIG_DIRS),$(abspath $D/$(MM_LIBDIR)/pkgconfig)) $(EXTRA_PKGCONFIG_PATH)) # # Mirror Sites @@ -521,6 +525,9 @@ COMMON_EXPORTS ?= $(DIRECTORY_EXPORTS) $(COMPILER_EXPORTS) $(GARPKG_EXPORTS) $(EXTRA_COMMON_EXPORTS) +# LD_OPTIONS = $(LINKER_FLAGS) +# COMMON_EXPORTS += LD_OPTIONS + CONFIGURE_EXPORTS ?= $(COMMON_EXPORTS) $(EXTRA_CONFIGURE_EXPORTS) PKG_CONFIG_PATH DESTDIR BUILD_EXPORTS ?= $(COMMON_EXPORTS) $(EXTRA_BUILD_EXPORTS) TEST_EXPORTS ?= $(COMMON_EXPORTS) $(EXTRA_TEST_EXPORTS) @@ -531,6 +538,7 @@ TEST_ENV ?= $(foreach TTT,$(TEST_EXPORTS),$(TTT)="$($(TTT))") INSTALL_ENV ?= $(foreach TTT,$(INSTALL_EXPORTS),$(TTT)="$($(TTT))") + # Standard Scripts CONFIGURE_SCRIPTS ?= $(WORKSRC)/configure BUILD_CHECK_SCRIPTS ?= modulated-check @@ -544,7 +552,8 @@ INSTALL_SCRIPTS ?= $(WORKSRC)/Makefile # Global environment -export PATH PKG_CONFIG_PATH +#export PATH PKG_CONFIG_PATH +export PATH # prepend the local file listing FILE_SITES = $(foreach DIR,$(FILEDIR) $(GARCHIVEPATH),file://$(DIR)/) @@ -599,11 +608,11 @@ _isaenv: @echo; \ echo "* ISA $(ISA)"; \ - echo " PATH = $(PATH)"; \ - echo " CFLAGS = $(CFLAGS)"; \ - echo " CXXFLAGS = $(CXXFLAGS)"; \ - echo " CPPFLAGS = $(CPPFLAGS)"; \ - echo " LDFLAGS = $(LDFLAGS)"; \ - #echo " LD_OPTIONS = $(LD_OPTIONS)"; \ - echo " ASFLAGS = $(ASFLAGS)"; \ - echo " OPTFLAGS = $(OPTFLAGS)" + echo " PATH = $(PATH)"; \ + echo "PKG_CONFIG_PATH = $(PKG_CONFIG_PATH)"; \ + echo " CFLAGS = $(CFLAGS)"; \ + echo " CXXFLAGS = $(CXXFLAGS)"; \ + echo " CPPFLAGS = $(CPPFLAGS)"; \ + echo " LDFLAGS = $(LDFLAGS)"; \ + echo " ASFLAGS = $(ASFLAGS)"; \ + echo " OPTFLAGS = $(OPTFLAGS)" Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2008-12-07 16:35:37 UTC (rev 2470) +++ csw/mgar/gar/v2/gar.mk 2008-12-07 16:45:33 UTC (rev 2471) @@ -546,6 +546,24 @@ # Replace files by itself terminating on first match _INC_EXT_RULE += $(foreach F,$(_MERGE_INCLUDE_FILES),-s ",^\(\.$F\)\$,\1,") +# These are used during merge phase to determine the base installation directory +MERGEBASE_$(bindir) ?= $(bindir_install) +MERGEBASE_$(sbindir) ?= $(sbindir_install) +MERGEBASE_$(libexecdir) ?= $(libexecdir_install) +MERGEBASE_$(libdir) ?= $(libdir_install) + +define mergebase +$(if $(MERGEBASE_$(1)),$(MERGEBASE_$(1)),$(1)) +endef + +# A package is compiled for the pathes defined in $(bindir), $(libdir), etc. +# These may not be the standard pathes, because specific ISA compilation +# could have appended e. g. /64 for .pc-pathes to be correct. Anyway these +# pathes may need to be rewritten e. g. from lib/64 to lib/amd64. Here, +# $(libdir) has the memorymodel-directory appended, whereas $(libdir_install) +# has not, so we use this one for appending. + + _PAX_ARGS = $(_INC_EXT_RULE) $(EXTRA_PAX_ARGS) # The basic merge merges the compiles for all ISAs on the current architecture @@ -558,13 +576,15 @@ # Copy the whole tree verbatim merge-copy-all: $(PKGROOT) $(INSTALLISADIR) - @(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) . $(PKGROOT)) + @(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \ + $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/,p") \ + . $(PKGROOT)) @$(MAKECOOKIE) # Copy only the merge directories merge-copy-only: $(PKGROOT) @(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \ - $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),\1,p") -s ",.*,," \ + $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/,p") -s ",.*,," \ . $(PKGROOT) \ ) @$(MAKECOOKIE) @@ -572,7 +592,7 @@ # Copy the whole tree and relocate the directories in $(MERGE_DIRS) merge-copy-relocate: $(PKGROOT) $(INSTALLISADIR) @(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \ - $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),\1$(ISA)/,p") \ + $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/$(ISA)/,p") \ . $(PKGROOT) \ ) @$(MAKECOOKIE) @@ -580,7 +600,7 @@ # Copy only the relocated directories merge-copy-relocated-only: $(PKGROOT) $(INSTALLISADIR) @(cd $(INSTALLISADIR); pax -r -w -v $(_PAX_ARGS) \ - $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),\1$(ISA)/,p") -s ",.*,," \ + $(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call mergebase,$(DIR))/$(ISA)/,p") -s ",.*,," \ . $(PKGROOT) \ ) @$(MAKECOOKIE) Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2008-12-07 16:35:37 UTC (rev 2470) +++ csw/mgar/gar/v2/gar.pkg.mk 2008-12-07 16:45:33 UTC (rev 2471) @@ -132,6 +132,9 @@ # This can be used to automatically distribute the files to different packages # +$(foreach SPEC,$(_PKG_SPECS),$(eval _PROTOTYPE_FILTER_$(SPEC) ?= | $(PROTOTYPE_FILTER_$(SPEC)))) +$(foreach SPEC,$(_PKG_SPECS),$(eval _PROTOTYPE_FILTER_$(SPEC) ?= | $(PROTOTYPE_FILTER))) + # This file contains all installed pathes. This can be used as a starting point # for distributing files to individual packages. PROTOTYPE = $(WORKDIR)/prototype @@ -154,14 +157,19 @@ ) \ <$(PROTOTYPE); \ if [ -n "$(EXTRA_PKGFILES_$*)" ]; then echo "$(EXTRA_PKGFILES_$*)"; fi \ - ) >$@; \ + ) $(_PROTOTYPE_FILTER_$*) >$@; \ else \ - cp $(PROTOTYPE) $@; \ + cat $(PROTOTYPE) $(_PROTOTYPE_FILTER_$*) >$@; \ fi $(WORKDIR)/%.prototype-$(GARCH): | $(WORKDIR)/%.prototype - @cp $(WORKDIR)/$*.prototype $@ + @cat $(WORKDIR)/$*.prototype $(_PROTOTYPE_FILTER_$*) >$@ +# This is a target used to generate all prototypes for debugging purposes. +# On a normal packaging workflow this is not used. +prototypes: extract merge $(SPKG_DESTDIRS) pre-package $(foreach S,$(_PKG_SPECS),$(WORKDIR)/$S.prototype-$(GARCH)) + @$(DONADA) + # $_EXTRA_GAR_PKGS is for dynamic dependencies added by GAR itself (like CSWisaexec or CSWcswclassutils) .PRECIOUS: $(WORKDIR)/%.depend $(WORKDIR)/%.depend: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Dec 7 17:46:25 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 07 Dec 2008 16:46:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[2472] csw/mgar/gar/v1/gar.pkg.mk Message-ID: Revision: 2472 http://gar.svn.sourceforge.net/gar/?rev=2472&view=rev Author: dmichelsen Date: 2008-12-07 16:46:25 +0000 (Sun, 07 Dec 2008) Log Message: ----------- mGAR v1: First commit towards source packages Modified Paths: -------------- csw/mgar/gar/v1/gar.pkg.mk Modified: csw/mgar/gar/v1/gar.pkg.mk =================================================================== --- csw/mgar/gar/v1/gar.pkg.mk 2008-12-07 16:45:33 UTC (rev 2471) +++ csw/mgar/gar/v1/gar.pkg.mk 2008-12-07 16:46:25 UTC (rev 2472) @@ -199,3 +199,14 @@ pkglist: @echo "G: $(GARDIR) - $(shell pwd) - $(realpath $(shell pwd)/$(GARDIR)) - $(realpath .)" @$(foreach SPEC,$(SPKG_SPECS),echo "$(call _pkglist_one,$(SPEC))";) + +srcpack: + @echo "*** Files" + @$(foreach S,$(SPKG_SPECS),echo "Spec $S";$(foreach F,$(filter $S.%,$(DISTFILES)),echo " $F";)) + @$(foreach F,$(filter-out $(foreach S,$(SPKG_SPECS),$S.%),$(DISTFILES)),echo "File $F";) + @$(foreach P,$(PATCHFILES),echo "Patch $P";) + + @echo + @echo "*** Dependencies" + + @$(foreach P,$(PREREQUISITE_PKGS),echo "$P";) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Dec 7 18:33:28 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 07 Dec 2008 17:33:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[2473] csw/mgar/pkg/xmlstarlet/trunk Message-ID: Revision: 2473 http://gar.svn.sourceforge.net/gar/?rev=2473&view=rev Author: dmichelsen Date: 2008-12-07 17:33:28 +0000 (Sun, 07 Dec 2008) Log Message: ----------- xmlstarlet: Update to mGAR v2 Modified Paths: -------------- csw/mgar/pkg/xmlstarlet/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/xmlstarlet/trunk/files/CSWxmlstarlet.depend csw/mgar/pkg/xmlstarlet/trunk/files/CSWxmlstarlet.prototype Property Changed: ---------------- csw/mgar/pkg/xmlstarlet/trunk/ Property changes on: csw/mgar/pkg/xmlstarlet/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/xmlstarlet/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlstarlet/trunk/Makefile 2008-12-07 16:46:25 UTC (rev 2472) +++ csw/mgar/pkg/xmlstarlet/trunk/Makefile 2008-12-07 17:33:28 UTC (rev 2473) @@ -14,8 +14,10 @@ SF_PROJ = xmlstar MASTER_SITES += $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWxmlstarlet,depend prototype) +DISTFILES += $(call admfiles,CSWxmlstarlet,) +REQUIRED_PKGS = CSWgcrypt CSWggettext CSWgpgerr CSWiconv CSWlibxml2 CSWlibxslt CSWzlib + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Deleted: csw/mgar/pkg/xmlstarlet/trunk/files/CSWxmlstarlet.depend =================================================================== --- csw/mgar/pkg/xmlstarlet/trunk/files/CSWxmlstarlet.depend 2008-12-07 16:46:25 UTC (rev 2472) +++ csw/mgar/pkg/xmlstarlet/trunk/files/CSWxmlstarlet.depend 2008-12-07 17:33:28 UTC (rev 2473) @@ -1,7 +0,0 @@ -P CSWgcrypt libgcrypt - GNU libcrypt -P CSWggettext ggettext - GNU gettext -P CSWgpgerr libgpg_error - GNU gpg related library -P CSWiconv libiconv - GNU iconv library -P CSWlibxml2 libxml2 - XML Parser Library -P CSWlibxslt libxslt - XSLT engine for the XML Toolkit -P CSWzlib zlib - Zlib Data Compression Library Deleted: csw/mgar/pkg/xmlstarlet/trunk/files/CSWxmlstarlet.prototype =================================================================== --- csw/mgar/pkg/xmlstarlet/trunk/files/CSWxmlstarlet.prototype 2008-12-07 16:46:25 UTC (rev 2472) +++ csw/mgar/pkg/xmlstarlet/trunk/files/CSWxmlstarlet.prototype 2008-12-07 17:33:28 UTC (rev 2473) @@ -1,9 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/xmlstarlet 0755 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man1 0755 root bin -f none /opt/csw/share/man/man1/xmlstarlet.1 0644 root bin -i copyright=CSWxmlstarlet.copyright -i depend=CSWxmlstarlet.depend -i pkginfo=CSWxmlstarlet.pkginfo This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Dec 7 23:31:33 2008 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 07 Dec 2008 22:31:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[2474] csw/mgar/pkg/openssl/trunk Message-ID: Revision: 2474 http://gar.svn.sourceforge.net/gar/?rev=2474&view=rev Author: chninkel Date: 2008-12-07 22:31:33 +0000 (Sun, 07 Dec 2008) Log Message: ----------- openssl: update to mGAR v2 Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile csw/mgar/pkg/openssl/trunk/checksums csw/mgar/pkg/openssl/trunk/files/CSWossl.gspec csw/mgar/pkg/openssl/trunk/files/changelog.CSW csw/mgar/pkg/openssl/trunk/files/i.conf csw/mgar/pkg/openssl/trunk/files/oldlibs.0.9.7m-sparc.tar.gz csw/mgar/pkg/openssl/trunk/files/openssl.0.9.8.patch csw/mgar/pkg/openssl/trunk/files/r.conf Added Paths: ----------- csw/mgar/pkg/openssl/trunk/files/certs.tar.gz Removed Paths: ------------- csw/mgar/pkg/openssl/trunk/checksums.0.9.7m Property Changed: ---------------- csw/mgar/pkg/openssl/trunk/ Property changes on: csw/mgar/pkg/openssl/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2008-12-07 17:33:28 UTC (rev 2473) +++ csw/mgar/pkg/openssl/trunk/Makefile 2008-12-07 22:31:33 UTC (rev 2474) @@ -1,29 +1,5 @@ -# Beware, this Makefile is complex because: -# - we must also build and include in the package the -# libraries of the previous version for comptability reason -# -# - we also build optimized libraries (amd64, pentium_pro, sparcv9, ...) -# -# -# On x86, amd64 libraries/binaries must be build on Solaris 10 whereas the -# other ones must be built on Solaris 8, so the packaging process must be -# split in two steps and must use a nfs shared directory. -# -# - first, on Solaris 10, build only the amd64 optimized binaries/libraries: -# -# gmake COOKIEROOTDIR="$NFS_SHARED_DIR/cookie" DESTROOT="$NFS_SHARED_DIR" DESTIMG=$LOGNAME-$HOST8 GAROSREL=5.8 ISA=amd64 install-libs install-bin -# -# - then on solaris 8, finish the build and packaging process: -# -# gmake COOKIEROOTDIR="$NFS_SHARED_DIR/cookie" DESTROOT="$NFS_SHARED_DIR" package -# -# NFS_SHARED_DIR is the path of the directory nfs shared between the solaris 10 -# and the solaris 8 host -# HOST8 is the hostname of the Solaris 8 host -# -# GARNAME = openssl -GARVERSION = 0.9.8g +GARVERSION = 0.9.8i CATEGORIES = lib OPENSSL_VERSION := $(shell echo $(GARVERSION) | sed -e 's/[a-z]//g') @@ -53,25 +29,24 @@ SPKG_CLASSES = none conf -# We will include the following previous versions of libraries -# for comptatibility reasons -OLDLIBS = 0.9.7m -DISTFILES += oldlibs.list.0.9.7m-i386 -DISTFILES += oldlibs.list.0.9.7m-sparc -0.9.7m_i386_ISALIST = pentium_pro -0.9.7m_sparc_ISALIST = sparcv8plus+vis sparcv9 - PATCHFILES = openssl.$(OPENSSL_VERSION).patch +GARCOMPILER = SOS11 + # The list of instructions set for which we will # provide optimized libraries and binaries -i386_ISALIST = pentium_pro amd64 -sparc_ISALIST = sparcv8plus+vis sparcv9 +EXTRA_BUILD_ISAS_i386 = pentium_pro amd64 +EXTRA_BUILD_ISAS_sparc = sparcv8plus+vis sparcv9 -ifdef OLDLIB -i386_ISALIST = pentium_pro -endif +# we don't yet use isaexec support so we disable +# isa relocation for default isa +NO_ISAEXEC = 1 +#ISA_RELOCATE_DIRS_i386 = +#ISA_RELOCATE_DIRS_sparcv8 = +# we redefine the default merge exclude so *.a files are not excluded +MERGE_EXCLUDE_DEFAULT = $(MERGE_EXCLUDE_INFODIR) + # The corresponding os/compiler to pass to the # openssl Configure script i386_OS_COMPILER = solaris-386-cc @@ -79,104 +54,39 @@ pentium_pro_OS_COMPILER = solaris-pentium_pro-cc amd64_OS_COMPILER = solaris64-x86_64-cc -sparc_OS_COMPILER = solaris-sparcv8-cc +sparcv8_OS_COMPILER = solaris-sparcv8-cc sparcv8plus_OS_COMPILER = solaris-sparcv9-cc sparcv8plus+vis_OS_COMPILER = solaris-sparcv9+vis-cc sparcv9_OS_COMPILER = solaris64-sparcv9-cc -# Let's determine the appropriate os/compiler couple -# to pass to the openssl Configure script -ifndef ISA -OS_COMPILER = $($(GARCH)_OS_COMPILER) -else -OS_COMPILER = $($(ISA)_OS_COMPILER) -endif +CONFIGURE_ARGS = --prefix=$(prefix) shared $($(ISA)_OS_COMPILER) --install_prefix=$(DESTDIR) -CONFIGURE_ARGS = --prefix=$(prefix) shared $(OS_COMPILER) --install_prefix=$(DESTDIR) - # We want the csw perl to be used #CONFIGURE_ENV += PERL="/opt/csw/bin/perl" # For now we want the sun perl to be used CONFIGURE_ENV += PERL="/usr/bin/perl" +# Some optimization EXT_CFLAGS += -mt -xstrconst EXT_CXXFLAGS += -noex -mt -# + # By default, the install target put man pages under # /opt/csw/ssl/man, but we want them under /opt/csw/share/man INSTALL_ARGS += MANDIR=$(mandir) -POST_INSTALL_TARGETS := striplib +# we include previous release of libraries file for comptability purpose +OLDLIBS = 0.9.7m -######################################################################### -# Makefile instructions to handle additional optimized libraries and binaries (part I) -# -# To enable optimized libraries/binaries: -# - define the i386_ISALIST and sparc_ISALIST with the instructions -# sets additionnal binaries and librairies should be optimized for -# - define the install-libs and install-bin targets which should -# install binaries and libraries in $(bindir)/$(ISA) and $(libdir)/$(ISA) -# -# To just build the non-optimized binaries/libraries: -# gmake ISALIST="" build -# -# To just build specific optimized binaries/libraries: -# gmake ISA=instruction_set build -# -# This code could be added in the common gar scripts. -# -######################################################################### +SKIPTEST = 1 -ifndef ISA -ISALIST=$($(GARCH)_ISALIST) -ifdef ISALIST -CONFIGURE_SCRIPTS = $(WORKSRC)/configure isa -BUILD_SCRIPTS = $(WORKSRC)/Makefile isa -INSTALL_SCRIPTS = $(WORKSRC)/Makefile isa -TEST_SCRIPTS = $(WORKSRC)/Makefile isa -CLEAN_SCRIPTS = all isa -endif -else -# We want a separate work and cookie directory -# for each optimized build -WORKDIR = $(WORKROOTDIR)/$(DESTIMG).$(ISA).d -COOKIEDIR = $(COOKIEROOTDIR)/$(DESTIMG).$(ISA).d -endif - -######################################################################### - -######################################################################### -# Makefile instructions to handle old libraries inclusion (part I) -# -# This should rather be handled by making a distinct package for each -# incompatible library version. -######################################################################### - -ifdef OLDLIB -CHECKSUM_FILE = checksums.$(GARVERSION) -ifdef ISA -WORKDIR = $(WORKROOTDIR)/$(DESTIMG).$(ISA).$(GARVERSION).d -COOKIEDIR = $(COOKIEROOTDIR)/$(DESTIMG).$(ISA).$(GARVERSION).d -else -WORKDIR = $(WORKROOTDIR)/$(DESTIMG).$(GARVERSION).d -COOKIEDIR = $(COOKIEROOTDIR)/$(DESTIMG).$(GARVERSION).d -endif -endif - -ifdef OLDLIBS -ifndef ISA -INSTALL_SCRIPTS += oldlibs -endif -endif - -######################################################################### - - include gar/category.mk +# we redefine the timestamp to fulfill opencsw standard +SPKG_VERSION := $(OPENSSL_VERSION) SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(OPENSSL_RELEASE) -pre-configure: + +pre-configure-modulated: echo " ==> Creating configure script" cd $(WORKSRC) && ln -nf Configure configure $(MAKECOOKIE) @@ -184,104 +94,21 @@ # we remove every debug information except symbol table # (should rather be done in the gar scripts) striplib: - chmod -R u+w $(DESTDIR)$(libdir) - strip -x $(DESTDIR)$(libdir)/*.so* - ( for ISA in $($(GARCH)_ISALIST); do \ - strip -x $(DESTDIR)$(libdir)/$$ISA/*.so*; \ - done ) - chmod -R u+w $(DESTDIR)$(libdir)/engines - strip -x $(DESTDIR)$(libdir)/engines/*.so* + chmod -R u+w $(PKGROOT)$(libdir) + find $(PKGROOT)$(libdir) -name "*.so*" -exec strip -x '{}' ';' -post-install: - [ -f $(DESTDIR)$(prefix)/ssl/openssl.cnf ] && \ - ginstall -D $(DESTDIR)$(prefix)/ssl/openssl.cnf $(DESTDIR)$(sysconfdir)/ssl/openssl.cnf - cp -r $(WORKSRC)/certs/* $(DESTDIR)$(prefix)/ssl/certs +install-certs: + [ -f $(PKGROOT)$(prefix)/ssl/openssl.cnf ] && \ + ginstall -D $(PKGROOT)$(prefix)/ssl/openssl.cnf $(PKGROOT)$(sysconfdir)/ssl/openssl.cnf + gunzip --stdout $(CURDIR)/$(FILEDIR)/certs.tar.gz | (cd $(PKGROOT)$(prefix)/ssl/certs && tar xf -) + cp -r $(WORKSRC)/certs/* $(PKGROOT)$(prefix)/ssl/certs + OPENSSL=$(PKGROOT)/$(bindir)/openssl $(PKGROOT)/$(bindir)/c_rehash $(PKGROOT)/$(prefix)/ssl/certs/ $(MAKECOOKIE) - -# These targets are required to provide optimized binaries/libraries - -install-libs: install-static-libs install-dynamic-libs - -install-static-libs: build - @if test ! -f "$(COOKIEDIR)/install-static-libs"; then \ - echo " ==> Installing libraries from $(WORKSRC)"; \ - ginstall -d $(DESTDIR)$(libdir)/$(ISA); \ - cd $(WORKSRC) && ginstall libcrypto.a libssl.a $(DESTDIR)$(libdir)/$(ISA); \ - $(MAKECOOKIE); \ - fi - -install-dynamic-libs: build - @if test ! -f $(COOKIEDIR)/install-dynamic-libs; then \ - echo " ==> Installing libraries from $(WORKSRC)"; \ - ginstall -d $(DESTDIR)$(libdir)/$(ISA); \ - cd $(WORKSRC) && ginstall libcrypto.so.$(OPENSSL_VERSION) libssl.so.$(OPENSSL_VERSION) $(DESTDIR)$(libdir)/$(ISA); \ - $(MAKECOOKIE); \ - fi - -install-bin: build - @if test ! -f $(COOKIEDIR)/install-bin; then \ - echo " ==> Installing binaries from $(WORKSRC)"; \ - ginstall -d $(DESTDIR)$(bindir)/$(ISA); \ - cd $(WORKSRC) && ginstall apps/openssl $(DESTDIR)$(bindir)/$(ISA); \ - $(MAKECOOKIE); \ - fi - - - -######################################################################### -# Makefile instructions to handle additional optimized libraries and binaries (part II) -# -######################################################################### - -configure-isa: $(addprefix configure-isa-,$(ISALIST)) -configure-isa-%: - @$(MAKE) ISA=$* configure - -build-isa: $(addprefix build-isa-,$(ISALIST)) -build-isa-%: - @$(MAKE) ISA=$* build - -test-isa: $(addprefix test-isa-,$(ISALIST)) -test-isa-%: - @$(MAKE) ISA=$* test - -install-isa: $(addprefix install-isa-,$(ISALIST)) -install-isa-%: - @$(MAKE) ISA=$* test install-libs install-bin - -clean-isa: $(addprefix clean-isa-,$(ISALIST)) -clean-isa-%: - @$(MAKE) ISA=$* clean - -######################################################################### -# Makefile instructions to handle old libraries inclusion (part II) -# -# This should rather be handled by making a distinct package for each -# incompatible library version. -######################################################################### - -update-oldlibs-archive: $(addprefix update-oldlibs-archive-,$(OLDLIBS)) -update-oldlibs-archive-%: clean-oldlibs-archive-% install-oldlibs-% - @echo " ==> Creating old libraries archive oldlibs.$*-$(GARCH).tar.gz" - @cd $(DESTDIR) && tar cvf - `cat $(CURDIR)/$(DOWNLOADDIR)/oldlibs.list.$*-$(GARCH)` | gzip > $(CURDIR)/$(FILEDIR)/oldlibs.$*-$(GARCH).tar.gz - -clean-oldlibs-archive: $(addprefix clean-oldlibs-archive,$(OLDLIBS)) -clean-oldlibs-archive-%: - @echo " ==> Removing old libraries archive oldlibs.$*-$(GARCH).tar.gz" - @rm -f $(FILEDIR)/oldlibs.$*-$(GARCH).tar.gz - @rm -f $(COOKIEDIR)/install-oldlibs* - install-oldlibs: $(addprefix install-oldlibs-,$(OLDLIBS)) -install-oldlibs-%: - @if [ -f $(FILEDIR)/oldlibs.$*-$(GARCH).tar.gz ]; then \ - echo " ==> Installing old libraries $* from existing old libraries archive oldlibs.$*-$(GARCH).tar.gz"; \ - cd $(DESTDIR) && gunzip -c $(CURDIR)/$(FILEDIR)/oldlibs.$*-$(GARCH).tar.gz | tar xvf -; \ - else \ - echo " ==> Build old libraries $*"; \ - $(MAKE) GARVERSION=$* OLDLIB=1 build; \ - for ISA in "" $($(*)_$(GARCH)_ISALIST); do \ - $(MAKE) GARVERSION=$* OLDLIB=1 ISA=$$ISA install-dynamic-libs; \ - done; \ - fi - @$(MAKECOOKIE) +install-oldlibs-%: + echo " ==> Installing old libraries $* from archive oldlibs.$*-$(GARCH).tar.gz"; \ + cd $(PKGROOT) && gunzip -c $(CURDIR)/$(FILEDIR)/oldlibs.$*-$(GARCH).tar.gz | tar xvf - && \ + $(MAKECOOKIE) + +pre-package: striplib install-certs install-oldlibs Modified: csw/mgar/pkg/openssl/trunk/checksums =================================================================== --- csw/mgar/pkg/openssl/trunk/checksums 2008-12-07 17:33:28 UTC (rev 2473) +++ csw/mgar/pkg/openssl/trunk/checksums 2008-12-07 22:31:33 UTC (rev 2474) @@ -1,5 +1,5 @@ -acf70a16359bf3658bdfb74bda1c4419 download/openssl-0.9.8g.tar.gz -3b17df33844577c449027ef309157fe7 download/CSWossl.gspec +561e00f18821c74b2b86c8c7786f9d8b download/openssl-0.9.8i.tar.gz +bc7aa9d2ea44e9ac28b11db12402024e download/CSWossl.gspec 05b45e7124833dee48e5f3c45591e95b download/CSWossl.depend 7fe01ca4ef9d0e971d57b00f4d0b168b download/CSWossl.prototype cf0fa997cc719009991e67b4264caeed download/CSWosslrt.gspec @@ -14,9 +14,7 @@ 0d55e4c93c94a1a72fb295d0ee6225d4 download/CSWosslutils.gspec 37995caa7f4155066b00fb7503e853da download/CSWosslutils.depend 6e0c86ddc23d044757810cca6f31f017 download/CSWosslutils.prototype -f49c762973d9955b310be948900de148 download/changelog.CSW -9b2ae27f98333b73ff2b16ed98ee896a download/i.conf -5d9e9fb1a5b6af82ce915f72ebc5e3b7 download/r.conf -1b1b1aa37d3827f03320dc7c6b2d54ae download/oldlibs.list.0.9.7m-i386 -ba0db139be0aeecdce5668d2de475a4d download/oldlibs.list.0.9.7m-sparc -a6475f97d8b1152e06679ba6ec463536 download/openssl.0.9.8.patch +e3f149dea30df046b9042a69639bcf3b download/changelog.CSW +7fdc09cd3c11db459c83c8946f7872f6 download/i.conf +a454ac09091085813ec8900f5a0c917c download/r.conf +64f7c3f3a6cae483209b69c31c82557d download/openssl.0.9.8.patch Deleted: csw/mgar/pkg/openssl/trunk/checksums.0.9.7m =================================================================== --- csw/mgar/pkg/openssl/trunk/checksums.0.9.7m 2008-12-07 17:33:28 UTC (rev 2473) +++ csw/mgar/pkg/openssl/trunk/checksums.0.9.7m 2008-12-07 22:31:33 UTC (rev 2474) @@ -1,22 +0,0 @@ -74a4d1b87e1e6e1ec95dbe58cb4c5b9a download/openssl-0.9.7m.tar.gz -3b17df33844577c449027ef309157fe7 download/CSWossl.gspec -05b45e7124833dee48e5f3c45591e95b download/CSWossl.depend -7fe01ca4ef9d0e971d57b00f4d0b168b download/CSWossl.prototype -cf0fa997cc719009991e67b4264caeed download/CSWosslrt.gspec -78c26f65b14f3ebf4a29069a3f675285 download/CSWosslrt.checkinstall -d41d8cd98f00b204e9800998ecf8427e download/CSWosslrt.depend -cba143e52cb08dd3ee39f275aefa075d download/CSWosslrt.prototype-i386 -ceeb4a59f1c31ae4deac9f2b61dadca2 download/CSWosslrt.prototype-sparc -1791edde7bf1bce62ac799852459dc47 download/CSWossldevel.gspec -37995caa7f4155066b00fb7503e853da download/CSWossldevel.depend -45161ff3a5b00fd6942f63b77c0b0ed1 download/CSWossldevel.prototype-i386 -7b1dd2e8c78b033ca2a8be4de097b147 download/CSWossldevel.prototype-sparc -0d55e4c93c94a1a72fb295d0ee6225d4 download/CSWosslutils.gspec -37995caa7f4155066b00fb7503e853da download/CSWosslutils.depend -6e0c86ddc23d044757810cca6f31f017 download/CSWosslutils.prototype -f49c762973d9955b310be948900de148 download/changelog.CSW -9b2ae27f98333b73ff2b16ed98ee896a download/i.conf -5d9e9fb1a5b6af82ce915f72ebc5e3b7 download/r.conf -1b1b1aa37d3827f03320dc7c6b2d54ae download/oldlibs.list.0.9.7m-i386 -ba0db139be0aeecdce5668d2de475a4d download/oldlibs.list.0.9.7m-sparc -45f0944761a63ba5211987dbfbfdfc42 download/openssl.0.9.7.patch Modified: csw/mgar/pkg/openssl/trunk/files/CSWossl.gspec =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWossl.gspec 2008-12-07 17:33:28 UTC (rev 2473) +++ csw/mgar/pkg/openssl/trunk/files/CSWossl.gspec 2008-12-07 22:31:33 UTC (rev 2474) @@ -1,5 +1,6 @@ %var bitname openssl %var pkgname CSWossl +%var arch all %var desc Openssl meta package %var pkgfile %{bitname}-%{SPKG_VERSION}%{SPKG_REVSTAMP}-%{SPKG_OSNAME}-all-CSW.pkg %include url file://%{PKGLIB}/csw_dyndepend.gspec Added: csw/mgar/pkg/openssl/trunk/files/certs.tar.gz =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/openssl/trunk/files/certs.tar.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: csw/mgar/pkg/openssl/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssl/trunk/files/changelog.CSW 2008-12-07 17:33:28 UTC (rev 2473) +++ csw/mgar/pkg/openssl/trunk/files/changelog.CSW 2008-12-07 22:31:33 UTC (rev 2474) @@ -1,3 +1,11 @@ +openssl (0.9.8,REV=2008.10.05_rev=i) unstable + + * New upstream version. + * Added CA certs that were removed in 0.9.8h. + * Fixed ARCH in openssl meta-package. + + -- Yann Rouillard Fri, 05 Oct 2008 21:25:09 +0200 + openssl (0.9.8,REV=2007.12.26_rev=g) unstable * Fixed inconsistency between headers and libraries. Modified: csw/mgar/pkg/openssl/trunk/files/i.conf =================================================================== --- csw/mgar/pkg/openssl/trunk/files/i.conf 2008-12-07 17:33:28 UTC (rev 2473) +++ csw/mgar/pkg/openssl/trunk/files/i.conf 2008-12-07 22:31:33 UTC (rev 2474) @@ -1,5 +1,5 @@ # -# Copyright 2006 Yann Rouillard +# Copyright 2006 Yann Rouillard # All rights reserved. Use is subject to license terms. # # Redistribution and/or use, with or without modification, is @@ -15,7 +15,7 @@ # with .CSW # except for service configuration files which are always installed # CSW suffixed under Solaris 9 as they are used to enable/disable -# a service according to blastwave standards. +# a service according to opencsw standards. # umask 0022 Modified: csw/mgar/pkg/openssl/trunk/files/oldlibs.0.9.7m-sparc.tar.gz =================================================================== (Binary files differ) Modified: csw/mgar/pkg/openssl/trunk/files/openssl.0.9.8.patch =================================================================== --- csw/mgar/pkg/openssl/trunk/files/openssl.0.9.8.patch 2008-12-07 17:33:28 UTC (rev 2473) +++ csw/mgar/pkg/openssl/trunk/files/openssl.0.9.8.patch 2008-12-07 22:31:33 UTC (rev 2474) @@ -1,7 +1,7 @@ -diff --speed-large-files --minimal -Nru openssl-0.9.8e.orig/Configure openssl-0.9.8e/Configure ---- openssl-0.9.8e.orig/Configure 2006-11-30 09:01:38.000000000 -0500 -+++ openssl-0.9.8e/Configure 2007-05-08 10:27:21.506853000 -0400 -@@ -194,8 +194,12 @@ +diff -ur openssl-0.9.8i.orig/Configure openssl-0.9.8i/Configure +--- openssl-0.9.8i.orig/Configure 2008-09-12 16:47:00.000000000 +0200 ++++ openssl-0.9.8i/Configure 2008-09-26 21:39:48.373741600 +0200 +@@ -199,8 +199,12 @@ "solaris64-x86_64-gcc","gcc:-m64 -O3 -Wall -DL_ENDIAN -DMD32_REG_T=int::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:solaris-shared:-fPIC:-m64 -shared -static-libgcc:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", #### Solaris x86 with Sun C setups @@ -16,12 +16,11 @@ #### SPARC Solaris with GNU C setups "solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -@@ -214,6 +218,7 @@ +@@ -219,6 +223,7 @@ "solaris-sparcv7-cc","cc:-xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "solaris-sparcv8-cc","cc:-xarch=v8 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "solaris-sparcv9-cc","cc:-xtarget=ultra -xarch=v8plus -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::md5-sparcv8plus.o::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"solaris-sparcv9+vis-cc","cc:-xtarget=ultra -xarch=v8plusa -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::md5-sparcv8plus.o::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "solaris64-sparcv9-cc","cc:-xtarget=ultra -xarch=v9 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:::des_enc-sparc.o fcrypt_b.o:::md5-sparcv9.o::::::dlfcn:solaris-shared:-KPIC:-xarch=v9 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs", + "solaris-sparcv9-cc","cc:-xtarget=ultra -xarch=v8plus -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"solaris-sparcv9+vis-cc","cc:-xtarget=ultra -xarch=v8plusa -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "solaris64-sparcv9-cc","cc:-xtarget=ultra -xarch=v9 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:::des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-KPIC:-xarch=v9 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs", #### "debug-solaris-sparcv8-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG_ALL -xarch=v8 -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::sparcv8.o::::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -set Modified: csw/mgar/pkg/openssl/trunk/files/r.conf =================================================================== --- csw/mgar/pkg/openssl/trunk/files/r.conf 2008-12-07 17:33:28 UTC (rev 2473) +++ csw/mgar/pkg/openssl/trunk/files/r.conf 2008-12-07 22:31:33 UTC (rev 2474) @@ -1,5 +1,5 @@ # -# Copyright 2006 Yann Rouillard +# Copyright 2006 Yann Rouillard # All rights reserved. Use is subject to license terms. # # Redistribution and/or use, with or without modification, is This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dlaigle at opencsw.org Mon Dec 8 11:44:49 2008 From: dlaigle at opencsw.org (dlaigle) Date: Mon, 08 Dec 2008 11:44:49 +0100 Subject: [csw-devel] =?utf-8?q?libtool_reordering_runpath_and_LD=5FOPTIONS?= In-Reply-To: <627731CF-D4B6-4319-9B92-63BBD440C4D7@opencsw.org> References: <627731CF-D4B6-4319-9B92-63BBD440C4D7@opencsw.org> Message-ID: <0e5fc9b305d125ad8a95423baab013e0@localhost> Dago, You should have a look at the related "libtool library file", which name is ".la". In there, you will have an entry which looks like the following: "dependency_libs='-L ... -l ...' : this is those options which are expanded directly when you build a library using libtool. You can either hack this entry directly to solve your problem... or use LD_OPTIONS ! BTW, it is this entry which is almost everytime responsible of the insertion of the building paths into the RPATH of the binaries we build: we should have an ".la cleaner" script be part of the packages creation process, to remove thatn but this is another topic :-) - Dominique On Sun, 7 Dec 2008 13:03:14 +0100, Dagobert Michelsen wrote: > Hi, > > I'm still working on automated 32/64 bit builds and still encounter > new strange things. This time I have an issue with libtool. This > command is issues during make when comiling > libvorbis/trunk/work/build-isa-amd64/libvorbis-1.2.0/examples > > opencsw# /bin/bash ../libtool --tag=CC --mode=link /opt/studio/SOS11/ > SUNWspro/bin/cc -O -xO3 -xarch=amd64 -I/opt/csw/include - > DUSE_MEMORY_H -xarch=amd64 -L/opt/csw/lib/64 -R/opt/csw/lib/\\\ > $ISALIST -R/opt/csw/lib/64 -o seeking_example seeking_example.o ../lib/ > libvorbisfile.la ../lib/libvorbis.la > > This looks good, but libtool reorders the runpath: > > /opt/studio/SOS11/SUNWspro/bin/cc -O -xO3 -xarch=amd64 -I/opt/csw/ > include -DUSE_MEMORY_H -xarch=amd64 -o .libs/seeking_example > seeking_example.o -L/opt/csw/lib/64 ../lib/.libs/libvorbisfile.so / > root/mgar/pkg/libvorbis/trunk/work/build-isa-amd64/libvorbis-1.2.0/ > lib/.libs/libvorbis.so ../lib/.libs/libvorbis.so /opt/csw/lib/64/ > libogg.so -lm -R/opt/csw/lib/64 -R/opt/csw/lib/\$ISALIST > ld: warning: file ../lib/.libs/libvorbis.so: linked to /root/mgar/pkg/ > libvorbis/trunk/work/build-isa-amd64/libvorbis-1.2.0/lib/.libs/ > libvorbis.so: attempted multiple inclusion of file > creating seeking_example > > Putting -R/opt/csw/lib/64 before $ISALIST is pretty pointless as > $ISALIST then never will be used as the library is found earlier. > Debugging the libtool-shellscript, umh, does not reveal any secrets. > It looks like libtool assembles the runpath dynamically from all > runpathes from libraries the to be linked lib depends on and > than reorders it somehow. If I use LD_OPTIONS I can get it > to work, but I understood from the past discussions that > LD_OPTIONS is a Bad Thing(tm). > > Any libtool experts around who can enlighten me how to do this right? > > > Best regards > > -- Dago > _______________________________________________ > devel mailing list > devel at lists.opencsw.org > https://lists.opencsw.org/mailman/listinfo/devel > From bdwalton at users.sourceforge.net Mon Dec 8 15:22:03 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 08 Dec 2008 14:22:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[2475] csw/mgar/pkg/opensp/ Message-ID: Revision: 2475 http://gar.svn.sourceforge.net/gar/?rev=2475&view=rev Author: bdwalton Date: 2008-12-08 14:22:03 +0000 (Mon, 08 Dec 2008) Log Message: ----------- Removed stub package for opensp (an erroneous creation). Removed Paths: ------------- csw/mgar/pkg/opensp/ 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 Dec 8 16:12:46 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 08 Dec 2008 15:12:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[2476] csw/mgar/pkg/docbook-dtds/trunk Message-ID: Revision: 2476 http://gar.svn.sourceforge.net/gar/?rev=2476&view=rev Author: bdwalton Date: 2008-12-08 15:12:46 +0000 (Mon, 08 Dec 2008) Log Message: ----------- Package builds and installs 'fine', including postinstall/preremove scripts. The scripts may need to be changed if we leave libxml2 pointing to /etc/sgml/catalog by default though, since the we're expecting them in /opt/csw/etc/sgml/catalog for the preremove portion. Modified Paths: -------------- csw/mgar/pkg/docbook-dtds/trunk/Makefile csw/mgar/pkg/docbook-dtds/trunk/checksums csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.gspec csw/mgar/pkg/docbook-dtds/trunk/files/Makefile Added Paths: ----------- csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.depend csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.preremove Modified: csw/mgar/pkg/docbook-dtds/trunk/Makefile =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/Makefile 2008-12-08 14:22:03 UTC (rev 2475) +++ csw/mgar/pkg/docbook-dtds/trunk/Makefile 2008-12-08 15:12:46 UTC (rev 2476) @@ -1,6 +1,12 @@ # Replicate the RHEL5 docbook-dtds-1.0.30.1 rpm for CSW. Patches are taken # from that srpm and modified (so paths work for GAR). +# NOTE NOTE NOTE +# If these version numbers change, you'll need to update the postinstall +# and preremove scripts also. +# 20081204 -bw +# NOTE NOTE NOTE + GARNAME = docbookdtds GARVERSION = 1.0 PATCHLEVEL = 30.1 @@ -50,6 +56,7 @@ MASTER_SITES = $(O_SRC) $(D_SRC) DISTFILES = $(DBFILES) Makefile +DISTFILES += $(call admfiles,CSWdocbookdtds,depend postinstall preremove) PATCHFILES = docbook-4.2-euro.patch docbook-dtd30-sgml-1.0.catalog.patch PATCHFILES += docbook-dtd31-sgml-1.0.catalog.patch Modified: csw/mgar/pkg/docbook-dtds/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/checksums 2008-12-08 14:22:03 UTC (rev 2475) +++ csw/mgar/pkg/docbook-dtds/trunk/checksums 2008-12-08 15:12:46 UTC (rev 2476) @@ -9,7 +9,11 @@ ab200202b9e136a144db1e0864c45074 download/docbook-xml-4.3.zip f89e1bd0b2c7a361e3f1f739e16b5d0d download/docbook-4.4.zip cbb04e9a700955d88c50962ef22c1634 download/docbook-xml-4.4.zip -9f1b87ab4fa6da7b7284a1c7edd1e3da download/Makefile +2479ac1e7b4a43d3618ca16237aaa85d download/Makefile +536104a1ab1e8eac583cf27f4f8844a4 download/CSWdocbookdtds.gspec +cb6dbfe9f6184a9de0725c0a61adc57b download/CSWdocbookdtds.depend +5cb8ab501683e226c5b34fac2dc66076 download/CSWdocbookdtds.postinstall +9035c448e6480f6e916084fea388b512 download/CSWdocbookdtds.preremove 318742d3a6648a6905727f071cbc9847 download/docbook-4.2-euro.patch e3067045964536cc7445d5c3f1e99916 download/docbook-dtd30-sgml-1.0.catalog.patch 856d40f5d1e3fc8fd939b88bf5fedc87 download/docbook-dtd31-sgml-1.0.catalog.patch Added: csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.depend =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.depend (rev 0) +++ csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.depend 2008-12-08 15:12:46 UTC (rev 2476) @@ -0,0 +1,6 @@ +P CSWcommon common - common files and dirs for CSW packages +P CSWsgmlcommon sgmlcommon - A collection of entities and DTDs +P CSWxmlcommon xmlcommon - A collection of entities and DTDs +P CSWopenjade openjade - A DSSSL implementation +P CSWlibxml2 libxml2 - A library providing XML and HTML support + Modified: csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.gspec =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.gspec 2008-12-08 14:22:03 UTC (rev 2475) +++ csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.gspec 2008-12-08 15:12:46 UTC (rev 2476) @@ -1,4 +1,4 @@ -%var bitname package -%var pkgname CSWpackage +%var bitname docbookdtds +%var pkgname CSWdocbookdtds +%var arch all %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/LICENSE Added: csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall (rev 0) +++ csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall 2008-12-08 15:12:46 UTC (rev 2476) @@ -0,0 +1,597 @@ +#!/bin/sh + +# NOTE: This script is a lightly modified version of the one included in the +# rhel5 docbook-dtds rpm spec. +# 20081204 -bw + +if [ -n "$PKG_INSTALL_ROOT" -a "$PKG_INSTALL_ROOT" != "/" ]; then + chroot $PKG_INSTALL_ROOT +fi + +XMLCAT=/opt/csw/bin/xmlcatalog +INSTCAT=/opt/csw/bin/install-catalog +CSWSGMLCNF=/opt/csw/etc/sgml +CSWSGML=/opt/csw/share/sgml + +VERSION=1.0 +RELEASE=30.1 + +OPENJADEVER=1.3.2 + +## +## SGML catalog +## + +# Update the centralized catalog corresponding to this version of the DTD +# DocBook V3.0 +$XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-3.0-$VERSION-$RELEASE.cat \ + $CSWSGML/sgml-iso-entities-8879.1986/catalog +$XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-3.0-$VERSION-$RELEASE.cat \ + $CSWSGML/docbook/sgml-dtd-3.0-$VERSION-$RELEASE/catalog + +# DocBook V3.1 +$XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-3.1-$VERSION-$RELEASE.cat \ + $CSWSGML/sgml-iso-entities-8879.1986/catalog +$XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-3.1-$VERSION-$RELEASE.cat \ + $CSWSGML/docbook/sgml-dtd-3.1-$VERSION-$RELEASE/catalog + +# DocBook V4.0 +$XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-4.0-$VERSION-$RELEASE.cat \ + $CSWSGML/sgml-iso-entities-8879.1986/catalog +$XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-4.0-$VERSION-$RELEASE.cat \ + $CSWSGML/docbook/sgml-dtd-4.0-$VERSION-$RELEASE/catalog + +# DocBook V4.1 +$XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-4.1-$VERSION-$RELEASE.cat \ + $CSWSGML/sgml-iso-entities-8879.1986/catalog +$XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-4.1-$VERSION-$RELEASE.cat \ + $CSWSGML/docbook/sgml-dtd-4.1-$VERSION-$RELEASE/catalog + +# DocBook XML V4.1.2 +$XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/xml-docbook-4.1.2-$VERSION-$RELEASE.cat \ + $CSWSGML/sgml-iso-entities-8879.1986/catalog +$XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/xml-docbook-4.1.2-$VERSION-$RELEASE.cat \ + $CSWSGML/docbook/xml-dtd-4.1.2-$VERSION-$RELEASE/catalog + +# DocBook V4.2 +$XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-4.2-$VERSION-$RELEASE.cat \ + $CSWSGML/sgml-iso-entities-8879.1986/catalog +$XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-4.2-$VERSION-$RELEASE.cat \ + $CSWSGML/docbook/sgml-dtd-4.2-$VERSION-$RELEASE/catalog + +# DocBook XML V4.2 +$XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/xml-docbook-4.2-$VERSION-$RELEASE.cat \ + $CSWSGML/sgml-iso-entities-8879.1986/catalog +$XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/xml-docbook-4.2-$VERSION-$RELEASE.cat \ + $CSWSGML/docbook/xml-dtd-4.2-$VERSION-$RELEASE/catalog + +# DocBook V4.3 +$XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-4.3-$VERSION-$RELEASE.cat \ + $CSWSGML/sgml-iso-entities-8879.1986/catalog +$XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-4.3-$VERSION-$RELEASE.cat \ + $CSWSGML/docbook/sgml-dtd-4.3-$VERSION-$RELEASE/catalog + +# DocBook XML V4.3 +$XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/xml-docbook-4.3-$VERSION-$RELEASE.cat \ + $CSWSGML/sgml-iso-entities-8879.1986/catalog +$XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/xml-docbook-4.3-$VERSION-$RELEASE.cat \ + $CSWSGML/docbook/xml-dtd-4.3-$VERSION-$RELEASE/catalog + +# DocBook V4.4 +$XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-4.4-$VERSION-$RELEASE.cat \ + $CSWSGML/sgml-iso-entities-8879.1986/catalog +$XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-4.4-$VERSION-$RELEASE.cat \ + $CSWSGML/docbook/sgml-dtd-4.4-$VERSION-$RELEASE/catalog + +# DocBook XML V4.4 +$XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/xml-docbook-4.4-$VERSION-$RELEASE.cat \ + $CSWSGML/sgml-iso-entities-8879.1986/catalog +$XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/xml-docbook-4.4-$VERSION-$RELEASE.cat \ + $CSWSGML/docbook/xml-dtd-4.4-$VERSION-$RELEASE/catalog + +# The following lines are for the case in which the style sheets +# were installed after another DTD but before this DTD +STYLESHEETS=`echo $CSWSGML/docbook/dsssl-stylesheets-*` +#STYLESHEETS=${STYLESHEETS##*/dsssl-stylesheets-} +STYLESHEETS=`echo $STYLESHEETS | sed 's#[^ ]*/dsssl-stylesheets-##g'` +if [ "$STYLESHEETS" != "*" ]; then + # DocBook V3.0 + $XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-3.0-$VERSION-$RELEASE.cat \ + $CSWSGML/openjade-$OPENJADEVER/catalog + $XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-3.0-$VERSION-$RELEASE.cat \ + $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog + + # DocBook V3.1 + $XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-3.1-$VERSION-$RELEASE.cat \ + $CSWSGML/openjade-$OPENJADEVER/catalog + $XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-3.1-$VERSION-$RELEASE.cat \ + $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog + + # DocBook V4.0 + $XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-4.0-$VERSION-$RELEASE.cat \ + $CSWSGML/openjade-$OPENJADEVER/catalog + $XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-4.0-$VERSION-$RELEASE.cat \ + $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog + + # DocBook V4.1 + $XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-4.1-$VERSION-$RELEASE.cat \ + $CSWSGML/openjade-$OPENJADEVER/catalog + $XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-4.1-$VERSION-$RELEASE.cat \ + $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog + + # DocBook XML V4.1.2 + $XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/xml-docbook-4.1.2-$VERSION-$RELEASE.cat \ + $CSWSGML/openjade-$OPENJADEVER/catalog + $XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/xml-docbook-4.1.2-$VERSION-$RELEASE.cat \ + $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog + + # DocBook V4.2 + $XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-4.2-$VERSION-$RELEASE.cat \ + $CSWSGML/openjade-$OPENJADEVER/catalog + $XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-4.2-$VERSION-$RELEASE.cat \ + $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog + + # DocBook XML V4.2 + $XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/xml-docbook-4.2-$VERSION-$RELEASE.cat \ + $CSWSGML/openjade-$OPENJADEVER/catalog + $XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/xml-docbook-4.2-$VERSION-$RELEASE.cat \ + $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog + + # DocBook V4.3 + $XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-4.3-$VERSION-$RELEASE.cat \ + $CSWSGML/openjade-$OPENJADEVER/catalog + $XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-4.3-$VERSION-$RELEASE.cat \ + $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog + + # DocBook XML V4.3 + $XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/xml-docbook-4.3-$VERSION-$RELEASE.cat \ + $CSWSGML/openjade-$OPENJADEVER/catalog + $XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/xml-docbook-4.3-$VERSION-$RELEASE.cat \ + $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog + + # DocBook V4.4 + $XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-4.4-$VERSION-$RELEASE.cat \ + $CSWSGML/openjade-$OPENJADEVER/catalog + $XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/sgml-docbook-4.4-$VERSION-$RELEASE.cat \ + $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog + + # DocBook XML V4.4 + $XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/xml-docbook-4.4-$VERSION-$RELEASE.cat \ + $CSWSGML/openjade-$OPENJADEVER/catalog + $XMLCAT --sgml --noout --add \ + $CSWSGMLCNF/xml-docbook-4.4-$VERSION-$RELEASE.cat \ + $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog +fi + +# Fix up SGML super catalog so that there isn't an XML DTD before an +# SGML one. We need to do this (*sigh*) because xmlcatalog messes up +# the order of the lines, and SGML tools don't like to see XML things +# they aren't expecting. +CATALOG=$CSWSGMLCNF/catalog +SGML=`cat -n ${CATALOG} | grep sgml-docbook | head -1 | awk '{print $1}'` +XML=`cat -n ${CATALOG} | grep xml-docbook | head -1 | awk '{print $1}'` + +# Do they need switching around? +if [ -n "${XML}" ] && [ -n "${SGML}" ] && [ "${XML}" -lt "${SGML}" ] +then + XML=`expr $XML - 1` + SGML=`expr $SGML - 1` + + # make sure we're using the system perl, as we know for sure that it + # can handle this operation correctly. + /usr/bin/perl -e "@_=<>;@_[$XML,$SGML]=@_[$SGML,$XML];print @_" \ + ${CATALOG} > ${CATALOG}.tmp + + mv ${CATALOG}.tmp ${CATALOG}.new +fi + +## +## XML catalog +## + +CATALOG=$CSWSGML/docbook/xmlcatalog + +if [ -w $CATALOG ] +then + # DocBook XML V4.1.2 + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Publishing//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-pub.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Greek Letters//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-grk1.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/dbpoolx.mod" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-box.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//DTD DocBook XML V4.1.2//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/docbookx.dtd" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Greek Symbols//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-grk3.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amsn.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-num.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/dbcentx.mod" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-grk4.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/dbnotnx.mod" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-dia.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-grk2.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/dbgenent.mod" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/dbhierx.mod" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amsa.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amso.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-cyrl.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES General Technical//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-tech.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amsc.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/soextblx.dtd" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/calstblx.dtd" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Latin 1//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-lat1.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amsb.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Latin 2//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-lat2.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amsr.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-cyr2.ent" $CATALOG + $XMLCAT --noout --add "rewriteSystem" \ + "http://www.oasis-open.org/docbook/xml/4.1.2" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE" $CATALOG + $XMLCAT --noout --add "rewriteURI" \ + "http://www.oasis-open.org/docbook/xml/4.1.2" \ + "xml-dtd-4.1.2-$VERSION-$RELEASE" $CATALOG + + # DocBook XML V4.2 + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Publishing//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-pub.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Greek Letters//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-grk1.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook XML Information Pool V4.2//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/dbpoolx.mod" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-box.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//DTD DocBook XML V4.2//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/docbookx.dtd" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Greek Symbols//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-grk3.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amsn.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-num.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Character Entities V4.2//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/dbcentx.mod" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-grk4.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Notations V4.2//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/dbnotnx.mod" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-dia.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-grk2.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.2//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/dbgenent.mod" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.2//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/dbhierx.mod" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amsa.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amso.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-cyrl.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES General Technical//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-tech.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amsc.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/soextblx.dtd" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//DTD DocBook XML CALS Table Model V4.2//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/calstblx.dtd" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Latin 1//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-lat1.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amsb.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Latin 2//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-lat2.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amsr.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-cyr2.ent" $CATALOG + $XMLCAT --noout --add "rewriteSystem" \ + "http://www.oasis-open.org/docbook/xml/4.2" \ + "xml-dtd-4.2-$VERSION-$RELEASE" $CATALOG + $XMLCAT --noout --add "rewriteURI" \ + "http://www.oasis-open.org/docbook/xml/4.2" \ + "xml-dtd-4.2-$VERSION-$RELEASE" $CATALOG + + # DocBook XML V4.3 + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Publishing//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-pub.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Greek Letters//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-grk1.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook XML Information Pool V4.3//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/dbpoolx.mod" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-box.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//DTD DocBook XML V4.3//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/docbookx.dtd" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Greek Symbols//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-grk3.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amsn.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-num.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Character Entities V4.3//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/dbcentx.mod" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-grk4.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Notations V4.3//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/dbnotnx.mod" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-dia.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-grk2.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.3//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/dbgenent.mod" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.3//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/dbhierx.mod" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amsa.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amso.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-cyrl.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES General Technical//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-tech.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amsc.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/soextblx.dtd" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//DTD DocBook XML CALS Table Model V4.3//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/calstblx.dtd" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Latin 1//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-lat1.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amsb.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Latin 2//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-lat2.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amsr.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-cyr2.ent" $CATALOG + $XMLCAT --noout --add "rewriteSystem" \ + "http://www.oasis-open.org/docbook/xml/4.3" \ + "xml-dtd-4.3-$VERSION-$RELEASE" $CATALOG + $XMLCAT --noout --add "rewriteURI" \ + "http://www.oasis-open.org/docbook/xml/4.3" \ + "xml-dtd-4.3-$VERSION-$RELEASE" $CATALOG + + # DocBook XML V4.4 + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Publishing//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-pub.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Greek Letters//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-grk1.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook XML Information Pool V4.4//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/dbpoolx.mod" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-box.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//DTD DocBook XML V4.4//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/docbookx.dtd" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Greek Symbols//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-grk3.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amsn.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-num.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Character Entities V4.4//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/dbcentx.mod" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-grk4.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Notations V4.4//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/dbnotnx.mod" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-dia.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-grk2.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.4//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/dbgenent.mod" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.4//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/dbhierx.mod" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amsa.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amso.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-cyrl.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES General Technical//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-tech.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amsc.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/soextblx.dtd" $CATALOG + $XMLCAT --noout --add "public" \ + "-//OASIS//DTD DocBook XML CALS Table Model V4.4//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/calstblx.dtd" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Latin 1//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-lat1.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amsb.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Latin 2//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-lat2.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amsr.ent" $CATALOG + $XMLCAT --noout --add "public" \ + "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-cyr2.ent" $CATALOG + $XMLCAT --noout --add "rewriteSystem" \ + "http://www.oasis-open.org/docbook/xml/4.4" \ + "xml-dtd-4.4-$VERSION-$RELEASE" $CATALOG + $XMLCAT --noout --add "rewriteURI" \ + "http://www.oasis-open.org/docbook/xml/4.4" \ + "xml-dtd-4.4-$VERSION-$RELEASE" $CATALOG +fi + +# Finally, make sure everything in $CSWSGMLCNF is readable! +/bin/chmod a+r $CSWSGMLCNF/* Added: csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.preremove =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.preremove (rev 0) +++ csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.preremove 2008-12-08 15:12:46 UTC (rev 2476) @@ -0,0 +1,337 @@ +#!/bin/sh + +# NOTE: This script is a lightly modified version of the one included in the +# rhel5 docbook-dtds rpm spec. +# 20081204 -bw + +if [ -n "$PKG_INSTALL_ROOT" -a "$PKG_INSTALL_ROOT" != "/" ]; then + chroot $PKG_INSTALL_ROOT +fi + +XMLCAT=/opt/csw/bin/xmlcatalog +CSWSGMLCNF=/opt/csw/etc/sgml +CSWSGML=/opt/csw/share/sgml + +VERSION=1.0 +RELEASE=30.1 + +OPENJADEVER=1.3.2 + +## +## SGML catalog +## + +# Update the centralized catalog corresponding to this version of the DTD +# DocBook V3.0 +$XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ + $CSWSGMLCNF/sgml-docbook-3.0-$VERSION-$RELEASE.cat +rm -f $CSWSGMLCNF/sgml-docbook-3.0-$VERSION-$RELEASE.cat + +# DocBook V3.1 +$XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ + $CSWSGMLCNF/sgml-docbook-3.1-$VERSION-$RELEASE.cat +rm -f $CSWSGMLCNF/sgml-docbook-3.1-$VERSION-$RELEASE.cat + +# DocBook V4.0 +$XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ + $CSWSGMLCNF/sgml-docbook-4.0-$VERSION-$RELEASE.cat +rm -f $CSWSGMLCNF/sgml-docbook-4.0-$VERSION-$RELEASE.cat + +# DocBook V4.1 +$XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ + $CSWSGMLCNF/sgml-docbook-4.1-$VERSION-$RELEASE.cat +rm -f $CSWSGMLCNF/sgml-docbook-4.1-$VERSION-$RELEASE.cat + +# DocBook XML V4.1.2 +$XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ + $CSWSGMLCNF/xml-docbook-4.1.2-$VERSION-$RELEASE.cat +rm -f $CSWSGMLCNF/xml-docbook-4.1.2-$VERSION-$RELEASE.cat + +# DocBook V4.2 +$XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ + $CSWSGMLCNF/sgml-docbook-4.2-$VERSION-$RELEASE.cat +rm -f $CSWSGMLCNF/sgml-docbook-4.2-$VERSION-$RELEASE.cat + +# DocBook XML V4.2 +$XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ + $CSWSGMLCNF/xml-docbook-4.2-$VERSION-$RELEASE.cat +rm -f $CSWSGMLCNF/xml-docbook-4.2-$VERSION-$RELEASE.cat + +# DocBook V4.3 +$XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ + $CSWSGMLCNF/sgml-docbook-4.3-$VERSION-$RELEASE.cat +rm -f $CSWSGMLCNF/sgml-docbook-4.3-$VERSION-$RELEASE.cat + +# DocBook XML V4.3 +$XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ + $CSWSGMLCNF/xml-docbook-4.3-$VERSION-$RELEASE.cat +rm -f $CSWSGMLCNF/xml-docbook-4.3-$VERSION-$RELEASE.cat + +# DocBook V4.4 +$XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ + $CSWSGMLCNF/sgml-docbook-4.4-$VERSION-$RELEASE.cat +rm -f $CSWSGMLCNF/sgml-docbook-4.4-$VERSION-$RELEASE.cat + +# DocBook XML V4.4 +$XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ + $CSWSGMLCNF/xml-docbook-4.4-$VERSION-$RELEASE.cat +rm -f $CSWSGMLCNF/xml-docbook-4.4-$VERSION-$RELEASE.cat + +# Fix up SGML super catalog so that there isn't an XML DTD before an +# SGML one. We need to do this (*sigh*) because xmlcatalog messes up +# the order of the lines, and SGML tools don't like to see XML things +# they aren't expecting. +CATALOG=$CSWSGMLCNF/catalog +SGML=`cat -n ${CATALOG} | grep sgml-docbook | head -1 | awk '{print $1}'` +XML=`cat -n ${CATALOG} | grep xml-docbook | head -1 | awk '{print $1}'` +# Do they need switching around? +if [ -n "${XML}" ] && [ -n "${SGML}" ] && [ "${XML}" -lt "${SGML}" ] +then + # Switch those two lines around. + XML=`expr $XML - 1` + SGML=`expr $SGML - 1` + /usr/bin/perl -e "@_=<>;@_[$XML, $SGML]=@_[$SGML, $XML];print @_" \ + ${CATALOG} > ${CATALOG}.tmp + mv -f ${CATALOG}.tmp ${CATALOG} +fi + +## +## XML catalog +## + +CATALOG=$CSWSGML/docbook/xmlcatalog + +if [ -w $CATALOG ] +then + # DocBook XML V4.1.2 + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-pub.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-grk1.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/dbpoolx.mod" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-box.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/docbookx.dtd" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-grk3.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amsn.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-num.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/dbcentx.mod" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-grk4.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/dbnotnx.mod" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-dia.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-grk2.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/dbgenent.mod" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/dbhierx.mod" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amsa.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amso.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-cyrl.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-tech.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amsc.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/soextblx.dtd" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/calstblx.dtd" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-lat1.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amsb.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-lat2.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amsr.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-cyr2.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.1.2-$VERSION-$RELEASE" $CATALOG + + # DocBook XML V4.2 + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-pub.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-grk1.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/dbpoolx.mod" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-box.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/docbookx.dtd" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-grk3.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amsn.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-num.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/dbcentx.mod" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-grk4.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/dbnotnx.mod" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-dia.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-grk2.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/dbgenent.mod" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/dbhierx.mod" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amsa.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amso.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-cyrl.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-tech.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amsc.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/soextblx.dtd" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/calstblx.dtd" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-lat1.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amsb.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-lat2.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amsr.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-cyr2.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.2-$VERSION-$RELEASE" $CATALOG + + # DocBook XML V4.3 + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-pub.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-grk1.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/dbpoolx.mod" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-box.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/docbookx.dtd" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-grk3.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amsn.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-num.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/dbcentx.mod" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-grk4.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/dbnotnx.mod" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-dia.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-grk2.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/dbgenent.mod" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/dbhierx.mod" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amsa.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amso.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-cyrl.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-tech.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amsc.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/soextblx.dtd" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/calstblx.dtd" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-lat1.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amsb.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-lat2.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amsr.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-cyr2.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.3-$VERSION-$RELEASE" $CATALOG + + # DocBook XML V4.4 + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-pub.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-grk1.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/dbpoolx.mod" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-box.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/docbookx.dtd" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-grk3.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amsn.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-num.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/dbcentx.mod" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-grk4.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/dbnotnx.mod" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-dia.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-grk2.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/dbgenent.mod" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/dbhierx.mod" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amsa.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amso.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-cyrl.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-tech.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amsc.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/soextblx.dtd" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/calstblx.dtd" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-lat1.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amsb.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-lat2.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amsr.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-cyr2.ent" $CATALOG + $XMLCAT --noout --del \ + "xml-dtd-4.4-$VERSION-$RELEASE" $CATALOG +fi Modified: csw/mgar/pkg/docbook-dtds/trunk/files/Makefile =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/Makefile 2008-12-08 14:22:03 UTC (rev 2475) +++ csw/mgar/pkg/docbook-dtds/trunk/files/Makefile 2008-12-08 15:12:46 UTC (rev 2476) @@ -1,11 +1,14 @@ prefix = /opt/csw +sysconfdir = $(prefix)/etc datadir = $(prefix)/share + INSTALL = /opt/csw/bin/ginstall -c INSTALL_DATA = $(INSTALL) -m 0644 INSTALL_DIR = $(INSTALL) -m 0755 -d docbookdir = $(datadir)/sgml/docbook +docdir = $(datadir)/doc/docbookdtds SGML = $(wildcard *-sgml) XML = $(wildcard *-xml) @@ -17,8 +20,34 @@ all: build -install: $(SGMLTARG) $(XMLTARG) +install: $(SGMLTARG) $(XMLTARG) links docs +links: $(SGMLTARG) $(XMLTARG) + @echo Installing links to most current SGML and XML catalogs + @( $(INSTALL_DIR) $(DESTDIR)/$(sysconfdir)/sgml; \ + cd $(DESTDIR)/$(sysconfdir)/sgml; \ + [ -h $(DESTDIR)/$(sysconfdir)/sgml/sgml-docbook.cat ] || \ + ln -s sgml-docbook-4.4-$(GARVERSION)-$(PATCHLEVEL).cat \ + $(DESTDIR)/$(sysconfdir)/sgml/sgml-docbook.cat; \ + [ -h $(DESTDIR)/$(sysconfdir)/sgml/xml-docbook.cat ] || \ + ln -s xml-docbook-4.4-$(GARVERSION)-$(PATCHLEVEL).cat \ + $(DESTDIR)/$(sysconfdir)/sgml/xml-docbook.cat ) + +docs: + @echo Installing docs + $(INSTALL_DIR) $(DESTDIR)/$(docdir)/ + for d in *; do \ + if [ "`echo $$d/*txt`" != "$$d/*txt" ]; then \ + $(INSTALL_DIR) $(DESTDIR)/$(docdir)/$$d; \ + $(INSTALL_DATA) $$d/*txt $(DESTDIR)/$(docdir)/$$d/; \ + fi \ + done + for x in 3 4; do \ + dir=$(DESTDIR)/$(docdir)/$$x.1-sgml; \ + [ -d $$dir ] || $(INSTALL_DIR) $$dir; \ + $(INSTALL_DATA) $$x.1-sgml/ChangeLog $$dir/; \ + done + inst-%-sgml: DD=$(DESTDIR)/$(docbookdir)/sgml-dtd-$*$(GARVERSION)-$(PATCHLEVEL) inst-%-sgml: @echo Installing $*-sgml This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvel at opencsw.org Mon Dec 8 19:47:27 2008 From: trygvel at opencsw.org (=?ISO-8859-1?Q?Trygve_Laugst=F8l?=) Date: Mon, 08 Dec 2008 19:47:27 +0100 Subject: [csw-devel] SF.net SVN: gar:[2467] csw/mgar/pkg/clamav/trunk In-Reply-To: References: Message-ID: <493D6BBF.6060305@opencsw.org> Hi Peter You might want to look into Dago's v2 of GAR to handle the splitting of packages. ClamAV should be a good example project for others to look at from what I can see. -- Trygve bonivart at users.sourceforge.net wrote: > Revision: 2467 > http://gar.svn.sourceforge.net/gar/?rev=2467&view=rev > Author: bonivart > Date: 2008-12-07 13:33:00 +0000 (Sun, 07 Dec 2008) > > Log Message: > ----------- > clamav: multiple packages > > Modified Paths: > -------------- > csw/mgar/pkg/clamav/trunk/Makefile > csw/mgar/pkg/clamav/trunk/checksums > > Modified: csw/mgar/pkg/clamav/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/clamav/trunk/Makefile 2008-12-07 12:47:24 UTC (rev 2466) > +++ csw/mgar/pkg/clamav/trunk/Makefile 2008-12-07 13:33:00 UTC (rev 2467) > @@ -1,5 +1,6 @@ > -# add re for update notification > -# split into multiple packages: clamav, libclamav > +# clamav, Peter Bonivart > +# files outside /opt/csw are not included, need to fix gspec and cswproto > +# split into multiple packages: clamav, libclamav, clamavdb? > # put libs in lib/32? > # add depend files > # add rc/smf support > @@ -8,6 +9,7 @@ > # add etc/clamd? > # add doc/README.CSW, INSTALL.clamav-milter.CSW > # check mantis bugs > +# + add re for update notification > # + add contrib > # + add html docs and some pdf:s > # + remove *.a, *.la from libs > @@ -27,9 +29,12 @@ > > MASTER_SITES = http://freshmeat.net/redir/clamav/29355/url_tgz/ > DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz > +DISTFILES += $(call admfiles,CSWlibclamav,) > DISTFILES += $(call admfiles,CSWclamav,) > -#DISTFILES += $(call admfiles,CSWlibclamav,) > > +# We define upstream file regex so we can be notifed of new upstream software release > +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz > + > GARCOMPILER = GNU > GNU_CC_HOME = /opt/csw/gcc3 > > @@ -43,6 +48,9 @@ > > include gar/category.mk > > +PKGFILE_CSWlibclamav_EXCLUSIVE = $(libdir)/.* > +PKGFILE_CSWlibclamav_EXCLUSIVE += $(includedir)/.* > + > SPKG_SOURCEURL = http://www.clamav.net/ > > pre-package: > > Modified: csw/mgar/pkg/clamav/trunk/checksums > =================================================================== > --- csw/mgar/pkg/clamav/trunk/checksums 2008-12-07 12:47:24 UTC (rev 2466) > +++ csw/mgar/pkg/clamav/trunk/checksums 2008-12-07 13:33:00 UTC (rev 2467) > @@ -1,2 +1,3 @@ > 1181e6d62341b84708f126cc353f7ebf download/clamav-0.94.2.tar.gz > df9572dc44907a1ceff3561f9b834e20 download/CSWclamav.gspec > +6edc8660bde0b27d3676699eacb51884 download/CSWlibclamav.gspec > > > 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 trygvel at opencsw.org Mon Dec 8 19:57:11 2008 From: trygvel at opencsw.org (=?ISO-8859-1?Q?Trygve_Laugst=F8l?=) Date: Mon, 08 Dec 2008 19:57:11 +0100 Subject: [csw-devel] GAR v2 and merging stuff Message-ID: <493D6E07.70501@opencsw.org> Hi (Dago) Shouldn't this build actually work as the build machine support amd64? http://buildfarm.opencsw.org/hudson/job/libogg-i386-pc-solaris2.8/0/console What where the goals to dump the configuration/possible settings available? I'd like to have each build dump that before building, should make it easier to find discrepancies between what you have at home and what the build farm uses. -- Trygve From bonivart at opencsw.org Mon Dec 8 21:01:48 2008 From: bonivart at opencsw.org (Peter Bonivart) Date: Mon, 8 Dec 2008 21:01:48 +0100 Subject: [csw-devel] SF.net SVN: gar:[2467] csw/mgar/pkg/clamav/trunk In-Reply-To: <493D6BBF.6060305@opencsw.org> References: <493D6BBF.6060305@opencsw.org> Message-ID: <625385e30812081201s24cb11bl59a46802056156a8@mail.gmail.com> On Mon, Dec 8, 2008 at 7:47 PM, Trygve Laugst?l wrote: > Hi Peter > > You might want to look into Dago's v2 of GAR to handle the splitting of > packages. ClamAV should be a good example project for others to look at > from what I can see. Yes, I figured out that only v2 supports the easy splitting, I have now switched to v2 but ran into other weird problems that I have mailed Dago about. In the meantime I'm testing my first all-in-one build and it seems to work which is good. :-) -- /peter From trygvel at opencsw.org Mon Dec 8 22:11:58 2008 From: trygvel at opencsw.org (=?ISO-8859-1?Q?Trygve_Laugst=F8l?=) Date: Mon, 08 Dec 2008 22:11:58 +0100 Subject: [csw-devel] SF.net SVN: gar:[2467] csw/mgar/pkg/clamav/trunk In-Reply-To: <625385e30812081201s24cb11bl59a46802056156a8@mail.gmail.com> References: <493D6BBF.6060305@opencsw.org> <625385e30812081201s24cb11bl59a46802056156a8@mail.gmail.com> Message-ID: <493D8D9E.3070506@opencsw.org> Peter Bonivart wrote: > On Mon, Dec 8, 2008 at 7:47 PM, Trygve Laugst?l wrote: >> Hi Peter >> >> You might want to look into Dago's v2 of GAR to handle the splitting of >> packages. ClamAV should be a good example project for others to look at >> from what I can see. > > Yes, I figured out that only v2 supports the easy splitting, I have > now switched to v2 but ran into other weird problems that I have > mailed Dago about. In the meantime I'm testing my first all-in-one > build and it seems to work which is good. :-) Cool :) I just added the builds to Hudson as well: http://buildfarm.opencsw.org/hudson/job/clamav-sparc-sun-solaris2.8/0/console It actually did build, but I'm not sure why the last step failed. -- Trygve From bonivart at opencsw.org Mon Dec 8 22:32:38 2008 From: bonivart at opencsw.org (Peter Bonivart) Date: Mon, 8 Dec 2008 22:32:38 +0100 Subject: [csw-devel] SF.net SVN: gar:[2467] csw/mgar/pkg/clamav/trunk In-Reply-To: <493D8D9E.3070506@opencsw.org> References: <493D6BBF.6060305@opencsw.org> <625385e30812081201s24cb11bl59a46802056156a8@mail.gmail.com> <493D8D9E.3070506@opencsw.org> Message-ID: <625385e30812081332v35eeb8d9ja4886985f6dde736@mail.gmail.com> On Mon, Dec 8, 2008 at 10:11 PM, Trygve Laugst?l wrote: > It actually did build, but I'm not sure why the last step failed. Looks like it couldn't create the temporary gz-file in /tmp..? -- /peter From trygvel at opencsw.org Mon Dec 8 22:54:41 2008 From: trygvel at opencsw.org (=?ISO-8859-1?Q?Trygve_Laugst=F8l?=) Date: Mon, 08 Dec 2008 22:54:41 +0100 Subject: [csw-devel] SF.net SVN: gar:[2467] csw/mgar/pkg/clamav/trunk In-Reply-To: <625385e30812081332v35eeb8d9ja4886985f6dde736@mail.gmail.com> References: <493D6BBF.6060305@opencsw.org> <625385e30812081201s24cb11bl59a46802056156a8@mail.gmail.com> <493D8D9E.3070506@opencsw.org> <625385e30812081332v35eeb8d9ja4886985f6dde736@mail.gmail.com> Message-ID: <493D97A1.7050405@opencsw.org> Peter Bonivart wrote: > On Mon, Dec 8, 2008 at 10:11 PM, Trygve Laugst?l wrote: >> It actually did build, but I'm not sure why the last step failed. > > Looks like it couldn't create the temporary gz-file in /tmp..? > Aha, look here: [22:53:20][hudson at build8s:~]$ ls -l /tmp/clamav-* -rw-r--r-- 1 hudson csw 3075072 Dec 8 22:11 /tmp/clamav-0.94.2,REV=2008.12.08-SunOS5.8-sparc-CSW.pkg -rw-r--r-- 1 bonivart csw 17617 Dec 8 17:50 /tmp/clamav-0.94.2,REV=2008.12.08-SunOS5.8-sparc-CSW.pkg.gz I guess this can be considered a bug in GAR that those files are not cleaned up, but I was sure they where after the .gz was built. Dago? http://buildfarm.opencsw.org/hudson/job/clamav-i386-pc-solaris2.8/0/console -- Trygve From dam at opencsw.org Mon Dec 8 23:56:54 2008 From: dam at opencsw.org (Dagobert Michelsen) Date: Mon, 8 Dec 2008 23:56:54 +0100 Subject: [csw-devel] GAR v2 and merging stuff In-Reply-To: <493D6E07.70501@opencsw.org> References: <493D6E07.70501@opencsw.org> Message-ID: <0DDCD941-2F2A-4212-8E2D-36A91A3D7766@opencsw.org> Hi Trygve, Am 08.12.2008 um 19:57 schrieb Trygve Laugst?l: > Hi (Dago) > > Shouldn't this build actually work as the build machine support amd64? No, it does not. Solaris 8 x86 supports only 32 bit. That's what I talked about: GAR should ssh over to Solaris 10 x86 and build amd64 there. > http://buildfarm.opencsw.org/hudson/job/libogg-i386-pc-solaris2.8/0/console > > What where the goals to dump the configuration/possible settings > available? I'm sorry, I don't understand what you are talking about. Shell environment? > I'd like to have each build dump that before building, should > make it easier to find discrepancies between what you have at home and > what the build farm uses. ?hm, what dump? Best regards -- Dago From dam at opencsw.org Mon Dec 8 23:59:16 2008 From: dam at opencsw.org (Dagobert Michelsen) Date: Mon, 8 Dec 2008 23:59:16 +0100 Subject: [csw-devel] SF.net SVN: gar:[2467] csw/mgar/pkg/clamav/trunk In-Reply-To: <493D97A1.7050405@opencsw.org> References: <493D6BBF.6060305@opencsw.org> <625385e30812081201s24cb11bl59a46802056156a8@mail.gmail.com> <493D8D9E.3070506@opencsw.org> <625385e30812081332v35eeb8d9ja4886985f6dde736@mail.gmail.com> <493D97A1.7050405@opencsw.org> Message-ID: <1B6136FD-1A37-4A57-B1AD-53BE2DA3E66A@opencsw.org> Hi Trygve, Am 08.12.2008 um 22:54 schrieb Trygve Laugst?l: > Aha, look here: > > [22:53:20][hudson at build8s:~]$ ls -l /tmp/clamav-* > -rw-r--r-- 1 hudson csw 3075072 Dec 8 22:11 > /tmp/clamav-0.94.2,REV=2008.12.08-SunOS5.8-sparc-CSW.pkg > -rw-r--r-- 1 bonivart csw 17617 Dec 8 17:50 > /tmp/clamav-0.94.2,REV=2008.12.08-SunOS5.8-sparc-CSW.pkg.gz > > I guess this can be considered a bug in GAR that those files are not > cleaned up, but I was sure they where after the .gz was built. Dago? > > http://buildfarm.opencsw.org/hudson/job/clamav-i386-pc-solaris2.8/0/console I'd say Peter copied the package to tmp manually and GAR couldn't overwrite it. Correct, Peter? ;-) Best regards -- Dago From dam at opencsw.org Tue Dec 9 00:01:04 2008 From: dam at opencsw.org (Dagobert Michelsen) Date: Tue, 9 Dec 2008 00:01:04 +0100 Subject: [csw-devel] SF.net SVN: gar:[2467] csw/mgar/pkg/clamav/trunk In-Reply-To: References: Message-ID: Hi Peter, Am 07.12.2008 um 14:33 schrieb bonivart at users.sourceforge.net: > +PKGFILE_CSWlibclamav_EXCLUSIVE = $(libdir)/.* > +PKGFILE_CSWlibclamav_EXCLUSIVE += $(includedir)/.* Well, that's another thing I have changed: This is now called PKGFILE_CSWlibclamav = ... (that is, files are now exclusively in one package by default and _SHARED otherwise). Sorry for the inconvenience. Best regards -- Dago From wbonnet at users.sourceforge.net Tue Dec 9 00:08:00 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 08 Dec 2008 23:08:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[2477] csw/mgar/gar Message-ID: Revision: 2477 http://gar.svn.sourceforge.net/gar/?rev=2477&view=rev Author: wbonnet Date: 2008-12-08 23:07:54 +0000 (Mon, 08 Dec 2008) Log Message: ----------- lftp timeout raised from 10 to 30 seconds Modified Paths: -------------- csw/mgar/gar/v1/bin/upstream_watch csw/mgar/gar/v2/bin/upstream_watch Modified: csw/mgar/gar/v1/bin/upstream_watch =================================================================== --- csw/mgar/gar/v1/bin/upstream_watch 2008-12-08 15:12:46 UTC (rev 2476) +++ csw/mgar/gar/v1/bin/upstream_watch 2008-12-08 23:07:54 UTC (rev 2477) @@ -90,7 +90,7 @@ $http_proxy_cmd = "set http:proxy $ENV{HTTP_PROXY};" if exists $ENV{HTTP_PROXY}; $http_proxy_cmd = "set http:proxy $ENV{http_proxy};" if exists $ENV{http_proxy}; - open (FH, "lftp -q -c \"set net:timeout 10; set net:max-retries 16; $ftp_proxy_cmd $http_proxy_cmd open $url/ && ls\" 2>/dev/null |"); + open (FH, "lftp -q -c \"set net:timeout 30; set net:max-retries 16; $ftp_proxy_cmd $http_proxy_cmd open $url/ && ls\" 2>/dev/null |"); while (my $line = ) { my @cols = split (/\s+/, $line); Modified: csw/mgar/gar/v2/bin/upstream_watch =================================================================== --- csw/mgar/gar/v2/bin/upstream_watch 2008-12-08 15:12:46 UTC (rev 2476) +++ csw/mgar/gar/v2/bin/upstream_watch 2008-12-08 23:07:54 UTC (rev 2477) @@ -90,7 +90,7 @@ $http_proxy_cmd = "set http:proxy $ENV{HTTP_PROXY};" if exists $ENV{HTTP_PROXY}; $http_proxy_cmd = "set http:proxy $ENV{http_proxy};" if exists $ENV{http_proxy}; - open (FH, "lftp -q -c \"set net:timeout 10; set net:max-retries 16; $ftp_proxy_cmd $http_proxy_cmd open $url/ && ls\" 2>/dev/null |"); + open (FH, "lftp -q -c \"set net:timeout 30; set net:max-retries 16; $ftp_proxy_cmd $http_proxy_cmd open $url/ && ls\" 2>/dev/null |"); while (my $line = ) { my @cols = split (/\s+/, $line); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From william at wbonnet.net Mon Dec 8 23:13:14 2008 From: william at wbonnet.net (William Bonnet) Date: Mon, 08 Dec 2008 23:13:14 +0100 Subject: [csw-devel] X11 path in svn Message-ID: <493D9BFA.1000001@wbonnet.net> Hi I plan to create a directory called x11 under svn/pkgs. At the same level as cpan or xfce. Any objection ? cheers W. -- William http://www.wbonnet.net http://www.sunwizard.net Le site fran?ais des amateurs de stations Unix http://www.blastwave.org An OpenSolaris Community Site http://www.opencsw.org Community SoftWare for Solaris http://www.guses.org French speaking Solaris User Group From bonivart at opencsw.org Tue Dec 9 00:14:27 2008 From: bonivart at opencsw.org (Peter Bonivart) Date: Tue, 9 Dec 2008 00:14:27 +0100 Subject: [csw-devel] SF.net SVN: gar:[2467] csw/mgar/pkg/clamav/trunk In-Reply-To: <1B6136FD-1A37-4A57-B1AD-53BE2DA3E66A@opencsw.org> References: <493D6BBF.6060305@opencsw.org> <625385e30812081201s24cb11bl59a46802056156a8@mail.gmail.com> <493D8D9E.3070506@opencsw.org> <625385e30812081332v35eeb8d9ja4886985f6dde736@mail.gmail.com> <493D97A1.7050405@opencsw.org> <1B6136FD-1A37-4A57-B1AD-53BE2DA3E66A@opencsw.org> Message-ID: <625385e30812081514x44dd67fcq6ddca33cd0adc114@mail.gmail.com> On Mon, Dec 8, 2008 at 11:59 PM, Dagobert Michelsen wrote: > I'd say Peter copied the package to tmp manually and GAR couldn't > overwrite > it. Correct, Peter? ;-) No, but I aborted some builds so they may have left debris. -- /peter From trygvel at opencsw.org Tue Dec 9 00:16:56 2008 From: trygvel at opencsw.org (=?ISO-8859-1?Q?Trygve_Laugst=F8l?=) Date: Tue, 09 Dec 2008 00:16:56 +0100 Subject: [csw-devel] X11 path in svn In-Reply-To: <493D9BFA.1000001@wbonnet.net> References: <493D9BFA.1000001@wbonnet.net> Message-ID: <493DAAE8.6080005@opencsw.org> William Bonnet wrote: > Hi > > I plan to create a directory called x11 under svn/pkgs. At the same > level as cpan or xfce. Any objection ? +1 -- Trygve From bonivart at opencsw.org Tue Dec 9 00:18:06 2008 From: bonivart at opencsw.org (Peter Bonivart) Date: Tue, 9 Dec 2008 00:18:06 +0100 Subject: [csw-devel] SF.net SVN: gar:[2467] csw/mgar/pkg/clamav/trunk In-Reply-To: References: Message-ID: <625385e30812081518k2c42ea59l7aff6a34554daf64@mail.gmail.com> On Tue, Dec 9, 2008 at 12:01 AM, Dagobert Michelsen wrote: > Hi Peter, > > Am 07.12.2008 um 14:33 schrieb bonivart at users.sourceforge.net: >> +PKGFILE_CSWlibclamav_EXCLUSIVE = $(libdir)/.* >> +PKGFILE_CSWlibclamav_EXCLUSIVE += $(includedir)/.* > > Well, that's another thing I have changed: This is now called > PKGFILE_CSWlibclamav = ... > (that is, files are now exclusively in one package by default > and _SHARED otherwise). Sorry for the inconvenience. Hudson builds from what I last commited. Locally I have now switched to GAR v2 and removed the _EXCLUSIVE-part. I sent you a mail with the problems I got then. I'm sure I have missed something, maybe it's easiest if you look in my home dir or should I commit again? -- /peter From dam at opencsw.org Tue Dec 9 00:21:36 2008 From: dam at opencsw.org (Dagobert Michelsen) Date: Tue, 9 Dec 2008 00:21:36 +0100 Subject: [csw-devel] X11 path in svn In-Reply-To: <493D9BFA.1000001@wbonnet.net> References: <493D9BFA.1000001@wbonnet.net> Message-ID: <04477B6F-78CC-4317-8C49-CDB352FD34C5@opencsw.org> Hi William, Am 08.12.2008 um 23:13 schrieb William Bonnet: > I plan to create a directory called x11 under svn/pkgs. At the same > level as cpan or xfce. Any objection ? If this grouping makes sense for you please go ahead. Best regards -- Dago From william at wbonnet.net Mon Dec 8 23:23:53 2008 From: william at wbonnet.net (William Bonnet) Date: Mon, 08 Dec 2008 23:23:53 +0100 Subject: [csw-devel] X11 path in svn In-Reply-To: <493DAAE8.6080005@opencsw.org> References: <493D9BFA.1000001@wbonnet.net> <493DAAE8.6080005@opencsw.org> Message-ID: <493D9E79.1070904@wbonnet.net> Hi Trygve > William Bonnet wrote: > >> Hi >> >> I plan to create a directory called x11 under svn/pkgs. At the same >> level as cpan or xfce. Any objection ? >> > > +1 > BTW Same question for creating a java dir and move all jboss tomcat* log4g and other java libs like apache commons to this dir. Cheers -- William http://www.wbonnet.net http://www.sunwizard.net Le site fran?ais des amateurs de stations Unix http://www.blastwave.org An OpenSolaris Community Site http://www.opencsw.org Community SoftWare for Solaris http://www.guses.org French speaking Solaris User Group From dam at opencsw.org Tue Dec 9 00:25:26 2008 From: dam at opencsw.org (Dagobert Michelsen) Date: Tue, 9 Dec 2008 00:25:26 +0100 Subject: [csw-devel] X11 path in svn In-Reply-To: <493D9E79.1070904@wbonnet.net> References: <493D9BFA.1000001@wbonnet.net> <493DAAE8.6080005@opencsw.org> <493D9E79.1070904@wbonnet.net> Message-ID: Hi William, Am 08.12.2008 um 23:23 schrieb William Bonnet: > Hi Trygve >> William Bonnet wrote: >>> I plan to create a directory called x11 under svn/pkgs. At the same >>> level as cpan or xfce. Any objection ? >> >> +1 >> > BTW Same question for creating a java dir and move all jboss tomcat* > log4g and other java libs like apache commons to this dir. I planned to use /java for JDK/JRE stuff. Do you think it is a good idea to mix in real applications like tomcat? Which already have a userbase? Best regards -- Dago From william at wbonnet.net Mon Dec 8 23:25:39 2008 From: william at wbonnet.net (William Bonnet) Date: Mon, 08 Dec 2008 23:25:39 +0100 Subject: [csw-devel] X11 path in svn In-Reply-To: <04477B6F-78CC-4317-8C49-CDB352FD34C5@opencsw.org> References: <493D9BFA.1000001@wbonnet.net> <04477B6F-78CC-4317-8C49-CDB352FD34C5@opencsw.org> Message-ID: <493D9EE3.2090605@wbonnet.net> Hi > If this grouping makes sense for you please go ahead. > It does, it will contains all libs from Xorg. They share some compilation options, like prefix. Cheers -- William http://www.wbonnet.net http://www.sunwizard.net Le site fran?ais des amateurs de stations Unix http://www.blastwave.org An OpenSolaris Community Site http://www.opencsw.org Community SoftWare for Solaris http://www.guses.org French speaking Solaris User Group From trygvel at opencsw.org Tue Dec 9 05:17:07 2008 From: trygvel at opencsw.org (=?ISO-8859-1?Q?Trygve_Laugst=F8l?=) Date: Tue, 09 Dec 2008 05:17:07 +0100 Subject: [csw-devel] SF.net SVN: gar:[2467] csw/mgar/pkg/clamav/trunk In-Reply-To: <625385e30812081518k2c42ea59l7aff6a34554daf64@mail.gmail.com> References: <625385e30812081518k2c42ea59l7aff6a34554daf64@mail.gmail.com> Message-ID: <493DF143.1010103@opencsw.org> Peter Bonivart wrote: > On Tue, Dec 9, 2008 at 12:01 AM, Dagobert Michelsen wrote: >> Hi Peter, >> >> Am 07.12.2008 um 14:33 schrieb bonivart at users.sourceforge.net: >>> +PKGFILE_CSWlibclamav_EXCLUSIVE = $(libdir)/.* >>> +PKGFILE_CSWlibclamav_EXCLUSIVE += $(includedir)/.* >> Well, that's another thing I have changed: This is now called >> PKGFILE_CSWlibclamav = ... >> (that is, files are now exclusively in one package by default >> and _SHARED otherwise). Sorry for the inconvenience. > > Hudson builds from what I last commited. Locally I have now switched > to GAR v2 and removed the _EXCLUSIVE-part. I sent you a mail with the > problems I got then. I'm sure I have missed something, maybe it's > easiest if you look in my home dir or should I commit again? I would say that normally you should commit stuff if it work locally. If what you did can be done in a more optimal way, people will most likely let you know (or you can ask of course if you are really uncertain). -- Trygve From dmichelsen at users.sourceforge.net Tue Dec 9 09:53:59 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 08:53:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[2478] csw/mgar/gar/v2 Message-ID: Revision: 2478 http://gar.svn.sourceforge.net/gar/?rev=2478&view=rev Author: dmichelsen Date: 2008-12-09 08:53:59 +0000 (Tue, 09 Dec 2008) Log Message: ----------- mGAR v2: Use inline dynamic dependencies, prototypes target, prototype filter now work Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk csw/mgar/gar/v2/gar.mk csw/mgar/gar/v2/gar.pkg.mk Removed Paths: ------------- csw/mgar/gar/v2/bin/dependon Deleted: csw/mgar/gar/v2/bin/dependon =================================================================== --- csw/mgar/gar/v2/bin/dependon 2008-12-08 23:07:54 UTC (rev 2477) +++ csw/mgar/gar/v2/bin/dependon 2008-12-09 08:53:59 UTC (rev 2478) @@ -1,3 +0,0 @@ -#!/bin/sh - -/usr/bin/pkginfo "$@" | awk '{ $1 = "P"; print }' Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2008-12-08 23:07:54 UTC (rev 2477) +++ csw/mgar/gar/v2/gar.conf.mk 2008-12-09 08:53:59 UTC (rev 2478) @@ -22,6 +22,7 @@ COOKIEDIR ?= $(COOKIEROOTDIR)/$(MODULATION) EXTRACTDIR ?= $(WORKDIR) WORKSRC ?= $(WORKDIR)/$(DISTNAME) +WORKSRC_DEFAULT ?= $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/$(DISTNAME) INSTALLISADIR ?= $(WORKROOTDIR)/install-$(MODULATION) PKGDIR ?= $(WORKROOTDIR)/package SCRATCHDIR ?= tmp Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2008-12-08 23:07:54 UTC (rev 2477) +++ csw/mgar/gar/v2/gar.mk 2008-12-09 08:53:59 UTC (rev 2478) @@ -295,7 +295,8 @@ garchive: checksum $(GARCHIVE_TARGETS) ; # extract - Unpacks $(DISTFILES) into $(EXTRACTDIR) (patches are "zcatted" into the patch program) -EXTRACT_TARGETS = $(addprefix extract-archive-,$(filter-out $(NOEXTRACT),$(DISTFILES))) +EXTRACT_TARGETS-global ?= $(foreach SPEC,$(SPKG_SPECS),$(filter $(SPEC).%,$(DISTFILES))) +EXTRACT_TARGETS = $(addprefix extract-archive-,$(filter-out $(NOEXTRACT),$(if $(EXTRACT_TARGETS-$(MODULATION)),$(EXTRACT_TARGETS-$(MODULATION)),$(DISTFILES)))) # We call an additional extract-modulated without resetting any variables so # a complete unpacked set goes to the global dir for packaging (like gspec) Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2008-12-08 23:07:54 UTC (rev 2477) +++ csw/mgar/gar/v2/gar.pkg.mk 2008-12-09 08:53:59 UTC (rev 2478) @@ -61,7 +61,7 @@ PKGLIB = $(CURDIR)/$(GARDIR)/pkglib PKG_EXPORTS = GARNAME GARVERSION DESCRIPTION CATEGORIES GARCH GARDIR GARBIN -PKG_EXPORTS += CURDIR WORKDIR WORKSRC +PKG_EXPORTS += CURDIR WORKDIR WORKSRC WORKSRC_DEFAULT PKGROOT PKG_EXPORTS += SPKG_REVSTAMP SPKG_PKGNAME SPKG_DESC SPKG_VERSION SPKG_CATEGORY PKG_EXPORTS += SPKG_VENDOR SPKG_EMAIL SPKG_PSTAMP SPKG_BASEDIR SPKG_CLASSES PKG_EXPORTS += SPKG_OSNAME SPKG_SOURCEURL SPKG_PACKAGER TIMESTAMP @@ -107,7 +107,6 @@ PKGFILES_DEVEL += $(mandir)/man1/.*-config\.1.* PKGFILES_DEVEL += $(mandir)/man3/.* - # PKGFILES_DOC selects files beloging to a documentation package PKGFILES_DOC = $(docdir)/.* @@ -132,8 +131,8 @@ # This can be used to automatically distribute the files to different packages # -$(foreach SPEC,$(_PKG_SPECS),$(eval _PROTOTYPE_FILTER_$(SPEC) ?= | $(PROTOTYPE_FILTER_$(SPEC)))) -$(foreach SPEC,$(_PKG_SPECS),$(eval _PROTOTYPE_FILTER_$(SPEC) ?= | $(PROTOTYPE_FILTER))) +$(foreach SPEC,$(_PKG_SPECS),$(if $(PROTOTYPE_FILTER_$(SPEC)),$(eval _PROTOTYPE_FILTER_$(SPEC) ?= | $(PROTOTYPE_FILTER_$(SPEC))))) +$(foreach SPEC,$(_PKG_SPECS),$(if $(PROTOTYPE_FILTER),$(eval _PROTOTYPE_FILTER_$(SPEC) ?= | $(PROTOTYPE_FILTER)))) # This file contains all installed pathes. This can be used as a starting point # for distributing files to individual packages. @@ -165,16 +164,18 @@ $(WORKDIR)/%.prototype-$(GARCH): | $(WORKDIR)/%.prototype @cat $(WORKDIR)/$*.prototype $(_PROTOTYPE_FILTER_$*) >$@ -# This is a target used to generate all prototypes for debugging purposes. -# On a normal packaging workflow this is not used. -prototypes: extract merge $(SPKG_DESTDIRS) pre-package $(foreach S,$(_PKG_SPECS),$(WORKDIR)/$S.prototype-$(GARCH)) - @$(DONADA) - # $_EXTRA_GAR_PKGS is for dynamic dependencies added by GAR itself (like CSWisaexec or CSWcswclassutils) .PRECIOUS: $(WORKDIR)/%.depend $(WORKDIR)/%.depend: - $(GARDIR)/bin/dependon $(_EXTRA_GAR_PKGS) $(REQUIRED_PKGS_$*) $(REQUIRED_PKGS) > $@ + $(if $(_EXTRA_GAR_PKGS)$(REQUIRED_PKGS_$*)$(REQUIRED_PKGS), \ + ($(foreach PKG,$(_EXTRA_GAR_PKGS) $(REQUIRED_PKGS_$*) $(REQUIRED_PKGS),\ + $(if $(SPKG_DESC_$(PKG)), \ + echo "P $(PKG) $(call _pkglist_catalogname,$(PKG)) - $(SPKG_DESC_$(PKG))";, \ + echo "$(shell /usr/bin/pkginfo $(PKG) | awk '{ $$1 = \"P\"; print }')"; \ + ) \ + )) >$@) + # package - Use the mkpackage utility to create Solaris packages # @@ -189,6 +190,10 @@ $(SPKG_DESTDIRS): ginstall -d $@ +# This is a target used to generate all prototypes for debugging purposes. +# On a normal packaging workflow this is not used. +prototypes: extract merge $(SPKG_DESTDIRS) pre-package $(foreach SPEC,$(_PKG_SPECS),$(WORKDIR)/$(SPEC).prototype-$(GARCH)) + # We depend on extract as the additional package files (like .gspec) must be # unpacked to global/ for packaging. E. g. 'merge' depends only on the specific # modulations and does not fill global/. @@ -224,7 +229,7 @@ # pkgreset - reset working directory for repackaging # -pkgreset: $(addprefix pkgreset-,$(_PKG_SPECS)) +pkgreset: $(addprefix pkgreset-,$(SPKG_SPECS)) @rm -f $(COOKIEDIR)/extract @rm -f $(COOKIEDIR)/extract-archive-* $(DONADA) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Dec 9 10:00:16 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 09 Dec 2008 09:00:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[2479] csw/mgar/pkg/clamav/trunk Message-ID: Revision: 2479 http://gar.svn.sourceforge.net/gar/?rev=2479&view=rev Author: bonivart Date: 2008-12-09 09:00:16 +0000 (Tue, 09 Dec 2008) Log Message: ----------- clamav: more fixes Modified Paths: -------------- csw/mgar/pkg/clamav/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/clamav/trunk/ Property changes on: csw/mgar/pkg/clamav/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/clamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamav/trunk/Makefile 2008-12-09 08:53:59 UTC (rev 2478) +++ csw/mgar/pkg/clamav/trunk/Makefile 2008-12-09 09:00:16 UTC (rev 2479) @@ -1,6 +1,7 @@ # clamav, Peter Bonivart + # files outside /opt/csw are not included, need to fix gspec and cswproto -# split into multiple packages: clamav, libclamav, clamavdb? +# split into multiple packages: clamav, libclamav # put libs in lib/32? # add depend files # add rc/smf support @@ -29,13 +30,16 @@ MASTER_SITES = http://freshmeat.net/redir/clamav/29355/url_tgz/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWclamav,) DISTFILES += $(call admfiles,CSWlibclamav,) -DISTFILES += $(call admfiles,CSWclamav,) +PKGFILES_CSWlibclamav = $(libdir)/.* +PKGFILES_CSWlibclamav += $(includedir)/.* + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -GARCOMPILER = GNU +GARCOMPILER = GCC3 GNU_CC_HOME = /opt/csw/gcc3 CONFIGURE_ARGS = $(DIRPATHS) @@ -48,34 +52,34 @@ include gar/category.mk -PKGFILE_CSWlibclamav_EXCLUSIVE = $(libdir)/.* -PKGFILE_CSWlibclamav_EXCLUSIVE += $(includedir)/.* - SPKG_SOURCEURL = http://www.clamav.net/ pre-package: @echo " ==> Pre-package for $(GARNAME)" - @find $(DESTDIR) -type f -name "*~" -exec rm {} \; - @find $(DESTDIR)/opt/csw/lib -type f -name "*.a" -exec rm {} \; - @find $(DESTDIR)/opt/csw/lib -type f -name "*.la" -exec rm {} \; - @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME)/html - @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME)/contrib - @ginstall -m 644 $(WORKSRC)/AUTHORS $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 644 $(WORKSRC)/BUGS $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 644 $(WORKSRC)/ChangeLog $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 644 $(WORKSRC)/docs/clamav-mirror-howto.pdf $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 644 $(WORKSRC)/docs/clamdoc.pdf $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 644 $(WORKSRC)/COPYING $(DESTDIR)$(docdir)/$(GARNAME)/LICENSE - @ginstall -m 644 $(WORKSRC)/FAQ $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 644 $(WORKSRC)/NEWS $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 644 $(WORKSRC)/docs/phishsigs_howto.pdf $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 644 $(WORKSRC)/README $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 644 $(WORKSRC)/docs/signatures.pdf $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 644 $(WORKSRC)/UPGRADE $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 644 $(WORKSRC)/contrib/clamdwatch/* $(DESTDIR)$(docdir)/$(GARNAME)/contrib - @ginstall -m 644 $(WORKSRC)/contrib/init/Solaris10/* $(DESTDIR)$(docdir)/$(GARNAME)/contrib - @ginstall -m 644 $(WORKSRC)/contrib/cleanup-partial.pl $(DESTDIR)$(docdir)/$(GARNAME)/contrib + @echo "DESTDIR: $(DESTDIR)" + @echo "WORKSRC: $(WORKSRC)" + @echo "PKGROOT: $(PKGROOT)" + @find $(PKGROOT) -type f -name "*~" -exec rm {} \; + @find $(PKGROOT)/opt/csw/lib -type f -name "*.a" -exec rm {} \; + @find $(PKGROOT)/opt/csw/lib -type f -name "*.la" -exec rm {} \; + @ginstall -d $(PKGROOT)$(docdir)/$(GARNAME)/html + @ginstall -d $(PKGROOT)$(docdir)/$(GARNAME)/contrib + @ginstall -m 644 $(WORKSRC)/AUTHORS $(PKGROOT)$(docdir)/$(GARNAME) + @ginstall -m 644 $(WORKSRC)/BUGS $(PKGROOT)$(docdir)/$(GARNAME) + @ginstall -m 644 $(WORKSRC)/ChangeLog $(PKGROOT)$(docdir)/$(GARNAME) + @ginstall -m 644 $(WORKSRC)/docs/clamav-mirror-howto.pdf $(PKGROOT)$(docdir)/$(GARNAME) + @ginstall -m 644 $(WORKSRC)/docs/clamdoc.pdf $(PKGROOT)$(docdir)/$(GARNAME) + @ginstall -m 644 $(WORKSRC)/COPYING $(PKGROOT)$(docdir)/$(GARNAME)/LICENSE + @ginstall -m 644 $(WORKSRC)/FAQ $(PKGROOT)$(docdir)/$(GARNAME) + @ginstall -m 644 $(WORKSRC)/NEWS $(PKGROOT)$(docdir)/$(GARNAME) + @ginstall -m 644 $(WORKSRC)/docs/phishsigs_howto.pdf $(PKGROOT)$(docdir)/$(GARNAME) + @ginstall -m 644 $(WORKSRC)/README $(PKGROOT)$(docdir)/$(GARNAME) + @ginstall -m 644 $(WORKSRC)/docs/signatures.pdf $(PKGROOT)$(docdir)/$(GARNAME) + @ginstall -m 644 $(WORKSRC)/UPGRADE $(PKGROOT)$(docdir)/$(GARNAME) + @ginstall -m 644 $(WORKSRC)/contrib/clamdwatch/* $(PKGROOT)$(docdir)/$(GARNAME)/contrib + @ginstall -m 644 $(WORKSRC)/contrib/init/Solaris10/* $(PKGROOT)$(docdir)/$(GARNAME)/contrib + @ginstall -m 644 $(WORKSRC)/contrib/cleanup-partial.pl $(PKGROOT)$(docdir)/$(GARNAME)/contrib @for file in $(WORKSRC)/docs/html/*; do \ - cp $$file $(DESTDIR)$(docdir)/$(GARNAME)/html ; \ + cp $$file $(PKGROOT)$(docdir)/$(GARNAME)/html ; \ done @$(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 Tue Dec 9 10:13:58 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 09:13:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[2480] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 2480 http://gar.svn.sourceforge.net/gar/?rev=2480&view=rev Author: dmichelsen Date: 2008-12-09 09:13:56 +0000 (Tue, 09 Dec 2008) Log Message: ----------- mGAR v2: Fix CC_HOME and CC_VERSION Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2008-12-09 09:00:16 UTC (rev 2479) +++ csw/mgar/gar/v2/gar.conf.mk 2008-12-09 09:13:56 UTC (rev 2480) @@ -374,25 +374,21 @@ GCC4_AS_FLAGS ?= $(EXTRA_GCC4_AS_FLAGS) $(EXTRA_GCC_AS_FLAGS) $(EXTRA_AS_FLAGS) SOS11_AS_FLAGS ?= $(EXTRA_SOS11_AS_FLAGS) $(EXTRA_SOS_AS_FLAGS) $(EXTRA_AS_FLAGS) SOS12_AS_FLAGS ?= $(EXTRA_SOS12_AS_FLAGS) $(EXTRA_SOS_AS_FLAGS) $(EXTRA_AS_FLAGS) -GCC3_LD_FLAGS ?= -L$(GNU_CC_HOME)/lib $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS) -GCC4_LD_FLAGS ?= -L$(GNU_CC_HOME)/lib $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS) +GCC3_LD_FLAGS ?= -L$(GCC3_CC_HOME)/lib $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS) +GCC4_LD_FLAGS ?= -L$(GCC4_CC_HOME)/lib $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS) SOS11_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) SOS12_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) # Compiler version -GCC_CC_VERSION = $(shell $(CC_HOME)/bin/gcc -v 2>&1| ggrep version) -GCC_CXX_VERSION = $(CC_VERSION) -GCC3_CC_VERSION = $(GCC_CC_VERSION) -GCC3_CXX_VERSION = $(GCC_CXX_VERSION) -GCC4_CC_VERSION = $(GCC_CC_VERSION) -GCC4_CXX_VERSION = $(GCC_CXX_VERSION) +GCC3_CC_VERSION = $(shell $(GCC3_CC) -v 2>&1| ggrep version) +GCC3_CXX_VERSION = $(shell $(GCC3_CXX) -v 2>&1| ggrep version) +GCC4_CC_VERSION = $(shell $(GCC4_CC) -v 2>&1| ggrep version) +GCC4_CXX_VERSION = $(shell $(GCC4_CXX) -v 2>&1| ggrep version) -SOS_CC_VERSION = $(shell $(CC_HOME)/bin/cc -V 2>&1| ggrep cc: | gsed -e 's/cc: //') -SOS_CXX_VERSION = $(shell $(CC_HOME)/bin/CC -V 2>&1| ggrep CC: | gsed -e 's/CC: //') -SOS11_CC_VERSION = $(SOS_CC_VERSION) -SOS11_CXX_VERSION = $(SOS_CXX_VERSION) -SOS12_CC_VERSION = $(SOS_CC_VERSION) -SOS12_CXX_VERSION = $(SOS_CXX_VERSION) +SOS11_CC_VERSION = $(shell $(SOS11_CC) -V 2>&1| ggrep cc: | gsed -e 's/cc: //') +SOS11_CXX_VERSION = $(shell $(SOS11_CXX)/bin/CC -V 2>&1| ggrep CC: | gsed -e 's/CC: //') +SOS12_CC_VERSION = $(shell $(SOS11_CC) -V 2>&1| ggrep cc: | gsed -e 's/cc: //') +SOS12_CXX_VERSION = $(shell $(SOS11_CXX)/bin/CC -V 2>&1| ggrep CC: | gsed -e 's/CC: //') CC_VERSION = $($(GARCOMPILER)_CC_VERSION) CXX_VERSION = $($(GARCOMPILER)_CXX_VERSION) 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 Dec 9 10:45:39 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 09:45:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[2481] csw/mgar/pkg/libntlm/trunk Message-ID: Revision: 2481 http://gar.svn.sourceforge.net/gar/?rev=2481&view=rev Author: dmichelsen Date: 2008-12-09 09:45:39 +0000 (Tue, 09 Dec 2008) Log Message: ----------- libntlm: Update to 1.0 and mGAR v2 Modified Paths: -------------- csw/mgar/pkg/libntlm/trunk/Makefile csw/mgar/pkg/libntlm/trunk/checksums csw/mgar/pkg/libntlm/trunk/files/CSWlibntlm.gspec Property Changed: ---------------- csw/mgar/pkg/libntlm/trunk/ Property changes on: csw/mgar/pkg/libntlm/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/libntlm/trunk/Makefile =================================================================== --- csw/mgar/pkg/libntlm/trunk/Makefile 2008-12-09 09:13:56 UTC (rev 2480) +++ csw/mgar/pkg/libntlm/trunk/Makefile 2008-12-09 09:45:39 UTC (rev 2481) @@ -1,5 +1,5 @@ GARNAME = libntlm -GARVERSION = 0.4.2 +GARVERSION = 1.0 CATEGORIES = lib DESCRIPTION = Microsoft WinNT domain authentication library @@ -18,6 +18,8 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +BUILD64 = 1 + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/libntlm/trunk/checksums =================================================================== --- csw/mgar/pkg/libntlm/trunk/checksums 2008-12-09 09:13:56 UTC (rev 2480) +++ csw/mgar/pkg/libntlm/trunk/checksums 2008-12-09 09:45:39 UTC (rev 2481) @@ -1,2 +1,2 @@ -e68a4e20628de0259b54f59725b9c486 download/libntlm-0.4.2.tar.gz -88b460b4c08154149578f07b03e360f9 download/CSWlibntlm.gspec +83dc36023ce36de0f0d2f98294c040c1 download/libntlm-1.0.tar.gz +f2c4153eb60293c0c209044812c07cae download/CSWlibntlm.gspec Modified: csw/mgar/pkg/libntlm/trunk/files/CSWlibntlm.gspec =================================================================== --- csw/mgar/pkg/libntlm/trunk/files/CSWlibntlm.gspec 2008-12-09 09:13:56 UTC (rev 2480) +++ csw/mgar/pkg/libntlm/trunk/files/CSWlibntlm.gspec 2008-12-09 09:45:39 UTC (rev 2481) @@ -1,4 +1,4 @@ %var bitname libntlm %var pkgname CSWlibntlm %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING +%copyright url file://%{WORKSRC_DEFAULT}/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 Tue Dec 9 10:54:32 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 09:54:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[2482] csw/mgar/gar/v2 Message-ID: Revision: 2482 http://gar.svn.sourceforge.net/gar/?rev=2482&view=rev Author: dmichelsen Date: 2008-12-09 09:54:32 +0000 (Tue, 09 Dec 2008) Log Message: ----------- mGAR v2: Use WORKSRC for first modulation Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2008-12-09 09:45:39 UTC (rev 2481) +++ csw/mgar/gar/v2/gar.conf.mk 2008-12-09 09:54:32 UTC (rev 2482) @@ -21,8 +21,8 @@ COOKIEROOTDIR ?= cookies COOKIEDIR ?= $(COOKIEROOTDIR)/$(MODULATION) EXTRACTDIR ?= $(WORKDIR) -WORKSRC ?= $(WORKDIR)/$(DISTNAME) -WORKSRC_DEFAULT ?= $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/$(DISTNAME) +#WORKSRC ?= $(WORKDIR)/$(DISTNAME) +WORKSRC ?= $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/$(DISTNAME) INSTALLISADIR ?= $(WORKROOTDIR)/install-$(MODULATION) PKGDIR ?= $(WORKROOTDIR)/package SCRATCHDIR ?= tmp Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2008-12-09 09:45:39 UTC (rev 2481) +++ csw/mgar/gar/v2/gar.pkg.mk 2008-12-09 09:54:32 UTC (rev 2482) @@ -61,7 +61,7 @@ PKGLIB = $(CURDIR)/$(GARDIR)/pkglib PKG_EXPORTS = GARNAME GARVERSION DESCRIPTION CATEGORIES GARCH GARDIR GARBIN -PKG_EXPORTS += CURDIR WORKDIR WORKSRC WORKSRC_DEFAULT PKGROOT +PKG_EXPORTS += CURDIR WORKDIR WORKSRC PKGROOT PKG_EXPORTS += SPKG_REVSTAMP SPKG_PKGNAME SPKG_DESC SPKG_VERSION SPKG_CATEGORY PKG_EXPORTS += SPKG_VENDOR SPKG_EMAIL SPKG_PSTAMP SPKG_BASEDIR SPKG_CLASSES PKG_EXPORTS += SPKG_OSNAME SPKG_SOURCEURL SPKG_PACKAGER TIMESTAMP 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 Dec 9 10:55:49 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 09:55:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[2483] csw/mgar/pkg/libntlm/trunk Message-ID: Revision: 2483 http://gar.svn.sourceforge.net/gar/?rev=2483&view=rev Author: dmichelsen Date: 2008-12-09 09:55:49 +0000 (Tue, 09 Dec 2008) Log Message: ----------- libntlm: Readjust to WORKSRC Modified Paths: -------------- csw/mgar/pkg/libntlm/trunk/checksums csw/mgar/pkg/libntlm/trunk/files/CSWlibntlm.gspec Modified: csw/mgar/pkg/libntlm/trunk/checksums =================================================================== --- csw/mgar/pkg/libntlm/trunk/checksums 2008-12-09 09:54:32 UTC (rev 2482) +++ csw/mgar/pkg/libntlm/trunk/checksums 2008-12-09 09:55:49 UTC (rev 2483) @@ -1,2 +1,2 @@ 83dc36023ce36de0f0d2f98294c040c1 download/libntlm-1.0.tar.gz -f2c4153eb60293c0c209044812c07cae download/CSWlibntlm.gspec +88b460b4c08154149578f07b03e360f9 download/CSWlibntlm.gspec Modified: csw/mgar/pkg/libntlm/trunk/files/CSWlibntlm.gspec =================================================================== --- csw/mgar/pkg/libntlm/trunk/files/CSWlibntlm.gspec 2008-12-09 09:54:32 UTC (rev 2482) +++ csw/mgar/pkg/libntlm/trunk/files/CSWlibntlm.gspec 2008-12-09 09:55:49 UTC (rev 2483) @@ -1,4 +1,4 @@ %var bitname libntlm %var pkgname CSWlibntlm %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC_DEFAULT}/COPYING +%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 Tue Dec 9 11:20:31 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 10:20:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[2484] csw/mgar/gar/v2/bin Message-ID: Revision: 2484 http://gar.svn.sourceforge.net/gar/?rev=2484&view=rev Author: dmichelsen Date: 2008-12-09 10:20:31 +0000 (Tue, 09 Dec 2008) Log Message: ----------- mGAR v2: Merge [2139] from v1 to v2 Modified Paths: -------------- csw/mgar/gar/v2/bin/checkpkg csw/mgar/gar/v2/bin/gencatalog csw/mgar/gar/v2/bin/killdupes csw/mgar/gar/v2/bin/whoowns Modified: csw/mgar/gar/v2/bin/checkpkg =================================================================== --- csw/mgar/gar/v2/bin/checkpkg 2008-12-09 09:55:49 UTC (rev 2483) +++ csw/mgar/gar/v2/bin/checkpkg 2008-12-09 10:20:31 UTC (rev 2484) @@ -2,10 +2,10 @@ # checkpkg 1.46a (diff to 1.46: modified errmsg -> warnmsg on two places) # This script examines a package that has been put together -# for submittal to the CSW archive at blastwave.org +# for submittal to the CSW archive # # It examines it for compliance with the packaging standards at -# http://www.blastwave.org/standards/ +# http://www.opencsw.org/standards/ # It DOES NOT CATCH EVERYTHING. However, the package will be # tested with this script before acceptance, so you may as well # save yourself some time, and run the script yourself! Modified: csw/mgar/gar/v2/bin/gencatalog =================================================================== --- csw/mgar/gar/v2/bin/gencatalog 2008-12-09 09:55:49 UTC (rev 2483) +++ csw/mgar/gar/v2/bin/gencatalog 2008-12-09 10:20:31 UTC (rev 2484) @@ -10,7 +10,7 @@ # author(s) shall not be liable in the event that use of the # software causes damage. # -# gencatalog - generate a blastwave v1 style catalog and description file. +# gencatalog - generate a v1 style catalog and description file. # cp catalog catalog.old Modified: csw/mgar/gar/v2/bin/killdupes =================================================================== --- csw/mgar/gar/v2/bin/killdupes 2008-12-09 09:55:49 UTC (rev 2483) +++ csw/mgar/gar/v2/bin/killdupes 2008-12-09 10:20:31 UTC (rev 2484) @@ -12,7 +12,7 @@ # # killdupes - Remove duplicate packages from a directory, with or # without user interaction. Note that this only works -# for packages named according to blastwave standards. +# for packages named according to package standards. # use strict; Modified: csw/mgar/gar/v2/bin/whoowns =================================================================== --- csw/mgar/gar/v2/bin/whoowns 2008-12-09 09:55:49 UTC (rev 2483) +++ csw/mgar/gar/v2/bin/whoowns 2008-12-09 10:20:31 UTC (rev 2484) @@ -2,9 +2,9 @@ for pkg in $@ do - owner=`curl -s http://www.blastwave.org/packages/$pkg | \ + owner=`curl -s http://www.opencsw.org/packages/$pkg | \ grep Maintainer: | cut -f5 -d'>' | cut -f1 -d'<'` - version=`curl -s http://www.blastwave.org/packages/$pkg | \ + version=`curl -s http://www.opencsw.org/packages/$pkg | \ grep Version: | cut -f4 -d'>' | cut -f1 -d' '` printf "%-20s %-30s %s\n" $pkg ${version:-Unknown} "${owner:-Nobody}" 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 Dec 9 11:42:41 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 10:42:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[2485] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 2485 http://gar.svn.sourceforge.net/gar/?rev=2485&view=rev Author: dmichelsen Date: 2008-12-09 10:42:41 +0000 (Tue, 09 Dec 2008) Log Message: ----------- mGAR v2: Fix dynamic depencies on foreign package Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2008-12-09 10:20:31 UTC (rev 2484) +++ csw/mgar/gar/v2/gar.pkg.mk 2008-12-09 10:42:41 UTC (rev 2485) @@ -171,7 +171,7 @@ ($(foreach PKG,$(_EXTRA_GAR_PKGS) $(REQUIRED_PKGS_$*) $(REQUIRED_PKGS),\ $(if $(SPKG_DESC_$(PKG)), \ echo "P $(PKG) $(call _pkglist_catalogname,$(PKG)) - $(SPKG_DESC_$(PKG))";, \ - echo "$(shell /usr/bin/pkginfo $(PKG) | awk '{ $$1 = \"P\"; print }')"; \ + echo "$(shell /usr/bin/pkginfo $(PKG) | awk '{ $$1 = "P"; print } ')"; \ ) \ )) >$@) 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 Dec 9 11:48:54 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 10:48:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[2486] csw/mgar/gar/v2 Message-ID: Revision: 2486 http://gar.svn.sourceforge.net/gar/?rev=2486&view=rev Author: dmichelsen Date: 2008-12-09 10:48:53 +0000 (Tue, 09 Dec 2008) Log Message: ----------- mGAR v2: Merge [2139] from v1 to v2, additional commit Modified Paths: -------------- csw/mgar/gar/v2/README csw/mgar/gar/v2/garrc.sample csw/mgar/gar/v2/pkglib/csw/pkginfo Modified: csw/mgar/gar/v2/README =================================================================== --- csw/mgar/gar/v2/README 2008-12-09 10:42:41 UTC (rev 2485) +++ csw/mgar/gar/v2/README 2008-12-09 10:48:53 UTC (rev 2486) @@ -3,16 +3,16 @@ Welcome to the CSW build system. Please visit: - http://svn.blastwave.org/wiki/GettingStarted + http://sourceforge.net/projects/gar For instructions on how to use this system. Copyrights -- -CSW is based on the GAR ports system, Copyright 2001 Nick Moffitt. All scripts -and add-on make modules are Copyright 2006 Cory Omand, except where otherwise -noted. Packaging content is Copyright 2006 Blastwave.org, except where -otherwise noted. Patches and source code are Copyright by their original -authors, which may or may not be members of the Blastwave project. +Copyright 2001 Nick Moffitt: GAR ports system +Copyright 2006 Cory Omand: Scripts and add-on make modules, except where otherwise noted. +Copyright 2006 Blastwave.org: Packaging content, except where otherwise noted. +Copyright 2008 Dagobert Michelsen (OpenCSW): Enhancements to the CSW GAR system +Patches and source code are Copyright by their original authors. Modified: csw/mgar/gar/v2/garrc.sample =================================================================== --- csw/mgar/gar/v2/garrc.sample 2008-12-09 10:42:41 UTC (rev 2485) +++ csw/mgar/gar/v2/garrc.sample 2008-12-09 10:48:53 UTC (rev 2486) @@ -1,19 +1,19 @@ # vim: ft=make # -# ~/.garrc - Local settings file for the Blastwave build system. +# ~/.garrc - Local settings file for the CSW build system. # # For the most part, any setting found in gar.conf.mk can be overridden by # setting (or unsetting) the variable in this file. The system gar.conf.mk # provides a reasonable set of defaults, but customizations may be required to -# build packages outside of the Blastwave build stack. +# build packages outside of the CSW build stack. # # Packaging information SPKG_PACKAGER = Joe Developer -SPKG_EMAIL = jdev at blastwave.org +SPKG_EMAIL = jdev at domain.org # Where to put finished packages -SPKG_EXPORT = /export/medusa/jdev/staging/build-$(shell date '+%d.%b.%Y') +SPKG_EXPORT = /export/home/jdev/staging/build-$(shell date '+%d.%b.%Y') # Proxy settings #http_proxy = Modified: csw/mgar/gar/v2/pkglib/csw/pkginfo =================================================================== --- csw/mgar/gar/v2/pkglib/csw/pkginfo 2008-12-09 10:42:41 UTC (rev 2485) +++ csw/mgar/gar/v2/pkglib/csw/pkginfo 2008-12-09 10:48:53 UTC (rev 2486) @@ -7,4 +7,4 @@ EMAIL=%{SPKG_EMAIL} PSTAMP=%{SPKG_PSTAMP} CLASSES=%{SPKG_CLASSES} -HOTLINE=http://www.blastwave.org/bugtrack/ +HOTLINE=http://www.opencsw.org/bugtrack/ 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 Dec 9 14:45:06 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 13:45:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[2487] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 2487 http://gar.svn.sourceforge.net/gar/?rev=2487&view=rev Author: dmichelsen Date: 2008-12-09 13:45:05 +0000 (Tue, 09 Dec 2008) Log Message: ----------- mGAR v2: Fixed typo in LINKER_FLAGS Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2008-12-09 10:48:53 UTC (rev 2486) +++ csw/mgar/gar/v2/gar.conf.mk 2008-12-09 13:45:05 UTC (rev 2487) @@ -415,7 +415,7 @@ # the links 32 and 64. ifeq ($(origin LINKER_FLAGS), undefined) ifdef NOISALIST -LINKER_FLAGS = $(foreach ELIB,$(libdir_install) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR)) -R$(abspath $(ELIB)/$(MM_LIBDIR)) +LINKER_FLAGS = $(foreach ELIB,$(libdir_install) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR)) -R$(abspath $(ELIB)/$(MM_LIBDIR))) else # If we use $ISALIST it is a good idea to also add $MM_LIBDIR as there # may not be a subdirectory for the 32-bit standard case (this would normally 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 Dec 9 15:19:03 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 14:19:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[2488] csw/mgar/gar/v2 Message-ID: Revision: 2488 http://gar.svn.sourceforge.net/gar/?rev=2488&view=rev Author: dmichelsen Date: 2008-12-09 14:19:03 +0000 (Tue, 09 Dec 2008) Log Message: ----------- mGAR v2: Must use WORKSRC_FIRSTMOD in .gspec for COPYRIGHT as sources are no longer unpacked to global modulation Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2008-12-09 13:45:05 UTC (rev 2487) +++ csw/mgar/gar/v2/gar.conf.mk 2008-12-09 14:19:03 UTC (rev 2488) @@ -21,8 +21,8 @@ COOKIEROOTDIR ?= cookies COOKIEDIR ?= $(COOKIEROOTDIR)/$(MODULATION) EXTRACTDIR ?= $(WORKDIR) -#WORKSRC ?= $(WORKDIR)/$(DISTNAME) -WORKSRC ?= $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/$(DISTNAME) +WORKSRC ?= $(WORKDIR)/$(DISTNAME) +WORKSRC_FIRSTMOD ?= $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/$(DISTNAME) INSTALLISADIR ?= $(WORKROOTDIR)/install-$(MODULATION) PKGDIR ?= $(WORKROOTDIR)/package SCRATCHDIR ?= tmp Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2008-12-09 13:45:05 UTC (rev 2487) +++ csw/mgar/gar/v2/gar.pkg.mk 2008-12-09 14:19:03 UTC (rev 2488) @@ -61,7 +61,7 @@ PKGLIB = $(CURDIR)/$(GARDIR)/pkglib PKG_EXPORTS = GARNAME GARVERSION DESCRIPTION CATEGORIES GARCH GARDIR GARBIN -PKG_EXPORTS += CURDIR WORKDIR WORKSRC PKGROOT +PKG_EXPORTS += CURDIR WORKDIR WORKSRC WORKSRC_FIRSTMOD PKGROOT PKG_EXPORTS += SPKG_REVSTAMP SPKG_PKGNAME SPKG_DESC SPKG_VERSION SPKG_CATEGORY PKG_EXPORTS += SPKG_VENDOR SPKG_EMAIL SPKG_PSTAMP SPKG_BASEDIR SPKG_CLASSES PKG_EXPORTS += SPKG_OSNAME SPKG_SOURCEURL SPKG_PACKAGER TIMESTAMP 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 Dec 9 15:19:37 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 14:19:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[2489] csw/mgar/pkg/sysstat/trunk Message-ID: Revision: 2489 http://gar.svn.sourceforge.net/gar/?rev=2489&view=rev Author: dmichelsen Date: 2008-12-09 14:19:37 +0000 (Tue, 09 Dec 2008) Log Message: ----------- sysstat: Update to 20081207 and latest mGAR v2 features Modified Paths: -------------- csw/mgar/pkg/sysstat/trunk/Makefile csw/mgar/pkg/sysstat/trunk/checksums csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.gspec csw/mgar/pkg/sysstat/trunk/files/patch-onlyisaexec-sysstatd.diff Removed Paths: ------------- csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.depend csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.prototype-i386 csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.prototype-sparc csw/mgar/pkg/sysstat/trunk/files/patch-isaexec-compat.diff csw/mgar/pkg/sysstat/trunk/files/patch-sysstat-shareman.diff Modified: csw/mgar/pkg/sysstat/trunk/Makefile =================================================================== --- csw/mgar/pkg/sysstat/trunk/Makefile 2008-12-09 14:19:03 UTC (rev 2488) +++ csw/mgar/pkg/sysstat/trunk/Makefile 2008-12-09 14:19:37 UTC (rev 2489) @@ -1,5 +1,5 @@ GARNAME = sysstat -GARVERSION = 20081125 +GARVERSION = 20081207 CATEGORIES = utils DESCRIPTION = Key system statistics at a glance @@ -18,8 +18,10 @@ MASTER_SITES = http://www.maier-komor.de/$(GARNAME)/ DISTFILES = $(GARNAME)-$(GARVERSION).tgz -DISTFILES += $(call admfiles,CSWsysstat,prototype-sparc prototype-i386 depend) +DISTFILES += $(call admfiles,CSWsysstat) +REQUIRED_PKGS = CSWncurses + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz @@ -53,6 +55,8 @@ # only done via sysstatd which uses isaexec. ISAEXEC_FILES = $(sbindir)/sysstatd +PROTOTYPE_FILTER = awk '$$$$3 ~ /\/sysstatd$$$$/ { $$$$4 = "4755" } { print }' + include gar/category.mk # We don't have a autoconf-style configure. The configure script Modified: csw/mgar/pkg/sysstat/trunk/checksums =================================================================== --- csw/mgar/pkg/sysstat/trunk/checksums 2008-12-09 14:19:03 UTC (rev 2488) +++ csw/mgar/pkg/sysstat/trunk/checksums 2008-12-09 14:19:37 UTC (rev 2489) @@ -1,6 +1,6 @@ -c634dc06c3c9211b1f63e0beeba7de64 download/sysstat-20081125.tgz -465eb128e17cb36e0e904fa759972283 download/CSWsysstat.gspec +7d5d5489a19119121b4bd53b85a91886 download/sysstat-20081207.tgz +c2be614c9715a73b469173e9888f1826 download/CSWsysstat.gspec e51f94d090618f19b854104291b10645 download/CSWsysstat.prototype-sparc 8c1dbc2e5fc16f16dbdfbe47b81e76f0 download/CSWsysstat.prototype-i386 2ba417371d006cee9ad62bf67252b05b download/CSWsysstat.depend -6c8b6d3c4a5b15157f02216b4ad2b459 download/patch-onlyisaexec-sysstatd.diff +7a7f0f67bb68484b56375d4a922fb63f download/patch-onlyisaexec-sysstatd.diff Deleted: csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.depend =================================================================== --- csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.depend 2008-12-09 14:19:03 UTC (rev 2488) +++ csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.depend 2008-12-09 14:19:37 UTC (rev 2489) @@ -1,2 +0,0 @@ -P CSWisaexec isaexec - sneaky wrapper around Sun isaexec -P CSWncurses ncurses - ncurses library and utilities Modified: csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.gspec =================================================================== --- csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.gspec 2008-12-09 14:19:03 UTC (rev 2488) +++ csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.gspec 2008-12-09 14:19:37 UTC (rev 2489) @@ -1,4 +1,4 @@ %var bitname sysstat %var pkgname CSWsysstat %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING +%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Deleted: csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.prototype-i386 =================================================================== --- csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.prototype-i386 2008-12-09 14:19:03 UTC (rev 2488) +++ csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.prototype-i386 2008-12-09 14:19:37 UTC (rev 2489) @@ -1,12 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/sysstat 0755 root bin -d none /opt/csw/sbin 0755 root bin -d none /opt/csw/sbin/amd64 0755 root bin -f none /opt/csw/sbin/amd64/sysstatd 4755 root bin -d none /opt/csw/sbin/i386 0755 root bin -f none /opt/csw/sbin/i386/sysstatd=/opt/csw/sbin/sysstatd 4755 root bin -l none /opt/csw/sbin/sysstatd=/opt/csw/bin/isaexec 0755 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man1 0755 root bin -f none /opt/csw/share/man/man1/sysstat.1m 0755 root bin Deleted: csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.prototype-sparc =================================================================== --- csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.prototype-sparc 2008-12-09 14:19:03 UTC (rev 2488) +++ csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.prototype-sparc 2008-12-09 14:19:37 UTC (rev 2489) @@ -1,12 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/sysstat 0755 root bin -d none /opt/csw/sbin 0755 root bin -d none /opt/csw/sbin/sparcv9 0755 root bin -f none /opt/csw/sbin/sparcv9/sysstatd 4755 root bin -d none /opt/csw/sbin/sparcv8 0755 root bin -f none /opt/csw/sbin/sparcv8/sysstatd=/opt/csw/sbin/sysstatd 4755 root bin -l none /opt/csw/sbin/sysstatd=/opt/csw/bin/isaexec 0755 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man1 0755 root bin -f none /opt/csw/share/man/man1/sysstat.1m 0755 root bin Deleted: csw/mgar/pkg/sysstat/trunk/files/patch-isaexec-compat.diff =================================================================== --- csw/mgar/pkg/sysstat/trunk/files/patch-isaexec-compat.diff 2008-12-09 14:19:03 UTC (rev 2488) +++ csw/mgar/pkg/sysstat/trunk/files/patch-isaexec-compat.diff 2008-12-09 14:19:37 UTC (rev 2489) @@ -1,24 +0,0 @@ -diff --speed-large-files --minimal -Nru sysstat-20080501.orig/client.c sysstat-20080501/client.c ---- sysstat-20080501.orig/client.c 2008-05-02 19:40:43.000000000 +0200 -+++ sysstat-20080501/client.c 2008-05-13 11:36:24.298053000 +0200 -@@ -71,7 +71,7 @@ - dbug("Execname %s\n",Execname); - strcpy(bin,dirname(Execname)); - dbug("Execdir %s\n",bin); -- strcat(bin,"/../sbin/sysstatd"); -+ strcat(bin,"/../../sbin/sysstatd"); - if (access(bin,X_OK) != 0) { - error("cannot find sysstatd at %s",bin); - return -1; -diff --speed-large-files --minimal -Nru sysstat-20080501.orig/sysstat.c sysstat-20080501/sysstat.c ---- sysstat-20080501.orig/sysstat.c 2008-05-02 19:40:43.000000000 +0200 -+++ sysstat-20080501/sysstat.c 2008-05-13 11:36:40.025857000 +0200 -@@ -490,7 +490,7 @@ - char *args[16]; - int num = 0; - strcpy(bin,dirname(Execname)); -- strcat(bin,"/../sbin/sysstatd"); -+ strcat(bin,"/../../sbin/sysstatd"); - args[num++] = bin; - args[num++] = "-v"; - if (port) { Modified: csw/mgar/pkg/sysstat/trunk/files/patch-onlyisaexec-sysstatd.diff =================================================================== --- csw/mgar/pkg/sysstat/trunk/files/patch-onlyisaexec-sysstatd.diff 2008-12-09 14:19:03 UTC (rev 2488) +++ csw/mgar/pkg/sysstat/trunk/files/patch-onlyisaexec-sysstatd.diff 2008-12-09 14:19:37 UTC (rev 2489) @@ -1,7 +1,7 @@ -diff --speed-large-files --minimal -Nru sysstat-20080704.orig/client.c sysstat-20080704/client.c ---- sysstat-20080704.orig/client.c 2008-07-06 23:55:52.000000000 +0200 -+++ sysstat-20080704/client.c 2008-07-07 14:31:22.791155000 +0200 -@@ -71,7 +71,7 @@ +diff -Naur sysstat-20081207.orig/client.c sysstat-20081207.patched/client.c +--- sysstat-20081207.orig/client.c 2008-12-07 23:24:38.000000000 +0100 ++++ sysstat-20081207.patched/client.c 2008-12-09 14:37:26.459180110 +0100 +@@ -81,7 +81,7 @@ dbug("Execname %s\n",Execname); strcpy(bin,dirname(Execname)); dbug("Execdir %s\n",bin); @@ -10,24 +10,24 @@ if (access(bin,X_OK) != 0) { error("cannot find sysstatd at %s",bin); return -1; -diff --speed-large-files --minimal -Nru sysstat-20080704.orig/sysstat.c sysstat-20080704/sysstat.c ---- sysstat-20080704.orig/sysstat.c 2008-07-06 23:55:52.000000000 +0200 -+++ sysstat-20080704/sysstat.c 2008-07-07 14:31:37.539418000 +0200 -@@ -485,7 +485,7 @@ +diff -Naur sysstat-20081207.orig/sysstat.c sysstat-20081207.patched/sysstat.c +--- sysstat-20081207.orig/sysstat.c 2008-12-07 23:24:38.000000000 +0100 ++++ sysstat-20081207.patched/sysstat.c 2008-12-09 14:37:51.199133788 +0100 +@@ -506,7 +506,7 @@ char cmd[PATH_MAX]; int ret = 0; strcpy(cmd,dirname(Execname)); - strcat(cmd,"/../../sbin/sysstatd -k"); + strcat(cmd,"/../sbin/sysstatd -k"); - if (verbose) - strcat(cmd," -v"); ret = system(cmd); -@@ -517,7 +517,7 @@ + if (ret == -1) { + error("could not execute '%s': %s\n",cmd,strerror(errno)); +@@ -554,7 +554,7 @@ char *args[16]; int num = 0; strcpy(bin,dirname(Execname)); - strcat(bin,"/../../sbin/sysstatd"); + strcat(bin,"/../sbin/sysstatd"); args[num++] = bin; - args[num++] = "-v"; - if (port) { + if (verbose) + args[num++] = "-v"; Deleted: csw/mgar/pkg/sysstat/trunk/files/patch-sysstat-shareman.diff =================================================================== --- csw/mgar/pkg/sysstat/trunk/files/patch-sysstat-shareman.diff 2008-12-09 14:19:03 UTC (rev 2488) +++ csw/mgar/pkg/sysstat/trunk/files/patch-sysstat-shareman.diff 2008-12-09 14:19:37 UTC (rev 2489) @@ -1,18 +0,0 @@ -diff --speed-large-files --minimal -Nru sysstat-20080501.orig/Makefile sysstat-20080501/Makefile ---- sysstat-20080501.orig/Makefile 2008-05-02 19:40:43.000000000 +0200 -+++ sysstat-20080501/Makefile 2008-05-13 06:12:48.272325000 +0200 -@@ -68,10 +68,10 @@ - -$(MKDIR) $(PREFIX)/bin - $(CP) $(CDIR)/sysstat $(PREFIX)/bin - -$(CHOWN) root:bin $(PREFIX)/bin/sysstat -- -$(MKDIR) $(PREFIX)/man/man1m -- $(CP) sysstat.1m $(PREFIX)/man/man1m -- -$(CHOWN) root:bin $(PREFIX)/man/man1m/sysstat.1m -- -$(CHMOD) 0644 $(PREFIX)/man/man1m/sysstat.1m -+ -$(MKDIR) $(PREFIX)/share/man/man1m -+ $(CP) sysstat.1m $(PREFIX)/share/man/man1m -+ -$(CHOWN) root:bin $(PREFIX)/share/man/man1m/sysstat.1m -+ -$(CHMOD) 0644 $(PREFIX)/share/man/man1m/sysstat.1m - - install_sysstatd: $(DDIR)/sysstatd - -$(MKDIR) $(PREFIX)/sbin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvel at opencsw.org Tue Dec 9 16:26:35 2008 From: trygvel at opencsw.org (=?ISO-8859-1?Q?Trygve_Laugst=F8l?=) Date: Tue, 09 Dec 2008 16:26:35 +0100 Subject: [csw-devel] GAR v2 and merging stuff In-Reply-To: <0DDCD941-2F2A-4212-8E2D-36A91A3D7766@opencsw.org> References: <493D6E07.70501@opencsw.org> <0DDCD941-2F2A-4212-8E2D-36A91A3D7766@opencsw.org> Message-ID: <493E8E2B.6040707@opencsw.org> Dagobert Michelsen wrote: > Hi Trygve, > > Am 08.12.2008 um 19:57 schrieb Trygve Laugst?l: >> Hi (Dago) >> >> Shouldn't this build actually work as the build machine support amd64? > > No, it does not. Solaris 8 x86 supports only 32 bit. That's what I > talked > about: GAR should ssh over to Solaris 10 x86 and build amd64 there. > >> http://buildfarm.opencsw.org/hudson/job/libogg-i386-pc-solaris2.8/0/console >> >> What where the goals to dump the configuration/possible settings >> available? > > I'm sorry, I don't understand what you are talking about. Shell > environment? > >> I'd like to have each build dump that before building, should >> make it easier to find discrepancies between what you have at home and >> what the build farm uses. > > ?hm, what dump? That's what you get when you write email too late; confustion. I meant the available compiler matrix vs supported CPU features. The thing you showed just before we went out to lunch on Sunday. -- Trygve From dam at opencsw.org Tue Dec 9 17:09:05 2008 From: dam at opencsw.org (Dagobert Michelsen) Date: Tue, 9 Dec 2008 17:09:05 +0100 Subject: [csw-devel] GAR v2 and merging stuff In-Reply-To: <493E8E2B.6040707@opencsw.org> References: <493D6E07.70501@opencsw.org> <0DDCD941-2F2A-4212-8E2D-36A91A3D7766@opencsw.org> <493E8E2B.6040707@opencsw.org> Message-ID: Hi Tragve, Am 09.12.2008 um 16:26 schrieb Trygve Laugst?l: >>> I'd like to have each build dump that before building, should >>> make it easier to find discrepancies between what you have at home >>> and >>> what the build farm uses. >> >> ?hm, what dump? > > That's what you get when you write email too late; confustion. I meant > the available compiler matrix vs supported CPU features. The thing you > showed just before we went out to lunch on Sunday. You mean the target 'ccenv' and 'isaenv'? Sure. But I would prefer if you would call them explicitly because otherwise the output may get too noisy. Best regards -- Dago From dmichelsen at users.sourceforge.net Tue Dec 9 17:11:21 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 16:11:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[2490] csw/mgar/pkg/Makefile Message-ID: Revision: 2490 http://gar.svn.sourceforge.net/gar/?rev=2490&view=rev Author: dmichelsen Date: 2008-12-09 16:11:20 +0000 (Tue, 09 Dec 2008) Log Message: ----------- mGAR: Fix target 'garlinks' if more than one external reference is given Modified Paths: -------------- csw/mgar/pkg/Makefile Modified: csw/mgar/pkg/Makefile =================================================================== --- csw/mgar/pkg/Makefile 2008-12-09 14:19:37 UTC (rev 2489) +++ csw/mgar/pkg/Makefile 2008-12-09 16:11:20 UTC (rev 2490) @@ -36,10 +36,15 @@ # to generate symbolic links instead of externally checked out dirs # Lines returned by 'svn propget -R' look like this: -# cpan/Test-Memory-Cycle/trunk - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 +# +# gar/trunk - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 +# gar-v1 https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 +# gar-v2 https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 +# +# ... garlinks: - @(svn propget svn:externals -R | perl -ane 'next if( /^$$/ );($$path,$$sep,$$dir,$$link)=@F;($$upsteps=$$path)=~s![^/]+!..!g;(($$linkdest=$$link))=~ s!https://gar.svn.sf.net/svnroot/gar/csw/mgar!$$upsteps!;print "Linking $$path/$$dir to ../$$linkdest", symlink("../$$linkdest","$$path/$$dir") ? "" : " failed", "\n";') + @(svn propget svn:externals -R | perl -ane 'next if( /^$$/ ); if( $$F[1] eq "-" ) { ($$path,$$sep,$$dir,$$link)=@F; } else { ($$dir,$$link) = @F; } ($$upsteps=$$path)=~s![^/]+!..!g;(($$linkdest=$$link))=~ s!https://gar.svn.sf.net/svnroot/gar/csw/mgar!$$upsteps!;print "Linking $$path/$$dir to ../$$linkdest", symlink("../$$linkdest","$$path/$$dir") ? "" : " failed", "\n";') pkglist: @for i in $(filter-out $(FILTER_DIRS),$(foreach D,. $(SUBDIRS),$(wildcard $D/*/))) ; do \ 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 Dec 9 17:14:22 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 16:14:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[2491] csw/branches/yann/ Message-ID: Revision: 2491 http://gar.svn.sourceforge.net/gar/?rev=2491&view=rev Author: dmichelsen Date: 2008-12-09 16:14:22 +0000 (Tue, 09 Dec 2008) Log Message: ----------- branches/yann: Deleted cin coordination with Yann Removed Paths: ------------- csw/branches/yann/ 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 Dec 9 17:17:34 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 16:17:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[2492] csw/branches/dam/automatic-multiarch-compile/lib/ neon Message-ID: Revision: 2492 http://gar.svn.sourceforge.net/gar/?rev=2492&view=rev Author: dmichelsen Date: 2008-12-09 16:17:34 +0000 (Tue, 09 Dec 2008) Log Message: ----------- multiISA neon: Move to mGAR v2 Modified Paths: -------------- csw/branches/dam/automatic-multiarch-compile/lib/neon/Makefile csw/branches/dam/automatic-multiarch-compile/lib/neon/checksums Removed Paths: ------------- csw/branches/dam/automatic-multiarch-compile/lib/neon/files/CSWneon-devel.prototype csw/branches/dam/automatic-multiarch-compile/lib/neon/files/CSWneon.prototype Modified: csw/branches/dam/automatic-multiarch-compile/lib/neon/Makefile =================================================================== --- csw/branches/dam/automatic-multiarch-compile/lib/neon/Makefile 2008-12-09 16:14:22 UTC (rev 2491) +++ csw/branches/dam/automatic-multiarch-compile/lib/neon/Makefile 2008-12-09 16:17:34 UTC (rev 2492) @@ -1,5 +1,10 @@ GARNAME = neon -GARVERSION = 0.26.3 +CURRENT_VERSION = 0.28.3 +LEGACY_VERSIONS = 0.25.4 0.26.4 0.27.2 +PKGVERSION ?= $(CURRENT_VERSION) +EXTRA_MODULATORS = PKGVERSION +MODULATIONS_PKGVERSION = $(LEGACY_VERSIONS) $(CURRENT_VERSION) +GARVERSION ?= $(PKGVERSION) CATEGORIES = lib DESCRIPTION = Neon HTTP and WebDAV client library @@ -10,31 +15,40 @@ be easily implemented. endef -# Compatibility libraries -LIBNAME = libneon.so -COMPATVERS = 24.0.7 25.0.5 -COMPATLIBS = $(foreach A,i386 sparc, \ - $(foreach V,$(COMPATVERS),$(LIBNAME).$(V).$(A).bz2)) - MASTER_SITES = http://www.webdav.org/$(GARNAME)/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWneon,$(ADMSTANDARD)) -DISTFILES += $(call admfiles,CSWneon-devel,$(ADMSTANDARD)) -#DISTFILES += $(COMPATLIBS) +SOURCEFILES = $(foreach VERSION,$(MODULATIONS_PKGVERSION),$(GARNAME)-$(GARVERSION).tar.gz) +DISTFILES = $(SOURCEFILES) +DISTFILES += $(call admfiles,CSWneon,depend) +DISTFILES += $(call admfiles,CSWneon-devel,depend) CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shared CONFIGURE_ARGS += --with-ssl=openssl CONFIGURE_ARGS += --with-expat -include ../category.mk +BUILD64 = 1 -#post-install: install-compat-libs +MERGE_SCRIPTS_isa-i386-pkgversion-0.25.4 = copy-only +MERGE_DIRS_isa-i386-pkgversion-0.25.4 = $(libdir) +MERGE_SCRIPTS_isa-amd64-pkgversion-0.25.4 = copy-relocated-only +MERGE_DIRS_isa-amd64-pkgversion-0.25.4 = $(libdir) -install-compat-libs: - @echo $(DISTFILES) - @for version in $(COMPATVERS) ; do \ - ginstall -m 755 $(WORKDIR)/$(LIBNAME).$$version.$(GARCH) \ - $(DESTDIR)$(libdir)/$(LIBNAME).$$version ; \ - done - @$(MAKECOOKIE) +MERGE_SCRIPTS_isa-i386-pkgversion-0.26.4 = copy-only +MERGE_DIRS_isa-i386-pkgversion-0.26.4 = $(libdir) +MERGE_SCRIPTS_isa-amd64-pkgversion-0.26.4 = copy-relocated-only +MERGE_DIRS_isa-amd64-pkgversion-0.26.4 = $(libdir) + +MERGE_SCRIPTS_isa-i386-pkgversion-0.27.2 = copy-only +MERGE_DIRS_isa-i386-pkgversion-0.27.2 = $(libdir) +MERGE_SCRIPTS_isa-amd64-pkgversion-0.27.2 = copy-relocated-only +MERGE_DIRS_isa-amd64-pkgversion-0.27.2 = $(libdir) + +MERGE_SCRIPTS_isa-i386-pkgversion-0.28.3 = copy-all +MERGE_SCRIPTS_isa-amd64-pkgversion-0.28.3 = copy-relocated-only +MERGE_DIRS_isa-amd64-pkgversion-0.28.3 = $(bindir) $(sbindir) $(libexecdir) $(libdir) + +# Move development stuff to CSWneon-devel and put the rest in CSWneon +PKGFILES_CSWneon-devel_EXCLUSIVE = $(PKGFILES_DEVEL) +PKGFILES_CSWneon-devel_EXCLUSIVE += $(docdir)/.* + +include ../category.mk Modified: csw/branches/dam/automatic-multiarch-compile/lib/neon/checksums =================================================================== --- csw/branches/dam/automatic-multiarch-compile/lib/neon/checksums 2008-12-09 16:14:22 UTC (rev 2491) +++ csw/branches/dam/automatic-multiarch-compile/lib/neon/checksums 2008-12-09 16:17:34 UTC (rev 2492) @@ -1,4 +1,7 @@ -6e52cd9c03e372026d6eccbfb80f09ef download/neon-0.26.3.tar.gz +4448c3a91e80429ea733aec8ce300009 download/neon-0.25.4.tar.gz +2d11fff51ffa856fc6b5d4bd801d6cc4 download/neon-0.26.4.tar.gz +24d434a4d5d4b6ce8f076039688f60ce download/neon-0.27.2.tar.gz +47599a328862ce64ac3c52726d6daa12 download/neon-0.28.3.tar.gz 643aa565e0d9f38f0153ab72b6dc5621 download/CSWneon.gspec cbce1c593467c9783a19b1a996cf5913 download/CSWneon.prototype 8d6f9c43747b4e4dee4ed216cd18a17b download/CSWneon.depend Deleted: csw/branches/dam/automatic-multiarch-compile/lib/neon/files/CSWneon-devel.prototype =================================================================== --- csw/branches/dam/automatic-multiarch-compile/lib/neon/files/CSWneon-devel.prototype 2008-12-09 16:14:22 UTC (rev 2491) +++ csw/branches/dam/automatic-multiarch-compile/lib/neon/files/CSWneon-devel.prototype 2008-12-09 16:17:34 UTC (rev 2492) @@ -1,171 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/neon-config 0755 root bin -d none /opt/csw/include 0755 root bin -d none /opt/csw/include/neon 0755 root bin -f none /opt/csw/include/neon/ne_207.h 0644 root bin -f none /opt/csw/include/neon/ne_acl.h 0644 root bin -f none /opt/csw/include/neon/ne_alloc.h 0644 root bin -f none /opt/csw/include/neon/ne_auth.h 0644 root bin -f none /opt/csw/include/neon/ne_basic.h 0644 root bin -f none /opt/csw/include/neon/ne_compress.h 0644 root bin -f none /opt/csw/include/neon/ne_dates.h 0644 root bin -f none /opt/csw/include/neon/ne_defs.h 0644 root bin -f none /opt/csw/include/neon/ne_i18n.h 0644 root bin -f none /opt/csw/include/neon/ne_locks.h 0644 root bin -f none /opt/csw/include/neon/ne_md5.h 0644 root bin -f none /opt/csw/include/neon/ne_props.h 0644 root bin -f none /opt/csw/include/neon/ne_redirect.h 0644 root bin -f none /opt/csw/include/neon/ne_request.h 0644 root bin -f none /opt/csw/include/neon/ne_session.h 0644 root bin -f none /opt/csw/include/neon/ne_socket.h 0644 root bin -f none /opt/csw/include/neon/ne_ssl.h 0644 root bin -f none /opt/csw/include/neon/ne_string.h 0644 root bin -f none /opt/csw/include/neon/ne_uri.h 0644 root bin -f none /opt/csw/include/neon/ne_utils.h 0644 root bin -f none /opt/csw/include/neon/ne_xml.h 0644 root bin -f none /opt/csw/include/neon/ne_xmlreq.h 0644 root bin -d none /opt/csw/lib 0755 root bin -f none /opt/csw/lib/libneon.a 0644 root bin -f none /opt/csw/lib/libneon.la 0755 root bin -d none /opt/csw/lib/pkgconfig 0755 root bin -f none /opt/csw/lib/pkgconfig/neon.pc 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/doc 0755 root bin -d none /opt/csw/share/doc/neon-0.26.3 0755 root bin -d none /opt/csw/share/doc/neon-0.26.3/html 0755 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/api.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/biblio.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/compliance.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/features.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/index.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/intro.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/ref.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refalloc.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refauth.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refbuf.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refbufapp.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refbufcr.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refbufdest.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refbufutil.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refcert.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refclicert.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refconfig.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/referr.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/reffeat.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refgetst.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refi18n.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refiaddr.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refneon.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refopts.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refreq.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refreqbody.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refreqhdr.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refreqopts.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refresolve.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refresphdr.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refsess.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refshave.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refsockinit.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refsslca.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refsslcert2.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refsslcertio.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refssldname.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refsslvfy.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refstatus.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/reftok.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refvers.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/refxml.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/using.html 0644 root bin -f none /opt/csw/share/doc/neon-0.26.3/html/xml.html 0644 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man1 0755 root bin -f none /opt/csw/share/man/man1/neon-config.1 0644 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/ne_add_request_header.3 0644 root bin -f none /opt/csw/share/man/man3/ne_addr_destroy.3 0644 root bin -f none /opt/csw/share/man/man3/ne_addr_error.3 0644 root bin -f none /opt/csw/share/man/man3/ne_addr_first.3 0644 root bin -f none /opt/csw/share/man/man3/ne_addr_next.3 0644 root bin -f none /opt/csw/share/man/man3/ne_addr_resolve.3 0644 root bin -f none /opt/csw/share/man/man3/ne_addr_result.3 0644 root bin -f none /opt/csw/share/man/man3/ne_buffer.3 0644 root bin -f none /opt/csw/share/man/man3/ne_buffer_altered.3 0644 root bin -f none /opt/csw/share/man/man3/ne_buffer_append.3 0644 root bin -f none /opt/csw/share/man/man3/ne_buffer_clear.3 0644 root bin -f none /opt/csw/share/man/man3/ne_buffer_concat.3 0644 root bin -f none /opt/csw/share/man/man3/ne_buffer_create.3 0644 root bin -f none /opt/csw/share/man/man3/ne_buffer_destroy.3 0644 root bin -f none /opt/csw/share/man/man3/ne_buffer_finish.3 0644 root bin -f none /opt/csw/share/man/man3/ne_buffer_grow.3 0644 root bin -f none /opt/csw/share/man/man3/ne_buffer_ncreate.3 0644 root bin -f none /opt/csw/share/man/man3/ne_buffer_zappend.3 0644 root bin -f none /opt/csw/share/man/man3/ne_calloc.3 0644 root bin -f none /opt/csw/share/man/man3/ne_close_connection.3 0644 root bin -f none /opt/csw/share/man/man3/ne_forget_auth.3 0644 root bin -f none /opt/csw/share/man/man3/ne_get_error.3 0644 root bin -f none /opt/csw/share/man/man3/ne_get_response_header.3 0644 root bin -f none /opt/csw/share/man/man3/ne_get_scheme.3 0644 root bin -f none /opt/csw/share/man/man3/ne_get_server_hostport.3 0644 root bin -f none /opt/csw/share/man/man3/ne_has_support.3 0644 root bin -f none /opt/csw/share/man/man3/ne_get_status.3 0644 root bin -f none /opt/csw/share/man/man3/ne_i18n_init.3 0644 root bin -f none /opt/csw/share/man/man3/ne_iaddr_cmp.3 0644 root bin -f none /opt/csw/share/man/man3/ne_iaddr_free.3 0644 root bin -f none /opt/csw/share/man/man3/ne_iaddr_make.3 0644 root bin -f none /opt/csw/share/man/man3/ne_iaddr_print.3 0644 root bin -f none /opt/csw/share/man/man3/ne_iaddr_typeof.3 0644 root bin -f none /opt/csw/share/man/man3/ne_malloc.3 0644 root bin -f none /opt/csw/share/man/man3/ne_oom_callback.3 0644 root bin -f none /opt/csw/share/man/man3/ne_print_request_header.3 0644 root bin -f none /opt/csw/share/man/man3/ne_qtoken.3 0644 root bin -f none /opt/csw/share/man/man3/ne_realloc.3 0644 root bin -f none /opt/csw/share/man/man3/ne_request_create.3 0644 root bin -f none /opt/csw/share/man/man3/ne_request_destroy.3 0644 root bin -f none /opt/csw/share/man/man3/ne_request_dispatch.3 0644 root bin -f none /opt/csw/share/man/man3/ne_response_header_iterate.3 0644 root bin -f none /opt/csw/share/man/man3/ne_session_create.3 0644 root bin -f none /opt/csw/share/man/man3/ne_session_destroy.3 0644 root bin -f none /opt/csw/share/man/man3/ne_session_proxy.3 0644 root bin -f none /opt/csw/share/man/man3/ne_set_error.3 0644 root bin -f none /opt/csw/share/man/man3/ne_set_persist.3 0644 root bin -f none /opt/csw/share/man/man3/ne_set_proxy_auth.3 0644 root bin -f none /opt/csw/share/man/man3/ne_set_read_timeout.3 0644 root bin -f none /opt/csw/share/man/man3/ne_set_request_body_buffer.3 0644 root bin -f none /opt/csw/share/man/man3/ne_set_request_body_fd.3 0644 root bin -f none /opt/csw/share/man/man3/ne_set_request_body_fd64.3 0644 root bin -f none /opt/csw/share/man/man3/ne_set_request_expect100.3 0644 root bin -f none /opt/csw/share/man/man3/ne_set_server_auth.3 0644 root bin -f none /opt/csw/share/man/man3/ne_set_useragent.3 0644 root bin -f none /opt/csw/share/man/man3/ne_shave.3 0644 root bin -f none /opt/csw/share/man/man3/ne_sock_exit.3 0644 root bin -f none /opt/csw/share/man/man3/ne_sock_init.3 0644 root bin -f none /opt/csw/share/man/man3/ne_ssl_cert_cmp.3 0644 root bin -f none /opt/csw/share/man/man3/ne_ssl_cert_export.3 0644 root bin -f none /opt/csw/share/man/man3/ne_ssl_cert_free.3 0644 root bin -f none /opt/csw/share/man/man3/ne_ssl_cert_identity.3 0644 root bin -f none /opt/csw/share/man/man3/ne_ssl_cert_import.3 0644 root bin -f none /opt/csw/share/man/man3/ne_ssl_cert_issuer.3 0644 root bin -f none /opt/csw/share/man/man3/ne_ssl_cert_read.3 0644 root bin -f none /opt/csw/share/man/man3/ne_ssl_cert_signedby.3 0644 root bin -f none /opt/csw/share/man/man3/ne_ssl_cert_subject.3 0644 root bin -f none /opt/csw/share/man/man3/ne_ssl_cert_write.3 0644 root bin -f none /opt/csw/share/man/man3/ne_ssl_clicert_decrypt.3 0644 root bin -f none /opt/csw/share/man/man3/ne_ssl_clicert_encrypted.3 0644 root bin -f none /opt/csw/share/man/man3/ne_ssl_clicert_free.3 0644 root bin -f none /opt/csw/share/man/man3/ne_ssl_clicert_name.3 0644 root bin -f none /opt/csw/share/man/man3/ne_ssl_clicert_owner.3 0644 root bin -f none /opt/csw/share/man/man3/ne_ssl_clicert_read.3 0644 root bin -f none /opt/csw/share/man/man3/ne_ssl_dname_cmp.3 0644 root bin -f none /opt/csw/share/man/man3/ne_ssl_readable_dname.3 0644 root bin -f none /opt/csw/share/man/man3/ne_ssl_set_verify.3 0644 root bin -f none /opt/csw/share/man/man3/ne_ssl_trust_cert.3 0644 root bin -f none /opt/csw/share/man/man3/ne_ssl_trust_default_ca.3 0644 root bin -f none /opt/csw/share/man/man3/ne_status.3 0644 root bin -f none /opt/csw/share/man/man3/ne_strdup.3 0644 root bin -f none /opt/csw/share/man/man3/ne_strndup.3 0644 root bin -f none /opt/csw/share/man/man3/ne_token.3 0644 root bin -f none /opt/csw/share/man/man3/ne_version_match.3 0644 root bin -f none /opt/csw/share/man/man3/ne_version_string.3 0644 root bin -f none /opt/csw/share/man/man3/ne_xml_create.3 0644 root bin -f none /opt/csw/share/man/man3/ne_xml_destroy.3 0644 root bin -f none /opt/csw/share/man/man3/neon.3 0644 root bin Deleted: csw/branches/dam/automatic-multiarch-compile/lib/neon/files/CSWneon.prototype =================================================================== --- csw/branches/dam/automatic-multiarch-compile/lib/neon/files/CSWneon.prototype 2008-12-09 16:14:22 UTC (rev 2491) +++ csw/branches/dam/automatic-multiarch-compile/lib/neon/files/CSWneon.prototype 2008-12-09 16:17:34 UTC (rev 2492) @@ -1,30 +0,0 @@ -d none /opt/csw/lib 0755 root bin -f none /opt/csw/lib/libneon.so.26.0.3 0755 root bin -s none /opt/csw/lib/libneon.so.26=libneon.so.26.0.3 root bin -s none /opt/csw/lib/libneon.so=libneon.so.26.0.3 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/locale 0755 root bin -d none /opt/csw/share/locale/cs 0755 root bin -d none /opt/csw/share/locale/cs/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/cs/LC_MESSAGES/neon.mo 0644 root bin -d none /opt/csw/share/locale/de 0755 root bin -d none /opt/csw/share/locale/de/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/de/LC_MESSAGES/neon.mo 0644 root bin -d none /opt/csw/share/locale/fr 0755 root bin -d none /opt/csw/share/locale/fr/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/fr/LC_MESSAGES/neon.mo 0644 root bin -d none /opt/csw/share/locale/ja 0755 root bin -d none /opt/csw/share/locale/ja/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/ja/LC_MESSAGES/neon.mo 0644 root bin -d none /opt/csw/share/locale/nn 0755 root bin -d none /opt/csw/share/locale/nn/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/nn/LC_MESSAGES/neon.mo 0644 root bin -d none /opt/csw/share/locale/ru 0755 root bin -d none /opt/csw/share/locale/ru/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/ru/LC_MESSAGES/neon.mo 0644 root bin -d none /opt/csw/share/locale/tr 0755 root bin -d none /opt/csw/share/locale/tr/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/tr/LC_MESSAGES/neon.mo 0644 root bin -d none /opt/csw/share/locale/zh 0755 root bin -d none /opt/csw/share/locale/zh/LC_MESSAGES 0755 root bin -f none /opt/csw/share/locale/zh/LC_MESSAGES/neon.mo 0644 root bin 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 Dec 9 17:18:17 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 16:18:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[2493] csw/branches/dam/automatic-multiarch-compile/lib/ expat Message-ID: Revision: 2493 http://gar.svn.sourceforge.net/gar/?rev=2493&view=rev Author: dmichelsen Date: 2008-12-09 16:18:16 +0000 (Tue, 09 Dec 2008) Log Message: ----------- multiISA expat: Move to mGAR v2 Modified Paths: -------------- csw/branches/dam/automatic-multiarch-compile/lib/expat/Makefile csw/branches/dam/automatic-multiarch-compile/lib/expat/checksums Added Paths: ----------- csw/branches/dam/automatic-multiarch-compile/lib/expat/files/patch-libexpat-1.95.8-destdir.diff Removed Paths: ------------- csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat-devel.depend csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat-devel.gspec csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat-devel.prototype csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat.depend csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat.prototype csw/branches/dam/automatic-multiarch-compile/lib/expat/files/libexpat.so.0.4.0 csw/branches/dam/automatic-multiarch-compile/lib/expat/files/libexpat.so.0.5.0 Modified: csw/branches/dam/automatic-multiarch-compile/lib/expat/Makefile =================================================================== --- csw/branches/dam/automatic-multiarch-compile/lib/expat/Makefile 2008-12-09 16:17:34 UTC (rev 2492) +++ csw/branches/dam/automatic-multiarch-compile/lib/expat/Makefile 2008-12-09 16:18:16 UTC (rev 2493) @@ -1,5 +1,8 @@ GARNAME = expat -GARVERSION = 2.0.0 +PKGVERSION ?= 2.0.1 +EXTRA_MODULATORS = PKGVERSION +MODULATIONS_PKGVERSION = 1.95.8 2.0.1 +GARVERSION ?= $(PKGVERSION) CATEGORIES = lib DESCRIPTION = XML Parser Toolkit @@ -10,15 +13,17 @@ endef MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWexpat,depend prototype) -DISTFILES += $(call admfiles,CSWexpat-devel,depend prototype) +DISTFILES = $(foreach VERSION,$(MODULATIONS_PKGVERSION),$(GARNAME)-$(VERSION).tar.gz) +DISTFILES += $(call admfiles,CSWexpat,) -# Compatibility libraries -EXTLIBS += libexpat.so.0.4.0 -EXTLIBS += libexpat.so.0.5.0 -DISTFILES += $(EXTLIBS) +# From +# https://sourceforge.net/tracker/?func=detail&atid=110127&aid=1217217&group_id=10127 +# http://expat.cvs.sourceforge.net/viewvc/expat/expat/Makefile.in?r1=1.47&r2=1.48 +PATCHFILES-pkgversion-1.95.8 = patch-libexpat-1.95.8-destdir.diff +PATCHFILES = $(PATCHFILES-pkgversion-$(PKGVERSION)) +BUILD64 = 1 + # The expat 'check' target tries to compile tests that use GCC # constructs -- won't compile under Forte without hackery. TEST_TARGET = check @@ -26,9 +31,13 @@ CONFIGURE_ARGS = $(DIRPATHS) +MERGE_SCRIPTS_isa-i386-pkgversion-1.95.8 = copy-only +MERGE_DIRS_isa-i386-pkgversion-1.95.8 = $(libdir) +MERGE_SCRIPTS_isa-amd64-pkgversion-1.95.8 = copy-relocated-only +MERGE_DIRS_isa-amd64-pkgversion-1.95.8 = $(libdir) + +MERGE_SCRIPTS_isa-i386-pkgversion-2.0.1 = copy-all +MERGE_SCRIPTS_isa-amd64-pkgversion-2.0.1 = copy-relocated-only +MERGE_DIRS_isa-amd64-pkgversion-2.0.1 = $(bindir) $(sbindir) $(libexecdir) $(libdir) + include ../category.mk - -post-install: - @for extlib in $(EXTLIBS) ; do \ - install -m 0755 $(WORKDIR)/$$extlib $(DESTDIR)$(libdir) ; \ - done Modified: csw/branches/dam/automatic-multiarch-compile/lib/expat/checksums =================================================================== --- csw/branches/dam/automatic-multiarch-compile/lib/expat/checksums 2008-12-09 16:17:34 UTC (rev 2492) +++ csw/branches/dam/automatic-multiarch-compile/lib/expat/checksums 2008-12-09 16:18:16 UTC (rev 2493) @@ -1,9 +1,9 @@ -d945df7f1c0868c5c73cf66ba9596f3f download/expat-2.0.0.tar.gz +aff487543845a82fe262e6e2922b4c8e download/expat-1.95.8.tar.gz +ee8b492592568805593f81f8cdf2a04c download/expat-2.0.1.tar.gz 7145f62799b8019b4636811f22eed0dc download/CSWexpat.gspec -8093298b67861e241b0d2499c9f2ff89 download/CSWexpat.depend -442c9a9124f9700d5156bf24baf8491b download/CSWexpat.prototype +d41d8cd98f00b204e9800998ecf8427e download/CSWexpat.depend +2ee9a8ce89f28371461302eea3a706ce download/CSWexpat.prototype 2fb9c175c9f5d1e21f0531c1cada0994 download/CSWexpat-devel.gspec -3dfca43e9c14ab646c8aadfc59093ba3 download/CSWexpat-devel.depend -7638ec36b2ae51da9b300bee9a18d349 download/CSWexpat-devel.prototype -0d36c0738fa471a0fcae0cd565016295 download/libexpat.so.0.4.0 -b52745e58a5dab5df7a459d25d54d65d download/libexpat.so.0.5.0 +9c8bed940180401cb0bfcd7761ad5c1a download/CSWexpat-devel.depend +d99c92a8836db5f6baedec6912a968fb download/CSWexpat-devel.prototype +da9dfd74eb2b44102d137ff1d0993842 download/patch-libexpat-1.95.8-destdir.diff Deleted: csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat-devel.depend =================================================================== --- csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat-devel.depend 2008-12-09 16:17:34 UTC (rev 2492) +++ csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat-devel.depend 2008-12-09 16:18:16 UTC (rev 2493) @@ -1 +0,0 @@ -P CSWexpat expat - XML Parser Toolkit Deleted: csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat-devel.gspec =================================================================== --- csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat-devel.gspec 2008-12-09 16:17:34 UTC (rev 2492) +++ csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat-devel.gspec 2008-12-09 16:18:16 UTC (rev 2493) @@ -1,5 +0,0 @@ -%var bitname expat_devel -%var pkgname CSWexpat-devel -%var desc XML Parsing Toolkit - Development Support -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING Deleted: csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat-devel.prototype =================================================================== --- csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat-devel.prototype 2008-12-09 16:17:34 UTC (rev 2492) +++ csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat-devel.prototype 2008-12-09 16:18:16 UTC (rev 2493) @@ -1,6 +0,0 @@ -d none /opt/csw/include 0755 root bin -f none /opt/csw/include/expat.h 0644 root bin -f none /opt/csw/include/expat_external.h 0644 root bin -d none /opt/csw/lib 0755 root bin -f none /opt/csw/lib/libexpat.a 0644 root bin -f none /opt/csw/lib/libexpat.la 0755 root bin Deleted: csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat.prototype =================================================================== --- csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat.prototype 2008-12-09 16:17:34 UTC (rev 2492) +++ csw/branches/dam/automatic-multiarch-compile/lib/expat/files/CSWexpat.prototype 2008-12-09 16:18:16 UTC (rev 2493) @@ -1,13 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/xmlwf 0755 root bin -d none /opt/csw/lib 0755 root bin -f none /opt/csw/lib/libexpat.so.0.4.0 0755 root bin -f none /opt/csw/lib/libexpat.so.0.5.0 0755 root bin -s none /opt/csw/lib/libexpat.so.0=libexpat.so.0.5.0 -f none /opt/csw/lib/libexpat.so.1.5.0 0755 root bin -s none /opt/csw/lib/libexpat.so.1=libexpat.so.1.5.0 -s none /opt/csw/lib/libexpat.so=libexpat.so.1.5.0 -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man1 0755 root bin -f none /opt/csw/share/man/man1/xmlwf.1 0644 root bin Deleted: csw/branches/dam/automatic-multiarch-compile/lib/expat/files/libexpat.so.0.4.0 =================================================================== (Binary files differ) Deleted: csw/branches/dam/automatic-multiarch-compile/lib/expat/files/libexpat.so.0.5.0 =================================================================== (Binary files differ) Added: csw/branches/dam/automatic-multiarch-compile/lib/expat/files/patch-libexpat-1.95.8-destdir.diff =================================================================== --- csw/branches/dam/automatic-multiarch-compile/lib/expat/files/patch-libexpat-1.95.8-destdir.diff (rev 0) +++ csw/branches/dam/automatic-multiarch-compile/lib/expat/files/patch-libexpat-1.95.8-destdir.diff 2008-12-09 16:18:16 UTC (rev 2493) @@ -0,0 +1,46 @@ +diff -Naur expat-1.95.8.orig/Makefile.in expat-1.95.8.patch/Makefile.in +--- expat-1.95.8.orig/Makefile.in 2004-05-07 22:00:48.000000000 +0200 ++++ expat-1.95.8.patch/Makefile.in 2008-10-08 21:37:37.308957000 +0200 +@@ -44,6 +44,9 @@ + APIHEADER = $(srcdir)/lib/expat.h $(srcdir)/lib/expat_external.h + LIBRARY = libexpat.la + ++ifndef INSTALL_ROOT ++INSTALL_ROOT=$(DESTDIR) ++endif + + default: buildlib xmlwf/xmlwf + +@@ -73,22 +76,22 @@ + tests/runtests + + install: xmlwf/xmlwf installlib +- $(mkinstalldirs) $(bindir) $(man1dir) +- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf $(bindir)/xmlwf +- $(INSTALL_DATA) $(MANFILE) $(man1dir) ++ $(mkinstalldirs) $(INSTALL_ROOT)$(bindir) $(INSTALL_ROOT)$(man1dir) ++ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf $(INSTALL_ROOT)$(bindir)/xmlwf ++ $(INSTALL_DATA) $(MANFILE) $(INSTALL_ROOT)$(man1dir) + + installlib: $(LIBRARY) $(APIHEADER) +- $(mkinstalldirs) $(libdir) $(includedir) +- $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(libdir)/$(LIBRARY) +- $(INSTALL_DATA) $(APIHEADER) $(includedir) ++ $(mkinstalldirs) $(INSTALL_ROOT)$(libdir) $(INSTALL_ROOT)$(includedir) ++ $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(INSTALL_ROOT)$(libdir)/$(LIBRARY) ++ for FN in $(APIHEADER) ; do $(INSTALL_DATA) $$FN $(INSTALL_ROOT)$(includedir) ; done + + uninstall: uninstalllib +- $(LIBTOOL) --mode=uninstall rm -f $(bindir)/xmlwf +- rm -f $(man1dir)/xmlwf.1 ++ $(LIBTOOL) --mode=uninstall rm -f $(INSTALL_ROOT)$(bindir)/xmlwf ++ rm -f $(INSTALL_ROOT)$(man1dir)/xmlwf.1 + + uninstalllib: +- $(LIBTOOL) --mode=uninstall rm -f $(libdir)/$(LIBRARY) +- rm -f $(includedir)/$(APIHEADER) ++ $(LIBTOOL) --mode=uninstall rm -f $(INSTALL_ROOT)$(libdir)/$(LIBRARY) ++ rm -f $(INSTALL_ROOT)$(includedir)/$(APIHEADER) + + # for VPATH builds (invoked by configure) + mkdir-init: 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 Dec 9 17:19:33 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 16:19:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[2494] csw/branches/dam/automatic-multiarch-compile/lib/ libsdl Message-ID: Revision: 2494 http://gar.svn.sourceforge.net/gar/?rev=2494&view=rev Author: dmichelsen Date: 2008-12-09 16:19:33 +0000 (Tue, 09 Dec 2008) Log Message: ----------- multiISA libsdl: Move to mGAR v2 Modified Paths: -------------- csw/branches/dam/automatic-multiarch-compile/lib/libsdl/Makefile csw/branches/dam/automatic-multiarch-compile/lib/libsdl/checksums csw/branches/dam/automatic-multiarch-compile/lib/libsdl/files/CSWlibsdl.depend Modified: csw/branches/dam/automatic-multiarch-compile/lib/libsdl/Makefile =================================================================== --- csw/branches/dam/automatic-multiarch-compile/lib/libsdl/Makefile 2008-12-09 16:18:16 UTC (rev 2493) +++ csw/branches/dam/automatic-multiarch-compile/lib/libsdl/Makefile 2008-12-09 16:19:33 UTC (rev 2494) @@ -1,17 +1,22 @@ GARNAME = SDL -GARVERSION = 1.2.11 +GARVERSION = 1.2.13 CATEGORIES = lib DESCRIPTION = Simple DirectMedia Layer library define BLURB - Simple DirectMedia Layer is a cross-platform multimedia library designed to provide low level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL, and 2D video framebuffer. It is used by MPEG playback software, emulators, and many popular games, including the award winning Linux port of "Civilization: Call To Power." + Simple DirectMedia Layer is a cross-platform multimedia library + designed to provide low level access to audio, keyboard, mouse, + joystick, 3D hardware via OpenGL, and 2D video framebuffer. endef MASTER_SITES = http://www.libsdl.org/release/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWlibsdl, depend ) +DISTFILES += $(call admfiles,CSWlibsdl) +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --disable-video-dga +EXTRA_BUILD_ISAS_i386 = amd64 + include ../category.mk Modified: csw/branches/dam/automatic-multiarch-compile/lib/libsdl/checksums =================================================================== --- csw/branches/dam/automatic-multiarch-compile/lib/libsdl/checksums 2008-12-09 16:18:16 UTC (rev 2493) +++ csw/branches/dam/automatic-multiarch-compile/lib/libsdl/checksums 2008-12-09 16:19:33 UTC (rev 2494) @@ -1,3 +1,2 @@ -dbe82ff408bccfd6992b4cf162538595 download/SDL-1.2.11.tar.gz +c6660feea2a6834de10bc71b2f8e4d88 download/SDL-1.2.13.tar.gz 60483a03ebdc960fc70c67cebc151245 download/CSWlibsdl.gspec -518f6003f41f94b4ff7c36c4df00853d download/CSWlibsdl.depend Modified: csw/branches/dam/automatic-multiarch-compile/lib/libsdl/files/CSWlibsdl.depend =================================================================== --- csw/branches/dam/automatic-multiarch-compile/lib/libsdl/files/CSWlibsdl.depend 2008-12-09 16:18:16 UTC (rev 2493) +++ csw/branches/dam/automatic-multiarch-compile/lib/libsdl/files/CSWlibsdl.depend 2008-12-09 16:19:33 UTC (rev 2494) @@ -1 +1 @@ -CSWiconv +P CSWiconv libiconv - GNU iconv library 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 Dec 9 17:20:15 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 16:20:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[2495] csw/branches/dam/automatic-multiarch-compile/lib/ libpopt/Makefile Message-ID: Revision: 2495 http://gar.svn.sourceforge.net/gar/?rev=2495&view=rev Author: dmichelsen Date: 2008-12-09 16:20:14 +0000 (Tue, 09 Dec 2008) Log Message: ----------- multiISA libpopt: Move to mGAR v2 Modified Paths: -------------- csw/branches/dam/automatic-multiarch-compile/lib/libpopt/Makefile Modified: csw/branches/dam/automatic-multiarch-compile/lib/libpopt/Makefile =================================================================== --- csw/branches/dam/automatic-multiarch-compile/lib/libpopt/Makefile 2008-12-09 16:19:33 UTC (rev 2494) +++ csw/branches/dam/automatic-multiarch-compile/lib/libpopt/Makefile 2008-12-09 16:20:14 UTC (rev 2495) @@ -12,8 +12,18 @@ CONFIGURE_ARGS = $(DIRPATHS) -ADDITIONAL_BUILD_ARCHS_sparc = sparcv9 +#EXTRA_BUILD_ISAS_i386 = amd64 +#EXTRA_BUILD_ISAS_sparc = sparcv9 +# Just do 64 bit build +#BUILD64 = 1 + +# Build all known ISAs (may not work with compiler) +#EXTRA_BUILD_ISAS = $(ISALIST) + +# Build all ISAs known to the chosen compiler +EXTRA_BUILD_ISAS = $(ISALIST_$(GARCOMPILER)) + TEST_TARGET = check include ../category.mk @@ -29,3 +39,6 @@ # Make sure xgettext we carefully linked just before is found before # other versions. PATH := .:$(PATH) + +env: + echo "I: $(ISALIST_$(GARCOMPILER)) 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 Dec 9 17:20:48 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 16:20:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[2496] csw/branches/dam/automatic-multiarch-compile/lib/ gtk2 Message-ID: Revision: 2496 http://gar.svn.sourceforge.net/gar/?rev=2496&view=rev Author: dmichelsen Date: 2008-12-09 16:20:48 +0000 (Tue, 09 Dec 2008) Log Message: ----------- multiISA gtk2: Move to mGAR v2 Modified Paths: -------------- csw/branches/dam/automatic-multiarch-compile/lib/gtk2/Makefile csw/branches/dam/automatic-multiarch-compile/lib/gtk2/checksums Modified: csw/branches/dam/automatic-multiarch-compile/lib/gtk2/Makefile =================================================================== --- csw/branches/dam/automatic-multiarch-compile/lib/gtk2/Makefile 2008-12-09 16:20:14 UTC (rev 2495) +++ csw/branches/dam/automatic-multiarch-compile/lib/gtk2/Makefile 2008-12-09 16:20:48 UTC (rev 2496) @@ -1,5 +1,5 @@ GARNAME = gtk2 -GARVERSION = 2.4.3 +GARVERSION = 2.14.4 CATEGORIES = lib DESCRIPTION = A library for creating graphical user interfaces. @@ -16,23 +16,20 @@ # # #if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP) -MASTER_SITES = ftp://ftp.gtk.org/pub/gtk/v2.4/ +MASTER_SITES = http://ftp.gnome.org/pub/gnome/sources/gtk+/2.14/ DISTFILES = gtk+-$(GARVERSION).tar.bz2 WORKSRC = $(WORKDIR)/gtk+-$(GARVERSION) -LIBDEPS += lib/atk -LIBDEPS += lib/pango -LIBDEPS += lib/xcursor -LIBDEPS += xtra/hicolor-icon-theme - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-debug=yes +BUILD64 = 1 + TEST_TARGET = check include ../category.mk -CFLAGS := -g $(CFLAGS) -CXXFLAGS := -g $(CXXFLAGS) -export CFLAGS CXXFLAGS +#CFLAGS := -g $(CFLAGS) +#CXXFLAGS := -g $(CXXFLAGS) +#export CFLAGS CXXFLAGS Modified: csw/branches/dam/automatic-multiarch-compile/lib/gtk2/checksums =================================================================== --- csw/branches/dam/automatic-multiarch-compile/lib/gtk2/checksums 2008-12-09 16:20:14 UTC (rev 2495) +++ csw/branches/dam/automatic-multiarch-compile/lib/gtk2/checksums 2008-12-09 16:20:48 UTC (rev 2496) @@ -1 +1 @@ -debfd0fcef08683c0761f13e1ba2dced download/gtk+-2.4.3.tar.bz2 +72bf65a54d2d29a6644dc0d28313ee67 download/gtk+-2.14.4.tar.bz2 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 Dec 9 17:21:34 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 16:21:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[2497] csw/branches/dam/automatic-multiarch-compile/lib/qt4 Message-ID: Revision: 2497 http://gar.svn.sourceforge.net/gar/?rev=2497&view=rev Author: dmichelsen Date: 2008-12-09 16:21:33 +0000 (Tue, 09 Dec 2008) Log Message: ----------- multiISA qt4: Move to mGAR v2 Modified Paths: -------------- csw/branches/dam/automatic-multiarch-compile/lib/qt4/Makefile csw/branches/dam/automatic-multiarch-compile/lib/qt4/checksums Modified: csw/branches/dam/automatic-multiarch-compile/lib/qt4/Makefile =================================================================== --- csw/branches/dam/automatic-multiarch-compile/lib/qt4/Makefile 2008-12-09 16:20:48 UTC (rev 2496) +++ csw/branches/dam/automatic-multiarch-compile/lib/qt4/Makefile 2008-12-09 16:21:33 UTC (rev 2497) @@ -1,5 +1,5 @@ GARNAME = qt4 -GARVERSION = 4.3.3 +GARVERSION = 4.4.0 CATEGORIES = lib DESCRIPTION = TrollTech C++ application framework @@ -9,58 +9,22 @@ http://doc.trolltech.com/4.3/qt4-intro.html for details. endef -sparc_ARCH = sparc -i386_ARCH = i386 -sparc_ARCH64 = sparcv9 -i386_ARCH64 = amd64 - -ARCH=$($(GARCH)_ARCH) -ARCH64=$($(GARCH)_ARCH64) - ifndef DO64 PLATFORM=solaris-cc else PLATFORM=solaris-cc-64 endif -ifdef ISA -ISALIST = $(ISA) -else -ifndef DO64 -ISA = $(ARCH) -else -ISA = $(ARCH64) -endif -endif - MASTER_SITES = ftp://ftp.trolltech.com/qt/source/ DISTFILES = qt-x11-opensource-src-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWqt4,depend prototype-sparc prototype-i386) DISTFILES += $(call admfiles,CSWqt4-devel,depend prototype-sparc prototype-i386) DISTFILES += $(call admfiles,CSWqt4-docs,prototype) -WORKDIR = $(WORKROOTDIR)/$(DESTIMG).d/$(PLATFORM) -COOKIEROOTDIR = cookies.$(PLATFORM) - WORKSRC = $(WORKDIR)/qt-x11-opensource-src-$(GARVERSION) PREREQUISITE_PKGS = CSWpkgconfig CSWfconfig CSWlibdbusdev -# Usually the pathes from already installed stuff at $DESTDIR is -# used before regular installed stuff. This leads to include errors -# if we already have a qt4 installed at $DESTDIR. -IGNORE_DESTDIR = 1 - -ifdef DO64 - bindir = $(exec_prefix)/bin/sparcv9 - libdir = $(exec_prefix)/lib/sparcv9 - docdir = $(prefix)/ignore/doc - includedir = $(prefix)/ignore/include - datadir = $(prefix)/ignore/data - sharedstatedir = $(prefix)/ignore/share - etcdir = $(prefix)/ignore/etc -endif - CONFIGURE_ARGS = -prefix $(prefix) \ -bindir $(bindir) \ -libdir $(libdir) \ @@ -78,82 +42,38 @@ -confirm-license \ -verbose +BUILD64 = 1 + SKIPTEST = 1 INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) SRC_CLEAN_TARGET = confclean -ifndef DO64 -CLEAN_SCRIPTS = all custom -endif - include ../category.mk -OPTARCH_sparc = v8 -OPTARCH_sparcv9 = v9 -OPTARCH_i386 = 386 -OPTARCH_amd64 = amd64 -OPTARCH = $(OPTARCH_$(ISA)) - -ifdef DO64 - # Do not use -xO3 as -xO2 is already set in the Makefile - SUN_CC_OPT = -xarch=$(OPTARCH) -xspace -xildoff - SUN_CXX_OPT = -xarch=$(OPTARCH) -xspace -xildoff - - # Do not include -I/-L here. These flags must be defined after - # local QT4 includes and need to be defined during configure. - CFLAGS = $($(GARCOMPILER)_CC_$(GARFLAVOR)) - CPPFLAGS = $($(GARCOMPILER)_CPP_FLAGS) - # -D_POSIX_PTHREAD_SEMANTICS needed, because getpwuid_r is used in the 4-arg-version - # (see getpwuid_r(3c) for details) - CXXFLAGS = $($(GARCOMPILER)_CXX_$(GARFLAVOR)) -D_POSIX_PTHREAD_SEMANTICS - LDFLAGS = $($(GARCOMPILER)_LD_FLAGS) $($(GARCOMPILER)_LD_$(GARFLAVOR)) -else - # Do not use -xO3 as -xO2 is already set in the Makefile - SUN_CC_OPT = -xarch=$(OPTARCH) -xspace -xildoff - SUN_CXX_OPT = -xarch=$(OPTARCH) -xspace -xildoff - - # Do not include -I/-L here. These flags must be defined after - # local QT4 includes and need to be defined during configure. - CFLAGS = $($(GARCOMPILER)_CC_$(GARFLAVOR)) - CPPFLAGS = $($(GARCOMPILER)_CPP_FLAGS) - CXXFLAGS = $($(GARCOMPILER)_CXX_$(GARFLAVOR)) - LDFLAGS = $($(GARCOMPILER)_LD_FLAGS) $($(GARCOMPILER)_LD_$(GARFLAVOR)) -endif - -pre-build: - @echo "ISA: $(ISA)" - @echo "XC: $(GARCOMPILER)_CC_$(GARFLAVOR)" - @echo "XC: $($(GARCOMPILER)_CC_$(GARFLAVOR))" - @echo "CFLAGS: $(CFLAGS)" - -build64: - @echo " ==> Building 64 bit version" - gmake DO64=1 build - -install64: build64 - @echo " ==> Installing 64 bit version" - gmake DO64=1 install - -pre-package: install64 - -pre-install: - @echo " ==> Install environment:" - @echo " bindir: $(bindir)" - @echo " libdir: $(libdir)" - @/usr/bin/env - -clean64: - gmake DO64=1 clean - -clean-custom: clean64 - -env: - @echo " GARCH = $(GARCH)" - @echo " GARVERSION = $(GARVERSION)" - @echo " ISA = $(ISA)" - @echo " CFLAGS = $(CFLAGS)" - @echo " OPTARCH = $(OPTARCH)" - @echo " OPTARCH_ISA = $(OPTARCH_$(ISA))" - @echo "CLEAN TARGETS = $(CLEAN_TARGETS)" +#ifdef DO64 +# # Do not use -xO3 as -xO2 is already set in the Makefile +# SUN_CC_OPT = -xarch=$(OPTARCH) -xspace -xildoff +# SUN_CXX_OPT = -xarch=$(OPTARCH) -xspace -xildoff +# +# # Do not include -I/-L here. These flags must be defined after +# # local QT4 includes and need to be defined during configure. +# CFLAGS = $($(GARCOMPILER)_CC_$(GARFLAVOR)) +# CPPFLAGS = $($(GARCOMPILER)_CPP_FLAGS) +# # -D_POSIX_PTHREAD_SEMANTICS needed, because getpwuid_r is used in the 4-arg-version +# # (see getpwuid_r(3c) for details) +# CXXFLAGS = $($(GARCOMPILER)_CXX_$(GARFLAVOR)) -D_POSIX_PTHREAD_SEMANTICS +# LDFLAGS = $($(GARCOMPILER)_LD_FLAGS) $($(GARCOMPILER)_LD_$(GARFLAVOR)) +#else +# # Do not use -xO3 as -xO2 is already set in the Makefile +# SUN_CC_OPT = -xarch=$(OPTARCH) -xspace -xildoff +# SUN_CXX_OPT = -xarch=$(OPTARCH) -xspace -xildoff +# +# # Do not include -I/-L here. These flags must be defined after +# # local QT4 includes and need to be defined during configure. +# CFLAGS = $($(GARCOMPILER)_CC_$(GARFLAVOR)) +# CPPFLAGS = $($(GARCOMPILER)_CPP_FLAGS) +# CXXFLAGS = $($(GARCOMPILER)_CXX_$(GARFLAVOR)) +# LDFLAGS = $($(GARCOMPILER)_LD_FLAGS) $($(GARCOMPILER)_LD_$(GARFLAVOR)) +#endif Modified: csw/branches/dam/automatic-multiarch-compile/lib/qt4/checksums =================================================================== --- csw/branches/dam/automatic-multiarch-compile/lib/qt4/checksums 2008-12-09 16:20:48 UTC (rev 2496) +++ csw/branches/dam/automatic-multiarch-compile/lib/qt4/checksums 2008-12-09 16:21:33 UTC (rev 2497) @@ -1,4 +1,4 @@ -19678fe35170559cd6a6fa531c57799c download/qt-x11-opensource-src-4.3.3.tar.gz +f13ad0aa75efad314715930e663bad55 download/qt-x11-opensource-src-4.4.0.tar.gz 1971c2c7513b65cd7a8d33b9a637a908 download/CSWqt4.gspec abca6ced15fc6cc1f47ca35ebe1af99b download/CSWqt4.depend 46107c5b0ec8d00a3a19008f251e98f3 download/CSWqt4.prototype-sparc 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 Dec 9 17:37:25 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 16:37:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[2498] csw/mgar/pkg/libxml2/trunk Message-ID: Revision: 2498 http://gar.svn.sourceforge.net/gar/?rev=2498&view=rev Author: dmichelsen Date: 2008-12-09 16:37:25 +0000 (Tue, 09 Dec 2008) Log Message: ----------- libxml2: Relocate catalog and small mGAR v2 fix Modified Paths: -------------- csw/mgar/pkg/libxml2/trunk/Makefile csw/mgar/pkg/libxml2/trunk/checksums csw/mgar/pkg/libxml2/trunk/files/CSWlibxml2.gspec csw/mgar/pkg/libxml2/trunk/files/CSWlibxml2devel.gspec csw/mgar/pkg/libxml2/trunk/files/CSWpylibxml2.gspec Modified: csw/mgar/pkg/libxml2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxml2/trunk/Makefile 2008-12-09 16:21:33 UTC (rev 2497) +++ csw/mgar/pkg/libxml2/trunk/Makefile 2008-12-09 16:37:25 UTC (rev 2498) @@ -20,6 +20,9 @@ CONFIGURE_ARGS_32 = --with-python=$(prefix) CONFIGURE_ARGS_64 = --without-python +EXTRA_CPPFLAGS = -DXML_XML_DEFAULT_CATALOG=\\\"$(sysconfdir)/xml/catalog\\\" +EXTRA_CPPFLAGS += -DXML_SGML_DEFAULT_CATALOG=\\\"$(sysconfdir)/sgml/catalog\\\" + CONFIGURE_ARGS = $(DIRPATHS) $(CONFIGURE_ARGS_$(MEMORYMODEL)) BUILD64 = 1 Modified: csw/mgar/pkg/libxml2/trunk/checksums =================================================================== --- csw/mgar/pkg/libxml2/trunk/checksums 2008-12-09 16:21:33 UTC (rev 2497) +++ csw/mgar/pkg/libxml2/trunk/checksums 2008-12-09 16:37:25 UTC (rev 2498) @@ -1,7 +1,7 @@ dc43ff7ae6aded45f578c87b7b0c8766 download/libxml2-2.7.2.tar.gz -893a9a9a73ffc96e1a44ca456e7014db download/CSWpylibxml2.gspec +590a7d5677be4f5c67a52b08eba6fb2b download/CSWpylibxml2.gspec dd8c26f51eb9a53545b4cd914b40675b download/CSWpylibxml2.depend -abd229e650e74b345c172079c0078f63 download/CSWlibxml2.gspec +f07ada794bee08b0d3ec7dcd68d1e0ac download/CSWlibxml2.gspec 115241717779eb81926e5ff971d7fbd7 download/CSWlibxml2.depend -da1d182aa18a0e7b5880897d1ed5afa8 download/CSWlibxml2devel.gspec +0633f70c4570a204284c219c02a3c00e download/CSWlibxml2devel.gspec 915b1265ec08b5efcfedb03ade19040f download/CSWlibxml2devel.depend Modified: csw/mgar/pkg/libxml2/trunk/files/CSWlibxml2.gspec =================================================================== --- csw/mgar/pkg/libxml2/trunk/files/CSWlibxml2.gspec 2008-12-09 16:21:33 UTC (rev 2497) +++ csw/mgar/pkg/libxml2/trunk/files/CSWlibxml2.gspec 2008-12-09 16:37:25 UTC (rev 2498) @@ -1,4 +1,4 @@ %var bitname libxml2 %var pkgname CSWlibxml2 %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING +%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Modified: csw/mgar/pkg/libxml2/trunk/files/CSWlibxml2devel.gspec =================================================================== --- csw/mgar/pkg/libxml2/trunk/files/CSWlibxml2devel.gspec 2008-12-09 16:21:33 UTC (rev 2497) +++ csw/mgar/pkg/libxml2/trunk/files/CSWlibxml2devel.gspec 2008-12-09 16:37:25 UTC (rev 2498) @@ -1,4 +1,4 @@ %var bitname libxml2_devel %var pkgname CSWlibxml2devel %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING +%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Modified: csw/mgar/pkg/libxml2/trunk/files/CSWpylibxml2.gspec =================================================================== --- csw/mgar/pkg/libxml2/trunk/files/CSWpylibxml2.gspec 2008-12-09 16:21:33 UTC (rev 2497) +++ csw/mgar/pkg/libxml2/trunk/files/CSWpylibxml2.gspec 2008-12-09 16:37:25 UTC (rev 2498) @@ -1,4 +1,4 @@ %var bitname pylibxml2 %var pkgname CSWpylibxml2 %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING +%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 bdwalton at users.sourceforge.net Tue Dec 9 18:48:51 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 09 Dec 2008 17:48:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[2499] csw/mgar/pkg/docbook-dtds/trunk Message-ID: Revision: 2499 http://gar.svn.sourceforge.net/gar/?rev=2499&view=rev Author: bdwalton Date: 2008-12-09 17:48:50 +0000 (Tue, 09 Dec 2008) Log Message: ----------- Corrected small glitch in postinstall script so that the catalog is reordered properly. Modified Paths: -------------- csw/mgar/pkg/docbook-dtds/trunk/checksums csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall Modified: csw/mgar/pkg/docbook-dtds/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/checksums 2008-12-09 16:37:25 UTC (rev 2498) +++ csw/mgar/pkg/docbook-dtds/trunk/checksums 2008-12-09 17:48:50 UTC (rev 2499) @@ -12,7 +12,7 @@ 2479ac1e7b4a43d3618ca16237aaa85d download/Makefile 536104a1ab1e8eac583cf27f4f8844a4 download/CSWdocbookdtds.gspec cb6dbfe9f6184a9de0725c0a61adc57b download/CSWdocbookdtds.depend -5cb8ab501683e226c5b34fac2dc66076 download/CSWdocbookdtds.postinstall +95eb4822347e50556398f4a11ee95097 download/CSWdocbookdtds.postinstall 9035c448e6480f6e916084fea388b512 download/CSWdocbookdtds.preremove 318742d3a6648a6905727f071cbc9847 download/docbook-4.2-euro.patch e3067045964536cc7445d5c3f1e99916 download/docbook-dtd30-sgml-1.0.catalog.patch Modified: csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall 2008-12-09 16:37:25 UTC (rev 2498) +++ csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall 2008-12-09 17:48:50 UTC (rev 2499) @@ -225,7 +225,7 @@ /usr/bin/perl -e "@_=<>;@_[$XML,$SGML]=@_[$SGML,$XML];print @_" \ ${CATALOG} > ${CATALOG}.tmp - mv ${CATALOG}.tmp ${CATALOG}.new + mv ${CATALOG}.tmp ${CATALOG} fi ## 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 Dec 9 21:23:44 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 20:23:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[2500] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 2500 http://gar.svn.sourceforge.net/gar/?rev=2500&view=rev Author: dmichelsen Date: 2008-12-09 20:23:44 +0000 (Tue, 09 Dec 2008) Log Message: ----------- mGAR v2: Exclude libtool files by default Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2008-12-09 17:48:50 UTC (rev 2499) +++ csw/mgar/gar/v2/gar.mk 2008-12-09 20:23:44 UTC (rev 2500) @@ -530,8 +530,7 @@ _MERGE_INCLUDE_FILES += $(EXTRA_MERGE_INCLUDE_FILES) $(EXTRA_MERGE_INCLUDE_FILES_$(MODULATION)) MERGE_EXCLUDE_INFODIR ?= $(sharedstatedir)/info/dir -#MERGE_EXCLUDE_DEFAULT ?= $(MERGE_EXCLUDE_INFODIR) $(libdir)/.*\.a $(libdir)/.*\.la -MERGE_EXCLUDE_DEFAULT ?= $(MERGE_EXCLUDE_INFODIR) $(libdir)/.*\.a +MERGE_EXCLUDE_DEFAULT ?= $(MERGE_EXCLUDE_INFODIR) $(libdir)/.*\.a $(libdir)/.*\.la # Exclude these files ifeq ($(origin MERGE_EXCLUDE_FILES_$(MODULATION)), undefined) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Dec 9 21:39:16 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 09 Dec 2008 20:39:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[2501] csw/mgar/gar/v2 Message-ID: Revision: 2501 http://gar.svn.sourceforge.net/gar/?rev=2501&view=rev Author: bonivart Date: 2008-12-09 20:39:16 +0000 (Tue, 09 Dec 2008) Log Message: ----------- mGAR v2: Allow /etc and /var in packages by default Modified Paths: -------------- csw/mgar/gar/v2/bin/cswproto csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/bin/cswproto =================================================================== --- csw/mgar/gar/v2/bin/cswproto 2008-12-09 20:23:44 UTC (rev 2500) +++ csw/mgar/gar/v2/bin/cswproto 2008-12-09 20:39:16 UTC (rev 2501) @@ -20,7 +20,7 @@ use POSIX; use vars qw/ - @XPATS @XFORMS @Common $StdOwn $StdGrp $StdDirPerm $stamp $root + @XFORMS @Common $StdOwn $StdGrp $StdDirPerm $stamp $root /; # atime=8,mtime=9,ctime=10 @@ -38,15 +38,6 @@ [ qr{^/opt/csw/info$}, q{/opt/csw/share/info} ], ); -# Standard exclusions - at XPATS = ( - qr{^/$}, - qr{^/opt$}, - qr{^/opt/csw$}, - qr{perllocal\.pod}, - qr{~$}, -); - # Print usage information and exit sub usage { print join(" ", @_) if @_; @@ -77,7 +68,7 @@ sub is_common { my $path = shift; foreach my $pat (@Common) { - return 1 if $path =~ /$pat$/; + return 1 if $path =~ m!^$pat$!; } return 0; } @@ -156,7 +147,7 @@ next unless $F[2]; # Then process any excludes - foreach my $pattern (@XPATS) { next SPECLINE if $F[2] =~ $pattern } + next SPECLINE if( is_common( $F[2] ) ); next if exclude($realpath); # Fix up dir permissions/file ownership. @@ -172,6 +163,10 @@ # Common directories (CSWcommon plus a few others) __DATA__ +/etc +/etc/opt +/etc/opt/csw +/opt /opt/csw /opt/csw/bin /opt/csw/bin/i386 @@ -348,3 +343,6 @@ /opt/csw/share/perl/csw/auto /opt/csw/share/perl/site_perl /opt/csw/var +/var +/var/opt +/var/opt/csw Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2008-12-09 20:23:44 UTC (rev 2500) +++ csw/mgar/gar/v2/gar.pkg.mk 2008-12-09 20:39:16 UTC (rev 2501) @@ -140,7 +140,7 @@ # Pulled in from pkglib/csw_prototype.gspec $(PROTOTYPE): $(WORKDIR) merge - @cswproto -r $(PKGROOT) $(PKGROOT)$(prefix) >$@ + @cswproto -r $(PKGROOT) $(PKGROOT) >$@ .PRECIOUS: $(WORKDIR)/%.prototype $(WORKDIR)/%.prototype-$(GARCH) $(WORKDIR)/%.prototype: | $(PROTOTYPE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Tue Dec 9 21:45:33 2008 From: dam at opencsw.org (Dagobert Michelsen) Date: Tue, 9 Dec 2008 21:45:33 +0100 Subject: [csw-devel] Putting /etc/opt/csw and /var/opt/csw in a package In-Reply-To: <625385e30812091122u75b59689m2f06a32da465d0f5@mail.gmail.com> References: <625385e30812081518k2c42ea59l7aff6a34554daf64@mail.gmail.com> <625385e30812081543p2c1709ach4a497174eb86cc62@mail.gmail.com> <6F86DE12-255A-4C09-9C5D-F3C22764CB32@opencsw.org> <625385e30812090842w509942bcre4cf85548e89082a@mail.gmail.com> <625385e30812091122u75b59689m2f06a32da465d0f5@mail.gmail.com> Message-ID: <6DA4F414-4A28-4F68-AC26-190B0F713C86@opencsw.org> Hi Peter, Am 09.12.2008 um 20:22 schrieb Peter Bonivart: >> So you use >>> >>> %prototype exec cswproto -r %{PKGROOT} %{PKGROOT} >> >> and it should work. > > For some reason this didn't change anything, it still skipped the /var > dir. I didn't have time to try any more, I had to leave but will > continue tomorrow. Forget my last mail, that didn't work out at all. I fixed this now in GAR: Starting from [2501] everything in $PKGROOT will be put in the package, where the pathes from CSWcommon are skipped. If you don't want to have something in there don't copy it to $PKGROOT in the first place by using EXTRA_MERGE_EXCLUDE_FILES. BTW: I removed the prototype line from your gspecs. Best regards -- Dago From dmichelsen at users.sourceforge.net Tue Dec 9 21:50:48 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 20:50:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[2502] csw/mgar/pkg/jdk6/trunk Message-ID: Revision: 2502 http://gar.svn.sourceforge.net/gar/?rev=2502&view=rev Author: dmichelsen Date: 2008-12-09 20:50:47 +0000 (Tue, 09 Dec 2008) Log Message: ----------- jdk6: Another step towards unified JDK/JRE Modified Paths: -------------- csw/mgar/pkg/jdk6/trunk/Makefile csw/mgar/pkg/jdk6/trunk/checksums csw/mgar/pkg/jdk6/trunk/files/CSWjdk.gspec csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.gspec csw/mgar/pkg/jdk6/trunk/files/CSWjre.gspec csw/mgar/pkg/jdk6/trunk/files/CSWjre6.gspec Removed Paths: ------------- csw/mgar/pkg/jdk6/trunk/files/CSWjdk.depend csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.depend csw/mgar/pkg/jdk6/trunk/files/CSWjre.depend Modified: csw/mgar/pkg/jdk6/trunk/Makefile =================================================================== --- csw/mgar/pkg/jdk6/trunk/Makefile 2008-12-09 20:39:16 UTC (rev 2501) +++ csw/mgar/pkg/jdk6/trunk/Makefile 2008-12-09 20:50:47 UTC (rev 2502) @@ -18,16 +18,27 @@ DISTNAME = jdk$(SPKG_VERSION) DISTFILES = $(foreach S,$(SUFFIXES),jdk-$(GARVERSION)-solaris-$S.sh) NOEXTRACT = $(foreach S,$(filter-out $(SUFFIXES_$(GARCH)),$(SUFFIXES)),jdk-$(GARVERSION)-solaris-$S.sh) -DISTFILES += $(call admfiles,CSWjdk6,depend) +DISTFILES += $(call admfiles,CSWjdk6) DISTFILES += $(call admfiles,CSWjre6) -DISTFILES += $(call admfiles,CSWjdk,depend) -DISTFILES += $(call admfiles,CSWjre,depend) +DISTFILES += $(call admfiles,CSWjdk) +DISTFILES += $(call admfiles,CSWjre) SPKG_SOURCEURL = http://java.sun.com/javase/downloads/index.jsp +SPKG_DESC_CSWjdk6 = Java Development Kit 6 +SPKG_DESC_CSWjre6 = Java Runtime Environment 6 +SPKG_DESC_CSWjdk = Java Delopment Kit - Latest Version (now CSWjdk6) +SPKG_DESC_CSWjre = Java Runtime Environment - Latest Version (now CSWjre6) + +REQUIRED_PKGS_CSWjdk6 = CSWjre6 +REQUIRED_PKGS_CSWjdk = CSWjdk6 +REQUIRED_PKGS_CSWjre = CSWjre6 + MANPAGES_JRE = java.1 javaws.1 keytool.1 orbd.1 pack200.1 policytool.1 rmid.1 rmiregistry.1 MANPAGES_JRE += servertool.1 tnameserv.1 unpack200.1 +MANPAGE_REGEX = ($(shell echo $(MANPAGES_JRE) | perl -lne 's/\./\\./g;print join("|",split)')) + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = @@ -39,7 +50,7 @@ PKGFILES_CSWjre += $(prefix)/java/man PKGFILES_CSWjre6 = $(prefix)/java/jdk/$(DISTNAME)/jre/.* -PKGFILES_CSWjre6 += $(prefix)/java/jdk/$(DISTNAME)/man/.*/(java|javaws|keytool|orbd|pack200|policytool|rmid|rmiregistry|servertool|tnameserv|unpack200)\.1 +PKGFILES_CSWjre6 += $(prefix)/java/jdk/$(DISTNAME)/man/.*/$(MANPAGE_REGEX) PKGFILES_CSWjre6 += $(prefix)/java/jre/jre$(SPKG_VERSION) PKGFILES_CSWjre6 += $(prefix)/java/jre/jre6 @@ -57,9 +68,10 @@ @echo # rule to extract files with shell +# Clear DISPLAY or the installer will bring up advertisement shell-extract-archive-%: @echo " ==> Extracting $(DOWNLOADDIR)/$*" - @echo "yes" | (D=$(abspath $(DOWNLOADDIR)/$*); cd $(EXTRACTDIR); MORE="-10000" sh $$D) + @echo "yes" | (D=$(abspath $(DOWNLOADDIR)/$*); cd $(EXTRACTDIR); DISPLAY= MORE="-10000" sh $$D -noregister) @$(MAKECOOKIE) extract-archive-%.sh: shell-extract-archive-%.sh Modified: csw/mgar/pkg/jdk6/trunk/checksums =================================================================== --- csw/mgar/pkg/jdk6/trunk/checksums 2008-12-09 20:39:16 UTC (rev 2501) +++ csw/mgar/pkg/jdk6/trunk/checksums 2008-12-09 20:50:47 UTC (rev 2502) @@ -2,10 +2,7 @@ 2f5b20118c85533854720ebbfb428758 download/jdk-6u11-solaris-sparcv9.sh e460101ca2d718b98a65c432753e9684 download/jdk-6u11-solaris-i586.sh c103e6c5d4d42a8ab162804a7b01c3c2 download/jdk-6u11-solaris-x64.sh -d2ea0d736a7cf088ed9d452f3b1ecb1d download/CSWjdk6.gspec -a077039adebc66db2f7316e387ba13eb download/CSWjdk6.depend -d085818ed2ca9c777c85b3c9553a41f5 download/CSWjre6.gspec -8b98539f0a2211e965cc9bb2d42024f3 download/CSWjdk.gspec -e1aeb08d2dbb21e9b61598bc1dde0094 download/CSWjdk.depend -873b8c1f59485f78eb87ad67fe4c4dc4 download/CSWjre.gspec -a077039adebc66db2f7316e387ba13eb download/CSWjre.depend +8e3e3bcebbbd14d16657d8a102c2ed3b download/CSWjdk6.gspec +a08a034895b0e77dd70df961d63ec1a1 download/CSWjre6.gspec +232933acc5ba9ac4fe72ed3cebdcb4d0 download/CSWjdk.gspec +8d4a797e73a0e4b6f17fcf0a99d9b6f0 download/CSWjre.gspec Deleted: csw/mgar/pkg/jdk6/trunk/files/CSWjdk.depend =================================================================== --- csw/mgar/pkg/jdk6/trunk/files/CSWjdk.depend 2008-12-09 20:39:16 UTC (rev 2501) +++ csw/mgar/pkg/jdk6/trunk/files/CSWjdk.depend 2008-12-09 20:50:47 UTC (rev 2502) @@ -1 +0,0 @@ -P CSWjdk6 jdk6 - Java Development Kit 6 Modified: csw/mgar/pkg/jdk6/trunk/files/CSWjdk.gspec =================================================================== --- csw/mgar/pkg/jdk6/trunk/files/CSWjdk.gspec 2008-12-09 20:39:16 UTC (rev 2501) +++ csw/mgar/pkg/jdk6/trunk/files/CSWjdk.gspec 2008-12-09 20:50:47 UTC (rev 2502) @@ -1,4 +1,4 @@ %var bitname jdk %var pkgname CSWjdk %include url file://%{PKGLIB}/csw_standard.gspec -%copyright url file://%{WORKSRC}/LICENSE +%copyright url file://%{WORKSRC_DEFAULT}/LICENSE Deleted: csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.depend =================================================================== --- csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.depend 2008-12-09 20:39:16 UTC (rev 2501) +++ csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.depend 2008-12-09 20:50:47 UTC (rev 2502) @@ -1 +0,0 @@ -P CSWjre6 jre6 - Java Runtime Environment 6 Modified: csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.gspec =================================================================== --- csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.gspec 2008-12-09 20:39:16 UTC (rev 2501) +++ csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.gspec 2008-12-09 20:50:47 UTC (rev 2502) @@ -1,4 +1,4 @@ %var bitname jdk6 %var pkgname CSWjdk6 %include url file://%{PKGLIB}/csw_standard.gspec -%copyright url file://%{WORKSRC}/LICENSE +%copyright url file://%{WORKSRC_DEFAULT}/LICENSE Deleted: csw/mgar/pkg/jdk6/trunk/files/CSWjre.depend =================================================================== --- csw/mgar/pkg/jdk6/trunk/files/CSWjre.depend 2008-12-09 20:39:16 UTC (rev 2501) +++ csw/mgar/pkg/jdk6/trunk/files/CSWjre.depend 2008-12-09 20:50:47 UTC (rev 2502) @@ -1 +0,0 @@ -P CSWjre6 jre6 - Java Runtime Environment 6 Modified: csw/mgar/pkg/jdk6/trunk/files/CSWjre.gspec =================================================================== --- csw/mgar/pkg/jdk6/trunk/files/CSWjre.gspec 2008-12-09 20:39:16 UTC (rev 2501) +++ csw/mgar/pkg/jdk6/trunk/files/CSWjre.gspec 2008-12-09 20:50:47 UTC (rev 2502) @@ -1,4 +1,4 @@ %var bitname jre %var pkgname CSWjre %include url file://%{PKGLIB}/csw_standard.gspec -%copyright url file://%{WORKSRC}/LICENSE +%copyright url file://%{WORKSRC_DEFAULT}/LICENSE Modified: csw/mgar/pkg/jdk6/trunk/files/CSWjre6.gspec =================================================================== --- csw/mgar/pkg/jdk6/trunk/files/CSWjre6.gspec 2008-12-09 20:39:16 UTC (rev 2501) +++ csw/mgar/pkg/jdk6/trunk/files/CSWjre6.gspec 2008-12-09 20:50:47 UTC (rev 2502) @@ -1,4 +1,4 @@ %var bitname jre6 %var pkgname CSWjre6 %include url file://%{PKGLIB}/csw_standard.gspec -%copyright url file://%{WORKSRC}/LICENSE +%copyright url file://%{WORKSRC_DEFAULT}/LICENSE 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 Dec 9 22:18:15 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 21:18:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[2503] csw/mgar/pkg/msmtp/trunk Message-ID: Revision: 2503 http://gar.svn.sourceforge.net/gar/?rev=2503&view=rev Author: dmichelsen Date: 2008-12-09 21:18:15 +0000 (Tue, 09 Dec 2008) Log Message: ----------- msmtp: Update to 1.4.16 and mGAR v2, waiting for libgsasl Modified Paths: -------------- csw/mgar/pkg/msmtp/trunk/Makefile csw/mgar/pkg/msmtp/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/msmtp/trunk/files/CSWmsmtp.depend Property Changed: ---------------- csw/mgar/pkg/msmtp/trunk/ Property changes on: csw/mgar/pkg/msmtp/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/msmtp/trunk/Makefile =================================================================== --- csw/mgar/pkg/msmtp/trunk/Makefile 2008-12-09 20:50:47 UTC (rev 2502) +++ csw/mgar/pkg/msmtp/trunk/Makefile 2008-12-09 21:18:15 UTC (rev 2503) @@ -1,5 +1,5 @@ GARNAME = msmtp -GARVERSION = 1.4.13 +GARVERSION = 1.4.16 CATEGORIES = net DESCRIPTION = SMTP client @@ -24,11 +24,14 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += $(call admfiles,CSWmsmtp,depend) +DISTFILES += $(call admfiles,CSWmsmtp) # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +REQUIRED_PKGS = CSWgcrypt CSWggettext CSWgnutls CSWgpgerr CSWiconv CSWkrb5lib +REQUIRED_PKGS += CSWlibgsasl CSWlibidn CSWlibntlm CSWzlib + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/msmtp/trunk/checksums =================================================================== --- csw/mgar/pkg/msmtp/trunk/checksums 2008-12-09 20:50:47 UTC (rev 2502) +++ csw/mgar/pkg/msmtp/trunk/checksums 2008-12-09 21:18:15 UTC (rev 2503) @@ -1,3 +1,2 @@ -021a91d7145100ad0f00c912c8104e03 download/msmtp-1.4.13.tar.bz2 +77a333601e9de03f695539498e678cc2 download/msmtp-1.4.16.tar.bz2 fe48f4e103c584120b79c5f4c0daed4e download/CSWmsmtp.gspec -0f1691a4cb0004a76a09b6a2b4e48ef1 download/CSWmsmtp.depend Deleted: csw/mgar/pkg/msmtp/trunk/files/CSWmsmtp.depend =================================================================== --- csw/mgar/pkg/msmtp/trunk/files/CSWmsmtp.depend 2008-12-09 20:50:47 UTC (rev 2502) +++ csw/mgar/pkg/msmtp/trunk/files/CSWmsmtp.depend 2008-12-09 21:18:15 UTC (rev 2503) @@ -1,10 +0,0 @@ -P CSWgcrypt libgcrypt - GNU libcrypt -P CSWggettext ggettext - GNU gettext -P CSWgnutls gnutls - GNU Transport Layer Security lib and tools -P CSWgpgerr libgpg_error - GNU gpg related library -P CSWiconv libiconv - GNU iconv library -P CSWkrb5lib krb5_lib - MIT Kerberos 5 core libraries -P CSWlibgsasl libgsasl - GNU SASL Library -P CSWlibidn libidn - Implementation of the Stringprep, Punycode and IDNA -P CSWlibntlm libntlm - libntlm - A library that implement Microsoft's NTLM authentication -P CSWzlib zlib - Zlib Data Compression Library 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 Dec 9 22:32:10 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Dec 2008 21:32:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[2504] csw/mgar/pkg/libgsasl/trunk Message-ID: Revision: 2504 http://gar.svn.sourceforge.net/gar/?rev=2504&view=rev Author: dmichelsen Date: 2008-12-09 21:32:10 +0000 (Tue, 09 Dec 2008) Log Message: ----------- libgsasl: Update to 0.2.29 and mGAR v2 Modified Paths: -------------- csw/mgar/pkg/libgsasl/trunk/Makefile csw/mgar/pkg/libgsasl/trunk/checksums csw/mgar/pkg/libgsasl/trunk/files/CSWlibgsasl.gspec Removed Paths: ------------- csw/mgar/pkg/libgsasl/trunk/files/CSWlibgsasl.depend Property Changed: ---------------- csw/mgar/pkg/libgsasl/trunk/ Property changes on: csw/mgar/pkg/libgsasl/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/libgsasl/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgsasl/trunk/Makefile 2008-12-09 21:18:15 UTC (rev 2503) +++ csw/mgar/pkg/libgsasl/trunk/Makefile 2008-12-09 21:32:10 UTC (rev 2504) @@ -1,5 +1,5 @@ GARNAME = libgsasl -GARVERSION = 0.2.24 +GARVERSION = 0.2.29 CATEGORIES = lib DESCRIPTION = GNU SASL Library @@ -12,16 +12,19 @@ MASTER_SITES = ftp://alpha.gnu.org/pub/gnu/gsasl/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWlibgsasl,depend) +DISTFILES += $(call admfiles,CSWlibgsasl) # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -PREREQUISITE_PKGS = CSWkrb5libdev CSWlibntlm +PREREQUISITE_PKGS = CSWkrb5libdev +REQUIRED_PKGS = CSWggettext CSWiconv CSWkrb5lib CSWlibidn CSWlibntlm CONFIGURE_ARGS = $(DIRPATHS) -TEST_TARGET = check +# Test has compile errors +TEST_TARGET = +#TEST_TARGET = check include gar/category.mk Modified: csw/mgar/pkg/libgsasl/trunk/checksums =================================================================== --- csw/mgar/pkg/libgsasl/trunk/checksums 2008-12-09 21:18:15 UTC (rev 2503) +++ csw/mgar/pkg/libgsasl/trunk/checksums 2008-12-09 21:32:10 UTC (rev 2504) @@ -1,3 +1,2 @@ -cc1f0353af7ea66a1a8906eb482d8c70 download/libgsasl-0.2.24.tar.gz -2144a2dadd53211c3c08c1c0afe4c674 download/CSWlibgsasl.gspec -ddb88ec7950f85a5656c7ca36f3cd196 download/CSWlibgsasl.depend +c38f4bc5ab488a215a09f2d915942482 download/libgsasl-0.2.29.tar.gz +df91f3186953d3af4a42244e314ef803 download/CSWlibgsasl.gspec Deleted: csw/mgar/pkg/libgsasl/trunk/files/CSWlibgsasl.depend =================================================================== --- csw/mgar/pkg/libgsasl/trunk/files/CSWlibgsasl.depend 2008-12-09 21:18:15 UTC (rev 2503) +++ csw/mgar/pkg/libgsasl/trunk/files/CSWlibgsasl.depend 2008-12-09 21:32:10 UTC (rev 2504) @@ -1,5 +0,0 @@ -P CSWggettext ggettext - GNU gettext -P CSWiconv libiconv - GNU iconv library -P CSWkrb5lib krb5_lib - MIT Kerberos 5 core libraries -P CSWlibidn libidn - Implementation of the Stringprep, Punycode and IDNA -P CSWlibntlm libntlm - A library that implement Microsoft's NTLM authentication Modified: csw/mgar/pkg/libgsasl/trunk/files/CSWlibgsasl.gspec =================================================================== --- csw/mgar/pkg/libgsasl/trunk/files/CSWlibgsasl.gspec 2008-12-09 21:18:15 UTC (rev 2503) +++ csw/mgar/pkg/libgsasl/trunk/files/CSWlibgsasl.gspec 2008-12-09 21:32:10 UTC (rev 2504) @@ -1,4 +1,4 @@ %var bitname libgsasl %var pkgname CSWlibgsasl %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING +%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 chninkel at users.sourceforge.net Tue Dec 9 22:47:17 2008 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 09 Dec 2008 21:47:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[2505] csw/mgar/pkg/openssl/trunk/Makefile Message-ID: Revision: 2505 http://gar.svn.sourceforge.net/gar/?rev=2505&view=rev Author: chninkel Date: 2008-12-09 21:47:17 +0000 (Tue, 09 Dec 2008) Log Message: ----------- openssl: sparcv9 merge workaround Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2008-12-09 21:32:10 UTC (rev 2504) +++ csw/mgar/pkg/openssl/trunk/Makefile 2008-12-09 21:47:17 UTC (rev 2505) @@ -43,6 +43,8 @@ NO_ISAEXEC = 1 #ISA_RELOCATE_DIRS_i386 = #ISA_RELOCATE_DIRS_sparcv8 = +ISALIBDIR_sparcv9 = . +libdir = /opt/csw/lib # we redefine the default merge exclude so *.a files are not excluded MERGE_EXCLUDE_DEFAULT = $(MERGE_EXCLUDE_INFODIR) 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 Dec 10 00:00:07 2008 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 09 Dec 2008 23:00:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[2506] csw/mgar/pkg/pv/trunk Message-ID: Revision: 2506 http://gar.svn.sourceforge.net/gar/?rev=2506&view=rev Author: skayser Date: 2008-12-09 23:00:07 +0000 (Tue, 09 Dec 2008) Log Message: ----------- pv: Changed broken upstream test Modified Paths: -------------- csw/mgar/pkg/pv/trunk/checksums csw/mgar/pkg/pv/trunk/files/fix-test-010.diff Modified: csw/mgar/pkg/pv/trunk/checksums =================================================================== --- csw/mgar/pkg/pv/trunk/checksums 2008-12-09 21:47:17 UTC (rev 2505) +++ csw/mgar/pkg/pv/trunk/checksums 2008-12-09 23:00:07 UTC (rev 2506) @@ -1,3 +1,3 @@ 8d0eda2182640919daaf6186cd816a13 download/pv-1.1.4.tar.gz 6e307b98bc517acb6353981bee5e686c download/CSWpv.gspec -0ea366b818f877857288b2a9a732a6d4 download/fix-test-010.diff +f4de09711819fdb79aee3fa0c612caca download/fix-test-010.diff Modified: csw/mgar/pkg/pv/trunk/files/fix-test-010.diff =================================================================== --- csw/mgar/pkg/pv/trunk/files/fix-test-010.diff 2008-12-09 21:47:17 UTC (rev 2505) +++ csw/mgar/pkg/pv/trunk/files/fix-test-010.diff 2008-12-09 23:00:07 UTC (rev 2506) @@ -1,12 +1,50 @@ 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-01 15:02:00.375332231 +0100 -@@ -5,7 +5,7 @@ ++++ 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 +-COUNT1=100000000 -COUNT2=`$PROG -B 100000 -q /dev/zero | dd bs=100000 count=1000 2>/dev/null | wc -c` -+COUNT2=`$PROG -B 100000 -q /dev/zero | dd bs=100000 count=1000 2>/dev/null | wc -c | tr -d ' '` ++#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 Dec 10 00:09:34 2008 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Tue, 09 Dec 2008 23:09:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[2507] csw/mgar/pkg/pv/trunk/Makefile Message-ID: Revision: 2507 http://gar.svn.sourceforge.net/gar/?rev=2507&view=rev Author: skayser Date: 2008-12-09 23:09:34 +0000 (Tue, 09 Dec 2008) Log Message: ----------- pv: Changed broken upstream test Modified Paths: -------------- csw/mgar/pkg/pv/trunk/Makefile Modified: csw/mgar/pkg/pv/trunk/Makefile =================================================================== --- csw/mgar/pkg/pv/trunk/Makefile 2008-12-09 23:00:07 UTC (rev 2506) +++ csw/mgar/pkg/pv/trunk/Makefile 2008-12-09 23:09:34 UTC (rev 2507) @@ -23,7 +23,10 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -# Trim extra whitespaces from Solaris wc +# 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) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Dec 10 15:19:01 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 10 Dec 2008 14:19:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[2508] csw/mgar/pkg/clamav/trunk Message-ID: Revision: 2508 http://gar.svn.sourceforge.net/gar/?rev=2508&view=rev Author: bonivart Date: 2008-12-10 14:19:01 +0000 (Wed, 10 Dec 2008) Log Message: ----------- clamav: more fixes Modified Paths: -------------- csw/mgar/pkg/clamav/trunk/Makefile csw/mgar/pkg/clamav/trunk/checksums csw/mgar/pkg/clamav/trunk/files/CSWclamav.gspec Added Paths: ----------- csw/mgar/pkg/clamav/trunk/files/CSWclamav.INSTALL.clamav-milter.CSW csw/mgar/pkg/clamav/trunk/files/CSWclamav.README.CSW csw/mgar/pkg/clamav/trunk/files/CSWclamav.checkinstall csw/mgar/pkg/clamav/trunk/files/CSWclamav.cswclamav-milter csw/mgar/pkg/clamav/trunk/files/CSWclamav.cswclamd csw/mgar/pkg/clamav/trunk/files/CSWclamav.postinstall csw/mgar/pkg/clamav/trunk/files/CSWclamav.preinstall csw/mgar/pkg/clamav/trunk/files/CSWclamav.preremove Modified: csw/mgar/pkg/clamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamav/trunk/Makefile 2008-12-09 23:09:34 UTC (rev 2507) +++ csw/mgar/pkg/clamav/trunk/Makefile 2008-12-10 14:19:01 UTC (rev 2508) @@ -1,15 +1,14 @@ # clamav, Peter Bonivart # files outside /opt/csw are not included, need to fix gspec and cswproto -# split into multiple packages: clamav, libclamav # put libs in lib/32? -# add depend files -# add rc/smf support +# add rc/smf support. cswclassutils? # add pre/post scripts -# add etc/clamav-milter +# add etc/clamav-milter? # add etc/clamd? -# add doc/README.CSW, INSTALL.clamav-milter.CSW # check mantis bugs +# + add doc/README.CSW, INSTALL.clamav-milter.CSW +# + split into multiple packages: clamav, libclamav # + add re for update notification # + add contrib # + add html docs and some pdf:s @@ -28,58 +27,68 @@ the package is an anti-virus engine available in a form of shared library. endef -MASTER_SITES = http://freshmeat.net/redir/clamav/29355/url_tgz/ +SF_PROJ = clamav +MASTER_SITES = $(SF_MIRRORS) +#MASTER_SITES = http://freshmeat.net/redir/clamav/29355/url_tgz/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWclamav,) +DISTFILES += $(call admfiles,CSWclamav,checkinstall preinstall postinstall preremove) DISTFILES += $(call admfiles,CSWlibclamav,) -PKGFILES_CSWlibclamav = $(libdir)/.* -PKGFILES_CSWlibclamav += $(includedir)/.* +SPKG_DESC_CSWclamav = Clam AntiVirus +SPKG_DESC_CSWlibclamav = Clam AntiVirus Library +REQUIRED_PKGS_CSWclamav = CSWlibclamav CSWlibgmp CSWzlib CSWbzip2 CSWiconv CSWcswclassutils +REQUIRED_PKGS_CSWlibclamav = CSWlibgmp CSWzlib CSWbzip2 CSWiconv + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -GARCOMPILER = GCC3 -GNU_CC_HOME = /opt/csw/gcc3 +SPKG_CLASSES = none cswinitsmf +#GARCOMPILER = GCC3 + CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-user=nobody -CONFIGURE_ARGS += --with-group=nobody +#CONFIGURE_ARGS += --with-user=nobody +#CONFIGURE_ARGS += --with-group=nobody +CONFIGURE_ARGS += --disable-clamav CONFIGURE_ARGS += --enable-milter -CONFIGURE_ARGS += --with-sendmail=/opt/csw/lib/sendmail +CONFIGURE_ARGS += --with-sendmail=$(libdir)/sendmail CONFIGURE_ARGS += --with-dbdir=/var/opt/csw/$(GARNAME)/db CONFIGURE_ARGS += --localstatedir=/var/opt/csw/$(GARNAME) -include gar/category.mk +EXTRA_MERGE_EXCLUDE_FILES = .*~ $(libdir)/.*\.a $(libdir)/.*\.la +PKGFILES_CSWlibclamav = $(libdir)/.* +PKGFILES_CSWlibclamav += $(includedir)/.* + SPKG_SOURCEURL = http://www.clamav.net/ -pre-package: - @echo " ==> Pre-package for $(GARNAME)" - @echo "DESTDIR: $(DESTDIR)" - @echo "WORKSRC: $(WORKSRC)" - @echo "PKGROOT: $(PKGROOT)" - @find $(PKGROOT) -type f -name "*~" -exec rm {} \; - @find $(PKGROOT)/opt/csw/lib -type f -name "*.a" -exec rm {} \; - @find $(PKGROOT)/opt/csw/lib -type f -name "*.la" -exec rm {} \; - @ginstall -d $(PKGROOT)$(docdir)/$(GARNAME)/html - @ginstall -d $(PKGROOT)$(docdir)/$(GARNAME)/contrib - @ginstall -m 644 $(WORKSRC)/AUTHORS $(PKGROOT)$(docdir)/$(GARNAME) - @ginstall -m 644 $(WORKSRC)/BUGS $(PKGROOT)$(docdir)/$(GARNAME) - @ginstall -m 644 $(WORKSRC)/ChangeLog $(PKGROOT)$(docdir)/$(GARNAME) - @ginstall -m 644 $(WORKSRC)/docs/clamav-mirror-howto.pdf $(PKGROOT)$(docdir)/$(GARNAME) - @ginstall -m 644 $(WORKSRC)/docs/clamdoc.pdf $(PKGROOT)$(docdir)/$(GARNAME) - @ginstall -m 644 $(WORKSRC)/COPYING $(PKGROOT)$(docdir)/$(GARNAME)/LICENSE - @ginstall -m 644 $(WORKSRC)/FAQ $(PKGROOT)$(docdir)/$(GARNAME) - @ginstall -m 644 $(WORKSRC)/NEWS $(PKGROOT)$(docdir)/$(GARNAME) - @ginstall -m 644 $(WORKSRC)/docs/phishsigs_howto.pdf $(PKGROOT)$(docdir)/$(GARNAME) - @ginstall -m 644 $(WORKSRC)/README $(PKGROOT)$(docdir)/$(GARNAME) - @ginstall -m 644 $(WORKSRC)/docs/signatures.pdf $(PKGROOT)$(docdir)/$(GARNAME) - @ginstall -m 644 $(WORKSRC)/UPGRADE $(PKGROOT)$(docdir)/$(GARNAME) - @ginstall -m 644 $(WORKSRC)/contrib/clamdwatch/* $(PKGROOT)$(docdir)/$(GARNAME)/contrib - @ginstall -m 644 $(WORKSRC)/contrib/init/Solaris10/* $(PKGROOT)$(docdir)/$(GARNAME)/contrib - @ginstall -m 644 $(WORKSRC)/contrib/cleanup-partial.pl $(PKGROOT)$(docdir)/$(GARNAME)/contrib - @for file in $(WORKSRC)/docs/html/*; do \ - cp $$file $(PKGROOT)$(docdir)/$(GARNAME)/html ; \ - done +include gar/category.mk + +DOCS = AUTHORS BUGS ChangeLog +DOCS += FAQ NEWS README UPGRADE +DOCS += docs/clamav-mirror-howto.pdf +DOCS += docs/clamdoc.pdf +DOCS += docs/phishsigs_howto.pdf +DOCS += docs/signatures.pdf + +DOCDEST = $(DESTDIR)$(docdir)/$(GARNAME) + +post-install-modulated: + @echo " ==> Post-install for $(GARNAME)" + @ginstall -d $(DESTDIR)/etc/opt/csw/init.d + @ginstall -m 755 $(FILEDIR)/CSWclamav.cswclamd $(DESTDIR)/etc/opt/csw/init.d/cswclamd + @ginstall -d $(DOCDEST) + @$(foreach DOC,$(DOCS),ginstall -m 644 $(WORKSRC)/$(DOC) $(DOCDEST);) + @ginstall -m 644 $(WORKSRC)/COPYING $(DOCDEST)/LICENSE + @ginstall -m 644 $(FILEDIR)/CSWclamav.INSTALL.clamav-milter.CSW $(DOCDEST)/INSTALL.clamav-milter.CSW + @ginstall -m 644 $(FILEDIR)/CSWclamav.README.CSW $(DOCDEST)/README.CSW + @ginstall -d $(DOCDEST)/contrib + @ginstall -m 644 $(WORKSRC)/contrib/clamdwatch/* $(DOCDEST)/contrib + @ginstall -m 644 $(WORKSRC)/contrib/init/Solaris10/* $(DOCDEST)/contrib + @ginstall -m 644 $(WORKSRC)/contrib/cleanup-partial.pl $(DOCDEST)/contrib + @ginstall -d $(DOCDEST)/html + @ginstall -m 644 $(WORKSRC)/docs/html/* $(DOCDEST)/html + @ginstall -d $(DESTDIR)$(docdir)/libclamav + @ginstall -m 644 $(WORKSRC)/COPYING $(DESTDIR)$(docdir)/libclamav/LICENSE @$(MAKECOOKIE) Modified: csw/mgar/pkg/clamav/trunk/checksums =================================================================== --- csw/mgar/pkg/clamav/trunk/checksums 2008-12-09 23:09:34 UTC (rev 2507) +++ csw/mgar/pkg/clamav/trunk/checksums 2008-12-10 14:19:01 UTC (rev 2508) @@ -1,3 +1,7 @@ 1181e6d62341b84708f126cc353f7ebf download/clamav-0.94.2.tar.gz -df9572dc44907a1ceff3561f9b834e20 download/CSWclamav.gspec +7d36b4328fa73af2b109169b923bc127 download/CSWclamav.gspec +751ed376aeccb1664694b772c4b9640d download/CSWclamav.checkinstall +e355168073277baaf456eea620ff2760 download/CSWclamav.preinstall +a82b60e7ee99d6a4ac6e80351ce7bf81 download/CSWclamav.postinstall +526d5979cca3a3ebdf88c6ed33b8ec8d download/CSWclamav.preremove 6edc8660bde0b27d3676699eacb51884 download/CSWlibclamav.gspec Added: csw/mgar/pkg/clamav/trunk/files/CSWclamav.INSTALL.clamav-milter.CSW =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWclamav.INSTALL.clamav-milter.CSW (rev 0) +++ csw/mgar/pkg/clamav/trunk/files/CSWclamav.INSTALL.clamav-milter.CSW 2008-12-10 14:19:01 UTC (rev 2508) @@ -0,0 +1,124 @@ +INSTRUCTIONS + +Any references in this document made to /usr/local should be replaced with /opt/csw. References to /etc/sysconfig should be replaced with /opt/csw/etc. + +Clamav is built with milter support. For this to work, see the following notes from the INSTALL.clamav-milter document supplied with the clamav source. + +Solaris 8 doesn't have milter support so clamav-milter won't work unless you +rebuild sendmail from source or install the CSW sendmail package. +Solaris 9 has milter support in the supplied sendmail, but doesn't include +libmilter so you can't develop milter applications on it. Go to sendmail.org, +download the lastest sendmail, cd to libmilter and "make install" there. +Needs -lresolv + +INSTALLATION + +See http://www.nmt.edu/~wcolburn/sendmail-8.12.5/libmilter/docs/sample.html + +Installations for RedHat Linux and it's derivatives such as YellowDog: + Add to /etc/mail/sendmail.mc: + INPUT_MAIL_FILTER(`clamav', `S=local:/var/run/clamav.sock, F=, T=S:4m;R:4m')dnl + define(`confINPUT_MAIL_FILTERS', `clamav') + + Check entry in /usr/local/etc/clamav.conf of the form: + LocalSocket /var/run/clamd.sock + StreamSaveToDisk + + If you already have a filter (such as spamassassin-milter from + http://savannah.nongnu.org/projects/spamass-milt) add it thus: + INPUT_MAIL_FILTER(`clamav', `S=local:/var/run/clamav.sock, F=, T=S:4m;R:4m')dnl + INPUT_MAIL_FILTER(`spamassassin', `S=local:/var/run/spamass.sock, F=, T=C:15m;S:4m;R:4m;E:10m') + define(`confINPUT_MAIL_FILTERS', `spamassassin,clamav')dnl + +You may find INPUT_MAIL_FILTERS is not needed on your machine, however it +is recommended by the Sendmail documentation and I recommend going along +with that. + +I suggest putting SpamAssassin first since you're more likely to get spam +than a virus/worm sent to you. + +Add to /etc/sysconfig/clamav-milter + CLAMAV_FLAGS="--max-children=2 local:/var/run/clamav.sock" +or if clamd is on a different machine + CLAMAV_FLAGS="--max-children=2 --server=192.168.1.9 local:/var/run/clamav.sock" + +You should have received a script to put into /etc/init.d with this software. + +CHANGE HISTORY + +Changes +0.2: 4/3/03 clamfi_abort() now always calls pthread_mutex_unlock + 5/3/03 Only send a bounce if -b is set + Version now uses -v not -V + --config-file couldn't be set by -c +0.3 7/3/03 Enhanced the Solaris compile time comment + No need to save the return result of LogSyslog + Use LogVerbose +0.4 9/3/03 Initialise dataSocket/cmdSocket correctly + 10/3/03 Say why we don't connect() to clamd + Enhanced '-l' usage message +0.5 18/3/03 Ported to FreeBSD 4.7 + Source no longer in support, so remove one .. from + the build instructions + Corrected the use of strerror_r +0.51 20/3/03 Mention StreamSaveToDisk in the installation + Added -s option which allows clamd to run on a + different machine from the milter +0.52 20/3/03 -b flag now only stops the bounce, sends warning + to recipient and postmaster +0.53 24/3/03 %d->%u in syslog call + 27/3/03 tcpSocket is now of type in_port_t + 27/3/03 Use PING/PONG +0.54 23/5/03 Allow a range of IP addresses as outgoing ones + that need not be checked +0.55 24/5/03 Use inet_ntop() instead of inet_ntoa() + Thanks to Krzysztof Oldzki +0.60 11/7/03 Some TODOs done by Nigel Kukard + Should stop a couple of remote chances of crashes +0.60a 22/7/03 Tidied up message when sender is unknown +0.60b 17/8/03 Optionally set postmaster address. Usually one uses + /etc/aliases, but not everyone want's to... +0.60c 22/8/03 Another go at Solaris support +0.60d 26/8/03 Removed superflous buffer and unneeded strerror call + ETIMEDOUT isn't an error, but should give a warning +0.60e 09/9/03 Added -P and -q flags by "Nicholas M. Kirsch" +0.60f 17/9/03 Changed fprintf to fputs where possible + Redirect stdin from /dev/null, stdout&stderr to + /dev/console +0.60g 26/9/03 Handle sendmail calling abort after calling cleanup + (Should never happen - but it does) + Added -noxheader patch from dirk.meyer at dinoex.sub.org +0.60h 28/9/03 Support MaxThreads option in config file, + overriden by --max-children. + Patch from "Richard G. Roberto" +0.60i 30/9/03 clamfi_envfrom() now correctly returns SMFIS_TEMPFAIL, + in a few circumstances it used to return EX_TEMPFAIL + Patch from Matt Sullivan +0.60j 1/10/03 strerror_r doesn't work on Linux, attempting workaround + Added support for hard-coded list of email addresses + who's e-mail is not scanned +0.60k 5/10/03 Only remove old UNIX domain socket if FixStaleSocket + is set +0.60l 11/10/03 port is now unsigned + Removed remote possibility of crash if the target + e-mail address is very long + No longer calls clamdscan to get the version +0.60m 12/10/03 Now does sanity check if using localSocket + Gets version info from clamd + Only reset fd's 0/1/2 if !ForeGround +0.60n 22/10/03 Call pthread_cont_broadcast more often +0.60o 31/10/03 Optionally accept all mails if scanning procedure + fails (Joe Talbott ) +0.60p 5/11/03 Only call mutex_unlock when max_children is set + Tidy up the call to pthread_cond_timedwait +0.60q 11/11/03 Fixed handling of % characters in e-mail addresses + pointed out by dotslash at snosoft.com + +BUG REPORTS + +Please send bug reports and/or comments to Nigel Horne + +TODO + +There are several ideas marked as TODO in the source code. If anyone has +any other suggestions please feel free to contact me. Added: csw/mgar/pkg/clamav/trunk/files/CSWclamav.README.CSW =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWclamav.README.CSW (rev 0) +++ csw/mgar/pkg/clamav/trunk/files/CSWclamav.README.CSW 2008-12-10 14:19:01 UTC (rev 2508) @@ -0,0 +1,177 @@ +# 2008-12-10 +Version 0.94.2 is released. Packages CSWclamav and CSWlibclamav are now +maintained by Peter Bonivart. + +# 02Jun2007 +Version 0.90.3 is released. +Changes are made to the rc scripts to allow clmilter to not wait for clamd +when clmilter is configured without --external. PLEASE note that I have +not fully tested clmilter without clamd. If you are running Solaris 10 +or later, you will also need to create a custom version of the clamav-milter +service method file and remove the dependency for cswclamd. See my notes +below dated 05Feb2006 for instructions on creating a custom service method +file. + +# 16Feb2007 +Version 0.90 is released. +--enable-experimental is disabled due to a bug introduced after the last +release candidate. + +The rc script is changed to relocate the pid file to /opt/csw/var/clamav. +If you run clamav without root access, please run the following. +`chown : /opt/csw/var/clamav +The rc script is changed to allow the startup options and config file +to be located in /etc/opt/csw + +*** IMPORTANT *** +You must change clamd.conf to match the new syntax. Boolean options must +state yes or no and not be left blank. I recommend renaming your old +clamd.conf to old-clamd.conf; `cp clamd.conf.CSW clamd.conf` and making +your changes again. Note that the directory for the pid file and log files +now defaults to /opt/csw/var/clamav. +*** END OF IMPORTANT *** + +# 07Jan2007 +The 'specificdeamonname' for this package is changed to only clamav. +Please change any entries that you have made in csw.conf +The scripts determine whether or not a clamd and clamav-milter is needed. + +# 14Dec2006 +clamd.conf has a new option - MailMaxRecursion +Package installation is using csw.conf, if available, to determine whether + or not to start the daemons. +See http://www.blastwave.org/standards/csw.conf.html for details. +The 'specificdaemonname' for this package is clamd and clamav-milter. + +# 16Oct2006 +freshclam.conf has option OnOutdatedExecute command added. + +# 05Feb2006 +# IMPORTANT changes with the Feb 2006 revision to version 0.88 +# For Solaris 8 and 9: + If you are using clamd and/or clamav-milter, the daemons + are now stopped on subsequent package upgrades and started + with this package install. + +# For Solaris 10 and later: + SMF processing is added for clamd and clamav-milter + Configuration file /opt/csw/etc/clamd is used to determine + whether or not to run clamd. This feature has not changed. + The same is true for clamav-milter, except that the relevant + file is /opt/csw/etc/clamav-milter. + + There are two types of files used by SMF. The service + method file is located in /opt/csw/lib/svc/method. The + service manifest is located in /opt/csw/var/svc/manifest and + subdirectory application for clamav. + + Service method and manifest files are provided with the package. + If you want to do something different, create custom files with + specific names and the package scripts will use them instead. + If you do create custom versions of these files, please test + them before running pkg-get. If there is an error in a custom + file, pkgadd will fail. + + The custom files must be named: + /opt/csw/lib/svc/method/svc-clamd.custom + /opt/csw/lib/svc/method/svc-clamav-milter.custom + /opt/csw/var/svc/manifest/application/clamd.custom.xml + /opt/csw/var/svc/manifest/application/clamav-milter.custom.xml + + You may supply custom versions of any or all of these files. + If there is not a custom file available and a set of files are + needed because a service is activated, the package scripts will + use the standard files installed with the package and name them + accordingly. + + To remove the installed service defintion and replace with your + own, do the following (using the clamd manifest as the example). + Create: /opt/csw/var/svc/manifest/application/clamd.custom.xml + Permissions should be 0644 root bin: + chown root:bin \ + /opt/csw/var/svc/manifest/application/clamd.custom.xml + chmod 0644 \ + /opt/csw/var/svc/manifest/application/clamd.custom.xml + Copy: cp -p /opt/csw/var/svc/manifest/application/clamd.custom.xml \ + /opt/csw/var/svc/manifest/application/clamd.xml + Removal: svcadm disable cswclamd + svccfg delete cswclamd + Install: svccfg import /opt/csw/var/svc/manifest/application/clamd.xml + svcadm enable cswclamd + + The supplied manifests have clamav-milter depending on clamd. + If you need clamav-milter, this is the recommended usage and + requires /opt/csw/etc/clamav-milter to define the '--external' + switch. + + The FMRI for clamd is svc:/application/cswclamd (or cswclamd). + The FMRI for clamav-milter is svc/application/cswclamav-milter + (or cswclamav-milter). + +# TO DO: + I want to allow more flexibility with clamd and clamav-milter + option definition. Currently, you are limited to what you put + on a single line in clamd and/or clamav-milter in /opt/csw/etc. + This works, but it could be more flexible and readable. Maybe + next time:> + + +# 27Jan2005 +# IMPORTANT changes with version 0.81 +# There are a few changes in the configuration files. So please +# compare the /opt/csw/etc/*.CSW files with your working copies. +# clamav-milter now uses libclamav by default. This means that you +# do not need to have clamd running if you only use clamav-milter. +# The sample clamav-milter.CSW file is changed to the old behavior. +# You decide what you are comfortable with. I will be running the +# old method until maybe the next release or until I am more familiar +# with this new option. + +# 21Sep2004 +# IMPORTANT changes with version 0.80 +# /opt/csw/etc/clamav.conf is renamed to /opt/csw/etc/clamd.conf +# Postinstall will do the rename, if the file exists. +# +# If this is the first migration to 0.80 from a previous version: +# YOU MUST review the changes in clamd.conf.CSW. +# If you have StreamSaveToDisk enabled, it must be disabled or removed. +# +# YOU MUST review the changes in freshclam.conf.CSW. There are new options. + +# 15Jun2004 +# Please compare your configuration files with the *.CSW versions in + /opt/csw/etc/. There are some minor changes to the defaults. + The bad symlink for /etc/rc2.d/S77cswclamd is fixed. + The cswclamav-milter script now removes the old socket. Note + that clamd socket removal can be done by enabling the FixStaleSocket + option in clamav.conf. + There are several ways to use this pkg, i.e., with clamd, with + clamav-milter. Some options need to be changed to setup an + environment. Please click the 'View news and info' buttom at + http://www.blastwave.org/packages.php/clamav to review the setup + that I use to run clamd and clamav-milter with freshclam running + from crontab. + +# *** IMPORTANT *** +1) Freshclam is no longer run as a daemon. Please create a crontab entry + to run freshclam when you desire. +2) You MUST change /opt/csw/etc/freshclam.conf as needed for your installation + and run freshclam before proceeding. +3) There are different ways to run clamav. To use clamav as a sendmail + milter, copy the config files clamav.conf.CSW and clamav-milter.CSW + in /opt/csw/etc to the same names without the .CSW. Add the milter + setup to your sendmail configuration file. +4) Change the configuration files as required for your installation. + The configuration files that you create are not touched when a + new version of clamav is installed. Therefore remember to run + a diff between your version and the .CSW version, which is the + new version. There could be new features added and the config + files are normally the way these new features are activated. +5) Clamav should be run as a non-root user. Change the directory + /opt/csw/share/clamav and the *.cvd files in this directory to + be owned by this user. Also change /opt/csw/etc/clamav.conf + accordingly. +6) The startup scripts run clamd if the file /opt/csw/etc/clamd exists. + You can change the startup options by changing /opt/csw/etc/clamd. + A sample file is provided. The same is true for clamav-milter. +# See additional files README, FAQ, INSTALL for more information. Added: csw/mgar/pkg/clamav/trunk/files/CSWclamav.checkinstall =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWclamav.checkinstall (rev 0) +++ csw/mgar/pkg/clamav/trunk/files/CSWclamav.checkinstall 2008-12-10 14:19:01 UTC (rev 2508) @@ -0,0 +1,55 @@ +# checkinstall script for Clamav +# Verify that group and user clamav exists +# +ADDUSER=0 +ADDGROUP=0 +# Next, verify that group clamav exists. +# First check target machines group file, THEN check +# NIS/NIS+/whatever + +/usr/bin/grep '^clamav:' /etc/group >/dev/null +if [ $? -ne 0 ] ; then + /usr/bin/getent group clamav >/dev/null + if [ $? -ne 0 ] ; then + NEEDGROUP=1 + fi +fi + +if [ "$NEEDGROUP" = 1 ] ; then + echo "***" + echo "Group clamav must exist for this package install." + echo "clamav group will be added." + ADDGROUP=1 +else + echo "clamav group detected" +fi +# Next, verify that user clamav exists. +# First check target machines password file, THEN check +# NIS/NIS+/whatever + +/usr/bin/grep '^clamav:' /etc/passwd >/dev/null +if [ $? -ne 0 ] ; then + /usr/bin/getent passwd clamav >/dev/null + if [ $? -ne 0 ] ; then + NEEDUSER=1 + fi +fi + +if [ "$NEEDUSER" = 1 ] ; then + echo "***" + echo "User clamav must exist for this package install." + echo "clamav user will be added." + ADDUSER=1 +else + echo "clamav user detected" +fi + +# Make env variables available to other packaging scripts + +cat >$1 <&1 + else + /usr/sbin/svcadm enable svc:application/cswclamd 2>&1 + fi + fi + +fi + +# Display message +echo '***' +echo '*** See README.CSW in /opt/csw/share/doc/clamav for changes.**' +echo '*** For first time version 0.90 installs - Please see README.CSW.""' +echo '*** See http://www.blastwave.org/standards/csw.conf.html for' +echo ' details on using csw.conf to enable/disable daemons.**' +echo '***' Added: csw/mgar/pkg/clamav/trunk/files/CSWclamav.preinstall =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWclamav.preinstall (rev 0) +++ csw/mgar/pkg/clamav/trunk/files/CSWclamav.preinstall 2008-12-10 14:19:01 UTC (rev 2508) @@ -0,0 +1,23 @@ +# preinstall for clamav +# Add the user and group clamav if told to by checkinstall script. + +# If installing on a filesystem that is not running the OS, exit this script. +if [ ! x"$PKG_INSTALL_ROOT" = x"" -a ! x"$PKG_INSTALL_ROOT" = x"/" ] ; then exit 0 ; fi + +if [ x"$PKG_INSTALL_ROOT" = x"" ] ; then + PKG_INSTALL_ROOT="/" +fi + +MYHOME=/var/spool + +if [ "$ADDGROUP" = "1" ] ; then + chroot $PKG_INSTALL_ROOT /usr/sbin/groupadd clamav + echo "Added clamav group." +fi +if [ "$ADDUSER" = "1" ] ; then + chroot $PKG_INSTALL_ROOT /usr/sbin/useradd -g clamav clamav + chroot $PKG_INSTALL_ROOT /usr/sbin/usermod -c "Clamav user" -d $MYHOME -s /bin/false clamav + echo "Added clamav user." +fi + +exit 0 Added: csw/mgar/pkg/clamav/trunk/files/CSWclamav.preremove =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWclamav.preremove (rev 0) +++ csw/mgar/pkg/clamav/trunk/files/CSWclamav.preremove 2008-12-10 14:19:01 UTC (rev 2508) @@ -0,0 +1,27 @@ +# clamav - preremove script +# +# Stop clamav if it is running. + +# Determine whether or not clamd and clamav-milter is running +haveclamd=no +haveclmilter=no + +if [ -f /opt/csw/etc/clamd ] || [ -f /etc/opt/csw/clamd ] ; then haveclamd=yes ; fi +if [ -f /opt/csw/etc/clamav-milter ] || [ -f /etc/opt/csw/clamav-milter ] ; then haveclmilter=yes ; fi + +# Determine whether or not SMF is available +smf=no +if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ] ; then smf=yes ; fi + + if [ $haveclamd=yes ] ; then + echo "Shutting down clamd" + if [ $smf = yes ] + then + # Disable service + /usr/sbin/svcadm disable -s svc:application/cswclamd:default >/dev/null 2>&1 + else + /etc/init.d/cswclamd stop >/dev/null 2>&1 + fi + 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 Wed Dec 10 15:24:30 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 10 Dec 2008 14:24:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[2509] csw/mgar/pkg Message-ID: Revision: 2509 http://gar.svn.sourceforge.net/gar/?rev=2509&view=rev Author: bdwalton Date: 2008-12-10 14:24:29 +0000 (Wed, 10 Dec 2008) Log Message: ----------- First working package for CSWdocbookxsl. Added Paths: ----------- csw/mgar/pkg/docbook-style-xsl/ csw/mgar/pkg/docbook-style-xsl/branches/ csw/mgar/pkg/docbook-style-xsl/tags/ csw/mgar/pkg/docbook-style-xsl/trunk/ csw/mgar/pkg/docbook-style-xsl/trunk/Makefile csw/mgar/pkg/docbook-style-xsl/trunk/checksums csw/mgar/pkg/docbook-style-xsl/trunk/files/ csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.depend csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.gspec csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.postinstall csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.preremove csw/mgar/pkg/docbook-style-xsl/trunk/files/Makefile csw/mgar/pkg/docbook-style-xsl/trunk/files/docbook-xsl-lists.patch csw/mgar/pkg/docbook-style-xsl/trunk/files/docbook-xsl-marginleft.patch csw/mgar/pkg/docbook-style-xsl/trunk/files/docbook-xsl-pagesetup.patch csw/mgar/pkg/docbook-style-xsl/trunk/files/docbook-xsl-sp.patch Property changes on: csw/mgar/pkg/docbook-style-xsl/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 Added: csw/mgar/pkg/docbook-style-xsl/trunk/Makefile =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/Makefile (rev 0) +++ csw/mgar/pkg/docbook-style-xsl/trunk/Makefile 2008-12-10 14:24:29 UTC (rev 2509) @@ -0,0 +1,52 @@ +GARNAME = docbookxsl +GARVERSION = 1.69.1 +PATCHLEVEL = 5.1 +CATEGORIES = xtra + +# for our (modified from rhel) copied in Makefile. +PREREQUISITES = CSWgfile CSWbash + +DESCRIPTION = Norman Walsh's XSL stylesheets for DocBook XML. +define BLURB +The DocBook XSL stylesheets are a set of stylesheets for use with an +XSLT engine (such as xsltproc or Saxon) for transforming DocBook XML +documents into other DocBookOutputFormats, such as HTML, PDF, +Microsoft HTML Help, and man pages. +endef + +# docbook-xsl is housed in the docbook master project at SF. +SF_PROJ = docbook +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = docbook-xsl-$(GARVERSION).tar.bz2 +DISTFILES += docbook-xsl-doc-$(GARVERSION).tar.bz2 +DISTFILES += $(call admfiles,CSWdocbookxsl,depend postinstall preremove) +DISTFILES += Makefile + +# These are listed in the same order they'd be applied during the rpm build... +# They don't apply cleanly, otherwise. +PATCHFILES = docbook-xsl-pagesetup.patch docbook-xsl-marginleft.patch +PATCHFILES += docbook-xsl-lists.patch docbook-xsl-sp.patch + +CONFIGURE_SCRIPTS = + +BUILD_SCRIPTS = + +TEST_SCRIPTS = + +INSTALL_ARGS = DESTDIR=$(DESTDIR) GARVERSION=$(GARVERSION) \ + PATCHLEVEL=$(PATCHLEVEL) + +#to make the package extraction happy...(we don't use the - separator) +WORKSRC = $(WORKDIR)/docbook-xsl-$(GARVERSION) + +post-extract: + @( cd $(WORKSRC); cp ../Makefile . ) + @$(MAKECOOKIE) + +post-install: + @(cd $(DESTDIR)/opt/csw/share/sgml/docbook; \ + ln -s xsl-stylesheets-$(GARVERSION)-$(PATCHLEVEL) \ + xsl-stylesheets ) + @$(MAKECOOKIE) + +include gar/category.mk Added: csw/mgar/pkg/docbook-style-xsl/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/checksums (rev 0) +++ csw/mgar/pkg/docbook-style-xsl/trunk/checksums 2008-12-10 14:24:29 UTC (rev 2509) @@ -0,0 +1,11 @@ +6ebd29a67f2dcc3f2220f475ee6f6552 download/docbook-xsl-1.69.1.tar.bz2 +b3bf09a0b1a368a3490e68ffc695d290 download/docbook-xsl-doc-1.69.1.tar.bz2 +4120f10e50070dd8fc2284d5214bf51d download/CSWdocbookxsl.gspec +6d190471746a394df111025da3060868 download/CSWdocbookxsl.depend +626425bf8e0de42afd5781c2d63397fc download/CSWdocbookxsl.postinstall +9f98469194bd4c15bf6b3fc76514b406 download/CSWdocbookxsl.preremove +ae11620673a7144c4df9a6e408a3bcb1 download/Makefile +84b37b559cc95c747e39a5a8f79558a3 download/docbook-xsl-pagesetup.patch +1d1ff63f5ebd3527c925f68e55138b6f download/docbook-xsl-marginleft.patch +cec8c281ed1c9be99ad47a74362248d5 download/docbook-xsl-lists.patch +e7bbf777eadbb70aaed073006de0347e download/docbook-xsl-sp.patch Added: csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.depend =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.depend (rev 0) +++ csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.depend 2008-12-10 14:24:29 UTC (rev 2509) @@ -0,0 +1,6 @@ +P CSWcommon common - common files and dirs for CSW packages +P CSWsgmlcommon sgmlcommon - A collection of entities and DTDs +P CSWxmlcommon xmlcommon - A collection of entities and DTDs +P CSWlibxml2 libxml2 - A library providing XML and HTML support +P CSWdocbookdtds docbookdtds - SGML and XML document type definitions for DocBook. + Added: csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.gspec =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.gspec (rev 0) +++ csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.gspec 2008-12-10 14:24:29 UTC (rev 2509) @@ -0,0 +1,5 @@ +%var bitname docbookxsl +%var pkgname CSWdocbookxsl +%var arch all +%include url file://%{PKGLIB}/csw_dyndepend.gspec + Added: csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.postinstall =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.postinstall (rev 0) +++ csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.postinstall 2008-12-10 14:24:29 UTC (rev 2509) @@ -0,0 +1,27 @@ +#!/bin/sh + +if [ -n "$PKG_INSTALL_ROOT" -a "$PKG_INSTALL_ROOT" != "/" ]; then + chroot $PKG_INSTALL_ROOT +fi + +PATH=/opt/csw/bin:$PATH + +CATCMD=/opt/csw/bin/xmlcatalog + +VERSION=1.69.1 +RELEASE=5.1 +DBHOME=/opt/csw/share/sgml/docbook + +CATALOG=/opt/csw/etc/xml/catalog +$CATCMD --noout --add "rewriteSystem" \ + "http://docbook.sourceforge.net/release/xsl/$VERSION" \ + "file://$DBHOME/xsl-stylesheets-$VERSION-$RELEASE" $CATALOG +$CATCMD --noout --add "rewriteURI" \ + "http://docbook.sourceforge.net/release/xsl/$VERSION" \ + "file://$DBHOME/xsl-stylesheets-$VERSION-$RELEASE" $CATALOG +$CATCMD --noout --add "rewriteSystem" \ + "http://docbook.sourceforge.net/release/xsl/current" \ + "file://$DBHOME/xsl-stylesheets-$VERSION-$RELEASE" $CATALOG +$CATCMD --noout --add "rewriteURI" \ + "http://docbook.sourceforge.net/release/xsl/current" \ + "file://$DBHOME/xsl-stylesheets-$VERSION-$RELEASE" $CATALOG Added: csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.preremove =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.preremove (rev 0) +++ csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.preremove 2008-12-10 14:24:29 UTC (rev 2509) @@ -0,0 +1,16 @@ +#!/bin/sh + +if [ -n "$PKG_INSTALL_ROOT" -a "$PKG_INSTALL_ROOT" != "/" ]; then + chroot $PKG_INSTALL_ROOT +fi + +PATH=/opt/csw/bin:$PATH + +CATALOG=/opt/csw/etc/xml/catalog +XMLCAT=/opt/csw/bin/xmlcatalog +DBHOME=/opt/csw/share/sgml/docbook +VERSION=1.69.1 +RELEASE=5.1 + +$XMLCAT --noout --del \ + "file://$DBHOME/xsl-stylesheets-$VERSION-$RELEASE" $CATALOG \ No newline at end of file Added: csw/mgar/pkg/docbook-style-xsl/trunk/files/Makefile =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/files/Makefile (rev 0) +++ csw/mgar/pkg/docbook-style-xsl/trunk/files/Makefile 2008-12-10 14:24:29 UTC (rev 2509) @@ -0,0 +1,51 @@ + +DESTDIR ?= ... should be overridden by GAR ... +GARVERSION ?= ... should be overridden by GAR ... +PATCHLEVEL ?= ... should be overridden by GAR ... + +SHELL = /opt/csw/bin/bash + +prefix = $(DESTDIR)/opt/csw +bindir = $(prefix)/bin +datadir = $(prefix)/share + +instdir = $(datadir)/sgml/docbook/xsl-stylesheets-$(GARVERSION)-$(PATCHLEVEL) +docdir = $(datadir)/doc/docbookxsl-$(GARVERSION)-$(PATCHLEVEL) + +all: install + +install: install-xsl install-img install-misc install-docs + +install-xsl: + gmkdir -p $(instdir)/{common,fo,html,htmlhelp/doc,javahelp,lib,template,xhtml,manpages,profiling} + cp common/*.dtd $(instdir)/common + cp common/*.xml $(instdir)/common + cp common/*.xsl $(instdir)/common + cp fo/*.xml $(instdir)/fo + cp fo/*.xsl $(instdir)/fo + cp html/*.xml $(instdir)/html + cp html/*.xsl $(instdir)/html + cp htmlhelp/*.xsl $(instdir)/htmlhelp + cp javahelp/*.xsl $(instdir)/javahelp + cp lib/lib.xsl $(instdir)/lib + cp template/README $(instdir)/template + cp template/*.xml $(instdir)/template + cp template/*.xsl $(instdir)/template + cp xhtml/*.xsl $(instdir)/xhtml + cp manpages/README $(instdir)/manpages + cp manpages/*.xsl $(instdir)/manpages + cp profiling/*.xsl $(instdir)/profiling + +install-img: + gmkdir -p $(instdir)/images/callouts + cp images/*.gif $(instdir)/images + cp images/*.png $(instdir)/images + cp images/callouts/*.png $(instdir)/images/callouts + +install-misc: + cp VERSION $(instdir) + +install-docs: + gmkdir -p $(docdir) + cp BUGS ChangeLog README TODO $(docdir)/ + cp -R doc $(docdir)/ \ No newline at end of file Added: csw/mgar/pkg/docbook-style-xsl/trunk/files/docbook-xsl-lists.patch =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/files/docbook-xsl-lists.patch (rev 0) +++ csw/mgar/pkg/docbook-style-xsl/trunk/files/docbook-xsl-lists.patch 2008-12-10 14:24:29 UTC (rev 2509) @@ -0,0 +1,123 @@ +--- docbook-xsl-1.69.1/fo/lists.xsl.orig 2006-01-19 02:36:22.000000000 -0800 ++++ docbook-xsl-1.69.1/fo/lists.xsl 2006-01-19 02:34:54.000000000 -0800 +@@ -125,9 +130,18 @@ + + + ++ ++ ++ ++ ++ + +- ++ + ++ ++ + + + +@@ -287,9 +301,18 @@ + + + ++ ++ ++ ++ ++ + +- ++ + ++ ++ + + + +@@ -486,9 +509,18 @@ + + + ++ ++ ++ ++ ++ + +- ++ + ++ ++ + + + +@@ -906,9 +938,18 @@ + + + ++ ++ ++ ++ ++ + +- ++ + ++ ++ + + + +@@ -932,9 +973,18 @@ + + + ++ ++ ++ ++ ++ + +- ++ + ++ ++ + + + +@@ -1112,10 +1162,19 @@ + + + ++ ++ ++ ++ ++ + +- ++ + +- ++ ++ ++ + + Added: csw/mgar/pkg/docbook-style-xsl/trunk/files/docbook-xsl-marginleft.patch =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/files/docbook-xsl-marginleft.patch (rev 0) +++ csw/mgar/pkg/docbook-style-xsl/trunk/files/docbook-xsl-marginleft.patch 2008-12-10 14:24:29 UTC (rev 2509) @@ -0,0 +1,111 @@ +--- docbook-xsl-1.68.0/fo/pagesetup.xsl.marginleft 2005-02-09 12:09:37.000000000 +0000 ++++ docbook-xsl-1.68.0/fo/pagesetup.xsl 2005-02-09 14:53:59.088068221 +0000 +@@ -34,29 +34,11 @@ + margin-left="{$page.margin.outer} - {$title.margin.left}" + --> + +- +- +- +- +- +- +- - +- +- +- ++ + + + +- +- +- +- +- +- +- - +- +- +- ++ + + + +--- docbook-xsl-1.68.0/fo/lists.xsl.marginleft 2005-02-09 12:09:37.000000000 +0000 ++++ docbook-xsl-1.68.0/fo/lists.xsl 2005-02-09 14:55:06.682138599 +0000 +@@ -371,7 +371,7 @@ + + + +- ++ + + + +@@ -380,15 +380,7 @@ + + + +- +- +- +- em +- +- +- em * 0.60 +- +- ++ em + + + +@@ -397,15 +389,7 @@ + + + +- +- +- +- em +- +- +- em * 0.60 +- +- ++ em + + + +@@ -419,17 +403,7 @@ + + 1em + +- +- +- +- +- +- +- +- + +- +- +- ++ + + + +--- docbook-xsl-1.68.0/fo/param.xsl.marginleft 2005-02-09 12:20:55.000000000 +0000 ++++ docbook-xsl-1.68.0/fo/param.xsl 2005-02-09 14:53:59.115063057 +0000 +@@ -95,8 +95,8 @@ + + always + +- +- ++ ++ + false + 0pt + Added: csw/mgar/pkg/docbook-style-xsl/trunk/files/docbook-xsl-pagesetup.patch =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/files/docbook-xsl-pagesetup.patch (rev 0) +++ csw/mgar/pkg/docbook-style-xsl/trunk/files/docbook-xsl-pagesetup.patch 2008-12-10 14:24:29 UTC (rev 2509) @@ -0,0 +1,74 @@ +--- docbook-xsl-1.69.1/fo/pagesetup.xsl.orig 2005-12-10 14:08:28.000000000 -0600 ++++ docbook-xsl-1.69.1/fo/pagesetup.xsl 2006-01-01 19:49:28.000000000 -0600 +@@ -1491,32 +1491,29 @@ + + + +- proportional-column-width( + + header + + +- ) ++ % + + + + +- proportional-column-width( + + header + + +- ) ++ % + + + + +- proportional-column-width( + + header + + +- ) ++ % + + + +@@ -1812,32 +1809,29 @@ + + + +- proportional-column-width( + + footer + + +- ) ++ % + + + + +- proportional-column-width( + + footer + + +- ) ++ % + + + + +- proportional-column-width( + + footer + + +- ) ++ % + + + Added: csw/mgar/pkg/docbook-style-xsl/trunk/files/docbook-xsl-sp.patch =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/files/docbook-xsl-sp.patch (rev 0) +++ csw/mgar/pkg/docbook-style-xsl/trunk/files/docbook-xsl-sp.patch 2008-12-10 14:24:29 UTC (rev 2509) @@ -0,0 +1,11 @@ +--- docbook-xsl-1.69.1/manpages/block.xsl.sp 2005-08-09 10:11:02.000000000 +0100 ++++ docbook-xsl-1.69.1/manpages/block.xsl 2006-01-19 12:07:47.000000000 +0000 +@@ -37,7 +37,7 @@ + + + +- .sp ++ .sp + + + 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 Dec 10 19:14:23 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 10 Dec 2008 18:14:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[2510] csw/mgar/pkg/docbook-dtds/trunk Message-ID: Revision: 2510 http://gar.svn.sourceforge.net/gar/?rev=2510&view=rev Author: bdwalton Date: 2008-12-10 18:14:21 +0000 (Wed, 10 Dec 2008) Log Message: ----------- The destination directory for the xml dtds was missing a '-', which saw things like xmllint not pick up locally installed dtds, as the catalog reference was broken. Modified Paths: -------------- csw/mgar/pkg/docbook-dtds/trunk/checksums csw/mgar/pkg/docbook-dtds/trunk/files/Makefile Modified: csw/mgar/pkg/docbook-dtds/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/checksums 2008-12-10 14:24:29 UTC (rev 2509) +++ csw/mgar/pkg/docbook-dtds/trunk/checksums 2008-12-10 18:14:21 UTC (rev 2510) @@ -9,7 +9,7 @@ ab200202b9e136a144db1e0864c45074 download/docbook-xml-4.3.zip f89e1bd0b2c7a361e3f1f739e16b5d0d download/docbook-4.4.zip cbb04e9a700955d88c50962ef22c1634 download/docbook-xml-4.4.zip -2479ac1e7b4a43d3618ca16237aaa85d download/Makefile +e5318114e6c751a9e0835d7711275e13 download/Makefile 536104a1ab1e8eac583cf27f4f8844a4 download/CSWdocbookdtds.gspec cb6dbfe9f6184a9de0725c0a61adc57b download/CSWdocbookdtds.depend 95eb4822347e50556398f4a11ee95097 download/CSWdocbookdtds.postinstall Modified: csw/mgar/pkg/docbook-dtds/trunk/files/Makefile =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/Makefile 2008-12-10 14:24:29 UTC (rev 2509) +++ csw/mgar/pkg/docbook-dtds/trunk/files/Makefile 2008-12-10 18:14:21 UTC (rev 2510) @@ -61,7 +61,7 @@ $(INSTALL_DATA) ent/* $(DD)/ent/; \ fi ) -inst-%-xml: DD=$(DESTDIR)/$(docbookdir)/xml-dtd-$*$(GARVERSION)-$(PATCHLEVEL) +inst-%-xml: DD=$(DESTDIR)/$(docbookdir)/xml-dtd-$*-$(GARVERSION)-$(PATCHLEVEL) inst-%-xml: @echo Installing $*-xml @( cd $*-xml; \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From william at wbonnet.net Wed Dec 10 19:23:47 2008 From: william at wbonnet.net (William Bonnet) Date: Wed, 10 Dec 2008 19:23:47 +0100 Subject: [csw-devel] Update the pkg-get package from website Message-ID: <49400933.4090104@wbonnet.net> Hi all I just installed the package linked from http://opencsw.org/pkg-get ( http://opencsw.org/pkg_get-3.8.4-SunOS5.8-all-CSW.pkg ). The config file is broken since it point to http://ibiblio.org/pub/packages/solaris/csw/unstable This file also has blastwave mirrors in the comment. It should be removed and replaced by our mirrors cheers W. -- William http://www.wbonnet.net http://www.sunwizard.net Le site fran?ais des amateurs de stations Unix http://www.blastwave.org An OpenSolaris Community Site http://www.opencsw.org Community SoftWare for Solaris http://www.guses.org French speaking Solaris User Group From dmichelsen at users.sourceforge.net Wed Dec 10 20:30:50 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 10 Dec 2008 19:30:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[2511] csw/mgar/pkg/jdk6/trunk Message-ID: Revision: 2511 http://gar.svn.sourceforge.net/gar/?rev=2511&view=rev Author: dmichelsen Date: 2008-12-10 19:30:49 +0000 (Wed, 10 Dec 2008) Log Message: ----------- jdk6: Make meta-package arch=all Modified Paths: -------------- csw/mgar/pkg/jdk6/trunk/checksums csw/mgar/pkg/jdk6/trunk/files/CSWjdk.gspec csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.gspec csw/mgar/pkg/jdk6/trunk/files/CSWjre.gspec csw/mgar/pkg/jdk6/trunk/files/CSWjre6.gspec Modified: csw/mgar/pkg/jdk6/trunk/checksums =================================================================== --- csw/mgar/pkg/jdk6/trunk/checksums 2008-12-10 18:14:21 UTC (rev 2510) +++ csw/mgar/pkg/jdk6/trunk/checksums 2008-12-10 19:30:49 UTC (rev 2511) @@ -2,7 +2,7 @@ 2f5b20118c85533854720ebbfb428758 download/jdk-6u11-solaris-sparcv9.sh e460101ca2d718b98a65c432753e9684 download/jdk-6u11-solaris-i586.sh c103e6c5d4d42a8ab162804a7b01c3c2 download/jdk-6u11-solaris-x64.sh -8e3e3bcebbbd14d16657d8a102c2ed3b download/CSWjdk6.gspec -a08a034895b0e77dd70df961d63ec1a1 download/CSWjre6.gspec -232933acc5ba9ac4fe72ed3cebdcb4d0 download/CSWjdk.gspec -8d4a797e73a0e4b6f17fcf0a99d9b6f0 download/CSWjre.gspec +e97f304567b9a3504ed23ab5203b1d6a download/CSWjdk6.gspec +db63838ec6ecabef9af5dbaeece93854 download/CSWjre6.gspec +49e3f19f300f9634301324c66e9c538f download/CSWjdk.gspec +e8c5435c1ec2ee4b55bc64a7e43092f5 download/CSWjre.gspec Modified: csw/mgar/pkg/jdk6/trunk/files/CSWjdk.gspec =================================================================== --- csw/mgar/pkg/jdk6/trunk/files/CSWjdk.gspec 2008-12-10 18:14:21 UTC (rev 2510) +++ csw/mgar/pkg/jdk6/trunk/files/CSWjdk.gspec 2008-12-10 19:30:49 UTC (rev 2511) @@ -1,4 +1,5 @@ %var bitname jdk %var pkgname CSWjdk +%var arch all %include url file://%{PKGLIB}/csw_standard.gspec -%copyright url file://%{WORKSRC_DEFAULT}/LICENSE +%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Modified: csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.gspec =================================================================== --- csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.gspec 2008-12-10 18:14:21 UTC (rev 2510) +++ csw/mgar/pkg/jdk6/trunk/files/CSWjdk6.gspec 2008-12-10 19:30:49 UTC (rev 2511) @@ -1,4 +1,4 @@ %var bitname jdk6 %var pkgname CSWjdk6 %include url file://%{PKGLIB}/csw_standard.gspec -%copyright url file://%{WORKSRC_DEFAULT}/LICENSE +%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Modified: csw/mgar/pkg/jdk6/trunk/files/CSWjre.gspec =================================================================== --- csw/mgar/pkg/jdk6/trunk/files/CSWjre.gspec 2008-12-10 18:14:21 UTC (rev 2510) +++ csw/mgar/pkg/jdk6/trunk/files/CSWjre.gspec 2008-12-10 19:30:49 UTC (rev 2511) @@ -1,4 +1,5 @@ %var bitname jre %var pkgname CSWjre +%var arch all %include url file://%{PKGLIB}/csw_standard.gspec -%copyright url file://%{WORKSRC_DEFAULT}/LICENSE +%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Modified: csw/mgar/pkg/jdk6/trunk/files/CSWjre6.gspec =================================================================== --- csw/mgar/pkg/jdk6/trunk/files/CSWjre6.gspec 2008-12-10 18:14:21 UTC (rev 2510) +++ csw/mgar/pkg/jdk6/trunk/files/CSWjre6.gspec 2008-12-10 19:30:49 UTC (rev 2511) @@ -1,4 +1,4 @@ %var bitname jre6 %var pkgname CSWjre6 %include url file://%{PKGLIB}/csw_standard.gspec -%copyright url file://%{WORKSRC_DEFAULT}/LICENSE +%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE 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 Dec 10 20:51:29 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 10 Dec 2008 19:51:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[2512] csw/mgar/pkg/mantis/trunk Message-ID: Revision: 2512 http://gar.svn.sourceforge.net/gar/?rev=2512&view=rev Author: dmichelsen Date: 2008-12-10 19:51:28 +0000 (Wed, 10 Dec 2008) Log Message: ----------- mantis: Update to 1.1.6 Modified Paths: -------------- csw/mgar/pkg/mantis/trunk/Makefile csw/mgar/pkg/mantis/trunk/checksums Modified: csw/mgar/pkg/mantis/trunk/Makefile =================================================================== --- csw/mgar/pkg/mantis/trunk/Makefile 2008-12-10 19:30:49 UTC (rev 2511) +++ csw/mgar/pkg/mantis/trunk/Makefile 2008-12-10 19:51:28 UTC (rev 2512) @@ -1,5 +1,5 @@ GARNAME = mantisbt -GARVERSION = 1.1.5 +GARVERSION = 1.1.6 CATEGORIES = apps DESCRIPTION = Mantis is a free popular web-based bugtracking system Modified: csw/mgar/pkg/mantis/trunk/checksums =================================================================== --- csw/mgar/pkg/mantis/trunk/checksums 2008-12-10 19:30:49 UTC (rev 2511) +++ csw/mgar/pkg/mantis/trunk/checksums 2008-12-10 19:51:28 UTC (rev 2512) @@ -1,4 +1,4 @@ -f1a03902fc598abd93edad3a0b39c7f9 download/mantisbt-1.1.5.tar.gz +2e0c6d3dd9ca7d16258fc2d86363a675 download/mantisbt-1.1.6.tar.gz d1789df1b666c1fead9fc492dd196711 download/CSWmantis.gspec 6342620e50a9c631c6fd46a86d6dc32b download/CSWmantis.depend 96401030529fc97656cf78d4f7b170e7 download/CSWmantis.preinstall This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Dec 10 21:10:11 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 10 Dec 2008 20:10:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[2513] csw/mgar/pkg/clamav/trunk Message-ID: Revision: 2513 http://gar.svn.sourceforge.net/gar/?rev=2513&view=rev Author: bonivart Date: 2008-12-10 20:10:10 +0000 (Wed, 10 Dec 2008) Log Message: ----------- clamav: even more fixes Modified Paths: -------------- csw/mgar/pkg/clamav/trunk/Makefile csw/mgar/pkg/clamav/trunk/checksums csw/mgar/pkg/clamav/trunk/files/CSWclamav.checkinstall csw/mgar/pkg/clamav/trunk/files/CSWclamav.cswclamd csw/mgar/pkg/clamav/trunk/files/CSWclamav.gspec csw/mgar/pkg/clamav/trunk/files/CSWclamav.postinstall csw/mgar/pkg/clamav/trunk/files/CSWclamav.preinstall csw/mgar/pkg/clamav/trunk/files/CSWlibclamav.gspec Removed Paths: ------------- csw/mgar/pkg/clamav/trunk/files/CSWclamav.preremove Modified: csw/mgar/pkg/clamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamav/trunk/Makefile 2008-12-10 19:51:28 UTC (rev 2512) +++ csw/mgar/pkg/clamav/trunk/Makefile 2008-12-10 20:10:10 UTC (rev 2513) @@ -1,18 +1,7 @@ # clamav, Peter Bonivart -# files outside /opt/csw are not included, need to fix gspec and cswproto -# put libs in lib/32? -# add rc/smf support. cswclassutils? -# add pre/post scripts -# add etc/clamav-milter? -# add etc/clamd? +# build with "ENABLE_CHECK=0 gmake package" # check mantis bugs -# + add doc/README.CSW, INSTALL.clamav-milter.CSW -# + split into multiple packages: clamav, libclamav -# + add re for update notification -# + add contrib -# + add html docs and some pdf:s -# + remove *.a, *.la from libs GARNAME = clamav GARVERSION = 0.94.2 @@ -29,9 +18,8 @@ SF_PROJ = clamav MASTER_SITES = $(SF_MIRRORS) -#MASTER_SITES = http://freshmeat.net/redir/clamav/29355/url_tgz/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWclamav,checkinstall preinstall postinstall preremove) +DISTFILES += $(call admfiles,CSWclamav,checkinstall preinstall postinstall) DISTFILES += $(call admfiles,CSWlibclamav,) SPKG_DESC_CSWclamav = Clam AntiVirus @@ -43,13 +31,9 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -SPKG_CLASSES = none cswinitsmf +SPKG_CLASSES = none cswcpsampleconf cswinitsmf -#GARCOMPILER = GCC3 - CONFIGURE_ARGS = $(DIRPATHS) -#CONFIGURE_ARGS += --with-user=nobody -#CONFIGURE_ARGS += --with-group=nobody CONFIGURE_ARGS += --disable-clamav CONFIGURE_ARGS += --enable-milter CONFIGURE_ARGS += --with-sendmail=$(libdir)/sendmail @@ -61,6 +45,8 @@ PKGFILES_CSWlibclamav = $(libdir)/.* PKGFILES_CSWlibclamav += $(includedir)/.* +PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswclamd$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/init.d\/cswclamav-milter$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/clamd.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } $$$$3 ~ /\/freshclam.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } { print }' + SPKG_SOURCEURL = http://www.clamav.net/ include gar/category.mk @@ -75,9 +61,12 @@ DOCDEST = $(DESTDIR)$(docdir)/$(GARNAME) post-install-modulated: - @echo " ==> Post-install for $(GARNAME)" + @echo " ==> Post-install for $(GARNAME) (custom)" @ginstall -d $(DESTDIR)/etc/opt/csw/init.d @ginstall -m 755 $(FILEDIR)/CSWclamav.cswclamd $(DESTDIR)/etc/opt/csw/init.d/cswclamd + @ginstall -m 755 $(FILEDIR)/CSWclamav.cswclamav-milter $(DESTDIR)/etc/opt/csw/init.d/cswclamav-milter + @mv $(DESTDIR)$(sysconfdir)/clamd.conf $(DESTDIR)$(sysconfdir)/clamd.conf.CSW + @mv $(DESTDIR)$(sysconfdir)/freshclam.conf $(DESTDIR)$(sysconfdir)/freshclam.conf.CSW @ginstall -d $(DOCDEST) @$(foreach DOC,$(DOCS),ginstall -m 644 $(WORKSRC)/$(DOC) $(DOCDEST);) @ginstall -m 644 $(WORKSRC)/COPYING $(DOCDEST)/LICENSE Modified: csw/mgar/pkg/clamav/trunk/checksums =================================================================== --- csw/mgar/pkg/clamav/trunk/checksums 2008-12-10 19:51:28 UTC (rev 2512) +++ csw/mgar/pkg/clamav/trunk/checksums 2008-12-10 20:10:10 UTC (rev 2513) @@ -1,7 +1,6 @@ 1181e6d62341b84708f126cc353f7ebf download/clamav-0.94.2.tar.gz -7d36b4328fa73af2b109169b923bc127 download/CSWclamav.gspec -751ed376aeccb1664694b772c4b9640d download/CSWclamav.checkinstall -e355168073277baaf456eea620ff2760 download/CSWclamav.preinstall -a82b60e7ee99d6a4ac6e80351ce7bf81 download/CSWclamav.postinstall -526d5979cca3a3ebdf88c6ed33b8ec8d download/CSWclamav.preremove -6edc8660bde0b27d3676699eacb51884 download/CSWlibclamav.gspec +dbb021404195c40d44dd61e9b0206634 download/CSWclamav.gspec +265f727008d1645114839cdbd9399be6 download/CSWclamav.checkinstall +03e2a2aaf95b2cd8497ad6742b9fbb46 download/CSWclamav.preinstall +574e50c4c06f22c928e1a48783490e26 download/CSWclamav.postinstall +8f6b719b38608d0f08ced7e556461c12 download/CSWlibclamav.gspec Modified: csw/mgar/pkg/clamav/trunk/files/CSWclamav.checkinstall =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWclamav.checkinstall 2008-12-10 19:51:28 UTC (rev 2512) +++ csw/mgar/pkg/clamav/trunk/files/CSWclamav.checkinstall 2008-12-10 20:10:10 UTC (rev 2513) @@ -1,6 +1,7 @@ # checkinstall script for Clamav # Verify that group and user clamav exists -# +# 2008-12-10 Peter Bonivart + ADDUSER=0 ADDGROUP=0 # Next, verify that group clamav exists. Modified: csw/mgar/pkg/clamav/trunk/files/CSWclamav.cswclamd =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWclamav.cswclamd 2008-12-10 19:51:28 UTC (rev 2512) +++ csw/mgar/pkg/clamav/trunk/files/CSWclamav.cswclamd 2008-12-10 20:10:10 UTC (rev 2513) @@ -5,9 +5,9 @@ # description: clamd is a standard UNIX program that scans for Viruses. # processname: clamd # config: /opt/csw/etc/clamd.conf -# pidfile: /opt/csw/share/clamav/clamd.pid +# pidfile: /var/opt/csw/clamav/clamd.pid # modified for CSW -# 2007-02-16 Note that the pid file is now in /opt/csw/var/clamav. So, you +# 2007-02-16 Note that the pid file is now in /var/opt/csw/clamav. So, you # may need to fix permissions on that directory. # The clamd file (used to send options to clamd) may now be in # /etc/opt/csw/. Using this file, you may specify a different location @@ -16,9 +16,8 @@ # 2007-04-14 PidFile name and User are obtained from clamd.conf. If # the directory does not exist, it is created by this script. # 2007-10-27 Fix restart script +# 2008-12-10 Peter Bonivart -. /lib/svc/share/smf_include.sh - prog="clamd" progdir="/opt/csw/sbin" @@ -30,57 +29,44 @@ chown $clamuser $piddir fi -OPTIONS_FILE="/etc/opt/csw/clamd" +OPTIONS_FILE="/etc/opt/csw/clamd.conf" if [ ! -f $OPTIONS_FILE ] ; then - OPTIONS_FILE="/opt/csw/etc/clamd" + OPTIONS_FILE="/opt/csw/etc/clamd.conf" fi if [ ! -f "$OPTIONS_FILE" ]; then exit 0 fi -# Local clamd config -if [ -f "$OPTIONS_FILE" ] ; then - CLAMD_FLAGS=`cat "$OPTIONS_FILE"` -fi - PATH=/usr/sbin:/usr/bin:/opt/csw/sbin:/opt/csw/bin -start() { - echo "Starting $prog " - $progdir/$prog ${CLAMD_FLAGS} -} - -stop() { - echo "Stopping $prog " - /usr/bin/kill `head -1 $pidfile` -} - -restart() { - /usr/bin/kill `head -1 $pidfile` - start -} - -reload() { - echo "Reloading clam daemon configuration: " - pkill -HUP $prog -} - case "$1" in start) - start + echo "Starting $prog " + $progdir/$prog & ;; stop) - stop + echo "Stopping $prog " + /usr/bin/pkill -x $prog ;; restart) - restart + $0 stop + echo "Waiting for $prog to stop.\c" + while ( /usr/bin/pgrep -x $prog > /dev/null ) + do + echo ".\c" + sleep 1 + done + echo + sleep 1 + $0 start ;; - reload) - reload + refresh|reload) + echo "Reloading clam daemon configuration: " + /usr/bin/pkill -x -HUP $prog ;; *) - echo $"Usage: $0 {start|stop|status|reload|restart}" + echo $"Usage: $0 { start|stop|refresh|reload|restart }" exit 1 esac -exit $? +exit 0 Modified: csw/mgar/pkg/clamav/trunk/files/CSWclamav.gspec =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWclamav.gspec 2008-12-10 19:51:28 UTC (rev 2512) +++ csw/mgar/pkg/clamav/trunk/files/CSWclamav.gspec 2008-12-10 20:10:10 UTC (rev 2513) @@ -1,9 +1,7 @@ %var bitname clamav %var pkgname CSWclamav %include url file://%{PKGLIB}/csw_dyndepend.gspec -%prototype:merge -f cswinitsmf /etc/opt/csw/init.d/cswclamd 0755 root bin %copyright -Please see /opt/csw/share/doc/clamav/copyright for license information. +Please see /opt/csw/share/doc/clamav/LICENSE for license information. Modified: csw/mgar/pkg/clamav/trunk/files/CSWclamav.postinstall =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWclamav.postinstall 2008-12-10 19:51:28 UTC (rev 2512) +++ csw/mgar/pkg/clamav/trunk/files/CSWclamav.postinstall 2008-12-10 20:10:10 UTC (rev 2513) @@ -1,74 +1,15 @@ # Postinstall script for clamav # 2007-01-07 Add csw.conf support -# The specific daemon name is clamav -# +# 2008-12-10 Peter Bonivart -# If /opt/csw/etc/clamav.conf exists, move it to /opt/csw/etc/clamd.conf +# if /opt/csw/etc/clamav.conf exists, move it to /opt/csw/etc/clamd.conf if [ -f /opt/csw/etc/clamav.conf ]; then /usr/bin/mv /opt/csw/etc/clamav.conf /opt/csw/etc/clamd.conf echo ' Moved /opt/csw/etc/clamav.conf to /opt/csw/etc/clamd.conf' fi -# Determine whether or not clamd and clamav-milter is needed -usingclamd=no -usingclmilter=no -if [ -f /opt/csw/etc/clamd ] -o [ -f /etc/opt/csw/clamd ] ; then usingclamd=yes ; fi -if [ -f /opt/csw/etc/clamav-milter ] -o [ -f /etc/opt/csw/clamav-milter ] ; then usingclmilter=yes ; fi +# assign user for /var/opt/csw/clamav directory +chown -R clamav /var/opt/csw/clamav -# Plug PKG_INSTALL_ROOT if not available -if [ "$PKG_INSTALL_ROOT" = "" ] ; then PKG_INSTALL_ROOT=/ ; fi - -# If available, assign user for /opt/csw/share/clamav directory -CONF_FILE="/etc/opt/csw/clamd.conf" -if [ ! -f "$CONF_FILE" ] ; then - CONF_FILE="/opt/csw/etc/clamd.conf" - if [ ! -f "$CONF_FILE" ] ; then - CONF_FILE="" - fi -fi -if [ x"$CONF_FILE" != x ] ; then - clamuser=`grep '^User' "$CONF_FILE" |awk '{print $2;}'` - if [ x$clamuser != x ] ; then - chown $clamuser /opt/csw/share/clamav - fi -fi - -# daemons are started by default -enable_daemon=yes - -# 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 - -# If defined, autoenable for the specific daemon name takes precedence -if [ "$autoenable_clamav" = "no" ] ; then - enable_daemon=no -elif [ "$autoenable_daemons" = "no" -a ! -n "$autoenable_clamav" ] ; then - enable_daemon=no -fi - -# Start selected daemons -if [ "$enable_daemon" = "yes" ] ; then - - # clamd is first - if [ $usingclamd = yes ] ; then - if [ $smf = no ] ; then - /etc/init.d/cswclamd start 2>&1 - else - /usr/sbin/svcadm enable svc:application/cswclamd 2>&1 - fi - fi - -fi - -# Display message -echo '***' +# display message echo '*** See README.CSW in /opt/csw/share/doc/clamav for changes.**' -echo '*** For first time version 0.90 installs - Please see README.CSW.""' -echo '*** See http://www.blastwave.org/standards/csw.conf.html for' -echo ' details on using csw.conf to enable/disable daemons.**' -echo '***' Modified: csw/mgar/pkg/clamav/trunk/files/CSWclamav.preinstall =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWclamav.preinstall 2008-12-10 19:51:28 UTC (rev 2512) +++ csw/mgar/pkg/clamav/trunk/files/CSWclamav.preinstall 2008-12-10 20:10:10 UTC (rev 2513) @@ -1,5 +1,6 @@ # preinstall for clamav # Add the user and group clamav if told to by checkinstall script. +# 2008-12-10 Peter Bonivart # If installing on a filesystem that is not running the OS, exit this script. if [ ! x"$PKG_INSTALL_ROOT" = x"" -a ! x"$PKG_INSTALL_ROOT" = x"/" ] ; then exit 0 ; fi Deleted: csw/mgar/pkg/clamav/trunk/files/CSWclamav.preremove =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWclamav.preremove 2008-12-10 19:51:28 UTC (rev 2512) +++ csw/mgar/pkg/clamav/trunk/files/CSWclamav.preremove 2008-12-10 20:10:10 UTC (rev 2513) @@ -1,27 +0,0 @@ -# clamav - preremove script -# -# Stop clamav if it is running. - -# Determine whether or not clamd and clamav-milter is running -haveclamd=no -haveclmilter=no - -if [ -f /opt/csw/etc/clamd ] || [ -f /etc/opt/csw/clamd ] ; then haveclamd=yes ; fi -if [ -f /opt/csw/etc/clamav-milter ] || [ -f /etc/opt/csw/clamav-milter ] ; then haveclmilter=yes ; fi - -# Determine whether or not SMF is available -smf=no -if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ] ; then smf=yes ; fi - - if [ $haveclamd=yes ] ; then - echo "Shutting down clamd" - if [ $smf = yes ] - then - # Disable service - /usr/sbin/svcadm disable -s svc:application/cswclamd:default >/dev/null 2>&1 - else - /etc/init.d/cswclamd stop >/dev/null 2>&1 - fi - fi - -exit 0 Modified: csw/mgar/pkg/clamav/trunk/files/CSWlibclamav.gspec =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWlibclamav.gspec 2008-12-10 19:51:28 UTC (rev 2512) +++ csw/mgar/pkg/clamav/trunk/files/CSWlibclamav.gspec 2008-12-10 20:10:10 UTC (rev 2513) @@ -3,5 +3,5 @@ %include url file://%{PKGLIB}/csw_dyndepend.gspec %copyright -Please see /opt/csw/share/doc/libclamav/copyright for license information. +Please see /opt/csw/share/doc/libclamav/LICENSE for license information. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Dec 10 23:34:47 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 10 Dec 2008 22:34:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[2514] csw/mgar/gar Message-ID: Revision: 2514 http://gar.svn.sourceforge.net/gar/?rev=2514&view=rev Author: wbonnet Date: 2008-12-10 22:34:46 +0000 (Wed, 10 Dec 2008) Log Message: ----------- Add more information to output Modified Paths: -------------- csw/mgar/gar/v1/gar.lib.mk csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v1/gar.lib.mk =================================================================== --- csw/mgar/gar/v1/gar.lib.mk 2008-12-10 20:10:10 UTC (rev 2513) +++ csw/mgar/gar/v1/gar.lib.mk 2008-12-10 22:34:46 UTC (rev 2514) @@ -116,16 +116,44 @@ check-upstream-and-mail: @if [ -n '$(FILES2CHECK)' ]; then \ NEW_FILES=""; \ + PACKAGE_UP_TO_DATE=0; \ for FILE in $(FILES2CHECK) ""; do \ [ -n "$$FILE" ] || continue; \ - if test -f $(COOKIEDIR)/checknew-$$FILE || echo $(DISTFILES) | grep -w $$FILE >/dev/null; then \ - : ; \ + if test -f $(COOKIEDIR)/checknew-$$FILE ; then \ + PACKAGE_UP_TO_DATE=1; \ else \ - NEW_FILES="$$FILE $$NEW_FILES"; \ + if echo $(DISTFILES) | grep -w $$FILE >/dev/null; then \ + PACKAGE_UP_TO_DATE=1; \ + echo "$(GARNAME) : Package is up-to-date. Current version is $$FILE" ; \ + else \ + NEW_FILES="$$FILE $$NEW_FILES"; \ + fi; \ fi; \ $(MAKE) checknew-$$FILE >/dev/null; \ done; \ if test -z "$$NEW_FILES" ; then \ + if [ ! -n '$(UFILES_REGEX)' ]; then \ + echo "$(GARNAME) : Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \ +# { echo ""; \ +# echo "Hello dear $(GARNAME) maintainer,"; \ +# echo ""; \ +# echo "The upstream notification job has detected that $(GARNAME) is not configured for automatic upstream file update detection."; \ +# echo ""; \ +# echo "Please consider updating your package. Documentation is available from this link : http://www.opencsw.org" ; \ +# echo ""; \ +# echo "---"; \ +# echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -b uwatch at opencsw.org -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ + else \ + if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ + echo "$(GARNAME) : Warning no files to check ! $(FILES2CHECK)" ; \ + echo "$(GARNAME) : UPSTREAM_MASTER_SITES is $(UPSTREAM_MASTER_SITES)" ; \ + echo "$(GARNAME) : DISTNAME is $(DISTNAME)" ; \ + echo "$(GARNAME) : UFILES_REGEX is : $(UFILES_REGEX)" ; \ + echo "$(GARNAME) : Please check configuration" ; \ + fi; \ + fi; \ + else \ + echo "$(GARNAME) : new upstream files available: $$NEW_FILES"; \ { echo ""; \ echo "Hello dear $(GARNAME) maintainer,"; \ echo ""; \ @@ -141,19 +169,7 @@ echo ""; \ echo "---"; \ echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -b uwatch at opencsw.org -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ - else \ -# if [ ! -n '$(UFILES_REGEX)' ]; then \ -# { echo ""; \ -# echo "Hello dear $(GARNAME) maintainer,"; \ -# echo ""; \ -# echo "The upstream notification job has detected that $(GARNAME) is not configured for automatic upstream file update detection."; \ -# echo ""; \ -# echo "Please consider updating your package. Documentation is available from this link : http://www.opencsw.org" ; \ -# echo ""; \ -# echo "---"; \ -# echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -b uwatch at opencsw.org -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ -# fi; \ - fi; \ + fi; \ fi check-upstream: Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2008-12-10 20:10:10 UTC (rev 2513) +++ csw/mgar/gar/v2/gar.lib.mk 2008-12-10 22:34:46 UTC (rev 2514) @@ -114,16 +114,44 @@ check-upstream-and-mail: @if [ -n '$(FILES2CHECK)' ]; then \ NEW_FILES=""; \ + PACKAGE_UP_TO_DATE=0; \ for FILE in $(FILES2CHECK) ""; do \ [ -n "$$FILE" ] || continue; \ - if test -f $(COOKIEDIR)/checknew-$$FILE || echo $(DISTFILES) | grep -w $$FILE >/dev/null; then \ - : ; \ + if test -f $(COOKIEDIR)/checknew-$$FILE ; then \ + PACKAGE_UP_TO_DATE=1; \ else \ - NEW_FILES="$$FILE $$NEW_FILES"; \ + if echo $(DISTFILES) | grep -w $$FILE >/dev/null; then \ + PACKAGE_UP_TO_DATE=1; \ + echo "$(GARNAME) : Package is up-to-date. Current version is $$FILE" ; \ + else \ + NEW_FILES="$$FILE $$NEW_FILES"; \ + fi; \ fi; \ $(MAKE) checknew-$$FILE >/dev/null; \ done; \ if test -z "$$NEW_FILES" ; then \ + if [ ! -n '$(UFILES_REGEX)' ]; then \ + echo "$(GARNAME) : Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \ +# { echo ""; \ +# echo "Hello dear $(GARNAME) maintainer,"; \ +# echo ""; \ +# echo "The upstream notification job has detected that $(GARNAME) is not configured for automatic upstream file update detection."; \ +# echo ""; \ +# echo "Please consider updating your package. Documentation is available from this link : http://www.opencsw.org" ; \ +# echo ""; \ +# echo "---"; \ +# echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -b uwatch at opencsw.org -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ + else \ + if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ + echo "$(GARNAME) : Warning no files to check ! $(FILES2CHECK)" ; \ + echo "$(GARNAME) : UPSTREAM_MASTER_SITES is $(UPSTREAM_MASTER_SITES)" ; \ + echo "$(GARNAME) : DISTNAME is $(DISTNAME)" ; \ + echo "$(GARNAME) : UFILES_REGEX is : $(UFILES_REGEX)" ; \ + echo "$(GARNAME) : Please check configuration" ; \ + fi; \ + fi; \ + else \ + echo "$(GARNAME) : new upstream files available: $$NEW_FILES"; \ { echo ""; \ echo "Hello dear $(GARNAME) maintainer,"; \ echo ""; \ @@ -139,21 +167,9 @@ echo ""; \ echo "---"; \ echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -b uwatch at opencsw.org -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ - else \ -# if [ ! -n '$(UFILES_REGEX)' ]; then \ -# { echo ""; \ -# echo "Hello dear $(GARNAME) maintainer,"; \ -# echo ""; \ -# echo "The upstream notification job has detected that $(GARNAME) is not configured for automatic upstream file update detection."; \ -# echo ""; \ -# echo "Please consider updating your package. Documentation is available from this link : http://www.opencsw.org" ; \ -# echo ""; \ -# echo "---"; \ -# echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -b uwatch at opencsw.org -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ -# fi; \ - fi; \ + fi; \ fi - + check-upstream: @if [ -n '$(FILES2CHECK)' ]; then \ NEW_FILES=""; \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Dec 10 23:56:06 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 10 Dec 2008 22:56:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[2515] csw/mgar/pkg/Makefile Message-ID: Revision: 2515 http://gar.svn.sourceforge.net/gar/?rev=2515&view=rev Author: wbonnet Date: 2008-12-10 22:56:06 +0000 (Wed, 10 Dec 2008) Log Message: ----------- Add the generation of the UFILES_REGEX in the Makefile Modified Paths: -------------- csw/mgar/pkg/Makefile Modified: csw/mgar/pkg/Makefile =================================================================== --- csw/mgar/pkg/Makefile 2008-12-10 22:34:46 UTC (rev 2514) +++ csw/mgar/pkg/Makefile 2008-12-10 22:56:06 UTC (rev 2515) @@ -53,28 +53,35 @@ newpkg-%: @svn mkdir $* $*/tags $*/branches $*/trunk $*/trunk/files - @(echo "GARNAME = package"; \ - echo "GARVERSION = 1.0"; \ - echo "CATEGORIES = category"; \ - echo ""; \ - echo "DESCRIPTION = Brief description"; \ - echo "define BLURB"; \ - echo " Long description"; \ - echo "endef"; \ - echo ""; \ - echo "MASTER_SITES = "; \ - echo "DISTFILES = $$(GARNAME)-$$(GARVERSION).tar.gz"; \ - echo "DISTFILES += $$(call admfiles,CSWpackage,)"; \ - echo ""; \ - echo "CONFIGURE_ARGS = $$(DIRPATHS)"; \ - echo ""; \ - echo "include gar/category.mk"; \ + @(echo "GARNAME = package"; \ + echo "GARVERSION = 1.0"; \ + echo "CATEGORIES = category"; \ + echo ""; \ + echo "DESCRIPTION = Brief description"; \ + echo "define BLURB"; \ + echo " Long description"; \ + echo "endef"; \ + echo ""; \ + echo "MASTER_SITES = "; \ + echo "DISTFILES = $$(GARNAME)-$$(GARVERSION).tar.gz"; \ + echo "DISTFILES += $$(call admfiles,CSWpackage,)"; \ + echo ""; \ + echo "# We define upstream file regex so we can be notifed of new upstream software release"; \ + echo "UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz"; \ + echo ""; \ + echo "# If the url used to check for software update is different of MASTER_SITES, then "; \ + echo "# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES"; \ + echo "# UPSTREAM_MASTER_SITES = "; \ + echo ""; \ + echo "CONFIGURE_ARGS = $$(DIRPATHS)"; \ + echo ""; \ + echo "include gar/category.mk"; \ ) > $*/trunk/Makefile @svn add $*/trunk/Makefile - @(echo "%var bitname package"; \ - echo "%var pkgname CSWpackage"; \ - echo "%include url file://%{PKGLIB}/csw_dyndepend.gspec";\ - echo "%copyright url file://%{WORKSRC}/LICENSE"; \ + @(echo "%var bitname package"; \ + echo "%var pkgname CSWpackage"; \ + echo "%include url file://%{PKGLIB}/csw_dyndepend.gspec"; \ + echo "%copyright url file://%{WORKSRC}/LICENSE"; \ ) > $*/trunk/files/CSWpackage.gspec @echo "cookies\ndownload\nwork\n" | svn propset svn:ignore -F /dev/fd/0 $*/trunk @echo "gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1" | svn propset svn:externals -F /dev/fd/0 $*/trunk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 11 00:05:57 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 10 Dec 2008 23:05:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[2516] csw/mgar/gar Message-ID: Revision: 2516 http://gar.svn.sourceforge.net/gar/?rev=2516&view=rev Author: wbonnet Date: 2008-12-10 23:05:56 +0000 (Wed, 10 Dec 2008) Log Message: ----------- Make the script be a bit more polite :) Modified Paths: -------------- csw/mgar/gar/v1/gar.lib.mk csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v1/gar.lib.mk =================================================================== --- csw/mgar/gar/v1/gar.lib.mk 2008-12-10 22:56:06 UTC (rev 2515) +++ csw/mgar/gar/v1/gar.lib.mk 2008-12-10 23:05:56 UTC (rev 2516) @@ -141,8 +141,9 @@ # echo ""; \ # echo "Please consider updating your package. Documentation is available from this link : http://www.opencsw.org" ; \ # echo ""; \ -# echo "---"; \ -# echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -b uwatch at opencsw.org -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ +# echo "--"; \ +# echo "Kindest regards"; \ +# echo "The upstream notification job"; } | $(GARBIN)/mail2maintainer -b uwatch at opencsw.org -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ else \ if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ echo "$(GARNAME) : Warning no files to check ! $(FILES2CHECK)" ; \ @@ -167,8 +168,9 @@ echo ""; \ echo "Please consider updating your package." ; \ echo ""; \ - echo "---"; \ - echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -b uwatch at opencsw.org -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ + echo "--"; \ + echo "Kindest regards"; \ + echo "The upstream notification job"; } | $(GARBIN)/mail2maintainer -b uwatch at opencsw.org -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ fi; \ fi Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2008-12-10 22:56:06 UTC (rev 2515) +++ csw/mgar/gar/v2/gar.lib.mk 2008-12-10 23:05:56 UTC (rev 2516) @@ -139,7 +139,8 @@ # echo ""; \ # echo "Please consider updating your package. Documentation is available from this link : http://www.opencsw.org" ; \ # echo ""; \ -# echo "---"; \ +# echo "--"; \ +# echo "Kindest regards"; \ # echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -b uwatch at opencsw.org -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ else \ if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ @@ -165,7 +166,8 @@ echo ""; \ echo "Please consider updating your package." ; \ echo ""; \ - echo "---"; \ + echo "--"; \ + echo "Kindest regards"; \ echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -b uwatch at opencsw.org -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ fi; \ fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 11 00:21:23 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 10 Dec 2008 23:21:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[2517] csw/mgar/gar Message-ID: Revision: 2517 http://gar.svn.sourceforge.net/gar/?rev=2517&view=rev Author: wbonnet Date: 2008-12-10 23:21:23 +0000 (Wed, 10 Dec 2008) Log Message: ----------- Add William Bonnet email in bcc of the reminder. It will be used at beginning to track errors Modified Paths: -------------- csw/mgar/gar/v1/bin/mail2maintainer csw/mgar/gar/v1/gar.lib.mk csw/mgar/gar/v2/bin/mail2maintainer csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v1/bin/mail2maintainer =================================================================== --- csw/mgar/gar/v1/bin/mail2maintainer 2008-12-10 23:05:56 UTC (rev 2516) +++ csw/mgar/gar/v1/bin/mail2maintainer 2008-12-10 23:21:23 UTC (rev 2517) @@ -62,5 +62,5 @@ shift done -eval mailx $MAIL_OPTIONS $EMAIL +eval mailx $MAIL_OPTIONS -b "william at wbonnet.net" $EMAIL Modified: csw/mgar/gar/v1/gar.lib.mk =================================================================== --- csw/mgar/gar/v1/gar.lib.mk 2008-12-10 23:05:56 UTC (rev 2516) +++ csw/mgar/gar/v1/gar.lib.mk 2008-12-10 23:21:23 UTC (rev 2517) @@ -143,7 +143,7 @@ # echo ""; \ # echo "--"; \ # echo "Kindest regards"; \ -# echo "The upstream notification job"; } | $(GARBIN)/mail2maintainer -b uwatch at opencsw.org -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ +# echo "The upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ else \ if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ echo "$(GARNAME) : Warning no files to check ! $(FILES2CHECK)" ; \ @@ -170,7 +170,7 @@ echo ""; \ echo "--"; \ echo "Kindest regards"; \ - echo "The upstream notification job"; } | $(GARBIN)/mail2maintainer -b uwatch at opencsw.org -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ + echo "The upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ fi; \ fi Modified: csw/mgar/gar/v2/bin/mail2maintainer =================================================================== --- csw/mgar/gar/v2/bin/mail2maintainer 2008-12-10 23:05:56 UTC (rev 2516) +++ csw/mgar/gar/v2/bin/mail2maintainer 2008-12-10 23:21:23 UTC (rev 2517) @@ -62,5 +62,5 @@ shift done -eval mailx $MAIL_OPTIONS $EMAIL +eval mailx $MAIL_OPTIONS -b "william at wbonnet.net" $EMAIL Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2008-12-10 23:05:56 UTC (rev 2516) +++ csw/mgar/gar/v2/gar.lib.mk 2008-12-10 23:21:23 UTC (rev 2517) @@ -141,7 +141,7 @@ # echo ""; \ # echo "--"; \ # echo "Kindest regards"; \ -# echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -b uwatch at opencsw.org -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ +# echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ else \ if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ echo "$(GARNAME) : Warning no files to check ! $(FILES2CHECK)" ; \ @@ -168,7 +168,7 @@ echo ""; \ echo "--"; \ echo "Kindest regards"; \ - echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -b uwatch at opencsw.org -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ + echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ fi; \ fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 11 00:34:42 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 10 Dec 2008 23:34:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[2518] csw/mgar/pkg/x11/ Message-ID: Revision: 2518 http://gar.svn.sourceforge.net/gar/?rev=2518&view=rev Author: wbonnet Date: 2008-12-10 23:34:42 +0000 (Wed, 10 Dec 2008) Log Message: ----------- Create directory for Xorg X11 components Added Paths: ----------- csw/mgar/pkg/x11/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 11 00:37:29 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 10 Dec 2008 23:37:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[2519] csw/mgar/pkg/x11/libX11/ Message-ID: Revision: 2519 http://gar.svn.sourceforge.net/gar/?rev=2519&view=rev Author: wbonnet Date: 2008-12-10 23:37:29 +0000 (Wed, 10 Dec 2008) Log Message: ----------- Move libX11 to x11 Added Paths: ----------- csw/mgar/pkg/x11/libX11/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 11 00:42:02 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 10 Dec 2008 23:42:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[2520] csw/mgar/pkg/libX11/ Message-ID: Revision: 2520 http://gar.svn.sourceforge.net/gar/?rev=2520&view=rev Author: wbonnet Date: 2008-12-10 23:42:01 +0000 (Wed, 10 Dec 2008) Log Message: ----------- Move libX11 to x11 subdir Removed Paths: ------------- csw/mgar/pkg/libX11/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 11 00:45:44 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 10 Dec 2008 23:45:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[2521] csw/mgar/pkg Message-ID: Revision: 2521 http://gar.svn.sourceforge.net/gar/?rev=2521&view=rev Author: wbonnet Date: 2008-12-10 23:45:44 +0000 (Wed, 10 Dec 2008) Log Message: ----------- Add UFILE_REGEX generation to xfce and cpan makefile Modified Paths: -------------- csw/mgar/pkg/cpan/Makefile csw/mgar/pkg/xfce/Makefile Modified: csw/mgar/pkg/cpan/Makefile =================================================================== --- csw/mgar/pkg/cpan/Makefile 2008-12-10 23:42:01 UTC (rev 2520) +++ csw/mgar/pkg/cpan/Makefile 2008-12-10 23:45:44 UTC (rev 2521) @@ -36,6 +36,13 @@ echo "MASTER_SITES = "; \ echo "DISTFILES = $$(GARNAME)-$$(GARVERSION).tar.gz"; \ echo "DISTFILES += $$(call admfiles,CSWpackage,)"; \ + echo ""; \ + echo "# We define upstream file regex so we can be notifed of new upstream software release"; \ + echo "UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz"; \ + echo ""; \ + echo "# If the url used to check for software update is different of MASTER_SITES, then "; \ + echo "# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES"; \ + echo "# UPSTREAM_MASTER_SITES = "; \ echo ""; \ echo "CONFIGURE_ARGS = $$(DIRPATHS)"; \ echo ""; \ Modified: csw/mgar/pkg/xfce/Makefile =================================================================== --- csw/mgar/pkg/xfce/Makefile 2008-12-10 23:42:01 UTC (rev 2520) +++ csw/mgar/pkg/xfce/Makefile 2008-12-10 23:45:44 UTC (rev 2521) @@ -36,6 +36,13 @@ echo "MASTER_SITES = "; \ echo "DISTFILES = $$(GARNAME)-$$(GARVERSION).tar.gz"; \ echo "DISTFILES += $$(call admfiles,CSWpackage,)"; \ + echo ""; \ + echo "# We define upstream file regex so we can be notifed of new upstream software release"; \ + echo "UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz"; \ + echo ""; \ + echo "# If the url used to check for software update is different of MASTER_SITES, then "; \ + echo "# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES"; \ + echo "# UPSTREAM_MASTER_SITES = "; \ echo ""; \ echo "CONFIGURE_ARGS = $$(DIRPATHS)"; \ echo ""; \ 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 Dec 11 08:15:13 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Dec 2008 07:15:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[2522] csw/mgar/pkg/pca/trunk/Makefile Message-ID: Revision: 2522 http://gar.svn.sourceforge.net/gar/?rev=2522&view=rev Author: dmichelsen Date: 2008-12-11 07:15:12 +0000 (Thu, 11 Dec 2008) Log Message: ----------- pca: Fix upstream watch version regex Modified Paths: -------------- csw/mgar/pkg/pca/trunk/Makefile Modified: csw/mgar/pkg/pca/trunk/Makefile =================================================================== --- csw/mgar/pkg/pca/trunk/Makefile 2008-12-10 23:45:44 UTC (rev 2521) +++ csw/mgar/pkg/pca/trunk/Makefile 2008-12-11 07:15:12 UTC (rev 2522) @@ -18,7 +18,7 @@ DISTFILES += $(call admfiles,CSWpca) # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*) +UFILES_REGEX = $(GARNAME)-(\d{8}-\d{2}) WORKSRC = $(WORKDIR) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvel at opencsw.org Thu Dec 11 08:51:55 2008 From: trygvel at opencsw.org (=?ISO-8859-1?Q?Trygve_Laugst=F8l?=) Date: Thu, 11 Dec 2008 08:51:55 +0100 Subject: [csw-devel] [Fwd: [svn] mercurial upstream update notification] Message-ID: <4940C69B.8040204@opencsw.org> Wow, this is great! Are you recording the data somewhere? I would like to create (yet) another RSS feed on the dev.opencsw.org page :) -- Trygve -------- Original Message -------- Subject: [svn] mercurial upstream update notification Date: Thu, 11 Dec 2008 05:27:26 +0100 (CET) From: Upstream Package Watch To: trygvel at opencsw.org Hello dear mercurial maintainer, The upstream notification job has detected the availability of new files for mercurial. The following upstream file(s): mercurial-1.1.tar.gz is/are available at the following url(s): http://www.selenic.com/mercurial/release Please consider updating your package. -- Kindest regards The upstream notification job From bonivart at users.sourceforge.net Thu Dec 11 10:05:46 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 11 Dec 2008 09:05:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[2523] csw/mgar/pkg/clamav/trunk Message-ID: Revision: 2523 http://gar.svn.sourceforge.net/gar/?rev=2523&view=rev Author: bonivart Date: 2008-12-11 09:05:46 +0000 (Thu, 11 Dec 2008) Log Message: ----------- clamav: fixed ownership issues, removed postinstall Modified Paths: -------------- csw/mgar/pkg/clamav/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/clamav/trunk/files/CSWclamav.postinstall Modified: csw/mgar/pkg/clamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamav/trunk/Makefile 2008-12-11 07:15:12 UTC (rev 2522) +++ csw/mgar/pkg/clamav/trunk/Makefile 2008-12-11 09:05:46 UTC (rev 2523) @@ -19,13 +19,13 @@ SF_PROJ = clamav MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWclamav,checkinstall preinstall postinstall) +DISTFILES += $(call admfiles,CSWclamav,checkinstall preinstall) DISTFILES += $(call admfiles,CSWlibclamav,) SPKG_DESC_CSWclamav = Clam AntiVirus SPKG_DESC_CSWlibclamav = Clam AntiVirus Library -REQUIRED_PKGS_CSWclamav = CSWlibclamav CSWlibgmp CSWzlib CSWbzip2 CSWiconv CSWcswclassutils +REQUIRED_PKGS_CSWclamav = CSWlibclamav CSWlibgmp CSWzlib CSWbzip2 CSWiconv CSWcswclassutils CSWtcpwrap REQUIRED_PKGS_CSWlibclamav = CSWlibgmp CSWzlib CSWbzip2 CSWiconv # We define upstream file regex so we can be notifed of new upstream software release @@ -45,7 +45,7 @@ PKGFILES_CSWlibclamav = $(libdir)/.* PKGFILES_CSWlibclamav += $(includedir)/.* -PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswclamd$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/init.d\/cswclamav-milter$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/clamd.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } $$$$3 ~ /\/freshclam.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } { print }' +PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswclamd$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/init.d\/cswclamav-milter$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/clamd.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } $$$$3 ~ /\/freshclam.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } $$$$3 ~ /\/var\/opt\/csw\/clamav/ { $$$$5 = "clamav" } { print }' SPKG_SOURCEURL = http://www.clamav.net/ Deleted: csw/mgar/pkg/clamav/trunk/files/CSWclamav.postinstall =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWclamav.postinstall 2008-12-11 07:15:12 UTC (rev 2522) +++ csw/mgar/pkg/clamav/trunk/files/CSWclamav.postinstall 2008-12-11 09:05:46 UTC (rev 2523) @@ -1,15 +0,0 @@ -# Postinstall script for clamav -# 2007-01-07 Add csw.conf support -# 2008-12-10 Peter Bonivart - -# if /opt/csw/etc/clamav.conf exists, move it to /opt/csw/etc/clamd.conf -if [ -f /opt/csw/etc/clamav.conf ]; then - /usr/bin/mv /opt/csw/etc/clamav.conf /opt/csw/etc/clamd.conf - echo ' Moved /opt/csw/etc/clamav.conf to /opt/csw/etc/clamd.conf' -fi - -# assign user for /var/opt/csw/clamav directory -chown -R clamav /var/opt/csw/clamav - -# display message -echo '*** See README.CSW in /opt/csw/share/doc/clamav for changes.**' 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 Dec 11 11:10:23 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Dec 2008 10:10:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[2524] csw/mgar/pkg/readline/trunk Message-ID: Revision: 2524 http://gar.svn.sourceforge.net/gar/?rev=2524&view=rev Author: dmichelsen Date: 2008-12-11 10:10:23 +0000 (Thu, 11 Dec 2008) Log Message: ----------- readline: Update to 5.2 and mGAR v2 Modified Paths: -------------- csw/mgar/pkg/readline/trunk/Makefile csw/mgar/pkg/readline/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/readline/trunk/ Property changes on: csw/mgar/pkg/readline/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/readline/trunk/Makefile =================================================================== --- csw/mgar/pkg/readline/trunk/Makefile 2008-12-11 09:05:46 UTC (rev 2523) +++ csw/mgar/pkg/readline/trunk/Makefile 2008-12-11 10:10:23 UTC (rev 2524) @@ -1,5 +1,5 @@ GARNAME = readline -GARVERSION = 4.3 +GARVERSION = 5.2 CATEGORIES = lib DESCRIPTION = GNU readline @@ -19,7 +19,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -LIBDEPS += lib/ncurses +BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-curses Modified: csw/mgar/pkg/readline/trunk/checksums =================================================================== --- csw/mgar/pkg/readline/trunk/checksums 2008-12-11 09:05:46 UTC (rev 2523) +++ csw/mgar/pkg/readline/trunk/checksums 2008-12-11 10:10:23 UTC (rev 2524) @@ -1,2 +1,2 @@ -f86f7cb717ab321fe15f1bbcb058c11e download/readline-4.3.tar.gz +e39331f32ad14009b9ff49cc10c5e751 download/readline-5.2.tar.gz ece4ee7c84df61c627f7bb07db207f59 download/CSWreadline.gspec 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 Dec 11 11:10:55 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Dec 2008 10:10:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[2525] csw/mgar/pkg/pcre/trunk Message-ID: Revision: 2525 http://gar.svn.sourceforge.net/gar/?rev=2525&view=rev Author: dmichelsen Date: 2008-12-11 10:10:54 +0000 (Thu, 11 Dec 2008) Log Message: ----------- pcre: Update to 7.8 and mGAR v2 Modified Paths: -------------- csw/mgar/pkg/pcre/trunk/Makefile csw/mgar/pkg/pcre/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/pcre/trunk/ Property changes on: csw/mgar/pkg/pcre/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/pcre/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcre/trunk/Makefile 2008-12-11 10:10:23 UTC (rev 2524) +++ csw/mgar/pkg/pcre/trunk/Makefile 2008-12-11 10:10:54 UTC (rev 2525) @@ -1,5 +1,5 @@ GARNAME = pcre -GARVERSION = 7.6 +GARVERSION = 7.8 CATEGORIES = lib DESCRIPTION = Perl-compatible regular expression tools @@ -15,9 +15,13 @@ DISTFILES += $(call admfiles,CSWpcrert,depend prototype) DISTFILES += $(call admfiles,CSWpcre,depend prototype) +PREREQUISITE_PKGS = CSWgnulinks + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +BUILD64 = 1 + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-unicode-properties CONFIGURE_ARGS += --enable-pcregrep-libz Modified: csw/mgar/pkg/pcre/trunk/checksums =================================================================== --- csw/mgar/pkg/pcre/trunk/checksums 2008-12-11 10:10:23 UTC (rev 2524) +++ csw/mgar/pkg/pcre/trunk/checksums 2008-12-11 10:10:54 UTC (rev 2525) @@ -1,4 +1,4 @@ -b94cce871f70734c2dfc47b52a3aa670 download/pcre-7.6.tar.gz +32fd7c7863b871d408d730e6ffa4aa71 download/pcre-7.8.tar.gz fa208f4292d0102dc5e87d81bed54af9 download/CSWpcrert.gspec b6471d1f8f8b32660529a389fa73bbf3 download/CSWpcrert.depend 99f231131bab4cb4c8dea955c6cd1236 download/CSWpcrert.prototype This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Thu Dec 11 11:15:28 2008 From: dam at opencsw.org (Dagobert Michelsen) Date: Thu, 11 Dec 2008 11:15:28 +0100 Subject: [csw-devel] [Fwd: [svn] mercurial upstream update notification] In-Reply-To: <4940C69B.8040204@opencsw.org> References: <4940C69B.8040204@opencsw.org> Message-ID: <802D1C8A-1E84-4EEA-95BD-2C3A4AFB9A3B@opencsw.org> Hi, Am 11.12.2008 um 08:51 schrieb Trygve Laugst?l: > Wow, this is great! Yesss!!1!! William, how about taking trunk, copying to branches/autoupdate-, rewrite GARVERSION and commit it? Trygve, then Hudson could pick this up automatically and build packages. I am aware that this doesn't in case of major upgrades, but on most packages it would help being real current. Best regards -- Dago From dmichelsen at users.sourceforge.net Thu Dec 11 11:41:18 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Dec 2008 10:41:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[2526] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 2526 http://gar.svn.sourceforge.net/gar/?rev=2526&view=rev Author: dmichelsen Date: 2008-12-11 10:41:13 +0000 (Thu, 11 Dec 2008) Log Message: ----------- mGAR v2: Merge [2453] SVN revision in PSTAMP Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2008-12-11 10:10:54 UTC (rev 2525) +++ csw/mgar/gar/v2/gar.pkg.mk 2008-12-11 10:41:13 UTC (rev 2526) @@ -18,6 +18,17 @@ SPKG_SPECS ?= $(basename $(filter %.gspec,$(DISTFILES))) _PKG_SPECS = $(filter-out $(NOPACKAGE),$(SPKG_SPECS)) +# We have to deal with four cases here: +# 1. There is no svn binary -> NOSVN +# 2. There is a svn binary, but the directory does not belong to a repository -> NOTVERSIONED +# 3. There is a svn binary, but not everything was committed properly -> UNCOMMITTED +# 4. There is a svn binary and everything was committed -> r + +# Calculating the revision can be time consuming, so we do this on demand +define _REVISION +$(if $(shell if test -x $(SVN); then echo yes; fi),$(if $(shell $(SVN) info >/dev/null 2>&1; if test $$? -eq 0; then echo YES; fi),$(if $(shell $(SVN) status --ignore-externals 2>/dev/null | grep -v '^X'),UNCOMMITTED,$(shell $(SVN) info --recursive 2>/dev/null | $(GAWK) '$$1 == "Revision:" && MAX < $$2 { MAX = $$2 } END {print "r" MAX }')),NOTVERSIONED),NOSVN) +endef + SPKG_DESC ?= $(DESCRIPTION) SPKG_VERSION ?= $(GARVERSION) SPKG_CATEGORY ?= application @@ -25,7 +36,7 @@ SPKG_PACKAGER ?= Unknown SPKG_VENDOR ?= $(SPKG_SOURCEURL) packaged for CSW by $(SPKG_PACKAGER) SPKG_EMAIL ?= Unknown -SPKG_PSTAMP ?= $(LOGNAME)@$(shell hostname)-$(shell date '+%Y%m%d%H%M%S') +SPKG_PSTAMP ?= $(LOGNAME)@$(shell hostname)-$(call _REVISION)-$(shell date '+%Y%m%d%H%M%S') SPKG_BASEDIR ?= $(prefix) SPKG_CLASSES ?= none SPKG_OSNAME ?= $(shell uname -s)$(shell uname -r) 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 Dec 11 11:56:20 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Dec 2008 10:56:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[2527] csw/mgar/pkg/readline/trunk Message-ID: Revision: 2527 http://gar.svn.sourceforge.net/gar/?rev=2527&view=rev Author: dmichelsen Date: 2008-12-11 10:56:20 +0000 (Thu, 11 Dec 2008) Log Message: ----------- readline: Small linker fix Modified Paths: -------------- csw/mgar/pkg/readline/trunk/Makefile csw/mgar/pkg/readline/trunk/checksums csw/mgar/pkg/readline/trunk/files/CSWreadline.gspec Modified: csw/mgar/pkg/readline/trunk/Makefile =================================================================== --- csw/mgar/pkg/readline/trunk/Makefile 2008-12-11 10:41:13 UTC (rev 2526) +++ csw/mgar/pkg/readline/trunk/Makefile 2008-12-11 10:56:20 UTC (rev 2527) @@ -31,3 +31,5 @@ post-install: @chmod 555 $(DESTDIR)$(libdir)/libhistory.* @chmod 555 $(DESTDIR)$(libdir)/libreadline.* + +LDFLAGS := $(filter-out -xarch=%,$(filter-out -m%,$(LDFLAGS))) Modified: csw/mgar/pkg/readline/trunk/checksums =================================================================== --- csw/mgar/pkg/readline/trunk/checksums 2008-12-11 10:41:13 UTC (rev 2526) +++ csw/mgar/pkg/readline/trunk/checksums 2008-12-11 10:56:20 UTC (rev 2527) @@ -1,2 +1,2 @@ e39331f32ad14009b9ff49cc10c5e751 download/readline-5.2.tar.gz -ece4ee7c84df61c627f7bb07db207f59 download/CSWreadline.gspec +9bb3360c0c8331df8143c7b8eac3ad5f download/CSWreadline.gspec Modified: csw/mgar/pkg/readline/trunk/files/CSWreadline.gspec =================================================================== --- csw/mgar/pkg/readline/trunk/files/CSWreadline.gspec 2008-12-11 10:41:13 UTC (rev 2526) +++ csw/mgar/pkg/readline/trunk/files/CSWreadline.gspec 2008-12-11 10:56:20 UTC (rev 2527) @@ -1,4 +1,4 @@ %var bitname readline %var pkgname CSWreadline %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYRIGHT +%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 dam at opencsw.org Thu Dec 11 12:02:36 2008 From: dam at opencsw.org (Dagobert Michelsen) Date: Thu, 11 Dec 2008 12:02:36 +0100 Subject: [csw-devel] FYI: Sun Studio 11 patched Message-ID: Hi, I just installed the latest Sun Studio 11 patches 121017-17 Sun Studio 11: Patch for Sun C++ 5.8 compiler 121018-17 Sun Studio 11_x86: Patch for Sun C++ 5.8 compiler Best regards -- Dago From william at wbonnet.net Thu Dec 11 12:02:34 2008 From: william at wbonnet.net (William Bonnet) Date: Thu, 11 Dec 2008 12:02:34 +0100 Subject: [csw-devel] [Fwd: [svn] mercurial upstream update notification] In-Reply-To: <4940C69B.8040204@opencsw.org> References: <4940C69B.8040204@opencsw.org> Message-ID: <4940F34A.5020306@wbonnet.net> Hi Trygve > Wow, this is great! > Thanks :) > Are you recording the data somewhere? I would like to create (yet) > another RSS feed on the dev.opencsw.org page :) > Acually i am in bcc of all sent emails. Mainly for debugging purpose ;) At the beginning i was thinking of adding a technical account in copy (let's say the account used to send the email). But i think it is better to have : . Information stored in mantis (new bug entry) . Information stored in a mysql databse (which i am creating right now) From the database, we can pull a rss feed. I still have a few bug to fix in this script. For instance about a hundred of email were not sent, mainy perl modules. This hapened because of a difference between names between gar and package list from the web site (sorry for your mail server Ihsan...). I'll fix this one tonight or tomorrow. I also have some url to fix in order to be able to find the upstream sources (don't worry i am the only to receive these errors). And last but not least, i have to write a documentation for the maintainers to help them setting the upstream regexp and sources Once fixed (at least let say 80% of url), i'll rewrite the script to insert information in the database. It should occur during Xmas break. Trygve, i'll send you the database model before Xmas, and some test data. So you'll be able to create this rss feed. Cheers, > -- > Trygve > > -------- Original Message -------- > Subject: [svn] mercurial upstream update notification > Date: Thu, 11 Dec 2008 05:27:26 +0100 (CET) > From: Upstream Package Watch > To: trygvel at opencsw.org > > > Hello dear mercurial maintainer, > > The upstream notification job has detected the availability of new files > for mercurial. > > The following upstream file(s): > mercurial-1.1.tar.gz > > is/are available at the following url(s): > http://www.selenic.com/mercurial/release > > Please consider updating your package. > > -- > Kindest regards > The upstream notification job > _______________________________________________ > devel mailing list > devel at lists.opencsw.org > https://lists.opencsw.org/mailman/listinfo/devel > From dmichelsen at users.sourceforge.net Thu Dec 11 12:32:11 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Dec 2008 11:32:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[2528] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 2528 http://gar.svn.sourceforge.net/gar/?rev=2528&view=rev Author: dmichelsen Date: 2008-12-11 11:32:11 +0000 (Thu, 11 Dec 2008) Log Message: ----------- mGAR v2: Fix defined for revision in PSTAMP Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2008-12-11 10:56:20 UTC (rev 2527) +++ csw/mgar/gar/v2/gar.pkg.mk 2008-12-11 11:32:11 UTC (rev 2528) @@ -18,6 +18,10 @@ SPKG_SPECS ?= $(basename $(filter %.gspec,$(DISTFILES))) _PKG_SPECS = $(filter-out $(NOPACKAGE),$(SPKG_SPECS)) +# Set this to your svn binary +SVN ?= /opt/csw/bin/svn +GAWK ?= /opt/csw/bin/gawk + # We have to deal with four cases here: # 1. There is no svn binary -> NOSVN # 2. There is a svn binary, but the directory does not belong to a repository -> NOTVERSIONED 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 Dec 11 12:32:42 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Dec 2008 11:32:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[2529] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 2529 http://gar.svn.sourceforge.net/gar/?rev=2529&view=rev Author: dmichelsen Date: 2008-12-11 11:32:42 +0000 (Thu, 11 Dec 2008) Log Message: ----------- mGAR v2: Add dependency to CSWisaexec only if it is actually used Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2008-12-11 11:32:11 UTC (rev 2528) +++ csw/mgar/gar/v2/gar.mk 2008-12-11 11:32:42 UTC (rev 2529) @@ -499,7 +499,6 @@ MERGE_DIRS_isa-$(ISA) ?= $(bindir) $(sbindir) $(libexecdir) $(libdir) MERGE_SCRIPTS_isa-$(ISA_DEFAULT) ?= copy-relocate $(EXTRA_MERGE_SCRIPTS_isa-$(ISA)) $(EXTRA_MERGE_SCRIPTS) MERGE_SCRIPTS_isa-$(ISA) ?= copy-relocated-only $(EXTRA_MERGE_SCRIPTS_isa-$(ISA)) $(EXTRA_MERGE_SCRIPTS) -_EXTRA_GAR_PKGS += CSWisaexec endif # These directories get relocated into their ISA subdirectories @@ -513,6 +512,10 @@ if test -f "$$F"; then echo $$F; fi; \ done)),) +ifneq ($(ISAEXEC_FILES),) +_EXTRA_GAR_PKGS += CSWisaexec +endif + # These files get relocated. # MERGE_DIRS is expanded to individual files here. All further # processing is done using these files. 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 Dec 11 12:54:08 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Dec 2008 11:54:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[2530] csw/mgar/pkg/readline/trunk Message-ID: Revision: 2530 http://gar.svn.sourceforge.net/gar/?rev=2530&view=rev Author: dmichelsen Date: 2008-12-11 11:54:08 +0000 (Thu, 11 Dec 2008) Log Message: ----------- readline: Add legacy version 4.3 as shared lib Modified Paths: -------------- csw/mgar/pkg/readline/trunk/Makefile csw/mgar/pkg/readline/trunk/checksums Modified: csw/mgar/pkg/readline/trunk/Makefile =================================================================== --- csw/mgar/pkg/readline/trunk/Makefile 2008-12-11 11:32:42 UTC (rev 2529) +++ csw/mgar/pkg/readline/trunk/Makefile 2008-12-11 11:54:08 UTC (rev 2530) @@ -2,6 +2,9 @@ GARVERSION = 5.2 CATEGORIES = lib +EXTRA_MODULATORS = GARVERSION +MODULATIONS_GARVERSION = 4.3 5.2 + DESCRIPTION = GNU readline define BLURB The Readline library provides a set of functions for use by applications @@ -13,7 +16,7 @@ endef MASTER_SITES = $(GNU_MIRROR) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(foreach V,$(MODULATIONS_GARVERSION),$(GARNAME)-$(V).tar.gz) DISTFILES += $(call admfiles,CSWreadline,) # We define upstream file regex so we can be notifed of new upstream software release @@ -26,6 +29,24 @@ TEST_TARGET = check +MERGE_SCRIPTS_isa-i386-garversion-4.3 = copy-only +MERGE_DIRS_isa-i386-garversion-4.3 = $(libdir) +MERGE_SCRIPTS_isa-amd64-garversion-4.3 = copy-relocated-only +MERGE_DIRS_isa-amd64-garversion-4.3 = $(libdir) + +MERGE_SCRIPTS_isa-i386-garversion-5.2 = copy-all +MERGE_SCRIPTS_isa-amd64-garversion-5.2 = copy-relocated-only +MERGE_DIRS_isa-amd64-garversion-5.2 = $(bindir) $(sbindir) $(libexecdir) $(libdir) + +MERGE_SCRIPTS_isa-sparcv8-garversion-4.3 = copy-only +MERGE_DIRS_isa-sparcv8-garversion-4.3 = $(libdir) +MERGE_SCRIPTS_isa-sparcv9-garversion-4.3 = copy-relocated-only +MERGE_DIRS_isa-sparcv9-garversion-4.3 = $(libdir) + +MERGE_SCRIPTS_isa-sparcv8-garversion-5.2 = copy-all +MERGE_SCRIPTS_isa-sparcv9-garversion-5.2 = copy-relocated-only +MERGE_DIRS_isa-sparcv9-garversion-5.2 = $(bindir) $(sbindir) $(libexecdir) $(libdir) + include gar/category.mk post-install: Modified: csw/mgar/pkg/readline/trunk/checksums =================================================================== --- csw/mgar/pkg/readline/trunk/checksums 2008-12-11 11:32:42 UTC (rev 2529) +++ csw/mgar/pkg/readline/trunk/checksums 2008-12-11 11:54:08 UTC (rev 2530) @@ -1,2 +1,3 @@ +f86f7cb717ab321fe15f1bbcb058c11e download/readline-4.3.tar.gz e39331f32ad14009b9ff49cc10c5e751 download/readline-5.2.tar.gz 9bb3360c0c8331df8143c7b8eac3ad5f download/CSWreadline.gspec 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 Dec 11 14:03:11 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Dec 2008 13:03:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[2531] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 2531 http://gar.svn.sourceforge.net/gar/?rev=2531&view=rev Author: dmichelsen Date: 2008-12-11 13:03:11 +0000 (Thu, 11 Dec 2008) Log Message: ----------- mGAR v2: Runpath now optional with NORUNPATH=1 Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2008-12-11 11:54:08 UTC (rev 2530) +++ csw/mgar/gar/v2/gar.conf.mk 2008-12-11 13:03:11 UTC (rev 2531) @@ -413,9 +413,13 @@ # however not expanded during compilation, so linker-pathes must directly be accessible # without expansion and needs to be differentiated between 32 and 64 bit, therefore # the links 32 and 64. +ifndef NORUNPATH +_ADD_RUNPATH = 1 +endif + ifeq ($(origin LINKER_FLAGS), undefined) ifdef NOISALIST -LINKER_FLAGS = $(foreach ELIB,$(libdir_install) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR)) -R$(abspath $(ELIB)/$(MM_LIBDIR))) +LINKER_FLAGS = $(foreach ELIB,$(libdir_install) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR))$(if $(_ADD_RUNPATH), -R$(abspath $(ELIB)/$(MM_LIBDIR)))) else # If we use $ISALIST it is a good idea to also add $MM_LIBDIR as there # may not be a subdirectory for the 32-bit standard case (this would normally @@ -424,9 +428,15 @@ # The quoting of $ISALIST is unfortunately dependend on how often the linker flags # are expanded until execution. The definition here is suitable for autotools. # For other buildtools it may be suitable to add definitions with other quotings. -LINKER_FLAGS = $(foreach ELIB,$(libdir_install) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR)) -R$(ELIB)/\\\\\\\$$\$$ISALIST -R$(abspath $(ELIB)/$(MM_LIBDIR))) +RUNPATHQUOTE ?= 2 +ifeq ($(RUNPATHQUOTE),1) + _Q = \\\$$\$$ +else + _Q = \\\\\\\$$\$$ endif +LINKER_FLAGS = $(foreach ELIB,$(libdir_install) $(EXTRA_LIB),-L$(abspath $(ELIB)/$(MM_LIBDIR))$(if $(_ADD_RUNPATH), -R$(ELIB)/$(_Q)ISALIST -R$(abspath $(ELIB)/$(MM_LIBDIR)))) endif +endif CC_HOME = $($(GARCOMPILER)_CC_HOME) CC = $($(GARCOMPILER)_CC) 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 Dec 11 14:03:46 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Dec 2008 13:03:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[2532] csw/mgar/pkg/readline/trunk/Makefile Message-ID: Revision: 2532 http://gar.svn.sourceforge.net/gar/?rev=2532&view=rev Author: dmichelsen Date: 2008-12-11 13:03:45 +0000 (Thu, 11 Dec 2008) Log Message: ----------- readline: Don't set runpath in shared library Modified Paths: -------------- csw/mgar/pkg/readline/trunk/Makefile Modified: csw/mgar/pkg/readline/trunk/Makefile =================================================================== --- csw/mgar/pkg/readline/trunk/Makefile 2008-12-11 13:03:11 UTC (rev 2531) +++ csw/mgar/pkg/readline/trunk/Makefile 2008-12-11 13:03:45 UTC (rev 2532) @@ -24,6 +24,8 @@ BUILD64 = 1 +NORUNPATH = 1 + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-curses 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 Dec 11 14:47:58 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Dec 2008 13:47:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[2533] csw/mgar/pkg/msmtp/trunk Message-ID: Revision: 2533 http://gar.svn.sourceforge.net/gar/?rev=2533&view=rev Author: dmichelsen Date: 2008-12-11 13:47:58 +0000 (Thu, 11 Dec 2008) Log Message: ----------- msmtp: Fix copyright location Modified Paths: -------------- csw/mgar/pkg/msmtp/trunk/checksums csw/mgar/pkg/msmtp/trunk/files/CSWmsmtp.gspec Modified: csw/mgar/pkg/msmtp/trunk/checksums =================================================================== --- csw/mgar/pkg/msmtp/trunk/checksums 2008-12-11 13:03:45 UTC (rev 2532) +++ csw/mgar/pkg/msmtp/trunk/checksums 2008-12-11 13:47:58 UTC (rev 2533) @@ -1,2 +1,2 @@ 77a333601e9de03f695539498e678cc2 download/msmtp-1.4.16.tar.bz2 -fe48f4e103c584120b79c5f4c0daed4e download/CSWmsmtp.gspec +42e9683c63a21aeb281bbb72d9e4b527 download/CSWmsmtp.gspec Modified: csw/mgar/pkg/msmtp/trunk/files/CSWmsmtp.gspec =================================================================== --- csw/mgar/pkg/msmtp/trunk/files/CSWmsmtp.gspec 2008-12-11 13:03:45 UTC (rev 2532) +++ csw/mgar/pkg/msmtp/trunk/files/CSWmsmtp.gspec 2008-12-11 13:47:58 UTC (rev 2533) @@ -1,4 +1,4 @@ %var bitname msmtp %var pkgname CSWmsmtp %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING +%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 Thu Dec 11 15:20:51 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Dec 2008 14:20:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[2534] csw/mgar/pkg/libtool/trunk Message-ID: Revision: 2534 http://gar.svn.sourceforge.net/gar/?rev=2534&view=rev Author: dmichelsen Date: 2008-12-11 14:20:51 +0000 (Thu, 11 Dec 2008) Log Message: ----------- libtool: Standardize towards mGAR v2 Modified Paths: -------------- csw/mgar/pkg/libtool/trunk/Makefile csw/mgar/pkg/libtool/trunk/checksums csw/mgar/pkg/libtool/trunk/files/CSWlibtool.gspec csw/mgar/pkg/libtool/trunk/files/CSWlibtoolrt.gspec Modified: csw/mgar/pkg/libtool/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtool/trunk/Makefile 2008-12-11 13:47:58 UTC (rev 2533) +++ csw/mgar/pkg/libtool/trunk/Makefile 2008-12-11 14:20:51 UTC (rev 2534) @@ -1,11 +1,11 @@ -PKGVERSION ?= 2.2.4 -EXTRA_MODULATORS = PKGVERSION -MODULATIONS_PKGVERSION = 1.5.26 2.2.4 GARNAME = libtool -GARVERSION ?=$(PKGVERSION) +GARVERSION = 2.2.4 CATEGORIES = devel -DESCRIPTION = A generic library support tool. +EXTRA_MODULATORS = GARVERSION +MODULATIONS_GARVERSION = 1.5.26 2.2.4 + +DESCRIPTION = A generic library support tool define BLURB GNU libtool is a generic library support script. Libtool hides the complexity of using shared and static libraries behind a consistent, portable interface. @@ -13,51 +13,44 @@ endef MASTER_SITES = $(GNU_MIRROR) -SOURCEFILES = $(foreach VERSION, $(MODULATIONS_PKGVERSION), $(GARNAME)-$(VERSION).tar.gz) +SOURCEFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION), $(GARNAME)-$(VERSION).tar.gz) DISTFILES = $(SOURCEFILES) DISTFILES += $(call admfiles,CSWlibtool) DISTFILES += $(call admfiles,CSWlibtoolrt) -#NOEXTRACT = $(filter-out $(GARNAME)-$(GARVERSION).tar.gz, $(SOURCEFILES)) +SPKG_DESC_CSWlibtool = A generic library support tool +SPKG_DESC_CSWlibtoolrt = A Generic library support tool runtime libraries + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz CONFIGURE_ARGS = $(DIRPATHS) BUILD64 = 1 +NO_ISAEXEC = 1 SKIPTEST = 1 TEST_TARGET = check -MERGE_SCRIPTS_isa-i386-pkgversion-1.5.26 = copy-only -MERGE_DIRS_isa-i386-pkgversion-1.5.26 = $(libdir) -MERGE_SCRIPTS_isa-amd64-pkgversion-1.5.26 = copy-relocated-only -MERGE_DIRS_isa-amd64-pkgversion-1.5.26 = $(libdir) +MERGE_SCRIPTS_isa-i386-garversion-1.5.26 = copy-only +MERGE_DIRS_isa-i386-garversion-1.5.26 = $(libdir) +MERGE_SCRIPTS_isa-amd64-garversion-1.5.26 = copy-relocated-only +MERGE_DIRS_isa-amd64-garversion-1.5.26 = $(libdir) -MERGE_SCRIPTS_isa-i386-pkgversion-2.2.4 = copy-all -MERGE_SCRIPTS_isa-amd64-pkgversion-2.2.4 = copy-relocated-only -MERGE_DIRS_isa-amd64-pkgversion-2.2.4 = $(bindir) $(sbindir) $(libexecdir) $(libdir) +MERGE_SCRIPTS_isa-i386-garversion-2.2.4 = copy-all +MERGE_SCRIPTS_isa-amd64-garversion-2.2.4 = copy-relocated-only +MERGE_DIRS_isa-amd64-garversion-2.2.4 = $(bindir) $(sbindir) $(libexecdir) $(libdir) -MERGE_SCRIPTS_isa-sparcv8-pkgversion-1.5.26 = copy-only -MERGE_DIRS_isa-sparcv8-pkgversion-1.5.26 = $(libdir) -MERGE_SCRIPTS_isa-sparcv9-pkgversion-1.5.26 = copy-relocated-only -MERGE_DIRS_isa-sparcv9-pkgversion-1.5.26 = $(libdir) +MERGE_SCRIPTS_isa-sparcv8-garversion-1.5.26 = copy-only +MERGE_DIRS_isa-sparcv8-garversion-1.5.26 = $(libdir) +MERGE_SCRIPTS_isa-sparcv9-garversion-1.5.26 = copy-relocated-only +MERGE_DIRS_isa-sparcv9-garversion-1.5.26 = $(libdir) -MERGE_SCRIPTS_isa-sparcv8-pkgversion-2.2.4 = copy-all -MERGE_SCRIPTS_isa-sparcv9-pkgversion-2.2.4 = copy-relocated-only -MERGE_DIRS_isa-sparcv9-pkgversion-2.2.4 = $(bindir) $(sbindir) $(libexecdir) $(libdir) +MERGE_SCRIPTS_isa-sparcv8-garversion-2.2.4 = copy-all +MERGE_SCRIPTS_isa-sparcv9-garversion-2.2.4 = copy-relocated-only +MERGE_DIRS_isa-sparcv9-garversion-2.2.4 = $(bindir) $(sbindir) $(libexecdir) $(libdir) -# Move runtime stuff to CSWlibtoolrt and put the rest in CSWlibtool -PKGFILES_CSWlibtoolrt_EXCLUSIVE = $(PKGFILES_RT) +PKGFILES_CSWlibtoolrt = $(PKGFILES_RT) include gar/category.mk -#pre-package: -# @(for VERSION in $(OLD_VERSIONS); do gmake GARVERSION=$$VERSION install; done) -# @$(MAKECOOKIE) - -post-install: - @echo " ==> Fixing install anomalies" - @rm -f $(DESTDIR)$(prefix)/share/info/dir - @$(MAKECOOKIE) - Modified: csw/mgar/pkg/libtool/trunk/checksums =================================================================== --- csw/mgar/pkg/libtool/trunk/checksums 2008-12-11 13:47:58 UTC (rev 2533) +++ csw/mgar/pkg/libtool/trunk/checksums 2008-12-11 14:20:51 UTC (rev 2534) @@ -1,4 +1,4 @@ aa9c5107f3ec9ef4200eb6556f3b3c29 download/libtool-1.5.26.tar.gz 0b87e84c7aad3b5e979bbe35312fd4c1 download/libtool-2.2.4.tar.gz -f3775e02c6cf24fc34591608d0faafd7 download/CSWlibtool.gspec -782d7a7a7d60533728e6d5ee4477a8f6 download/CSWlibtoolrt.gspec +c8c05c4657da45bd2a70c0f1ed9b8ae5 download/CSWlibtool.gspec +66e02987d097403a1662be5af0800a25 download/CSWlibtoolrt.gspec Modified: csw/mgar/pkg/libtool/trunk/files/CSWlibtool.gspec =================================================================== --- csw/mgar/pkg/libtool/trunk/files/CSWlibtool.gspec 2008-12-11 13:47:58 UTC (rev 2533) +++ csw/mgar/pkg/libtool/trunk/files/CSWlibtool.gspec 2008-12-11 14:20:51 UTC (rev 2534) @@ -1,4 +1,4 @@ %var bitname libtool %var pkgname CSWlibtool %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING +%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Modified: csw/mgar/pkg/libtool/trunk/files/CSWlibtoolrt.gspec =================================================================== --- csw/mgar/pkg/libtool/trunk/files/CSWlibtoolrt.gspec 2008-12-11 13:47:58 UTC (rev 2533) +++ csw/mgar/pkg/libtool/trunk/files/CSWlibtoolrt.gspec 2008-12-11 14:20:51 UTC (rev 2534) @@ -1,5 +1,4 @@ %var bitname libtool_rt %var pkgname CSWlibtoolrt -%var desc Generic library support runtime libraries %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING +%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 Thu Dec 11 15:28:08 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Dec 2008 14:28:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[2535] csw/mgar/pkg/pcre/trunk Message-ID: Revision: 2535 http://gar.svn.sourceforge.net/gar/?rev=2535&view=rev Author: dmichelsen Date: 2008-12-11 14:28:08 +0000 (Thu, 11 Dec 2008) Log Message: ----------- pcre: Standardize towards mGAR v2, waiting for 64 bit libbz2 Modified Paths: -------------- csw/mgar/pkg/pcre/trunk/Makefile csw/mgar/pkg/pcre/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/pcre/trunk/files/CSWpcre.depend csw/mgar/pkg/pcre/trunk/files/CSWpcre.prototype csw/mgar/pkg/pcre/trunk/files/CSWpcrert.depend csw/mgar/pkg/pcre/trunk/files/CSWpcrert.prototype Modified: csw/mgar/pkg/pcre/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcre/trunk/Makefile 2008-12-11 14:20:51 UTC (rev 2534) +++ csw/mgar/pkg/pcre/trunk/Makefile 2008-12-11 14:28:08 UTC (rev 2535) @@ -12,11 +12,16 @@ MASTER_SITES = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWpcrert,depend prototype) -DISTFILES += $(call admfiles,CSWpcre,depend prototype) +DISTFILES += $(call admfiles,CSWpcre) +DISTFILES += $(call admfiles,CSWpcrert) PREREQUISITE_PKGS = CSWgnulinks +REQUIRED_PKGS_CSWpcre = CSWpcrert +REQUIRED_PKGS_CSWpcrert = CSWzlib CSWbzip2 CSWreadline +SPKG_DESC_CSWpcrert = Perl-compatible regular expression tools (runtime) +SPKG_DESC_CSWpcre = Perl-compatible regular expression tools + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/pcre/trunk/checksums =================================================================== --- csw/mgar/pkg/pcre/trunk/checksums 2008-12-11 14:20:51 UTC (rev 2534) +++ csw/mgar/pkg/pcre/trunk/checksums 2008-12-11 14:28:08 UTC (rev 2535) @@ -1,7 +1,3 @@ 32fd7c7863b871d408d730e6ffa4aa71 download/pcre-7.8.tar.gz -fa208f4292d0102dc5e87d81bed54af9 download/CSWpcrert.gspec -b6471d1f8f8b32660529a389fa73bbf3 download/CSWpcrert.depend -99f231131bab4cb4c8dea955c6cd1236 download/CSWpcrert.prototype dc5c2103dbbe39a0ffa06ff14b8760b7 download/CSWpcre.gspec -502d6610700f76b35a673aa1a24dd673 download/CSWpcre.depend -c5508817f6cb38d12faac881d393a8cd download/CSWpcre.prototype +fa208f4292d0102dc5e87d81bed54af9 download/CSWpcrert.gspec Deleted: csw/mgar/pkg/pcre/trunk/files/CSWpcre.depend =================================================================== --- csw/mgar/pkg/pcre/trunk/files/CSWpcre.depend 2008-12-11 14:20:51 UTC (rev 2534) +++ csw/mgar/pkg/pcre/trunk/files/CSWpcre.depend 2008-12-11 14:28:08 UTC (rev 2535) @@ -1,4 +0,0 @@ -P CSWzlib zlib - Zlib Data Compression Library -P CSWbzip2 bzip2 - a high-quality block-sorting file compressor -P CSWreadline readline - library to enable interactive line editing -P CSWpcrert pcre_rt - Perl-compatible regular expression runtime libraries Deleted: csw/mgar/pkg/pcre/trunk/files/CSWpcre.prototype =================================================================== --- csw/mgar/pkg/pcre/trunk/files/CSWpcre.prototype 2008-12-11 14:20:51 UTC (rev 2534) +++ csw/mgar/pkg/pcre/trunk/files/CSWpcre.prototype 2008-12-11 14:28:08 UTC (rev 2535) @@ -1,115 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/pcre-config 0755 root bin -f none /opt/csw/bin/pcregrep 0755 root bin -f none /opt/csw/bin/pcretest 0755 root bin -d none /opt/csw/include 0755 root bin -f none /opt/csw/include/pcre.h 0644 root bin -f none /opt/csw/include/pcre_scanner.h 0644 root bin -f none /opt/csw/include/pcre_stringpiece.h 0644 root bin -f none /opt/csw/include/pcrecpp.h 0644 root bin -f none /opt/csw/include/pcrecpparg.h 0644 root bin -f none /opt/csw/include/pcreposix.h 0644 root bin -d none /opt/csw/lib 0755 root bin -f none /opt/csw/lib/libpcre.a 0644 root bin -f none /opt/csw/lib/libpcre.la 0755 root bin -f none /opt/csw/lib/libpcrecpp.a 0644 root bin -f none /opt/csw/lib/libpcrecpp.la 0755 root bin -f none /opt/csw/lib/libpcreposix.a 0644 root bin -f none /opt/csw/lib/libpcreposix.la 0755 root bin -d none /opt/csw/lib/pkgconfig 0755 root bin -f none /opt/csw/lib/pkgconfig/libpcre.pc 0644 root bin -f none /opt/csw/lib/pkgconfig/libpcrecpp.pc 0644 root bin -d none /opt/csw/share/doc/pcre 0755 root bin -f none /opt/csw/share/doc/pcre/AUTHORS 0644 root bin -f none /opt/csw/share/doc/pcre/COPYING 0644 root bin -f none /opt/csw/share/doc/pcre/ChangeLog 0644 root bin -f none /opt/csw/share/doc/pcre/LICENCE 0644 root bin -f none /opt/csw/share/doc/pcre/NEWS 0644 root bin -f none /opt/csw/share/doc/pcre/README 0644 root bin -d none /opt/csw/share/doc/pcre/html 0755 root bin -f none /opt/csw/share/doc/pcre/html/index.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcre-config.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcre.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcre_compile.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcre_compile2.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcre_config.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcre_copy_named_substring.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcre_copy_substring.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcre_dfa_exec.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcre_exec.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcre_free_substring.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcre_free_substring_list.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcre_fullinfo.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcre_get_named_substring.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcre_get_stringnumber.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcre_get_stringtable_entries.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcre_get_substring.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcre_get_substring_list.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcre_info.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcre_maketables.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcre_refcount.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcre_study.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcre_version.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcreapi.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcrebuild.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcrecallout.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcrecompat.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcrecpp.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcregrep.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcrematching.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcrepartial.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcrepattern.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcreperform.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcreposix.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcreprecompile.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcresample.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcrestack.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcresyntax.html 0644 root bin -f none /opt/csw/share/doc/pcre/html/pcretest.html 0644 root bin -f none /opt/csw/share/doc/pcre/pcre-config.txt 0644 root bin -f none /opt/csw/share/doc/pcre/pcre.txt 0644 root bin -f none /opt/csw/share/doc/pcre/pcregrep.txt 0644 root bin -f none /opt/csw/share/doc/pcre/pcretest.txt 0644 root bin -d none /opt/csw/share/man/man1 0755 root bin -f none /opt/csw/share/man/man1/pcre-config.1 0644 root bin -f none /opt/csw/share/man/man1/pcregrep.1 0644 root bin -f none /opt/csw/share/man/man1/pcretest.1 0644 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/pcre.3 0644 root bin -f none /opt/csw/share/man/man3/pcre_compile.3 0644 root bin -f none /opt/csw/share/man/man3/pcre_compile2.3 0644 root bin -f none /opt/csw/share/man/man3/pcre_config.3 0644 root bin -f none /opt/csw/share/man/man3/pcre_copy_named_substring.3 0644 root bin -f none /opt/csw/share/man/man3/pcre_copy_substring.3 0644 root bin -f none /opt/csw/share/man/man3/pcre_dfa_exec.3 0644 root bin -f none /opt/csw/share/man/man3/pcre_exec.3 0644 root bin -f none /opt/csw/share/man/man3/pcre_free_substring.3 0644 root bin -f none /opt/csw/share/man/man3/pcre_free_substring_list.3 0644 root bin -f none /opt/csw/share/man/man3/pcre_fullinfo.3 0644 root bin -f none /opt/csw/share/man/man3/pcre_get_named_substring.3 0644 root bin -f none /opt/csw/share/man/man3/pcre_get_stringnumber.3 0644 root bin -f none /opt/csw/share/man/man3/pcre_get_stringtable_entries.3 0644 root bin -f none /opt/csw/share/man/man3/pcre_get_substring.3 0644 root bin -f none /opt/csw/share/man/man3/pcre_get_substring_list.3 0644 root bin -f none /opt/csw/share/man/man3/pcre_info.3 0644 root bin -f none /opt/csw/share/man/man3/pcre_maketables.3 0644 root bin -f none /opt/csw/share/man/man3/pcre_refcount.3 0644 root bin -f none /opt/csw/share/man/man3/pcre_study.3 0644 root bin -f none /opt/csw/share/man/man3/pcre_version.3 0644 root bin -f none /opt/csw/share/man/man3/pcreapi.3 0644 root bin -f none /opt/csw/share/man/man3/pcrebuild.3 0644 root bin -f none /opt/csw/share/man/man3/pcrecallout.3 0644 root bin -f none /opt/csw/share/man/man3/pcrecompat.3 0644 root bin -f none /opt/csw/share/man/man3/pcrecpp.3 0644 root bin -f none /opt/csw/share/man/man3/pcrematching.3 0644 root bin -f none /opt/csw/share/man/man3/pcrepartial.3 0644 root bin -f none /opt/csw/share/man/man3/pcrepattern.3 0644 root bin -f none /opt/csw/share/man/man3/pcreperform.3 0644 root bin -f none /opt/csw/share/man/man3/pcreposix.3 0644 root bin -f none /opt/csw/share/man/man3/pcreprecompile.3 0644 root bin -f none /opt/csw/share/man/man3/pcresample.3 0644 root bin -f none /opt/csw/share/man/man3/pcrestack.3 0644 root bin -f none /opt/csw/share/man/man3/pcresyntax.3 0644 root bin -i copyright=CSWpcre.copyright -i depend=CSWpcre.depend -i pkginfo=CSWpcre.pkginfo Deleted: csw/mgar/pkg/pcre/trunk/files/CSWpcrert.depend =================================================================== --- csw/mgar/pkg/pcre/trunk/files/CSWpcrert.depend 2008-12-11 14:20:51 UTC (rev 2534) +++ csw/mgar/pkg/pcre/trunk/files/CSWpcrert.depend 2008-12-11 14:28:08 UTC (rev 2535) @@ -1,3 +0,0 @@ -P CSWzlib zlib - Zlib Data Compression Library -P CSWbzip2 bzip2 - a high-quality block-sorting file compressor -P CSWreadline readline - library to enable interactive line editing Deleted: csw/mgar/pkg/pcre/trunk/files/CSWpcrert.prototype =================================================================== --- csw/mgar/pkg/pcre/trunk/files/CSWpcrert.prototype 2008-12-11 14:20:51 UTC (rev 2534) +++ csw/mgar/pkg/pcre/trunk/files/CSWpcrert.prototype 2008-12-11 14:28:08 UTC (rev 2535) @@ -1,12 +0,0 @@ -f none /opt/csw/lib/libpcre.so.0.0.1 0755 root bin -s none /opt/csw/lib/libpcre.so.0=libpcre.so.0.0.1 -s none /opt/csw/lib/libpcre.so=libpcre.so.0.0.1 -f none /opt/csw/lib/libpcrecpp.so.0.0.0 0755 root bin -s none /opt/csw/lib/libpcrecpp.so.0=libpcrecpp.so.0.0.0 -s none /opt/csw/lib/libpcrecpp.so=libpcrecpp.so.0.0.0 -f none /opt/csw/lib/libpcreposix.so.0.0.0 0755 root bin -s none /opt/csw/lib/libpcreposix.so.0=libpcreposix.so.0.0.0 -s none /opt/csw/lib/libpcreposix.so=libpcreposix.so.0.0.0 -i copyright=CSWpcrert.copyright -i depend=CSWpcrert.depend -i pkginfo=CSWpcrert.pkginfo 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 Dec 11 15:38:29 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Dec 2008 14:38:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[2536] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 2536 http://gar.svn.sourceforge.net/gar/?rev=2536&view=rev Author: dmichelsen Date: 2008-12-11 14:38:29 +0000 (Thu, 11 Dec 2008) Log Message: ----------- mGAR v2: Fix SOSxx_CXX_VERSION Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2008-12-11 14:28:08 UTC (rev 2535) +++ csw/mgar/gar/v2/gar.conf.mk 2008-12-11 14:38:29 UTC (rev 2536) @@ -386,9 +386,9 @@ GCC4_CXX_VERSION = $(shell $(GCC4_CXX) -v 2>&1| ggrep version) SOS11_CC_VERSION = $(shell $(SOS11_CC) -V 2>&1| ggrep cc: | gsed -e 's/cc: //') -SOS11_CXX_VERSION = $(shell $(SOS11_CXX)/bin/CC -V 2>&1| ggrep CC: | gsed -e 's/CC: //') +SOS11_CXX_VERSION = $(shell $(SOS11_CXX) -V 2>&1| ggrep CC: | gsed -e 's/CC: //') SOS12_CC_VERSION = $(shell $(SOS11_CC) -V 2>&1| ggrep cc: | gsed -e 's/cc: //') -SOS12_CXX_VERSION = $(shell $(SOS11_CXX)/bin/CC -V 2>&1| ggrep CC: | gsed -e 's/CC: //') +SOS12_CXX_VERSION = $(shell $(SOS11_CXX) -V 2>&1| ggrep CC: | gsed -e 's/CC: //') CC_VERSION = $($(GARCOMPILER)_CC_VERSION) CXX_VERSION = $($(GARCOMPILER)_CXX_VERSION) 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 Dec 11 15:38:59 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Dec 2008 14:38:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[2537] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 2537 http://gar.svn.sourceforge.net/gar/?rev=2537&view=rev Author: dmichelsen Date: 2008-12-11 14:38:59 +0000 (Thu, 11 Dec 2008) Log Message: ----------- mGAR v2: Make all package variables overwritable per package Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2008-12-11 14:38:29 UTC (rev 2536) +++ csw/mgar/gar/v2/gar.pkg.mk 2008-12-11 14:38:59 UTC (rev 2537) @@ -82,8 +82,9 @@ PKG_EXPORTS += SPKG_OSNAME SPKG_SOURCEURL SPKG_PACKAGER TIMESTAMP PKG_EXPORTS += DEPMAKER_EXTRA_ARGS PKGLIB DESTDIR -PKG_ENV = $(BUILD_ENV) -PKG_ENV += $(foreach EXP,$(PKG_EXPORTS),$(EXP)="$($(EXP))") +define _PKG_ENV +$(BUILD_ENV) $(foreach EXP,$(PKG_EXPORTS),$(EXP)="$(if $($(EXP)_$1),$($(EXP)_$1),$($(EXP)))") +endef # Canned command for generating admin file names # Usage: $(call admfiles,SUNWpackage,depend copyright) @@ -217,7 +218,7 @@ package-%: $(WORKDIR)/%.prototype-$(GARCH) $(WORKDIR)/%.depend @echo " ==> Processing $*.gspec" - @( $(PKG_ENV) mkpackage --spec $(WORKDIR)/$*.gspec \ + @( $(call _PKG_ENV,$*) mkpackage --spec $(WORKDIR)/$*.gspec \ --spooldir $(SPKG_SPOOLDIR) \ --destdir $(SPKG_EXPORT) \ --workdir $(SPKG_WORKDIR) \ @@ -237,7 +238,7 @@ pkgcheck-%: @echo " ==> Checking compliance: $*" - @( checkpkg $(SPKG_EXPORT)/`$(PKG_ENV) mkpackage -qs $(WORKDIR)/$*.gspec -D pkgfile`.gz ) || exit 2 + @( checkpkg $(SPKG_EXPORT)/`$(call _PKG_ENV,$1) mkpackage -qs $(WORKDIR)/$*.gspec -D pkgfile`.gz ) || exit 2 pkgcheck-p: @$(foreach COOKIEFILE,$(PKGCHECK_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;) @@ -269,7 +270,7 @@ # pkgenv - dump the packaging environment # pkgenv: - @$(PKG_ENV) env + @$(foreach SPEC,$(_PKG_SPECS),echo "$(SPEC)";echo;$(call _PKG_ENV,$(SPEC)) env;) # pkglist - list the packages to be built with GAR pathname, catalog name and package name This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Dec 11 16:33:52 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 11 Dec 2008 15:33:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[2538] csw/mgar/pkg/clamav/trunk Message-ID: Revision: 2538 http://gar.svn.sourceforge.net/gar/?rev=2538&view=rev Author: bonivart Date: 2008-12-11 15:33:52 +0000 (Thu, 11 Dec 2008) Log Message: ----------- clamav: must use -xO2 to build on i386, fixed license file, ready for testing Modified Paths: -------------- csw/mgar/pkg/clamav/trunk/Makefile csw/mgar/pkg/clamav/trunk/checksums Modified: csw/mgar/pkg/clamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamav/trunk/Makefile 2008-12-11 14:38:59 UTC (rev 2537) +++ csw/mgar/pkg/clamav/trunk/Makefile 2008-12-11 15:33:52 UTC (rev 2538) @@ -33,6 +33,8 @@ SPKG_CLASSES = none cswcpsampleconf cswinitsmf +CFLAGS=-xO2 + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-clamav CONFIGURE_ARGS += --enable-milter @@ -44,6 +46,7 @@ PKGFILES_CSWlibclamav = $(libdir)/.* PKGFILES_CSWlibclamav += $(includedir)/.* +PKGFILES_CSWlibclamav += $(docdir)/libclamav/.* PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswclamd$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/init.d\/cswclamav-milter$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/clamd.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } $$$$3 ~ /\/freshclam.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } $$$$3 ~ /\/var\/opt\/csw\/clamav/ { $$$$5 = "clamav" } { print }' Modified: csw/mgar/pkg/clamav/trunk/checksums =================================================================== --- csw/mgar/pkg/clamav/trunk/checksums 2008-12-11 14:38:59 UTC (rev 2537) +++ csw/mgar/pkg/clamav/trunk/checksums 2008-12-11 15:33:52 UTC (rev 2538) @@ -2,5 +2,4 @@ dbb021404195c40d44dd61e9b0206634 download/CSWclamav.gspec 265f727008d1645114839cdbd9399be6 download/CSWclamav.checkinstall 03e2a2aaf95b2cd8497ad6742b9fbb46 download/CSWclamav.preinstall -574e50c4c06f22c928e1a48783490e26 download/CSWclamav.postinstall 8f6b719b38608d0f08ced7e556461c12 download/CSWlibclamav.gspec 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 Dec 11 16:34:10 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Dec 2008 15:34:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[2539] csw/mgar/pkg/qt4/trunk/Makefile Message-ID: Revision: 2539 http://gar.svn.sourceforge.net/gar/?rev=2539&view=rev Author: dmichelsen Date: 2008-12-11 15:34:10 +0000 (Thu, 11 Dec 2008) Log Message: ----------- qt4: First commit towards mGAR v2 Modified Paths: -------------- csw/mgar/pkg/qt4/trunk/Makefile Modified: csw/mgar/pkg/qt4/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4/trunk/Makefile 2008-12-11 15:33:52 UTC (rev 2538) +++ csw/mgar/pkg/qt4/trunk/Makefile 2008-12-11 15:34:10 UTC (rev 2539) @@ -9,30 +9,6 @@ http://doc.trolltech.com/4.3/qt4-intro.html for details. endef -sparc_ARCH = sparc -i386_ARCH = i386 -sparc_ARCH64 = sparcv9 -i386_ARCH64 = amd64 - -ARCH=$($(GARCH)_ARCH) -ARCH64=$($(GARCH)_ARCH64) - -ifndef DO64 -PLATFORM=solaris-cc -else -PLATFORM=solaris-cc-64 -endif - -ifdef ISA -ISALIST = $(ISA) -else -ifndef DO64 -ISA = $(ARCH) -else -ISA = $(ARCH64) -endif -endif - MASTER_SITES = ftp://ftp.trolltech.com/qt/source/ DISTFILES = qt-x11-opensource-src-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWqt4,depend prototype-sparc prototype-i386) @@ -42,28 +18,16 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = qt-x11-opensource-src-(\d+(?:\.\d+)*).tar.gz -WORKDIR = $(WORKROOTDIR)/$(DESTIMG).d/$(PLATFORM) -COOKIEROOTDIR = cookies.$(PLATFORM) +ifndef DO64 +PLATFORM=solaris-cc +else +PLATFORM=solaris-cc-64 +endif WORKSRC = $(WORKDIR)/qt-x11-opensource-src-$(GARVERSION) PREREQUISITE_PKGS = CSWpkgconfig CSWfconfig CSWlibdbusdev -# Usually the pathes from already installed stuff at $DESTDIR is -# used before regular installed stuff. This leads to include errors -# if we already have a qt4 installed at $DESTDIR. -IGNORE_DESTDIR = 1 - -ifdef DO64 - bindir = $(exec_prefix)/bin/sparcv9 - libdir = $(exec_prefix)/lib/sparcv9 - docdir = $(prefix)/ignore/doc - includedir = $(prefix)/ignore/include - datadir = $(prefix)/ignore/data - sharedstatedir = $(prefix)/ignore/share - etcdir = $(prefix)/ignore/etc -endif - CONFIGURE_ARGS = -prefix $(prefix) \ -bindir $(bindir) \ -libdir $(libdir) \ @@ -81,82 +45,36 @@ -confirm-license \ -verbose -SKIPTEST = 1 +# SKIPTEST = 1 INSTALL_ENV += INSTALL_ROOT=$(DESTDIR) SRC_CLEAN_TARGET = confclean -ifndef DO64 -CLEAN_SCRIPTS = all custom -endif - include gar/category.mk -OPTARCH_sparc = v8 -OPTARCH_sparcv9 = v9 -OPTARCH_i386 = 386 -OPTARCH_amd64 = amd64 -OPTARCH = $(OPTARCH_$(ISA)) - -ifdef DO64 - # Do not use -xO3 as -xO2 is already set in the Makefile - SUN_CC_OPT = -xarch=$(OPTARCH) -xspace -xildoff - SUN_CXX_OPT = -xarch=$(OPTARCH) -xspace -xildoff - - # Do not include -I/-L here. These flags must be defined after - # local QT4 includes and need to be defined during configure. - CFLAGS = $($(GARCOMPILER)_CC_$(GARFLAVOR)) - CPPFLAGS = $($(GARCOMPILER)_CPP_FLAGS) - # -D_POSIX_PTHREAD_SEMANTICS needed, because getpwuid_r is used in the 4-arg-version - # (see getpwuid_r(3c) for details) - CXXFLAGS = $($(GARCOMPILER)_CXX_$(GARFLAVOR)) -D_POSIX_PTHREAD_SEMANTICS - LDFLAGS = $($(GARCOMPILER)_LD_FLAGS) $($(GARCOMPILER)_LD_$(GARFLAVOR)) -else - # Do not use -xO3 as -xO2 is already set in the Makefile - SUN_CC_OPT = -xarch=$(OPTARCH) -xspace -xildoff - SUN_CXX_OPT = -xarch=$(OPTARCH) -xspace -xildoff - - # Do not include -I/-L here. These flags must be defined after - # local QT4 includes and need to be defined during configure. - CFLAGS = $($(GARCOMPILER)_CC_$(GARFLAVOR)) - CPPFLAGS = $($(GARCOMPILER)_CPP_FLAGS) - CXXFLAGS = $($(GARCOMPILER)_CXX_$(GARFLAVOR)) - LDFLAGS = $($(GARCOMPILER)_LD_FLAGS) $($(GARCOMPILER)_LD_$(GARFLAVOR)) -endif - -pre-build: - @echo "ISA: $(ISA)" - @echo "XC: $(GARCOMPILER)_CC_$(GARFLAVOR)" - @echo "XC: $($(GARCOMPILER)_CC_$(GARFLAVOR))" - @echo "CFLAGS: $(CFLAGS)" - -build64: - @echo " ==> Building 64 bit version" - gmake DO64=1 build - -install64: build64 - @echo " ==> Installing 64 bit version" - gmake DO64=1 install - -pre-package: install64 - -pre-install: - @echo " ==> Install environment:" - @echo " bindir: $(bindir)" - @echo " libdir: $(libdir)" - @/usr/bin/env - -clean64: - gmake DO64=1 clean - -clean-custom: clean64 - -env: - @echo " GARCH = $(GARCH)" - @echo " GARVERSION = $(GARVERSION)" - @echo " ISA = $(ISA)" - @echo " CFLAGS = $(CFLAGS)" - @echo " OPTARCH = $(OPTARCH)" - @echo " OPTARCH_ISA = $(OPTARCH_$(ISA))" - @echo "CLEAN TARGETS = $(CLEAN_TARGETS)" +#ifdef DO64 +# # Do not use -xO3 as -xO2 is already set in the Makefile +# SUN_CC_OPT = -xarch=$(OPTARCH) -xspace -xildoff +# SUN_CXX_OPT = -xarch=$(OPTARCH) -xspace -xildoff +# +# # Do not include -I/-L here. These flags must be defined after +# # local QT4 includes and need to be defined during configure. +# CFLAGS = $($(GARCOMPILER)_CC_$(GARFLAVOR)) +# CPPFLAGS = $($(GARCOMPILER)_CPP_FLAGS) +# # -D_POSIX_PTHREAD_SEMANTICS needed, because getpwuid_r is used in the 4-arg-version +# # (see getpwuid_r(3c) for details) +# CXXFLAGS = $($(GARCOMPILER)_CXX_$(GARFLAVOR)) -D_POSIX_PTHREAD_SEMANTICS +# LDFLAGS = $($(GARCOMPILER)_LD_FLAGS) $($(GARCOMPILER)_LD_$(GARFLAVOR)) +#else +# # Do not use -xO3 as -xO2 is already set in the Makefile +# SUN_CC_OPT = -xarch=$(OPTARCH) -xspace -xildoff +# SUN_CXX_OPT = -xarch=$(OPTARCH) -xspace -xildoff +# +# # Do not include -I/-L here. These flags must be defined after +# # local QT4 includes and need to be defined during configure. +# CFLAGS = $($(GARCOMPILER)_CC_$(GARFLAVOR)) +# CPPFLAGS = $($(GARCOMPILER)_CPP_FLAGS) +# CXXFLAGS = $($(GARCOMPILER)_CXX_$(GARFLAVOR)) +# LDFLAGS = $($(GARCOMPILER)_LD_FLAGS) $($(GARCOMPILER)_LD_$(GARFLAVOR)) +#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 Thu Dec 11 18:33:40 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 11 Dec 2008 17:33:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[2540] csw/mgar/pkg/xmlto/trunk Message-ID: Revision: 2540 http://gar.svn.sourceforge.net/gar/?rev=2540&view=rev Author: bdwalton Date: 2008-12-11 17:33:39 +0000 (Thu, 11 Dec 2008) Log Message: ----------- commit in prep for building on host with new libxml2 Modified Paths: -------------- csw/mgar/pkg/xmlto/trunk/Makefile csw/mgar/pkg/xmlto/trunk/checksums csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.gspec Added Paths: ----------- csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.depend Modified: csw/mgar/pkg/xmlto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlto/trunk/Makefile 2008-12-11 15:34:10 UTC (rev 2539) +++ csw/mgar/pkg/xmlto/trunk/Makefile 2008-12-11 17:33:39 UTC (rev 2540) @@ -1,18 +1,30 @@ GARNAME = xmlto -GARVERSION = 0.0.20 +GARVERSION = 0.0.21 CATEGORIES = utils -DESCRIPTION = +PREREQUISITES = CSWmktemp CSWfindutils CSWdocbookxsl CSWlibxslt CSWflex + +DESCRIPTION = An XSL toolchain front end. define BLURB +xmlto is a front-end to an XSL toolchain. It chooses an appropriate stylesheet +for the conversion you want and applies it using an external XSL-T processor. +It also performs any necessary post-processing. endef -MASTER_SITES = http://cyberelk.net/tim/data/$(GARNAME)/stable/ +MASTER_SITES = https://fedorahosted.org/$(GARNAME)/export/1/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += $(call admfiles,CSWxmlto) +DISTFILES += $(call admfiles,CSWxmlto,depend) +TEST_ARGS = check + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +pre-configure: + @(cd $(WORKSRC); \ + touch doc/xmlto.xml doc/xmlif.xml ) + @$(MAKECOOKIE) + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-mktemp=/opt/csw/bin/mktemp CONFIGURE_ARGS += --with-find=/opt/csw/bin/gfind Modified: csw/mgar/pkg/xmlto/trunk/checksums =================================================================== --- csw/mgar/pkg/xmlto/trunk/checksums 2008-12-11 15:34:10 UTC (rev 2539) +++ csw/mgar/pkg/xmlto/trunk/checksums 2008-12-11 17:33:39 UTC (rev 2540) @@ -1,2 +1,3 @@ -ab814ae352fc028862cbea9d676ab93b download/xmlto-0.0.20.tar.bz2 -a93561a21c4b94bf0b53dd2bfeb876bc download/CSWxmlto.gspec +cc2039dedc81f1a56b06e5fdac6f7570 download/xmlto-0.0.21.tar.bz2 +07a55001f7ff0b35e22d45772ff66a57 download/CSWxmlto.gspec +492cea1bbf25f9ab97f43582e6bd429a download/CSWxmlto.depend Added: csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.depend =================================================================== --- csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.depend (rev 0) +++ csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.depend 2008-12-11 17:33:39 UTC (rev 2540) @@ -0,0 +1,12 @@ +P CSWcommon common - common files and dirs for CSW packages +P CSWsgmlcommon sgmlcommon - A collection of entities and DTDs +P CSWxmlcommon xmlcommon - A collection of entities and DTDs +P CSWlibxml2 libxml2 - A library providing XML and HTML support +P CSWdocbookdtds docbookdtds - SGML and XML document type definitions for DocBook. +P CSWdocbookxsl docbookxsl - Norman Walsh's XSL stylesheets for DocBook XML. +P CSWlibxslt libxslt - XSLT engine for the XML Toolkit +P CSWflex flex - A tool for generating text-scanning programs. +P CSWw3m w3m - Text-based web browser + + + Modified: csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.gspec =================================================================== --- csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.gspec 2008-12-11 15:34:10 UTC (rev 2539) +++ csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.gspec 2008-12-11 17:33:39 UTC (rev 2540) @@ -1,5 +1,4 @@ %var bitname xmlto %var pkgname CSWxmlto -%var arch all %include url file://%{PKGLIB}/csw_dyndepend.gspec %copyright url file://%{WORKSRC}/COPYRIGHT This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From william at wbonnet.net Thu Dec 11 19:08:34 2008 From: william at wbonnet.net (William Bonnet) Date: Thu, 11 Dec 2008 19:08:34 +0100 Subject: [csw-devel] Moving informations out of the .gspec file Message-ID: <49415722.4010709@wbonnet.net> Hi Dago, I believe you told me you have been working on a version of mgar which allow to move some information out of the .gspec file and put these into Makefile. Did i understood well ? :) If yes, it would help me for upstream watch. I am currently facing the a problem which is not blocking, but which would be solved in an elegant way by doing this. My problem is that same packages have a GARNAME differemnt from the package name. So it is not easy to make the link using only information from Makefile. Cheers -- William http://www.wbonnet.net http://www.sunwizard.net Le site fran?ais des amateurs de stations Unix http://www.blastwave.org An OpenSolaris Community Site http://www.opencsw.org Community SoftWare for Solaris http://www.guses.org French speaking Solaris User Group From wbonnet at users.sourceforge.net Thu Dec 11 21:03:54 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 11 Dec 2008 20:03:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[2541] csw/mgar/pkg/atk/trunk/Makefile Message-ID: Revision: 2541 http://gar.svn.sourceforge.net/gar/?rev=2541&view=rev Author: wbonnet Date: 2008-12-11 20:03:54 +0000 (Thu, 11 Dec 2008) Log Message: ----------- Regexp modified to detect Path This test is not 100% accurate since the url match a pattern upstream watch does not actually handle Warning : this Makefile is incomplete and package is not produced Modified Paths: -------------- csw/mgar/pkg/atk/trunk/Makefile Modified: csw/mgar/pkg/atk/trunk/Makefile =================================================================== --- csw/mgar/pkg/atk/trunk/Makefile 2008-12-11 17:33:39 UTC (rev 2540) +++ csw/mgar/pkg/atk/trunk/Makefile 2008-12-11 20:03:54 UTC (rev 2541) @@ -11,11 +11,12 @@ utilize all of the functionality of the GNOME user environment. endef -MASTER_SITES = http://ftp.gnome.org/pub/gnome/sources/atk/1.6/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +# UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +UFILES_REGEX = (\d+(?:\.\d+)*) +MASTER_SITES = http://ftp.gnome.org/pub/gnome/sources/atk/ LIBDEPS += lib/glib2 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 Dec 11 21:24:10 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Dec 2008 20:24:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[2542] csw/mgar/gar/v1/gar.lib.mk Message-ID: Revision: 2542 http://gar.svn.sourceforge.net/gar/?rev=2542&view=rev Author: dmichelsen Date: 2008-12-11 20:24:10 +0000 (Thu, 11 Dec 2008) Log Message: ----------- mGAR v1: Add https target and WGET_OPTS Modified Paths: -------------- csw/mgar/gar/v1/gar.lib.mk Modified: csw/mgar/gar/v1/gar.lib.mk =================================================================== --- csw/mgar/gar/v1/gar.lib.mk 2008-12-11 20:03:54 UTC (rev 2541) +++ csw/mgar/gar/v1/gar.lib.mk 2008-12-11 20:24:10 UTC (rev 2542) @@ -41,13 +41,16 @@ # download an http URL (colons omitted) http//%: - @wget -T 10 -c -P $(PARTIALDIR) http://$* + @wget $(WGET_OPTS) -T 10 -c -P $(PARTIALDIR) http://$* +https//%: + @wget $(WGET_OPTS) -T 10 -c -P $(PARTIALDIR) https://$* + # download an ftp URL (colons omitted) #ftp//%: # @wget -T 10 -c --passive-ftp -P $(PARTIALDIR) ftp://$* ftp//%: - @wget -T 10 -c -P $(PARTIALDIR) ftp://$* + @wget $(WGET_OPTS) -T 10 -c -P $(PARTIALDIR) ftp://$* # link to a local copy of the file # (absolute path) @@ -80,6 +83,9 @@ svn-http//%: @svn co $(SVNHTTP_CO_ARGS) http://$* $(PARTIALDIR)/$(notdir $*) +svn-https//%: + @svn co $(SVNHTTP_CO_ARGS) https://$* $(PARTIALDIR)/$(notdir $*) + #################### CHECKSUM RULES #################### # check a given file's checksum against $(CHECKSUM_FILE) and 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 Dec 11 21:25:28 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Dec 2008 20:25:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[2543] csw/mgar/gar/v2/gar.lib.mk Message-ID: Revision: 2543 http://gar.svn.sourceforge.net/gar/?rev=2543&view=rev Author: dmichelsen Date: 2008-12-11 20:25:26 +0000 (Thu, 11 Dec 2008) Log Message: ----------- mGAR v2: Merge [2542] from mGAR v1 Modified Paths: -------------- csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2008-12-11 20:24:10 UTC (rev 2542) +++ csw/mgar/gar/v2/gar.lib.mk 2008-12-11 20:25:26 UTC (rev 2543) @@ -41,13 +41,16 @@ # download an http URL (colons omitted) http//%: - @wget -T 10 -c -P $(PARTIALDIR) http://$* + @wget $(WGET_OPTS) -T 10 -c -P $(PARTIALDIR) http://$* +https//%: + @wget $(WGET_OPTS) -T 10 -c -P $(PARTIALDIR) https://$* + # download an ftp URL (colons omitted) #ftp//%: # @wget -T 10 -c --passive-ftp -P $(PARTIALDIR) ftp://$* ftp//%: - @wget -T 10 -c -P $(PARTIALDIR) ftp://$* + @wget $(WGET_OPTS) -T 10 -c -P $(PARTIALDIR) ftp://$* # link to a local copy of the file # (absolute path) @@ -80,6 +83,9 @@ svn-http//%: @svn co $(SVNHTTP_CO_ARGS) http://$* $(PARTIALDIR)/$(notdir $*) +svn-https//%: + @svn co $(SVNHTTP_CO_ARGS) https://$* $(PARTIALDIR)/$(notdir $*) + #################### CHECKSUM RULES #################### # check a given file's checksum against $(CHECKSUM_FILE) and 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 Dec 11 22:01:39 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Dec 2008 21:01:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[2544] csw/mgar/gar Message-ID: Revision: 2544 http://gar.svn.sourceforge.net/gar/?rev=2544&view=rev Author: dmichelsen Date: 2008-12-11 21:01:38 +0000 (Thu, 11 Dec 2008) Log Message: ----------- mGAR v1/v2: Adjust pkglist to be useful Modified Paths: -------------- csw/mgar/gar/v1/gar.pkg.mk csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v1/gar.pkg.mk =================================================================== --- csw/mgar/gar/v1/gar.pkg.mk 2008-12-11 20:25:26 UTC (rev 2543) +++ csw/mgar/gar/v1/gar.pkg.mk 2008-12-11 21:01:38 UTC (rev 2544) @@ -193,11 +193,10 @@ endef define _pkglist_one -$(shell /usr/bin/echo "$(patsubst $(realpath $(shell pwd)/$(GARDIR))/%,%,$(realpath .))\t$(call _pkglist_catalogname,$(1))\t$(call _pkglist_pkgname,$(1))") +$(shell /usr/bin/echo "$(shell pwd)\t$(call _pkglist_catalogname,$(1))\t$(call _pkglist_pkgname,$(1))") endef pkglist: - @echo "G: $(GARDIR) - $(shell pwd) - $(realpath $(shell pwd)/$(GARDIR)) - $(realpath .)" @$(foreach SPEC,$(SPKG_SPECS),echo "$(call _pkglist_one,$(SPEC))";) srcpack: Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2008-12-11 20:25:26 UTC (rev 2543) +++ csw/mgar/gar/v2/gar.pkg.mk 2008-12-11 21:01:38 UTC (rev 2544) @@ -285,9 +285,8 @@ endef define _pkglist_one -$(shell /usr/bin/echo "$(patsubst $(realpath $(shell pwd)/$(GARDIR))/%,%,$(realpath .))\t$(call _pkglist_catalogname,$(1))\t$(call _pkglist_pkgname,$(1))") +$(shell /usr/bin/echo "$(shell pwd)\t$(call _pkglist_catalogname,$(1))\t$(call _pkglist_pkgname,$(1))") endef pkglist: - @echo "G: $(GARDIR) - $(shell pwd) - $(realpath $(shell pwd)/$(GARDIR)) - $(realpath .)" @$(foreach SPEC,$(SPKG_SPECS),echo "$(call _pkglist_one,$(SPEC))";) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Thu Dec 11 22:02:26 2008 From: dam at opencsw.org (Dagobert Michelsen) Date: Thu, 11 Dec 2008 22:02:26 +0100 Subject: [csw-devel] Moving informations out of the .gspec file In-Reply-To: <49415722.4010709@wbonnet.net> References: <49415722.4010709@wbonnet.net> Message-ID: <5A4C2AED-2293-4C61-B45A-721A316BD097@opencsw.org> Hi William, Am 11.12.2008 um 19:08 schrieb William Bonnet: > I believe you told me you have been working on a version of mgar which > allow to move some information out of the .gspec file and put these > into > Makefile. Did i understood well ? :) If yes, it would help me for > upstream watch. I am currently facing the a problem which is not > blocking, but which would be solved in an elegant way by doing this. I hacked together gmake pkglist which prints " - - " Feel free to adjust it to be useful to you. > My problem is that same packages have a GARNAME differemnt from the > package name. So it is not easy to make the link using only > information > from Makefile. This is not solvable as a directory in GAR may result in multiple packages. Best regards -- Dago From bdwalton at users.sourceforge.net Thu Dec 11 22:06:06 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 11 Dec 2008 21:06:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[2545] csw/mgar/pkg/xmlto/trunk Message-ID: Revision: 2545 http://gar.svn.sourceforge.net/gar/?rev=2545&view=rev Author: bdwalton Date: 2008-12-11 21:06:06 +0000 (Thu, 11 Dec 2008) Log Message: ----------- first working build of xmlto Modified Paths: -------------- csw/mgar/pkg/xmlto/trunk/Makefile csw/mgar/pkg/xmlto/trunk/checksums csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.gspec Modified: csw/mgar/pkg/xmlto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlto/trunk/Makefile 2008-12-11 21:01:38 UTC (rev 2544) +++ csw/mgar/pkg/xmlto/trunk/Makefile 2008-12-11 21:06:06 UTC (rev 2545) @@ -2,7 +2,7 @@ GARVERSION = 0.0.21 CATEGORIES = utils -PREREQUISITES = CSWmktemp CSWfindutils CSWdocbookxsl CSWlibxslt CSWflex +PREREQUISITE_PKGS = CSWmktemp CSWfindutils CSWdocbookxsl CSWlibxslt CSWflex DESCRIPTION = An XSL toolchain front end. define BLURB @@ -15,11 +15,16 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWxmlto,depend) -TEST_ARGS = check +TEST_TARGET = check # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +GARCOMPILER = GNU + +# this ssl site has a cert we don't recognize +WGET_OPTS = --no-check-certificate + pre-configure: @(cd $(WORKSRC); \ touch doc/xmlto.xml doc/xmlif.xml ) @@ -35,3 +40,9 @@ # We need this for 'tail -n' PATH := /usr/xpg4/bin:/opt/csw/bin:$(PATH) + +#reset XML_CATALOG lookup (we rely on having packages that provide stylesheets +#etc). Having xsltproc not find them during build makes us blow up!! +XML_CATALOG_FILES = /opt/csw/etc/xml/catalog + + Modified: csw/mgar/pkg/xmlto/trunk/checksums =================================================================== --- csw/mgar/pkg/xmlto/trunk/checksums 2008-12-11 21:01:38 UTC (rev 2544) +++ csw/mgar/pkg/xmlto/trunk/checksums 2008-12-11 21:06:06 UTC (rev 2545) @@ -1,3 +1,3 @@ cc2039dedc81f1a56b06e5fdac6f7570 download/xmlto-0.0.21.tar.bz2 -07a55001f7ff0b35e22d45772ff66a57 download/CSWxmlto.gspec +3f51dd8ed4ca7795397702250254a6fb download/CSWxmlto.gspec 492cea1bbf25f9ab97f43582e6bd429a download/CSWxmlto.depend Modified: csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.gspec =================================================================== --- csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.gspec 2008-12-11 21:01:38 UTC (rev 2544) +++ csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.gspec 2008-12-11 21:06:06 UTC (rev 2545) @@ -1,4 +1,4 @@ %var bitname xmlto %var pkgname CSWxmlto %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYRIGHT +%copyright url file://%{WORKSRC}/COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Dec 11 22:08:05 2008 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 11 Dec 2008 21:08:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[2546] csw/mgar/pkg/synergy/trunk/Makefile Message-ID: Revision: 2546 http://gar.svn.sourceforge.net/gar/?rev=2546&view=rev Author: skayser Date: 2008-12-11 21:08:05 +0000 (Thu, 11 Dec 2008) Log Message: ----------- synergy: added SPKG_SOURCEURL Modified Paths: -------------- csw/mgar/pkg/synergy/trunk/Makefile Modified: csw/mgar/pkg/synergy/trunk/Makefile =================================================================== --- csw/mgar/pkg/synergy/trunk/Makefile 2008-12-11 21:06:06 UTC (rev 2545) +++ csw/mgar/pkg/synergy/trunk/Makefile 2008-12-11 21:08:05 UTC (rev 2546) @@ -10,6 +10,8 @@ on their desk since each system uses its own monitor(s). endef +SPKG_SOURCEURL = http://synergy2.sourceforge.net/ + MASTER_SITES = $(SF_MIRRORS) SF_PROJ = $(GARNAME)2 DISTFILES = synergy-$(GARVERSION).tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From william at wbonnet.net Thu Dec 11 21:09:37 2008 From: william at wbonnet.net (William Bonnet) Date: Thu, 11 Dec 2008 21:09:37 +0100 Subject: [csw-devel] Moving informations out of the .gspec file In-Reply-To: <5A4C2AED-2293-4C61-B45A-721A316BD097@opencsw.org> References: <49415722.4010709@wbonnet.net> <5A4C2AED-2293-4C61-B45A-721A316BD097@opencsw.org> Message-ID: <49417381.4030309@wbonnet.net> Hi Dago > I hacked together > gmake pkglist > which prints " - - " > Feel free to adjust it to be useful to you. > Thanks > This is not solvable as a directory in GAR may result in multiple > packages. > That's what i was affraid of. I did a QaD test. I use the first maintainer found in a files/*.gspec file. I assume if there are several packages in the same files subdir of a given dir, then all these package should have the same maintainer. Sounds not too risky cheers -- William http://www.wbonnet.net http://www.sunwizard.net Le site fran?ais des amateurs de stations Unix http://www.blastwave.org An OpenSolaris Community Site http://www.opencsw.org Community SoftWare for Solaris http://www.guses.org French speaking Solaris User Group From wbonnet at users.sourceforge.net Thu Dec 11 22:15:47 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 11 Dec 2008 21:15:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[2547] csw/mgar/gar Message-ID: Revision: 2547 http://gar.svn.sourceforge.net/gar/?rev=2547&view=rev Author: wbonnet Date: 2008-12-11 21:15:47 +0000 (Thu, 11 Dec 2008) Log Message: ----------- Add detection of invalid email address for maintainer (empty string may happen if package is not yet published) Add detection of the package using a GARNAME different from package name. In such cases, script try to retrive maintainer name from a gspec file Modified Paths: -------------- csw/mgar/gar/v1/bin/mail2maintainer csw/mgar/gar/v1/gar.lib.mk csw/mgar/gar/v2/bin/mail2maintainer Modified: csw/mgar/gar/v1/bin/mail2maintainer =================================================================== --- csw/mgar/gar/v1/bin/mail2maintainer 2008-12-11 21:08:05 UTC (rev 2546) +++ csw/mgar/gar/v1/bin/mail2maintainer 2008-12-11 21:15:47 UTC (rev 2547) @@ -23,8 +23,17 @@ function get_package_maintainer { _PACKAGE="$1" + + # This has to be improved. Maintainer is retrieved from the web page. It will be replaced by a sql query _MAINTAINER="`wget -q http://www.opencsw.org/packages.php/$_PACKAGE -O- | grep Maintainer | sed -e "s,.*/maintainers/\([^\'\\\"]*\).*,\1,g"`" - + + # In case Maintainer string is empty, try to find the maintainer from a gspec file + # It's a bit crappy, but it works in msot cases (but has to be replaced also) + if [ "$_MAINTAINER" -eq "" ] ; then + _PACKAGE="`grep bitname files/*.gspec | awk '{ print $3 }' | head -n 1`" + _MAINTAINER="`wget -q http://www.opencsw.org/packages.php/$_PACKAGE -O- | grep Maintainer | sed -e "s,.*/maintainers/\([^\'\\\"]*\).*,\1,g"`" + fi + echo "$_MAINTAINER" } @@ -62,5 +71,9 @@ shift done -eval mailx $MAIL_OPTIONS -b "william at wbonnet.net" $EMAIL - +if [ ! -n "$MAINTAINER" ] ; then + echo "No valid maintainer for package : $PACKAGE_NAME" + eval mailx "-s" "\"[svn] Invalid maintainer for package $PACKAGE_NAME\"" -b "william at wbonnet.net" uwatch at opencsw.org +else + eval mailx $MAIL_OPTIONS -b "william at wbonnet.net" $EMAIL +fi Modified: csw/mgar/gar/v1/gar.lib.mk =================================================================== --- csw/mgar/gar/v1/gar.lib.mk 2008-12-11 21:08:05 UTC (rev 2546) +++ csw/mgar/gar/v1/gar.lib.mk 2008-12-11 21:15:47 UTC (rev 2547) @@ -191,6 +191,7 @@ else \ if echo $(DISTFILES) | grep -w $$FILE >/dev/null; then \ PACKAGE_UP_TO_DATE=1; \ +echo DISTFILES : $(DISTFILES); \ echo "$(GARNAME) : Package is up-to-date. Current version is $$FILE" ; \ else \ NEW_FILES="$$FILE $$NEW_FILES"; \ @@ -211,6 +212,8 @@ fi; \ fi; \ else \ +echo GNU_MIRROR : $(GNU_MIRROR); \ +echo NEW_FILES : $$NEW_FILES; \ echo "$(GARNAME) : new upstream files available: $$NEW_FILES"; \ fi; \ fi Modified: csw/mgar/gar/v2/bin/mail2maintainer =================================================================== --- csw/mgar/gar/v2/bin/mail2maintainer 2008-12-11 21:08:05 UTC (rev 2546) +++ csw/mgar/gar/v2/bin/mail2maintainer 2008-12-11 21:15:47 UTC (rev 2547) @@ -23,8 +23,17 @@ function get_package_maintainer { _PACKAGE="$1" + + # This has to be improved. Maintainer is retrieved from the web page. It will be replaced by a sql query _MAINTAINER="`wget -q http://www.opencsw.org/packages.php/$_PACKAGE -O- | grep Maintainer | sed -e "s,.*/maintainers/\([^\'\\\"]*\).*,\1,g"`" - + + # In case Maintainer string is empty, try to find the maintainer from a gspec file + # It's a bit crappy, but it works in msot cases (but has to be replaced also) + if [ "$_MAINTAINER" -eq "" ] ; then + _PACKAGE="`grep bitname files/*.gspec | awk '{ print $3 }' | head -n 1`" + _MAINTAINER="`wget -q http://www.opencsw.org/packages.php/$_PACKAGE -O- | grep Maintainer | sed -e "s,.*/maintainers/\([^\'\\\"]*\).*,\1,g"`" + fi + echo "$_MAINTAINER" } @@ -62,5 +71,9 @@ shift done -eval mailx $MAIL_OPTIONS -b "william at wbonnet.net" $EMAIL - +if [ ! -n "$MAINTAINER" ] ; then + echo "No valid maintainer for package : $PACKAGE_NAME" + eval mailx "-s" "\"[svn] Invalid maintainer for package $PACKAGE_NAME\"" -b "william at wbonnet.net" uwatch at opencsw.org +else + eval mailx $MAIL_OPTIONS -b "william at wbonnet.net" $EMAIL +fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 11 23:42:43 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 11 Dec 2008 22:42:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[2548] csw/mgar/gar/v1/gar.lib.mk Message-ID: Revision: 2548 http://gar.svn.sourceforge.net/gar/?rev=2548&view=rev Author: wbonnet Date: 2008-12-11 22:42:43 +0000 (Thu, 11 Dec 2008) Log Message: ----------- Remove extra comments Modified Paths: -------------- csw/mgar/gar/v1/gar.lib.mk Modified: csw/mgar/gar/v1/gar.lib.mk =================================================================== --- csw/mgar/gar/v1/gar.lib.mk 2008-12-11 21:15:47 UTC (rev 2547) +++ csw/mgar/gar/v1/gar.lib.mk 2008-12-11 22:42:43 UTC (rev 2548) @@ -149,7 +149,7 @@ # echo ""; \ # echo "--"; \ # echo "Kindest regards"; \ -# echo "The upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ +# echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ else \ if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ echo "$(GARNAME) : Warning no files to check ! $(FILES2CHECK)" ; \ @@ -176,7 +176,8 @@ echo ""; \ echo "--"; \ echo "Kindest regards"; \ - echo "The upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ + echo "upstream notification job"; } ; \ +# echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ fi; \ fi @@ -212,8 +213,6 @@ fi; \ fi; \ else \ -echo GNU_MIRROR : $(GNU_MIRROR); \ -echo NEW_FILES : $$NEW_FILES; \ echo "$(GARNAME) : new upstream files available: $$NEW_FILES"; \ fi; \ fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 11 23:46:04 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 11 Dec 2008 22:46:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[2549] csw/mgar/gar/v1/gar.lib.mk Message-ID: Revision: 2549 http://gar.svn.sourceforge.net/gar/?rev=2549&view=rev Author: wbonnet Date: 2008-12-11 22:46:03 +0000 (Thu, 11 Dec 2008) Log Message: ----------- Modify email text Modified Paths: -------------- csw/mgar/gar/v1/gar.lib.mk Modified: csw/mgar/gar/v1/gar.lib.mk =================================================================== --- csw/mgar/gar/v1/gar.lib.mk 2008-12-11 22:42:43 UTC (rev 2548) +++ csw/mgar/gar/v1/gar.lib.mk 2008-12-11 22:46:03 UTC (rev 2549) @@ -149,7 +149,7 @@ # echo ""; \ # echo "--"; \ # echo "Kindest regards"; \ -# echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ +# echo "The upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ else \ if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ echo "$(GARNAME) : Warning no files to check ! $(FILES2CHECK)" ; \ @@ -176,8 +176,7 @@ echo ""; \ echo "--"; \ echo "Kindest regards"; \ - echo "upstream notification job"; } ; \ -# echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ + echo "The upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ fi; \ fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Fri Dec 12 00:02:13 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 11 Dec 2008 23:02:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[2550] csw/mgar/gar Message-ID: Revision: 2550 http://gar.svn.sourceforge.net/gar/?rev=2550&view=rev Author: wbonnet Date: 2008-12-11 23:02:13 +0000 (Thu, 11 Dec 2008) Log Message: ----------- Add detection of path in the the file name to check for updates If a web page contains filenames with directory path, only the filename is kept for comparison. Otherwise cookie cretion fails Modified Paths: -------------- csw/mgar/gar/v1/bin/upstream_watch csw/mgar/gar/v2/bin/upstream_watch Modified: csw/mgar/gar/v1/bin/upstream_watch =================================================================== --- csw/mgar/gar/v1/bin/upstream_watch 2008-12-11 22:46:03 UTC (rev 2549) +++ csw/mgar/gar/v1/bin/upstream_watch 2008-12-11 23:02:13 UTC (rev 2550) @@ -129,8 +129,14 @@ foreach my $url (@urls) { my $file_list = get_file_list ($url); - foreach my $file (@{$file_list}) { + foreach my $file (@{$file_list}) { if ($file =~ /^$file_pattern$/) { + my $char = '/'; + my $result = rindex($file, $char); + if ($result != -1) { + $file = substr $file , $result +1 ; + } + # we only keep the newest file for a given $file_pattern if (compare_versions ($1, $newest_version) > 0) { $newest_version = $1; Modified: csw/mgar/gar/v2/bin/upstream_watch =================================================================== --- csw/mgar/gar/v2/bin/upstream_watch 2008-12-11 22:46:03 UTC (rev 2549) +++ csw/mgar/gar/v2/bin/upstream_watch 2008-12-11 23:02:13 UTC (rev 2550) @@ -129,8 +129,14 @@ foreach my $url (@urls) { my $file_list = get_file_list ($url); - foreach my $file (@{$file_list}) { + foreach my $file (@{$file_list}) { if ($file =~ /^$file_pattern$/) { + my $char = '/'; + my $result = rindex($file, $char); + if ($result != -1) { + $file = substr $file , $result +1 ; + } + # we only keep the newest file for a given $file_pattern if (compare_versions ($1, $newest_version) > 0) { $newest_version = $1; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Fri Dec 12 00:04:13 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 11 Dec 2008 23:04:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[2551] csw/mgar/pkg/a52dec/trunk/Makefile Message-ID: Revision: 2551 http://gar.svn.sourceforge.net/gar/?rev=2551&view=rev Author: wbonnet Date: 2008-12-11 23:04:13 +0000 (Thu, 11 Dec 2008) Log Message: ----------- Fix upstream watch regexp Modified Paths: -------------- csw/mgar/pkg/a52dec/trunk/Makefile Modified: csw/mgar/pkg/a52dec/trunk/Makefile =================================================================== --- csw/mgar/pkg/a52dec/trunk/Makefile 2008-12-11 23:02:13 UTC (rev 2550) +++ csw/mgar/pkg/a52dec/trunk/Makefile 2008-12-11 23:04:13 UTC (rev 2551) @@ -7,12 +7,13 @@ liba52 is a free library for decoding ATSC A/52 streams. It is released under the terms of the GPL license. The A/52 standard is used in a variety of applications, including digital television and DVD. It is also known as AC-3. endef +UPSTREAM_MASTER_SITES = http://liba52.sourceforge.net/ MASTER_SITES = http://liba52.sourceforge.net/files/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWliba52, depend) # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = files/$(GARNAME)-(\d+(?:\.\d+)*).tar.gz CONFIGURE_ARGS = $(DIRPATHS) --enable-shared --disable-static This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Fri Dec 12 00:10:11 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 11 Dec 2008 23:10:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[2552] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 2552 http://gar.svn.sourceforge.net/gar/?rev=2552&view=rev Author: wbonnet Date: 2008-12-11 23:10:11 +0000 (Thu, 11 Dec 2008) Log Message: ----------- Add UFILES_REGEX Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2008-12-11 23:04:13 UTC (rev 2551) +++ csw/mgar/pkg/apache2/trunk/Makefile 2008-12-11 23:10:11 UTC (rev 2552) @@ -10,6 +10,9 @@ include files/config.mk +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = files/$(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # Dummy toplevel package DISTFILES += $(call admfiles,CSWapache2,depend prototype) # Runtime This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Fri Dec 12 00:12:15 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 11 Dec 2008 23:12:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[2553] csw/mgar/pkg/apache2/trunk/Makefile Message-ID: Revision: 2553 http://gar.svn.sourceforge.net/gar/?rev=2553&view=rev Author: wbonnet Date: 2008-12-11 23:12:14 +0000 (Thu, 11 Dec 2008) Log Message: ----------- Fix UFILEs_REGEX Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2008-12-11 23:10:11 UTC (rev 2552) +++ csw/mgar/pkg/apache2/trunk/Makefile 2008-12-11 23:12:14 UTC (rev 2553) @@ -11,7 +11,7 @@ include files/config.mk # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = files/$(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz # Dummy toplevel package DISTFILES += $(call admfiles,CSWapache2,depend prototype) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Fri Dec 12 00:20:10 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 11 Dec 2008 23:20:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[2554] csw/mgar/pkg/apg/trunk/Makefile Message-ID: Revision: 2554 http://gar.svn.sourceforge.net/gar/?rev=2554&view=rev Author: wbonnet Date: 2008-12-11 23:20:10 +0000 (Thu, 11 Dec 2008) Log Message: ----------- Fix UFILES_REGEX Modified Paths: -------------- csw/mgar/pkg/apg/trunk/Makefile Modified: csw/mgar/pkg/apg/trunk/Makefile =================================================================== --- csw/mgar/pkg/apg/trunk/Makefile 2008-12-11 23:12:14 UTC (rev 2553) +++ csw/mgar/pkg/apg/trunk/Makefile 2008-12-11 23:20:10 UTC (rev 2554) @@ -11,7 +11,8 @@ DISTFILES += $(call admfiles,CSWapg) # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = download/$(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UPSTREAM_MASTER_SITES = http://www.adel.nursat.kz/apg/download.shtml CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Fri Dec 12 00:24:43 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 11 Dec 2008 23:24:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[2555] csw/mgar/pkg/apr/trunk/Makefile Message-ID: Revision: 2555 http://gar.svn.sourceforge.net/gar/?rev=2555&view=rev Author: wbonnet Date: 2008-12-11 23:24:43 +0000 (Thu, 11 Dec 2008) Log Message: ----------- Fix MASTER_SITE (use mirror with directory mode access) Modified Paths: -------------- csw/mgar/pkg/apr/trunk/Makefile Modified: csw/mgar/pkg/apr/trunk/Makefile =================================================================== --- csw/mgar/pkg/apr/trunk/Makefile 2008-12-11 23:20:10 UTC (rev 2554) +++ csw/mgar/pkg/apr/trunk/Makefile 2008-12-11 23:24:43 UTC (rev 2555) @@ -9,7 +9,7 @@ interface to underlying platform-specific implementations. endef -MASTER_SITES = http://apache.mirrored.ca/apr/ +MASTER_SITES = http://apache.crihan.fr/dist/apr/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWapr,depend prototype) DISTFILES += $(call admfiles,CSWapr-devel,depend prototype) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Fri Dec 12 00:27:40 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 11 Dec 2008 23:27:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[2556] csw/mgar/pkg/apr-util/trunk/Makefile Message-ID: Revision: 2556 http://gar.svn.sourceforge.net/gar/?rev=2556&view=rev Author: wbonnet Date: 2008-12-11 23:27:40 +0000 (Thu, 11 Dec 2008) Log Message: ----------- Fix MASTER_SITE (use mirror with directory mode) Modified Paths: -------------- csw/mgar/pkg/apr-util/trunk/Makefile Modified: csw/mgar/pkg/apr-util/trunk/Makefile =================================================================== --- csw/mgar/pkg/apr-util/trunk/Makefile 2008-12-11 23:24:43 UTC (rev 2555) +++ csw/mgar/pkg/apr-util/trunk/Makefile 2008-12-11 23:27:40 UTC (rev 2556) @@ -9,7 +9,7 @@ interface to underlying platform-specific implementations. endef -MASTER_SITES = http://apache.mirrored.ca/apr/ +MASTER_SITES = http://apache.crihan.fr/dist/apr/ MASTER_SITES += http://apache.webthing.com/database/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz #DISTFILES += apr_dbd_mysql.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Fri Dec 12 00:31:09 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 11 Dec 2008 23:31:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[2557] csw/mgar/pkg/arpwatch/trunk/Makefile Message-ID: Revision: 2557 http://gar.svn.sourceforge.net/gar/?rev=2557&view=rev Author: wbonnet Date: 2008-12-11 23:31:08 +0000 (Thu, 11 Dec 2008) Log Message: ----------- Add UWATCH_REGEX Modified Paths: -------------- csw/mgar/pkg/arpwatch/trunk/Makefile Modified: csw/mgar/pkg/arpwatch/trunk/Makefile =================================================================== --- csw/mgar/pkg/arpwatch/trunk/Makefile 2008-12-11 23:27:40 UTC (rev 2556) +++ csw/mgar/pkg/arpwatch/trunk/Makefile 2008-12-11 23:31:08 UTC (rev 2557) @@ -13,6 +13,9 @@ # Smf/init stuffs DISTFILES += cswarpwatch.xml svc-cswarpwatch cswarpwatch arpwatch.conf +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz + # This patch add an system header include # in arpwatch.h so u_int32 is defined # TODO: this should be done in configure This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From william at wbonnet.net Thu Dec 11 23:42:31 2008 From: william at wbonnet.net (William Bonnet) Date: Thu, 11 Dec 2008 23:42:31 +0100 Subject: [csw-devel] Upstream Watch progress report Message-ID: <49419757.1030503@wbonnet.net> Hi all As some of you already noticed today, the "upstream watch" task is now running. Upstream watch, aka uwatch, is a task running every night, that check for each of the package present in GAR if a newer version of sources is available from the MASTER_SITE (GAR variable defining the site from which you download the sources). If a newer version is detected, the maintainer is warned. The notification email will be sent once a month. Soon a mantis entry will also be inserted. Declaring an "need for update bug". Since this script is still pretty new, it may have bugs. So feedback are welcomed :) I will add soon more features, like : . Sending email to maintainer with incomplete or invalid "upstream check information" in the makefile. So far i receive the email and will try to fix a few things in the coming days. This happens when either the MASTER_SITE or the regular expression used by uwatch are invalid . Sending an email asking the maintainer to configure uwatch information in the makefile (need to write some howtos before) . Sending an email asking the maintainer if they want to add there packages to gar if they are missing from svn . Sending an email to our beloved release master, notifying him that some package are in svn and GAR and have never been released :) Trygve, if you have time in the next weeks, we can look to a possibility of make this working together with Hudson. Cheers, -- William http://www.wbonnet.net http://www.sunwizard.net Le site fran?ais des amateurs de stations Unix http://www.blastwave.org An OpenSolaris Community Site http://www.opencsw.org Community SoftWare for Solaris http://www.guses.org French speaking Solaris User Group From bonivart at users.sourceforge.net Fri Dec 12 11:03:45 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 12 Dec 2008 10:03:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[2558] csw/mgar/pkg/cpan/DBD-SQLite/trunk/Makefile Message-ID: Revision: 2558 http://gar.svn.sourceforge.net/gar/?rev=2558&view=rev Author: bonivart Date: 2008-12-12 10:03:45 +0000 (Fri, 12 Dec 2008) Log Message: ----------- DBD-SQLite: updated Makefile version Modified Paths: -------------- csw/mgar/pkg/cpan/DBD-SQLite/trunk/Makefile Modified: csw/mgar/pkg/cpan/DBD-SQLite/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DBD-SQLite/trunk/Makefile 2008-12-11 23:31:08 UTC (rev 2557) +++ csw/mgar/pkg/cpan/DBD-SQLite/trunk/Makefile 2008-12-12 10:03:45 UTC (rev 2558) @@ -1,5 +1,5 @@ GARNAME = DBD-SQLite -GARVERSION = 1.13 +GARVERSION = 1.14 CATEGORIES = cpan AUTHOR = MSERGEANT 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 Dec 12 11:12:39 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 12 Dec 2008 10:12:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[2559] csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/ Makefile Message-ID: Revision: 2559 http://gar.svn.sourceforge.net/gar/?rev=2559&view=rev Author: bonivart Date: 2008-12-12 10:12:38 +0000 (Fri, 12 Dec 2008) Log Message: ----------- Module-Load-Conditional: updated Makefile version Modified Paths: -------------- csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile Modified: csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile 2008-12-12 10:03:45 UTC (rev 2558) +++ csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile 2008-12-12 10:12:38 UTC (rev 2559) @@ -1,5 +1,5 @@ GARNAME = Module-Load-Conditional -GARVERSION = 0.16 +GARVERSION = 0.26 CATEGORIES = cpan AUTHOR = KANE 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 Dec 12 15:03:50 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 12 Dec 2008 14:03:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[2560] csw/mgar/pkg/xmlto/trunk Message-ID: Revision: 2560 http://gar.svn.sourceforge.net/gar/?rev=2560&view=rev Author: bdwalton Date: 2008-12-12 14:03:50 +0000 (Fri, 12 Dec 2008) Log Message: ----------- cut external gar reference to mgar v2 Modified Paths: -------------- csw/mgar/pkg/xmlto/trunk/Makefile csw/mgar/pkg/xmlto/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/xmlto/trunk/ Property changes on: csw/mgar/pkg/xmlto/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/xmlto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlto/trunk/Makefile 2008-12-12 10:12:38 UTC (rev 2559) +++ csw/mgar/pkg/xmlto/trunk/Makefile 2008-12-12 14:03:50 UTC (rev 2560) @@ -3,6 +3,8 @@ CATEGORIES = utils PREREQUISITE_PKGS = CSWmktemp CSWfindutils CSWdocbookxsl CSWlibxslt CSWflex +REQUIRES_PKGS = CSWsgmlcommon CSWxmlcommon CSWlibxml2 CSWdocbookdtds +REQUIRES_PKGS += CSWdocbookxsl CSWlibxslt CSWflex CSWw3m DESCRIPTION = An XSL toolchain front end. define BLURB @@ -13,7 +15,7 @@ MASTER_SITES = https://fedorahosted.org/$(GARNAME)/export/1/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += $(call admfiles,CSWxmlto,depend) +#DISTFILES += $(call admfiles,CSWxmlto,depend) TEST_TARGET = check Modified: csw/mgar/pkg/xmlto/trunk/checksums =================================================================== --- csw/mgar/pkg/xmlto/trunk/checksums 2008-12-12 10:12:38 UTC (rev 2559) +++ csw/mgar/pkg/xmlto/trunk/checksums 2008-12-12 14:03:50 UTC (rev 2560) @@ -1,3 +1 @@ cc2039dedc81f1a56b06e5fdac6f7570 download/xmlto-0.0.21.tar.bz2 -3f51dd8ed4ca7795397702250254a6fb download/CSWxmlto.gspec -492cea1bbf25f9ab97f43582e6bd429a download/CSWxmlto.depend 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 Dec 12 16:53:02 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 12 Dec 2008 15:53:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[2561] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 2561 http://gar.svn.sourceforge.net/gar/?rev=2561&view=rev Author: bonivart Date: 2008-12-12 15:53:01 +0000 (Fri, 12 Dec 2008) Log Message: ----------- pkgutil: 1.3 release 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 2008-12-12 14:03:50 UTC (rev 2560) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2008-12-12 15:53:01 UTC (rev 2561) @@ -1,5 +1,5 @@ GARNAME = pkgutil -GARVERSION = 1.3b2 +GARVERSION = 1.3 CATEGORIES = utils DESCRIPTION = Installs Solaris packages easily Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2008-12-12 14:03:50 UTC (rev 2560) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2008-12-12 15:53:01 UTC (rev 2561) @@ -1,4 +1,4 @@ -3973b2172d45390dc9884f83109671a8 download/pkgutil-1.3b2.zip +1b930b0ac7aee3f9523a07ad27bdb211 download/pkgutil-1.3.zip 805cd30ad9f21cb1167d166fa99b5891 download/CSWpkgutil.gspec 2f561d7f40289fac9bd02d2504b73693 download/CSWpkgutil.prototype bea1e5ef39a8389b9feaa18938993205 download/CSWpkgutil.postinstall 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 Dec 12 18:15:38 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 12 Dec 2008 17:15:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[2562] csw/mgar/pkg/cpan/libwww-perl/trunk Message-ID: Revision: 2562 http://gar.svn.sourceforge.net/gar/?rev=2562&view=rev Author: bonivart Date: 2008-12-12 17:15:38 +0000 (Fri, 12 Dec 2008) Log Message: ----------- libwww-perl: switched to gar v2 Modified Paths: -------------- csw/mgar/pkg/cpan/libwww-perl/trunk/Makefile csw/mgar/pkg/cpan/libwww-perl/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/cpan/libwww-perl/trunk/ Property changes on: csw/mgar/pkg/cpan/libwww-perl/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/libwww-perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/libwww-perl/trunk/Makefile 2008-12-12 15:53:01 UTC (rev 2561) +++ csw/mgar/pkg/cpan/libwww-perl/trunk/Makefile 2008-12-12 17:15:38 UTC (rev 2562) @@ -1,5 +1,5 @@ GARNAME = libwww-perl -GARVERSION = 5.820 +GARVERSION = 5.822 CATEGORIES = cpan AUTHOR = GAAS @@ -11,9 +11,12 @@ used. endef -#DISTFILES += $(call admfiles,CSWpmlibwww,depend prototype) -DISTFILES += $(call admfiles,CSWpmlibwww,depend) +DISTFILES += $(call admfiles,CSWpmlibwww,) +REQUIRED_PKGS = CSWpmhtmltagset CSWpmuri CSWpmhtmlparser CSWpmcompresszlib CSWpmhtmlfmt CSWpmmimebase64 + +EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod + DEPENDS += cpan/URI DEPENDS += cpan/HTML-Parser DEPENDS += cpan/Crypt-SSLeay Modified: csw/mgar/pkg/cpan/libwww-perl/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/libwww-perl/trunk/checksums 2008-12-12 15:53:01 UTC (rev 2561) +++ csw/mgar/pkg/cpan/libwww-perl/trunk/checksums 2008-12-12 17:15:38 UTC (rev 2562) @@ -1,3 +1,2 @@ 7f2db1cb966b9260b395fdbc01b09fae download/CSWpmlibwww.gspec -71b8fe3c44d3bfaa7e8d1eaec794b24e download/CSWpmlibwww.depend -761f87c2e47f57633c9537f532f82e49 download/libwww-perl-5.820.tar.gz +5b5856e0d61abb75fb5f52ed1678161f download/libwww-perl-5.822.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvel at opencsw.org Fri Dec 12 19:09:03 2008 From: trygvel at opencsw.org (=?ISO-8859-1?Q?Trygve_Laugst=F8l?=) Date: Fri, 12 Dec 2008 19:09:03 +0100 Subject: [csw-devel] Upstream Watch progress report In-Reply-To: <49419757.1030503@wbonnet.net> References: <49419757.1030503@wbonnet.net> Message-ID: <4942A8BF.1010201@opencsw.org> William Bonnet wrote: [snip] > Trygve, if you have time in the next weeks, we can look to a possibility > of make this working together with Hudson. Let me know what you want and I can get it into Hudson. -- Trygve From bdwalton at users.sourceforge.net Fri Dec 12 19:18:45 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 12 Dec 2008 18:18:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[2563] csw/mgar/pkg/xmlto/trunk Message-ID: Revision: 2563 http://gar.svn.sourceforge.net/gar/?rev=2563&view=rev Author: bdwalton Date: 2008-12-12 18:18:44 +0000 (Fri, 12 Dec 2008) Log Message: ----------- updated xmlto description to get a license into the package. Modified Paths: -------------- csw/mgar/pkg/xmlto/trunk/Makefile csw/mgar/pkg/xmlto/trunk/checksums csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.gspec Added Paths: ----------- csw/mgar/pkg/xmlto/trunk/files/GPL Modified: csw/mgar/pkg/xmlto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlto/trunk/Makefile 2008-12-12 17:15:38 UTC (rev 2562) +++ csw/mgar/pkg/xmlto/trunk/Makefile 2008-12-12 18:18:44 UTC (rev 2563) @@ -15,7 +15,7 @@ MASTER_SITES = https://fedorahosted.org/$(GARNAME)/export/1/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -#DISTFILES += $(call admfiles,CSWxmlto,depend) +DISTFILES += $(call admfiles,CSWxmlto) GPL TEST_TARGET = check @@ -38,6 +38,8 @@ CONFIGURE_ARGS += --with-bash=/opt/csw/bin/bash CONFIGURE_ARGS += --with-getopt=/opt/csw/bin/ggetopt +EXTRACT_TARGETS-global = $(call admfiles,CSWxmlto) GPL + include gar/category.mk # We need this for 'tail -n' Modified: csw/mgar/pkg/xmlto/trunk/checksums =================================================================== --- csw/mgar/pkg/xmlto/trunk/checksums 2008-12-12 17:15:38 UTC (rev 2562) +++ csw/mgar/pkg/xmlto/trunk/checksums 2008-12-12 18:18:44 UTC (rev 2563) @@ -1 +1,3 @@ cc2039dedc81f1a56b06e5fdac6f7570 download/xmlto-0.0.21.tar.bz2 +ca57ac3300751be169587c70ee43d421 download/CSWxmlto.gspec +0636e73ff0215e8d672dc4c32c317bb3 download/GPL Modified: csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.gspec =================================================================== --- csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.gspec 2008-12-12 17:15:38 UTC (rev 2562) +++ csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.gspec 2008-12-12 18:18:44 UTC (rev 2563) @@ -1,4 +1,4 @@ %var bitname xmlto %var pkgname CSWxmlto %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING +%copyright url file://%{WORKDIR}/GPL Added: csw/mgar/pkg/xmlto/trunk/files/GPL =================================================================== --- csw/mgar/pkg/xmlto/trunk/files/GPL (rev 0) +++ csw/mgar/pkg/xmlto/trunk/files/GPL 2008-12-12 18:18:44 UTC (rev 2563) @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU 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. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), 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 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 show them these terms so they know 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. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + 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 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 derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 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 License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +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. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary 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 + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 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 Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing 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 for copying, distributing or modifying +the Program or works based on it. + + 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. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. 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 this 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 +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. 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 + + 11. 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. + + 12. 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 + + 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 the public, 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 2 of the License, 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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) 19yy 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 is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. 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 Dec 12 19:36:41 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 12 Dec 2008 18:36:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[2564] csw/mgar/pkg/openjade/trunk/ Message-ID: Revision: 2564 http://gar.svn.sourceforge.net/gar/?rev=2564&view=rev Author: bdwalton Date: 2008-12-12 18:36:41 +0000 (Fri, 12 Dec 2008) Log Message: ----------- switch to gar v2 Property Changed: ---------------- csw/mgar/pkg/openjade/trunk/ Property changes on: csw/mgar/pkg/openjade/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 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 Dec 12 21:55:07 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 12 Dec 2008 20:55:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[2565] csw/mgar/pkg/libpopt/trunk Message-ID: Revision: 2565 http://gar.svn.sourceforge.net/gar/?rev=2565&view=rev Author: dmichelsen Date: 2008-12-12 20:55:07 +0000 (Fri, 12 Dec 2008) Log Message: ----------- libpopt: Update to 1.14 and mGAR v2 Modified Paths: -------------- csw/mgar/pkg/libpopt/trunk/Makefile csw/mgar/pkg/libpopt/trunk/checksums csw/mgar/pkg/libpopt/trunk/files/CSWlibpopt.gspec Removed Paths: ------------- csw/mgar/pkg/libpopt/trunk/files/CSWlibpopt.depend Property Changed: ---------------- csw/mgar/pkg/libpopt/trunk/ Property changes on: csw/mgar/pkg/libpopt/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/libpopt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libpopt/trunk/Makefile 2008-12-12 18:36:41 UTC (rev 2564) +++ csw/mgar/pkg/libpopt/trunk/Makefile 2008-12-12 20:55:07 UTC (rev 2565) @@ -1,5 +1,5 @@ GARNAME = popt -GARVERSION = 1.13 +GARVERSION = 1.14 CATEGORIES = lib DESCRIPTION = Popt is a C library for parsing command line parameters @@ -8,14 +8,17 @@ MASTER_SITES = http://rpm5.org/files/$(GARNAME)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWlibpopt,depend) +DISTFILES += $(call admfiles,CSWlibpopt) UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +REQUIRED_PKGS = CSWggettext CSWiconv + +BUILD64 = 1 +NORUNPATH = 1 + CONFIGURE_ARGS = $(DIRPATHS) -EXTRA_BUILD_ISAS_sparc = sparcv9 - TEST_TARGET = check include gar/category.mk Modified: csw/mgar/pkg/libpopt/trunk/checksums =================================================================== --- csw/mgar/pkg/libpopt/trunk/checksums 2008-12-12 18:36:41 UTC (rev 2564) +++ csw/mgar/pkg/libpopt/trunk/checksums 2008-12-12 20:55:07 UTC (rev 2565) @@ -1,3 +1,2 @@ -b5c47ce0185c83f947953c77000533bf download/popt-1.13.tar.gz -d20ca7ebe60fd59a2b771186ae97d474 download/CSWlibpopt.gspec -fecba5106ba279bc0c6279dbe23c33d4 download/CSWlibpopt.depend +4f90a07316eb825604dd10ae4f9f3f04 download/popt-1.14.tar.gz +ee4e9a79a4e5dc3ccc90413ec229e51a download/CSWlibpopt.gspec Deleted: csw/mgar/pkg/libpopt/trunk/files/CSWlibpopt.depend =================================================================== --- csw/mgar/pkg/libpopt/trunk/files/CSWlibpopt.depend 2008-12-12 18:36:41 UTC (rev 2564) +++ csw/mgar/pkg/libpopt/trunk/files/CSWlibpopt.depend 2008-12-12 20:55:07 UTC (rev 2565) @@ -1,2 +0,0 @@ -system CSWggettext ggettext - GNU gettext -system CSWiconv libiconv - GNU iconv library Modified: csw/mgar/pkg/libpopt/trunk/files/CSWlibpopt.gspec =================================================================== --- csw/mgar/pkg/libpopt/trunk/files/CSWlibpopt.gspec 2008-12-12 18:36:41 UTC (rev 2564) +++ csw/mgar/pkg/libpopt/trunk/files/CSWlibpopt.gspec 2008-12-12 20:55:07 UTC (rev 2565) @@ -1,4 +1,4 @@ %var bitname libpopt %var pkgname CSWlibpopt %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING +%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 Dec 12 22:07:36 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 12 Dec 2008 21:07:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[2566] csw/mgar/pkg/readline/trunk Message-ID: Revision: 2566 http://gar.svn.sourceforge.net/gar/?rev=2566&view=rev Author: dmichelsen Date: 2008-12-12 21:07:36 +0000 (Fri, 12 Dec 2008) Log Message: ----------- readline: Add legacy build description for reference Added Paths: ----------- csw/mgar/pkg/readline/trunk/legacy/ csw/mgar/pkg/readline/trunk/legacy/readline/ csw/mgar/pkg/readline/trunk/legacy/readline/build.sparc csw/mgar/pkg/readline/trunk/legacy/readline/build.x86 csw/mgar/pkg/readline/trunk/legacy/readline/copyright csw/mgar/pkg/readline/trunk/legacy/readline/pkginfo csw/mgar/pkg/readline/trunk/legacy/readline/prototype Added: csw/mgar/pkg/readline/trunk/legacy/readline/build.sparc =================================================================== --- csw/mgar/pkg/readline/trunk/legacy/readline/build.sparc (rev 0) +++ csw/mgar/pkg/readline/trunk/legacy/readline/build.sparc 2008-12-12 21:07:36 UTC (rev 2566) @@ -0,0 +1,74 @@ +#!/bin/sh + +VERSION=5.1 +BASE=/export/medusa/mark +HOST=ra + +cd $BASE/build-$HOST +rm -rf readline-$VERSION +gtar xzvf /export/medusa/src/readline-$VERSION.tar.gz +cd readline-$VERSION + +# First, make 64-bit version + +LD_OPTIONS="-R/opt/csw/lib/64 -L/opt/csw/lib/64 -z defs -lc -lcurses" CC="cc -fast -xtarget=ultra -xarch=v9" ./configure --prefix=/opt/csw + +LD_OPTIONS="-R/opt/csw/lib/64 -L/opt/csw/lib/64 -z defs -lc -lcurses" CC="cc -fast -xtarget=ultra -xarch=v9" gmake + +gmake prefix=$BASE/build-$HOST/readline-$VERSION/cswstage/opt/csw install +LD_OPTIONS="-R/opt/csw/lib/64 -L/opt/csw/lib/64 -z defs -lc -lcurses" CC="cc -fast -xtarget=ultra -xarch=v9" gmake shared +gmake prefix=$BASE/build-$HOST/readline-$VERSION/cswstage/opt/csw install-shared + +cd cswstage/opt/csw/lib +mkdir sparcv9 +mv *.so* *.a* sparcv9/ + + + +# Now, build the 32-bit version + +cd ../../../../ +gmake distclean + +LD_OPTIONS="-R/opt/csw/lib -L/opt/csw/lib -z defs -lc -lcurses" CC="cc -fast -xarch=v8" ./configure --prefix=/opt/csw +LD_OPTIONS="-R/opt/csw/lib -L/opt/csw/lib -z defs -lc -lcurses" CC="cc -fast -xarch=v8" gmake +gmake prefix=$BASE/build-$HOST/readline-$VERSION/cswstage/opt/csw install +LD_OPTIONS="-R/opt/csw/lib -L/opt/csw/lib -z defs -lc -lcurses" CC="cc -fast -xarch=v8" gmake shared +gmake prefix=$BASE/build-$HOST/readline-$VERSION/cswstage/opt/csw install-shared + + +echo "Waiting for input - do any additional stuff now..." +read input + +# Clean up according to CSW standards +cd cswstage/opt/csw +[ ! -d share ] && mkdir share +for dir in man doc info; do + [ -d $dir ] && mv $dir share/ && ln -s share/$dir $dir +done + + +cd ../../ + +# Bug in the makefiles... +find . -name '*.old' -exec rm {} + + +pkgproto . | sed "s/e opt/e \/opt/" | sed "s/mark csw/root bin/" > prototype.full +echo "i pkginfo" > prototype.tmp +echo "i copyright" >> prototype.tmp +cat prototype.full >> prototype.tmp +rm prototype.full + +cat prototype.tmp | sed "/info\/dir 0644/d" | sed "/info=share/d" | sed "/man=share/d" | sed "/doc=share/d" | sed "/opt 0755/d" | sed "/prototype.full/d" > prototype +rm prototype.tmp + + +for file in copyright pkginfo; do + cp /export/home/mark/pkgs/readline/$file . +done + +createpkg -r . + +mv *.gz /export/home/mark/pkgs/readline/ + +echo "All done!" Property changes on: csw/mgar/pkg/readline/trunk/legacy/readline/build.sparc ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/readline/trunk/legacy/readline/build.x86 =================================================================== --- csw/mgar/pkg/readline/trunk/legacy/readline/build.x86 (rev 0) +++ csw/mgar/pkg/readline/trunk/legacy/readline/build.x86 2008-12-12 21:07:36 UTC (rev 2566) @@ -0,0 +1,51 @@ +#!/bin/sh + +VERSION=5.1 +BASE=/export/medusa/mark +HOST=thor + +cd $BASE/build-$HOST +rm -rf readline-$VERSION +gtar xzvf /export/medusa/src/readline-$VERSION.tar.gz +cd readline-$VERSION + +LD_OPTIONS="-R/opt/csw/lib -L/opt/csw/lib -z defs -lc -lcurses" CC="cc -fast -xarch=386" ./configure --prefix=/opt/csw +LD_OPTIONS="-R/opt/csw/lib -L/opt/csw/lib -z defs -lc -lcurses" CC="cc -fast -xarch=386" gmake +gmake prefix=$BASE/build-$HOST/readline-$VERSION/cswstage/opt/csw install +LD_OPTIONS="-R/opt/csw/lib -L/opt/csw/lib -z defs -lc -lcurses" CC="cc -fast -xarch=386" gmake shared +gmake prefix=$BASE/build-$HOST/readline-$VERSION/cswstage/opt/csw install-shared + +echo "Waiting for input - perform any additional stuff now." +read input + +# Clean up according to CSW standards +cd cswstage/opt/csw +[ ! -d share ] && mkdir share +for dir in man doc info; do + [ -d $dir ] && mv $dir share/ && ln -s share/$dir $dir +done + +cd ../../ + +# Bug in the makefiles... +find . -name '*.old' -exec rm {} + + +pkgproto . | sed "s/e opt/e \/opt/" | sed "s/mark other/root bin/" > prototype.full +echo "i pkginfo" > prototype.tmp +echo "i copyright" >> prototype.tmp +cat prototype.full >> prototype.tmp +rm prototype.full + +cat prototype.tmp | sed "/info\/dir 0644/d" | sed "/info=share/d" | sed "/man=share/d" | sed "/doc=share/d" | sed "/opt 0755/d" | sed "/prototype.full/d" > prototype +rm prototype.tmp + + +for file in copyright pkginfo; do + cp /export/home/mark/pkgs/readline/$file . +done + +createpkg -r . + +mv *.gz /export/home/mark/pkgs/readline/ + +echo "All done!" Property changes on: csw/mgar/pkg/readline/trunk/legacy/readline/build.x86 ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/readline/trunk/legacy/readline/copyright =================================================================== --- csw/mgar/pkg/readline/trunk/legacy/readline/copyright (rev 0) +++ csw/mgar/pkg/readline/trunk/legacy/readline/copyright 2008-12-12 21:07:36 UTC (rev 2566) @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU 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. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), 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 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 show them these terms so they know 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. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + 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 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 derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 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 License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +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. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary 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 + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 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 Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing 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 for copying, distributing or modifying +the Program or works based on it. + + 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. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. 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 this 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 +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. 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 + + 11. 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. + + 12. 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 the public, 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 2 of the License, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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) 19yy 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 is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. Added: csw/mgar/pkg/readline/trunk/legacy/readline/pkginfo =================================================================== --- csw/mgar/pkg/readline/trunk/legacy/readline/pkginfo (rev 0) +++ csw/mgar/pkg/readline/trunk/legacy/readline/pkginfo 2008-12-12 21:07:36 UTC (rev 2566) @@ -0,0 +1,7 @@ +PKG=CSWreadline +NAME=readline - library to enable interactive line editing +VERSION=5.1 +CATEGORY=system +VENDOR=http://ftp.gnu.org/pub/gnu/readline/ packaged for CSW by Mark Round +HOTLINE=http://www.blastwave.org/bugtrack/ +EMAIL=mark at blastwave.org Added: csw/mgar/pkg/readline/trunk/legacy/readline/prototype =================================================================== --- csw/mgar/pkg/readline/trunk/legacy/readline/prototype (rev 0) +++ csw/mgar/pkg/readline/trunk/legacy/readline/prototype 2008-12-12 21:07:36 UTC (rev 2566) @@ -0,0 +1,18 @@ +i pkginfo +i copyright +d none /opt/csw 0755 root bin +d none /opt/csw/lib 0755 root bin +f none /opt/csw/lib/libhistory.so.4 0644 root bin +s none /opt/csw/lib/libhistory.so=libhistory.so.4 +f none /opt/csw/lib/libreadline.so.4 0644 root bin +s none /opt/csw/lib/libreadline.so=libreadline.so.4 +d none /opt/csw/include 0755 root bin +d none /opt/csw/include/readline 0755 root bin +f none /opt/csw/include/readline/readline.h 0644 root bin +f none /opt/csw/include/readline/chardefs.h 0644 root bin +f none /opt/csw/include/readline/keymaps.h 0644 root bin +f none /opt/csw/include/readline/history.h 0644 root bin +f none /opt/csw/include/readline/tilde.h 0644 root bin +f none /opt/csw/include/readline/rlstdc.h 0644 root bin +f none /opt/csw/include/readline/rlconf.h 0644 root bin +f none /opt/csw/include/readline/rltypedefs.h 0644 root bin 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 Dec 12 22:15:11 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 12 Dec 2008 21:15:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[2567] csw/mgar/pkg Message-ID: Revision: 2567 http://gar.svn.sourceforge.net/gar/?rev=2567&view=rev Author: dmichelsen Date: 2008-12-12 21:15:09 +0000 (Fri, 12 Dec 2008) Log Message: ----------- postgresql: Make stub package with legacy build description from leaving maintainer Added Paths: ----------- csw/mgar/pkg/postgresql/ csw/mgar/pkg/postgresql/branches/ csw/mgar/pkg/postgresql/tags/ csw/mgar/pkg/postgresql/trunk/ csw/mgar/pkg/postgresql/trunk/Makefile csw/mgar/pkg/postgresql/trunk/files/ csw/mgar/pkg/postgresql/trunk/legacy/ csw/mgar/pkg/postgresql/trunk/legacy/README csw/mgar/pkg/postgresql/trunk/legacy/libpq/ csw/mgar/pkg/postgresql/trunk/legacy/libpq/checkinstall csw/mgar/pkg/postgresql/trunk/legacy/libpq/compat.sparc.tgz csw/mgar/pkg/postgresql/trunk/legacy/libpq/compat.x86.tgz csw/mgar/pkg/postgresql/trunk/legacy/libpq/copyright csw/mgar/pkg/postgresql/trunk/legacy/libpq/depend csw/mgar/pkg/postgresql/trunk/legacy/libpq/pkginfo csw/mgar/pkg/postgresql/trunk/legacy/libpq/prototype.append csw/mgar/pkg/postgresql/trunk/legacy/postgresql/ csw/mgar/pkg/postgresql/trunk/legacy/postgresql/BUILD.notes csw/mgar/pkg/postgresql/trunk/legacy/postgresql/README-CSW.txt.sparc csw/mgar/pkg/postgresql/trunk/legacy/postgresql/README-CSW.txt.x86 csw/mgar/pkg/postgresql/trunk/legacy/postgresql/build.sparc csw/mgar/pkg/postgresql/trunk/legacy/postgresql/build.x86 csw/mgar/pkg/postgresql/trunk/legacy/postgresql/copyright csw/mgar/pkg/postgresql/trunk/legacy/postgresql/cswpostgres.sparc csw/mgar/pkg/postgresql/trunk/legacy/postgresql/cswpostgres.x86 csw/mgar/pkg/postgresql/trunk/legacy/postgresql/depend csw/mgar/pkg/postgresql/trunk/legacy/postgresql/libpqfiles.sparc csw/mgar/pkg/postgresql/trunk/legacy/postgresql/libpqfiles.x86 csw/mgar/pkg/postgresql/trunk/legacy/postgresql/pkginfo csw/mgar/pkg/postgresql/trunk/legacy/postgresql/postgresql.conf.sparc csw/mgar/pkg/postgresql/trunk/legacy/postgresql/postgresql.conf.x86 csw/mgar/pkg/postgresql/trunk/legacy/postgresql/postinstall csw/mgar/pkg/postgresql/trunk/legacy/postgresql/preremove csw/mgar/pkg/postgresql/trunk/legacy/postgresql/prototype.append csw/mgar/pkg/postgresql/trunk/legacy/postgresqlcontrib/ csw/mgar/pkg/postgresql/trunk/legacy/postgresqlcontrib/copyright csw/mgar/pkg/postgresql/trunk/legacy/postgresqlcontrib/depend csw/mgar/pkg/postgresql/trunk/legacy/postgresqlcontrib/pkginfo csw/mgar/pkg/postgresql/trunk/legacy/scripts/ csw/mgar/pkg/postgresql/trunk/legacy/scripts/env Property changes on: csw/mgar/pkg/postgresql/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 Added: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile (rev 0) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,16 @@ +GARNAME = package +GARVERSION = 1.0 +CATEGORIES = category + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWpackage,) + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/postgresql/trunk/legacy/README =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/README (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/README 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,37 @@ +Here are my postgresql scripts. + +Horrible and ugly, I know :( + +All you should need to do is unpack this in a ~/pkgs/ directory, tweak +a few things, and run. My standard was to have my home directory set +up like : + +pkgs/ for all build scripts, copyright, etc. +build- for each build host. + +And source under /export/medusa/src. + +So, on running these, you'd end up with ~/build-/postgresql-8.3.3. + +The scripts then move parts of the postgresql install into different +staging directories (and, in the case of libpq, unpack a +"compatibility" tarball) and then package them up in to the +appropriate ~/pkgs/ directories. The compat tarballs +could possibly be removed if everyone relinks their packages when +needed. It's a bit of a pain when a new upstream major version comes +out and you then have to include the previous libraries in... + +So you'll end up with packages under postgresql, postgresqlcontrib, and libpq. + +For some reason, the last time I tried this, I had to manually go into +the staging directory for postgresqlcontrib and run "createpkg -r ." - +not sure why this didn't work automatically. + +Like I say - these are pretty horrible and ugly, particularly the +sparc build script which produces the combined 32/64-bit package. But +they worked for years, so I never got round to moving them into GAR. I +hope these work for you - even though I've left the project, please do +contact me if you have any questions at all about them. + +-Mark + Added: csw/mgar/pkg/postgresql/trunk/legacy/libpq/checkinstall =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/libpq/checkinstall (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/libpq/checkinstall 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,36 @@ +#!/bin/sh + +# Check if the /opt/csw/libpq.so file exists, and if it is part +# of the CSWpostgresql package. If so, it's an old version of +# PostgreSQL and we can't continue... + +if [ -f "/opt/csw/lib/libpq.so" ]; then + if [ "`/usr/sbin/pkgchk -l -p /opt/csw/lib/libpq.so | grep CSWpostgresql 2> /dev/null`" ]; then + echo "*** WARNING ***" + echo " The installation has been aborted." + echo " " + echo " From version 7.3.5 onwards, the PostgreSQL package from blastwave.org" + echo " has been split into two parts. This is the 'libpq' package, which " + echo " contains core libraries and headers needed for PostgreSQL development." + echo " It is also needed by the 'postgresql' package, which contains the server" + echo " and clients." + echo " " + echo " It appears that you are attempting to upgrade an older release of PostgreSQL." + echo " You will need to manually stop the server and uninstall the CSWpostgresql " + echo " package before trying again - as the libpq package will otherwise conflict" + echo " with the currently installed postgresql package. " + echo " " + echo " You can do this with the following commands (as root) :" + echo " " + echo " /etc/init.d/cswpostgres stop" + echo " pkgrm CSWpostgresql" + echo " " + echo " Uninstalling the old version in this way will NOT affect your databases." + echo "*** WARNING ***" + + exit 1 + + fi + +fi + Property changes on: csw/mgar/pkg/postgresql/trunk/legacy/libpq/checkinstall ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/postgresql/trunk/legacy/libpq/compat.sparc.tgz =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/postgresql/trunk/legacy/libpq/compat.sparc.tgz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/postgresql/trunk/legacy/libpq/compat.x86.tgz =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/postgresql/trunk/legacy/libpq/compat.x86.tgz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/postgresql/trunk/legacy/libpq/copyright =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/libpq/copyright (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/libpq/copyright 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,23 @@ +PostgreSQL Database Management System +(formerly known as Postgres, then as Postgres95) + +Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group + +Portions Copyright (c) 1994, The Regents of the University of California + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose, without fee, and without a written agreement +is hereby granted, provided that the above copyright notice and this +paragraph and the following two paragraphs appear in all copies. + +IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR +DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING +LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS +DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + +THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS +ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO +PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. Added: csw/mgar/pkg/postgresql/trunk/legacy/libpq/depend =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/libpq/depend (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/libpq/depend 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,5 @@ +P CSWreadline +P CSWosslrt +P CSWzlib +P CSWisaexec + Added: csw/mgar/pkg/postgresql/trunk/legacy/libpq/pkginfo =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/libpq/pkginfo (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/libpq/pkginfo 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,8 @@ +PKG=CSWlibpq +NAME=libpq - libraries needed by postgresql server and clients +VERSION=8.3.3,REV=2008.06.26 +CATEGORY=application +VENDOR=http://www.postgresql.org/ packaged for CSW by Mark Round +HOTLINE=http://www.blastwave.org/bugtrack/ +EMAIL=mark at blastwave.org + Added: csw/mgar/pkg/postgresql/trunk/legacy/libpq/prototype.append =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/libpq/prototype.append (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/libpq/prototype.append 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,3 @@ +s none /opt/csw/postgresql/lib/64=sparcv9 +s none /opt/csw/postgresql/lib/32=sparcv8 +s none /opt/csw/postgresql/lib/sparcv8=. Added: csw/mgar/pkg/postgresql/trunk/legacy/postgresql/BUILD.notes =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/postgresql/BUILD.notes (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/postgresql/BUILD.notes 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,5 @@ +All you should need to do is tweak the version numbers in the build scripts, +and pkginfo files. + +You'll also need to update the compat tarballs if you're bumping a major version, +otherwise old packages will break if they haven't been re-linked. Added: csw/mgar/pkg/postgresql/trunk/legacy/postgresql/README-CSW.txt.sparc =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/postgresql/README-CSW.txt.sparc (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/postgresql/README-CSW.txt.sparc 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,103 @@ +*** Important information - please make sure you read this ! *** + +*** Migrating from older versions *** + +If you have upgraded from a previous 8.0, 8.1 or 8.2 version of PostgreSQL, +your databases will NOT work on this 8.3.x version. Before upgrading, you +should dump your databases using the old utilities. You can then create a +new data directory using this 8.3.x package, and import your dumps. +See the "64-bit support" section below for pointers to documentation on t +his. + +Another point to note is that the location of the PostgreSQL install has +changed. Previous 7.3.x packages used /opt/csw as the base - this package +uses /opt/csw/postgresql. You will need to add /opt/csw/postgresql/bin to your +$PATH, and any scripts you have written using the old locations will have to +be changed. + + +*** User configuration of server options *** + +Configuration of the server start-up options is now done through a user- +configuration file, /opt/csw/etc/postgresql.conf. A sample template has been +provided for you at /opt/csw/etc/postgresql.conf.csw. If you want to change +any of the server options discussed below, make a copy of this file to +/opt/csw/etc/postgresql.conf and edit it accordingly. + +If you cannot modify this file (for instance, you are mounting /opt/csw +from a read-only NFS server), you can use /etc/opt/csw/postgresql.conf +instead, and it will take precedence over /opt/csw/etc/postgresql.conf. + +*** Networking *** + +By default, the cswpostgres init script will start the server up listening on +localhost only. If you want to allow other hosts on your network to connect, you +will need to add "-o -i" to the value of SERVEROPTS in the user configuration +file and restart your server. The included template has the line already +entered, you just need to uncomment it (remove the leading #). + +Once this is done, PostgreSQL will now bind to all network interfaces and +listen for connections. You will still need to configure which hosts are allowed +access by modifying the pg_hba.conf file in your data directory - read the manual +for more information on this. + +*** 64-bit support *** + +The SPARC packages have been built with 64-bit support, but by default, the +32-bit version of the server will be run. If you need the 64-bit version, +edit the user configuration file and change the values of PGINIT and PGCTL +accordingly. + +It is important to note that the 64-bit server WILL NOT WORK with databases +created with the 32-bit version, and vice versa. You will get an error +message if you attempt this. + +In order to migrate your system to the 64-bit server, you will need to dump +your databases while running the 32-bit client, stop and upgrade the server, +initialise a new database directory, and import your dumps. For more information +on this procedure, see the PostgreSQL manual (included with this package), +chapter 9 - Backup and restore. This is located at : + +/opt/csw/postgresql/share/doc/html/backup.html + +All other PostgreSQL binaries in /opt/csw/postgresql/bin/ are copies of the +'isaexec' wrapper, which will run the appropriate binary for your +architecture and/or kernel. + +*** Starting the server *** + +The PostgreSQL database runs under the user 'postgres' - this has been created +for you by the installation script. + +The default PostgreSQL data directory is /opt/csw/var/pgdata. As this does not +exist, you will need to create it yourself before the database will start. +You can change the location of the data directory by altering the user +configuration file, and modifying the value of PGDATA. + +A startup script has been provided for you that handles database initialisation, +startup and shutdown functions - it is located at /etc/init.d/cswpostgres. You +should always use this script to start or stop the server, otherwise you may +find that you are running the wrong binaries (64-bit instead of 32-bit). + +It is set to start the database the next time the system enters runlevel 3 - +usually, this will be at the next boot. + +To create the data directory, the startup script accepts the "init" argument : + +/etc/init.d/cswpostgres init + +This will create and initialise the data directory. After this step has been +completed succesfully, the database can be started with : + +/etc/init.d/cswpostgres start + +If you get errors relating to shared memory on startup, make sure you have read +the section entitled "Manging Kernel Resources" - this is in Chapter 3 of the +PostgreSQL HTML Administrator's Guide, located at + +/opt/csw/postgresql/share/doc/html/index.html + + +Mark Round, +mark at blastwave.org + Property changes on: csw/mgar/pkg/postgresql/trunk/legacy/postgresql/README-CSW.txt.sparc ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/postgresql/trunk/legacy/postgresql/README-CSW.txt.x86 =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/postgresql/README-CSW.txt.x86 (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/postgresql/README-CSW.txt.x86 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,82 @@ +*** Important information - please make sure you read this ! *** + +*** Migrating from older versions *** + +If you have upgraded from a previous 8.0, 8.1 or 8.2 version of PostgreSQL, +your databases will NOT work on this 8.3.x version. Before upgrading, you +should dump your databases using the old utilities. You can then create a +new data directory using this 8.3.x package, and import your dumps. + +For more information on this procedure, see the PostgreSQL manual +(included with this package), chapter 9 - Backup and restore. +This is located at : + +/opt/csw/postgresql/share/doc/html/backup.html + +Another point to note is that the location of the PostgreSQL install has +changed. Previous 7.3.x packages used /opt/csw as the base - this package +uses /opt/csw/postgresql. You will need to add /opt/csw/postgresql/bin to your +$PATH, and any scripts you have written using the old locations will have to +be changed. + +*** User configuration of server options *** + +Configuration of the server start-up options is now done through a user- +configuration file, /opt/csw/etc/postgresql.conf. A sample template has been +provided for you at /opt/csw/etc/postgresql.conf.csw. If you want to change +any of the server options discussed below, make a copy of this file to +/opt/csw/etc/postgresql.conf and edit it accordingly. + +If you cannot modify this file (for instance, you are mounting /opt/csw +from a read-only NFS server), you can use /etc/opt/csw/postgresql.conf +instead, and it will take precedence over /opt/csw/etc/postgresql.conf. + +*** Networking *** + +By default, the cswpostgres init script will start the server up listening on +localhost only. If you want to allow other hosts on your network to connect, you +will need to add "-o -i" to the value of SERVEROPTS in the user configuration +file and restart your server. The included template has the line already +entered, you just need to uncomment it (remove the leading #). + +Once this is done, PostgreSQL will now bind to all network interfaces and +listen for connections. You will still need to configure which hosts are allowed +access by modifying the pg_hba.conf file in your data directory - read the manual +for more information on this. + +*** Starting the server *** + +The PostgreSQL database runs under the user 'postgres' - this has been created +for you by the installation script. + +The default PostgreSQL data directory is /opt/csw/var/pgdata. As this does not +exist, you will need to create it yourself before the database will start. +You can change the location of the data directory by altering the user +configuration file and modifying the value of PGDATA. + +A startup script has been provided for you that handles database initialisation, +startup and shutdown functions - it is located at /etc/init.d/cswpostgres. You +should always use this script to start or stop the server, otherwise you may +find that you are running the wrong binaries (64-bit instead of 32-bit). + +It is set to start the database the next time the system enters runlevel 3 - +usually, this will be at the next boot. + +To create the data directory, the startup script accepts the "init" argument : + +/etc/init.d/cswpostgres init + +This will create and initialise the data directory. After this step has been +completed succesfully, the database can be started with : + +/etc/init.d/cswpostgres start + +If you get errors relating to shared memory on startup, make sure you have read +the section entitled "Manging Kernel Resources" - this is in Chapter 3 of the +PostgreSQL HTML Administrator's Guide, located at + +/opt/csw/postgresql/share/doc/html/index.html + + +Mark Round, +mark at blastwave.org Property changes on: csw/mgar/pkg/postgresql/trunk/legacy/postgresql/README-CSW.txt.x86 ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/postgresql/trunk/legacy/postgresql/build.sparc =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/postgresql/build.sparc (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/postgresql/build.sparc 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,249 @@ +#!/usr/bin/bash + +. ~/pkgs/scripts/env + +PACKAGE=postgresql +VERSION=8.3.3 +HOST=ra + +# Override some defaults, as we're installing in /opt/csw/postgresql +LD_OPTIONS_64="-R/opt/csw/lib/64:/opt/csw/postgresql/lib/sparcv9 -L/opt/csw/lib/64" +LD_OPTIONS_32="-R/opt/csw/lib:/opt/csw/postgresql/lib -L/opt/csw/lib" + + +TARBALL="postgresql-8.3.3.tar.gz" + +## Start + +# Delete build dir so we start fresh +if [ -d $BASE/build-$HOST/$PACKAGE-$VERSION/ ]; then + rm -rf $BASE/build-$HOST/$PACKAGE-$VERSION +fi + +# And unpack and change into it +cd $BASE/build-$HOST +gtar xzvf $SRC/$TARBALL +cd $BASE/build-$HOST/$PACKAGE-$VERSION/ + + +## +## 64-bit version +## + +LD_OPTIONS="$LD_OPTIONS_64" CC="$CC_SPARC_64" ./configure --prefix=/opt/csw/postgresql --with-pam --with-openssl --enable-multibyte --with-CXX --with-includes=/opt/csw/include/openssl:/opt/csw/include --bindir=/opt/csw/postgresql/bin/sparcv9 --datadir=/opt/csw/postgresql/share --libexecdir=/opt/csw/postgresql/lib/sparcv9 --libdir=/opt/csw/postgresql/lib/sparcv9 + +# Bug fix, needed in old versions, maybe not needed now ? +perl -p -i -e "s/\.seg/\.section/g" src/backend/storage/lmgr/s_lock.c + +LD_OPTIONS="$LD_OPTIONS_64" CC="$CC_SPARC_64" gmake +gmake DESTDIR=$BASE/build-$HOST/postgresql-$VERSION/cswstage install + +cd $BASE/build-$HOST/$PACKAGE-$VERSION/ + +## +## "Contrib" package +## + +cd contrib +LD_OPTIONS="$LD_OPTIONS_64" CC="$CC_SPARC_64" gmake +gmake DESTDIR=$BASE/build-$HOST/postgresql-$VERSION/contribstage install + + +## +## 32-bit version +## +cd $BASE/build-$HOST/$PACKAGE-$VERSION/ +gmake distclean + +LD_OPTIONS="$LD_OPTIONS_32" CC="$CC_SPARC_32" ./configure --prefix=/opt/csw/postgresql --with-pam --with-openssl --enable-multibyte --with-CXX --with-includes=/opt/csw/include/openssl:/opt/csw/include --bindir=/opt/csw/postgresql/bin/sparcv8 --datadir=/opt/csw/postgresql/share --libexecdir=/opt/csw/postgresql/lib --libdir=/opt/csw/postgresql/lib + +LD_OPTIONS="$LD_OPTIONS_32" CC="$CC_SPARC_32" gmake + +gmake DESTDIR=$BASE/build-$HOST/postgresql-$VERSION/cswstage install +cd $BASE/build-$HOST/$PACKAGE-$VERSION/ + +## +## "Contrib" package +## + +cd contrib +LD_OPTIONS="$LD_OPTIONS_32" CC="$CC_SPARC_32" gmake +gmake DESTDIR=$BASE/build-$HOST/postgresql-$VERSION/contribstage install +cd $BASE/build-$HOST/$PACKAGE-$VERSION/ + + +## +## Packaging stuff +## +# Clean up according to CSW standards +cd $BASE/build-$HOST/postgresql-$VERSION/cswstage/opt/csw/postgresql +[ ! -d share ] && mkdir share +for dir in man doc info; do + [ -d $dir ] && mv $dir share/ && ln -s share/$dir $dir +done + +cd $BASE/build-$HOST/postgresql-$VERSION/contribstage/opt/csw/postgresql +[ ! -d share ] && mkdir share +for dir in man doc info; do + [ -d $dir ] && mv $dir share/ && ln -s share/$dir $dir +done + + +## +## Move libpq to separate staging directory +## And include compat libraries from older packages +## +cd $BASE/build-$HOST/$PACKAGE-$VERSION/ +mkdir -p $BASE/build-$HOST/postgresql-$VERSION/libpqstage/opt/csw/postgresql + +# Unpack the compat tarball of old libraries +gtar -C $BASE/build-$HOST/postgresql-$VERSION/libpqstage -xzvf $BASE/pkgs/libpq/compat.sparc.tgz + +cd $BASE/build-$HOST/postgresql-$VERSION/libpqstage/opt/csw/postgresql +while read file; do + [ ! -d "`dirname $file`" ] && mkdir -p "`dirname $file`" + mv $BASE/build-$HOST/postgresql-$VERSION/cswstage/opt/csw/postgresql/$file $file +done < $BASE/pkgs/postgresql/libpqfiles.sparc + +cd $BASE/build-$HOST/$PACKAGE-$VERSION/ + +## +## Package everything up +## +cd $BASE/build-$HOST/postgresql-$VERSION/cswstage + +# Make the prototype +pkgproto . | sed "s/e opt/e \/opt/" | sed "s/$USER $GROUP/root bin/g" > prototype.tmp +gsed -i "/info\/dir 0644/d" prototype.tmp +gsed -i "/info=share/d" prototype.tmp +gsed -i "/man=share/d" prototype.tmp +gsed -i "/doc=share/d" prototype.tmp +gsed -i "/opt 0755/d" prototype.tmp +gsed -i "/prototype.tmp/d" prototype.tmp +cat $BASE/pkgs/postgresql/prototype.append >> prototype.tmp + +# Isaexec wrapper +cd opt/csw/postgresql/bin +for prog in sparcv9/*; do + echo "l none /opt/csw/postgresql/bin/`basename $prog`=/opt/csw/bin/isaexec" >> $BASE/build-$HOST/postgresql-$VERSION/cswstage/prototype.tmp +done +cd $BASE/build-$HOST/postgresql-$VERSION/cswstage + + +# Copy various files "outside" the package + +for file in copyright depend pkginfo preremove postinstall; do + cp $BASE/pkgs/postgresql/$file . + echo "i $file" >> prototype +done + +cp $BASE/pkgs/postgresql/cswpostgres.sparc cswpostgres +cp $BASE/pkgs/postgresql/postgresql.conf.sparc postgresql.conf.csw +cp $BASE/pkgs/postgresql/README-CSW.txt.sparc README-CSW.txt + +# Strip binaries +find . -type f | xargs file | grep ELF | \ + awk -F: '{print $1}' | xargs strip +find . -type f | xargs file | grep ELF | \ + awk -F: '{print $1}' | xargs /usr/ccs/bin/mcs -d + +# Make the prototype +cat prototype.tmp >> prototype +rm prototype.tmp + +# Hack the wonky pgxs file +/opt/csw/bin/gsed -i -e '/medusa/d' ./opt/csw/postgresql/lib/pgxs/src/Makefile.global +/opt/csw/bin/gsed -i -e '/medusa/d' ./opt/csw/postgresql/lib/sparcv9/pgxs/src/Makefile.global + +# And package! +createpkg -r . +gzip *.pkg +mv *.gz $BASE/pkgs/postgresql/ + + +## Package up libpq +cd $BASE/build-$HOST/postgresql-$VERSION/libpqstage + +# Make the prototype +pkgproto . | sed "s/e opt/e \/opt/" | sed "s/$USER $GROUP/root bin/g" > prototype.tmp +gsed -i "/info\/dir 0644/d" prototype.tmp +gsed -i "/info=share/d" prototype.tmp +gsed -i "/man=share/d" prototype.tmp +gsed -i "/doc=share/d" prototype.tmp +gsed -i "/opt 0755/d" prototype.tmp +gsed -i "/prototype.tmp/d" prototype.tmp + +# Isaexec wrapper +cd opt/csw/postgresql/bin +for prog in sparcv9/*; do + echo "l none /opt/csw/postgresql/bin/`basename $prog`=/opt/csw/bin/isaexec" >> $BASE/build-$HOST/postgresql-$VERSION/libpqstage/prototype.tmp +done +cd $BASE/build-$HOST/postgresql-$VERSION/libpqstage + +# Copy various files "outside" the package +for file in copyright depend pkginfo checkinstall; do + cp $BASE/pkgs/libpq/$file . + echo "i $file" >> prototype +done + + + +# Strip binaries +find . -type f | xargs file | grep ELF | \ + awk -F: '{print $1}' | xargs strip +find . -type f | xargs file | grep ELF | \ + awk -F: '{print $1}' | xargs /usr/ccs/bin/mcs -d + +# Make the prototype +cat prototype.tmp >> prototype +rm prototype.tmp + +# And build! +createpkg -r . +gzip *.pkg +mv *.gz $BASE/pkgs/libpq/ + + + +## Package up contrib + +cd $BASE/build-$HOST/postgresql-$VERSION/contribstage + +# Make the prototype +pkgproto . | sed "s/e opt/e \/opt/" | sed "s/$USER $GROUP/root bin/g" > prototype.tmp +gsed -i "/info\/dir 0644/d" prototype.tmp +gsed -i "/info=share/d" prototype.tmp +gsed -i "/man=share/d" prototype.tmp +gsed -i "/doc=share/d" prototype.tmp +gsed -i "/opt 0755/d" prototype.tmp +gsed -i "/prototype.tmp/d" prototype.tmp + +# Isaexec wrapper +cd opt/csw/postgresql/bin +for prog in sparcv9/*; do + echo "l none /opt/csw/postgresql/bin/`basename $prog`=/opt/csw/bin/isaexec" >> $BASE/build-$HOST/postgresql-$VERSION/contribstage/prototype.tmp +done +cd $BASE/build-$HOST/postgresql-$VERSION/contribstage + + +# Copy various files "outside" the package +for file in copyright depend pkginfo; do + cp $BASE/pkgs/postgresqlcontrib/$file . + echo "i $file" >> prototype +done + +# Strip binaries +find . -type f | xargs file | grep ELF | \ + awk -F: '{print $1}' | xargs strip +find . -type f | xargs file | grep ELF | \ + awk -F: '{print $1}' | xargs /usr/ccs/bin/mcs -d + +# Make the prototype +cat prototype.tmp >> prototype +rm prototype.tmp + +# And build! +createpkg -r . +gzip *.pkg +mv *.gz $BASE/pkgs/postgresqlcontrib/ + Property changes on: csw/mgar/pkg/postgresql/trunk/legacy/postgresql/build.sparc ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/postgresql/trunk/legacy/postgresql/build.x86 =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/postgresql/build.x86 (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/postgresql/build.x86 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,197 @@ +#!/usr/bin/bash +. ~/pkgs/scripts/env + +PACKAGE=postgresql +VERSION=8.3.3 +HOST=thor + +SRC=/export/medusa/src + +# Override some defaults, as we're installing in /opt/csw/postgresql +LD_OPTIONS_32="-R/opt/csw/lib:/opt/csw/postgresql/lib -L/opt/csw/lib -L/opt/csw/lib/postgresql" +CC_INTEL_32="cc -O -xarch=386 -xinline=%auto,no%AddAcl" + +TARBALL="postgresql-8.3.3.tar.gz" + +## Start + +# Delete build dir so we start fresh +if [ -d $BASE/build-$HOST/$PACKAGE-$VERSION/ ]; then + rm -rf $BASE/build-$HOST/$PACKAGE-$VERSION +fi + +# And unpack and change into it +cd $BASE/build-$HOST +gtar xzvf $SRC/$TARBALL +cd $BASE/build-$HOST/$PACKAGE-$VERSION/ + +## +## 32-bit version +## +gmake distclean + +LD_OPTIONS="$LD_OPTIONS_32" CC="$CC_INTEL_32" ./configure --prefix=/opt/csw/postgresql --with-pam --with-openssl --enable-multibyte --with-CXX --with-includes=/opt/csw/include/openssl:/opt/csw/include --datadir=/opt/csw/postgresql/share --libexecdir=/opt/csw/postgresql/lib --libdir=/opt/csw/postgresql/lib + +LD_OPTIONS="$LD_OPTIONS_32" CC="$CC_INTEL_32" gmake +gmake DESTDIR=$BASE/build-$HOST/postgresql-$VERSION/cswstage install + +cd $BASE/build-$HOST/$PACKAGE-$VERSION/ + +## +## "Contrib" package +## + +cd contrib +LD_OPTIONS="$LD_OPTIONS_32" CC="$CC_INTEL_32" gmake +gmake DESTDIR=$BASE/build-$HOST/postgresql-$VERSION/contribstage install +cd $BASE/build-$HOST/$PACKAGE-$VERSION/ + + +## +## Packaging stuff +## +# Clean up according to CSW standards +cd $BASE/build-$HOST/postgresql-$VERSION/cswstage/opt/csw/postgresql +[ ! -d share ] && mkdir share +for dir in man doc info; do + [ -d $dir ] && mv $dir share/ && ln -s share/$dir $dir +done + +cd $BASE/build-$HOST/postgresql-$VERSION/contribstage/opt/csw/postgresql +[ ! -d share ] && mkdir share +for dir in man doc info; do + [ -d $dir ] && mv $dir share/ && ln -s share/$dir $dir +done + + +## +## Move libpq to separate staging directory +## +cd $BASE/build-$HOST/$PACKAGE-$VERSION/ +mkdir -p $BASE/build-$HOST/postgresql-$VERSION/libpqstage/opt/csw/postgresql + +# Unpack the compat tarball of old libraries +gtar -C $BASE/build-$HOST/postgresql-$VERSION/libpqstage -xzvf $BASE/pkgs/libpq/compat.x86.tgz + +cd $BASE/build-$HOST/postgresql-$VERSION/libpqstage/opt/csw/postgresql +while read file; do + [ ! -d "`dirname $file`" ] && mkdir -p "`dirname $file`" + mv $BASE/build-$HOST/postgresql-$VERSION/cswstage/opt/csw/postgresql/$file $file +done < $BASE/pkgs/postgresql/libpqfiles.x86 + + +## +## Package everything up +## + +cd $BASE/build-$HOST/postgresql-$VERSION/cswstage + +# Make the prototype +pkgproto . | sed "s/e opt/e \/opt/" | sed "s/$USER $GROUP/root bin/g" > prototype.tmp +gsed -i "/info\/dir 0644/d" prototype.tmp +gsed -i "/info=share/d" prototype.tmp +gsed -i "/man=share/d" prototype.tmp +gsed -i "/doc=share/d" prototype.tmp +gsed -i "/opt 0755/d" prototype.tmp +gsed -i "/prototype.tmp/d" prototype.tmp +cat $BASE/pkgs/postgresql/prototype.append >> prototype.tmp + +# Copy various files "outside" the package + +for file in copyright depend pkginfo preremove postinstall; do + cp $BASE/pkgs/postgresql/$file . + echo "i $file" >> prototype +done + +cp $BASE/pkgs/postgresql/cswpostgres.x86 cswpostgres +cp $BASE/pkgs/postgresql/postgresql.conf.x86 postgresql.conf.csw +cp $BASE/pkgs/postgresql/README-CSW.txt.x86 README-CSW.txt + +# Strip binaries +find . -type f | xargs file | grep ELF | \ + awk -F: '{print $1}' | xargs strip +find . -type f | xargs file | grep ELF | \ + awk -F: '{print $1}' | xargs /usr/ccs/bin/mcs -d + +# Make the prototype +cat prototype.tmp >> prototype +rm prototype.tmp + +# Hack the wonky pgxs file +/opt/csw/bin/gsed -i -e '/medusa/d' ./opt/csw/postgresql/lib/pgxs/src/Makefile.global + +# And package! +createpkg -r . +gzip *.pkg +mv *.gz $BASE/pkgs/postgresql/ + + +## Package up libpq +cd $BASE/build-$HOST/postgresql-$VERSION/libpqstage + +# Make the prototype +pkgproto . | sed "s/e opt/e \/opt/" | sed "s/$USER $GROUP/root bin/g" > prototype.tmp +gsed -i "/info\/dir 0644/d" prototype.tmp +gsed -i "/info=share/d" prototype.tmp +gsed -i "/man=share/d" prototype.tmp +gsed -i "/doc=share/d" prototype.tmp +gsed -i "/opt 0755/d" prototype.tmp +gsed -i "/prototype.tmp/d" prototype.tmp + +# Copy various files "outside" the package +for file in copyright depend pkginfo checkinstall; do + cp $BASE/pkgs/libpq/$file . + echo "i $file" >> prototype +done + +# Strip binaries +find . -type f | xargs file | grep ELF | \ + awk -F: '{print $1}' | xargs strip +find . -type f | xargs file | grep ELF | \ + awk -F: '{print $1}' | xargs /usr/ccs/bin/mcs -d + +# Make the prototype +cat prototype.tmp >> prototype +rm prototype.tmp + +# And build! +createpkg -r . +gzip *.pkg +mv *.gz $BASE/pkgs/libpq/ + + + +## Package up contrib + +cd $BASE/build-$HOST/postgresql-$VERSION/contribstage + +# Make the prototype +pkgproto . | sed "s/e opt/e \/opt/" | sed "s/$USER $GROUP/root bin/g" > prototype.tmp +gsed -i "/info\/dir 0644/d" prototype.tmp +gsed -i "/info=share/d" prototype.tmp +gsed -i "/man=share/d" prototype.tmp +gsed -i "/doc=share/d" prototype.tmp +gsed -i "/opt 0755/d" prototype.tmp +gsed -i "/prototype.tmp/d" prototype.tmp + +# Copy various files "outside" the package +for file in copyright depend pkginfo; do + cp $BASE/pkgs/postgresqlcontrib/$file . + echo "i $file" >> prototype +done + +# Strip binaries +find . -type f | xargs file | grep ELF | \ + awk -F: '{print $1}' | xargs strip +find . -type f | xargs file | grep ELF | \ + awk -F: '{print $1}' | xargs /usr/ccs/bin/mcs -d + +# Make the prototype +cat prototype.tmp >> prototype +rm prototype.tmp + +# And build! +createpkg -r . +gzip *.pkg +mv *.gz $BASE/pkgs/postgresqlcontrib/ + Property changes on: csw/mgar/pkg/postgresql/trunk/legacy/postgresql/build.x86 ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/postgresql/trunk/legacy/postgresql/copyright =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/postgresql/copyright (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/postgresql/copyright 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,23 @@ +PostgreSQL Database Management System +(formerly known as Postgres, then as Postgres95) + +Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group + +Portions Copyright (c) 1994, The Regents of the University of California + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose, without fee, and without a written agreement +is hereby granted, provided that the above copyright notice and this +paragraph and the following two paragraphs appear in all copies. + +IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR +DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING +LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS +DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + +THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS +ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO +PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. Added: csw/mgar/pkg/postgresql/trunk/legacy/postgresql/cswpostgres.sparc =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/postgresql/cswpostgres.sparc (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/postgresql/cswpostgres.sparc 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,97 @@ +#!/bin/sh +# PostgreSQL startup script - part of the CSWpostgresql package +# mark at blastwave.org + +# Read in the user configuration file +[ -s /opt/csw/etc/postgresql.conf ] && . /opt/csw/etc/postgresql.conf +[ -s /etc/opt/csw/postgresql.conf ] && . /etc/opt/csw/postgresql.conf + +# Defaults +[ -z "$PGDATA" ] && PGDATA=/opt/csw/var/pgdata +[ -z "$PGCTL" ] && PGCTL=/opt/csw/postgresql/bin/sparcv8/pg_ctl +[ -z "$PGINIT" ] && PGINIT=/opt/csw/postgresql/bin/sparcv8/initdb + + +# The following attempts to catch any mistakes in the server +# version - it checks if the 64-bit server was last run. If so, +# it forces the 64-bit server, otherwise it won't start up! +# And vice-versa for the 32-bit server... +if [ -f $PGDATA/postmaster.opts ]; then + grep 'sparcv9' $PGDATA/postmaster.opts > /dev/null + if [ $? -eq 0 ]; then + echo $PGCTL | grep "sparcv8" > /dev/null + if [ $? -eq 0 ]; then + echo "Warning: 32-bit server was specified in /etc/init.d/cswpostgres," + echo " but 64-bit version was last run. Using 64-bit server..." + fi + PGCTL=/opt/csw/postgresql/bin/sparcv9/pg_ctl + PGINIT=/opt/csw/postgresql/bin/sparcv9/initdb + else + # Did not detect 64-bit server last used + echo $PGCTL | grep "sparcv8" > /dev/null + if [ $? -ne 0 ]; then + echo "Warning: 64-bit server was specified in /etc/init.d/cswpostgres," + echo " but 32-bit version was last run. Using 32-bit server..." + fi + PGCTL=/opt/csw/postgresql/bin/sparcv8/pg_ctl + PGINIT=/opt/csw/postgresql/bin/sparcv8/initdb + fi +fi + +# Exit if postgres user hasn't been created. +grep '^postgres:' /etc/passwd >/dev/null +if [ $? -ne 0 ] ; then + getent passwd postgres >/dev/null + if [ $? -ne 0 ] ; then + exit 0 + fi +fi + +# Change to /var/tmp, as pgctl etc. need to be started from +# a directory that they can read +cd /var/tmp + +case "$1" in +start) + if [ -d $PGDATA -a `ls -l $PGDATA 2> /dev/null | wc -l` -gt 1 ]; then + # PostgreSQL data directory exists and is populated + echo "Starting PostgreSQL..." + su postgres -c "$PGCTL -D $PGDATA -l $PGDATA/postgresql.log start $SERVEROPTS" + fi + ;; + +stop) + echo "Stopping PostgreSQL database..." + su postgres -c "$PGCTL -D $PGDATA -l $PGDATA/postgresql.log stop" + ;; + +restart) + echo "Restarting PostgreSQL database..." + su postgres -c "$PGCTL -D $PGDATA -l $PGDATA/postgresql.log restart $SERVEROPTS" + ;; + +reload) + echo "Reloading PostgreSQL database..." + su postgres -c "$PGCTL -D $PGDATA -l $PGDATA/postgresql.log reload $SERVEROPTS" + ;; + +status) + su postgres -c "$PGCTL -D $PGDATA status" + ;; + +init) + # create and initialise data directory + echo "Creating PostgreSQL data directory at $PGDATA..." + # Create it, unless it's already there and empty + [ -d $PGDATA -a `ls -l $PGDATA 2> /dev/null | wc -l` -eq 1 ] || mkdir -p $PGDATA + chown postgres $PGDATA + echo "Initialising PostgreSQL database..." + su postgres -c "$PGINIT -D $PGDATA > /dev/null" + ;; + +*) + echo "Usage: $0 (init|start|stop|restart|reload|status)" + ;; + +esac + Property changes on: csw/mgar/pkg/postgresql/trunk/legacy/postgresql/cswpostgres.sparc ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/postgresql/trunk/legacy/postgresql/cswpostgres.x86 =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/postgresql/cswpostgres.x86 (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/postgresql/cswpostgres.x86 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,71 @@ +#!/bin/sh +# PostgreSQL startup script - part of the CSWpostgresql package +# mark at blastwave.org + +# Read in the user configuration file +[ -s /opt/csw/etc/postgresql.conf ] && . /opt/csw/etc/postgresql.conf +[ -s /etc/opt/csw/postgresql.conf ] && . /etc/opt/csw/postgresql.conf + +# Defaults +[ -z "$PGDATA" ] && PGDATA=/opt/csw/var/pgdata +[ -z "$PGCTL" ] && PGCTL=/opt/csw/postgresql/bin/pg_ctl +[ -z "$PGINIT" ] && PGINIT=/opt/csw/postgresql/bin/initdb + + +# Exit if postgres user hasn't been created. +grep '^postgres:' /etc/passwd >/dev/null +if [ $? -ne 0 ] ; then + getent passwd postgres >/dev/null + if [ $? -ne 0 ] ; then + exit 0 + fi +fi + +# Change to a directory that pg_ctl etc. can read - startup fails +# otherwise +cd /var/tmp + +case "$1" in +start) + if [ -d $PGDATA -a `ls -l $PGDATA 2> /dev/null | wc -l` -gt 1 ]; then + # PostgreSQL data directory exists and is populated + echo "Starting PostgreSQL..." + su postgres -c "$PGCTL -D $PGDATA -l $PGDATA/postgresql.log start $SERVEROPTS" + fi + ;; + +stop) + echo "Stopping PostgreSQL database..." + su postgres -c "$PGCTL -D $PGDATA -l $PGDATA/postgresql.log stop" + ;; + +restart) + echo "Restarting PostgreSQL database..." + su postgres -c "$PGCTL -D $PGDATA -l $PGDATA/postgresql.log restart $SERVEROPTS" + ;; + +reload) + echo "Reloading PostgreSQL database..." + su postgres -c "$PGCTL -D $PGDATA -l $PGDATA/postgresql.log reload $SERVEROPTS" + ;; + +status) + su postgres -c "$PGCTL -D $PGDATA status" + ;; + +init) + # create and initialise data directory + echo "Creating PostgreSQL data directory at $PGDATA..." + # Create it, unless it's already there and empty + [ -d $PGDATA -a `ls -l $PGDATA 2> /dev/null | wc -l` -eq 1 ] || mkdir -p $PGDATA + chown postgres $PGDATA + echo "Initialising PostgreSQL database..." + su postgres -c "$PGINIT -D $PGDATA > /dev/null" + ;; + +*) + echo "Usage: $0 (init|start|stop|restart|reload|status)" + ;; + +esac + Property changes on: csw/mgar/pkg/postgresql/trunk/legacy/postgresql/cswpostgres.x86 ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/postgresql/trunk/legacy/postgresql/depend =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/postgresql/depend (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/postgresql/depend 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,5 @@ +P CSWreadline +P CSWosslrt +P CSWlibpq +P CSWzlib +P CSWisaexec Added: csw/mgar/pkg/postgresql/trunk/legacy/postgresql/libpqfiles.sparc =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/postgresql/libpqfiles.sparc (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/postgresql/libpqfiles.sparc 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,45 @@ +lib/libpq.so.5.1 +lib/libpq.so.5 +lib/libpq.so +lib/libpq.a +lib/libecpg.so.6.0 +lib/libecpg.so.6 +lib/libecpg.so +lib/libecpg.a +lib/libpgtypes.a +lib/libpgtypes.so +lib/libpgtypes.so.3 +lib/libpgtypes.so.3.0 +lib/sparcv9/libpq.so.5.1 +lib/sparcv9/libpq.so.5 +lib/sparcv9/libpq.so +lib/sparcv9/libpq.a +lib/sparcv9/libecpg.so.6.0 +lib/sparcv9/libecpg.so.6 +lib/sparcv9/libecpg.so +lib/sparcv9/libecpg.a +lib/sparcv9/libpgtypes.a +lib/sparcv9/libpgtypes.so +lib/sparcv9/libpgtypes.so.3 +lib/sparcv9/libpgtypes.so.3.0 +include/sqlca.h +include/sql3types.h +include/internal/pqexpbuffer.h +include/internal/libpq-int.h +include/postgres_ext.h +include/pg_config_os.h +include/pg_config.h +include/libpq/libpq-fs.h +include/libpq-fe.h +include/ecpgtype.h +include/ecpglib.h +include/ecpgerrno.h +include/pgtypes_date.h +include/pgtypes_error.h +include/pgtypes_interval.h +include/pgtypes_numeric.h +include/pgtypes_timestamp.h +bin/sparcv8/ecpg +bin/sparcv9/ecpg +bin/sparcv8/pg_config +bin/sparcv9/pg_config Added: csw/mgar/pkg/postgresql/trunk/legacy/postgresql/libpqfiles.x86 =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/postgresql/libpqfiles.x86 (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/postgresql/libpqfiles.x86 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,31 @@ +lib/libpq.so.5.1 +lib/libpq.so.5 +lib/libpq.so +lib/libpq.a +lib/libecpg.so.6.0 +lib/libecpg.so.6 +lib/libecpg.so +lib/libecpg.a +lib/libpgtypes.a +lib/libpgtypes.so +lib/libpgtypes.so.3 +lib/libpgtypes.so.3.0 +include/sqlca.h +include/sql3types.h +include/internal/pqexpbuffer.h +include/internal/libpq-int.h +include/postgres_ext.h +include/pg_config_os.h +include/pg_config.h +include/libpq/libpq-fs.h +include/libpq-fe.h +include/ecpgtype.h +include/ecpglib.h +include/ecpgerrno.h +include/pgtypes_date.h +include/pgtypes_error.h +include/pgtypes_interval.h +include/pgtypes_numeric.h +include/pgtypes_timestamp.h +bin/ecpg +bin/pg_config Added: csw/mgar/pkg/postgresql/trunk/legacy/postgresql/pkginfo =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/postgresql/pkginfo (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/postgresql/pkginfo 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,7 @@ +PKG=CSWpostgresql +NAME=postgresql - advanced open source database system +VERSION=8.3.3,REV=2008.06.26 +CATEGORY=application +VENDOR=http://www.postgresql.org/ packaged for CSW by Mark Round +HOTLINE=http://www.blastwave.org/bugtrack/ +EMAIL=mark at blastwave.org Added: csw/mgar/pkg/postgresql/trunk/legacy/postgresql/postgresql.conf.sparc =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/postgresql/postgresql.conf.sparc (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/postgresql/postgresql.conf.sparc 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,34 @@ +# Example PostgreSQL server configuration file. +# Provided by the Blastwave package of PostgreSQL. +# This file is read by the /etc/init.d/cswpostgres startup script, +# and can be used to override the defaults. + +# The location of the data directory. +# Default : /opt/csw/var/pgdata +PGDATA=/opt/csw/var/pgdata + + +# Which binaries to use, 32- or 64-bit. +# Only use the 64-bit server if you're sure you need it. +# Make sure you have read /opt/csw/postgresql/share/doc/README-CSW.txt +# before changing these, as your databases may not work without +# a 'dump and restore' cycle ! + +# 32-bit server - default, and fine for most uses +PGCTL=/opt/csw/postgresql/bin/sparcv8/pg_ctl +PGINIT=/opt/csw/postgresql/bin/sparcv8/initdb + +# 64-bit server - uncomment these lines only if you really need them. +#PGCTL=/opt/csw/postgresql/bin/sparcv9/pg_ctl +#PGINIT=/opt/csw/postgresql/bin/sparcv9/initdb + + +# Additional options to pass to postmaster. +# These options will be passed to the postmaster program. The most common use of +# these is to allow network access to PostgreSQL from other hosts over TCP/IP. +# This is done by using the flags "-o -i", as in the example below. +# Uncomment this line to enable network access to PostgreSQL. +# Note that you will still need to configure authentication in the pg_hba.conf +# in your data directory. +# SERVEROPTS="-o -i" + Added: csw/mgar/pkg/postgresql/trunk/legacy/postgresql/postgresql.conf.x86 =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/postgresql/postgresql.conf.x86 (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/postgresql/postgresql.conf.x86 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,19 @@ +# Example PostgreSQL server configuration file. +# Provided by the Blastwave package of PostgreSQL. +# This file is read by the /etc/init.d/cswpostgres startup script, +# and can be used to override the defaults. + +# The location of the data directory. +# Default : /opt/csw/var/pgdata +PGDATA=/opt/csw/var/pgdata + + +# Additional options to pass to postmaster. +# These options will be passed to the postmaster program. The most common use of +# these is to allow network access to PostgreSQL from other hosts over TCP/IP. +# This is done by using the flags "-o -i", as in the example below. +# Uncomment this line to enable network access to PostgreSQL. +# Note that you will still need to configure authentication in the pg_hba.conf +# in your data directory. +# SERVEROPTS="-o -i" + Added: csw/mgar/pkg/postgresql/trunk/legacy/postgresql/postinstall =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/postgresql/postinstall (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/postgresql/postinstall 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,44 @@ +#!/bin/sh +# This script makes sure the postgres user exists. If not, it creates it. +# Modified from the MySQL script by Philip Brown. + +PGSQLHOME=/opt/csw/var/pgdata + +if [ "$PKG_ROOT_DIR" = "" ] ; then + PKG_ROOT_DIR="/" +fi + +#First check target machines password file, THEN check +#NIS/NIS+/whatever + +grep '^postgres:' $PKG_ROOT_DIR/etc/passwd >/dev/null +if [ $? -ne 0 ] ; then + getent passwd postgres >/dev/null + if [ $? -ne 0 ] ; then + NEEDUSER=1 + fi +fi + +if [ "$NEEDUSER" = 1 ] ; then + echo adding postgres user + chroot $PKG_ROOT_DIR /usr/sbin/useradd postgres + chroot $PKG_ROOT_DIR /usr/sbin/usermod -s /bin/sh -d $PGSQLHOME postgres +else + echo postgres user detected +fi + +# Start the server again... +/etc/init.d/cswpostgres start + + +cat < /dev/null + /etc/init.d/cswpostgres status && /etc/init.d/cswpostgres stop + /etc/init.d/cswpostgres status && exit 2 +fi +exit 0 + Property changes on: csw/mgar/pkg/postgresql/trunk/legacy/postgresql/preremove ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/postgresql/trunk/legacy/postgresql/prototype.append =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/postgresql/prototype.append (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/postgresql/prototype.append 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,8 @@ +f none /etc/init.d/cswpostgres=cswpostgres 0744 root sys +f none /opt/csw/etc/postgresql.conf.csw=postgresql.conf.csw 0755 root sys +f none /opt/csw/postgresql/share/doc/README-CSW.txt=README-CSW.txt 0644 root sys +s none /etc/rc3.d/S10cswpostgres=../init.d/cswpostgres +s none /etc/rc0.d/K90cswpostgres=../init.d/cswpostgres +s none /etc/rc1.d/K90cswpostgres=../init.d/cswpostgres +s none /etc/rc2.d/K90cswpostgres=../init.d/cswpostgres +s none /etc/rcS.d/K90cswpostgres=../init.d/cswpostgres Added: csw/mgar/pkg/postgresql/trunk/legacy/postgresqlcontrib/copyright =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/postgresqlcontrib/copyright (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/postgresqlcontrib/copyright 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,23 @@ +PostgreSQL Database Management System +(formerly known as Postgres, then as Postgres95) + +Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group + +Portions Copyright (c) 1994, The Regents of the University of California + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose, without fee, and without a written agreement +is hereby granted, provided that the above copyright notice and this +paragraph and the following two paragraphs appear in all copies. + +IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR +DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING +LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS +DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + +THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS +ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO +PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. Added: csw/mgar/pkg/postgresql/trunk/legacy/postgresqlcontrib/depend =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/postgresqlcontrib/depend (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/postgresqlcontrib/depend 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,5 @@ +P CSWlibpq +P CSWreadline +P CSWosslrt +P CSWzlib + Added: csw/mgar/pkg/postgresql/trunk/legacy/postgresqlcontrib/pkginfo =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/postgresqlcontrib/pkginfo (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/postgresqlcontrib/pkginfo 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,8 @@ +PKG=CSWpostgresqlcontrib +NAME=postgresqlcontrib - utilities not part of the core PostgreSQL distribution +VERSION=8.3.3,REV=2008.06.26 +CATEGORY=application +VENDOR=http://www.postgresql.org/ packaged for CSW by Mark Round +HOTLINE=http://www.blastwave.org/bugtrack/ +EMAIL=mark at blastwave.org + Added: csw/mgar/pkg/postgresql/trunk/legacy/scripts/env =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/scripts/env (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/scripts/env 2008-12-12 21:15:09 UTC (rev 2567) @@ -0,0 +1,21 @@ +#!/usr/bin/bash +# Sets some common variables + +BASE="/export/medusa/mark" +SRC="/export/medusa/src" + +USER="mark" +GROUP="`groups | awk '{print $1}'`" + +PATH="/opt/SUNWspro/bin:/opt/csw/bin:$PATH" +LD_OPTIONS_64="-R/opt/csw/lib/64 -L/opt/csw/lib/64" +LD_OPTIONS_32="-R/opt/csw/lib -L/opt/csw/lib" + +CC_SPARC_64="cc -xtarget=ultra -xarch=v9" +CC_SPARC_32="cc -xarch=v8" + +#CC_SPARC_64="cc -fast -xtarget=ultra -xarch=v9" +#CC_SPARC_32="cc -fast -xarch=v8" + +CC_INTEL_32="cc -xarch=386" +CC_INTEL_64="cc -xtarget=opteron -xarch=amd64" 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 Dec 12 22:16:43 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 12 Dec 2008 21:16:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[2568] csw/mgar/pkg/postgresql/trunk/legacy/README. postgresqljdbc Message-ID: Revision: 2568 http://gar.svn.sourceforge.net/gar/?rev=2568&view=rev Author: dmichelsen Date: 2008-12-12 21:16:43 +0000 (Fri, 12 Dec 2008) Log Message: ----------- postgresqljdbc: Add legacy build description Added Paths: ----------- csw/mgar/pkg/postgresql/trunk/legacy/README.postgresqljdbc Added: csw/mgar/pkg/postgresql/trunk/legacy/README.postgresqljdbc =================================================================== --- csw/mgar/pkg/postgresql/trunk/legacy/README.postgresqljdbc (rev 0) +++ csw/mgar/pkg/postgresql/trunk/legacy/README.postgresqljdbc 2008-12-12 21:16:43 UTC (rev 2568) @@ -0,0 +1,24 @@ +Oh, and here's the postgresqljdbc prototype. No build script needed +for this, all I ever did was repackage the .jar files : + +i pkginfo +i copyright +d none /opt/csw 0755 root bin +d none /opt/csw/postgresql 0755 root bin +d none /opt/csw/postgresql/share 0755 root bin +d none /opt/csw/share 0755 root bin +d none /opt/csw/share/java 0755 root bin +f none /opt/csw/share/java/pg81jdbc2.jar 0644 root bin +f none /opt/csw/share/java/pg81jdbc2ee.jar 0644 root bin +f none /opt/csw/share/java/pg81jdbc3.jar 0644 root bin +f none /opt/csw/share/java/pg82jdbc2.jar 0644 root bin +f none /opt/csw/share/java/pg82jdbc2ee.jar 0644 root bin +f none /opt/csw/share/java/pg82jdbc3.jar 0644 root bin +f none /opt/csw/share/java/pg82jdbc4.jar 0644 root bin +s none /opt/csw/postgresql/share/pgjdbc4.jar=/opt/csw/share/java/pg82jdbc4.jar +s none /opt/csw/postgresql/share/pgjdbc3.jar=/opt/csw/share/java/pg82jdbc3.jar +s none /opt/csw/postgresql/share/pgjdbc2.jar=/opt/csw/share/java/pg82jdbc2.jar +s none /opt/csw/postgresql/share/pgjdbc2ee.jar=/opt/csw/share/java/pg82jdbc2ee.jar +s none /opt/csw/share/java/pgjdbc3.jar=pg81jdbc3.jar +s none /opt/csw/share/java/pgjdbc2.jar=pg81jdbc2.jar +s none /opt/csw/share/java/pgjdbc2ee.jar=pg81jdbc2ee.jar This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From william at wbonnet.net Fri Dec 12 21:30:47 2008 From: william at wbonnet.net (William Bonnet) Date: Fri, 12 Dec 2008 21:30:47 +0100 Subject: [csw-devel] Upstream Watch progress report In-Reply-To: <4942A8BF.1010201@opencsw.org> References: <49419757.1030503@wbonnet.net> <4942A8BF.1010201@opencsw.org> Message-ID: <4942C9F7.4070808@wbonnet.net> Hi Trygve >> Trygve, if you have time in the next weeks, we can look to a possibility >> of make this working together with Hudson. >> > > Let me know what you want and I can get it into Hudson. > Thanks :) We'll talk about this soon. Maybe this week end or next week on irc. Otherwise i'll drop you an email. Cheers -- William http://www.wbonnet.net http://www.sunwizard.net Le site fran?ais des amateurs de stations Unix http://www.blastwave.org An OpenSolaris Community Site http://www.opencsw.org Community SoftWare for Solaris http://www.guses.org French speaking Solaris User Group From chninkel at users.sourceforge.net Sat Dec 13 12:33:23 2008 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 13 Dec 2008 11:33:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[2569] csw/mgar/pkg/lftp/trunk Message-ID: Revision: 2569 http://gar.svn.sourceforge.net/gar/?rev=2569&view=rev Author: chninkel Date: 2008-12-13 11:33:23 +0000 (Sat, 13 Dec 2008) Log Message: ----------- lftp: update to 3.7.7 Modified Paths: -------------- csw/mgar/pkg/lftp/trunk/Makefile csw/mgar/pkg/lftp/trunk/checksums csw/mgar/pkg/lftp/trunk/files/changelog.CSW Modified: csw/mgar/pkg/lftp/trunk/Makefile =================================================================== --- csw/mgar/pkg/lftp/trunk/Makefile 2008-12-12 21:16:43 UTC (rev 2568) +++ csw/mgar/pkg/lftp/trunk/Makefile 2008-12-13 11:33:23 UTC (rev 2569) @@ -1,5 +1,5 @@ GARNAME = lftp -GARVERSION = 3.7.6 +GARVERSION = 3.7.7 CATEGORIES = net DESCRIPTION = sophisticated command-line ftp/http client Modified: csw/mgar/pkg/lftp/trunk/checksums =================================================================== --- csw/mgar/pkg/lftp/trunk/checksums 2008-12-12 21:16:43 UTC (rev 2568) +++ csw/mgar/pkg/lftp/trunk/checksums 2008-12-13 11:33:23 UTC (rev 2569) @@ -1,7 +1,7 @@ -53424ab64756a387f3367f475261358a download/lftp-3.7.6.tar.gz +7b7aebf99e862fa4b9dcf892b7b45d82 download/lftp-3.7.7.tar.gz 47fdb80e4575a9a70d69b146974620df download/CSWlftp.gspec 96ee1569832d5eaed0c3a7b37e13fc88 download/CSWlftp.prototype f2c7e3e3db9f5c48dddb983c95588528 download/CSWlftp.depend -eb73ad48caf3cc5d4d3f683c29a1859a download/changelog.CSW +1bcc79a591071b5110fa57c072b57818 download/changelog.CSW 3a01fb949dfe799507720c311222cd96 download/i.conf 51abe2144219c1af4c79c2e8b7e81cb9 download/r.conf Modified: csw/mgar/pkg/lftp/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2008-12-12 21:16:43 UTC (rev 2568) +++ csw/mgar/pkg/lftp/trunk/files/changelog.CSW 2008-12-13 11:33:23 UTC (rev 2569) @@ -1,3 +1,9 @@ +lftp (3.7.7,REV=2008.12.12) unstable + + * New upstream version. + + -- Yann Rouillard Sat, 13 Dec 2008 11:53:59 +0100 + lftp (3.7.6,REV=2008.11.30) unstable * New upstream version. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Dec 13 14:30:45 2008 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 13 Dec 2008 13:30:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[2570] csw/mgar/pkg/openssl/trunk Message-ID: Revision: 2570 http://gar.svn.sourceforge.net/gar/?rev=2570&view=rev Author: chninkel Date: 2008-12-13 13:30:44 +0000 (Sat, 13 Dec 2008) Log Message: ----------- openssl: last fixes to be able to build with gar v2 Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile csw/mgar/pkg/openssl/trunk/checksums csw/mgar/pkg/openssl/trunk/files/CSWossl.gspec csw/mgar/pkg/openssl/trunk/files/CSWossldevel.gspec csw/mgar/pkg/openssl/trunk/files/CSWosslrt.gspec csw/mgar/pkg/openssl/trunk/files/CSWosslutils.gspec csw/mgar/pkg/openssl/trunk/files/changelog.CSW Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2008-12-13 11:33:23 UTC (rev 2569) +++ csw/mgar/pkg/openssl/trunk/Makefile 2008-12-13 13:30:44 UTC (rev 2570) @@ -41,8 +41,9 @@ # we don't yet use isaexec support so we disable # isa relocation for default isa NO_ISAEXEC = 1 -#ISA_RELOCATE_DIRS_i386 = -#ISA_RELOCATE_DIRS_sparcv8 = +# GAR wants and puts sparcv9 in lib/64 but openssl build system +# isn't the standard autoconf/automake one so we disable this +# relocation for now ISALIBDIR_sparcv9 = . libdir = /opt/csw/lib @@ -91,7 +92,7 @@ pre-configure-modulated: echo " ==> Creating configure script" cd $(WORKSRC) && ln -nf Configure configure - $(MAKECOOKIE) + @$(MAKECOOKIE) # we remove every debug information except symbol table # (should rather be done in the gar scripts) @@ -99,18 +100,22 @@ chmod -R u+w $(PKGROOT)$(libdir) find $(PKGROOT)$(libdir) -name "*.so*" -exec strip -x '{}' ';' +install-changelog: + ginstall -D $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/changelog.CSW $(SPKG_PKGBASE)/changelog.CSW + @$(MAKECOOKIE) + install-certs: [ -f $(PKGROOT)$(prefix)/ssl/openssl.cnf ] && \ ginstall -D $(PKGROOT)$(prefix)/ssl/openssl.cnf $(PKGROOT)$(sysconfdir)/ssl/openssl.cnf gunzip --stdout $(CURDIR)/$(FILEDIR)/certs.tar.gz | (cd $(PKGROOT)$(prefix)/ssl/certs && tar xf -) - cp -r $(WORKSRC)/certs/* $(PKGROOT)$(prefix)/ssl/certs + cp -r $(WORKSRC_FIRSTMOD)/certs/* $(PKGROOT)$(prefix)/ssl/certs OPENSSL=$(PKGROOT)/$(bindir)/openssl $(PKGROOT)/$(bindir)/c_rehash $(PKGROOT)/$(prefix)/ssl/certs/ - $(MAKECOOKIE) + @$(MAKECOOKIE) install-oldlibs: $(addprefix install-oldlibs-,$(OLDLIBS)) install-oldlibs-%: echo " ==> Installing old libraries $* from archive oldlibs.$*-$(GARCH).tar.gz"; \ cd $(PKGROOT) && gunzip -c $(CURDIR)/$(FILEDIR)/oldlibs.$*-$(GARCH).tar.gz | tar xvf - && \ - $(MAKECOOKIE) + @$(MAKECOOKIE) -pre-package: striplib install-certs install-oldlibs +post-merge: striplib install-certs install-oldlibs install-changelog Modified: csw/mgar/pkg/openssl/trunk/checksums =================================================================== --- csw/mgar/pkg/openssl/trunk/checksums 2008-12-13 11:33:23 UTC (rev 2569) +++ csw/mgar/pkg/openssl/trunk/checksums 2008-12-13 13:30:44 UTC (rev 2570) @@ -1,20 +1,20 @@ 561e00f18821c74b2b86c8c7786f9d8b download/openssl-0.9.8i.tar.gz -bc7aa9d2ea44e9ac28b11db12402024e download/CSWossl.gspec +b5ded4412606a0996595015bc2ff6974 download/CSWossl.gspec 05b45e7124833dee48e5f3c45591e95b download/CSWossl.depend 7fe01ca4ef9d0e971d57b00f4d0b168b download/CSWossl.prototype -cf0fa997cc719009991e67b4264caeed download/CSWosslrt.gspec +83480e01971e71d037bd44fa5ed4e4e5 download/CSWosslrt.gspec 78c26f65b14f3ebf4a29069a3f675285 download/CSWosslrt.checkinstall d41d8cd98f00b204e9800998ecf8427e download/CSWosslrt.depend cba143e52cb08dd3ee39f275aefa075d download/CSWosslrt.prototype-i386 ceeb4a59f1c31ae4deac9f2b61dadca2 download/CSWosslrt.prototype-sparc -1791edde7bf1bce62ac799852459dc47 download/CSWossldevel.gspec +2ac43ebf4689d236540e22171541be4e download/CSWossldevel.gspec 37995caa7f4155066b00fb7503e853da download/CSWossldevel.depend 45161ff3a5b00fd6942f63b77c0b0ed1 download/CSWossldevel.prototype-i386 7b1dd2e8c78b033ca2a8be4de097b147 download/CSWossldevel.prototype-sparc -0d55e4c93c94a1a72fb295d0ee6225d4 download/CSWosslutils.gspec +eec77249fb642c525cad67dcd055fb77 download/CSWosslutils.gspec 37995caa7f4155066b00fb7503e853da download/CSWosslutils.depend 6e0c86ddc23d044757810cca6f31f017 download/CSWosslutils.prototype -e3f149dea30df046b9042a69639bcf3b download/changelog.CSW +1bd6e7ee77845fc4de843d7479a4bdb9 download/changelog.CSW 7fdc09cd3c11db459c83c8946f7872f6 download/i.conf a454ac09091085813ec8900f5a0c917c download/r.conf 64f7c3f3a6cae483209b69c31c82557d download/openssl.0.9.8.patch Modified: csw/mgar/pkg/openssl/trunk/files/CSWossl.gspec =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWossl.gspec 2008-12-13 11:33:23 UTC (rev 2569) +++ csw/mgar/pkg/openssl/trunk/files/CSWossl.gspec 2008-12-13 13:30:44 UTC (rev 2570) @@ -4,4 +4,4 @@ %var desc Openssl meta package %var pkgfile %{bitname}-%{SPKG_VERSION}%{SPKG_REVSTAMP}-%{SPKG_OSNAME}-all-CSW.pkg %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/LICENSE +%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Modified: csw/mgar/pkg/openssl/trunk/files/CSWossldevel.gspec =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWossldevel.gspec 2008-12-13 11:33:23 UTC (rev 2569) +++ csw/mgar/pkg/openssl/trunk/files/CSWossldevel.gspec 2008-12-13 13:30:44 UTC (rev 2570) @@ -2,4 +2,4 @@ %var pkgname CSWossldevel %var desc Openssl development support %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/LICENSE +%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Modified: csw/mgar/pkg/openssl/trunk/files/CSWosslrt.gspec =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWosslrt.gspec 2008-12-13 11:33:23 UTC (rev 2569) +++ csw/mgar/pkg/openssl/trunk/files/CSWosslrt.gspec 2008-12-13 13:30:44 UTC (rev 2570) @@ -2,4 +2,4 @@ %var pkgname CSWosslrt %var desc Openssl runtime libraries %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/LICENSE +%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Modified: csw/mgar/pkg/openssl/trunk/files/CSWosslutils.gspec =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWosslutils.gspec 2008-12-13 11:33:23 UTC (rev 2569) +++ csw/mgar/pkg/openssl/trunk/files/CSWosslutils.gspec 2008-12-13 13:30:44 UTC (rev 2570) @@ -2,4 +2,4 @@ %var pkgname CSWosslutils %var desc Openssl binaries and related tools %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/LICENSE +%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Modified: csw/mgar/pkg/openssl/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssl/trunk/files/changelog.CSW 2008-12-13 11:33:23 UTC (rev 2569) +++ csw/mgar/pkg/openssl/trunk/files/changelog.CSW 2008-12-13 13:30:44 UTC (rev 2570) @@ -1,10 +1,17 @@ -openssl (0.9.8,REV=2008.10.05_rev=i) unstable +openssl (0.9.8,rev=2008.10.05_rev=i) unstable + * checkinstall script now accepts that /dev/random and + /dev/random are pipes (Closes: #2687) + + -- Yann Rouillard Sat, 13 Dec 2008 14:28:14 +0100 + +openssl (0.9.8,rev=2008.10.05_rev=i) unstable + * New upstream version. - * Added CA certs that were removed in 0.9.8h. - * Fixed ARCH in openssl meta-package. + * Added ca certs that were removed in 0.9.8h. + * Fixed arch in openssl meta-package. - -- Yann Rouillard Fri, 05 Oct 2008 21:25:09 +0200 + -- Yann Rouillard Fri, 05 oct 2008 21:25:09 +0200 openssl (0.9.8,REV=2007.12.26_rev=g) unstable This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Dec 13 14:42:04 2008 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 13 Dec 2008 13:42:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[2571] csw/mgar/pkg/arpwatch/trunk Message-ID: Revision: 2571 http://gar.svn.sourceforge.net/gar/?rev=2571&view=rev Author: chninkel Date: 2008-12-13 13:42:03 +0000 (Sat, 13 Dec 2008) Log Message: ----------- arpwatch: fixed prototype Modified Paths: -------------- csw/mgar/pkg/arpwatch/trunk/Makefile csw/mgar/pkg/arpwatch/trunk/checksums csw/mgar/pkg/arpwatch/trunk/files/CSWarpwatch.prototype Modified: csw/mgar/pkg/arpwatch/trunk/Makefile =================================================================== --- csw/mgar/pkg/arpwatch/trunk/Makefile 2008-12-13 13:30:44 UTC (rev 2570) +++ csw/mgar/pkg/arpwatch/trunk/Makefile 2008-12-13 13:42:03 UTC (rev 2571) @@ -36,6 +36,9 @@ # so libpcap is found SUN_CC_OPT += -L$(libdir) +# No test target in arpwatch Makefile +SKIPTEST = 1 + include gar/category.mk pre-configure: Modified: csw/mgar/pkg/arpwatch/trunk/checksums =================================================================== --- csw/mgar/pkg/arpwatch/trunk/checksums 2008-12-13 13:30:44 UTC (rev 2570) +++ csw/mgar/pkg/arpwatch/trunk/checksums 2008-12-13 13:42:03 UTC (rev 2571) @@ -1,7 +1,7 @@ cebfeb99c4a7c2a6cee2564770415fe7 download/arpwatch.tar.gz 0c9ca3341a64b564ff795320e9fe7746 download/CSWarpwatch.gspec -2aa9a97b195671e0a018ceb525916d82 download/CSWarpwatch.depend -0c0f1f3432a6f852fc00aee91e1a5664 download/CSWarpwatch.prototype +3e26b12ebf786b56e8ed1f5192734784 download/CSWarpwatch.depend +82ad6aedda8c58dd41d1eed72858fe30 download/CSWarpwatch.prototype b75294e9ae5192f5637f8c3594fb3ce6 download/cswarpwatch.xml 5a429cfbbb852a73dca372dd2db9c52f download/svc-cswarpwatch c190d02a3f5e4d20a390061509fcad92 download/cswarpwatch Modified: csw/mgar/pkg/arpwatch/trunk/files/CSWarpwatch.prototype =================================================================== --- csw/mgar/pkg/arpwatch/trunk/files/CSWarpwatch.prototype 2008-12-13 13:30:44 UTC (rev 2570) +++ csw/mgar/pkg/arpwatch/trunk/files/CSWarpwatch.prototype 2008-12-13 13:42:03 UTC (rev 2571) @@ -1,7 +1,7 @@ f none /opt/csw/etc/arpwatch.conf.CSW=arpwatch.conf 0755 root bin f none /opt/csw/sbin/arpsnmp 0755 root bin f none /opt/csw/sbin/arpwatch 0755 root bin -d none /opt/csw/share/man/man8 +d none /opt/csw/share/man/man8 0755 root bin f none /opt/csw/share/man/man8/arpsnmp.8 0755 root bin f none /opt/csw/share/man/man8/arpwatch.8 0755 root bin d none /opt/csw/var/arpwatch 0755 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Dec 13 19:14:37 2008 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 13 Dec 2008 18:14:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[2572] csw/mgar/pkg/openssl/trunk/Makefile Message-ID: Revision: 2572 http://gar.svn.sourceforge.net/gar/?rev=2572&view=rev Author: chninkel Date: 2008-12-13 18:14:37 +0000 (Sat, 13 Dec 2008) Log Message: ----------- openssl: moved striplib in post-install Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2008-12-13 13:42:03 UTC (rev 2571) +++ csw/mgar/pkg/openssl/trunk/Makefile 2008-12-13 18:14:37 UTC (rev 2572) @@ -96,9 +96,10 @@ # we remove every debug information except symbol table # (should rather be done in the gar scripts) -striplib: - chmod -R u+w $(PKGROOT)$(libdir) - find $(PKGROOT)$(libdir) -name "*.so*" -exec strip -x '{}' ';' +post-install-modulated: + echo " ==> Stripping libraries" + chmod -R u+w $(DESTDIR)$(libdir) + find $(DESTDIR)$(libdir) -name "*.so*" -exec strip -x '{}' ';' install-changelog: ginstall -D $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/changelog.CSW $(SPKG_PKGBASE)/changelog.CSW @@ -114,8 +115,8 @@ install-oldlibs: $(addprefix install-oldlibs-,$(OLDLIBS)) install-oldlibs-%: - echo " ==> Installing old libraries $* from archive oldlibs.$*-$(GARCH).tar.gz"; \ - cd $(PKGROOT) && gunzip -c $(CURDIR)/$(FILEDIR)/oldlibs.$*-$(GARCH).tar.gz | tar xvf - && \ + @echo " ==> Installing old libraries $* from archive oldlibs.$*-$(GARCH).tar.gz" + cd $(PKGROOT) && gunzip -c $(CURDIR)/$(FILEDIR)/oldlibs.$*-$(GARCH).tar.gz | tar xvf - @$(MAKECOOKIE) -post-merge: striplib install-certs install-oldlibs install-changelog +post-merge: install-certs install-oldlibs install-changelog 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 Dec 13 19:53:19 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 13 Dec 2008 18:53:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[2573] csw/mgar/pkg/openjade/trunk Message-ID: Revision: 2573 http://gar.svn.sourceforge.net/gar/?rev=2573&view=rev Author: bdwalton Date: 2008-12-13 18:53:19 +0000 (Sat, 13 Dec 2008) Log Message: ----------- now builds properly under gar v2 Modified Paths: -------------- csw/mgar/pkg/openjade/trunk/Makefile csw/mgar/pkg/openjade/trunk/checksums csw/mgar/pkg/openjade/trunk/files/CSWopenjade.gspec Removed Paths: ------------- csw/mgar/pkg/openjade/trunk/files/CSWopenjade.depend Modified: csw/mgar/pkg/openjade/trunk/Makefile =================================================================== --- csw/mgar/pkg/openjade/trunk/Makefile 2008-12-13 18:14:37 UTC (rev 2572) +++ csw/mgar/pkg/openjade/trunk/Makefile 2008-12-13 18:53:19 UTC (rev 2573) @@ -3,7 +3,10 @@ PATCHLEVEL = 27 CATEGORIES = apps -PREREQUISITES = CSWopensp +PREREQUISITE_PKGS = CSWopensp +REQUIRED_PKGS = CSWgcc3core CSWgcc3corert CSWgcc3g++ CSWgcc3g++rt +REQUIRED_PKGS += CSWggettext CSWiconv CSWopensp CSWsgmlcommon +REQUIRED_PKGS += CSWxmlcommon DESCRIPTION = A DSSSL implementation. define BLURB @@ -17,14 +20,15 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWopenjade,depend postinstall preremove) +DISTFILES += $(call admfiles,CSWopenjade,postinstall preremove) PATCHFILES = openjade-1.3.1-nsl.patch -# use gnu c/c++ for this one...(matches opensp and the c++ doesn't want to -# play with sun_cc...) -GARCOMPILER = GNU -GNU_CC_HOME = /opt/csw/gcc3 +# Use gcc3 to build this. a) it matches opensp b) the c++ used has +# some issues w/sun c++ and c) gcc4 generates object files that get +# the sun linker upset. [we could likely force gld or a strip in the +# middle somewhere, but this works too.] +GARCOMPILER = GCC3 CONFIGURE_ARGS = $(DIRPATHS) --disable-static CONFIGURE_ARGS += --datadir=$(datadir)/sgml/$(GARNAME)-$(GARVERSION) @@ -36,13 +40,16 @@ include gar/category.mk +#squish the pesky post strip la files... +MERGE_EXCLUDE_DEFAULT += $(libdir)/.*\.la\~ + sgmldir = $(DESTDIR)/$(datadir)/sgml/$(GARNAME)-$(GARVERSION) sgmldoc = $(DESTDIR)/$(docdir)/$(GARNAME) INSTALL = /opt/csw/bin/ginstall -c INSTALL_DATA = $(INSTALL) -m 0644 INSTALL_DIR = $(INSTALL) -m 0755 -d -post-install: +post-install-modulated: @echo Installing catalog files. @( cd $(WORKSRC); \ $(INSTALL_DIR) $(sgmldir)/; \ @@ -55,7 +62,6 @@ touch $(GARNAME)-$(GARVERSION)-$(PATCHLEVEL).soc; \ ln -s $(GARNAME)-$(GARVERSION)-$(PATCHLEVEL).soc $(GARNAME).soc; \ ) - @echo Installing docs. @( cd $(WORKSRC); \ $(INSTALL_DIR) $(sgmldoc); \ @@ -65,4 +71,4 @@ $(INSTALL_DATA) dsssl/README.jadetex $(sgmldoc)/; \ $(INSTALL_DATA) README COPYING VERSION $(sgmldoc)/; \ ) - @$(MAKECOOKIE) \ No newline at end of file + @$(MAKECOOKIE) Modified: csw/mgar/pkg/openjade/trunk/checksums =================================================================== --- csw/mgar/pkg/openjade/trunk/checksums 2008-12-13 18:14:37 UTC (rev 2572) +++ csw/mgar/pkg/openjade/trunk/checksums 2008-12-13 18:53:19 UTC (rev 2573) @@ -1,6 +1,5 @@ 7df692e3186109cc00db6825b777201e download/openjade-1.3.2.tar.gz -3bceb78eeb9bdb38e98e75c6fb20714e download/CSWopenjade.gspec -ea3dd2c469bf7e8efd183f82b743c90f download/CSWopenjade.depend +12f647d82faad16570aa84667ca9ed61 download/CSWopenjade.gspec a31c09c1e08da2712e87446762d9fcdc download/CSWopenjade.postinstall b35aca62389881efb0c0ebb296d9ae14 download/CSWopenjade.preremove ca3a0ff43d8ed182f432d723927cd2e9 download/openjade-1.3.1-nsl.patch Deleted: csw/mgar/pkg/openjade/trunk/files/CSWopenjade.depend =================================================================== --- csw/mgar/pkg/openjade/trunk/files/CSWopenjade.depend 2008-12-13 18:14:37 UTC (rev 2572) +++ csw/mgar/pkg/openjade/trunk/files/CSWopenjade.depend 2008-12-13 18:53:19 UTC (rev 2573) @@ -1,12 +0,0 @@ -P CSWcommon common - common files and dirs for CSW packages -P CSWgcc3core gcc3core - GNU C Compiler -P CSWgcc3corert gcc3corert - GNU C Compiler Run Time -P CSWgcc3g++ gcc3g++ - GNU C++ Compiler -P CSWgcc3g++rt gcc3g++rt - GNU C++ Compiler Run Time -P CSWgcc4corert gcc4corert - GNU C Compiler Run Time -P CSWgcc4g++rt gcc4g++rt - GNU C++ Compiler Run Time -P CSWggettext ggettext - GNU gettext -P CSWiconv libiconv - GNU iconv library -P CSWopensp opensp - a SGML parser called OpenSP -P CSWsgmlcommon sgmlcommon - A collection of entities and DTDs -P CSWxmlcommon xmlcommon - A collection of entities and DTDs Modified: csw/mgar/pkg/openjade/trunk/files/CSWopenjade.gspec =================================================================== --- csw/mgar/pkg/openjade/trunk/files/CSWopenjade.gspec 2008-12-13 18:14:37 UTC (rev 2572) +++ csw/mgar/pkg/openjade/trunk/files/CSWopenjade.gspec 2008-12-13 18:53:19 UTC (rev 2573) @@ -1,4 +1,4 @@ %var bitname openjade %var pkgname CSWopenjade %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING +%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 Sat Dec 13 22:51:31 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 13 Dec 2008 21:51:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[2574] csw/mgar/pkg/opengrok/trunk Message-ID: Revision: 2574 http://gar.svn.sourceforge.net/gar/?rev=2574&view=rev Author: dmichelsen Date: 2008-12-13 21:51:31 +0000 (Sat, 13 Dec 2008) Log Message: ----------- opengrok: Update to 0.7 and mGAR v2, package still unfinished Modified Paths: -------------- csw/mgar/pkg/opengrok/trunk/Makefile csw/mgar/pkg/opengrok/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/opengrok/trunk/files/CSWopengrok.depend Modified: csw/mgar/pkg/opengrok/trunk/Makefile =================================================================== --- csw/mgar/pkg/opengrok/trunk/Makefile 2008-12-13 18:53:19 UTC (rev 2573) +++ csw/mgar/pkg/opengrok/trunk/Makefile 2008-12-13 21:51:31 UTC (rev 2574) @@ -1,5 +1,5 @@ GARNAME = opengrok -GARVERSION = 0.6.1 +GARVERSION = 0.7 CATEGORIES = devel DESCRIPTION = A wicked fast source browser @@ -15,8 +15,10 @@ MASTER_SITES = http://www.opensolaris.org/os/project/opengrok/files/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWopengrok,depend postinstall preremove) +DISTFILES += $(call admfiles,CSWopengrok,postinstall preremove) +REQUIRED_PKGS = CSWectags CSWjavasvn CSWtomcat5 CSWmercurial + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz Modified: csw/mgar/pkg/opengrok/trunk/checksums =================================================================== --- csw/mgar/pkg/opengrok/trunk/checksums 2008-12-13 18:53:19 UTC (rev 2573) +++ csw/mgar/pkg/opengrok/trunk/checksums 2008-12-13 21:51:31 UTC (rev 2574) @@ -1,4 +1,4 @@ -2681ad005fa238ff91c3e4818a2f07fa download/opengrok-0.6.1.tar.gz +17f554a60edde0b3ea9d9debc8ff8eef download/opengrok-0.7.tar.gz 1ab19c04b3551db20e5fbac19d731d3f download/CSWopengrok.gspec 0304d70ad22411352a6e3733203e6467 download/CSWopengrok.depend 3283129332005c795178e6f363f521a0 download/CSWopengrok.postinstall Deleted: csw/mgar/pkg/opengrok/trunk/files/CSWopengrok.depend =================================================================== --- csw/mgar/pkg/opengrok/trunk/files/CSWopengrok.depend 2008-12-13 18:53:19 UTC (rev 2573) +++ csw/mgar/pkg/opengrok/trunk/files/CSWopengrok.depend 2008-12-13 21:51:31 UTC (rev 2574) @@ -1,3 +0,0 @@ -P CSWectags ectags - Exuberant Ctags: A multilanguage implementation of Ctags -P CSWjavasvn javasvn - Subversion Java language binding -P CSWtomcat5 tomcat5 - Apache Jakarta Tomcat 5.5 Servlet/JSP Container This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Dec 13 23:06:47 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 13 Dec 2008 22:06:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[2575] csw/mgar/pkg/jdk5/trunk Message-ID: Revision: 2575 http://gar.svn.sourceforge.net/gar/?rev=2575&view=rev Author: dmichelsen Date: 2008-12-13 22:06:46 +0000 (Sat, 13 Dec 2008) Log Message: ----------- jdk5: Update to 1.5.0_17 and mGAR v2 and analogous to jdk6 Modified Paths: -------------- csw/mgar/pkg/jdk5/trunk/Makefile csw/mgar/pkg/jdk5/trunk/checksums csw/mgar/pkg/jdk5/trunk/files/CSWjdk5.gspec Added Paths: ----------- csw/mgar/pkg/jdk5/trunk/files/CSWjre5.gspec Property Changed: ---------------- csw/mgar/pkg/jdk5/trunk/ Property changes on: csw/mgar/pkg/jdk5/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/jdk5/trunk/Makefile =================================================================== --- csw/mgar/pkg/jdk5/trunk/Makefile 2008-12-13 21:51:31 UTC (rev 2574) +++ csw/mgar/pkg/jdk5/trunk/Makefile 2008-12-13 22:06:46 UTC (rev 2575) @@ -1,5 +1,5 @@ GARNAME = jdk5 -SPKG_VERSION = 1.5.0_16 +SPKG_VERSION = 1.5.0_17 GARVERSION = $(shell echo $(SPKG_VERSION) | sed -e 's/\./_/g') CATEGORIES = lang @@ -19,14 +19,30 @@ DISTFILES = $(foreach S,$(SUFFIXES),jdk-$(GARVERSION)-solaris-$S.sh) NOEXTRACT = $(foreach S,$(filter-out $(SUFFIXES_$(GARCH)),$(SUFFIXES)),jdk-$(GARVERSION)-solaris-$S.sh) DISTFILES += $(call admfiles,CSWjdk5) +DISTFILES += $(call admfiles,CSWjre5) -SPKG_SOURCEURL = http://java.sun.com/products/archive/ +SPKG_SOURCEURL = http://java.sun.com/javase/downloads/index_jdk5.jsp +SPKG_DESC_CSWjdk5 = Java Development Kit 6 +SPKG_DESC_CSWjre5 = Java Runtime Environment 6 + +REQUIRED_PKGS_CSWjdk6 = CSWjre6 + +MANPAGES_JRE = java.1 javaws.1 keytool.1 orbd.1 pack200.1 policytool.1 rmid.1 rmiregistry.1 +MANPAGES_JRE += servertool.1 tnameserv.1 unpack200.1 + +MANPAGE_REGEX = ($(shell echo $(MANPAGES_JRE) | perl -lne 's/\./\\./g;print join("|",split)')) + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = INSTALL_SCRIPTS = custom +PKGFILES_CSWjre5 = $(prefix)/java/jdk/$(DISTNAME)/jre/.* +PKGFILES_CSWjre5 += $(prefix)/java/jdk/$(DISTNAME)/man/.*/$(MANPAGE_REGEX) +PKGFILES_CSWjre5 += $(prefix)/java/jre/jre$(SPKG_VERSION) +PKGFILES_CSWjre5 += $(prefix)/java/jre/jre5 + # Tell the user to download the file manually manual//%: @echo @@ -41,7 +57,7 @@ # rule to extract files with shell shell-extract-%: @echo " ==> Extracting $(DOWNLOADDIR)/$*" - @echo "yes" | (D=$(abspath $(DOWNLOADDIR)/$*); cd $(EXTRACTDIR); MORE="-10000" sh $$D) + @echo "yes" | (D=$(abspath $(DOWNLOADDIR)/$*); cd $(EXTRACTDIR); DISPLAY= MORE="-10000" sh $$D -noregister) @$(MAKECOOKIE) extract-%.sh: shell-extract-%.sh @@ -51,9 +67,18 @@ install-custom: @echo " ==> Installing $(GARNAME)" - @rm -rf $(DESTDIR)$(prefix)/$(DISTNAME) - @ginstall -d $(DESTDIR)$(prefix) - @(cd $(WORKDIR); pax -r -w -v $(DISTNAME) $(DESTDIR)$(prefix)) - @rm -f $(DESTDIR)$(prefix)/$(GARNAME) - @gln -sf $(DISTNAME) $(DESTDIR)$(prefix)/$(GARNAME) + + rm -rf $(DESTDIR)$(prefix)/java + ginstall -d $(DESTDIR)$(prefix)/java/jdk + (cd $(WORKDIR); pax -r -w $(DISTNAME) $(DESTDIR)$(prefix)/java/jdk) + rm -f $(DESTDIR)$(prefix)/java/jdk/jdk5 + gln -sf $(DISTNAME) $(DESTDIR)$(prefix)/java/jdk/jdk5 + + ginstall -d $(DESTDIR)$(prefix)/java/jre + rm -f $(DESTDIR)$(prefix)/java/jre/jre$(SPKG_VERSION) + gln -sf ../jdk/$(DISTNAME)/jre $(DESTDIR)$(prefix)/java/jre/jre$(SPKG_VERSION) + rm -f $(DESTDIR)$(prefix)/java/jre/jre5 + gln -sf jre$(SPKG_VERSION) $(DESTDIR)$(prefix)/java/jre/jre5 + + gln -s ../man $(DESTDIR)$(prefix)/java/jdk/$(DISTNAME)/jre/man @$(MAKECOOKIE) Modified: csw/mgar/pkg/jdk5/trunk/checksums =================================================================== --- csw/mgar/pkg/jdk5/trunk/checksums 2008-12-13 21:51:31 UTC (rev 2574) +++ csw/mgar/pkg/jdk5/trunk/checksums 2008-12-13 22:06:46 UTC (rev 2575) @@ -1,5 +1,6 @@ -07cd02212259ed4b421c07b140873e88 download/jdk-1_5_0_16-solaris-sparc.sh -4216693ca5d27fa3a2242a2932149a38 download/jdk-1_5_0_16-solaris-sparcv9.sh -8f96c0535287b32d4ef26e35a5307957 download/jdk-1_5_0_16-solaris-i586.sh -cdb42f091f5ace5b5fb23b70d0a23520 download/jdk-1_5_0_16-solaris-amd64.sh -7fc8cfa2f14f146a0546d6b69dcc0aae download/CSWjdk5.gspec +7d8b35d7eb7664d36ff2387e73baa15b download/jdk-1_5_0_17-solaris-sparc.sh +7e0ccd19d636bc3fdf1781c07a99cb8d download/jdk-1_5_0_17-solaris-sparcv9.sh +f000bd7d44c2964dd811f3f526572106 download/jdk-1_5_0_17-solaris-i586.sh +419310f32f7f2bfff715bc6f1d1258c4 download/jdk-1_5_0_17-solaris-amd64.sh +43194293b08b51d47ebc1c78af346942 download/CSWjdk5.gspec +68ebd77b4f7648109eb11c58f8959b5b download/CSWjre5.gspec Modified: csw/mgar/pkg/jdk5/trunk/files/CSWjdk5.gspec =================================================================== --- csw/mgar/pkg/jdk5/trunk/files/CSWjdk5.gspec 2008-12-13 21:51:31 UTC (rev 2574) +++ csw/mgar/pkg/jdk5/trunk/files/CSWjdk5.gspec 2008-12-13 22:06:46 UTC (rev 2575) @@ -1,4 +1,4 @@ %var bitname jdk5 %var pkgname CSWjdk5 %include url file://%{PKGLIB}/csw_standard.gspec -%copyright url file://%{WORKSRC}/LICENSE +%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE Added: csw/mgar/pkg/jdk5/trunk/files/CSWjre5.gspec =================================================================== --- csw/mgar/pkg/jdk5/trunk/files/CSWjre5.gspec (rev 0) +++ csw/mgar/pkg/jdk5/trunk/files/CSWjre5.gspec 2008-12-13 22:06:46 UTC (rev 2575) @@ -0,0 +1,4 @@ +%var bitname jre5 +%var pkgname CSWjre5 +%include url file://%{PKGLIB}/csw_standard.gspec +%copyright url file://%{WORKSRC_FIRSTMOD}/LICENSE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Dec 13 23:13:18 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 13 Dec 2008 22:13:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[2576] csw/mgar/pkg/jdk5/trunk/Makefile Message-ID: Revision: 2576 http://gar.svn.sourceforge.net/gar/?rev=2576&view=rev Author: dmichelsen Date: 2008-12-13 22:13:18 +0000 (Sat, 13 Dec 2008) Log Message: ----------- jdk5: Fix typo Modified Paths: -------------- csw/mgar/pkg/jdk5/trunk/Makefile Modified: csw/mgar/pkg/jdk5/trunk/Makefile =================================================================== --- csw/mgar/pkg/jdk5/trunk/Makefile 2008-12-13 22:06:46 UTC (rev 2575) +++ csw/mgar/pkg/jdk5/trunk/Makefile 2008-12-13 22:13:18 UTC (rev 2576) @@ -60,7 +60,7 @@ @echo "yes" | (D=$(abspath $(DOWNLOADDIR)/$*); cd $(EXTRACTDIR); DISPLAY= MORE="-10000" sh $$D -noregister) @$(MAKECOOKIE) -extract-%.sh: shell-extract-%.sh +extract-archive-%.sh: shell-extract-%.sh @$(MAKECOOKIE) include gar/category.mk @@ -68,17 +68,17 @@ install-custom: @echo " ==> Installing $(GARNAME)" - rm -rf $(DESTDIR)$(prefix)/java - ginstall -d $(DESTDIR)$(prefix)/java/jdk - (cd $(WORKDIR); pax -r -w $(DISTNAME) $(DESTDIR)$(prefix)/java/jdk) - rm -f $(DESTDIR)$(prefix)/java/jdk/jdk5 - gln -sf $(DISTNAME) $(DESTDIR)$(prefix)/java/jdk/jdk5 + @rm -rf $(DESTDIR)$(prefix)/java + @ginstall -d $(DESTDIR)$(prefix)/java/jdk + @(cd $(WORKDIR); pax -r -w $(DISTNAME) $(DESTDIR)$(prefix)/java/jdk) + @rm -f $(DESTDIR)$(prefix)/java/jdk/jdk5 + @gln -sf $(DISTNAME) $(DESTDIR)$(prefix)/java/jdk/jdk5 - ginstall -d $(DESTDIR)$(prefix)/java/jre - rm -f $(DESTDIR)$(prefix)/java/jre/jre$(SPKG_VERSION) - gln -sf ../jdk/$(DISTNAME)/jre $(DESTDIR)$(prefix)/java/jre/jre$(SPKG_VERSION) - rm -f $(DESTDIR)$(prefix)/java/jre/jre5 - gln -sf jre$(SPKG_VERSION) $(DESTDIR)$(prefix)/java/jre/jre5 + @ginstall -d $(DESTDIR)$(prefix)/java/jre + @rm -f $(DESTDIR)$(prefix)/java/jre/jre$(SPKG_VERSION) + @gln -sf ../jdk/$(DISTNAME)/jre $(DESTDIR)$(prefix)/java/jre/jre$(SPKG_VERSION) + @rm -f $(DESTDIR)$(prefix)/java/jre/jre5 + @gln -sf jre$(SPKG_VERSION) $(DESTDIR)$(prefix)/java/jre/jre5 - gln -s ../man $(DESTDIR)$(prefix)/java/jdk/$(DISTNAME)/jre/man + @gln -s ../man $(DESTDIR)$(prefix)/java/jdk/$(DISTNAME)/jre/man @$(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 Dec 14 03:04:11 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 14 Dec 2008 02:04:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[2577] csw/mgar/pkg/docbook-dtds/trunk Message-ID: Revision: 2577 http://gar.svn.sourceforge.net/gar/?rev=2577&view=rev Author: bdwalton Date: 2008-12-14 02:04:11 +0000 (Sun, 14 Dec 2008) Log Message: ----------- working build under gar v2 Modified Paths: -------------- csw/mgar/pkg/docbook-dtds/trunk/Makefile csw/mgar/pkg/docbook-dtds/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/docbook-dtds/trunk/ Property changes on: csw/mgar/pkg/docbook-dtds/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/docbook-dtds/trunk/Makefile =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/Makefile 2008-12-13 22:13:18 UTC (rev 2576) +++ csw/mgar/pkg/docbook-dtds/trunk/Makefile 2008-12-14 02:04:11 UTC (rev 2577) @@ -9,10 +9,11 @@ GARNAME = docbookdtds GARVERSION = 1.0 + PATCHLEVEL = 30.1 CATEGORIES = xtra -PREREQUISITES = CSWunzip +REQUIRED_PKGS = CSWsgmlcommon CSWxmlcommon CSWopenjade CSWlibxml2 DESCRIPTION = SGML and XML document type definitions for DocBook. define BLURB @@ -56,7 +57,7 @@ MASTER_SITES = $(O_SRC) $(D_SRC) DISTFILES = $(DBFILES) Makefile -DISTFILES += $(call admfiles,CSWdocbookdtds,depend postinstall preremove) +DISTFILES += $(call admfiles,CSWdocbookdtds,postinstall preremove) PATCHFILES = docbook-4.2-euro.patch docbook-dtd30-sgml-1.0.catalog.patch PATCHFILES += docbook-dtd31-sgml-1.0.catalog.patch @@ -77,73 +78,68 @@ include gar/category.mk -SGMLDIRS = 3.0 3.1 4.0 4.1 4.2 4.3 4.4 -XMLDIRS = 4.1.2 4.2 4.3 4.4 - - # ok, for each source, we make an explicit target that overrides the implicit # zip-extract-% targets in GAR. -zip-extract-docbk30.zip: +zip-extract-docbk30.zip: + ginstall -d $(WORKSRC)/3.0-sgml unzip $(DOWNLOADDIR)/docbk30.zip -d $(WORKSRC)/3.0-sgml @$(MAKECOOKIE) zip-extract-docbk31.zip: + ginstall -d $(WORKSRC)/3.1-sgml unzip $(DOWNLOADDIR)/docbk31.zip -d $(WORKSRC)/3.1-sgml @$(MAKECOOKIE) zip-extract-docbk40.zip: + ginstall -d $(WORKSRC)/4.0-sgml unzip $(DOWNLOADDIR)/docbk40.zip -d $(WORKSRC)/4.0-sgml @$(MAKECOOKIE) zip-extract-docbk41.zip: + ginstall -d $(WORKSRC)/4.1-sgml unzip $(DOWNLOADDIR)/docbk41.zip -d $(WORKSRC)/4.1-sgml @$(MAKECOOKIE) zip-extract-docbook-4.2.zip: + ginstall -d $(WORKSRC)/4.2-sgml unzip $(DOWNLOADDIR)/docbook-4.2.zip -d $(WORKSRC)/4.2-sgml @$(MAKECOOKIE) -zip-extract-docbkx412.zip: +zip-extract-docbkx412.zip: + ginstall -d $(WORKSRC)/4.1.2-xml unzip $(DOWNLOADDIR)/docbkx412.zip -d $(WORKSRC)/4.1.2-xml @$(MAKECOOKIE) zip-extract-docbook-4.3.zip: + ginstall -d $(WORKSRC)/4.3-sgml unzip $(DOWNLOADDIR)/docbook-4.3.zip -d $(WORKSRC)/4.3-sgml @$(MAKECOOKIE) zip-extract-docbook-4.4.zip: + ginstall -d $(WORKSRC)/4.4-sgml unzip $(DOWNLOADDIR)/docbook-4.4.zip -d $(WORKSRC)/4.4-sgml @$(MAKECOOKIE) zip-extract-docbook-xml-4.2.zip: + ginstall -d $(WORKSRC)/4.2-xml unzip $(DOWNLOADDIR)/docbook-xml-4.2.zip -d $(WORKSRC)/4.2-xml @$(MAKECOOKIE) zip-extract-docbook-xml-4.3.zip: + ginstall -d $(WORKSRC)/4.3-xml unzip $(DOWNLOADDIR)/docbook-xml-4.3.zip -d $(WORKSRC)/4.3-xml @$(MAKECOOKIE) zip-extract-docbook-xml-4.4.zip: + ginstall -d $(WORKSRC)/4.4-xml unzip $(DOWNLOADDIR)/docbook-xml-4.4.zip -d $(WORKSRC)/4.4-xml @$(MAKECOOKIE) -# we override extract for our needs...man this is horrible! (note the cookie -# madness) -pre-extract: $(WORKSRC) - ( cd $(WORKSRC); \ - for d in $(SGMLDIRS); do \ - [ -d $$d-sgml ] || mkdir $$d-sgml; \ - done; \ - for d in $(XMLDIRS); do \ - [ -d $$d-xml ] || mkdir $$d-xml; \ - done ) - @$(MAKECOOKIE) - post-extract: # Increase NAMELEN (bug #36058, bug #159382). [bug references from # rpm .spec file] - ( cd $(WORKSRC); \ + ( cd $(WORKSRC_FIRSTMOD); \ gsed -e's,\(NAMELEN\s\+\)44\(\s\*\)\?,\1256,' -i.namelen */docbook.dcl; \ cp ../Makefile .) - @$(MAKECOOKIE) \ No newline at end of file + @$(MAKECOOKIE) Modified: csw/mgar/pkg/docbook-dtds/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/checksums 2008-12-13 22:13:18 UTC (rev 2576) +++ csw/mgar/pkg/docbook-dtds/trunk/checksums 2008-12-14 02:04:11 UTC (rev 2577) @@ -11,7 +11,6 @@ cbb04e9a700955d88c50962ef22c1634 download/docbook-xml-4.4.zip e5318114e6c751a9e0835d7711275e13 download/Makefile 536104a1ab1e8eac583cf27f4f8844a4 download/CSWdocbookdtds.gspec -cb6dbfe9f6184a9de0725c0a61adc57b download/CSWdocbookdtds.depend 95eb4822347e50556398f4a11ee95097 download/CSWdocbookdtds.postinstall 9035c448e6480f6e916084fea388b512 download/CSWdocbookdtds.preremove 318742d3a6648a6905727f071cbc9847 download/docbook-4.2-euro.patch 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 Dec 14 03:43:27 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 14 Dec 2008 02:43:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[2578] csw/mgar/pkg/docbook-style-xsl/trunk Message-ID: Revision: 2578 http://gar.svn.sourceforge.net/gar/?rev=2578&view=rev Author: bdwalton Date: 2008-12-14 02:43:27 +0000 (Sun, 14 Dec 2008) Log Message: ----------- transition to gar v2 Modified Paths: -------------- csw/mgar/pkg/docbook-style-xsl/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/docbook-style-xsl/trunk/ Property changes on: csw/mgar/pkg/docbook-style-xsl/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/docbook-style-xsl/trunk/Makefile =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/Makefile 2008-12-14 02:04:11 UTC (rev 2577) +++ csw/mgar/pkg/docbook-style-xsl/trunk/Makefile 2008-12-14 02:43:27 UTC (rev 2578) @@ -4,8 +4,10 @@ CATEGORIES = xtra # for our (modified from rhel) copied in Makefile. -PREREQUISITES = CSWgfile CSWbash +PREREQUISITE_PKGS = CSWgfile CSWbash +REQUIRED_PKGS = CSWsgmlcommon CSWxmlcommon CSWdocbookdtds CSWlibxml2 + DESCRIPTION = Norman Walsh's XSL stylesheets for DocBook XML. define BLURB The DocBook XSL stylesheets are a set of stylesheets for use with an @@ -19,7 +21,7 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = docbook-xsl-$(GARVERSION).tar.bz2 DISTFILES += docbook-xsl-doc-$(GARVERSION).tar.bz2 -DISTFILES += $(call admfiles,CSWdocbookxsl,depend postinstall preremove) +DISTFILES += $(call admfiles,CSWdocbookxsl,postinstall preremove) DISTFILES += Makefile # These are listed in the same order they'd be applied during the rpm build... 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 Dec 14 04:30:04 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 14 Dec 2008 03:30:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[2579] csw/mgar/pkg/openjade/trunk/Makefile Message-ID: Revision: 2579 http://gar.svn.sourceforge.net/gar/?rev=2579&view=rev Author: bdwalton Date: 2008-12-14 03:30:04 +0000 (Sun, 14 Dec 2008) Log Message: ----------- clean dependencies Modified Paths: -------------- csw/mgar/pkg/openjade/trunk/Makefile Modified: csw/mgar/pkg/openjade/trunk/Makefile =================================================================== --- csw/mgar/pkg/openjade/trunk/Makefile 2008-12-14 02:43:27 UTC (rev 2578) +++ csw/mgar/pkg/openjade/trunk/Makefile 2008-12-14 03:30:04 UTC (rev 2579) @@ -4,7 +4,7 @@ CATEGORIES = apps PREREQUISITE_PKGS = CSWopensp -REQUIRED_PKGS = CSWgcc3core CSWgcc3corert CSWgcc3g++ CSWgcc3g++rt +REQUIRED_PKGS = CSWgcc3corert CSWgcc3g++rt REQUIRED_PKGS += CSWggettext CSWiconv CSWopensp CSWsgmlcommon REQUIRED_PKGS += CSWxmlcommon This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Dec 14 16:53:05 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 14 Dec 2008 15:53:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[2580] csw/mgar/pkg/x11 Message-ID: Revision: 2580 http://gar.svn.sourceforge.net/gar/?rev=2580&view=rev Author: wbonnet Date: 2008-12-14 15:53:05 +0000 (Sun, 14 Dec 2008) Log Message: ----------- Move inputproto to x11 subdir Added Paths: ----------- csw/mgar/pkg/x11/inputproto/ Property Changed: ---------------- csw/mgar/pkg/x11/inputproto/trunk/ Property changes on: csw/mgar/pkg/x11/inputproto/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Dec 14 18:20:40 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 14 Dec 2008 17:20:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[2581] csw/mgar/pkg/x11/inputproto/trunk Message-ID: Revision: 2581 http://gar.svn.sourceforge.net/gar/?rev=2581&view=rev Author: wbonnet Date: 2008-12-14 17:20:39 +0000 (Sun, 14 Dec 2008) Log Message: ----------- Move inputproto package to X11 subdir Modified Paths: -------------- csw/mgar/pkg/x11/inputproto/trunk/Makefile csw/mgar/pkg/x11/inputproto/trunk/checksums csw/mgar/pkg/x11/inputproto/trunk/files/CSWinputproto.gspec Removed Paths: ------------- csw/mgar/pkg/x11/inputproto/trunk/files/CSWinputproto.depend csw/mgar/pkg/x11/inputproto/trunk/files/CSWinputproto.prototype Modified: csw/mgar/pkg/x11/inputproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/inputproto/trunk/Makefile 2008-12-14 15:53:05 UTC (rev 2580) +++ csw/mgar/pkg/x11/inputproto/trunk/Makefile 2008-12-14 17:20:39 UTC (rev 2581) @@ -1,35 +1,20 @@ GARNAME = inputproto GARVERSION = 1.4.4 -CATEGORIES = lib +CATEGORIES = x11 DESCRIPTION = inputproto define BLURB inputproto endef -MASTER_SITES =http://xorg.freedesktop.org/releases/individual/proto/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWinputproto) # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -DISTFILES += $(call admfiles,CSWinputproto, depend) - -LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib - -export LDFLAGS - -TEST_SCRIPTS = none - -GREP = ggrep - include gar/category.mk -CONFIGURE_ARGS = --prefix=/opt/csw --mandir=/opt/csw/share/man -test-none: - @$(MAKECOOKIE) - -post-install: - ( gfind $(DESTDIR)/opt/csw -exec bash -c "file {} | ggrep ELF | ggrep -e 'executable' -e 'dynamic lib' | ggrep 'not stripped' && strip {}" \; ) Modified: csw/mgar/pkg/x11/inputproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/inputproto/trunk/checksums 2008-12-14 15:53:05 UTC (rev 2580) +++ csw/mgar/pkg/x11/inputproto/trunk/checksums 2008-12-14 17:20:39 UTC (rev 2581) @@ -1,3 +1,3 @@ 55c67c1f42d70458a3e4d153c8c07cf7 download/inputproto-1.4.4.tar.gz -9ab4295ca5a56d868a7f16e702d0317f download/CSWinputproto.gspec -d41d8cd98f00b204e9800998ecf8427e download/CSWinputproto.depend +0bf70c2ca902742d209d422600c99801 download/CSWinputproto.gspec +55c67c1f42d70458a3e4d153c8c07cf7 download/inputproto-1.4.4.tar.gz Modified: csw/mgar/pkg/x11/inputproto/trunk/files/CSWinputproto.gspec =================================================================== --- csw/mgar/pkg/x11/inputproto/trunk/files/CSWinputproto.gspec 2008-12-14 15:53:05 UTC (rev 2580) +++ csw/mgar/pkg/x11/inputproto/trunk/files/CSWinputproto.gspec 2008-12-14 17:20:39 UTC (rev 2581) @@ -1,4 +1,4 @@ %var bitname inputproto %var pkgname CSWinputproto %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING +%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 wbonnet at users.sourceforge.net Sun Dec 14 18:33:38 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 14 Dec 2008 17:33:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[2582] csw/mgar/pkg Message-ID: Revision: 2582 http://gar.svn.sourceforge.net/gar/?rev=2582&view=rev Author: wbonnet Date: 2008-12-14 17:33:37 +0000 (Sun, 14 Dec 2008) Log Message: ----------- Move packages to x11 Modified Paths: -------------- csw/mgar/pkg/x11/kbproto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/kbproto/ csw/mgar/pkg/x11/renderproto/ csw/mgar/pkg/x11/xcb-proto/ csw/mgar/pkg/x11/xextproto/ csw/mgar/pkg/x11/xproto/ Removed Paths: ------------- csw/mgar/pkg/inputproto/ csw/mgar/pkg/kbproto/ csw/mgar/pkg/renderproto/ csw/mgar/pkg/xcb-proto/ csw/mgar/pkg/xextproto/ csw/mgar/pkg/xproto/ Property Changed: ---------------- csw/mgar/pkg/x11/kbproto/trunk/ csw/mgar/pkg/x11/renderproto/trunk/ csw/mgar/pkg/x11/xcb-proto/trunk/ csw/mgar/pkg/x11/xextproto/trunk/ csw/mgar/pkg/x11/xproto/trunk/ Property changes on: csw/mgar/pkg/x11/kbproto/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/x11/kbproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/kbproto/trunk/Makefile 2008-12-13 18:53:19 UTC (rev 2573) +++ csw/mgar/pkg/x11/kbproto/trunk/Makefile 2008-12-14 17:33:37 UTC (rev 2582) @@ -1,35 +1,20 @@ GARNAME = kbproto GARVERSION = 1.0.3 -CATEGORIES = lib +CATEGORIES = x11 DESCRIPTION = kbproto define BLURB kbproto endef -MASTER_SITES =http://xorg.freedesktop.org/releases/individual/proto/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -DISTFILES += $(call admfiles,CSWkbproto, depend) +DISTFILES += $(call admfiles,CSWkbproto) -LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib - -export LDFLAGS - -TEST_SCRIPTS = none - -GREP = ggrep - include gar/category.mk -CONFIGURE_ARGS = --prefix=/opt/csw --mandir=/opt/csw/share/man - -test-none: - @$(MAKECOOKIE) - -post-install: - ( gfind $(DESTDIR)/opt/csw -exec bash -c "file {} | ggrep ELF | ggrep -e 'executable' -e 'dynamic lib' | ggrep 'not stripped' && strip {}" \; ) Property changes on: csw/mgar/pkg/x11/renderproto/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/x11/xcb-proto/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/x11/xextproto/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/x11/xproto/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Dec 14 18:38:02 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 14 Dec 2008 17:38:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[2583] csw/mgar/pkg/x11/kbproto/trunk Message-ID: Revision: 2583 http://gar.svn.sourceforge.net/gar/?rev=2583&view=rev Author: wbonnet Date: 2008-12-14 17:38:01 +0000 (Sun, 14 Dec 2008) Log Message: ----------- Move files to /opt/csw/x11 Modified Paths: -------------- csw/mgar/pkg/x11/kbproto/trunk/checksums csw/mgar/pkg/x11/kbproto/trunk/files/CSWkbproto.gspec Removed Paths: ------------- csw/mgar/pkg/x11/kbproto/trunk/files/CSWkbproto.depend csw/mgar/pkg/x11/kbproto/trunk/files/CSWkbproto.prototype Modified: csw/mgar/pkg/x11/kbproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/kbproto/trunk/checksums 2008-12-14 17:33:37 UTC (rev 2582) +++ csw/mgar/pkg/x11/kbproto/trunk/checksums 2008-12-14 17:38:01 UTC (rev 2583) @@ -1,3 +1,3 @@ 1efc6a4d97acb3ec3f34c4b2508478dc download/kbproto-1.0.3.tar.gz -95b5e511af0a95f91913e1cd8d24d0ce download/CSWkbproto.gspec -d41d8cd98f00b204e9800998ecf8427e download/CSWkbproto.depend +18e0000ca77d25e593f4b4b960ad1a7c download/CSWkbproto.gspec +1efc6a4d97acb3ec3f34c4b2508478dc download/kbproto-1.0.3.tar.gz Modified: csw/mgar/pkg/x11/kbproto/trunk/files/CSWkbproto.gspec =================================================================== --- csw/mgar/pkg/x11/kbproto/trunk/files/CSWkbproto.gspec 2008-12-14 17:33:37 UTC (rev 2582) +++ csw/mgar/pkg/x11/kbproto/trunk/files/CSWkbproto.gspec 2008-12-14 17:38:01 UTC (rev 2583) @@ -1,4 +1,4 @@ %var bitname kbproto %var pkgname CSWkbproto %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING +%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 wbonnet at users.sourceforge.net Sun Dec 14 20:06:57 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 14 Dec 2008 19:06:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[2584] csw/mgar/pkg/x11/renderproto/trunk Message-ID: Revision: 2584 http://gar.svn.sourceforge.net/gar/?rev=2584&view=rev Author: wbonnet Date: 2008-12-14 19:06:57 +0000 (Sun, 14 Dec 2008) Log Message: ----------- Move to X11 subdir Modified Paths: -------------- csw/mgar/pkg/x11/renderproto/trunk/Makefile csw/mgar/pkg/x11/renderproto/trunk/checksums csw/mgar/pkg/x11/renderproto/trunk/files/CSWrenderproto.gspec Removed Paths: ------------- csw/mgar/pkg/x11/renderproto/trunk/files/CSWrenderproto.depend csw/mgar/pkg/x11/renderproto/trunk/files/CSWrenderproto.prototype Modified: csw/mgar/pkg/x11/renderproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/renderproto/trunk/Makefile 2008-12-14 17:38:01 UTC (rev 2583) +++ csw/mgar/pkg/x11/renderproto/trunk/Makefile 2008-12-14 19:06:57 UTC (rev 2584) @@ -1,35 +1,21 @@ GARNAME = renderproto GARVERSION = 0.9.3 -CATEGORIES = lib +CATEGORIES = x11 DESCRIPTION = renderproto define BLURB renderproto endef -MASTER_SITES =http://xorg.freedesktop.org/releases/individual/proto/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -DISTFILES += $(call admfiles,CSWrenderproto, depend) +DISTFILES += $(call admfiles,CSWrenderproto) -LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib - -export LDFLAGS - -TEST_SCRIPTS = none - -GREP = ggrep - include gar/category.mk -CONFIGURE_ARGS = --prefix=/opt/csw --mandir=/opt/csw/share/man -test-none: - @$(MAKECOOKIE) - -post-install: - ( gfind $(DESTDIR)/opt/csw -exec bash -c "file {} | ggrep ELF | ggrep -e 'executable' -e 'dynamic lib' | ggrep 'not stripped' && strip {}" \; ) Modified: csw/mgar/pkg/x11/renderproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/renderproto/trunk/checksums 2008-12-14 17:38:01 UTC (rev 2583) +++ csw/mgar/pkg/x11/renderproto/trunk/checksums 2008-12-14 19:06:57 UTC (rev 2584) @@ -1,3 +1,3 @@ ab8f3e356973d9c99810a8f092db3a2e download/renderproto-0.9.3.tar.gz -78032ae1b66c588360331ed8b994c0c1 download/CSWrenderproto.gspec -d41d8cd98f00b204e9800998ecf8427e download/CSWrenderproto.depend +7ed3eb5869a828ed11fd90b7f3c2e70e download/CSWrenderproto.gspec +ab8f3e356973d9c99810a8f092db3a2e download/renderproto-0.9.3.tar.gz Modified: csw/mgar/pkg/x11/renderproto/trunk/files/CSWrenderproto.gspec =================================================================== --- csw/mgar/pkg/x11/renderproto/trunk/files/CSWrenderproto.gspec 2008-12-14 17:38:01 UTC (rev 2583) +++ csw/mgar/pkg/x11/renderproto/trunk/files/CSWrenderproto.gspec 2008-12-14 19:06:57 UTC (rev 2584) @@ -1,4 +1,4 @@ %var bitname renderproto %var pkgname CSWrenderproto %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING +%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 wbonnet at users.sourceforge.net Sun Dec 14 20:14:55 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 14 Dec 2008 19:14:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[2585] csw/mgar/pkg/x11/xcb-proto/trunk Message-ID: Revision: 2585 http://gar.svn.sourceforge.net/gar/?rev=2585&view=rev Author: wbonnet Date: 2008-12-14 19:14:55 +0000 (Sun, 14 Dec 2008) Log Message: ----------- Move t X11 subdir Modified Paths: -------------- csw/mgar/pkg/x11/xcb-proto/trunk/Makefile csw/mgar/pkg/x11/xcb-proto/trunk/checksums csw/mgar/pkg/x11/xcb-proto/trunk/files/CSWxcb-proto.gspec Removed Paths: ------------- csw/mgar/pkg/x11/xcb-proto/trunk/files/CSWxcb-proto.depend csw/mgar/pkg/x11/xcb-proto/trunk/files/CSWxcb-proto.prototype Modified: csw/mgar/pkg/x11/xcb-proto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xcb-proto/trunk/Makefile 2008-12-14 19:06:57 UTC (rev 2584) +++ csw/mgar/pkg/x11/xcb-proto/trunk/Makefile 2008-12-14 19:14:55 UTC (rev 2585) @@ -1,6 +1,6 @@ GARNAME = xcb-proto GARVERSION = 1.1 -CATEGORIES = lib +CATEGORIES = x11 DESCRIPTION = xcb-proto define BLURB @@ -14,22 +14,8 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -DISTFILES += $(call admfiles,CSWxcb-proto, depend) +DISTFILES += $(call admfiles,CSWxcb-proto) -LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib - -export LDFLAGS - -TEST_SCRIPTS = none - -GREP = ggrep - include gar/category.mk -CONFIGURE_ARGS = --prefix=/opt/csw --mandir=/opt/csw/share/man -test-none: - @$(MAKECOOKIE) - -post-install: - ( gfind $(DESTDIR)/opt/csw -exec bash -c "file {} | ggrep ELF | ggrep -e 'executable' -e 'dynamic lib' | ggrep 'not stripped' && strip {}" \; ) Modified: csw/mgar/pkg/x11/xcb-proto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/xcb-proto/trunk/checksums 2008-12-14 19:06:57 UTC (rev 2584) +++ csw/mgar/pkg/x11/xcb-proto/trunk/checksums 2008-12-14 19:14:55 UTC (rev 2585) @@ -1,3 +1,3 @@ 424ac05f279fb9aab0139e982c81e6d6 download/xcb-proto-1.1.tar.gz -3beeed068baf809bb6d2c5958281c38d download/CSWxcb-proto.gspec -d41d8cd98f00b204e9800998ecf8427e download/CSWxcb-proto.depend +96f3a97a7bb1391d79bff88257ff98e2 download/CSWxcb-proto.gspec +424ac05f279fb9aab0139e982c81e6d6 download/xcb-proto-1.1.tar.gz Modified: csw/mgar/pkg/x11/xcb-proto/trunk/files/CSWxcb-proto.gspec =================================================================== --- csw/mgar/pkg/x11/xcb-proto/trunk/files/CSWxcb-proto.gspec 2008-12-14 19:06:57 UTC (rev 2584) +++ csw/mgar/pkg/x11/xcb-proto/trunk/files/CSWxcb-proto.gspec 2008-12-14 19:14:55 UTC (rev 2585) @@ -1,4 +1,4 @@ %var bitname xcbproto %var pkgname CSWxcbproto %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING +%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 wbonnet at users.sourceforge.net Sun Dec 14 20:18:04 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 14 Dec 2008 19:18:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[2586] csw/mgar/pkg/x11/xextproto/trunk Message-ID: Revision: 2586 http://gar.svn.sourceforge.net/gar/?rev=2586&view=rev Author: wbonnet Date: 2008-12-14 19:18:04 +0000 (Sun, 14 Dec 2008) Log Message: ----------- Move to X11 subdir Modified Paths: -------------- csw/mgar/pkg/x11/xextproto/trunk/Makefile csw/mgar/pkg/x11/xextproto/trunk/checksums csw/mgar/pkg/x11/xextproto/trunk/files/CSWxextproto.gspec Removed Paths: ------------- csw/mgar/pkg/x11/xextproto/trunk/files/CSWxextproto.depend csw/mgar/pkg/x11/xextproto/trunk/files/CSWxextproto.prototype Modified: csw/mgar/pkg/x11/xextproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xextproto/trunk/Makefile 2008-12-14 19:14:55 UTC (rev 2585) +++ csw/mgar/pkg/x11/xextproto/trunk/Makefile 2008-12-14 19:18:04 UTC (rev 2586) @@ -1,35 +1,20 @@ GARNAME = xextproto GARVERSION = 7.0.3 -CATEGORIES = lib +CATEGORIES = x11 DESCRIPTION = xextproto define BLURB xextproto endef -MASTER_SITES =http://xorg.freedesktop.org/releases/individual/proto/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -DISTFILES += $(call admfiles,CSWxextproto, depend) +DISTFILES += $(call admfiles,CSWxextproto) -LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib - -export LDFLAGS - -TEST_SCRIPTS = none - -GREP = ggrep - include gar/category.mk -CONFIGURE_ARGS = --prefix=/opt/csw --mandir=/opt/csw/share/man - -test-none: - @$(MAKECOOKIE) - -post-install: - ( gfind $(DESTDIR)/opt/csw -exec bash -c "file {} | ggrep ELF | ggrep -e 'executable' -e 'dynamic lib' | ggrep 'not stripped' && strip {}" \; ) Modified: csw/mgar/pkg/x11/xextproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/xextproto/trunk/checksums 2008-12-14 19:14:55 UTC (rev 2585) +++ csw/mgar/pkg/x11/xextproto/trunk/checksums 2008-12-14 19:18:04 UTC (rev 2586) @@ -1,3 +1,3 @@ 6a8f9f9559e9065858905043c17e05a1 download/xextproto-7.0.3.tar.gz -eccfcd948b06943cbd532906a56ff190 download/CSWxextproto.gspec -d41d8cd98f00b204e9800998ecf8427e download/CSWxextproto.depend +fd70e9403a62d42ca8e45df6fda471c9 download/CSWxextproto.gspec +6a8f9f9559e9065858905043c17e05a1 download/xextproto-7.0.3.tar.gz Modified: csw/mgar/pkg/x11/xextproto/trunk/files/CSWxextproto.gspec =================================================================== --- csw/mgar/pkg/x11/xextproto/trunk/files/CSWxextproto.gspec 2008-12-14 19:14:55 UTC (rev 2585) +++ csw/mgar/pkg/x11/xextproto/trunk/files/CSWxextproto.gspec 2008-12-14 19:18:04 UTC (rev 2586) @@ -1,4 +1,4 @@ %var bitname xextproto %var pkgname CSWxextproto %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING +%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 wbonnet at users.sourceforge.net Sun Dec 14 20:22:16 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 14 Dec 2008 19:22:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[2587] csw/mgar/pkg/x11/xproto/trunk Message-ID: Revision: 2587 http://gar.svn.sourceforge.net/gar/?rev=2587&view=rev Author: wbonnet Date: 2008-12-14 19:22:16 +0000 (Sun, 14 Dec 2008) Log Message: ----------- Move to X11 subdir Modified Paths: -------------- csw/mgar/pkg/x11/xproto/trunk/Makefile csw/mgar/pkg/x11/xproto/trunk/checksums csw/mgar/pkg/x11/xproto/trunk/files/CSWxproto.gspec Modified: csw/mgar/pkg/x11/xproto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xproto/trunk/Makefile 2008-12-14 19:18:04 UTC (rev 2586) +++ csw/mgar/pkg/x11/xproto/trunk/Makefile 2008-12-14 19:22:16 UTC (rev 2587) @@ -1,35 +1,20 @@ GARNAME = xproto GARVERSION = 7.0.14 -CATEGORIES = lib +CATEGORIES = x11 DESCRIPTION = xproto define BLURB xproto endef -MASTER_SITES =http://xorg.freedesktop.org/releases/individual/proto/ -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz +MASTER_SITES = $(X11_PROTO_MASTER_SITE) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -DISTFILES += $(call admfiles,CSWxproto, depend) +DISTFILES += $(call admfiles,CSWxproto) -LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib - -export LDFLAGS - -TEST_SCRIPTS = none - -GREP = ggrep - include gar/category.mk -CONFIGURE_ARGS = --prefix=/opt/csw --mandir=/opt/csw/share/man - -test-none: - @$(MAKECOOKIE) - -post-install: - ( gfind $(DESTDIR)/opt/csw -exec bash -c "file {} | ggrep ELF | ggrep -e 'executable' -e 'dynamic lib' | ggrep 'not stripped' && strip {}" \; ) Modified: csw/mgar/pkg/x11/xproto/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/xproto/trunk/checksums 2008-12-14 19:18:04 UTC (rev 2586) +++ csw/mgar/pkg/x11/xproto/trunk/checksums 2008-12-14 19:22:16 UTC (rev 2587) @@ -1,3 +1,3 @@ 3575f7bea6d3314508f142575eb8e843 download/xproto-7.0.14.tar.gz -b72227e1b4bd37ced508c6809d750114 download/CSWxproto.gspec -d41d8cd98f00b204e9800998ecf8427e download/CSWxproto.depend +87ea47c8bd3fcf06c6d6b78822c967e5 download/CSWxproto.gspec +3575f7bea6d3314508f142575eb8e843 download/xproto-7.0.14.tar.gz Modified: csw/mgar/pkg/x11/xproto/trunk/files/CSWxproto.gspec =================================================================== --- csw/mgar/pkg/x11/xproto/trunk/files/CSWxproto.gspec 2008-12-14 19:18:04 UTC (rev 2586) +++ csw/mgar/pkg/x11/xproto/trunk/files/CSWxproto.gspec 2008-12-14 19:22:16 UTC (rev 2587) @@ -1,4 +1,4 @@ %var bitname xproto %var pkgname CSWxproto %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING +%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 wbonnet at users.sourceforge.net Sun Dec 14 20:40:35 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 14 Dec 2008 19:40:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[2588] csw/mgar/pkg Message-ID: Revision: 2588 http://gar.svn.sourceforge.net/gar/?rev=2588&view=rev Author: wbonnet Date: 2008-12-14 19:40:34 +0000 (Sun, 14 Dec 2008) Log Message: ----------- Move to subdir X11 and GARv2 Modified Paths: -------------- csw/mgar/pkg/x11/libpthread-stubs/trunk/Makefile csw/mgar/pkg/x11/libpthread-stubs/trunk/files/CSWlibpthreadstubs.gspec csw/mgar/pkg/x11/xcb-proto/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/libpthread-stubs/ Removed Paths: ------------- csw/mgar/pkg/libpthread-stubs/ csw/mgar/pkg/x11/libpthread-stubs/trunk/files/CSWlibpthreadstubs.depend csw/mgar/pkg/x11/libpthread-stubs/trunk/files/CSWlibpthreadstubs.prototype Property Changed: ---------------- csw/mgar/pkg/x11/libpthread-stubs/trunk/ Property changes on: csw/mgar/pkg/x11/libpthread-stubs/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/x11/libpthread-stubs/trunk/Makefile =================================================================== --- csw/mgar/pkg/libpthread-stubs/trunk/Makefile 2008-12-13 18:53:19 UTC (rev 2573) +++ csw/mgar/pkg/x11/libpthread-stubs/trunk/Makefile 2008-12-14 19:40:34 UTC (rev 2588) @@ -1,39 +1,20 @@ GARNAME = libpthread-stubs GARVERSION = 0.1 -CATEGORIES = lib +CATEGORIES = x11 DESCRIPTION = pthread stubs not provided by native libc define BLURB This library provides weak aliases for pthread functions not provided in libc or otherwise available by default. Libraries like libxcb rely on pthread stubs to use pthreads optionally, becoming thread-safe when linked to libpthread, while avoiding any performance hit when running single-threaded. libpthread-stubs supports this behavior even on platforms which do not supply all the necessary pthread stubs. On platforms which already supply all the necessary pthread stubs, this package has no content. endef -MASTER_SITES =http://xcb.freedesktop.org/dist/ +MASTER_SITES = $(XCB_MASTER_SITES) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -# DISTFILES += CSWlibpthreadstubs.gspec CSWlibpthreadstubs.prototype CSWlibpthreadstubs.depend -# DISTFILES += CSWlibpthreadstubsdev.gspec CSWlibpthreadstubsdev.prototype CSWlibpthreadstubsdev.depend DISTFILES += $(call admfiles,CSWlibpthreadstubs, depend) -CFLAGS += -xlibmil -errtags=yes -erroff=E_EMPTY_DECLARATION -CXXFLAGS += -xlibmil -xlibmopt -features=tmplife -norunpath -LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib - -export CFLAGS CXXFLAGS LDFLAGS - -TEST_SCRIPTS = none - -GREP = ggrep - include gar/category.mk -CONFIGURE_ARGS = --prefix=/opt/csw --mandir=/opt/csw/share/man - -test-none: - @$(MAKECOOKIE) - -post-install: - ( gfind $(DESTDIR)/opt/csw -exec bash -c "file {} | ggrep ELF | ggrep -e 'executable' -e 'dynamic lib' | ggrep 'not stripped' && strip {}" \; ) Modified: csw/mgar/pkg/x11/libpthread-stubs/trunk/files/CSWlibpthreadstubs.gspec =================================================================== --- csw/mgar/pkg/libpthread-stubs/trunk/files/CSWlibpthreadstubs.gspec 2008-12-13 18:53:19 UTC (rev 2573) +++ csw/mgar/pkg/x11/libpthread-stubs/trunk/files/CSWlibpthreadstubs.gspec 2008-12-14 19:40:34 UTC (rev 2588) @@ -1,4 +1,4 @@ %var bitname libpthreadstubs %var pkgname CSWlibpthreadstubs %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING +%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Deleted: csw/mgar/pkg/x11/libpthread-stubs/trunk/files/CSWlibpthreadstubs.prototype =================================================================== --- csw/mgar/pkg/libpthread-stubs/trunk/files/CSWlibpthreadstubs.prototype 2008-12-13 18:53:19 UTC (rev 2573) +++ csw/mgar/pkg/x11/libpthread-stubs/trunk/files/CSWlibpthreadstubs.prototype 2008-12-14 19:40:34 UTC (rev 2588) @@ -1,5 +0,0 @@ -d none /opt/csw/lib/pkgconfig 0755 root bin -f none /opt/csw/lib/pkgconfig/pthread-stubs.pc 0644 root bin -i copyright=CSWlibpthreadstubs.copyright -i depend=CSWlibpthreadstubs.depend -i pkginfo=CSWlibpthreadstubs.pkginfo Modified: csw/mgar/pkg/x11/xcb-proto/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/xcb-proto/trunk/Makefile 2008-12-14 19:22:16 UTC (rev 2587) +++ csw/mgar/pkg/x11/xcb-proto/trunk/Makefile 2008-12-14 19:40:34 UTC (rev 2588) @@ -7,7 +7,7 @@ xcb-proto endef -MASTER_SITES =http://xcb.freedesktop.org/dist/ +MASTER_SITES = $(XCB_MASTER_SITES) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz PKGDIST = $(GARNAME)-$(GARVERSION).tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Dec 14 21:22:31 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 14 Dec 2008 20:22:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[2589] csw/mgar/pkg/x11/libpthread-stubs/trunk Message-ID: Revision: 2589 http://gar.svn.sourceforge.net/gar/?rev=2589&view=rev Author: wbonnet Date: 2008-12-14 20:22:31 +0000 (Sun, 14 Dec 2008) Log Message: ----------- Move to X11 subdir Modified Paths: -------------- csw/mgar/pkg/x11/libpthread-stubs/trunk/Makefile csw/mgar/pkg/x11/libpthread-stubs/trunk/checksums Modified: csw/mgar/pkg/x11/libpthread-stubs/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libpthread-stubs/trunk/Makefile 2008-12-14 19:40:34 UTC (rev 2588) +++ csw/mgar/pkg/x11/libpthread-stubs/trunk/Makefile 2008-12-14 20:22:31 UTC (rev 2589) @@ -14,7 +14,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -DISTFILES += $(call admfiles,CSWlibpthreadstubs, depend) +DISTFILES += $(call admfiles,CSWlibpthreadstubs) include gar/category.mk Modified: csw/mgar/pkg/x11/libpthread-stubs/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libpthread-stubs/trunk/checksums 2008-12-14 19:40:34 UTC (rev 2588) +++ csw/mgar/pkg/x11/libpthread-stubs/trunk/checksums 2008-12-14 20:22:31 UTC (rev 2589) @@ -1,3 +1,2 @@ 5e3e75160ab6a8c212d0ecd82aa04651 download/libpthread-stubs-0.1.tar.gz -9ea5b260e4d45c5f92bb54601b77fa32 download/CSWlibpthreadstubs.gspec -d41d8cd98f00b204e9800998ecf8427e download/CSWlibpthreadstubs.depend +adceda12cfefe051430db570bbc6a438 download/CSWlibpthreadstubs.gspec This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Dec 14 21:27:33 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 14 Dec 2008 20:27:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[2590] csw/mgar/pkg Message-ID: Revision: 2590 http://gar.svn.sourceforge.net/gar/?rev=2590&view=rev Author: wbonnet Date: 2008-12-14 20:27:27 +0000 (Sun, 14 Dec 2008) Log Message: ----------- move to X11 subdir Modified Paths: -------------- csw/mgar/pkg/x11/libXau/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/x11/libXau/ Removed Paths: ------------- csw/mgar/pkg/libXau/ Property Changed: ---------------- csw/mgar/pkg/x11/libXau/trunk/ Property changes on: csw/mgar/pkg/x11/libXau/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/x11/libXau/trunk/Makefile =================================================================== --- csw/mgar/pkg/libXau/trunk/Makefile 2008-12-13 18:53:19 UTC (rev 2573) +++ csw/mgar/pkg/x11/libXau/trunk/Makefile 2008-12-14 20:27:27 UTC (rev 2590) @@ -1,6 +1,6 @@ GARNAME = libXau GARVERSION = 1.0.4 -CATEGORIES = lib +CATEGORIES = x11 DESCRIPTION = X11 authorisation library define BLURB This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Dec 14 21:35:35 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 14 Dec 2008 20:35:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[2591] csw/mgar/gar/v2/categories Message-ID: Revision: 2591 http://gar.svn.sourceforge.net/gar/?rev=2591&view=rev Author: wbonnet Date: 2008-12-14 20:35:35 +0000 (Sun, 14 Dec 2008) Log Message: ----------- Add x11 category Added Paths: ----------- csw/mgar/gar/v2/categories/x11/ csw/mgar/gar/v2/categories/x11/category.mk Added: csw/mgar/gar/v2/categories/x11/category.mk =================================================================== --- csw/mgar/gar/v2/categories/x11/category.mk (rev 0) +++ csw/mgar/gar/v2/categories/x11/category.mk 2008-12-14 20:35:35 UTC (rev 2591) @@ -0,0 +1,41 @@ +# X11 +X11_PROTO_MASTER_SITE = http://xorg.freedesktop.org/releases/individual/proto/ +XCB_MASTER_SITES = http://xcb.freedesktop.org/dist/ + +# C compiler flags +CFLAGS += -xlibmil -errtags=yes -erroff=E_EMPTY_DECLARATION + +# C++ compiler flags +CXXFLAGS += -xlibmil -xlibmopt -features=tmplife -norunpath + +# Preprocessor flags + +# Linker flags +LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib + +# Defines some tools used by autostuff +GREP = ggrep + +# export the variables +export LDFLAGS CXXFLAGS CFLAGS CPPFLAGS GREP + +# pkg-config options +PKG_CONFIG_PATH += $(DESTDIR)/opt/csw/lib/pkgconfig +PKG_CONFIG_PATH += $(DESTDIR)/opt/csw/X11/lib/pkgconfig + +# Configure common options +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --prefix=/opt/csw/X11 +CONFIGURE_ARGS += --exec-prefix=/opt/csw/X11 +CONFIGURE_ARGS += --libdir=/opt/csw/X11 +CONFIGURE_ARGS += --includedir=/opt/csw/X11/include +CONFIGURE_ARGS += --datadir=/opt/csw/X11/share +CONFIGURE_ARGS += --mandir=/opt/csw/X11/share/man +CONFIGURE_ARGS += --docdir=/opt/csw/X11/share/doc + +# No tests scripts, thus there is no "gmake test" target +TEST_SCRIPTS = + +# Includes the rest of gar +include gar/gar.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 Sun Dec 14 22:38:42 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 14 Dec 2008 21:38:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[2592] csw/mgar/pkg/pca/trunk Message-ID: Revision: 2592 http://gar.svn.sourceforge.net/gar/?rev=2592&view=rev Author: dmichelsen Date: 2008-12-14 21:38:42 +0000 (Sun, 14 Dec 2008) Log Message: ----------- pca: Add pca.conf from William Bonnet, review of parameters for latest version pending Modified Paths: -------------- csw/mgar/pkg/pca/trunk/Makefile csw/mgar/pkg/pca/trunk/checksums Added Paths: ----------- csw/mgar/pkg/pca/trunk/files/pca.conf Modified: csw/mgar/pkg/pca/trunk/Makefile =================================================================== --- csw/mgar/pkg/pca/trunk/Makefile 2008-12-14 20:35:35 UTC (rev 2591) +++ csw/mgar/pkg/pca/trunk/Makefile 2008-12-14 21:38:42 UTC (rev 2592) @@ -16,6 +16,7 @@ MASTER_SITES = http://www.par.univie.ac.at/solaris/pca/download/ DISTFILES = $(GARNAME)-$(GARVERSION) DISTFILES += $(call admfiles,CSWpca) +DISTFILES += pca.conf # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d{8}-\d{2}) Modified: csw/mgar/pkg/pca/trunk/checksums =================================================================== --- csw/mgar/pkg/pca/trunk/checksums 2008-12-14 20:35:35 UTC (rev 2591) +++ csw/mgar/pkg/pca/trunk/checksums 2008-12-14 21:38:42 UTC (rev 2592) @@ -1,2 +1,3 @@ 85ce7fa0c108b5e6f1fd1b84e1216ca6 download/pca-20081024-01 12fc8ec8fe4164566632328a76e025f7 download/CSWpca.gspec +12de68ff8f67b4bb8b095e5646402208 download/pca.conf Added: csw/mgar/pkg/pca/trunk/files/pca.conf =================================================================== --- csw/mgar/pkg/pca/trunk/files/pca.conf (rev 0) +++ csw/mgar/pkg/pca/trunk/files/pca.conf 2008-12-14 21:38:42 UTC (rev 2592) @@ -0,0 +1,396 @@ +# ----------------------------------------------------------------------------- +# +# PCA - Patch Check Advanced +# +# The template for this configuration file is associated to version 5.3 +# if you currently use a newer version, please check if you need to update +# this file. +# +# +# +# The behaviour of pca can be configured by setting any option either in this +# configuration file, or as an environment variable with the PCA_ prefix or on +# the command line. +# +# See man page for pca for a complete list of allowed options +# +# At first, this configuration file is read from the following locations : +# +# /opt/csw/bin/pca.conf +# /opt/csw/etc/pca.conf +# /etc/pca.conf +# $HOME/.pca +# pca.conf in the current directory +# +# in this order. Options are set by specifying option=value in the file. +# +# Example: To set the path of the wget command, use wget=/opt/csw/bin/wget +# To enable debug output, use debug=1. +# +# The values defined in this configuration file can be supereded at runtime. +# +# After reading the values from the first configuration file, all environment +# variables matching PCA_OPTION are read. +# +# Example: To set the patch download directory, set PCA_PATCHDIR to +# /some/dir/. +# To set the noheader option, set PCA_NOHEADER to 1. +# +# At last, the command line options are read. Example: To set the location of +# the patch xref file, use -X /tmp or --xrefdir=/tmp. To set the option for +# safe patch installation, use -s or --safe. +# +# +# +# The following value is set by default in the Blastwave package +# +# wget=/opt/csw/bin/wget +# + + + +# ----------------------------------------------------------------------------- +# +# Variable : user +# +# Login name for Sun Online Account authentication. +# +# user=USER + +# ----------------------------------------------------------------------------- +# +# Variable : passwd +# +# Password for Sun Online Account authentication. +# +# passwd=PASS + + + + +# ----------------------------------------------------------------------------- +# +# Variable : list +# +# List patches. See OPERANDS on how to specify which patches are listed. +# +# Set the variable value to 1 to activate it. By default (uncommented line) +# this option is not activated. Uncomment the line to activate it. +# +# list=1 + +# ----------------------------------------------------------------------------- +# +# Variable : listhtml +# +# Like -l, but generates output in HTML format, including links to patch READMEs and downloads. +# +# Set the variable value to 1 to activate it. By default (uncommented line) +# this option is not activated. Uncomment the line to activate it. +# +# listhtml=1 + +# ----------------------------------------------------------------------------- +# +# Variable : download +# +# Download patches. See OPERANDS on how to specify which patches are +# downloaded. Patches are placed in the current directory or in patchdir, +# if set. +# +# Set the variable value to 1 to activate it. By default (uncommented line) +# this option is not activated. Uncomment the line to activate it. +# +# download=1 + +# ----------------------------------------------------------------------------- +# +# Variable : install +# +# Download and install patches. See OPERANDS on how to specify which patches +# are installed. Requires pca to be run as root. +# +# Set the variable value to 1 to activate it. By default (uncommented line) +# this option is not activated. Uncomment the line to activate it. +# +# install=1 + +# ----------------------------------------------------------------------------- +# +# Variable : pretend +# +# Like -i, but only pretend to install patches. Can be used to find out if +# any of the patches require a reboot. +# +# Set the variable value to 1 to activate it. By default (uncommented line) +# this option is not activated. Uncomment the line to activate it. +# +# pretend=1 + +# ----------------------------------------------------------------------------- +# +# Variable : readme +# +# Display patch READMEs. See OPERANDS on how to specify which READMEs are +# displayed. The patch README is extracted from a previously downloaded patch +# file or downloaded directly from Sun. +# +# Set the variable value to 1 to activate it. By default (uncommented line) +# this option is not activated. Uncomment the line to activate it. +# +# readme=1 + +# ----------------------------------------------------------------------------- +# +# Variable : getxref +# +# Download most recent patch cross-reference file. If the file does not exist +# or is older than 24 hours, pca tries to download it on its own before +# anything else. +# +# Set the variable value to 1 to activate it. By default (uncommented line) +# this option is not activated. Uncomment the line to activate it. +# +# getxref=1 + +# ----------------------------------------------------------------------------- +# +# Variable : xfredir +# +# Set location of the cross-reference file. The default is /var/tmp. +# By default, patchdiag.xref is writable for all users. If the xrefown +# option is set, or the xrefdir option contains /home, the cross reference +# file will be writable by the current user only. +# +# xrefdir=/var/opt/csw/pca + +# ----------------------------------------------------------------------------- +# +# Variable : nocheckxref +# +# Do not check for updated patch cross-reference file. Use this option to +# maintain a global baseline patch set. +# +# Set the variable value to 1 to activate it. By default (uncommented line) +# this option is not activated. Uncomment the line to activate it. +# +# nocheckxref=1 + +# ----------------------------------------------------------------------------- +# +# Variable : xrefown +# +# If set, patchdiag.xref will be writable for the current user only. +# +# Set the variable value to 1 to activate it. By default (uncommented line) +# this option is not activated. Uncomment the line to activate it. +# +# xrefown=1 + +# ----------------------------------------------------------------------------- +# +# Variable : nocache +# +# If a proxy is used to access the Internet, this option advises it to not +# cache patchdiag.xref. Useful if the proxy can't be trusted to always return +# an up-to-date version of the file. +# +# Set the variable value to 1 to activate it. By default (uncommented line) +# this option is not activated. Uncomment the line to activate it. +# +# nocache=1 + +# ----------------------------------------------------------------------------- +# +# Variable : patchdir +# +# Set directory to which patches are downloaded. Only use absolute path names. +# The default is the current working directory. +# +# patchdir=/var/opt/csw/pca/download + +# ----------------------------------------------------------------------------- +# +# Variable : askauth +# +# Ask for Sun Online Account data interactively. +# +# Set the variable value to 1 to activate it. By default (uncommented line) +# this option is not activated. Uncomment the line to activate it. +# +# askauth=1 + +# ----------------------------------------------------------------------------- +# +# Variable : localurl +# +# If set, pca tries to download patches and READMEs from this URL first. +# Any URL starting with file:/, ftp://, http:// or https:// can be used. +# See LOCAL PATCH SERVER for more information. +# +# localurl=URL + +# ----------------------------------------------------------------------------- +# +# Variable : pattern +# +# List only patches whose synopsis matches the search pattern REGEX. This +# can be a simple string like mail or a regular expression like "[kK]ernel". +# +# pattern=REGEX + +# ----------------------------------------------------------------------------- +# +# Variable : noreboot +# +# Install only patches that don't require a reboot after installation. +# +# Set the variable value to 1 to activate it. By default (uncommented line) +# this option is not activated. Uncomment the line to activate it. +# +# noreboot=1 + + +# ----------------------------------------------------------------------------- +# +# Variable : minage +# +# List only patches which are at least DAYS old. +# +# Set the variable value to the number of DAYS (eg: 5, 10, 30). By default +# (uncommented line) this option is not activated. Uncomment the line to +# activate it. +# +# minage=DAYS + + +# ----------------------------------------------------------------------------- +# +# Variable : syslog +# +# Syslog facility (eg. user or local0) to log successful patch installs to. +# +# syslog=TYPE + +# ----------------------------------------------------------------------------- +# +# Variable : nobackup +# +# Make patchadd not back up files when installing patches. This works by +# running patchadd with its -d option. Patches can not be backed out if this +# option is used. +# +# Set the variable value to 1 to activate it. By default (uncommented line) +# this option is not activated. Uncomment the line to activate it. +# +# nobackup=1 + +# ----------------------------------------------------------------------------- +# +# Variable : safe +# +# Safe patch installation. Checks all files for local modifications before +# installing a patch. A patch will not be installed if files with local +# modifications would be overwritten. +# +# Set the variable value to 1 to activate it. By default (uncommented line) +# this option is not activated. Uncomment the line to activate it. +# +# safe=1 + +# ----------------------------------------------------------------------------- +# +# Variable : currentzone +# +# Make patchadd modify packages in the current zone only. This works by +# running patchadd with its -G option. This option works on Solaris 10 or +# newer only. +# +# Set the variable value to 1 to activate it. By default (uncommented line) +# this option is not activated. Uncomment the line to activate it. +# +# currentzone=1 + +# ----------------------------------------------------------------------------- +# +# Variable : patchadd +# +# Path to an alternative patchadd command. +# +# patchadd=FILE + +# ----------------------------------------------------------------------------- +# +# Variable : noheader +# +# Don't display descriptive headers. Useful if re-using pca's output in own +# scripts. +# +# Set the variable value to 1 to activate it. By default (uncommented line) +# this option is not activated. Uncomment the line to activate it. +# +# noheader=1 + +# ----------------------------------------------------------------------------- +# +# Variable : fromfiles +# +# Read uname/showrev/pkginfo output from files in the specified directory, +# where DIR can also be a file name prefix. See CREATING PATCH REPORTS FOR +# REMOTE MACHINES for details. +# +# fromfiles=DIR + +# ----------------------------------------------------------------------------- +# +# Variable : root +# +# Set alternative root directory. This can be useful for Live Upgrade, to +# analyze patches in an alternate root environment or to point pca at the +# mini-root of a jumpstart install server. This option works on Solaris 9 or +# newer only. +# +# root=DIR + +# ----------------------------------------------------------------------------- +# +# Variable : wget +# +# Path to the wget command. +# + +wget=/opt/csw/bin/wget + +# ----------------------------------------------------------------------------- +# +# Variable : debug +# +# Show debug output. This includes output generated by patchadd. +# +# Set the variable value to 1 to activate it. By default (uncommented line) +# this option is not activated. Uncomment the line to activate it. +# +# debug=1 + +# ----------------------------------------------------------------------------- +# +# Variable : help +# +# Print help on command line options. +# +# Set the variable value to 1 to activate it. By default (uncommented line) +# this option is not activated. Uncomment the line to activate it. +# +# help=1 + +# ----------------------------------------------------------------------------- +# +# Variable : version +# +# Print version information. +# +# Set the variable value to 1 to activate it. By default (uncommented line) +# this option is not activated. Uncomment the line to activate it. +# +# version=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 Mon Dec 15 12:26:13 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Dec 2008 11:26:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[2593] csw/mgar/pkg Message-ID: Revision: 2593 http://gar.svn.sourceforge.net/gar/?rev=2593&view=rev Author: dmichelsen Date: 2008-12-15 11:26:10 +0000 (Mon, 15 Dec 2008) Log Message: ----------- gar: First commit Added Paths: ----------- csw/mgar/pkg/gar/ csw/mgar/pkg/gar/branches/ csw/mgar/pkg/gar/tags/ csw/mgar/pkg/gar/trunk/ csw/mgar/pkg/gar/trunk/Makefile csw/mgar/pkg/gar/trunk/checksums csw/mgar/pkg/gar/trunk/files/ csw/mgar/pkg/gar/trunk/files/CSWgar-v1.gspec csw/mgar/pkg/gar/trunk/files/CSWgar-v2.gspec csw/mgar/pkg/gar/trunk/files/CSWgar.gspec csw/mgar/pkg/gar/trunk/files/garit Property changes on: csw/mgar/pkg/gar/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 gar-base https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar Added: csw/mgar/pkg/gar/trunk/Makefile =================================================================== --- csw/mgar/pkg/gar/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gar/trunk/Makefile 2008-12-15 11:26:10 UTC (rev 2593) @@ -0,0 +1,48 @@ +GARNAME = gar +GARVERSION = 2.0 +CATEGORIES = utils + +DESCRIPTION = The GAR package build system +define BLURB +endef + +# No master sites, we already have GAR in the repository +MASTER_SITES = +DISTFILES = $(call admfiles,CSWgar,) +DISTFILES += $(call admfiles,CSWgar-v1,) +DISTFILES += $(call admfiles,CSWgar-v2,) +DISTFILES += garit + +WORKSRC = $(WORKDIR) + +SPKG_SOURCEURL = http://gar.sourceforge.net + +SPKG_DESC_CSWgar = The mGAR package build system +SPKG_DESC_CSWgar-v1 = The mGAR v1 system files +SPKG_DESC_CSWgar-v2 = The mGAR v2 system files + +REQUIRED_PKGS_CSWgar = $(PREREQUISITE_BASE_PKGS) CSWsvn +REQUIRED_PKGS_CSWgar-v1 = CSWgar +REQUIRED_PKGS_CSWgar-v2 = CSWgar + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +PKGFILES_CSWgar-v1 = $(prefix)/src/gar/v1/.* +PKGFILES_CSWgar-v2 = $(prefix)/src/gar/v2/.* + +# Because the bad pathes are in the bad pathes check we cannot check ourselves +ENABLE_CHECK = 0 + +include gar/category.mk + +install-custom: + @echo " ==> Installing $(GARNAME)" + + rm -f $(DESTIR)$(bindir)/garit + ginstall -d $(DESTDIR)$(bindir) + ginstall $(WORKSRC)/garit $(DESTDIR)$(bindir)/garit + ginstall -d $(DESTDIR)$(prefix)/src/gar + cd $(CURDIR)/gar-base && pax -r -w -v -s ,.*/\.svn.*,, . $(DESTDIR)$(prefix)/src/gar Added: csw/mgar/pkg/gar/trunk/checksums =================================================================== --- csw/mgar/pkg/gar/trunk/checksums (rev 0) +++ csw/mgar/pkg/gar/trunk/checksums 2008-12-15 11:26:10 UTC (rev 2593) @@ -0,0 +1,4 @@ +ce15d9d2f3f7c2807b385142097446f6 download/CSWgar.gspec +972eef3a1dd23345e20df9d7b34ccf85 download/CSWgar-v1.gspec +8d0f9e54dfd9dc49147343ab5eef546d download/CSWgar-v2.gspec +3505c7f06c435fd0b34e9addd5b4da2a download/garit Added: csw/mgar/pkg/gar/trunk/files/CSWgar-v1.gspec =================================================================== --- csw/mgar/pkg/gar/trunk/files/CSWgar-v1.gspec (rev 0) +++ csw/mgar/pkg/gar/trunk/files/CSWgar-v1.gspec 2008-12-15 11:26:10 UTC (rev 2593) @@ -0,0 +1,5 @@ +%var bitname gar_v1 +%var pkgname CSWgar-v1 +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright +This software is released under GPL. Added: csw/mgar/pkg/gar/trunk/files/CSWgar-v2.gspec =================================================================== --- csw/mgar/pkg/gar/trunk/files/CSWgar-v2.gspec (rev 0) +++ csw/mgar/pkg/gar/trunk/files/CSWgar-v2.gspec 2008-12-15 11:26:10 UTC (rev 2593) @@ -0,0 +1,5 @@ +%var bitname gar_v2 +%var pkgname CSWgar-v2 +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright +This software is released under GPL. Added: csw/mgar/pkg/gar/trunk/files/CSWgar.gspec =================================================================== --- csw/mgar/pkg/gar/trunk/files/CSWgar.gspec (rev 0) +++ csw/mgar/pkg/gar/trunk/files/CSWgar.gspec 2008-12-15 11:26:10 UTC (rev 2593) @@ -0,0 +1,5 @@ +%var bitname gar +%var pkgname CSWgar +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright +This software is released under GPL. Added: csw/mgar/pkg/gar/trunk/files/garit =================================================================== --- csw/mgar/pkg/gar/trunk/files/garit (rev 0) +++ csw/mgar/pkg/gar/trunk/files/garit 2008-12-15 11:26:10 UTC (rev 2593) @@ -0,0 +1,32 @@ +#!/bin/sh +#! -*- perl -*- +eval 'exec perl -x -w $0 ${1+"$@"}' + if 0; + +# garit - Script for making tasks with GAR easy +# +# Author: Dagobert Michelsen, + +my $version = 0.01 + +use strict; +use Config; + +sub man { + eval "use Pod::Usage"; + if ($@) { err ('Required module Pod::Usage not found') } + + # Change uid to something secure as pod2usage does not run as root. + # This snippet is taken from perldoc. See the comments there. + my $id= eval { getpwnam("nobody") }; + $id= eval { getpwnam("nouser") } unless defined $id; + $id= -2 unless defined $id; + eval { + $< = $id; # real uid + $> = $id; # effective uid + $< = $id; # real uid + $> = $id; # effective uid + }; + pod2usage( -exitstatus => 0, -verbose => 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 Mon Dec 15 12:37:34 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Dec 2008 11:37:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[2594] csw/mgar/gar Message-ID: Revision: 2594 http://gar.svn.sourceforge.net/gar/?rev=2594&view=rev Author: dmichelsen Date: 2008-12-15 11:37:33 +0000 (Mon, 15 Dec 2008) Log Message: ----------- mGAR v1/v2: Fix default pathes for build_pkgdb Modified Paths: -------------- csw/mgar/gar/v1/bin/build_pkgdb csw/mgar/gar/v2/bin/build_pkgdb Modified: csw/mgar/gar/v1/bin/build_pkgdb =================================================================== --- csw/mgar/gar/v1/bin/build_pkgdb 2008-12-15 11:26:10 UTC (rev 2593) +++ csw/mgar/gar/v1/bin/build_pkgdb 2008-12-15 11:37:33 UTC (rev 2594) @@ -13,7 +13,7 @@ # build_pkgdb - create CSW package name database from makefiles/gspecs # -GARROOT=${1:-'/export/medusa/comand/csw'} +GARROOT=${1:-.} for makefile in `gfind $GARROOT -mindepth 3 -maxdepth 3 -name Makefile \ | grep -v meta | sort` Modified: csw/mgar/gar/v2/bin/build_pkgdb =================================================================== --- csw/mgar/gar/v2/bin/build_pkgdb 2008-12-15 11:26:10 UTC (rev 2593) +++ csw/mgar/gar/v2/bin/build_pkgdb 2008-12-15 11:37:33 UTC (rev 2594) @@ -13,7 +13,7 @@ # build_pkgdb - create CSW package name database from makefiles/gspecs # -GARROOT=${1:-'/export/medusa/comand/csw'} +GARROOT=${1:-.} for makefile in `gfind $GARROOT -mindepth 3 -maxdepth 3 -name Makefile \ | grep -v meta | sort` 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 Dec 15 12:43:33 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Dec 2008 11:43:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[2595] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 2595 http://gar.svn.sourceforge.net/gar/?rev=2595&view=rev Author: dmichelsen Date: 2008-12-15 11:43:32 +0000 (Mon, 15 Dec 2008) Log Message: ----------- mGAR v2: Add DEBUG_PACKAGING flag Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2008-12-15 11:37:33 UTC (rev 2594) +++ csw/mgar/gar/v2/gar.pkg.mk 2008-12-15 11:43:32 UTC (rev 2595) @@ -13,6 +13,12 @@ # # +ifeq ($(DEBUG_PACKAGING),) +_DBG=@ +else +_DBG= +endif + PKGINFO ?= /usr/bin/pkginfo SPKG_SPECS ?= $(basename $(filter %.gspec,$(DISTFILES))) @@ -156,11 +162,11 @@ # Pulled in from pkglib/csw_prototype.gspec $(PROTOTYPE): $(WORKDIR) merge - @cswproto -r $(PKGROOT) $(PKGROOT) >$@ + $(_DBG)cswproto -r $(PKGROOT) $(PKGROOT) >$@ .PRECIOUS: $(WORKDIR)/%.prototype $(WORKDIR)/%.prototype-$(GARCH) $(WORKDIR)/%.prototype: | $(PROTOTYPE) - @if [ -n "$(PKGFILES_$*_SHARED)" -o \ + $(_DBG)if [ -n "$(PKGFILES_$*_SHARED)" -o \ -n "$(PKGFILES_$*)" -o \ -n "$(_PKGFILES_EXCLUDE_$*)" -o \ -n "$(ISAEXEC_FILES_$*)" -o \ @@ -178,12 +184,12 @@ fi $(WORKDIR)/%.prototype-$(GARCH): | $(WORKDIR)/%.prototype - @cat $(WORKDIR)/$*.prototype $(_PROTOTYPE_FILTER_$*) >$@ + $(_DBG)cat $(WORKDIR)/$*.prototype $(_PROTOTYPE_FILTER_$*) >$@ # $_EXTRA_GAR_PKGS is for dynamic dependencies added by GAR itself (like CSWisaexec or CSWcswclassutils) .PRECIOUS: $(WORKDIR)/%.depend $(WORKDIR)/%.depend: - $(if $(_EXTRA_GAR_PKGS)$(REQUIRED_PKGS_$*)$(REQUIRED_PKGS), \ + $(_DBG)$(if $(_EXTRA_GAR_PKGS)$(REQUIRED_PKGS_$*)$(REQUIRED_PKGS), \ ($(foreach PKG,$(_EXTRA_GAR_PKGS) $(REQUIRED_PKGS_$*) $(REQUIRED_PKGS),\ $(if $(SPKG_DESC_$(PKG)), \ echo "P $(PKG) $(call _pkglist_catalogname,$(PKG)) - $(SPKG_DESC_$(PKG))";, \ @@ -218,7 +224,7 @@ package-%: $(WORKDIR)/%.prototype-$(GARCH) $(WORKDIR)/%.depend @echo " ==> Processing $*.gspec" - @( $(call _PKG_ENV,$*) mkpackage --spec $(WORKDIR)/$*.gspec \ + $(_DBG)( $(call _PKG_ENV,$*) mkpackage --spec $(WORKDIR)/$*.gspec \ --spooldir $(SPKG_SPOOLDIR) \ --destdir $(SPKG_EXPORT) \ --workdir $(SPKG_WORKDIR) \ 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 Dec 15 12:44:55 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Dec 2008 11:44:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[2596] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 2596 http://gar.svn.sourceforge.net/gar/?rev=2596&view=rev Author: dmichelsen Date: 2008-12-15 11:44:55 +0000 (Mon, 15 Dec 2008) Log Message: ----------- mGAR v2: Make default merge excludes more flexible Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2008-12-15 11:43:32 UTC (rev 2595) +++ csw/mgar/gar/v2/gar.mk 2008-12-15 11:44:55 UTC (rev 2596) @@ -533,7 +533,10 @@ _MERGE_INCLUDE_FILES += $(EXTRA_MERGE_INCLUDE_FILES) $(EXTRA_MERGE_INCLUDE_FILES_$(MODULATION)) MERGE_EXCLUDE_INFODIR ?= $(sharedstatedir)/info/dir -MERGE_EXCLUDE_DEFAULT ?= $(MERGE_EXCLUDE_INFODIR) $(libdir)/.*\.a $(libdir)/.*\.la +MERGE_EXCLUDE_LIBTOOL ?= $(libdir)/.*\.la +MERGE_EXCLUDE_BACKUPFILES ?= .*\~ +MERGE_EXCLUDE_STATICLIBS ?= $(libdir)/.*\.a +MERGE_EXCLUDE_DEFAULT ?= $(MERGE_EXCLUDE_INFODIR) $(MERGE_EXCLUDE_LIBTOOL) $(MERGE_EXCLUDE_BACKUPFILES) $(MERGE_EXCLUDE_STATICLIBS) # Exclude these files ifeq ($(origin MERGE_EXCLUDE_FILES_$(MODULATION)), undefined) 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 Dec 15 13:49:51 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Dec 2008 12:49:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[2597] csw/branches/dam/automatic-multiarch-compile/devel Message-ID: Revision: 2597 http://gar.svn.sourceforge.net/gar/?rev=2597&view=rev Author: dmichelsen Date: 2008-12-15 12:49:51 +0000 (Mon, 15 Dec 2008) Log Message: ----------- automatic-multiarch-compile distcc: Initial commit Added Paths: ----------- csw/branches/dam/automatic-multiarch-compile/devel/distcc/ csw/branches/dam/automatic-multiarch-compile/devel/distcc/Makefile csw/branches/dam/automatic-multiarch-compile/devel/distcc/checksums csw/branches/dam/automatic-multiarch-compile/devel/distcc/files/ csw/branches/dam/automatic-multiarch-compile/devel/distcc/files/CSWdistcc.gspec Added: csw/branches/dam/automatic-multiarch-compile/devel/distcc/Makefile =================================================================== --- csw/branches/dam/automatic-multiarch-compile/devel/distcc/Makefile (rev 0) +++ csw/branches/dam/automatic-multiarch-compile/devel/distcc/Makefile 2008-12-15 12:49:51 UTC (rev 2597) @@ -0,0 +1,21 @@ +GARNAME = distcc +GARVERSION = 3.0 +CATEGORIES = devel + +DESCRIPTION = Distributed compilation for faster C/C++ builds +define BLURB + distcc is a program to distribute builds of C, C++, Objective C or + Objective C++ code across several machines on a network. distcc should + always generate the same results as a local build, is simple to install + and use, and is usually much faster than a local compile. +endef + +MASTER_SITES = $(GOOGLE_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 +DISTFILES += $(call admfiles,CSWdistcc,) + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include ../category.mk Added: csw/branches/dam/automatic-multiarch-compile/devel/distcc/checksums =================================================================== --- csw/branches/dam/automatic-multiarch-compile/devel/distcc/checksums (rev 0) +++ csw/branches/dam/automatic-multiarch-compile/devel/distcc/checksums 2008-12-15 12:49:51 UTC (rev 2597) @@ -0,0 +1,2 @@ +a3cab94fb8514687805456bcca9a15ea download/distcc-3.0.tar.bz2 +d301ec445ac117b16707593e77713d82 download/CSWdistcc.gspec Added: csw/branches/dam/automatic-multiarch-compile/devel/distcc/files/CSWdistcc.gspec =================================================================== --- csw/branches/dam/automatic-multiarch-compile/devel/distcc/files/CSWdistcc.gspec (rev 0) +++ csw/branches/dam/automatic-multiarch-compile/devel/distcc/files/CSWdistcc.gspec 2008-12-15 12:49:51 UTC (rev 2597) @@ -0,0 +1,4 @@ +%var bitname distcc +%var pkgname CSWdistcc +%include url file://%{PKGLIB}/csw_dyndepend.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 Mon Dec 15 13:52:19 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Dec 2008 12:52:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[2598] csw/branches/dam/automatic-multiarch-compile/apps Message-ID: Revision: 2598 http://gar.svn.sourceforge.net/gar/?rev=2598&view=rev Author: dmichelsen Date: 2008-12-15 12:52:17 +0000 (Mon, 15 Dec 2008) Log Message: ----------- automatic-multiarch-compile/apps iozone: Initial commit Added Paths: ----------- csw/branches/dam/automatic-multiarch-compile/apps/iozone/ csw/branches/dam/automatic-multiarch-compile/apps/iozone/Makefile csw/branches/dam/automatic-multiarch-compile/apps/iozone/checksums csw/branches/dam/automatic-multiarch-compile/apps/iozone/files/ csw/branches/dam/automatic-multiarch-compile/apps/iozone/files/CSWiozone.gspec csw/branches/dam/automatic-multiarch-compile/apps/iozone/files/patch-vx_ioctl.diff csw/branches/dam/automatic-multiarch-compile/apps/iozone/files/vx_ioctl.h Added: csw/branches/dam/automatic-multiarch-compile/apps/iozone/Makefile =================================================================== --- csw/branches/dam/automatic-multiarch-compile/apps/iozone/Makefile (rev 0) +++ csw/branches/dam/automatic-multiarch-compile/apps/iozone/Makefile 2008-12-15 12:52:17 UTC (rev 2598) @@ -0,0 +1,61 @@ +GARNAME = iozone +GARVERSION = 3.291 +VERSION = $(shell echo $(GARVERSION) | sed -e 's/\./_/g') +CATEGORIES = apps + +DESCRIPTION = IO benchmarking tool +define BLURB + IOzone is a filesystem benchmark tool. The benchmark + generates and measures a variety of file operations. + Iozone has been ported to many machines and runs under + many operating systems. +endef + +MASTER_SITES = http://www.iozone.org/src/current/ +#MASTER_SITES += http://www.iozone.org/docs/ +DISTFILES = $(GARNAME)$(VERSION).tar +DISTFILES += vx_ioctl.h +DISTFILES += $(call admfiles,CSWiozone) + +DISTNAME = $(GARNAME)$(VERSION) + +PATCHFILES = patch-vx_ioctl.diff + +#DOCS = IOzone_msword_98.pdf +#DOCS += Iozone_ps.gz +#DOCS += IOzone_msword_98.doc +#DOCS += Run_rules.doc + +WORKSRC = $(WORKDIR)/$(DISTNAME)/src/current +DOCSRC = $(WORKDIR)/$(DISTNAME)/docs + +# We don't have this modern autoconfig-doodle-crap +CONFIGURE_SCRIPTS = +TEST_SCRIPTS = + +BUILD_SCRIPTS = $(WORKSRC)/makefile + +MODULATORS = TARGET +MODULATIONS_TARGET = 32 64 + +BUILD_ARGS_32 = Solaris +BUILD_ARGS_64 = Solaris8-64 +BUILD_ARGS = $(BUILD_ARGS_$(TARGET)) + +INSTALL_SCRIPTS = custom + +include ../category.mk + +# Make sure the VxFS header is in place +post-extract: + @cp $(WORKDIR)/vx_ioctl.h $(WORKSRC) + @$(MAKECOOKIE) + +# The install part from the Makefile is completely unrelocatable :-( +install-custom: + @echo " ==> Installing $(GARNAME)" + ginstall -d $(DESTDIR)$(bindir) + ginstall $(WORKSRC)/iozone $(DESTDIR)$(bindir) + ginstall -d $(DESTDIR)$(mandir)/man1 + ginstall $(DOCSRC)/iozone.1 $(DESTDIR)$(mandir)/man1 + @$(MAKECOOKIE) Added: csw/branches/dam/automatic-multiarch-compile/apps/iozone/checksums =================================================================== --- csw/branches/dam/automatic-multiarch-compile/apps/iozone/checksums (rev 0) +++ csw/branches/dam/automatic-multiarch-compile/apps/iozone/checksums 2008-12-15 12:52:17 UTC (rev 2598) @@ -0,0 +1,4 @@ +fceb0146e50e714a6c4b3618489e4880 download/iozone3_291.tar +5c485e1e0f464c4c47b05140f383b4b2 download/vx_ioctl.h +84aa96a0593883e2e6a38504be8a0aec download/CSWiozone.gspec +bbf1f15160145b829dbc00b8c8c7b60e download/patch-vx_ioctl.diff Added: csw/branches/dam/automatic-multiarch-compile/apps/iozone/files/CSWiozone.gspec =================================================================== --- csw/branches/dam/automatic-multiarch-compile/apps/iozone/files/CSWiozone.gspec (rev 0) +++ csw/branches/dam/automatic-multiarch-compile/apps/iozone/files/CSWiozone.gspec 2008-12-15 12:52:17 UTC (rev 2598) @@ -0,0 +1,4 @@ +%var bitname iozone +%var pkgname CSWiozone +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKSRC}/LICENSE Added: csw/branches/dam/automatic-multiarch-compile/apps/iozone/files/patch-vx_ioctl.diff =================================================================== --- csw/branches/dam/automatic-multiarch-compile/apps/iozone/files/patch-vx_ioctl.diff (rev 0) +++ csw/branches/dam/automatic-multiarch-compile/apps/iozone/files/patch-vx_ioctl.diff 2008-12-15 12:52:17 UTC (rev 2598) @@ -0,0 +1,24 @@ +diff -Naur tmp/iozone3_291/src/current/iozone.c work/root-blastwavepkg.d/iozone3_291/src/current/iozone.c +--- current/iozone.c 2008-03-03 16:38:17.000000000 +0100 ++++ current/iozone.c 2008-04-23 11:20:00.862783000 +0200 +@@ -338,7 +338,7 @@ + #endif + + #ifdef VXFS +-#include ++#include "vx_ioctl.h" + #endif + + #ifdef unix +diff -Naur tmp/iozone3_291/src/current/libasync.c work/root-blastwavepkg.d/iozone3_291/src/current/libasync.c +--- current/libasync.c 2008-03-03 16:38:17.000000000 +0100 ++++ current/libasync.c 2008-04-23 11:20:09.562273000 +0200 +@@ -106,7 +106,7 @@ + #include + #endif + #ifdef VXFS +-#include ++#include "vx_ioctl.h" + #endif + + #if defined(OSFV5) || defined(linux) Added: csw/branches/dam/automatic-multiarch-compile/apps/iozone/files/vx_ioctl.h =================================================================== --- csw/branches/dam/automatic-multiarch-compile/apps/iozone/files/vx_ioctl.h (rev 0) +++ csw/branches/dam/automatic-multiarch-compile/apps/iozone/files/vx_ioctl.h 2008-12-15 12:52:17 UTC (rev 2598) @@ -0,0 +1,135 @@ +/* @(#)src/unix/pagecache/sol/common/kernel/base/vx_ioctl.h 3.15 10/05/00 14:53:28 - */ +/* #ident "@(#)vxfs:src/unix/pagecache/sol/common/kernel/base/vx_ioctl.h 3.15" */ + +/* + * Copyright (c) 2000 VERITAS Software Corporation. ALL RIGHTS RESERVED. + * UNPUBLISHED -- RIGHTS RESERVED UNDER THE COPYRIGHT + * LAWS OF THE UNITED STATES. USE OF A COPYRIGHT NOTICE + * IS PRECAUTIONARY ONLY AND DOES NOT IMPLY PUBLICATION + * OR DISCLOSURE. + * + * THIS SOFTWARE CONTAINS CONFIDENTIAL INFORMATION AND + * TRADE SECRETS OF VERITAS SOFTWARE. USE, DISCLOSURE, + * OR REPRODUCTION IS PROHIBITED WITHOUT THE PRIOR + * EXPRESS WRITTEN PERMISSION OF VERITAS SOFTWARE. + * + * RESTRICTED RIGHTS LEGEND + * USE, DUPLICATION, OR DISCLOSURE BY THE GOVERNMENT IS + * SUBJECT TO RESTRICTIONS AS SET FORTH IN SUBPARAGRAPH + * (C) (1) (ii) OF THE RIGHTS IN TECHNICAL DATA AND + * COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013. + * VERITAS SOFTWARE + * 1600 PLYMOUTH STREET, MOUNTAIN VIEW, CA 94043 + */ + +#ifndef _FS_VXFS_VX_IOCTL_H +#define _FS_VXFS_VX_IOCTL_H + +#include + +#define VX_IOCTL (('V' << 24) | ('X' << 16) | ('F' << 8)) + +/* + * User group ioctls + */ + +#define VX_SETCACHE (VX_IOCTL | 1) /* set cache advice */ +#define VX_GETCACHE (VX_IOCTL | 2) /* get cache advice */ +#define VX_GETFSOPT (VX_IOCTL | 5) /* get cache advice */ + +#if _FILE_OFFSET_BITS==64 +#define VX_SETEXT (VX_IOCTL | 39) +#define VX_GETEXT (VX_IOCTL | 40) +#else +#define VX_SETEXT (VX_IOCTL | 3) +#define VX_GETEXT (VX_IOCTL | 4) +#endif /*_FILE_OFFSET_BITS==64*/ + +struct vx_ext { + off_t ext_size; /* extent size in fs blocks */ + off_t reserve; /* space reservation in fs blocks */ + int a_flags; /* allocation flags */ +}; + +#ifdef _LP64 +#define VX_FREEZE_ALL (VX_IOCTL | 6) +#else +#define VX_FREEZE_ALL (VX_IOCTL | 41) +#endif /*_LP64*/ + +/* + * The VX_FREEZE_ALL ioctl uses the following structure + */ + +struct vx_freezeall { + int num; /* number of fd pointed to */ + int timeout; /* timeout value for the freeze all */ + int *fds; /* buffer for file descriptor list */ +}; + +/* + * Values for freeze and thaw ioctls. These must match the volume manager + * VOL_FREEZE and VOL_THAW ioctl values. + * + * These are in the user group as opposed to the admin group because we need + * to maintain backward binary compatibility with VxVM. + */ + +#ifndef VOLIOC +#define VOLIOC (('V' << 24) | ('O' << 16) | ('L' << 8)) +#endif /* VOLIOC */ + +#define VX_FREEZE (VOLIOC | 100) /* freeze the file system */ +#define VX_THAW (VOLIOC | 101) /* unfreeze the file system */ + +/* + * values for a_flags in vx_ext + */ + +#define VX_AFLAGS 0x3f /* valid flags for a_flags */ +#define VX_NOEXTEND 0x01 /* file is not to be extended */ +#define VX_TRIM 0x02 /* trim reservation to i_size on close */ +#define VX_CONTIGUOUS 0x04 /* file must be contiguously allocated */ +#define VX_ALIGN 0x08 /* extents allocated on extent boundaries */ +#define VX_NORESERVE 0x10 /* don't change i_reserve */ +#define VX_CHGSIZE 0x20 /* change i_size to match reservation */ + +/* + * vx_setcache flags + */ + +#define VX_ADVFLAGS 0x0003f /* valid advisory flags */ +#define VX_RANDOM 0x00001 /* file is accessed randomly */ +#define VX_SEQ 0x00002 /* file is accessed sequentially */ +#define VX_DIRECT 0x00004 /* perform direct (un-buffered) i/o */ +#define VX_NOREUSE 0x00008 /* do not cache file data */ +#define VX_DSYNC 0x00010 /* synchronous data i/o (not mtime) */ +#define VX_UNBUFFERED 0x00020 /* perform non-sync direct i/o */ + +/* + * Flags for VX_GETFSOPT + */ + +#define VX_FSO_NOLOG 0x0000001 /* mounted with VX_MS_NOLOG */ +#define VX_FSO_BLKCLEAR 0x0000002 /* mounted with VX_MS_BLKCLEAR */ +#define VX_FSO_NODATAINLOG 0x0000004 /* mounted with VX_MS_NODATAINLOG */ +#define VX_FSO_SNAPSHOT 0x0000008 /* is a snapshot */ +#define VX_FSO_SNAPPED 0x0000010 /* is being snapped */ +#define VX_FSO_VJFS 0x0000020 /* the kernel is VJFS */ +#define VX_FSO_DELAYLOG 0x0000040 /* mounted with VX_MS_DELAYLOG */ +#define VX_FSO_TMPLOG 0x0000080 /* mounted with VX_MS_TMPLOG */ +#define VX_FSO_CACHE_DIRECT 0x0000100 /* mounted with VX_MS_CACHE_DIRECT */ +#define VX_FSO_CACHE_DSYNC 0x0000200 /* mounted with VX_MS_CACHE_DSYNC */ +#define VX_FSO_CACHE_CLOSESYNC 0x0000400 /* mnt'd with VX_MS_CACHE_CLOSESYNC */ +#define VX_FSO_OSYNC_DIRECT 0x0001000 /* mounted with VX_MS_OSYNC_DIRECT */ +#define VX_FSO_OSYNC_DSYNC 0x0002000 /* mounted with VX_MS_OSYNC_DSYNC */ +#define VX_FSO_OSYNC_CLOSESYNC 0x0004000 /* mnt'd with VX_MS_OSYNC_CLOSESYNC */ +#define VX_FSO_FILESET 0x0010000 /* mounted as a file set */ +#define VX_FSO_CACHE_TMPCACHE 0x0020000 /* mnt'd with VX_MS_CACHE_TMPCACHE */ +#define VX_FSO_OSYNC_DELAY 0x0040000 /* mounted with VX_MS_OSYNC_DELAY */ +#define VX_FSO_CACHE_UNBUFFERED 0x0080000 /* mnt'd w/ VX_MS_CACHE_UNBUFFERED */ +#define VX_FSO_OSYNC_UNBUFFERED 0x0100000 /* mounted with VX_MS_UNBUFFERED */ +#define VX_FSO_QIO_ON 0x0200000 /* mounted with VX_MS_QIO_ON */ +#define VX_FSO_NOATIME 0x0400000 /* mounted with VX_MS_NOATIME */ + +#endif /* _FS_VXFS_VX_IOCTL_H */ Property changes on: csw/branches/dam/automatic-multiarch-compile/apps/iozone/files/vx_ioctl.h ___________________________________________________________________ Added: svn:executable + * 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 Dec 15 13:53:41 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Dec 2008 12:53:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[2599] csw/branches/dam/automatic-multiarch-compile/lib Message-ID: Revision: 2599 http://gar.svn.sourceforge.net/gar/?rev=2599&view=rev Author: dmichelsen Date: 2008-12-15 12:53:40 +0000 (Mon, 15 Dec 2008) Log Message: ----------- automatic-multiarch-compile gettext: Initial commit Added Paths: ----------- csw/branches/dam/automatic-multiarch-compile/lib/gettext/ csw/branches/dam/automatic-multiarch-compile/lib/gettext/Makefile csw/branches/dam/automatic-multiarch-compile/lib/gettext/checksums csw/branches/dam/automatic-multiarch-compile/lib/gettext/files/ csw/branches/dam/automatic-multiarch-compile/lib/gettext/files/CSWggettext.gspec Added: csw/branches/dam/automatic-multiarch-compile/lib/gettext/Makefile =================================================================== --- csw/branches/dam/automatic-multiarch-compile/lib/gettext/Makefile (rev 0) +++ csw/branches/dam/automatic-multiarch-compile/lib/gettext/Makefile 2008-12-15 12:53:40 UTC (rev 2599) @@ -0,0 +1,31 @@ +GARNAME = gettext +GARVERSION = 0.17 +CATEGORIES = lib + +DESCRIPTION = GNU gettext +define BLURB +endef + +MASTER_SITES = $(GNU_MIRRORS) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWggettext) + +EXTRA_BUILD_ISAS_sparc = sparcv9 +EXTRA_BUILD_ISAS_i386 = amd64 + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --program-transform-name='s/^/g&/' + +TEST_TARGET = check + +include ../category.mk + +LIBS = -lsec +export LIBS + +post-install: + @# Only CSWiconv should have lib/charset.alias in it + @rm -f $(DESTDIR)$(libdir)/charset.alias + @# Only CSWcommon should have share/locale/locale.alias in it + @rm -f $(DESTDIR)$(sharedstatedir)/locale/locale.alias + Added: csw/branches/dam/automatic-multiarch-compile/lib/gettext/checksums =================================================================== --- csw/branches/dam/automatic-multiarch-compile/lib/gettext/checksums (rev 0) +++ csw/branches/dam/automatic-multiarch-compile/lib/gettext/checksums 2008-12-15 12:53:40 UTC (rev 2599) @@ -0,0 +1,2 @@ +58a2bc6d39c0ba57823034d55d65d606 download/gettext-0.17.tar.gz +e77ed8e74dcd0abbf699d345acde7e85 download/CSWggettext.gspec Added: csw/branches/dam/automatic-multiarch-compile/lib/gettext/files/CSWggettext.gspec =================================================================== --- csw/branches/dam/automatic-multiarch-compile/lib/gettext/files/CSWggettext.gspec (rev 0) +++ csw/branches/dam/automatic-multiarch-compile/lib/gettext/files/CSWggettext.gspec 2008-12-15 12:53:40 UTC (rev 2599) @@ -0,0 +1,4 @@ +%var bitname ggettext +%var pkgname CSWggettext +%include url file://%{PKGLIB}/csw_dyndepend.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 Mon Dec 15 13:55:23 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Dec 2008 12:55:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[2600] csw/branches/dam/automatic-multiarch-compile/server/ openldap Message-ID: Revision: 2600 http://gar.svn.sourceforge.net/gar/?rev=2600&view=rev Author: dmichelsen Date: 2008-12-15 12:55:23 +0000 (Mon, 15 Dec 2008) Log Message: ----------- automatic-multiarch-compile openldap: Update to 2.3.41 and minor tweaks Modified Paths: -------------- csw/branches/dam/automatic-multiarch-compile/server/openldap/Makefile csw/branches/dam/automatic-multiarch-compile/server/openldap/checksums csw/branches/dam/automatic-multiarch-compile/server/openldap/files/CSWoldap.depend Modified: csw/branches/dam/automatic-multiarch-compile/server/openldap/Makefile =================================================================== --- csw/branches/dam/automatic-multiarch-compile/server/openldap/Makefile 2008-12-15 12:53:40 UTC (rev 2599) +++ csw/branches/dam/automatic-multiarch-compile/server/openldap/Makefile 2008-12-15 12:55:23 UTC (rev 2600) @@ -1,6 +1,6 @@ GARNAME = openldap -GARVERSION = 2.3.40 -CATEGORIES = server +GARVERSION = 2.3.41 +CATEGORIE1 = server DESCRIPTION = Open source implementation of the Lightweight Directory Access Protocol define BLURB @@ -25,8 +25,8 @@ EXTRA_DOCS = README.CSW openldaprc $(PATCHFILES) -EXTRA_LIB = $(prefix)/bdb4/lib -EXTRA_INC = $(prefix)/bdb4/include +EXTRA_INC = $(prefix)/bdb44/include +EXTRA_LIB = $(prefix)/bdb44/lib CONFIGURE_ARGS = $(DIRPATHS) @@ -37,6 +37,9 @@ EXTRA_BUILD_ISAS_sparc = sparcv9 EXTRA_BUILD_ISAS_i386 = pentium_pro amd64 +ISA_RELOCATE_DIRS_pentium_pro = $(libdir) +EXTRA_MERGE_EXCLUDE_FILES_pentium_pro = .*\.a .*\.la + PKGFILES_CSWoldapclient_EXCLUSIVE = $(bindir)/.* PKGFILES_CSWoldapclient_EXCLUSIVE += $(mandir)/man1/.* Modified: csw/branches/dam/automatic-multiarch-compile/server/openldap/checksums =================================================================== --- csw/branches/dam/automatic-multiarch-compile/server/openldap/checksums 2008-12-15 12:53:40 UTC (rev 2599) +++ csw/branches/dam/automatic-multiarch-compile/server/openldap/checksums 2008-12-15 12:55:23 UTC (rev 2600) @@ -1,19 +1,16 @@ -728e95d806a3d47d9686481d72e62072 download/openldap-2.3.40.tgz +7551b72365f87eeaa3a334c8b3029403 download/openldap-2.3.41.tgz 2f6e6a8c9c3497f1c0c9d52ea2d1dafa download/CSWoldap.gspec -059b2c7ae6d2f181e9098a8afc852ce4 download/CSWoldap.depend -bebf1c2805dfe126938a9631f9d7947f download/CSWoldap.prototype +22d5e58da2b46dddf121f087083dd5d3 download/CSWoldap.depend d7e13ba31a8de786f7cdbe3d529a9728 download/cswopenldap 0e57547ad2b5fedca9f0bd4beaddfe39 download/openldap.xml e15c2020566e56f02118e75c89111f15 download/svc-openldap 5eb9a4b33ac44dd218d508e17f827461 download/CSWoldapclient.gspec ff1e9fbbaf7b56927e297226ed429b0f download/CSWoldapclient.depend -14406b97a0e1587071f8598132f64bab download/CSWoldapclient.prototype 16a7768e2473edbbb3bdff1c64835f1c download/CSWoldapdevel.gspec 6d30b718d20705441b89353dae9e64b4 download/CSWoldapdevel.depend -aa020153cf5ecfc19252d45e89708eda download/CSWoldapdevel.prototype 0cc22644bd37d23564afb7fba580d607 download/CSWoldaprt.gspec 85d952cebd7d6cc954c08f8b446815ba download/CSWoldaprt.depend -755aef96cb0ab523b49e83504d37c107 download/CSWoldaprt.prototype 892dba5f625755be024c30ea0055fd55 download/README.CSW ab2ac7519b092ce8d16124c5270bfec0 download/openldaprc 2d8b0286819ffcb41761a6fdd735c5ae download/patch-oldap-2.3.24-ntlm.diff +2d8b0286819ffcb41761a6fdd735c5ae download/patch-oldap-2.3.24-ntlm.diff Modified: csw/branches/dam/automatic-multiarch-compile/server/openldap/files/CSWoldap.depend =================================================================== --- csw/branches/dam/automatic-multiarch-compile/server/openldap/files/CSWoldap.depend 2008-12-15 12:53:40 UTC (rev 2599) +++ csw/branches/dam/automatic-multiarch-compile/server/openldap/files/CSWoldap.depend 2008-12-15 12:55:23 UTC (rev 2600) @@ -1,4 +1,4 @@ -P CSWbdb4 berkeleydb4 - Embedded database libraries and utilities +P CSWbdb44 berkeleydb44 - embedded database libraries and utilities P CSWiconv libiconv - GNU iconv library P CSWlibnet libnet - the libnet packet construction library P CSWlibtool libtool - Generic library support script 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 Dec 15 15:06:58 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Dec 2008 14:06:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[2601] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 2601 http://gar.svn.sourceforge.net/gar/?rev=2601&view=rev Author: dmichelsen Date: 2008-12-15 14:06:58 +0000 (Mon, 15 Dec 2008) Log Message: ----------- mGAR v2: New variable INCOMPATIBLE_PKGS to produce 'I'-type depends Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2008-12-15 12:55:23 UTC (rev 2600) +++ csw/mgar/gar/v2/gar.pkg.mk 2008-12-15 14:06:58 UTC (rev 2601) @@ -190,7 +190,10 @@ .PRECIOUS: $(WORKDIR)/%.depend $(WORKDIR)/%.depend: $(_DBG)$(if $(_EXTRA_GAR_PKGS)$(REQUIRED_PKGS_$*)$(REQUIRED_PKGS), \ - ($(foreach PKG,$(_EXTRA_GAR_PKGS) $(REQUIRED_PKGS_$*) $(REQUIRED_PKGS),\ + ($(foreach PKG,$(INCOMPATIBLE_PKGS_$*) $(INCOMPATIBLE_PKGS),\ + echo "I $(PKG)";\ + )\ + $(foreach PKG,$(_EXTRA_GAR_PKGS) $(REQUIRED_PKGS_$*) $(REQUIRED_PKGS),\ $(if $(SPKG_DESC_$(PKG)), \ echo "P $(PKG) $(call _pkglist_catalogname,$(PKG)) - $(SPKG_DESC_$(PKG))";, \ echo "$(shell /usr/bin/pkginfo $(PKG) | awk '{ $$1 = "P"; print } ')"; \ 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 Dec 15 15:07:34 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Dec 2008 14:07:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[2602] csw/mgar/pkg/graphviz/trunk Message-ID: Revision: 2602 http://gar.svn.sourceforge.net/gar/?rev=2602&view=rev Author: dmichelsen Date: 2008-12-15 14:07:33 +0000 (Mon, 15 Dec 2008) Log Message: ----------- graphviz: Move to mGAR v2 Modified Paths: -------------- csw/mgar/pkg/graphviz/trunk/Makefile csw/mgar/pkg/graphviz/trunk/checksums csw/mgar/pkg/graphviz/trunk/files/CSWgraphviz.gspec Removed Paths: ------------- csw/mgar/pkg/graphviz/trunk/files/CSWgraphviz.depend Property Changed: ---------------- csw/mgar/pkg/graphviz/trunk/ Property changes on: csw/mgar/pkg/graphviz/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/graphviz/trunk/Makefile =================================================================== --- csw/mgar/pkg/graphviz/trunk/Makefile 2008-12-15 14:06:58 UTC (rev 2601) +++ csw/mgar/pkg/graphviz/trunk/Makefile 2008-12-15 14:07:33 UTC (rev 2602) @@ -9,13 +9,17 @@ emphasis is on making very good drawings of reasonably-sized graphs. endef -MASTER_SITES = http://www.graphviz.org/pub/graphviz/ARCHIVE/ +MASTER_SITES = http://www.graphviz.org/pub/graphviz/stable/SOURCES/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWgraphviz,depend) +DISTFILES += $(call admfiles,CSWgraphviz) # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +REQUIRED_PKGS = CSWexpat CSWfconfig CSWftype2 CSWgd CSWiconv CSWjpeg +REQUIRED_PKGS += CSWpng CSWxpm CSWzlib CSWsunmath +INCOMPATIBLE_PKGS = CSWgraphvis + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check Modified: csw/mgar/pkg/graphviz/trunk/checksums =================================================================== --- csw/mgar/pkg/graphviz/trunk/checksums 2008-12-15 14:06:58 UTC (rev 2601) +++ csw/mgar/pkg/graphviz/trunk/checksums 2008-12-15 14:07:33 UTC (rev 2602) @@ -1,4 +1,2 @@ 703089233da491b736e5d1548f25477f download/graphviz-1.18.tar.gz -471f1a7fc69346b54e6863896452556b download/CSWgraphviz.gspec -c06fe1ab83f4670ed9c436a439f48451 download/CSWgraphviz.depend -edf81d3f2ef4a0ef5321435b6831f528 download/CSWgraphviz.prototype +7d7c6845f079132513d80078e403c0b6 download/CSWgraphviz.gspec Deleted: csw/mgar/pkg/graphviz/trunk/files/CSWgraphviz.depend =================================================================== --- csw/mgar/pkg/graphviz/trunk/files/CSWgraphviz.depend 2008-12-15 14:06:58 UTC (rev 2601) +++ csw/mgar/pkg/graphviz/trunk/files/CSWgraphviz.depend 2008-12-15 14:07:33 UTC (rev 2602) @@ -1,9 +0,0 @@ -P CSWexpat expat - XML Parser Toolkit -P CSWfconfig fontconfig - Font configuration and customization library -P CSWftype2 freetype2 - The free and portable high quality font engine -P CSWgd gd - libgd, Graphics creation library and utilities -P CSWiconv libiconv - GNU iconv library -P CSWjpeg jpeg - lib and tools for JPEG image format -P CSWpng png - library for Portable Network Graphics format (PNG) -P CSWxpm xpm - library for X11 PixMap format (libXpm.so.4.11) -P CSWzlib zlib - Zlib Data Compression Library Modified: csw/mgar/pkg/graphviz/trunk/files/CSWgraphviz.gspec =================================================================== --- csw/mgar/pkg/graphviz/trunk/files/CSWgraphviz.gspec 2008-12-15 14:06:58 UTC (rev 2601) +++ csw/mgar/pkg/graphviz/trunk/files/CSWgraphviz.gspec 2008-12-15 14:07:33 UTC (rev 2602) @@ -1,4 +1,4 @@ %var bitname graphviz %var pkgname CSWgraphviz %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING +%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 bonivart at users.sourceforge.net Mon Dec 15 17:08:25 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 15 Dec 2008 16:08:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[2603] csw/mgar/pkg/cpan/Module-Load-Conditional/trunk Message-ID: Revision: 2603 http://gar.svn.sourceforge.net/gar/?rev=2603&view=rev Author: bonivart Date: 2008-12-15 16:08:25 +0000 (Mon, 15 Dec 2008) Log Message: ----------- Module-Load-Conditional: moved to gar v2, removed manual prototype and depend Modified Paths: -------------- csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/files/CSWpmmodloadcond.depend csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/files/CSWpmmodloadcond.prototype Property Changed: ---------------- csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/ Property changes on: csw/mgar/pkg/cpan/Module-Load-Conditional/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile 2008-12-15 14:07:33 UTC (rev 2602) +++ csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile 2008-12-15 16:08:25 UTC (rev 2603) @@ -9,11 +9,17 @@ any of the modules you have installed on your system during runtime. endef -DISTFILES += $(call admfiles,CSWpmmodloadcond,depend prototype) +DISTFILES += $(call admfiles,CSWpmmodloadcond,) +REQUIRED_PKGS = CSWpmprmscheck CSWpmmodload CSWpmlclemktxtsimple + +#SKIPTEST = 1 + DEPENDS += cpan/Params-Check DEPENDS += cpan/Module-Load DEPENDS += cpan/Locale-Maketext-Simple DEPENDS += cpan/version +EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod + include gar/category.mk Modified: csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/checksums 2008-12-15 14:07:33 UTC (rev 2602) +++ csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/checksums 2008-12-15 16:08:25 UTC (rev 2603) @@ -1,4 +1,2 @@ e912706042be78943b1af9a349378bbd download/CSWpmmodloadcond.gspec -29950eac3f358abb2289ba87ec1e54ae download/CSWpmmodloadcond.depend -7e19b3870875ba4f3ac57b1bd99906ca download/CSWpmmodloadcond.prototype -fae73541e0b1d87d0bbe6e1676e5e738 download/Module-Load-Conditional-0.16.tar.gz +cc80e455e996fa2fbd6933283c3947ef download/Module-Load-Conditional-0.26.tar.gz Deleted: csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/files/CSWpmmodloadcond.depend =================================================================== --- csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/files/CSWpmmodloadcond.depend 2008-12-15 14:07:33 UTC (rev 2602) +++ csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/files/CSWpmmodloadcond.depend 2008-12-15 16:08:25 UTC (rev 2603) @@ -1,3 +0,0 @@ -P CSWpmlclemktxtsimple pm_lclemktxtsimple - simple interface to Locale::Maketext::Lexicon -P CSWpmmodload pm_modload - Runtime require of both modules and files -P CSWpmprmscheck pm_prmscheck - A generic input parsing/checking mechanism. Deleted: csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/files/CSWpmmodloadcond.prototype =================================================================== --- csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/files/CSWpmmodloadcond.prototype 2008-12-15 14:07:33 UTC (rev 2602) +++ csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/files/CSWpmmodloadcond.prototype 2008-12-15 16:08:25 UTC (rev 2603) @@ -1,16 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Module/Load 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Module/Load/Conditional 0755 root bin -f none /opt/csw/lib/perl/csw/auto/Module/Load/Conditional/.packlist 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/Module::Load::Conditional.3perl 0444 root bin -d none /opt/csw/share/perl 0755 root bin -d none /opt/csw/share/perl/csw 0755 root bin -d none /opt/csw/share/perl/csw/Module 0755 root bin -d none /opt/csw/share/perl/csw/Module/Load 0755 root bin -f none /opt/csw/share/perl/csw/Module/Load/Conditional.pm 0444 root bin 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 Dec 15 17:20:08 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 15 Dec 2008 16:20:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[2604] csw/mgar/pkg/cpan/Module-Load/trunk Message-ID: Revision: 2604 http://gar.svn.sourceforge.net/gar/?rev=2604&view=rev Author: bonivart Date: 2008-12-15 16:20:08 +0000 (Mon, 15 Dec 2008) Log Message: ----------- Module-Load: updated to 0.12 Modified Paths: -------------- csw/mgar/pkg/cpan/Module-Load/trunk/Makefile csw/mgar/pkg/cpan/Module-Load/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Module-Load/trunk/files/CSWpmmodload.depend csw/mgar/pkg/cpan/Module-Load/trunk/files/CSWpmmodload.prototype Property Changed: ---------------- csw/mgar/pkg/cpan/Module-Load/trunk/ Property changes on: csw/mgar/pkg/cpan/Module-Load/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Module-Load/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Module-Load/trunk/Makefile 2008-12-15 16:08:25 UTC (rev 2603) +++ csw/mgar/pkg/cpan/Module-Load/trunk/Makefile 2008-12-15 16:20:08 UTC (rev 2604) @@ -1,5 +1,5 @@ GARNAME = Module-Load -GARVERSION = 0.10 +GARVERSION = 0.12 CATEGORIES = cpan AUTHOR = KANE @@ -9,6 +9,10 @@ or a module. endef -DISTFILES += $(call admfiles,CSWpmmodload,depend prototype) +DISTFILES += $(call admfiles,CSWpmmodload,) +#SKIPTEST = 1 + +EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod + include gar/category.mk Modified: csw/mgar/pkg/cpan/Module-Load/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Module-Load/trunk/checksums 2008-12-15 16:08:25 UTC (rev 2603) +++ csw/mgar/pkg/cpan/Module-Load/trunk/checksums 2008-12-15 16:20:08 UTC (rev 2604) @@ -1,4 +1,2 @@ 6e4e4023477a104e96c1145551065db5 download/CSWpmmodload.gspec -882cfc02f0fd6a7892b45bc34a8a9755 download/CSWpmmodload.depend -e887c9dca1a15ae0dc9611d95b6975b0 download/CSWpmmodload.prototype -ee40eb2fa3059381e43d1f14d414fe67 download/Module-Load-0.10.tar.gz +be2f196d1f364887eb94d08bb1e24c1d download/Module-Load-0.12.tar.gz Deleted: csw/mgar/pkg/cpan/Module-Load/trunk/files/CSWpmmodload.prototype =================================================================== --- csw/mgar/pkg/cpan/Module-Load/trunk/files/CSWpmmodload.prototype 2008-12-15 16:08:25 UTC (rev 2603) +++ csw/mgar/pkg/cpan/Module-Load/trunk/files/CSWpmmodload.prototype 2008-12-15 16:20:08 UTC (rev 2604) @@ -1,15 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Module 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Module/Load 0755 root bin -f none /opt/csw/lib/perl/csw/auto/Module/Load/.packlist 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/Module::Load.3perl 0444 root bin -d none /opt/csw/share/perl 0755 root bin -d none /opt/csw/share/perl/csw 0755 root bin -d none /opt/csw/share/perl/csw/Module 0755 root bin -f none /opt/csw/share/perl/csw/Module/Load.pm 0444 root bin 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 Dec 15 17:27:27 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 15 Dec 2008 16:27:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[2605] csw/mgar/pkg/cpan/libwww-perl/trunk/files Message-ID: Revision: 2605 http://gar.svn.sourceforge.net/gar/?rev=2605&view=rev Author: bonivart Date: 2008-12-15 16:27:27 +0000 (Mon, 15 Dec 2008) Log Message: ----------- libwww-perl: removed manual depend and prototype Removed Paths: ------------- csw/mgar/pkg/cpan/libwww-perl/trunk/files/CSWpmlibwww.depend csw/mgar/pkg/cpan/libwww-perl/trunk/files/CSWpmlibwww.prototype Deleted: csw/mgar/pkg/cpan/libwww-perl/trunk/files/CSWpmlibwww.depend =================================================================== --- csw/mgar/pkg/cpan/libwww-perl/trunk/files/CSWpmlibwww.depend 2008-12-15 16:20:08 UTC (rev 2604) +++ csw/mgar/pkg/cpan/libwww-perl/trunk/files/CSWpmlibwww.depend 2008-12-15 16:27:27 UTC (rev 2605) @@ -1,6 +0,0 @@ -P CSWpmmimebase64 -P CSWpmhtmlfmt -P CSWpmcompresszlib -P CSWpmhtmlparser pm_htmlparser - HTML parser class -P CSWpmuri pm_uri - Uniform Resource Identifiers (absolute and relative) -P CSWpmhtmltagset Deleted: csw/mgar/pkg/cpan/libwww-perl/trunk/files/CSWpmlibwww.prototype =================================================================== --- csw/mgar/pkg/cpan/libwww-perl/trunk/files/CSWpmlibwww.prototype 2008-12-15 16:20:08 UTC (rev 2604) +++ csw/mgar/pkg/cpan/libwww-perl/trunk/files/CSWpmlibwww.prototype 2008-12-15 16:27:27 UTC (rev 2605) @@ -1,112 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/LWP 0755 root bin -f none /opt/csw/lib/perl/csw/auto/LWP/.packlist 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/Bundle::LWP.3perl 0444 root bin -f none /opt/csw/share/man/man3/File::Listing.3perl 0444 root bin -f none /opt/csw/share/man/man3/HTML::Form.3perl 0444 root bin -f none /opt/csw/share/man/man3/HTTP::Cookies.3perl 0444 root bin -f none /opt/csw/share/man/man3/HTTP::Cookies::Microsoft.3perl 0444 root bin -f none /opt/csw/share/man/man3/HTTP::Cookies::Netscape.3perl 0444 root bin -f none /opt/csw/share/man/man3/HTTP::Daemon.3perl 0444 root bin -f none /opt/csw/share/man/man3/HTTP::Date.3perl 0444 root bin -f none /opt/csw/share/man/man3/HTTP::Headers.3perl 0444 root bin -f none /opt/csw/share/man/man3/HTTP::Headers::Util.3perl 0444 root bin -f none /opt/csw/share/man/man3/HTTP::Message.3perl 0444 root bin -f none /opt/csw/share/man/man3/HTTP::Negotiate.3perl 0444 root bin -f none /opt/csw/share/man/man3/HTTP::Request.3perl 0444 root bin -f none /opt/csw/share/man/man3/HTTP::Request::Common.3perl 0444 root bin -f none /opt/csw/share/man/man3/HTTP::Response.3perl 0444 root bin -f none /opt/csw/share/man/man3/HTTP::Status.3perl 0444 root bin -f none /opt/csw/share/man/man3/LWP.3perl 0444 root bin -f none /opt/csw/share/man/man3/LWP::Authen::Ntlm.3perl 0444 root bin -f none /opt/csw/share/man/man3/LWP::ConnCache.3perl 0444 root bin -f none /opt/csw/share/man/man3/LWP::Debug.3perl 0444 root bin -f none /opt/csw/share/man/man3/LWP::DebugFile.3perl 0444 root bin -f none /opt/csw/share/man/man3/LWP::MediaTypes.3perl 0444 root bin -f none /opt/csw/share/man/man3/LWP::MemberMixin.3perl 0444 root bin -f none /opt/csw/share/man/man3/LWP::Protocol.3perl 0444 root bin -f none /opt/csw/share/man/man3/LWP::RobotUA.3perl 0444 root bin -f none /opt/csw/share/man/man3/LWP::Simple.3perl 0444 root bin -f none /opt/csw/share/man/man3/LWP::UserAgent.3perl 0444 root bin -f none /opt/csw/share/man/man3/Net::HTTP.3perl 0444 root bin -f none /opt/csw/share/man/man3/Net::HTTP::NB.3perl 0444 root bin -f none /opt/csw/share/man/man3/WWW::RobotRules.3perl 0444 root bin -f none /opt/csw/share/man/man3/WWW::RobotRules::AnyDBM_File.3perl 0444 root bin -f none /opt/csw/share/man/man3/lwpcook.3perl 0444 root bin -f none /opt/csw/share/man/man3/lwptut.3perl 0444 root bin -d none /opt/csw/share/perl 0755 root bin -d none /opt/csw/share/perl/csw 0755 root bin -d none /opt/csw/share/perl/csw/Bundle 0755 root bin -f none /opt/csw/share/perl/csw/Bundle/LWP.pm 0444 root bin -d none /opt/csw/share/perl/csw/File 0755 root bin -f none /opt/csw/share/perl/csw/File/Listing.pm 0444 root bin -d none /opt/csw/share/perl/csw/HTML 0755 root bin -f none /opt/csw/share/perl/csw/HTML/Form.pm 0444 root bin -d none /opt/csw/share/perl/csw/HTTP 0755 root bin -d none /opt/csw/share/perl/csw/HTTP/Cookies 0755 root bin -f none /opt/csw/share/perl/csw/HTTP/Cookies.pm 0444 root bin -f none /opt/csw/share/perl/csw/HTTP/Cookies/Microsoft.pm 0444 root bin -f none /opt/csw/share/perl/csw/HTTP/Cookies/Netscape.pm 0444 root bin -f none /opt/csw/share/perl/csw/HTTP/Daemon.pm 0444 root bin -f none /opt/csw/share/perl/csw/HTTP/Date.pm 0444 root bin -d none /opt/csw/share/perl/csw/HTTP/Headers 0755 root bin -f none /opt/csw/share/perl/csw/HTTP/Headers.pm 0444 root bin -f none /opt/csw/share/perl/csw/HTTP/Headers/Auth.pm 0444 root bin -f none /opt/csw/share/perl/csw/HTTP/Headers/ETag.pm 0444 root bin -f none /opt/csw/share/perl/csw/HTTP/Headers/Util.pm 0444 root bin -f none /opt/csw/share/perl/csw/HTTP/Message.pm 0444 root bin -f none /opt/csw/share/perl/csw/HTTP/Negotiate.pm 0444 root bin -d none /opt/csw/share/perl/csw/HTTP/Request 0755 root bin -f none /opt/csw/share/perl/csw/HTTP/Request.pm 0444 root bin -f none /opt/csw/share/perl/csw/HTTP/Request/Common.pm 0444 root bin -f none /opt/csw/share/perl/csw/HTTP/Response.pm 0444 root bin -f none /opt/csw/share/perl/csw/HTTP/Status.pm 0444 root bin -d none /opt/csw/share/perl/csw/LWP 0755 root bin -f none /opt/csw/share/perl/csw/LWP.pm 0444 root bin -d none /opt/csw/share/perl/csw/LWP/Authen 0755 root bin -f none /opt/csw/share/perl/csw/LWP/Authen/Basic.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/Authen/Digest.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/Authen/Ntlm.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/ConnCache.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/Debug.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/DebugFile.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/MediaTypes.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/MemberMixin.pm 0444 root bin -d none /opt/csw/share/perl/csw/LWP/Protocol 0755 root bin -f none /opt/csw/share/perl/csw/LWP/Protocol.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/Protocol/GHTTP.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/Protocol/cpan.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/Protocol/data.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/Protocol/file.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/Protocol/ftp.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/Protocol/gopher.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/Protocol/http.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/Protocol/http10.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/Protocol/https.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/Protocol/https10.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/Protocol/loopback.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/Protocol/mailto.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/Protocol/nntp.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/Protocol/nogo.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/RobotUA.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/Simple.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/UserAgent.pm 0444 root bin -f none /opt/csw/share/perl/csw/LWP/media.types 0444 root bin -d none /opt/csw/share/perl/csw/Net 0755 root bin -d none /opt/csw/share/perl/csw/Net/HTTP 0755 root bin -f none /opt/csw/share/perl/csw/Net/HTTP.pm 0444 root bin -f none /opt/csw/share/perl/csw/Net/HTTP/Methods.pm 0444 root bin -f none /opt/csw/share/perl/csw/Net/HTTP/NB.pm 0444 root bin -f none /opt/csw/share/perl/csw/Net/HTTPS.pm 0444 root bin -d none /opt/csw/share/perl/csw/WWW 0755 root bin -d none /opt/csw/share/perl/csw/WWW/RobotRules 0755 root bin -f none /opt/csw/share/perl/csw/WWW/RobotRules.pm 0444 root bin -f none /opt/csw/share/perl/csw/WWW/RobotRules/AnyDBM_File.pm 0444 root bin -f none /opt/csw/share/perl/csw/lwpcook.pod 0444 root bin -f none /opt/csw/share/perl/csw/lwptut.pod 0444 root bin 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 Dec 15 18:35:52 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 15 Dec 2008 17:35:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[2606] csw/mgar/pkg/docbook-dtds/trunk Message-ID: Revision: 2606 http://gar.svn.sourceforge.net/gar/?rev=2606&view=rev Author: bdwalton Date: 2008-12-15 17:35:52 +0000 (Mon, 15 Dec 2008) Log Message: ----------- Convert the local Makefile into a patch for easier 'installation' in gar2. A few other tweaks for better packaging under v2. Modified Paths: -------------- csw/mgar/pkg/docbook-dtds/trunk/Makefile csw/mgar/pkg/docbook-dtds/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/docbook-dtds/trunk/files/Makefile Modified: csw/mgar/pkg/docbook-dtds/trunk/Makefile =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/Makefile 2008-12-15 16:27:27 UTC (rev 2605) +++ csw/mgar/pkg/docbook-dtds/trunk/Makefile 2008-12-15 17:35:52 UTC (rev 2606) @@ -56,7 +56,7 @@ DBFILES += docbook-xml-4.3.zip docbook-4.4.zip docbook-xml-4.4.zip MASTER_SITES = $(O_SRC) $(D_SRC) -DISTFILES = $(DBFILES) Makefile +DISTFILES = $(DBFILES) DISTFILES += $(call admfiles,CSWdocbookdtds,postinstall preremove) PATCHFILES = docbook-4.2-euro.patch docbook-dtd30-sgml-1.0.catalog.patch @@ -65,6 +65,7 @@ PATCHFILES += docbook-dtd41-sgml-1.0.catalog.patch PATCHFILES += docbook-dtd42-sgml-1.0.catalog.patch PATCHFILES += docbook-dtds-ents.patch +PATCHFILES += add_makefile.patch # we don't need no stinkin' configure! :) CONFIGURE_SCRIPTS = @@ -140,6 +141,7 @@ # Increase NAMELEN (bug #36058, bug #159382). [bug references from # rpm .spec file] ( cd $(WORKSRC_FIRSTMOD); \ - gsed -e's,\(NAMELEN\s\+\)44\(\s\*\)\?,\1256,' -i.namelen */docbook.dcl; \ - cp ../Makefile .) + gsed -e's,\(NAMELEN\s\+\)44\(\s\*\)\?,\1256,' -i.namelen \ + */docbook.dcl ) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/docbook-dtds/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/checksums 2008-12-15 16:27:27 UTC (rev 2605) +++ csw/mgar/pkg/docbook-dtds/trunk/checksums 2008-12-15 17:35:52 UTC (rev 2606) @@ -9,7 +9,6 @@ ab200202b9e136a144db1e0864c45074 download/docbook-xml-4.3.zip f89e1bd0b2c7a361e3f1f739e16b5d0d download/docbook-4.4.zip cbb04e9a700955d88c50962ef22c1634 download/docbook-xml-4.4.zip -e5318114e6c751a9e0835d7711275e13 download/Makefile 536104a1ab1e8eac583cf27f4f8844a4 download/CSWdocbookdtds.gspec 95eb4822347e50556398f4a11ee95097 download/CSWdocbookdtds.postinstall 9035c448e6480f6e916084fea388b512 download/CSWdocbookdtds.preremove @@ -20,3 +19,4 @@ e976c302070ec2e14316d4a601c224cb download/docbook-dtd41-sgml-1.0.catalog.patch 0ee42c28835cd448b6b47b2345394b28 download/docbook-dtd42-sgml-1.0.catalog.patch 1dae3f33fe7dda3fd68a4d4a3df2c653 download/docbook-dtds-ents.patch +9fba7b568d66e824b498706eb1c83a73 download/add_makefile.patch Deleted: csw/mgar/pkg/docbook-dtds/trunk/files/Makefile =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/Makefile 2008-12-15 16:27:27 UTC (rev 2605) +++ csw/mgar/pkg/docbook-dtds/trunk/files/Makefile 2008-12-15 17:35:52 UTC (rev 2606) @@ -1,81 +0,0 @@ -prefix = /opt/csw -sysconfdir = $(prefix)/etc -datadir = $(prefix)/share - - -INSTALL = /opt/csw/bin/ginstall -c -INSTALL_DATA = $(INSTALL) -m 0644 -INSTALL_DIR = $(INSTALL) -m 0755 -d - -docbookdir = $(datadir)/sgml/docbook -docdir = $(datadir)/doc/docbookdtds - -SGML = $(wildcard *-sgml) -XML = $(wildcard *-xml) - -SGMLTARG = $(patsubst %,inst-%,$(SGML)) -XMLTARG = $(patsubst %,inst-%,$(XML)) - -.PHONY: $(SGML) $(XMLT) - -all: build - -install: $(SGMLTARG) $(XMLTARG) links docs - -links: $(SGMLTARG) $(XMLTARG) - @echo Installing links to most current SGML and XML catalogs - @( $(INSTALL_DIR) $(DESTDIR)/$(sysconfdir)/sgml; \ - cd $(DESTDIR)/$(sysconfdir)/sgml; \ - [ -h $(DESTDIR)/$(sysconfdir)/sgml/sgml-docbook.cat ] || \ - ln -s sgml-docbook-4.4-$(GARVERSION)-$(PATCHLEVEL).cat \ - $(DESTDIR)/$(sysconfdir)/sgml/sgml-docbook.cat; \ - [ -h $(DESTDIR)/$(sysconfdir)/sgml/xml-docbook.cat ] || \ - ln -s xml-docbook-4.4-$(GARVERSION)-$(PATCHLEVEL).cat \ - $(DESTDIR)/$(sysconfdir)/sgml/xml-docbook.cat ) - -docs: - @echo Installing docs - $(INSTALL_DIR) $(DESTDIR)/$(docdir)/ - for d in *; do \ - if [ "`echo $$d/*txt`" != "$$d/*txt" ]; then \ - $(INSTALL_DIR) $(DESTDIR)/$(docdir)/$$d; \ - $(INSTALL_DATA) $$d/*txt $(DESTDIR)/$(docdir)/$$d/; \ - fi \ - done - for x in 3 4; do \ - dir=$(DESTDIR)/$(docdir)/$$x.1-sgml; \ - [ -d $$dir ] || $(INSTALL_DIR) $$dir; \ - $(INSTALL_DATA) $$x.1-sgml/ChangeLog $$dir/; \ - done - -inst-%-sgml: DD=$(DESTDIR)/$(docbookdir)/sgml-dtd-$*$(GARVERSION)-$(PATCHLEVEL) -inst-%-sgml: - @echo Installing $*-sgml - @( cd $*-sgml; \ - gmkdir -p $(DD); \ - $(INSTALL_DATA) *dtd *mod $(DD)/; \ - [ -n "`ls *dcl 2>/dev/null`" ] && $(INSTALL_DATA) *dcl $(DD); \ - $(INSTALL_DATA) docbook.cat $(DD)/; \ - if [ -d ent ]; then \ - $(INSTALL_DIR) $(DD)/ent; \ - $(INSTALL_DATA) ent/* $(DD)/ent/; \ - fi ) - -inst-%-xml: DD=$(DESTDIR)/$(docbookdir)/xml-dtd-$*-$(GARVERSION)-$(PATCHLEVEL) -inst-%-xml: - @echo Installing $*-xml - @( cd $*-xml; \ - gmkdir -p $(DD); \ - $(INSTALL_DATA) *dtd *mod $(DD)/; \ - [ -n "`ls *dcl 2>/dev/null`" ] && $(INSTALL_DATA) *dcl $(DD); \ - $(INSTALL_DATA) docbook.cat $(DD)/; \ - if [ -d ent ]; then \ - $(INSTALL_DIR) $(DD)/ent; \ - $(INSTALL_DATA) ent/* $(DD)/ent/; \ - fi ) - -build: - @echo Nothing to build...dummy statement in action. - -showtarg: - @echo $(SGMLTARG) $(XMLTARG) 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 Dec 15 19:09:48 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 15 Dec 2008 18:09:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[2607] csw/mgar/pkg/docbook-dtds/trunk Message-ID: Revision: 2607 http://gar.svn.sourceforge.net/gar/?rev=2607&view=rev Author: bdwalton Date: 2008-12-15 18:09:48 +0000 (Mon, 15 Dec 2008) Log Message: ----------- Added the makefile patch to svn, tweaked install filename for catalog files. Modified Paths: -------------- csw/mgar/pkg/docbook-dtds/trunk/checksums Added Paths: ----------- csw/mgar/pkg/docbook-dtds/trunk/files/add_makefile.patch Modified: csw/mgar/pkg/docbook-dtds/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/checksums 2008-12-15 17:35:52 UTC (rev 2606) +++ csw/mgar/pkg/docbook-dtds/trunk/checksums 2008-12-15 18:09:48 UTC (rev 2607) @@ -19,4 +19,4 @@ e976c302070ec2e14316d4a601c224cb download/docbook-dtd41-sgml-1.0.catalog.patch 0ee42c28835cd448b6b47b2345394b28 download/docbook-dtd42-sgml-1.0.catalog.patch 1dae3f33fe7dda3fd68a4d4a3df2c653 download/docbook-dtds-ents.patch -9fba7b568d66e824b498706eb1c83a73 download/add_makefile.patch +e95f2615b1a3f50b9d14efdb4d188f3d download/add_makefile.patch Added: csw/mgar/pkg/docbook-dtds/trunk/files/add_makefile.patch =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/add_makefile.patch (rev 0) +++ csw/mgar/pkg/docbook-dtds/trunk/files/add_makefile.patch 2008-12-15 18:09:48 UTC (rev 2607) @@ -0,0 +1,84 @@ +--- /dev/null 2008-12-15 18:41:04.000000000 +0100 ++++ docbookdtds-1.0/Makefile 2008-12-15 18:55:18.651895350 +0100 +@@ -0,0 +1,81 @@ ++prefix = /opt/csw ++sysconfdir = $(prefix)/etc ++datadir = $(prefix)/share ++ ++ ++INSTALL = /opt/csw/bin/ginstall -c ++INSTALL_DATA = $(INSTALL) -m 0644 ++INSTALL_DIR = $(INSTALL) -m 0755 -d ++ ++docbookdir = $(datadir)/sgml/docbook ++docdir = $(datadir)/doc/docbookdtds ++ ++SGML = $(wildcard *-sgml) ++XML = $(wildcard *-xml) ++ ++SGMLTARG = $(patsubst %,inst-%,$(SGML)) ++XMLTARG = $(patsubst %,inst-%,$(XML)) ++ ++.PHONY: $(SGML) $(XMLT) ++ ++all: build ++ ++install: $(SGMLTARG) $(XMLTARG) links docs ++ ++links: $(SGMLTARG) $(XMLTARG) ++ @echo Installing links to most current SGML and XML catalogs ++ @( $(INSTALL_DIR) $(DESTDIR)/$(sysconfdir)/sgml; \ ++ cd $(DESTDIR)/$(sysconfdir)/sgml; \ ++ [ -h $(DESTDIR)/$(sysconfdir)/sgml/sgml-docbook.cat ] || \ ++ ln -s sgml-docbook-4.4-$(GARVERSION)-$(PATCHLEVEL).cat \ ++ $(DESTDIR)/$(sysconfdir)/sgml/sgml-docbook.cat; \ ++ [ -h $(DESTDIR)/$(sysconfdir)/sgml/xml-docbook.cat ] || \ ++ ln -s xml-docbook-4.4-$(GARVERSION)-$(PATCHLEVEL).cat \ ++ $(DESTDIR)/$(sysconfdir)/sgml/xml-docbook.cat ) ++ ++docs: ++ @echo Installing docs ++ $(INSTALL_DIR) $(DESTDIR)/$(docdir)/ ++ for d in *; do \ ++ if [ "`echo $$d/*txt`" != "$$d/*txt" ]; then \ ++ $(INSTALL_DIR) $(DESTDIR)/$(docdir)/$$d; \ ++ $(INSTALL_DATA) $$d/*txt $(DESTDIR)/$(docdir)/$$d/; \ ++ fi \ ++ done ++ for x in 3 4; do \ ++ dir=$(DESTDIR)/$(docdir)/$$x.1-sgml; \ ++ [ -d $$dir ] || $(INSTALL_DIR) $$dir; \ ++ $(INSTALL_DATA) $$x.1-sgml/ChangeLog $$dir/; \ ++ done ++ ++inst-%-sgml: DD=$(DESTDIR)/$(docbookdir)/sgml-dtd-$*-$(GARVERSION)-$(PATCHLEVEL) ++inst-%-sgml: ++ @echo Installing $*-sgml ++ @( cd $*-sgml; \ ++ gmkdir -p $(DD); \ ++ $(INSTALL_DATA) *dtd *mod $(DD)/; \ ++ [ -n "`ls *dcl 2>/dev/null`" ] && $(INSTALL_DATA) *dcl $(DD); \ ++ $(INSTALL_DATA) docbook.cat $(DD)/catalog; \ ++ if [ -d ent ]; then \ ++ $(INSTALL_DIR) $(DD)/ent; \ ++ $(INSTALL_DATA) ent/* $(DD)/ent/; \ ++ fi ) ++ ++inst-%-xml: DD=$(DESTDIR)/$(docbookdir)/xml-dtd-$*-$(GARVERSION)-$(PATCHLEVEL) ++inst-%-xml: ++ @echo Installing $*-xml ++ @( cd $*-xml; \ ++ gmkdir -p $(DD); \ ++ $(INSTALL_DATA) *dtd *mod $(DD)/; \ ++ [ -n "`ls *dcl 2>/dev/null`" ] && $(INSTALL_DATA) *dcl $(DD); \ ++ $(INSTALL_DATA) docbook.cat $(DD)/catalog; \ ++ if [ -d ent ]; then \ ++ $(INSTALL_DIR) $(DD)/ent; \ ++ $(INSTALL_DATA) ent/* $(DD)/ent/; \ ++ fi ) ++ ++build: ++ @echo Nothing to build...dummy statement in action. ++ ++showtarg: ++ @echo $(SGMLTARG) $(XMLTARG) 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 Dec 15 21:11:36 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 15 Dec 2008 20:11:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[2608] csw/mgar/pkg/docbook-dtds/trunk Message-ID: Revision: 2608 http://gar.svn.sourceforge.net/gar/?rev=2608&view=rev Author: bdwalton Date: 2008-12-15 20:11:36 +0000 (Mon, 15 Dec 2008) Log Message: ----------- Corrected postinstall/preremove script to not use chroot like it's a Linux box. Doh! Modified Paths: -------------- csw/mgar/pkg/docbook-dtds/trunk/checksums csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.preremove Modified: csw/mgar/pkg/docbook-dtds/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/checksums 2008-12-15 18:09:48 UTC (rev 2607) +++ csw/mgar/pkg/docbook-dtds/trunk/checksums 2008-12-15 20:11:36 UTC (rev 2608) @@ -10,8 +10,8 @@ f89e1bd0b2c7a361e3f1f739e16b5d0d download/docbook-4.4.zip cbb04e9a700955d88c50962ef22c1634 download/docbook-xml-4.4.zip 536104a1ab1e8eac583cf27f4f8844a4 download/CSWdocbookdtds.gspec -95eb4822347e50556398f4a11ee95097 download/CSWdocbookdtds.postinstall -9035c448e6480f6e916084fea388b512 download/CSWdocbookdtds.preremove +15aa1d4d660b64c96f0e68bdaa04facb download/CSWdocbookdtds.postinstall +140c5f6cda37568a76f43f349bef8453 download/CSWdocbookdtds.preremove 318742d3a6648a6905727f071cbc9847 download/docbook-4.2-euro.patch e3067045964536cc7445d5c3f1e99916 download/docbook-dtd30-sgml-1.0.catalog.patch 856d40f5d1e3fc8fd939b88bf5fedc87 download/docbook-dtd31-sgml-1.0.catalog.patch Modified: csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall 2008-12-15 18:09:48 UTC (rev 2607) +++ csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall 2008-12-15 20:11:36 UTC (rev 2608) @@ -4,9 +4,10 @@ # rhel5 docbook-dtds rpm spec. # 20081204 -bw -if [ -n "$PKG_INSTALL_ROOT" -a "$PKG_INSTALL_ROOT" != "/" ]; then - chroot $PKG_INSTALL_ROOT -fi +case "$PKG_INSTALL_ROOT" in + ""|"/") PREFIX= ;; + *) PREFIX="chroot $PKG_INSTALL_ROOT";; +esac XMLCAT=/opt/csw/bin/xmlcatalog INSTCAT=/opt/csw/bin/install-catalog @@ -24,184 +25,183 @@ # Update the centralized catalog corresponding to this version of the DTD # DocBook V3.0 -$XMLCAT --sgml --noout --add \ +$PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-3.0-$VERSION-$RELEASE.cat \ $CSWSGML/sgml-iso-entities-8879.1986/catalog -$XMLCAT --sgml --noout --add \ +$PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-3.0-$VERSION-$RELEASE.cat \ $CSWSGML/docbook/sgml-dtd-3.0-$VERSION-$RELEASE/catalog # DocBook V3.1 -$XMLCAT --sgml --noout --add \ +$PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-3.1-$VERSION-$RELEASE.cat \ $CSWSGML/sgml-iso-entities-8879.1986/catalog -$XMLCAT --sgml --noout --add \ +$PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-3.1-$VERSION-$RELEASE.cat \ $CSWSGML/docbook/sgml-dtd-3.1-$VERSION-$RELEASE/catalog # DocBook V4.0 -$XMLCAT --sgml --noout --add \ +$PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-4.0-$VERSION-$RELEASE.cat \ $CSWSGML/sgml-iso-entities-8879.1986/catalog -$XMLCAT --sgml --noout --add \ +$PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-4.0-$VERSION-$RELEASE.cat \ $CSWSGML/docbook/sgml-dtd-4.0-$VERSION-$RELEASE/catalog # DocBook V4.1 -$XMLCAT --sgml --noout --add \ +$PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-4.1-$VERSION-$RELEASE.cat \ $CSWSGML/sgml-iso-entities-8879.1986/catalog -$XMLCAT --sgml --noout --add \ +$PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-4.1-$VERSION-$RELEASE.cat \ $CSWSGML/docbook/sgml-dtd-4.1-$VERSION-$RELEASE/catalog # DocBook XML V4.1.2 -$XMLCAT --sgml --noout --add \ +$PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/xml-docbook-4.1.2-$VERSION-$RELEASE.cat \ $CSWSGML/sgml-iso-entities-8879.1986/catalog -$XMLCAT --sgml --noout --add \ +$PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/xml-docbook-4.1.2-$VERSION-$RELEASE.cat \ $CSWSGML/docbook/xml-dtd-4.1.2-$VERSION-$RELEASE/catalog # DocBook V4.2 -$XMLCAT --sgml --noout --add \ +$PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-4.2-$VERSION-$RELEASE.cat \ $CSWSGML/sgml-iso-entities-8879.1986/catalog -$XMLCAT --sgml --noout --add \ +$PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-4.2-$VERSION-$RELEASE.cat \ $CSWSGML/docbook/sgml-dtd-4.2-$VERSION-$RELEASE/catalog # DocBook XML V4.2 -$XMLCAT --sgml --noout --add \ +$PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/xml-docbook-4.2-$VERSION-$RELEASE.cat \ $CSWSGML/sgml-iso-entities-8879.1986/catalog -$XMLCAT --sgml --noout --add \ +$PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/xml-docbook-4.2-$VERSION-$RELEASE.cat \ $CSWSGML/docbook/xml-dtd-4.2-$VERSION-$RELEASE/catalog # DocBook V4.3 -$XMLCAT --sgml --noout --add \ +$PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-4.3-$VERSION-$RELEASE.cat \ $CSWSGML/sgml-iso-entities-8879.1986/catalog -$XMLCAT --sgml --noout --add \ +$PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-4.3-$VERSION-$RELEASE.cat \ $CSWSGML/docbook/sgml-dtd-4.3-$VERSION-$RELEASE/catalog # DocBook XML V4.3 -$XMLCAT --sgml --noout --add \ +$PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/xml-docbook-4.3-$VERSION-$RELEASE.cat \ $CSWSGML/sgml-iso-entities-8879.1986/catalog -$XMLCAT --sgml --noout --add \ +$PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/xml-docbook-4.3-$VERSION-$RELEASE.cat \ $CSWSGML/docbook/xml-dtd-4.3-$VERSION-$RELEASE/catalog # DocBook V4.4 -$XMLCAT --sgml --noout --add \ +$PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-4.4-$VERSION-$RELEASE.cat \ $CSWSGML/sgml-iso-entities-8879.1986/catalog -$XMLCAT --sgml --noout --add \ +$PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-4.4-$VERSION-$RELEASE.cat \ $CSWSGML/docbook/sgml-dtd-4.4-$VERSION-$RELEASE/catalog # DocBook XML V4.4 -$XMLCAT --sgml --noout --add \ +$PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/xml-docbook-4.4-$VERSION-$RELEASE.cat \ $CSWSGML/sgml-iso-entities-8879.1986/catalog -$XMLCAT --sgml --noout --add \ +$PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/xml-docbook-4.4-$VERSION-$RELEASE.cat \ $CSWSGML/docbook/xml-dtd-4.4-$VERSION-$RELEASE/catalog # The following lines are for the case in which the style sheets # were installed after another DTD but before this DTD -STYLESHEETS=`echo $CSWSGML/docbook/dsssl-stylesheets-*` -#STYLESHEETS=${STYLESHEETS##*/dsssl-stylesheets-} -STYLESHEETS=`echo $STYLESHEETS | sed 's#[^ ]*/dsssl-stylesheets-##g'` +SS=`echo $PKG_INSTALL_ROOT/$CSWSGML/docbook/dsssl-stylesheets-*` +STYLESHEETS=`echo $SS | sed 's#[^ ]*/dsssl-stylesheets-##g'` if [ "$STYLESHEETS" != "*" ]; then # DocBook V3.0 - $XMLCAT --sgml --noout --add \ + $PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-3.0-$VERSION-$RELEASE.cat \ $CSWSGML/openjade-$OPENJADEVER/catalog - $XMLCAT --sgml --noout --add \ + $PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-3.0-$VERSION-$RELEASE.cat \ $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog # DocBook V3.1 - $XMLCAT --sgml --noout --add \ + $PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-3.1-$VERSION-$RELEASE.cat \ $CSWSGML/openjade-$OPENJADEVER/catalog - $XMLCAT --sgml --noout --add \ + $PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-3.1-$VERSION-$RELEASE.cat \ $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog # DocBook V4.0 - $XMLCAT --sgml --noout --add \ + $PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-4.0-$VERSION-$RELEASE.cat \ $CSWSGML/openjade-$OPENJADEVER/catalog - $XMLCAT --sgml --noout --add \ + $PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-4.0-$VERSION-$RELEASE.cat \ $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog # DocBook V4.1 - $XMLCAT --sgml --noout --add \ + $PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-4.1-$VERSION-$RELEASE.cat \ $CSWSGML/openjade-$OPENJADEVER/catalog - $XMLCAT --sgml --noout --add \ + $PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-4.1-$VERSION-$RELEASE.cat \ $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog # DocBook XML V4.1.2 - $XMLCAT --sgml --noout --add \ + $PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/xml-docbook-4.1.2-$VERSION-$RELEASE.cat \ $CSWSGML/openjade-$OPENJADEVER/catalog - $XMLCAT --sgml --noout --add \ + $PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/xml-docbook-4.1.2-$VERSION-$RELEASE.cat \ $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog # DocBook V4.2 - $XMLCAT --sgml --noout --add \ + $PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-4.2-$VERSION-$RELEASE.cat \ $CSWSGML/openjade-$OPENJADEVER/catalog - $XMLCAT --sgml --noout --add \ + $PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-4.2-$VERSION-$RELEASE.cat \ $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog # DocBook XML V4.2 - $XMLCAT --sgml --noout --add \ + $PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/xml-docbook-4.2-$VERSION-$RELEASE.cat \ $CSWSGML/openjade-$OPENJADEVER/catalog - $XMLCAT --sgml --noout --add \ + $PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/xml-docbook-4.2-$VERSION-$RELEASE.cat \ $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog # DocBook V4.3 - $XMLCAT --sgml --noout --add \ + $PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-4.3-$VERSION-$RELEASE.cat \ $CSWSGML/openjade-$OPENJADEVER/catalog - $XMLCAT --sgml --noout --add \ + $PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-4.3-$VERSION-$RELEASE.cat \ $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog # DocBook XML V4.3 - $XMLCAT --sgml --noout --add \ + $PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/xml-docbook-4.3-$VERSION-$RELEASE.cat \ $CSWSGML/openjade-$OPENJADEVER/catalog - $XMLCAT --sgml --noout --add \ + $PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/xml-docbook-4.3-$VERSION-$RELEASE.cat \ $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog # DocBook V4.4 - $XMLCAT --sgml --noout --add \ + $PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-4.4-$VERSION-$RELEASE.cat \ $CSWSGML/openjade-$OPENJADEVER/catalog - $XMLCAT --sgml --noout --add \ + $PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/sgml-docbook-4.4-$VERSION-$RELEASE.cat \ $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog # DocBook XML V4.4 - $XMLCAT --sgml --noout --add \ + $PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/xml-docbook-4.4-$VERSION-$RELEASE.cat \ $CSWSGML/openjade-$OPENJADEVER/catalog - $XMLCAT --sgml --noout --add \ + $PREFIX $XMLCAT --sgml --noout --add \ $CSWSGMLCNF/xml-docbook-4.4-$VERSION-$RELEASE.cat \ $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog fi @@ -210,7 +210,7 @@ # SGML one. We need to do this (*sigh*) because xmlcatalog messes up # the order of the lines, and SGML tools don't like to see XML things # they aren't expecting. -CATALOG=$CSWSGMLCNF/catalog +CATALOG=$PKG_INSTALL_ROOT/$CSWSGMLCNF/catalog SGML=`cat -n ${CATALOG} | grep sgml-docbook | head -1 | awk '{print $1}'` XML=`cat -n ${CATALOG} | grep xml-docbook | head -1 | awk '{print $1}'` @@ -223,9 +223,9 @@ # make sure we're using the system perl, as we know for sure that it # can handle this operation correctly. /usr/bin/perl -e "@_=<>;@_[$XML,$SGML]=@_[$SGML,$XML];print @_" \ - ${CATALOG} > ${CATALOG}.tmp + $CATALOG > $CATALOG.tmp - mv ${CATALOG}.tmp ${CATALOG} + mv $CATALOG.tmp $CATALOG fi ## @@ -234,364 +234,364 @@ CATALOG=$CSWSGML/docbook/xmlcatalog -if [ -w $CATALOG ] +if [ -w $PKG_INSTALL_ROOT/$CATALOG ] then # DocBook XML V4.1.2 - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Publishing//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-pub.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Greek Letters//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-grk1.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/dbpoolx.mod" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-box.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//DTD DocBook XML V4.1.2//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/docbookx.dtd" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Greek Symbols//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-grk3.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amsn.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-num.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/dbcentx.mod" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-grk4.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/dbnotnx.mod" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-dia.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-grk2.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/dbgenent.mod" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/dbhierx.mod" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amsa.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amso.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-cyrl.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES General Technical//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-tech.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amsc.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/soextblx.dtd" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/calstblx.dtd" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Latin 1//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-lat1.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amsb.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Latin 2//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-lat2.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amsr.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-cyr2.ent" $CATALOG - $XMLCAT --noout --add "rewriteSystem" \ + $PREFIX $XMLCAT --noout --add "rewriteSystem" \ "http://www.oasis-open.org/docbook/xml/4.1.2" \ "xml-dtd-4.1.2-$VERSION-$RELEASE" $CATALOG - $XMLCAT --noout --add "rewriteURI" \ + $PREFIX $XMLCAT --noout --add "rewriteURI" \ "http://www.oasis-open.org/docbook/xml/4.1.2" \ "xml-dtd-4.1.2-$VERSION-$RELEASE" $CATALOG # DocBook XML V4.2 - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Publishing//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-pub.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Greek Letters//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-grk1.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML Information Pool V4.2//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/dbpoolx.mod" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-box.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//DTD DocBook XML V4.2//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/docbookx.dtd" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Greek Symbols//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-grk3.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amsn.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-num.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Character Entities V4.2//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/dbcentx.mod" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-grk4.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Notations V4.2//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/dbnotnx.mod" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-dia.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-grk2.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.2//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/dbgenent.mod" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.2//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/dbhierx.mod" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amsa.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amso.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-cyrl.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES General Technical//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-tech.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amsc.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/soextblx.dtd" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//DTD DocBook XML CALS Table Model V4.2//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/calstblx.dtd" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Latin 1//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-lat1.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amsb.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Latin 2//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-lat2.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amsr.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-cyr2.ent" $CATALOG - $XMLCAT --noout --add "rewriteSystem" \ + $PREFIX $XMLCAT --noout --add "rewriteSystem" \ "http://www.oasis-open.org/docbook/xml/4.2" \ "xml-dtd-4.2-$VERSION-$RELEASE" $CATALOG - $XMLCAT --noout --add "rewriteURI" \ + $PREFIX $XMLCAT --noout --add "rewriteURI" \ "http://www.oasis-open.org/docbook/xml/4.2" \ "xml-dtd-4.2-$VERSION-$RELEASE" $CATALOG # DocBook XML V4.3 - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Publishing//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-pub.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Greek Letters//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-grk1.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML Information Pool V4.3//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/dbpoolx.mod" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-box.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//DTD DocBook XML V4.3//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/docbookx.dtd" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Greek Symbols//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-grk3.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amsn.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-num.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Character Entities V4.3//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/dbcentx.mod" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-grk4.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Notations V4.3//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/dbnotnx.mod" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-dia.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-grk2.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.3//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/dbgenent.mod" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.3//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/dbhierx.mod" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amsa.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amso.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-cyrl.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES General Technical//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-tech.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amsc.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/soextblx.dtd" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//DTD DocBook XML CALS Table Model V4.3//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/calstblx.dtd" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Latin 1//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-lat1.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amsb.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Latin 2//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-lat2.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amsr.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-cyr2.ent" $CATALOG - $XMLCAT --noout --add "rewriteSystem" \ + $PREFIX $XMLCAT --noout --add "rewriteSystem" \ "http://www.oasis-open.org/docbook/xml/4.3" \ "xml-dtd-4.3-$VERSION-$RELEASE" $CATALOG - $XMLCAT --noout --add "rewriteURI" \ + $PREFIX $XMLCAT --noout --add "rewriteURI" \ "http://www.oasis-open.org/docbook/xml/4.3" \ "xml-dtd-4.3-$VERSION-$RELEASE" $CATALOG # DocBook XML V4.4 - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Publishing//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-pub.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Greek Letters//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-grk1.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML Information Pool V4.4//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/dbpoolx.mod" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-box.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//DTD DocBook XML V4.4//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/docbookx.dtd" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Greek Symbols//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-grk3.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amsn.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-num.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Character Entities V4.4//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/dbcentx.mod" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-grk4.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Notations V4.4//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/dbnotnx.mod" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Diacritical Marks//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-dia.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-grk2.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.4//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/dbgenent.mod" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.4//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/dbhierx.mod" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amsa.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amso.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-cyrl.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES General Technical//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-tech.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amsc.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/soextblx.dtd" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "-//OASIS//DTD DocBook XML CALS Table Model V4.4//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/calstblx.dtd" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Latin 1//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-lat1.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amsb.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Latin 2//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-lat2.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amsr.ent" $CATALOG - $XMLCAT --noout --add "public" \ + $PREFIX $XMLCAT --noout --add "public" \ "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-cyr2.ent" $CATALOG - $XMLCAT --noout --add "rewriteSystem" \ + $PREFIX $XMLCAT --noout --add "rewriteSystem" \ "http://www.oasis-open.org/docbook/xml/4.4" \ "xml-dtd-4.4-$VERSION-$RELEASE" $CATALOG - $XMLCAT --noout --add "rewriteURI" \ + $PREFIX $XMLCAT --noout --add "rewriteURI" \ "http://www.oasis-open.org/docbook/xml/4.4" \ "xml-dtd-4.4-$VERSION-$RELEASE" $CATALOG fi # Finally, make sure everything in $CSWSGMLCNF is readable! -/bin/chmod a+r $CSWSGMLCNF/* +/bin/chmod a+r $PKG_INSTALL_ROOT/$CSWSGMLCNF/* Modified: csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.preremove =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.preremove 2008-12-15 18:09:48 UTC (rev 2607) +++ csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.preremove 2008-12-15 20:11:36 UTC (rev 2608) @@ -4,9 +4,10 @@ # rhel5 docbook-dtds rpm spec. # 20081204 -bw -if [ -n "$PKG_INSTALL_ROOT" -a "$PKG_INSTALL_ROOT" != "/" ]; then - chroot $PKG_INSTALL_ROOT -fi +case "$PKG_INSTALL_ROOT" in + ""|"/") PREFIX= ;; + *) PREFIX="chroot $PKG_INSTALL_ROOT ";; +esac XMLCAT=/opt/csw/bin/xmlcatalog CSWSGMLCNF=/opt/csw/etc/sgml @@ -23,65 +24,65 @@ # Update the centralized catalog corresponding to this version of the DTD # DocBook V3.0 -$XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ +$PREFIX $XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ $CSWSGMLCNF/sgml-docbook-3.0-$VERSION-$RELEASE.cat -rm -f $CSWSGMLCNF/sgml-docbook-3.0-$VERSION-$RELEASE.cat +rm -f $PKG_INSTALL_ROOT/$CSWSGMLCNF/sgml-docbook-3.0-$VERSION-$RELEASE.cat # DocBook V3.1 -$XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ +$PREFIX $XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ $CSWSGMLCNF/sgml-docbook-3.1-$VERSION-$RELEASE.cat -rm -f $CSWSGMLCNF/sgml-docbook-3.1-$VERSION-$RELEASE.cat +rm -f $PKG_INSTALL_ROOT/CSWSGMLCNF/sgml-docbook-3.1-$VERSION-$RELEASE.cat # DocBook V4.0 -$XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ +$PREFIX $XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ $CSWSGMLCNF/sgml-docbook-4.0-$VERSION-$RELEASE.cat -rm -f $CSWSGMLCNF/sgml-docbook-4.0-$VERSION-$RELEASE.cat +rm -f $PKG_INSTALL_ROOT/$CSWSGMLCNF/sgml-docbook-4.0-$VERSION-$RELEASE.cat # DocBook V4.1 -$XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ +$PREFIX $XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ $CSWSGMLCNF/sgml-docbook-4.1-$VERSION-$RELEASE.cat -rm -f $CSWSGMLCNF/sgml-docbook-4.1-$VERSION-$RELEASE.cat +rm -f $PKG_INSTALL_ROOT/$CSWSGMLCNF/sgml-docbook-4.1-$VERSION-$RELEASE.cat # DocBook XML V4.1.2 -$XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ +$PREFIX $XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ $CSWSGMLCNF/xml-docbook-4.1.2-$VERSION-$RELEASE.cat -rm -f $CSWSGMLCNF/xml-docbook-4.1.2-$VERSION-$RELEASE.cat +rm -f $PKG_INSTALL_ROOT/$CSWSGMLCNF/xml-docbook-4.1.2-$VERSION-$RELEASE.cat # DocBook V4.2 -$XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ +$PREFIX $XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ $CSWSGMLCNF/sgml-docbook-4.2-$VERSION-$RELEASE.cat -rm -f $CSWSGMLCNF/sgml-docbook-4.2-$VERSION-$RELEASE.cat +rm -f $PKG_INSTALL_ROOT/$CSWSGMLCNF/sgml-docbook-4.2-$VERSION-$RELEASE.cat # DocBook XML V4.2 -$XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ +$PREFIX $XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ $CSWSGMLCNF/xml-docbook-4.2-$VERSION-$RELEASE.cat -rm -f $CSWSGMLCNF/xml-docbook-4.2-$VERSION-$RELEASE.cat +rm -f $PKG_INSTALL_ROOT/$CSWSGMLCNF/xml-docbook-4.2-$VERSION-$RELEASE.cat # DocBook V4.3 -$XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ +$PREFIX $XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ $CSWSGMLCNF/sgml-docbook-4.3-$VERSION-$RELEASE.cat -rm -f $CSWSGMLCNF/sgml-docbook-4.3-$VERSION-$RELEASE.cat +rm -f $PKG_INSTALL_ROOT/$CSWSGMLCNF/sgml-docbook-4.3-$VERSION-$RELEASE.cat # DocBook XML V4.3 -$XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ +$PREFIX $XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ $CSWSGMLCNF/xml-docbook-4.3-$VERSION-$RELEASE.cat -rm -f $CSWSGMLCNF/xml-docbook-4.3-$VERSION-$RELEASE.cat +rm -f $PKG_INSTALL_ROOT/$CSWSGMLCNF/xml-docbook-4.3-$VERSION-$RELEASE.cat # DocBook V4.4 -$XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ +$PREFIX $XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ $CSWSGMLCNF/sgml-docbook-4.4-$VERSION-$RELEASE.cat -rm -f $CSWSGMLCNF/sgml-docbook-4.4-$VERSION-$RELEASE.cat +rm -f $PKG_INSTALL_ROOT/$CSWSGMLCNF/sgml-docbook-4.4-$VERSION-$RELEASE.cat # DocBook XML V4.4 -$XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ +$PREFIX $XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ $CSWSGMLCNF/xml-docbook-4.4-$VERSION-$RELEASE.cat -rm -f $CSWSGMLCNF/xml-docbook-4.4-$VERSION-$RELEASE.cat +rm -f $PKG_INSTALL_ROOT/$PKG_INSTALL_ROOT/$CSWSGMLCNF/xml-docbook-4.4-$VERSION-$RELEASE.cat # Fix up SGML super catalog so that there isn't an XML DTD before an # SGML one. We need to do this (*sigh*) because xmlcatalog messes up # the order of the lines, and SGML tools don't like to see XML things # they aren't expecting. -CATALOG=$CSWSGMLCNF/catalog +CATALOG=$PKG_INSTALL_ROOT/$CSWSGMLCNF/catalog SGML=`cat -n ${CATALOG} | grep sgml-docbook | head -1 | awk '{print $1}'` XML=`cat -n ${CATALOG} | grep xml-docbook | head -1 | awk '{print $1}'` # Do they need switching around? @@ -91,8 +92,8 @@ XML=`expr $XML - 1` SGML=`expr $SGML - 1` /usr/bin/perl -e "@_=<>;@_[$XML, $SGML]=@_[$SGML, $XML];print @_" \ - ${CATALOG} > ${CATALOG}.tmp - mv -f ${CATALOG}.tmp ${CATALOG} + $CATALOG > $CATALOG.tmp + mv -f $CATALOG.tmp $CATALOG fi ## @@ -101,237 +102,237 @@ CATALOG=$CSWSGML/docbook/xmlcatalog -if [ -w $CATALOG ] +if [ -w $PKG_INSTALL_ROOT/$CATALOG ] then # DocBook XML V4.1.2 - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-pub.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-grk1.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/dbpoolx.mod" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-box.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/docbookx.dtd" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-grk3.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amsn.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-num.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/dbcentx.mod" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-grk4.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/dbnotnx.mod" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-dia.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-grk2.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/dbgenent.mod" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/dbhierx.mod" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amsa.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amso.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-cyrl.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-tech.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amsc.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/soextblx.dtd" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/calstblx.dtd" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-lat1.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amsb.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-lat2.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-amsr.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE/ent/iso-cyr2.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.1.2-$VERSION-$RELEASE" $CATALOG # DocBook XML V4.2 - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-pub.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-grk1.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/dbpoolx.mod" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-box.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/docbookx.dtd" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-grk3.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amsn.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-num.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/dbcentx.mod" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-grk4.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/dbnotnx.mod" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-dia.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-grk2.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/dbgenent.mod" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/dbhierx.mod" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amsa.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amso.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-cyrl.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-tech.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amsc.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/soextblx.dtd" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/calstblx.dtd" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-lat1.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amsb.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-lat2.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-amsr.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE/ent/iso-cyr2.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.2-$VERSION-$RELEASE" $CATALOG # DocBook XML V4.3 - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-pub.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-grk1.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/dbpoolx.mod" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-box.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/docbookx.dtd" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-grk3.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amsn.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-num.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/dbcentx.mod" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-grk4.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/dbnotnx.mod" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-dia.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-grk2.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/dbgenent.mod" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/dbhierx.mod" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amsa.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amso.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-cyrl.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-tech.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amsc.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/soextblx.dtd" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/calstblx.dtd" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-lat1.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amsb.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-lat2.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-amsr.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE/ent/iso-cyr2.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.3-$VERSION-$RELEASE" $CATALOG # DocBook XML V4.4 - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-pub.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-grk1.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/dbpoolx.mod" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-box.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/docbookx.dtd" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-grk3.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amsn.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-num.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/dbcentx.mod" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-grk4.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/dbnotnx.mod" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-dia.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-grk2.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/dbgenent.mod" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/dbhierx.mod" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amsa.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amso.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-cyrl.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-tech.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amsc.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/soextblx.dtd" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/calstblx.dtd" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-lat1.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amsb.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-lat2.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-amsr.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE/ent/iso-cyr2.ent" $CATALOG - $XMLCAT --noout --del \ + $PREFIX $XMLCAT --noout --del \ "xml-dtd-4.4-$VERSION-$RELEASE" $CATALOG 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 Dec 15 21:13:22 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 15 Dec 2008 20:13:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[2609] csw/mgar/pkg/docbook-style-xsl/trunk Message-ID: Revision: 2609 http://gar.svn.sourceforge.net/gar/?rev=2609&view=rev Author: bdwalton Date: 2008-12-15 20:13:21 +0000 (Mon, 15 Dec 2008) Log Message: ----------- - Convert our local Makefile to a patch for easier application in gar2. - Make postinstall/preremove use solaris-style chroot instead of linux-style. - Clean package build under gar2. Modified Paths: -------------- csw/mgar/pkg/docbook-style-xsl/trunk/Makefile csw/mgar/pkg/docbook-style-xsl/trunk/checksums csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.postinstall csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.preremove Added Paths: ----------- csw/mgar/pkg/docbook-style-xsl/trunk/files/add_makefile.patch Modified: csw/mgar/pkg/docbook-style-xsl/trunk/Makefile =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/Makefile 2008-12-15 20:11:36 UTC (rev 2608) +++ csw/mgar/pkg/docbook-style-xsl/trunk/Makefile 2008-12-15 20:13:21 UTC (rev 2609) @@ -22,12 +22,12 @@ DISTFILES = docbook-xsl-$(GARVERSION).tar.bz2 DISTFILES += docbook-xsl-doc-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWdocbookxsl,postinstall preremove) -DISTFILES += Makefile # These are listed in the same order they'd be applied during the rpm build... # They don't apply cleanly, otherwise. PATCHFILES = docbook-xsl-pagesetup.patch docbook-xsl-marginleft.patch PATCHFILES += docbook-xsl-lists.patch docbook-xsl-sp.patch +PATCHFILES += add_makefile.patch CONFIGURE_SCRIPTS = @@ -41,11 +41,7 @@ #to make the package extraction happy...(we don't use the - separator) WORKSRC = $(WORKDIR)/docbook-xsl-$(GARVERSION) -post-extract: - @( cd $(WORKSRC); cp ../Makefile . ) - @$(MAKECOOKIE) - -post-install: +post-install-modulated: @(cd $(DESTDIR)/opt/csw/share/sgml/docbook; \ ln -s xsl-stylesheets-$(GARVERSION)-$(PATCHLEVEL) \ xsl-stylesheets ) Modified: csw/mgar/pkg/docbook-style-xsl/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/checksums 2008-12-15 20:11:36 UTC (rev 2608) +++ csw/mgar/pkg/docbook-style-xsl/trunk/checksums 2008-12-15 20:13:21 UTC (rev 2609) @@ -1,11 +1,10 @@ 6ebd29a67f2dcc3f2220f475ee6f6552 download/docbook-xsl-1.69.1.tar.bz2 b3bf09a0b1a368a3490e68ffc695d290 download/docbook-xsl-doc-1.69.1.tar.bz2 4120f10e50070dd8fc2284d5214bf51d download/CSWdocbookxsl.gspec -6d190471746a394df111025da3060868 download/CSWdocbookxsl.depend -626425bf8e0de42afd5781c2d63397fc download/CSWdocbookxsl.postinstall -9f98469194bd4c15bf6b3fc76514b406 download/CSWdocbookxsl.preremove -ae11620673a7144c4df9a6e408a3bcb1 download/Makefile +8911f851d78a1ab1a21c49286f37f6cb download/CSWdocbookxsl.postinstall +88f331d079de730ef77a5091e69989e2 download/CSWdocbookxsl.preremove 84b37b559cc95c747e39a5a8f79558a3 download/docbook-xsl-pagesetup.patch 1d1ff63f5ebd3527c925f68e55138b6f download/docbook-xsl-marginleft.patch cec8c281ed1c9be99ad47a74362248d5 download/docbook-xsl-lists.patch e7bbf777eadbb70aaed073006de0347e download/docbook-xsl-sp.patch +6e7ff9307e810ea822c94818cfbc86e0 download/add_makefile.patch Modified: csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.postinstall =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.postinstall 2008-12-15 20:11:36 UTC (rev 2608) +++ csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.postinstall 2008-12-15 20:13:21 UTC (rev 2609) @@ -1,8 +1,9 @@ #!/bin/sh -if [ -n "$PKG_INSTALL_ROOT" -a "$PKG_INSTALL_ROOT" != "/" ]; then - chroot $PKG_INSTALL_ROOT -fi +case "$PKG_INSTALL_ROOT" in + ""|"/") PREFIX= ;; + *) PREFIX="chroot $PKG_INSTALL_ROOT ";; +esac PATH=/opt/csw/bin:$PATH @@ -13,15 +14,16 @@ DBHOME=/opt/csw/share/sgml/docbook CATALOG=/opt/csw/etc/xml/catalog -$CATCMD --noout --add "rewriteSystem" \ + +$PREFIX $CATCMD --noout --add "rewriteSystem" \ "http://docbook.sourceforge.net/release/xsl/$VERSION" \ "file://$DBHOME/xsl-stylesheets-$VERSION-$RELEASE" $CATALOG -$CATCMD --noout --add "rewriteURI" \ +$PREFIX $CATCMD --noout --add "rewriteURI" \ "http://docbook.sourceforge.net/release/xsl/$VERSION" \ "file://$DBHOME/xsl-stylesheets-$VERSION-$RELEASE" $CATALOG -$CATCMD --noout --add "rewriteSystem" \ +$PREFIX $CATCMD --noout --add "rewriteSystem" \ "http://docbook.sourceforge.net/release/xsl/current" \ "file://$DBHOME/xsl-stylesheets-$VERSION-$RELEASE" $CATALOG -$CATCMD --noout --add "rewriteURI" \ +$PREFIX $CATCMD --noout --add "rewriteURI" \ "http://docbook.sourceforge.net/release/xsl/current" \ "file://$DBHOME/xsl-stylesheets-$VERSION-$RELEASE" $CATALOG Modified: csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.preremove =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.preremove 2008-12-15 20:11:36 UTC (rev 2608) +++ csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsl.preremove 2008-12-15 20:13:21 UTC (rev 2609) @@ -1,8 +1,9 @@ #!/bin/sh -if [ -n "$PKG_INSTALL_ROOT" -a "$PKG_INSTALL_ROOT" != "/" ]; then - chroot $PKG_INSTALL_ROOT -fi +case "$PKG_INSTALL_ROOT" in + ""|"/") PREFIX= ;; + *) PREFIX="chroot $PKG_INSTALL_ROOT ";; +esac PATH=/opt/csw/bin:$PATH @@ -12,5 +13,5 @@ VERSION=1.69.1 RELEASE=5.1 -$XMLCAT --noout --del \ - "file://$DBHOME/xsl-stylesheets-$VERSION-$RELEASE" $CATALOG \ No newline at end of file +$PREFIX $XMLCAT --noout --del \ + "file://$DBHOME/xsl-stylesheets-$VERSION-$RELEASE" $CATALOG Added: csw/mgar/pkg/docbook-style-xsl/trunk/files/add_makefile.patch =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/files/add_makefile.patch (rev 0) +++ csw/mgar/pkg/docbook-style-xsl/trunk/files/add_makefile.patch 2008-12-15 20:13:21 UTC (rev 2609) @@ -0,0 +1,55 @@ +--- /dev/null 2008-12-14 03:06:26.000000000 +0100 ++++ docbook-xsl-1.69.1/Makefile 2008-12-14 04:12:33.444192066 +0100 +@@ -0,0 +1,51 @@ ++ ++DESTDIR ?= ... should be overridden by GAR ... ++GARVERSION ?= ... should be overridden by GAR ... ++PATCHLEVEL ?= ... should be overridden by GAR ... ++ ++SHELL = /opt/csw/bin/bash ++ ++prefix = $(DESTDIR)/opt/csw ++bindir = $(prefix)/bin ++datadir = $(prefix)/share ++ ++instdir = $(datadir)/sgml/docbook/xsl-stylesheets-$(GARVERSION)-$(PATCHLEVEL) ++docdir = $(datadir)/doc/docbookxsl-$(GARVERSION)-$(PATCHLEVEL) ++ ++all: install ++ ++install: install-xsl install-img install-misc install-docs ++ ++install-xsl: ++ gmkdir -p $(instdir)/{common,fo,html,htmlhelp/doc,javahelp,lib,template,xhtml,manpages,profiling} ++ cp common/*.dtd $(instdir)/common ++ cp common/*.xml $(instdir)/common ++ cp common/*.xsl $(instdir)/common ++ cp fo/*.xml $(instdir)/fo ++ cp fo/*.xsl $(instdir)/fo ++ cp html/*.xml $(instdir)/html ++ cp html/*.xsl $(instdir)/html ++ cp htmlhelp/*.xsl $(instdir)/htmlhelp ++ cp javahelp/*.xsl $(instdir)/javahelp ++ cp lib/lib.xsl $(instdir)/lib ++ cp template/README $(instdir)/template ++ cp template/*.xml $(instdir)/template ++ cp template/*.xsl $(instdir)/template ++ cp xhtml/*.xsl $(instdir)/xhtml ++ cp manpages/README $(instdir)/manpages ++ cp manpages/*.xsl $(instdir)/manpages ++ cp profiling/*.xsl $(instdir)/profiling ++ ++install-img: ++ gmkdir -p $(instdir)/images/callouts ++ cp images/*.gif $(instdir)/images ++ cp images/*.png $(instdir)/images ++ cp images/callouts/*.png $(instdir)/images/callouts ++ ++install-misc: ++ cp VERSION $(instdir) ++ ++install-docs: ++ gmkdir -p $(docdir) ++ cp BUGS ChangeLog README TODO $(docdir)/ ++ cp -R doc $(docdir)/ +\ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Dec 15 21:34:14 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 15 Dec 2008 20:34:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[2610] csw/mgar/pkg/xrender/trunk/Makefile Message-ID: Revision: 2610 http://gar.svn.sourceforge.net/gar/?rev=2610&view=rev Author: wbonnet Date: 2008-12-15 20:34:13 +0000 (Mon, 15 Dec 2008) Log Message: ----------- Fix UFILES_REGEX Modified Paths: -------------- csw/mgar/pkg/xrender/trunk/Makefile Modified: csw/mgar/pkg/xrender/trunk/Makefile =================================================================== --- csw/mgar/pkg/xrender/trunk/Makefile 2008-12-15 20:13:21 UTC (rev 2609) +++ csw/mgar/pkg/xrender/trunk/Makefile 2008-12-15 20:34:13 UTC (rev 2610) @@ -12,7 +12,7 @@ PKGDIST = libXrender-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = libXrender-(\d+(?:\.\d+)*).tar.gz DISTFILES += CSWlibxrender.gspec CSWlibxrender.prototype CSWlibxrender.depend DISTFILES += CSWrenderdev.gspec CSWrenderdev.prototype CSWrenderdev.depend This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Dec 15 21:52:57 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 15 Dec 2008 20:52:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[2611] csw/mgar/pkg/xft/trunk/Makefile Message-ID: Revision: 2611 http://gar.svn.sourceforge.net/gar/?rev=2611&view=rev Author: wbonnet Date: 2008-12-15 20:52:57 +0000 (Mon, 15 Dec 2008) Log Message: ----------- Fix UFILE_REGEX Modified Paths: -------------- csw/mgar/pkg/xft/trunk/Makefile Modified: csw/mgar/pkg/xft/trunk/Makefile =================================================================== --- csw/mgar/pkg/xft/trunk/Makefile 2008-12-15 20:34:13 UTC (rev 2610) +++ csw/mgar/pkg/xft/trunk/Makefile 2008-12-15 20:52:57 UTC (rev 2611) @@ -12,7 +12,7 @@ PKGDIST = libXft-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = libXft-(\d+(?:\.\d+)*).tar.gz DISTFILES += CSWlibxft2.gspec CSWlibxft2.prototype CSWlibxft2.depend DISTFILES += CSWlibxft2dev.gspec CSWlibxft2dev.prototype CSWlibxft2dev.depend This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Dec 15 23:05:34 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 15 Dec 2008 22:05:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[2612] csw/mgar/gar Message-ID: Revision: 2612 http://gar.svn.sourceforge.net/gar/?rev=2612&view=rev Author: wbonnet Date: 2008-12-15 22:05:34 +0000 (Mon, 15 Dec 2008) Log Message: ----------- Fix some directories parsing Modified Paths: -------------- csw/mgar/gar/v1/bin/upstream_watch csw/mgar/gar/v2/bin/upstream_watch Modified: csw/mgar/gar/v1/bin/upstream_watch =================================================================== --- csw/mgar/gar/v1/bin/upstream_watch 2008-12-15 20:52:57 UTC (rev 2611) +++ csw/mgar/gar/v1/bin/upstream_watch 2008-12-15 22:05:34 UTC (rev 2612) @@ -75,7 +75,7 @@ # # TODO: find a better way than lftp to do this # -sub get_file_list +sub get_file_list_lftp { my $url = shift; my @file_list; @@ -90,16 +90,20 @@ $http_proxy_cmd = "set http:proxy $ENV{HTTP_PROXY};" if exists $ENV{HTTP_PROXY}; $http_proxy_cmd = "set http:proxy $ENV{http_proxy};" if exists $ENV{http_proxy}; - open (FH, "lftp -q -c \"set net:timeout 30; set net:max-retries 16; $ftp_proxy_cmd $http_proxy_cmd open $url/ && ls\" 2>/dev/null |"); + open (my $FH, "lftp -q -c \"set net:timeout 30; set net:max-retries 16; $ftp_proxy_cmd $http_proxy_cmd open $url/ && ls\" 2>/dev/null |"); - while (my $line = ) { + while (my $line = <$FH>) { my @cols = split (/\s+/, $line); my $filename = $cols[$#cols]; chomp ($filename); + my $result = rindex($filename, '/'); + if ($result != -1) { + $filename = substr $filename , $result +1 ; + } push (@file_list, $filename); } - close (FH); + close ($FH); return \@file_list; } @@ -116,9 +120,6 @@ Usage: upstream_watch -u URL file_regex... Display the latest upstream files. EOF - - - } foreach my $file_pattern (@ARGV) { @@ -127,8 +128,8 @@ my $newest_file = ""; foreach my $url (@urls) { - my $file_list = get_file_list ($url); - + my $file_list = get_file_list_lftp ($url); + foreach my $file (@{$file_list}) { if ($file =~ /^$file_pattern$/) { my $char = '/'; Modified: csw/mgar/gar/v2/bin/upstream_watch =================================================================== --- csw/mgar/gar/v2/bin/upstream_watch 2008-12-15 20:52:57 UTC (rev 2611) +++ csw/mgar/gar/v2/bin/upstream_watch 2008-12-15 22:05:34 UTC (rev 2612) @@ -75,7 +75,7 @@ # # TODO: find a better way than lftp to do this # -sub get_file_list +sub get_file_list_lftp { my $url = shift; my @file_list; @@ -90,16 +90,20 @@ $http_proxy_cmd = "set http:proxy $ENV{HTTP_PROXY};" if exists $ENV{HTTP_PROXY}; $http_proxy_cmd = "set http:proxy $ENV{http_proxy};" if exists $ENV{http_proxy}; - open (FH, "lftp -q -c \"set net:timeout 30; set net:max-retries 16; $ftp_proxy_cmd $http_proxy_cmd open $url/ && ls\" 2>/dev/null |"); + open (my $FH, "lftp -q -c \"set net:timeout 30; set net:max-retries 16; $ftp_proxy_cmd $http_proxy_cmd open $url/ && ls\" 2>/dev/null |"); - while (my $line = ) { + while (my $line = <$FH>) { my @cols = split (/\s+/, $line); my $filename = $cols[$#cols]; chomp ($filename); + my $result = rindex($filename, '/'); + if ($result != -1) { + $filename = substr $filename , $result +1 ; + } push (@file_list, $filename); } - close (FH); + close ($FH); return \@file_list; } @@ -116,9 +120,6 @@ Usage: upstream_watch -u URL file_regex... Display the latest upstream files. EOF - - - } foreach my $file_pattern (@ARGV) { @@ -127,8 +128,8 @@ my $newest_file = ""; foreach my $url (@urls) { - my $file_list = get_file_list ($url); - + my $file_list = get_file_list_lftp ($url); + foreach my $file (@{$file_list}) { if ($file =~ /^$file_pattern$/) { my $char = '/'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Dec 15 23:17:38 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 15 Dec 2008 22:17:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[2613] csw/mgar/pkg/sudo/trunk/Makefile Message-ID: Revision: 2613 http://gar.svn.sourceforge.net/gar/?rev=2613&view=rev Author: wbonnet Date: 2008-12-15 22:17:38 +0000 (Mon, 15 Dec 2008) Log Message: ----------- Fix UFILE REGEXP Modified Paths: -------------- csw/mgar/pkg/sudo/trunk/Makefile Modified: csw/mgar/pkg/sudo/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo/trunk/Makefile 2008-12-15 22:05:34 UTC (rev 2612) +++ csw/mgar/pkg/sudo/trunk/Makefile 2008-12-15 22:17:38 UTC (rev 2613) @@ -14,7 +14,7 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)(p\d+)?.tar.gz DISTFILES += CSWsudo.gspec CSWsudo.postinstall DISTFILES += CSWsudo.prototype CSWsudo.depend This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Dec 15 23:43:57 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 15 Dec 2008 22:43:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[2614] csw/mgar/pkg/sudo/trunk/Makefile Message-ID: Revision: 2614 http://gar.svn.sourceforge.net/gar/?rev=2614&view=rev Author: wbonnet Date: 2008-12-15 22:43:57 +0000 (Mon, 15 Dec 2008) Log Message: ----------- Fix UFILE_REGEX Modified Paths: -------------- csw/mgar/pkg/sudo/trunk/Makefile Modified: csw/mgar/pkg/sudo/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo/trunk/Makefile 2008-12-15 22:17:38 UTC (rev 2613) +++ csw/mgar/pkg/sudo/trunk/Makefile 2008-12-15 22:43:57 UTC (rev 2614) @@ -14,7 +14,7 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)(p\d+)?.tar.gz +UFILES_REGEX = $(GARNAME)-((\d+(?:\.\d+)*)(p\d+)?).tar.gz DISTFILES += CSWsudo.gspec CSWsudo.postinstall DISTFILES += CSWsudo.prototype CSWsudo.depend This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Mon Dec 15 23:48:38 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Mon, 15 Dec 2008 22:48:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[2615] csw/mgar/gar/v1/gar.lib.mk Message-ID: Revision: 2615 http://gar.svn.sourceforge.net/gar/?rev=2615&view=rev Author: wbonnet Date: 2008-12-15 22:48:37 +0000 (Mon, 15 Dec 2008) Log Message: ----------- Suppress extra comment Modified Paths: -------------- csw/mgar/gar/v1/gar.lib.mk Modified: csw/mgar/gar/v1/gar.lib.mk =================================================================== --- csw/mgar/gar/v1/gar.lib.mk 2008-12-15 22:43:57 UTC (rev 2614) +++ csw/mgar/gar/v1/gar.lib.mk 2008-12-15 22:48:37 UTC (rev 2615) @@ -191,7 +191,6 @@ else \ if echo $(DISTFILES) | grep -w $$FILE >/dev/null; then \ PACKAGE_UP_TO_DATE=1; \ -echo DISTFILES : $(DISTFILES); \ echo "$(GARNAME) : Package is up-to-date. Current version is $$FILE" ; \ else \ NEW_FILES="$$FILE $$NEW_FILES"; \ @@ -215,7 +214,7 @@ echo "$(GARNAME) : new upstream files available: $$NEW_FILES"; \ fi; \ fi - + checknew-%: @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvel at opencsw.org Tue Dec 16 00:27:16 2008 From: trygvel at opencsw.org (=?ISO-8859-1?Q?Trygve_Laugst=F8l?=) Date: Tue, 16 Dec 2008 00:27:16 +0100 Subject: [csw-devel] Building GIT Message-ID: <4946E7D4.4000805@opencsw.org> Hi Ben! I just had a need for Git locally so I though I should build the git package from source. As I'm currently on a crappy line the xsltproc steps took very long time to complete and I notices with some trussing that it was connecting to the internet trying to fetch the XSLTs: stat64("http://docbook.sourceforge.net/release/xsl/current/html/lists.xsl", 0x08046370) Err#2 ENOENT Shouldn't this be using a catalog and reference a local copy of the XMLTs? -- Trygve From trygvel at opencsw.org Tue Dec 16 01:05:40 2008 From: trygvel at opencsw.org (=?ISO-8859-1?Q?Trygve_Laugst=F8l?=) Date: Tue, 16 Dec 2008 01:05:40 +0100 Subject: [csw-devel] gmake garlinks Message-ID: <4946F0D4.8090103@opencsw.org> Hello (Dago) Could you make the garlinks goal not write out "...failed" if the link already was correct? I just goofed around because I couldn't understand why it would fail. -- Trygve From bwalton at opencsw.org Tue Dec 16 01:36:12 2008 From: bwalton at opencsw.org (Ben Walton) Date: Mon, 15 Dec 2008 19:36:12 -0500 Subject: [csw-devel] Building GIT In-Reply-To: <4946E7D4.4000805@opencsw.org> References: <4946E7D4.4000805@opencsw.org> Message-ID: <1229387608-sup-6685@ntdws12.chass.utoronto.ca> Excerpts from Trygve Laugst?l's message of Mon Dec 15 18:27:16 -0500 2008: Hi Trygve, > stat64("http://docbook.sourceforge.net/release/xsl/current/html/lists.xsl", > 0x08046370) Err#2 ENOENT > > Shouldn't this be using a catalog and reference a local copy of the > XMLTs? Yes, it should. I'm currently struggling through the dependency gauntlet to get the proper docbook dtds and xsl stylesheets in place. When they're released, xmlto (used to create docs for git in combination with asciidoc) will follow, at which point git should build fully. It's just taken far longer than I anticipated... Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 GPG Key Id: 8E89F6D2; Key Server: pgp.mit.edu Contact me to arrange for a CAcert assurance meeting. -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 189 bytes Desc: not available URL: From bonivart at users.sourceforge.net Tue Dec 16 11:19:56 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 16 Dec 2008 10:19:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[2616] csw/mgar/pkg/bind/trunk Message-ID: Revision: 2616 http://gar.svn.sourceforge.net/gar/?rev=2616&view=rev Author: bonivart Date: 2008-12-16 10:19:55 +0000 (Tue, 16 Dec 2008) Log Message: ----------- bind: update to 9.5.0-P2 and switch to gar v2 Modified Paths: -------------- csw/mgar/pkg/bind/trunk/Makefile csw/mgar/pkg/bind/trunk/checksums Added Paths: ----------- csw/mgar/pkg/bind/trunk/files/CSWbinddevel.gspec csw/mgar/pkg/bind/trunk/files/CSWbindutils.gspec csw/mgar/pkg/bind/trunk/files/CSWlibbind.gspec Property Changed: ---------------- csw/mgar/pkg/bind/trunk/ Property changes on: csw/mgar/pkg/bind/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/bind/trunk/Makefile =================================================================== --- csw/mgar/pkg/bind/trunk/Makefile 2008-12-15 22:48:37 UTC (rev 2615) +++ csw/mgar/pkg/bind/trunk/Makefile 2008-12-16 10:19:55 UTC (rev 2616) @@ -1,5 +1,5 @@ GARNAME = bind -GARVERSION = 9.4.2 +GARVERSION = 9.5.0 RELEASE = P2 DISTVERSION = $(GARVERSION)-$(RELEASE) DISTNAME = $(GARNAME)-$(DISTVERSION) @@ -18,7 +18,15 @@ MASTER_SITES = http://ftp.isc.org/isc/bind9/$(GARVERSION)-$(RELEASE)/ DISTFILES = $(GARNAME)-$(GARVERSION)-$(RELEASE).tar.gz DISTFILES += $(call admfiles,CSWbind,preinstall postinstall preremove) +DISTFILES += $(call admfiles,CSWbinddevel,) +DISTFILES += $(call admfiles,CSWlibbind,) +DISTFILES += $(call admfiles,CSWbindutils,) +REQUIRED_PKGS_CSWbind = CSWlibbind CSWbindutils CSWcswclassutils +REQUIRED_PKGS_CSWbinddevel = CSWbind +REQUIRED_PKGS_CSWlibbind = CSWiconv CSWlibxml2 CSWosslrt CSWzlib +REQUIRED_PKGS_CSWbindutils = CSWlibbind + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = (\d+(?:\.\d+)*)-([A-Z][0-9]) @@ -30,21 +38,29 @@ CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw CONFIGURE_ARGS += --localstatedir=/var/opt/csw/named +EXTRA_MERGE_EXCLUDE_FILES = .*~ $(libdir)/.*\.a $(libdir)/.*\.la + +PKGFILES_CSWbinddevel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibbind = $(libdir)/.* +PKGFILES_CSWbindutils = $(bindir)/.* + INSTALL_SCRIPTS = custom -include gar/category.mk +PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswnamed$$$$/ { $$$$2 = "cswinitsmf" } { print }' SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) SPKG_SOURCEURL = http://www.isc.org/software/bind -#SPKG_CLASSES = none cswinitsmf +SPKG_CLASSES = none cswinitsmf +include gar/category.mk + install-custom: @echo " ==> Installing $(GARNAME) (custom)" @rm -rf $(DESTDIR) -# @ginstall -d $(DESTDIR)/etc/opt/csw/init.d -# @cp $(FILEDIR)/CSWbind.cswnamed $(DESTDIR)/etc/opt/csw/init.d/cswnamed - @ginstall -d $(DESTDIR)/etc/init.d - @cp $(FILEDIR)/CSWbind.cswnamed $(DESTDIR)/etc/init.d/cswnamed + @ginstall -d $(DESTDIR)/etc/opt/csw/init.d + @cp $(FILEDIR)/CSWbind.cswnamed $(DESTDIR)/etc/opt/csw/init.d/cswnamed +# @ginstall -d $(DESTDIR)/etc/init.d +# @cp $(FILEDIR)/CSWbind.cswnamed $(DESTDIR)/etc/init.d/cswnamed @ginstall -d $(DESTDIR)/etc/opt/csw @cp $(FILEDIR)/CSWbind.named.conf.CSW $(DESTDIR)/etc/opt/csw/named.conf.CSW @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) Modified: csw/mgar/pkg/bind/trunk/checksums =================================================================== --- csw/mgar/pkg/bind/trunk/checksums 2008-12-15 22:48:37 UTC (rev 2615) +++ csw/mgar/pkg/bind/trunk/checksums 2008-12-16 10:19:55 UTC (rev 2616) @@ -1,5 +1,8 @@ -74464f8af260ad71a19a3400a1ae00bb download/bind-9.4.2-P2.tar.gz +16c893f73a394c8cc36d7900cb9bb801 download/bind-9.5.0-P2.tar.gz 9d20fd7cceac478243ac485868b9ef35 download/CSWbind.gspec 9338f20547092ec54136ebebd5f663d3 download/CSWbind.preinstall 78702926bd064e3a1f4ac56ae85866a9 download/CSWbind.postinstall 104f5539928c029738b0a1808f8af262 download/CSWbind.preremove +af16ec4f9c20614932f67acd116e52ad download/CSWbinddevel.gspec +40e00ac3e92ec835dbf567581930d34e download/CSWlibbind.gspec +7f81505db2da9fbc899b9abeac434c58 download/CSWbindutils.gspec Added: csw/mgar/pkg/bind/trunk/files/CSWbinddevel.gspec =================================================================== --- csw/mgar/pkg/bind/trunk/files/CSWbinddevel.gspec (rev 0) +++ csw/mgar/pkg/bind/trunk/files/CSWbinddevel.gspec 2008-12-16 10:19:55 UTC (rev 2616) @@ -0,0 +1,8 @@ +%var bitname bind_devel +%var pkgname CSWbinddevel +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%prototype exec cswproto -s %{TIMESTAMP} -r %{DESTDIR} %{DESTDIR} +%copyright + +Please see /opt/csw/share/doc/bind/LICENSE for license information + Added: csw/mgar/pkg/bind/trunk/files/CSWbindutils.gspec =================================================================== --- csw/mgar/pkg/bind/trunk/files/CSWbindutils.gspec (rev 0) +++ csw/mgar/pkg/bind/trunk/files/CSWbindutils.gspec 2008-12-16 10:19:55 UTC (rev 2616) @@ -0,0 +1,8 @@ +%var bitname bind_utils +%var pkgname CSWbindutils +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%prototype exec cswproto -s %{TIMESTAMP} -r %{DESTDIR} %{DESTDIR} +%copyright + +Please see /opt/csw/share/doc/bind/LICENSE for license information + Added: csw/mgar/pkg/bind/trunk/files/CSWlibbind.gspec =================================================================== --- csw/mgar/pkg/bind/trunk/files/CSWlibbind.gspec (rev 0) +++ csw/mgar/pkg/bind/trunk/files/CSWlibbind.gspec 2008-12-16 10:19:55 UTC (rev 2616) @@ -0,0 +1,8 @@ +%var bitname libbind +%var pkgname CSWlibbind +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%prototype exec cswproto -s %{TIMESTAMP} -r %{DESTDIR} %{DESTDIR} +%copyright + +Please see /opt/csw/share/doc/bind/LICENSE for license information + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvel at opencsw.org Tue Dec 16 11:51:53 2008 From: trygvel at opencsw.org (=?UTF-8?B?VHJ5Z3ZlIExhdWdzdMO4bA==?=) Date: Tue, 16 Dec 2008 11:51:53 +0100 Subject: [csw-devel] Building GIT In-Reply-To: <1229387608-sup-6685@ntdws12.chass.utoronto.ca> References: <4946E7D4.4000805@opencsw.org> <1229387608-sup-6685@ntdws12.chass.utoronto.ca> Message-ID: <49478849.90702@opencsw.org> Ben Walton wrote: > Excerpts from Trygve Laugst?l's message of Mon Dec 15 18:27:16 -0500 2008: > > Hi Trygve, > >> stat64("http://docbook.sourceforge.net/release/xsl/current/html/lists.xsl", >> 0x08046370) Err#2 ENOENT >> >> Shouldn't this be using a catalog and reference a local copy of the >> XMLTs? > > Yes, it should. I'm currently struggling through the dependency > gauntlet to get the proper docbook dtds and xsl stylesheets in place. > When they're released, xmlto (used to create docs for git in > combination with asciidoc) will follow, at which point git should > build fully. > > It's just taken far longer than I anticipated... Oki. Go get it working I also had to skip the tests as there was a couple of them that suddenly asked me for input. Is that expected? Btw, I was building this on snv b101. -- Trygve From bwalton at opencsw.org Tue Dec 16 14:55:16 2008 From: bwalton at opencsw.org (Ben Walton) Date: Tue, 16 Dec 2008 08:55:16 -0500 Subject: [csw-devel] Building GIT In-Reply-To: <49478849.90702@opencsw.org> References: <4946E7D4.4000805@opencsw.org> <1229387608-sup-6685@ntdws12.chass.utoronto.ca> <49478849.90702@opencsw.org> Message-ID: <1229435468-sup-8102@ntdws12.chass.utoronto.ca> Excerpts from Trygve Laugst?l's message of Tue Dec 16 05:51:53 -0500 2008: > Oki. Go get it working I also had to skip the tests as there was a > couple of them that suddenly asked me for input. Is that expected? Well, I hadn't seen that behaviour, but I do know there are some bash-isms lurking in some of the install script stuff. I haven't spent time on that yet, as I felt that getting the foundation for xmlto and asciidoc in place was the first priority. I really only got the GAR description to the point where I knew that there was no point going forward until foundation was laid, so don't expect anything useful from it and you won't be disappointed! On the plus side, I think I may finally be becoming someone that curses when they see bash-isms in /bin/sh scripts! :) I'm _hoping_ I can get this all put together by Friday, as I'd rather not futz with it over the holidays (but I will if I need to)... Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 GPG Key Id: 8E89F6D2; Key Server: pgp.mit.edu Contact me to arrange for a CAcert assurance meeting. -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 189 bytes Desc: not available URL: From trygvel at opencsw.org Tue Dec 16 16:02:26 2008 From: trygvel at opencsw.org (=?UTF-8?B?VHJ5Z3ZlIExhdWdzdMO4bA==?=) Date: Tue, 16 Dec 2008 16:02:26 +0100 Subject: [csw-devel] Building GIT In-Reply-To: <1229435468-sup-8102@ntdws12.chass.utoronto.ca> References: <4946E7D4.4000805@opencsw.org> <1229387608-sup-6685@ntdws12.chass.utoronto.ca> <49478849.90702@opencsw.org> <1229435468-sup-8102@ntdws12.chass.utoronto.ca> Message-ID: <4947C302.6090700@opencsw.org> Ben Walton wrote: > Excerpts from Trygve Laugst?l's message of Tue Dec 16 05:51:53 -0500 2008: >> Oki. Go get it working I also had to skip the tests as there was a >> couple of them that suddenly asked me for input. Is that expected? > > Well, I hadn't seen that behaviour, but I do know there are some > bash-isms lurking in some of the install script stuff. I haven't > spent time on that yet, as I felt that getting the foundation for > xmlto and asciidoc in place was the first priority. > > I really only got the GAR description to the point where I knew that > there was no point going forward until foundation was laid, so don't > expect anything useful from it and you won't be disappointed! > > On the plus side, I think I may finally be becoming someone that > curses when they see bash-isms in /bin/sh scripts! :) > > I'm _hoping_ I can get this all put together by Friday, as I'd rather > not futz with it over the holidays (but I will if I need to)... Let me know if there is anything I can do, this package is getting important for me. I'm on IRC most of the day European time. -- Trygve From trygvel at opencsw.org Tue Dec 16 16:05:06 2008 From: trygvel at opencsw.org (=?ISO-8859-1?Q?Trygve_Laugst=F8l?=) Date: Tue, 16 Dec 2008 16:05:06 +0100 Subject: [csw-devel] IRC Message-ID: <4947C3A2.1030707@opencsw.org> Hello A few of us maintainers are regularly hanging out on IRC chatting on CSW, Solaris, life and everything else. Feel free to join us on freenode[1], the channel name is (drumroll...) #opencsw. OpenCSW has more than one useful IRC client: xchat [2] and irssi [3]. [1]: http://freenode.net/ [2]: http://opencsw.org/packages/xchat [3]: http://opencsw.org/packages/irssi -- Trygve From dmichelsen at users.sourceforge.net Tue Dec 16 16:07:36 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 16 Dec 2008 15:07:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[2617] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 2617 http://gar.svn.sourceforge.net/gar/?rev=2617&view=rev Author: dmichelsen Date: 2008-12-16 15:07:35 +0000 (Tue, 16 Dec 2008) Log Message: ----------- mGAR v2: Allow setting of LD_OPTIONS if explicitly set Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2008-12-16 10:19:55 UTC (rev 2616) +++ csw/mgar/gar/v2/gar.conf.mk 2008-12-16 15:07:35 UTC (rev 2617) @@ -533,7 +533,9 @@ COMMON_EXPORTS ?= $(DIRECTORY_EXPORTS) $(COMPILER_EXPORTS) $(GARPKG_EXPORTS) $(EXTRA_COMMON_EXPORTS) # LD_OPTIONS = $(LINKER_FLAGS) -# COMMON_EXPORTS += LD_OPTIONS +ifneq ($(LD_OPTIONS),) +COMMON_EXPORTS += LD_OPTIONS +endif CONFIGURE_EXPORTS ?= $(COMMON_EXPORTS) $(EXTRA_CONFIGURE_EXPORTS) PKG_CONFIG_PATH DESTDIR BUILD_EXPORTS ?= $(COMMON_EXPORTS) $(EXTRA_BUILD_EXPORTS) 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 Dec 16 16:27:14 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 16 Dec 2008 15:27:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[2618] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 2618 http://gar.svn.sourceforge.net/gar/?rev=2618&view=rev Author: dmichelsen Date: 2008-12-16 15:27:14 +0000 (Tue, 16 Dec 2008) Log Message: ----------- mGAR v2: Small fix for reset-configure-* and minor cleanups of testcode Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2008-12-16 15:07:35 UTC (rev 2617) +++ csw/mgar/gar/v2/gar.mk 2008-12-16 15:27:14 UTC (rev 2618) @@ -46,8 +46,10 @@ # successfully completed #DONADA = @echo " [$@] complete. Finished rules: $+" #DONADA = @touch $(COOKIEDIR)/$@; echo " [$@] complete for $(GARNAME)." -DONADA = @touch $(COOKIEDIR)/$(patsubst $(COOKIEDIR)/%,%,$@); echo " [$@] complete for $(GARNAME)." +COOKIEFILE = $(COOKIEDIR)/$(patsubst $(COOKIEDIR)/%,%,$1) +DONADA = @touch $(call COOKIEFILE,$@); echo " [$@] complete for $(GARNAME)." + # TODO: write a stub rule to print out the name of a rule when it # *does* do something, and handle indentation intelligently. @@ -136,10 +138,6 @@ endef define _modulate_do -xtest-$(2): - @gmake -s MODULATION=$(2) $(4) _pmod - @# The next line has intentionally been left blank - $(call _modulate_target,extract,$(2),$(4)) $(call _modulate_target,patch,$(2),$(4)) $(call _modulate_target,configure,$(2),$(4)) @@ -188,12 +186,6 @@ $(eval $(call _modulate,$(MODULATORS))) -moddebug: - @echo $(strip $(strip $(call _modulate,$(MODULATORS)))) - -allmod: $(foreach M,$(MODULATIONS),xtest-$(M)) - - modenv: @echo " Modulators: $(MODULATORS)" @echo "Modulations: $(MODULATIONS)" @@ -381,14 +373,12 @@ .PHONY: reset-configure reset-configure-modulated reconfigure: reset-configure configure -reset-configure-isa: +reset-configure: $(addprefix reset-configure-,$(MODULATIONS)) + rm -f $(COOKIEDIR)/configure -reset-configure: - @$(foreach ISA,$(NEEDED_ISAS),$(MAKE) -s ISA=$(ISA) reset-configure-isa;) +reset-configure-modulated: + rm -f $(addprefix $(COOKIEDIR)/,$(CONFIGURE_TARGETS)) -reconfigure-isa-%: - @$(MAKE) -s ISA=$* reset-configure-isa configure-isa - # returns true if configure has completed successfully, false # otherwise configure-p: 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 Dec 16 16:28:19 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 16 Dec 2008 15:28:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[2619] csw/mgar/pkg/ncurses/trunk/Makefile Message-ID: Revision: 2619 http://gar.svn.sourceforge.net/gar/?rev=2619&view=rev Author: dmichelsen Date: 2008-12-16 15:28:19 +0000 (Tue, 16 Dec 2008) Log Message: ----------- ncurses: Fix flags for some builds, 5.7 sparcv9 still to go Modified Paths: -------------- csw/mgar/pkg/ncurses/trunk/Makefile Modified: csw/mgar/pkg/ncurses/trunk/Makefile =================================================================== --- csw/mgar/pkg/ncurses/trunk/Makefile 2008-12-16 15:27:14 UTC (rev 2618) +++ csw/mgar/pkg/ncurses/trunk/Makefile 2008-12-16 15:28:19 UTC (rev 2619) @@ -28,16 +28,18 @@ CONFIGURE_ARGS += --with-build-ldflags="-64" endif +ifeq ($(GARVERSION),5.7) +LD_OPTIONS = $(LD_FLAGS) +endif + TEST_SCRIPTS = include gar/category.mk -# 32 Bit -#LDFLAGS := $(filter-out -xarch=386,$(filter-out -m32,$(LDFLAGS))) +#LDFLAGS := $(filter-out -xarch=%,$(filter-out -m%,$(LDFLAGS))) +LDFLAGS := -# 64 Bit -#LDFLAGS := $(filter-out -xarch=sse2,$(filter-out -m64,$(LDFLAGS))) -#ifeq ($(MEMORYMODEL),64) -#LDFLAGS := $(LDFLAGS) -64 -#endif +ifeq ($(MEMORYMODEL),64) +LDFLAGS := $(LDFLAGS) $(if $(findstring $(GARVERSION),5.6),-xarch=v9) +endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Dec 16 17:14:01 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 16 Dec 2008 16:14:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[2620] csw/mgar/pkg/bind/trunk Message-ID: Revision: 2620 http://gar.svn.sourceforge.net/gar/?rev=2620&view=rev Author: bonivart Date: 2008-12-16 16:14:01 +0000 (Tue, 16 Dec 2008) Log Message: ----------- bind: using cswclassutils made it possible to remove postinstall Modified Paths: -------------- csw/mgar/pkg/bind/trunk/Makefile csw/mgar/pkg/bind/trunk/checksums csw/mgar/pkg/bind/trunk/files/CSWbind.cswnamed csw/mgar/pkg/bind/trunk/files/CSWbind.gspec csw/mgar/pkg/bind/trunk/files/CSWbind.preremove csw/mgar/pkg/bind/trunk/files/CSWbinddevel.gspec csw/mgar/pkg/bind/trunk/files/CSWbindutils.gspec csw/mgar/pkg/bind/trunk/files/CSWlibbind.gspec Removed Paths: ------------- csw/mgar/pkg/bind/trunk/files/CSWbind.postinstall Modified: csw/mgar/pkg/bind/trunk/Makefile =================================================================== --- csw/mgar/pkg/bind/trunk/Makefile 2008-12-16 15:28:19 UTC (rev 2619) +++ csw/mgar/pkg/bind/trunk/Makefile 2008-12-16 16:14:01 UTC (rev 2620) @@ -17,11 +17,16 @@ UPSTREAM_MASTER_SITES = http://ftp.isc.org/isc/bind9/ MASTER_SITES = http://ftp.isc.org/isc/bind9/$(GARVERSION)-$(RELEASE)/ DISTFILES = $(GARNAME)-$(GARVERSION)-$(RELEASE).tar.gz -DISTFILES += $(call admfiles,CSWbind,preinstall postinstall preremove) +DISTFILES += $(call admfiles,CSWbind,preinstall preremove) DISTFILES += $(call admfiles,CSWbinddevel,) DISTFILES += $(call admfiles,CSWlibbind,) DISTFILES += $(call admfiles,CSWbindutils,) +SPKG_DESC_CSWbind = ISC BIND main package +SPKG_DESC_CSWbinddevel = ISC BIND development package +SPKG_DESC_CSWlibbind = ISC BIND library package +SPKG_DESC_CSWbindutils = ISC BIND utilities package + REQUIRED_PKGS_CSWbind = CSWlibbind CSWbindutils CSWcswclassutils REQUIRED_PKGS_CSWbinddevel = CSWbind REQUIRED_PKGS_CSWlibbind = CSWiconv CSWlibxml2 CSWosslrt CSWzlib @@ -44,24 +49,23 @@ PKGFILES_CSWlibbind = $(libdir)/.* PKGFILES_CSWbindutils = $(bindir)/.* +ENABLE_CHECK = 0 + INSTALL_SCRIPTS = custom -PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswnamed$$$$/ { $$$$2 = "cswinitsmf" } { print }' +PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswnamed$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/named.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } $$$$3 ~ /\/var\/opt\/csw\/named/ { $$$$5 = "named" } { print }' -SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) SPKG_SOURCEURL = http://www.isc.org/software/bind -SPKG_CLASSES = none cswinitsmf +SPKG_CLASSES_CSWbind = none cswcpsampleconf cswinitsmf include gar/category.mk +SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) + install-custom: @echo " ==> Installing $(GARNAME) (custom)" - @rm -rf $(DESTDIR) @ginstall -d $(DESTDIR)/etc/opt/csw/init.d @cp $(FILEDIR)/CSWbind.cswnamed $(DESTDIR)/etc/opt/csw/init.d/cswnamed -# @ginstall -d $(DESTDIR)/etc/init.d -# @cp $(FILEDIR)/CSWbind.cswnamed $(DESTDIR)/etc/init.d/cswnamed - @ginstall -d $(DESTDIR)/etc/opt/csw @cp $(FILEDIR)/CSWbind.named.conf.CSW $(DESTDIR)/etc/opt/csw/named.conf.CSW @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) @cp $(FILEDIR)/CSWbind.README.CSW $(DESTDIR)$(docdir)/$(GARNAME)/README.CSW @@ -73,4 +77,5 @@ @cp $(WORKSRC)/COPYRIGHT $(DESTDIR)$(docdir)/$(GARNAME)/LICENSE ( cd $(WORKSRC) ; \ gmake DESTDIR=$(DESTDIR) install ) + @touch $(DESTDIR)/var/opt/csw/named/named.pid @$(MAKECOOKIE) Modified: csw/mgar/pkg/bind/trunk/checksums =================================================================== --- csw/mgar/pkg/bind/trunk/checksums 2008-12-16 15:28:19 UTC (rev 2619) +++ csw/mgar/pkg/bind/trunk/checksums 2008-12-16 16:14:01 UTC (rev 2620) @@ -1,8 +1,7 @@ 16c893f73a394c8cc36d7900cb9bb801 download/bind-9.5.0-P2.tar.gz -9d20fd7cceac478243ac485868b9ef35 download/CSWbind.gspec +e346b8d43181db864605c76435a0f731 download/CSWbind.gspec 9338f20547092ec54136ebebd5f663d3 download/CSWbind.preinstall -78702926bd064e3a1f4ac56ae85866a9 download/CSWbind.postinstall -104f5539928c029738b0a1808f8af262 download/CSWbind.preremove -af16ec4f9c20614932f67acd116e52ad download/CSWbinddevel.gspec -40e00ac3e92ec835dbf567581930d34e download/CSWlibbind.gspec -7f81505db2da9fbc899b9abeac434c58 download/CSWbindutils.gspec +90026b0ca15e2435ddae730c5bed4a42 download/CSWbind.preremove +771f4b6098f7bdeb83c5690dfeb6b5eb download/CSWbinddevel.gspec +d5c381cd0cf6be25fc3a75fc470eeaf6 download/CSWlibbind.gspec +a6c7fa764b592aed3b370b9a49e9920e download/CSWbindutils.gspec Modified: csw/mgar/pkg/bind/trunk/files/CSWbind.cswnamed =================================================================== --- csw/mgar/pkg/bind/trunk/files/CSWbind.cswnamed 2008-12-16 15:28:19 UTC (rev 2619) +++ csw/mgar/pkg/bind/trunk/files/CSWbind.cswnamed 2008-12-16 16:14:01 UTC (rev 2620) @@ -1,7 +1,7 @@ #!/sbin/sh # rc-script for CSW Bind -# Peter Bonivart, 2008-11-18 +# Peter Bonivart, 2008-12-16 USER=named #OPTIONS="-d 1" # debug mode @@ -11,14 +11,14 @@ ZONE= # used for initialization, do not change case "$1" in - 'start') + start) if [ -f /opt/csw/sbin/named -a -f /etc/opt/csw/named.conf ]; then echo 'Starting bind.' # ulimit -n 1024 /opt/csw/sbin/named $OPTIONS & fi ;; - 'stop') + stop) echo 'Shutting down bind.' if [ -x /usr/bin/zonename ]; then if [ "`/usr/bin/zonename`" = "global" ]; then @@ -28,7 +28,7 @@ pkill $ZONE named exit 0 ;; - 'reload') + reload|refresh) echo 'Reloading bind.' if [ -x /usr/bin/zonename ]; then if [ "`/usr/bin/zonename`" = "global" ]; then @@ -39,7 +39,7 @@ exit 0 ;; *) - echo "Usage: $0 { start | stop | reload }" + echo "Usage: $0 { start | stop | reload | refresh }" exit 1 ;; esac Modified: csw/mgar/pkg/bind/trunk/files/CSWbind.gspec =================================================================== --- csw/mgar/pkg/bind/trunk/files/CSWbind.gspec 2008-12-16 15:28:19 UTC (rev 2619) +++ csw/mgar/pkg/bind/trunk/files/CSWbind.gspec 2008-12-16 16:14:01 UTC (rev 2620) @@ -1,7 +1,6 @@ %var bitname bind %var pkgname CSWbind %include url file://%{PKGLIB}/csw_dyndepend.gspec -%prototype exec cswproto -s %{TIMESTAMP} -r %{DESTDIR} %{DESTDIR} %copyright Please see /opt/csw/share/doc/bind/LICENSE for license information Deleted: csw/mgar/pkg/bind/trunk/files/CSWbind.postinstall =================================================================== --- csw/mgar/pkg/bind/trunk/files/CSWbind.postinstall 2008-12-16 15:28:19 UTC (rev 2619) +++ csw/mgar/pkg/bind/trunk/files/CSWbind.postinstall 2008-12-16 16:14:01 UTC (rev 2620) @@ -1,34 +0,0 @@ -#!/bin/sh - -# 2008-11-19 - -ETC=$PKG_INSTALL_ROOT/etc/opt/csw -VAR=$PKG_INSTALL_ROOT/var/opt/csw/named - -# check csw.conf -if [ -x $BASEDIR/etc/csw.conf ] ; then - . $BASEDIR/etc/csw.conf -fi -if [ -x $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf ] ; then - . $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf -fi - -# enable? -if [ ! -f "$ETC/named.conf" ]; then - if [ "$autoenable_daemons" = "no" ]; then - echo "named.conf not created due to csw.conf setting." - else - cp -p $ETC/named.conf.CSW $ETC/named.conf - fi -else - echo "named.conf already exists, will not copy named.conf.CSW to it." -fi - -# set owner on var dir -chown -R named $VAR - -echo -echo ">>> Read /opt/csw/share/doc/bind/README.CSW for more info <<<" -echo - -exit 0 Modified: csw/mgar/pkg/bind/trunk/files/CSWbind.preremove =================================================================== --- csw/mgar/pkg/bind/trunk/files/CSWbind.preremove 2008-12-16 15:28:19 UTC (rev 2619) +++ csw/mgar/pkg/bind/trunk/files/CSWbind.preremove 2008-12-16 16:14:01 UTC (rev 2620) @@ -1,14 +1,7 @@ #!/bin/sh -# 2008-11-19 +# 2008-12-16 -ETC=$PKG_INSTALL_ROOT/etc/opt/csw - -echo - -# stop bind -/etc/init.d/cswnamed stop - # remove named user if created by this package /usr/bin/grep "^named:" $PKG_INSTALL_ROOT/etc/passwd | /usr/bin/grep ":CSW BIND DNS:" > /dev/null 2>&1 if [ "$?" = "0" ]; then @@ -16,11 +9,4 @@ /usr/sbin/userdel named > /dev/null 2>&1 fi -# remove conf files -if [ "`cmp "$ETC/named.conf" "$ETC/named.conf.CSW"`" ]; then - echo "named.conf modified, will not remove it." -else - /bin/rm $ETC/named.conf -fi - exit 0 Modified: csw/mgar/pkg/bind/trunk/files/CSWbinddevel.gspec =================================================================== --- csw/mgar/pkg/bind/trunk/files/CSWbinddevel.gspec 2008-12-16 15:28:19 UTC (rev 2619) +++ csw/mgar/pkg/bind/trunk/files/CSWbinddevel.gspec 2008-12-16 16:14:01 UTC (rev 2620) @@ -1,7 +1,6 @@ %var bitname bind_devel %var pkgname CSWbinddevel %include url file://%{PKGLIB}/csw_dyndepend.gspec -%prototype exec cswproto -s %{TIMESTAMP} -r %{DESTDIR} %{DESTDIR} %copyright Please see /opt/csw/share/doc/bind/LICENSE for license information Modified: csw/mgar/pkg/bind/trunk/files/CSWbindutils.gspec =================================================================== --- csw/mgar/pkg/bind/trunk/files/CSWbindutils.gspec 2008-12-16 15:28:19 UTC (rev 2619) +++ csw/mgar/pkg/bind/trunk/files/CSWbindutils.gspec 2008-12-16 16:14:01 UTC (rev 2620) @@ -1,7 +1,6 @@ %var bitname bind_utils %var pkgname CSWbindutils %include url file://%{PKGLIB}/csw_dyndepend.gspec -%prototype exec cswproto -s %{TIMESTAMP} -r %{DESTDIR} %{DESTDIR} %copyright Please see /opt/csw/share/doc/bind/LICENSE for license information Modified: csw/mgar/pkg/bind/trunk/files/CSWlibbind.gspec =================================================================== --- csw/mgar/pkg/bind/trunk/files/CSWlibbind.gspec 2008-12-16 15:28:19 UTC (rev 2619) +++ csw/mgar/pkg/bind/trunk/files/CSWlibbind.gspec 2008-12-16 16:14:01 UTC (rev 2620) @@ -1,7 +1,6 @@ %var bitname libbind %var pkgname CSWlibbind %include url file://%{PKGLIB}/csw_dyndepend.gspec -%prototype exec cswproto -s %{TIMESTAMP} -r %{DESTDIR} %{DESTDIR} %copyright Please see /opt/csw/share/doc/bind/LICENSE for license information 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 Dec 16 17:20:11 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 16 Dec 2008 16:20:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[2621] csw/mgar/pkg/docbook-style-xsl/trunk Message-ID: Revision: 2621 http://gar.svn.sourceforge.net/gar/?rev=2621&view=rev Author: bdwalton Date: 2008-12-16 16:20:11 +0000 (Tue, 16 Dec 2008) Log Message: ----------- split out share/doc to a separate docbookxsldoc package Modified Paths: -------------- csw/mgar/pkg/docbook-style-xsl/trunk/Makefile csw/mgar/pkg/docbook-style-xsl/trunk/checksums Added Paths: ----------- csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsldoc.gspec Modified: csw/mgar/pkg/docbook-style-xsl/trunk/Makefile =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/Makefile 2008-12-16 16:14:01 UTC (rev 2620) +++ csw/mgar/pkg/docbook-style-xsl/trunk/Makefile 2008-12-16 16:20:11 UTC (rev 2621) @@ -6,8 +6,12 @@ # for our (modified from rhel) copied in Makefile. PREREQUISITE_PKGS = CSWgfile CSWbash -REQUIRED_PKGS = CSWsgmlcommon CSWxmlcommon CSWdocbookdtds CSWlibxml2 +REQUIRED_PKGS_CSWdocbookxsl = CSWsgmlcommon CSWxmlcommon CSWdocbookdtds +REQUIRED_PKGS_CSWdocbookxsl += CSWlibxml2 +REQUIRED_PKGS_CSWdocbookxsldoc = CSWdocbookxsl +PKGFILES_CSWdocbookxsldoc = $(datadir)/doc/.* + DESCRIPTION = Norman Walsh's XSL stylesheets for DocBook XML. define BLURB The DocBook XSL stylesheets are a set of stylesheets for use with an @@ -22,6 +26,7 @@ DISTFILES = docbook-xsl-$(GARVERSION).tar.bz2 DISTFILES += docbook-xsl-doc-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWdocbookxsl,postinstall preremove) +DISTFILES += $(call admfiles,CSWdocbookxsldoc,) # These are listed in the same order they'd be applied during the rpm build... # They don't apply cleanly, otherwise. Modified: csw/mgar/pkg/docbook-style-xsl/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/checksums 2008-12-16 16:14:01 UTC (rev 2620) +++ csw/mgar/pkg/docbook-style-xsl/trunk/checksums 2008-12-16 16:20:11 UTC (rev 2621) @@ -3,6 +3,7 @@ 4120f10e50070dd8fc2284d5214bf51d download/CSWdocbookxsl.gspec 8911f851d78a1ab1a21c49286f37f6cb download/CSWdocbookxsl.postinstall 88f331d079de730ef77a5091e69989e2 download/CSWdocbookxsl.preremove +2da0402bea01c8235e6fffac147382d5 download/CSWdocbookxsldoc.gspec 84b37b559cc95c747e39a5a8f79558a3 download/docbook-xsl-pagesetup.patch 1d1ff63f5ebd3527c925f68e55138b6f download/docbook-xsl-marginleft.patch cec8c281ed1c9be99ad47a74362248d5 download/docbook-xsl-lists.patch Added: csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsldoc.gspec =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsldoc.gspec (rev 0) +++ csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsldoc.gspec 2008-12-16 16:20:11 UTC (rev 2621) @@ -0,0 +1,5 @@ +%var bitname docbookxsldoc +%var pkgname CSWdocbookxsldoc +%var arch all +%include url file://%{PKGLIB}/csw_dyndepend.gspec + 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 Dec 16 19:02:04 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 16 Dec 2008 18:02:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[2622] csw/mgar/pkg/git/trunk/ Message-ID: Revision: 2622 http://gar.svn.sourceforge.net/gar/?rev=2622&view=rev Author: bdwalton Date: 2008-12-16 18:02:04 +0000 (Tue, 16 Dec 2008) Log Message: ----------- cut over to gar2 Property Changed: ---------------- csw/mgar/pkg/git/trunk/ Property changes on: csw/mgar/pkg/git/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 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 Dec 16 19:48:17 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 16 Dec 2008 18:48:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[2623] csw/mgar/gar/v2 Message-ID: Revision: 2623 http://gar.svn.sourceforge.net/gar/?rev=2623&view=rev Author: dmichelsen Date: 2008-12-16 18:48:14 +0000 (Tue, 16 Dec 2008) Log Message: ----------- mGAR v2: More generalized debug target 'modenv' instead of 'isaenv' Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2008-12-16 18:02:04 UTC (rev 2622) +++ csw/mgar/gar/v2/gar.conf.mk 2008-12-16 18:48:14 UTC (rev 2623) @@ -591,7 +591,7 @@ @echo " No = Compiler cannot generate code for that ISA" @echo -isaenv: +modenv: @echo " Arch: $(GARCH)" @echo " Kernel: $(KERNELISA)" @echo @@ -610,13 +610,11 @@ @echo " Merge exclude: $(_MERGE_EXCLUDE_FILES)" @echo @echo "Requested compiler flags:" - @$(foreach ISA,$(ISA) $(filter-out $(ISA),$(BUILD_ISAS)), \ - $(MAKE) -s ISA=$(ISA) _isaenv; \ - ) + @$(foreach MOD,$(MODULATIONS),$(MAKE) -s _modenv-$(MOD);) -_isaenv: +_modenv-modulated: @echo; \ - echo "* ISA $(ISA)"; \ + echo "* Modulation $(MODULATION): $(foreach M,$(MODULATORS),$M=$($M))"; \ echo " PATH = $(PATH)"; \ echo "PKG_CONFIG_PATH = $(PKG_CONFIG_PATH)"; \ echo " CFLAGS = $(CFLAGS)"; \ Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2008-12-16 18:02:04 UTC (rev 2622) +++ csw/mgar/gar/v2/gar.mk 2008-12-16 18:48:14 UTC (rev 2623) @@ -137,19 +137,27 @@ endef +define _modulate_target_nocookie_noprepost +$(1)-$(2): + @gmake -s MODULATION=$(2) $(3) $(1)-modulated + @# The next line has intentionally been left blank to explicitly terminate this make rule + +endef + define _modulate_do $(call _modulate_target,extract,$(2),$(4)) $(call _modulate_target,patch,$(2),$(4)) $(call _modulate_target,configure,$(2),$(4)) -$(call _modulate_target_nocookie,reset-configure,$(2),$(4)) +$(call _modulate_target_nocookie_noprepost,reset-configure,$(2),$(4)) $(call _modulate_target,build,$(2),$(4)) -$(call _modulate_target_nocookie,reset-build,$(2),$(4)) +$(call _modulate_target_nocookie_noprepost,reset-build,$(2),$(4)) $(call _modulate_target,test,$(2),$(4)) $(call _modulate_target,install,$(2),$(4)) -$(call _modulate_target_nocookie,reset-install,$(2),$(4)) +$(call _modulate_target_nocookie_noprepost,reset-install,$(2),$(4)) $(call _modulate_target,merge,$(2),$(4)) -$(call _modulate_target_nocookie,reset-merge,$(2),$(4)) -$(call _modulate_target_nocookie,clean,$(2),$(4)) +$(call _modulate_target_nocookie_noprepost,reset-merge,$(2),$(4)) +$(call _modulate_target_nocookie_noprepost,clean,$(2),$(4)) +$(call _modulate_target_nocookie_noprepost,_modenv,$(2),$(4)) endef # This evaluates to the make rules for all modulations passed as first argument @@ -186,10 +194,6 @@ $(eval $(call _modulate,$(MODULATORS))) -modenv: - @echo " Modulators: $(MODULATORS)" - @echo "Modulations: $(MODULATIONS)" - @echo "M: $(call expand_modulator_1,ISA)" # ========================= MAIN RULES ========================= # The main rules are the ones that the user can specify as a 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 Dec 16 21:59:04 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 16 Dec 2008 20:59:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[2624] csw/mgar/pkg/git/trunk Message-ID: Revision: 2624 http://gar.svn.sourceforge.net/gar/?rev=2624&view=rev Author: bdwalton Date: 2008-12-16 20:59:04 +0000 (Tue, 16 Dec 2008) Log Message: ----------- first working build; tests fail, but i think that is a sed vs gsed issue Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile csw/mgar/pkg/git/trunk/checksums Added Paths: ----------- csw/mgar/pkg/git/trunk/files/doc-makefile.patch Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2008-12-16 18:48:14 UTC (rev 2623) +++ csw/mgar/pkg/git/trunk/Makefile 2008-12-16 20:59:04 UTC (rev 2624) @@ -1,7 +1,9 @@ GARNAME = git -GARVERSION = 1.5.5.1 +GARVERSION = 1.6.0.5 CATEGORIES = devel +PREREQUISITE_PKGS = CSWasciidoc CSWossldevel CSWxmlto CSWbash CSWcurl + DESCRIPTION = Fast Version Control System define BLURB Git is a popular version control system designed to handle @@ -13,17 +15,22 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWgit,) +PATCHFILES = doc-makefile.patch + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -PREREQUISITE_PKGS = CSWasciidoc CSWossldevel +GARCOMPILER = GNU -CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS = $(DIRPATHS) --with-shell=/opt/csw/bin/bash -BUILD_ARGS = MSGFMT=gmsgfmt all doc +BUILD_ARGS = MSGFMT=gmsgfmt SHELL_PATH=/opt/csw/bin/bash all doc INSTALL_ARGS = install-doc include gar/category.mk CFLAGS += -L$(libdir) + +# for tail -n +PATH := /usr/xpg4/bin:$(PATH) \ No newline at end of file Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2008-12-16 18:48:14 UTC (rev 2623) +++ csw/mgar/pkg/git/trunk/checksums 2008-12-16 20:59:04 UTC (rev 2624) @@ -1,2 +1,3 @@ -6c5ffadc0e6a8652833b4160510ed27f download/git-1.5.5.1.tar.bz2 +899172ebeac65f7a09a8e204d4f87d8c download/git-1.6.0.5.tar.bz2 fa435e5bd4c829d055a1265ec36360fe download/CSWgit.gspec +369547e8222dcf8be214b5013f28afcc download/doc-makefile.patch Added: csw/mgar/pkg/git/trunk/files/doc-makefile.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/doc-makefile.patch (rev 0) +++ csw/mgar/pkg/git/trunk/files/doc-makefile.patch 2008-12-16 20:59:04 UTC (rev 2624) @@ -0,0 +1,50 @@ +--- git-1.6.0.5/Documentation/Makefile.orig 2008-12-16 14:41:44.670977000 -0500 ++++ git-1.6.0.5/Documentation/Makefile 2008-12-16 14:49:07.561035000 -0500 +@@ -56,6 +56,8 @@ + -include ../config.mak.autogen + -include ../config.mak + ++SHELL = $(SHELL_PATH) ++ + ifdef ASCIIDOC8 + ASCIIDOC_EXTRA += -a asciidoc7compatible + endif +@@ -105,7 +107,7 @@ + fi + + install-html: html +- sh ./install-webdoc.sh $(DESTDIR)$(htmldir) ++ $(SHELL) ./install-webdoc.sh $(DESTDIR)$(htmldir) + + ../GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE + $(MAKE) -C ../ GIT-VERSION-FILE +@@ -167,7 +169,7 @@ + + technical/api-index.txt: technical/api-index-skel.txt \ + technical/api-index.sh $(patsubst %,%.txt,$(API_DOCS)) +- cd technical && sh ./api-index.sh ++ cd technical && $(SHELL) ./api-index.sh + + $(patsubst %,%.html,$(API_DOCS) technical/api-index): %.html : %.txt + $(ASCIIDOC) -b xhtml11 -f asciidoc.conf \ +@@ -203,7 +205,7 @@ + + howto-index.txt: howto-index.sh $(wildcard howto/*.txt) + $(RM) $@+ $@ +- sh ./howto-index.sh $(wildcard howto/*.txt) >$@+ ++ $(SHELL) ./howto-index.sh $(wildcard howto/*.txt) >$@+ + mv $@+ $@ + + $(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt +@@ -217,9 +219,9 @@ + mv $@+ $@ + + install-webdoc : html +- sh ./install-webdoc.sh $(WEBDOC_DEST) ++ $(SHELL) ./install-webdoc.sh $(WEBDOC_DEST) + + quick-install: +- sh ./install-doc-quick.sh $(DOC_REF) $(DESTDIR)$(mandir) ++ $(SHELL) ./install-doc-quick.sh $(DOC_REF) $(DESTDIR)$(mandir) + + .PHONY: .FORCE-GIT-VERSION-FILE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Dec 16 23:02:55 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 16 Dec 2008 22:02:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[2625] csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile Message-ID: Revision: 2625 http://gar.svn.sourceforge.net/gar/?rev=2625&view=rev Author: wbonnet Date: 2008-12-16 22:02:55 +0000 (Tue, 16 Dec 2008) Log Message: ----------- Fix Author for fetching and downloading Modified Paths: -------------- csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile Modified: csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile 2008-12-16 20:59:04 UTC (rev 2624) +++ csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile 2008-12-16 22:02:55 UTC (rev 2625) @@ -1,7 +1,7 @@ GARNAME = BerkeleyDB GARVERSION = 0.36 CATEGORIES = cpan -AUTHOR = Paul Marquess +AUTHOR = PMQS DESCRIPTION = BerkeleyDB module define BLURB This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Dec 16 23:07:49 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 16 Dec 2008 22:07:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[2626] csw/mgar/pkg/cpan/Convert-UUlib/trunk/Makefile Message-ID: Revision: 2626 http://gar.svn.sourceforge.net/gar/?rev=2626&view=rev Author: wbonnet Date: 2008-12-16 22:07:49 +0000 (Tue, 16 Dec 2008) Log Message: ----------- Fix UFILE Regex Modified Paths: -------------- csw/mgar/pkg/cpan/Convert-UUlib/trunk/Makefile Modified: csw/mgar/pkg/cpan/Convert-UUlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Convert-UUlib/trunk/Makefile 2008-12-16 22:02:55 UTC (rev 2625) +++ csw/mgar/pkg/cpan/Convert-UUlib/trunk/Makefile 2008-12-16 22:07:49 UTC (rev 2626) @@ -1,7 +1,7 @@ GARNAME = Convert-UUlib GARVERSION = 1.12 CATEGORIES = cpan -AUTHOR = Marc Lehmann +AUTHOR = MLEHMANN DESCRIPTION = Perl interface to the uulib library define BLURB This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Dec 16 23:14:24 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 16 Dec 2008 22:14:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[2627] csw/mgar/gar/v1/categories/cpan/category.mk Message-ID: Revision: 2627 http://gar.svn.sourceforge.net/gar/?rev=2627&view=rev Author: wbonnet Date: 2008-12-16 22:14:23 +0000 (Tue, 16 Dec 2008) Log Message: ----------- Update default regexp and upstream master site Modified Paths: -------------- csw/mgar/gar/v1/categories/cpan/category.mk Modified: csw/mgar/gar/v1/categories/cpan/category.mk =================================================================== --- csw/mgar/gar/v1/categories/cpan/category.mk 2008-12-16 22:07:49 UTC (rev 2626) +++ csw/mgar/gar/v1/categories/cpan/category.mk 2008-12-16 22:14:23 UTC (rev 2627) @@ -28,8 +28,8 @@ SPKG_SOURCEURL := $(SPKG_SOURCEURL)/~$(call TOLOWER,$(AUTHOR)) # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -USTREAM_MASTER_SITE = $(SPKG_SOURCEURL) +UFILES_REGEX ?= $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +USTREAM_MASTER_SITE ?= $(SPKG_SOURCEURL) SPKG_SOURCEURL := $(SPKG_SOURCEURL)/$(GARNAME) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Dec 16 23:15:31 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 16 Dec 2008 22:15:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[2628] csw/mgar/gar/v2/categories/cpan/category.mk Message-ID: Revision: 2628 http://gar.svn.sourceforge.net/gar/?rev=2628&view=rev Author: wbonnet Date: 2008-12-16 22:15:30 +0000 (Tue, 16 Dec 2008) Log Message: ----------- Update default regexp for upstream detection Modified Paths: -------------- csw/mgar/gar/v2/categories/cpan/category.mk Modified: csw/mgar/gar/v2/categories/cpan/category.mk =================================================================== --- csw/mgar/gar/v2/categories/cpan/category.mk 2008-12-16 22:14:23 UTC (rev 2627) +++ csw/mgar/gar/v2/categories/cpan/category.mk 2008-12-16 22:15:30 UTC (rev 2628) @@ -28,8 +28,8 @@ SPKG_SOURCEURL := $(SPKG_SOURCEURL)/~$(call TOLOWER,$(AUTHOR)) # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -USTREAM_MASTER_SITE = $(SPKG_SOURCEURL) +UFILES_REGEX ?= $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +USTREAM_MASTER_SITE ?= $(SPKG_SOURCEURL) SPKG_SOURCEURL := $(SPKG_SOURCEURL)/$(GARNAME) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Tue Dec 16 23:38:36 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Tue, 16 Dec 2008 22:38:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[2629] csw/mgar/pkg/cpan Message-ID: Revision: 2629 http://gar.svn.sourceforge.net/gar/?rev=2629&view=rev Author: wbonnet Date: 2008-12-16 22:38:36 +0000 (Tue, 16 Dec 2008) Log Message: ----------- Update some UFILE_REGEX Modified Paths: -------------- csw/mgar/pkg/cpan/DateManip/trunk/Makefile csw/mgar/pkg/cpan/Frontier-RPC/trunk/Makefile csw/mgar/pkg/cpan/Gtk2-PodViewer/trunk/Makefile csw/mgar/pkg/cpan/IO-Pager/trunk/Makefile csw/mgar/pkg/cpan/Syslog/trunk/Makefile csw/mgar/pkg/cpan/VCP/trunk/Makefile csw/mgar/pkg/cpan/sol-inst/trunk/Makefile Modified: csw/mgar/pkg/cpan/DateManip/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/DateManip/trunk/Makefile 2008-12-16 22:15:30 UTC (rev 2628) +++ csw/mgar/pkg/cpan/DateManip/trunk/Makefile 2008-12-16 22:38:36 UTC (rev 2629) @@ -1,4 +1,4 @@ -GARNAME = DateManip +GARNAME = Date-Manip GARVERSION = 5.46 CATEGORIES = cpan AUTHOR = SBECK Modified: csw/mgar/pkg/cpan/Frontier-RPC/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Frontier-RPC/trunk/Makefile 2008-12-16 22:15:30 UTC (rev 2628) +++ csw/mgar/pkg/cpan/Frontier-RPC/trunk/Makefile 2008-12-16 22:38:36 UTC (rev 2629) @@ -12,6 +12,8 @@ DISTFILES += $(call admfiles,CSWpmfrontierrpc,depend prototype) +UFILES_REGEX ?= $(GARNAME)-((\d+(?:\.\d+)*)(b\d+)?).tar.gz + # See http://rt.cpan.org/Public/Bug/Display.html?id=18299 PATCHFILES += XMLRPC-mp2.diff Modified: csw/mgar/pkg/cpan/Gtk2-PodViewer/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Gtk2-PodViewer/trunk/Makefile 2008-12-16 22:15:30 UTC (rev 2628) +++ csw/mgar/pkg/cpan/Gtk2-PodViewer/trunk/Makefile 2008-12-16 22:38:36 UTC (rev 2629) @@ -1,4 +1,4 @@ -GARNAME = Gtk2-PodViewer +GARNAME = Gtk2-Ex-PodViewer GARVERSION = 0.13 CATEGORIES = cpan AUTHOR = GBROWN Modified: csw/mgar/pkg/cpan/IO-Pager/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/IO-Pager/trunk/Makefile 2008-12-16 22:15:30 UTC (rev 2628) +++ csw/mgar/pkg/cpan/IO-Pager/trunk/Makefile 2008-12-16 22:38:36 UTC (rev 2629) @@ -13,6 +13,8 @@ MODDIST = $(GARNAME)-$(GARVERSION).tgz DISTFILES = $(call admfiles,CSWpmiopager,depend prototype) +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz + # Tests are mostly visual verification TEST_SCRIPTS = Modified: csw/mgar/pkg/cpan/Syslog/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Syslog/trunk/Makefile 2008-12-16 22:15:30 UTC (rev 2628) +++ csw/mgar/pkg/cpan/Syslog/trunk/Makefile 2008-12-16 22:38:36 UTC (rev 2629) @@ -1,4 +1,4 @@ -GARNAME = Syslog +GARNAME = Unix-Syslog GARVERSION = 0.97 CATEGORIES = cpan AUTHOR = MHARNISCH Modified: csw/mgar/pkg/cpan/VCP/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/VCP/trunk/Makefile 2008-12-16 22:15:30 UTC (rev 2628) +++ csw/mgar/pkg/cpan/VCP/trunk/Makefile 2008-12-16 22:38:36 UTC (rev 2629) @@ -16,6 +16,8 @@ MODDIST = $(MODDISTP).tar.gz WORKSRC = $(WORKDIR)/$(MODDISTP) +UFILES_REGEX ?= $(GARNAME)-autrijus-snapshot-((\d+(?:\.\d+)*)(-\d+)?).tar.gz + DEPENDS += cpan/HTML-Tree DEPENDS += cpan/IPC-Run3 DEPENDS += cpan/PodToHTML Modified: csw/mgar/pkg/cpan/sol-inst/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/sol-inst/trunk/Makefile 2008-12-16 22:15:30 UTC (rev 2628) +++ csw/mgar/pkg/cpan/sol-inst/trunk/Makefile 2008-12-16 22:38:36 UTC (rev 2629) @@ -9,6 +9,8 @@ information on a Solaris system. endef +UFILES_REGEX ?= $(GARNAME)-((\d+(?:\.\d+)*)(a)?).tar.gz + WORKSRC = $(WORKDIR)/Solaris DISTFILES += CSWpmsolinst.gspec 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 Dec 17 04:48:48 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 17 Dec 2008 03:48:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[2630] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 2630 http://gar.svn.sourceforge.net/gar/?rev=2630&view=rev Author: bdwalton Date: 2008-12-17 03:48:48 +0000 (Wed, 17 Dec 2008) Log Message: ----------- Depend on gsed and the gnu links during build so that tests assuming sed as gnu sed work. The package now builds and passes the tests (sol10 x86). Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2008-12-16 22:38:36 UTC (rev 2629) +++ csw/mgar/pkg/git/trunk/Makefile 2008-12-17 03:48:48 UTC (rev 2630) @@ -3,6 +3,7 @@ CATEGORIES = devel PREREQUISITE_PKGS = CSWasciidoc CSWossldevel CSWxmlto CSWbash CSWcurl +PREREQUISITE_PKGS += CSWgsed CSWgnulinks DESCRIPTION = Fast Version Control System define BLURB @@ -30,7 +31,6 @@ include gar/category.mk -CFLAGS += -L$(libdir) - -# for tail -n -PATH := /usr/xpg4/bin:$(PATH) \ No newline at end of file +# for tail -n and to override things like, etc with the gnu counterparts +# gnu must come first so xpg4/sed isn't found first. +PATH := /opt/csw/gnu:/usr/xpg4/bin:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Dec 17 16:33:03 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 17 Dec 2008 15:33:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[2631] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 2631 http://gar.svn.sourceforge.net/gar/?rev=2631&view=rev Author: bonivart Date: 2008-12-17 15:33:03 +0000 (Wed, 17 Dec 2008) Log Message: ----------- pkgutil: update to 1.3.1 due to minor bug in pre/post Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.postinstall csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.preremove Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2008-12-17 03:48:48 UTC (rev 2630) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2008-12-17 15:33:03 UTC (rev 2631) @@ -1,5 +1,5 @@ GARNAME = pkgutil -GARVERSION = 1.3 +GARVERSION = 1.3.1 CATEGORIES = utils DESCRIPTION = Installs Solaris packages easily @@ -31,25 +31,24 @@ install-custom: @echo " ==> Installing $(GARNAME) (custom)" @rm -rf $(DESTDIR) -# @ginstall -d $(DESTDIR)/etc/opt/csw - @ginstall -d $(DESTDIR)/opt/csw/bin - @ginstall -d $(DESTDIR)/opt/csw/etc + @ginstall -d $(DESTDIR)$(bindir) + @ginstall -d $(DESTDIR)$/sysconfdir) @ginstall -d $(DESTDIR)/opt/csw/libexec/pkgutil - @ginstall -d $(DESTDIR)/opt/csw/share/doc/pkgutil + @ginstall -d $(DESTDIR)$(docdir)/pkgutil @ginstall -d $(DESTDIR)$(mandir)/man1 # @ginstall -d $(DESTDIR)/usr/sadm/install/scripts @ginstall -d $(DESTDIR)/var/opt/csw/pkgutil/packages - @pod2man --section=1 $(WORKSRC)/$(GARNAME) > $(DESTDIR)$(mandir)/man1/pkgutil.1 # @cp -r $(WORKSRC)/$(GARNAME).conf $(DESTDIR)/etc/opt/csw/$(GARNAME).conf.CSW - @cp -r $(WORKSRC)/$(GARNAME).conf $(DESTDIR)/opt/csw/etc/$(GARNAME).conf.CSW - @cp -r $(WORKSRC)/$(GARNAME) $(DESTDIR)/opt/csw/bin/ - @cp -r $(WORKSRC)/bldcat $(DESTDIR)/opt/csw/bin/ - @cp -r $(WORKSRC)/chkcat $(DESTDIR)/opt/csw/bin/ - @cp -r $(WORKSRC)/readme $(DESTDIR)/opt/csw/share/doc/pkgutil/ -# @cp -r $(FILEDIR)/CSWpkgutil.copyright $(DESTDIR)/opt/csw/share/doc/pkgutil/LICENSE + @cp -r $(WORKSRC)/$(GARNAME).conf $(DESTDIR)$(sysconfdir)/$(GARNAME).conf.CSW + @cp -r $(WORKSRC)/$(GARNAME) $(DESTDIR)$(bindir) + @cp -r $(WORKSRC)/bldcat $(DESTDIR)$(bindir) + @cp -r $(WORKSRC)/chkcat $(DESTDIR)$(bindir) + @cp -r $(WORKSRC)/readme $(DESTDIR)$(docdir)/pkgutil/ +# @cp -r $(FILEDIR)/CSWpkgutil.copyright $(DESTDIR)$(docdir)/pkgutil/LICENSE @cp -r $(WORKSRC)/copyright $(DESTDIR)$(docdir)/pkgutil/LICENSE # @cp -r $(FILEDIR)/CSWpkgutil.i.cswpkgutil $(DESTDIR)/usr/sadm/install/scripts/i.cswpkgutil # @cp -r $(FILEDIR)/CSWpkgutil.r.cswpkgutil $(DESTDIR)/usr/sadm/install/scripts/r.cswpkgutil @cp -r $(WORKSRC)/admin $(DESTDIR)/var/opt/csw/pkgutil/admin.CSW @cp -r $(WORKSRC)/wget-`uname -p` $(DESTDIR)/opt/csw/libexec/pkgutil/wget + @pod2man --section=1 $(WORKSRC)/$(GARNAME) > $(DESTDIR)$(mandir)/man1/pkgutil.1 @$(MAKECOOKIE) Modified: csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.postinstall =================================================================== --- csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.postinstall 2008-12-17 03:48:48 UTC (rev 2630) +++ csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.postinstall 2008-12-17 15:33:03 UTC (rev 2631) @@ -1,6 +1,6 @@ #!/bin/sh -ETC=$PKG_INSTALL_ROOT/etc/opt/csw +ETC=$PKG_INSTALL_ROOT/opt/csw/etc VAR=$PKG_INSTALL_ROOT/var/opt/csw/pkgutil echo Modified: csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.preremove =================================================================== --- csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.preremove 2008-12-17 03:48:48 UTC (rev 2630) +++ csw/mgar/pkg/pkgutil/trunk/files/CSWpkgutil.preremove 2008-12-17 15:33:03 UTC (rev 2631) @@ -1,6 +1,6 @@ #!/bin/sh -ETC=$PKG_INSTALL_ROOT/etc/opt/csw +ETC=$PKG_INSTALL_ROOT/opt/csw/etc VAR=$PKG_INSTALL_ROOT/var/opt/csw/pkgutil echo This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Dec 17 16:36:58 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 17 Dec 2008 15:36:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[2632] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 2632 http://gar.svn.sourceforge.net/gar/?rev=2632&view=rev Author: bonivart Date: 2008-12-17 15:36:58 +0000 (Wed, 17 Dec 2008) Log Message: ----------- pkgutil: Makefile fix 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 2008-12-17 15:33:03 UTC (rev 2631) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2008-12-17 15:36:58 UTC (rev 2632) @@ -32,7 +32,7 @@ @echo " ==> Installing $(GARNAME) (custom)" @rm -rf $(DESTDIR) @ginstall -d $(DESTDIR)$(bindir) - @ginstall -d $(DESTDIR)$/sysconfdir) + @ginstall -d $(DESTDIR)$(sysconfdir) @ginstall -d $(DESTDIR)/opt/csw/libexec/pkgutil @ginstall -d $(DESTDIR)$(docdir)/pkgutil @ginstall -d $(DESTDIR)$(mandir)/man1 Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2008-12-17 15:33:03 UTC (rev 2631) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2008-12-17 15:36:58 UTC (rev 2632) @@ -1,5 +1,5 @@ -1b930b0ac7aee3f9523a07ad27bdb211 download/pkgutil-1.3.zip +1b930b0ac7aee3f9523a07ad27bdb211 download/pkgutil-1.3.1.zip 805cd30ad9f21cb1167d166fa99b5891 download/CSWpkgutil.gspec 2f561d7f40289fac9bd02d2504b73693 download/CSWpkgutil.prototype -bea1e5ef39a8389b9feaa18938993205 download/CSWpkgutil.postinstall -5b83368c47fc309a69a1a5020d55385b download/CSWpkgutil.preremove +b9a3a99ece73247e0dbcbb8ea448fcba download/CSWpkgutil.postinstall +6905ca210b32f0789c8640c32de44911 download/CSWpkgutil.preremove This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Wed Dec 17 19:23:22 2008 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Wed, 17 Dec 2008 18:23:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[2633] csw/mgar/pkg/xmlto/trunk/Makefile Message-ID: Revision: 2633 http://gar.svn.sourceforge.net/gar/?rev=2633&view=rev Author: trygvis Date: 2008-12-17 18:23:22 +0000 (Wed, 17 Dec 2008) Log Message: ----------- o Adding missing pre-requisite. Modified Paths: -------------- csw/mgar/pkg/xmlto/trunk/Makefile Modified: csw/mgar/pkg/xmlto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlto/trunk/Makefile 2008-12-17 15:36:58 UTC (rev 2632) +++ csw/mgar/pkg/xmlto/trunk/Makefile 2008-12-17 18:23:22 UTC (rev 2633) @@ -2,7 +2,7 @@ GARVERSION = 0.0.21 CATEGORIES = utils -PREREQUISITE_PKGS = CSWmktemp CSWfindutils CSWdocbookxsl CSWlibxslt CSWflex +PREREQUISITE_PKGS = CSWmktemp CSWfindutils CSWdocbookxsl CSWlibxslt CSWflex CSWggetopts REQUIRES_PKGS = CSWsgmlcommon CSWxmlcommon CSWlibxml2 CSWdocbookdtds REQUIRES_PKGS += CSWdocbookxsl CSWlibxslt CSWflex CSWw3m This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Wed Dec 17 19:23:40 2008 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Wed, 17 Dec 2008 18:23:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[2634] csw/mgar/pkg/asciidoc/trunk/Makefile Message-ID: Revision: 2634 http://gar.svn.sourceforge.net/gar/?rev=2634&view=rev Author: trygvis Date: 2008-12-17 18:23:40 +0000 (Wed, 17 Dec 2008) Log Message: ----------- o Adding missing pre-requisite. Modified Paths: -------------- csw/mgar/pkg/asciidoc/trunk/Makefile Modified: csw/mgar/pkg/asciidoc/trunk/Makefile =================================================================== --- csw/mgar/pkg/asciidoc/trunk/Makefile 2008-12-17 18:23:22 UTC (rev 2633) +++ csw/mgar/pkg/asciidoc/trunk/Makefile 2008-12-17 18:23:40 UTC (rev 2634) @@ -20,6 +20,8 @@ DISTFILES += CSWasciidoc.gspec CSWasciidoc.depend DISTFILES += $(AUTOFILES) +PREREQUISITE_PKGS = CSWautoconf + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).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 Wed Dec 17 19:44:11 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 17 Dec 2008 18:44:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[2635] csw/mgar/pkg/docbook-style-xsl/trunk/files/ CSWdocbookxsldoc.gspec Message-ID: Revision: 2635 http://gar.svn.sourceforge.net/gar/?rev=2635&view=rev Author: bdwalton Date: 2008-12-17 18:44:11 +0000 (Wed, 17 Dec 2008) Log Message: ----------- fixed description for docbookxsl doc package. Modified Paths: -------------- csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsldoc.gspec Modified: csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsldoc.gspec =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsldoc.gspec 2008-12-17 18:23:40 UTC (rev 2634) +++ csw/mgar/pkg/docbook-style-xsl/trunk/files/CSWdocbookxsldoc.gspec 2008-12-17 18:44:11 UTC (rev 2635) @@ -1,5 +1,6 @@ %var bitname docbookxsldoc %var pkgname CSWdocbookxsldoc %var arch all +%var desc Documentation for the Docbook XSL Stylesheets %include url file://%{PKGLIB}/csw_dyndepend.gspec 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 Dec 17 20:01:19 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 17 Dec 2008 19:01:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[2636] csw/mgar/pkg/git/trunk Message-ID: Revision: 2636 http://gar.svn.sourceforge.net/gar/?rev=2636&view=rev Author: bdwalton Date: 2008-12-17 19:01:19 +0000 (Wed, 17 Dec 2008) Log Message: ----------- working towards splitting up the package Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile csw/mgar/pkg/git/trunk/checksums csw/mgar/pkg/git/trunk/files/CSWgit.gspec Added Paths: ----------- csw/mgar/pkg/git/trunk/files/CSWgitdoc.gspec csw/mgar/pkg/git/trunk/files/CSWgitgui.gspec csw/mgar/pkg/git/trunk/files/CSWgitk.gspec csw/mgar/pkg/git/trunk/files/CSWpmgit.gspec Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2008-12-17 18:44:11 UTC (rev 2635) +++ csw/mgar/pkg/git/trunk/Makefile 2008-12-17 19:01:19 UTC (rev 2636) @@ -3,8 +3,12 @@ CATEGORIES = devel PREREQUISITE_PKGS = CSWasciidoc CSWossldevel CSWxmlto CSWbash CSWcurl -PREREQUISITE_PKGS += CSWgsed CSWgnulinks +PREREQUISITE_PKGS += CSWgsed CSWgnulinks CSWperl CSWtcl CSWtk +REQUIRED_PKGS_CSWgit = CSWzlib CSWperl CSWrsync CSWcurl CSWosslrt CSWpmgit +REQUIRED_PKGS_CSWgitk = CSWgit CSWtk +REQUIRED_PKGS_CSWgitgui = CSWgit CSWtk + DESCRIPTION = Fast Version Control System define BLURB Git is a popular version control system designed to handle @@ -15,22 +19,44 @@ MASTER_SITES = http://kernel.org/pub/software/scm/$(GARNAME)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWgit,) +DISTFILES += $(call admfiles,CSWgitdoc,) +DISTFILES += $(call admfiles,CSWpmgit,) +DISTFILES += $(call admfiles,CSWgitgui,) +DISTFILES += $(call admfiles,CSWgitk,) PATCHFILES = doc-makefile.patch +PKGFILES_CSWgitgui = $(bindir)/git-gui $(bindir)/git-citool \ + $(mandir)/man1/git-gui.* $(mandir)/man1/git-citool.* \ + $(datadir)/git-gui/.* $(datadir)/doc/git-gui.* +PKGFILES_CSWgitk = $(bindir)/gitk $(datadir)/doc/gitk.* $(datadir)/gitk.* \ + $(mandir)/man1/gitk.* +PKGFILES_CSWgitdoc = $(datadir)/doc/.* + +PKGFILES_CSWpmgit = + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 GARCOMPILER = GNU CONFIGURE_ARGS = $(DIRPATHS) --with-shell=/opt/csw/bin/bash +CONFIGURE_ARGS += --with-perl=/opt/csw/bin/perl +CONFIGURE_ARGS += --with-tcltk=/opt/csw/bin/tclsh +CONFIGURE_ARGS += --with-zlib=/opt/csw BUILD_ARGS = MSGFMT=gmsgfmt SHELL_PATH=/opt/csw/bin/bash all doc -INSTALL_ARGS = install-doc +INSTALL_ARGS = install install-doc include gar/category.mk # for tail -n and to override things like, etc with the gnu counterparts # gnu must come first so xpg4/sed isn't found first. PATH := /opt/csw/gnu:/usr/xpg4/bin:$(PATH) + +post-install-modulated: + @echo Removing perllocal.pod + @rm -f ${DESTDIR}/opt/csw/lib/perl/5.8.8/perllocal.pod* + @chmod 644 ${DESTDIR}/${libdir}/perl5/site_perl/*pm + @$(MAKECOOKIE) Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2008-12-17 18:44:11 UTC (rev 2635) +++ csw/mgar/pkg/git/trunk/checksums 2008-12-17 19:01:19 UTC (rev 2636) @@ -1,3 +1,7 @@ 899172ebeac65f7a09a8e204d4f87d8c download/git-1.6.0.5.tar.bz2 -fa435e5bd4c829d055a1265ec36360fe download/CSWgit.gspec +57d2c46660773d3a1e87651447e3252a download/CSWgit.gspec +5c5f3cd7951602129a5283c0c242ed3d download/CSWgitdoc.gspec +9ca606aeacf21b081e425a539b848567 download/CSWpmgit.gspec +c5210335743e17938bde6f922891b02a download/CSWgitgui.gspec +82bc03b73b73a6f4b251992a1c671aab download/CSWgitk.gspec 369547e8222dcf8be214b5013f28afcc download/doc-makefile.patch Modified: csw/mgar/pkg/git/trunk/files/CSWgit.gspec =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgit.gspec 2008-12-17 18:44:11 UTC (rev 2635) +++ csw/mgar/pkg/git/trunk/files/CSWgit.gspec 2008-12-17 19:01:19 UTC (rev 2636) @@ -1,4 +1,4 @@ %var bitname git %var pkgname CSWgit %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING +%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Added: csw/mgar/pkg/git/trunk/files/CSWgitdoc.gspec =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgitdoc.gspec (rev 0) +++ csw/mgar/pkg/git/trunk/files/CSWgitdoc.gspec 2008-12-17 19:01:19 UTC (rev 2636) @@ -0,0 +1,5 @@ +%var bitname gitdoc +%var pkgname CSWgitdoc +%var desc Documentation for Git +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Added: csw/mgar/pkg/git/trunk/files/CSWgitgui.gspec =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgitgui.gspec (rev 0) +++ csw/mgar/pkg/git/trunk/files/CSWgitgui.gspec 2008-12-17 19:01:19 UTC (rev 2636) @@ -0,0 +1,5 @@ +%var bitname gitgui +%var pkgname CSWgitgui +%var desc Git GUI tool +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Added: csw/mgar/pkg/git/trunk/files/CSWgitk.gspec =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgitk.gspec (rev 0) +++ csw/mgar/pkg/git/trunk/files/CSWgitk.gspec 2008-12-17 19:01:19 UTC (rev 2636) @@ -0,0 +1,5 @@ +%var bitname gitk +%var pkgname CSWgitk +%var desc Git revision tree visualiser +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Added: csw/mgar/pkg/git/trunk/files/CSWpmgit.gspec =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWpmgit.gspec (rev 0) +++ csw/mgar/pkg/git/trunk/files/CSWpmgit.gspec 2008-12-17 19:01:19 UTC (rev 2636) @@ -0,0 +1,5 @@ +%var bitname pm_git +%var pkgname CSWpmgit +%var desc Perl interface to Git +%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 trygvis at users.sourceforge.net Wed Dec 17 20:09:55 2008 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Wed, 17 Dec 2008 19:09:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[2637] csw/mgar/pkg/xmlto/trunk/Makefile Message-ID: Revision: 2637 http://gar.svn.sourceforge.net/gar/?rev=2637&view=rev Author: trygvis Date: 2008-12-17 19:09:49 +0000 (Wed, 17 Dec 2008) Log Message: ----------- uhm .. Modified Paths: -------------- csw/mgar/pkg/xmlto/trunk/Makefile Modified: csw/mgar/pkg/xmlto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlto/trunk/Makefile 2008-12-17 19:01:19 UTC (rev 2636) +++ csw/mgar/pkg/xmlto/trunk/Makefile 2008-12-17 19:09:49 UTC (rev 2637) @@ -2,7 +2,7 @@ GARVERSION = 0.0.21 CATEGORIES = utils -PREREQUISITE_PKGS = CSWmktemp CSWfindutils CSWdocbookxsl CSWlibxslt CSWflex CSWggetopts +PREREQUISITE_PKGS = CSWmktemp CSWfindutils CSWdocbookxsl CSWlibxslt CSWflex CSWggetopt REQUIRES_PKGS = CSWsgmlcommon CSWxmlcommon CSWlibxml2 CSWdocbookdtds REQUIRES_PKGS += CSWdocbookxsl CSWlibxslt CSWflex CSWw3m 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 Dec 17 22:58:21 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 17 Dec 2008 21:58:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[2638] csw/mgar/pkg/xmlto/trunk Message-ID: Revision: 2638 http://gar.svn.sourceforge.net/gar/?rev=2638&view=rev Author: bdwalton Date: 2008-12-17 21:58:21 +0000 (Wed, 17 Dec 2008) Log Message: ----------- revert to SoS11 compiler, handle license file better Modified Paths: -------------- csw/mgar/pkg/xmlto/trunk/Makefile csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.gspec Removed Paths: ------------- csw/mgar/pkg/xmlto/trunk/files/GPL Modified: csw/mgar/pkg/xmlto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlto/trunk/Makefile 2008-12-17 19:09:49 UTC (rev 2637) +++ csw/mgar/pkg/xmlto/trunk/Makefile 2008-12-17 21:58:21 UTC (rev 2638) @@ -15,15 +15,13 @@ MASTER_SITES = https://fedorahosted.org/$(GARNAME)/export/1/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += $(call admfiles,CSWxmlto) GPL +DISTFILES += $(call admfiles,CSWxmlto) TEST_TARGET = check # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -GARCOMPILER = GNU - # this ssl site has a cert we don't recognize WGET_OPTS = --no-check-certificate @@ -38,8 +36,6 @@ CONFIGURE_ARGS += --with-bash=/opt/csw/bin/bash CONFIGURE_ARGS += --with-getopt=/opt/csw/bin/ggetopt -EXTRACT_TARGETS-global = $(call admfiles,CSWxmlto) GPL - include gar/category.mk # We need this for 'tail -n' @@ -48,5 +44,3 @@ #reset XML_CATALOG lookup (we rely on having packages that provide stylesheets #etc). Having xsltproc not find them during build makes us blow up!! XML_CATALOG_FILES = /opt/csw/etc/xml/catalog - - Modified: csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.gspec =================================================================== --- csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.gspec 2008-12-17 19:09:49 UTC (rev 2637) +++ csw/mgar/pkg/xmlto/trunk/files/CSWxmlto.gspec 2008-12-17 21:58:21 UTC (rev 2638) @@ -1,4 +1,4 @@ %var bitname xmlto %var pkgname CSWxmlto %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKDIR}/GPL +%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Deleted: csw/mgar/pkg/xmlto/trunk/files/GPL =================================================================== --- csw/mgar/pkg/xmlto/trunk/files/GPL 2008-12-17 19:09:49 UTC (rev 2637) +++ csw/mgar/pkg/xmlto/trunk/files/GPL 2008-12-17 21:58:21 UTC (rev 2638) @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU 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. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), 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 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 show them these terms so they know 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. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - 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 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 derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 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 License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -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. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary 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 - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 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 Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing 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 for copying, distributing or modifying -the Program or works based on it. - - 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. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. 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 this 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 -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. 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 - - 11. 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. - - 12. 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 - - 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 the public, 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 2 of the License, 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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) 19yy 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 is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 18 00:39:14 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 17 Dec 2008 23:39:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[2639] csw/mgar/gar Message-ID: Revision: 2639 http://gar.svn.sourceforge.net/gar/?rev=2639&view=rev Author: wbonnet Date: 2008-12-17 23:39:14 +0000 (Wed, 17 Dec 2008) Log Message: ----------- Add support for Sourceforge download page parsing Modified Paths: -------------- csw/mgar/gar/v1/bin/upstream_watch csw/mgar/gar/v1/gar.conf.mk csw/mgar/gar/v1/gar.lib.mk csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v1/bin/upstream_watch =================================================================== --- csw/mgar/gar/v1/bin/upstream_watch 2008-12-17 21:58:21 UTC (rev 2638) +++ csw/mgar/gar/v1/bin/upstream_watch 2008-12-17 23:39:14 UTC (rev 2639) @@ -108,11 +108,64 @@ return \@file_list; } +sub get_file_list_wget_sourceforge +{ + my $url = shift; + my @file_list; + + my $http_proxy_cmd = ""; + my $wget_command ="wget"; + my $filename = ""; + + # lftp doesn't seem to obey the _PROXY env variable + # we must manually set them + $http_proxy_cmd = "set http:proxy $ENV{HTTP_PROXY};" if exists $ENV{HTTP_PROXY}; + $http_proxy_cmd = "set http:proxy $ENV{http_proxy};" if exists $ENV{http_proxy}; + $wget_command = "$http_proxy_cmd ; wget --proxy=on" if exists $ENV{http_proxy_cmd}; + + open (my $FH, "$wget_command -qO- $url 2>/dev/null | grep class | grep selected | grep li | grep Download | "); + + if (my $line = <$FH>) { + my @cols = split (/"/, $line); + $filename = $cols[3]; + chomp ($filename); + } + else { + close ($FH); + return \@file_list; + } + + close ($FH); + + $url = "http://downloads.sourceforge.net" . $filename; + open ($FH, "$wget_command -qO- $url 2>/dev/null | grep $filename | grep package_id= | grep release_id | "); + + if (my $line = <$FH>) { + my @cols = split (/>/, $line); + my $filename = $cols[2]; + chomp ($filename); + @cols = split (/ \$help, + "s|use_sf=i" => \$use_sf, "u|url=s@" => \@urls); if ($help) { @@ -126,9 +179,14 @@ my $newest_version = 0; my $newest_file = ""; + my $file_list ; foreach my $url (@urls) { - my $file_list = get_file_list_lftp ($url); + if ($use_sf != 0) { + $file_list = get_file_list_wget_sourceforge ($url); + } else { + $file_list = get_file_list_lftp ($url); +} foreach my $file (@{$file_list}) { if ($file =~ /^$file_pattern$/) { Modified: csw/mgar/gar/v1/gar.conf.mk =================================================================== --- csw/mgar/gar/v1/gar.conf.mk 2008-12-17 21:58:21 UTC (rev 2638) +++ csw/mgar/gar/v1/gar.conf.mk 2008-12-17 23:39:14 UTC (rev 2639) @@ -233,6 +233,8 @@ SF_MIRRORS ?= http://downloads.sourceforge.net/$(SF_PROJ)/ # Keep this for compatibility SF_MIRROR = $(firstword $(SF_MIRRORS)) +SF_PROJECT_SHOWFILE ?= http://sourceforge.net/project/showfiles.php?group_id +UPSTREAM_USE_SF ?= 0 # GNU GNU_SITE = http://mirrors.kernel.org/ Modified: csw/mgar/gar/v1/gar.lib.mk =================================================================== --- csw/mgar/gar/v1/gar.lib.mk 2008-12-17 21:58:21 UTC (rev 2638) +++ csw/mgar/gar/v1/gar.lib.mk 2008-12-17 23:39:14 UTC (rev 2639) @@ -113,8 +113,9 @@ UPSTREAM_MASTER_SITES ?= $(MASTER_SITES) UW_ARGS = $(addprefix -u ,$(UPSTREAM_MASTER_SITES)) +SF_ARGS = $(addprefix -s ,$(UPSTREAM_USE_SF)) ifneq ($(UFILES_REGEX), "") - FILES2CHECK = $(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/upstream_watch $(UW_ARGS) $(addsuffix ',$(addprefix ',$(UFILES_REGEX)))) + FILES2CHECK = $(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/upstream_watch $(UW_ARGS) $(SF_ARGS) $(addsuffix ',$(addprefix ',$(UFILES_REGEX)))) else FILES2CHECK = "" endif @@ -130,7 +131,7 @@ else \ if echo $(DISTFILES) | grep -w $$FILE >/dev/null; then \ PACKAGE_UP_TO_DATE=1; \ - echo "$(GARNAME) : Package is up-to-date. Current version is $$FILE" ; \ + echo "$(GARNAME) : Package is up-to-date. Current version is $$FILE" ; \ else \ NEW_FILES="$$FILE $$NEW_FILES"; \ fi; \ @@ -138,8 +139,8 @@ $(MAKE) checknew-$$FILE >/dev/null; \ done; \ if test -z "$$NEW_FILES" ; then \ - if [ ! -n '$(UFILES_REGEX)' ]; then \ - echo "$(GARNAME) : Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \ + if [ ! -n '$(UFILES_REGEX)' ]; then \ + echo "$(GARNAME) : Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \ # { echo ""; \ # echo "Hello dear $(GARNAME) maintainer,"; \ # echo ""; \ @@ -149,37 +150,37 @@ # echo ""; \ # echo "--"; \ # echo "Kindest regards"; \ -# echo "The upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ +# echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ else \ - if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ + if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ echo "$(GARNAME) : Warning no files to check ! $(FILES2CHECK)" ; \ echo "$(GARNAME) : UPSTREAM_MASTER_SITES is $(UPSTREAM_MASTER_SITES)" ; \ echo "$(GARNAME) : DISTNAME is $(DISTNAME)" ; \ echo "$(GARNAME) : UFILES_REGEX is : $(UFILES_REGEX)" ; \ echo "$(GARNAME) : Please check configuration" ; \ - fi; \ - fi; \ - else \ + fi; \ + fi; \ + else \ echo "$(GARNAME) : new upstream files available: $$NEW_FILES"; \ - { echo ""; \ - echo "Hello dear $(GARNAME) maintainer,"; \ - echo ""; \ - echo "The upstream notification job has detected the availability of new files for $(GARNAME)."; \ - echo ""; \ - echo "The following upstream file(s):"; \ - echo " $$NEW_FILES"; \ - echo ""; \ - echo "is/are available at the following url(s):"; \ - echo " $(UPSTREAM_MASTER_SITES)"; \ - echo ""; \ - echo "Please consider updating your package." ; \ - echo ""; \ - echo "--"; \ - echo "Kindest regards"; \ - echo "The upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ - fi; \ + { echo ""; \ + echo "Hello dear $(GARNAME) maintainer,"; \ + echo ""; \ + echo "The upstream notification job has detected the availability of new files for $(GARNAME)."; \ + echo ""; \ + echo "The following upstream file(s):"; \ + echo " $$NEW_FILES"; \ + echo ""; \ + echo "is/are available at the following url(s):"; \ + echo " $(UPSTREAM_MASTER_SITES)"; \ + echo ""; \ + echo "Please consider updating your package." ; \ + echo ""; \ + echo "--"; \ + echo "Kindest regards"; \ + echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ + fi; \ fi - + check-upstream: @if [ -n '$(FILES2CHECK)' ]; then \ NEW_FILES=""; \ @@ -191,7 +192,7 @@ else \ if echo $(DISTFILES) | grep -w $$FILE >/dev/null; then \ PACKAGE_UP_TO_DATE=1; \ - echo "$(GARNAME) : Package is up-to-date. Current version is $$FILE" ; \ + echo "$(GARNAME) : Package is up-to-date. Current version is $$FILE" ; \ else \ NEW_FILES="$$FILE $$NEW_FILES"; \ fi; \ @@ -199,20 +200,20 @@ $(MAKE) checknew-$$FILE >/dev/null; \ done; \ if test -z "$$NEW_FILES" ; then \ - if [ ! -n '$(UFILES_REGEX)' ]; then \ - echo "$(GARNAME) : Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \ + if [ ! -n '$(UFILES_REGEX)' ]; then \ + echo "$(GARNAME) : Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \ else \ - if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ + if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ echo "$(GARNAME) : Warning no files to check ! $(FILES2CHECK)" ; \ echo "$(GARNAME) : UPSTREAM_MASTER_SITES is $(UPSTREAM_MASTER_SITES)" ; \ echo "$(GARNAME) : DISTNAME is $(DISTNAME)" ; \ echo "$(GARNAME) : UFILES_REGEX is : $(UFILES_REGEX)" ; \ echo "$(GARNAME) : Please check configuration" ; \ - fi; \ - fi; \ - else \ + fi; \ + fi; \ + else \ echo "$(GARNAME) : new upstream files available: $$NEW_FILES"; \ - fi; \ + fi; \ fi checknew-%: Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2008-12-17 21:58:21 UTC (rev 2638) +++ csw/mgar/gar/v2/gar.lib.mk 2008-12-17 23:39:14 UTC (rev 2639) @@ -111,8 +111,9 @@ UPSTREAM_MASTER_SITES ?= $(MASTER_SITES) UW_ARGS = $(addprefix -u ,$(UPSTREAM_MASTER_SITES)) +SF_ARGS = $(addprefix -s ,$(UPSTREAM_USE_SF)) ifneq ($(UFILES_REGEX), "") - FILES2CHECK = $(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/upstream_watch $(UW_ARGS) $(addsuffix ',$(addprefix ',$(UFILES_REGEX)))) + FILES2CHECK = $(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/upstream_watch $(UW_ARGS) $(SF_ARGS) $(addsuffix ',$(addprefix ',$(UFILES_REGEX)))) else FILES2CHECK = "" endif @@ -128,7 +129,7 @@ else \ if echo $(DISTFILES) | grep -w $$FILE >/dev/null; then \ PACKAGE_UP_TO_DATE=1; \ - echo "$(GARNAME) : Package is up-to-date. Current version is $$FILE" ; \ + echo "$(GARNAME) : Package is up-to-date. Current version is $$FILE" ; \ else \ NEW_FILES="$$FILE $$NEW_FILES"; \ fi; \ @@ -136,8 +137,8 @@ $(MAKE) checknew-$$FILE >/dev/null; \ done; \ if test -z "$$NEW_FILES" ; then \ - if [ ! -n '$(UFILES_REGEX)' ]; then \ - echo "$(GARNAME) : Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \ + if [ ! -n '$(UFILES_REGEX)' ]; then \ + echo "$(GARNAME) : Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \ # { echo ""; \ # echo "Hello dear $(GARNAME) maintainer,"; \ # echo ""; \ @@ -149,33 +150,33 @@ # echo "Kindest regards"; \ # echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ else \ - if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ + if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ echo "$(GARNAME) : Warning no files to check ! $(FILES2CHECK)" ; \ echo "$(GARNAME) : UPSTREAM_MASTER_SITES is $(UPSTREAM_MASTER_SITES)" ; \ echo "$(GARNAME) : DISTNAME is $(DISTNAME)" ; \ echo "$(GARNAME) : UFILES_REGEX is : $(UFILES_REGEX)" ; \ echo "$(GARNAME) : Please check configuration" ; \ - fi; \ - fi; \ - else \ + fi; \ + fi; \ + else \ echo "$(GARNAME) : new upstream files available: $$NEW_FILES"; \ - { echo ""; \ - echo "Hello dear $(GARNAME) maintainer,"; \ - echo ""; \ - echo "The upstream notification job has detected the availability of new files for $(GARNAME)."; \ - echo ""; \ - echo "The following upstream file(s):"; \ - echo " $$NEW_FILES"; \ - echo ""; \ - echo "is/are available at the following url(s):"; \ - echo " $(UPSTREAM_MASTER_SITES)"; \ - echo ""; \ - echo "Please consider updating your package." ; \ - echo ""; \ - echo "--"; \ - echo "Kindest regards"; \ - echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ - fi; \ + { echo ""; \ + echo "Hello dear $(GARNAME) maintainer,"; \ + echo ""; \ + echo "The upstream notification job has detected the availability of new files for $(GARNAME)."; \ + echo ""; \ + echo "The following upstream file(s):"; \ + echo " $$NEW_FILES"; \ + echo ""; \ + echo "is/are available at the following url(s):"; \ + echo " $(UPSTREAM_MASTER_SITES)"; \ + echo ""; \ + echo "Please consider updating your package." ; \ + echo ""; \ + echo "--"; \ + echo "Kindest regards"; \ + echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ + fi; \ fi check-upstream: @@ -189,7 +190,7 @@ else \ if echo $(DISTFILES) | grep -w $$FILE >/dev/null; then \ PACKAGE_UP_TO_DATE=1; \ - echo "$(GARNAME) : Package is up-to-date. Current version is $$FILE" ; \ + echo "$(GARNAME) : Package is up-to-date. Current version is $$FILE" ; \ else \ NEW_FILES="$$FILE $$NEW_FILES"; \ fi; \ @@ -197,20 +198,20 @@ $(MAKE) checknew-$$FILE >/dev/null; \ done; \ if test -z "$$NEW_FILES" ; then \ - if [ ! -n '$(UFILES_REGEX)' ]; then \ - echo "$(GARNAME) : Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \ + if [ ! -n '$(UFILES_REGEX)' ]; then \ + echo "$(GARNAME) : Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \ else \ - if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ + if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ echo "$(GARNAME) : Warning no files to check ! $(FILES2CHECK)" ; \ echo "$(GARNAME) : UPSTREAM_MASTER_SITES is $(UPSTREAM_MASTER_SITES)" ; \ echo "$(GARNAME) : DISTNAME is $(DISTNAME)" ; \ echo "$(GARNAME) : UFILES_REGEX is : $(UFILES_REGEX)" ; \ echo "$(GARNAME) : Please check configuration" ; \ - fi; \ - fi; \ - else \ + fi; \ + fi; \ + else \ echo "$(GARNAME) : new upstream files available: $$NEW_FILES"; \ - fi; \ + fi; \ fi checknew-%: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 18 00:40:05 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 17 Dec 2008 23:40:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[2640] csw/mgar/gar Message-ID: Revision: 2640 http://gar.svn.sourceforge.net/gar/?rev=2640&view=rev Author: wbonnet Date: 2008-12-17 23:40:05 +0000 (Wed, 17 Dec 2008) Log Message: ----------- Port to upstream_watch v2 SF download page support Modified Paths: -------------- csw/mgar/gar/v1/bin/upstream_watch csw/mgar/gar/v2/bin/upstream_watch Modified: csw/mgar/gar/v1/bin/upstream_watch =================================================================== --- csw/mgar/gar/v1/bin/upstream_watch 2008-12-17 23:39:14 UTC (rev 2639) +++ csw/mgar/gar/v1/bin/upstream_watch 2008-12-17 23:40:05 UTC (rev 2640) @@ -186,7 +186,7 @@ $file_list = get_file_list_wget_sourceforge ($url); } else { $file_list = get_file_list_lftp ($url); -} + } foreach my $file (@{$file_list}) { if ($file =~ /^$file_pattern$/) { Modified: csw/mgar/gar/v2/bin/upstream_watch =================================================================== --- csw/mgar/gar/v2/bin/upstream_watch 2008-12-17 23:39:14 UTC (rev 2639) +++ csw/mgar/gar/v2/bin/upstream_watch 2008-12-17 23:40:05 UTC (rev 2640) @@ -108,11 +108,64 @@ return \@file_list; } +sub get_file_list_wget_sourceforge +{ + my $url = shift; + my @file_list; + + my $http_proxy_cmd = ""; + my $wget_command ="wget"; + my $filename = ""; + + # lftp doesn't seem to obey the _PROXY env variable + # we must manually set them + $http_proxy_cmd = "set http:proxy $ENV{HTTP_PROXY};" if exists $ENV{HTTP_PROXY}; + $http_proxy_cmd = "set http:proxy $ENV{http_proxy};" if exists $ENV{http_proxy}; + $wget_command = "$http_proxy_cmd ; wget --proxy=on" if exists $ENV{http_proxy_cmd}; + + open (my $FH, "$wget_command -qO- $url 2>/dev/null | grep class | grep selected | grep li | grep Download | "); + + if (my $line = <$FH>) { + my @cols = split (/"/, $line); + $filename = $cols[3]; + chomp ($filename); + } + else { + close ($FH); + return \@file_list; + } + + close ($FH); + + $url = "http://downloads.sourceforge.net" . $filename; + open ($FH, "$wget_command -qO- $url 2>/dev/null | grep $filename | grep package_id= | grep release_id | "); + + if (my $line = <$FH>) { + my @cols = split (/>/, $line); + my $filename = $cols[2]; + chomp ($filename); + @cols = split (/ \$help, + "s|use_sf=i" => \$use_sf, "u|url=s@" => \@urls); if ($help) { @@ -126,9 +179,14 @@ my $newest_version = 0; my $newest_file = ""; + my $file_list ; foreach my $url (@urls) { - my $file_list = get_file_list_lftp ($url); + if ($use_sf != 0) { + $file_list = get_file_list_wget_sourceforge ($url); + } else { + $file_list = get_file_list_lftp ($url); + } foreach my $file (@{$file_list}) { if ($file =~ /^$file_pattern$/) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 18 00:41:08 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 17 Dec 2008 23:41:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[2641] csw/mgar/pkg/slrn/trunk/Makefile Message-ID: Revision: 2641 http://gar.svn.sourceforge.net/gar/?rev=2641&view=rev Author: wbonnet Date: 2008-12-17 23:41:08 +0000 (Wed, 17 Dec 2008) Log Message: ----------- Fix URL and regexp for uwatch Modified Paths: -------------- csw/mgar/pkg/slrn/trunk/Makefile Modified: csw/mgar/pkg/slrn/trunk/Makefile =================================================================== --- csw/mgar/pkg/slrn/trunk/Makefile 2008-12-17 23:40:05 UTC (rev 2640) +++ csw/mgar/pkg/slrn/trunk/Makefile 2008-12-17 23:41:08 UTC (rev 2641) @@ -19,7 +19,9 @@ DISTFILES += $(call admfiles,CSWslrn,prototype depend) # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=7768 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = $(GARNAME)-((\d+(?:\.\d+)*)(p\d+)?) LD_OPTIONS = -R/opt/csw/lib/\$$ISALIST -R/opt/csw/lib This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 18 00:48:53 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 17 Dec 2008 23:48:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[2642] csw/mgar/pkg/asciidoc/trunk/Makefile Message-ID: Revision: 2642 http://gar.svn.sourceforge.net/gar/?rev=2642&view=rev Author: wbonnet Date: 2008-12-17 23:48:53 +0000 (Wed, 17 Dec 2008) Log Message: ----------- Fix UFILE_REGEX Modified Paths: -------------- csw/mgar/pkg/asciidoc/trunk/Makefile Modified: csw/mgar/pkg/asciidoc/trunk/Makefile =================================================================== --- csw/mgar/pkg/asciidoc/trunk/Makefile 2008-12-17 23:41:08 UTC (rev 2641) +++ csw/mgar/pkg/asciidoc/trunk/Makefile 2008-12-17 23:48:53 UTC (rev 2642) @@ -23,7 +23,9 @@ PREREQUISITE_PKGS = CSWautoconf # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=67797 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = (\d+(?:\.\d+)*) CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 18 00:50:55 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 17 Dec 2008 23:50:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[2643] csw/mgar/pkg/avantfax/trunk Message-ID: Revision: 2643 http://gar.svn.sourceforge.net/gar/?rev=2643&view=rev Author: wbonnet Date: 2008-12-17 23:50:55 +0000 (Wed, 17 Dec 2008) Log Message: ----------- Fix UFILE_REGEX Delete cookies directory from svn Modified Paths: -------------- csw/mgar/pkg/avantfax/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/avantfax/trunk/cookies/ Modified: csw/mgar/pkg/avantfax/trunk/Makefile =================================================================== --- csw/mgar/pkg/avantfax/trunk/Makefile 2008-12-17 23:48:53 UTC (rev 2642) +++ csw/mgar/pkg/avantfax/trunk/Makefile 2008-12-17 23:50:55 UTC (rev 2643) @@ -17,7 +17,9 @@ DISTFILES += $(call admfiles,CSWavantfax,depend preinstall postinstall) # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=160107 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = (\d+(?:\.\d+)*) CONFIGURE_SCRIPTS = BUILD_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 18 00:52:39 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 17 Dec 2008 23:52:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[2644] csw/mgar/pkg/boost/trunk/Makefile Message-ID: Revision: 2644 http://gar.svn.sourceforge.net/gar/?rev=2644&view=rev Author: wbonnet Date: 2008-12-17 23:52:39 +0000 (Wed, 17 Dec 2008) Log Message: ----------- Fix UFILE_REGEX Modified Paths: -------------- csw/mgar/pkg/boost/trunk/Makefile Modified: csw/mgar/pkg/boost/trunk/Makefile =================================================================== --- csw/mgar/pkg/boost/trunk/Makefile 2008-12-17 23:50:55 UTC (rev 2643) +++ csw/mgar/pkg/boost/trunk/Makefile 2008-12-17 23:52:39 UTC (rev 2644) @@ -21,7 +21,9 @@ DISTFILES += CSWboost.gspec # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=7586 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = (\d+(?:\.\d+)*) WORKSRC = $(WORKDIR)/$(GARNAME)_$(DISTVERSION) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 18 00:54:28 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 17 Dec 2008 23:54:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[2645] csw/mgar/pkg/clusterit/trunk/Makefile Message-ID: Revision: 2645 http://gar.svn.sourceforge.net/gar/?rev=2645&view=rev Author: wbonnet Date: 2008-12-17 23:54:28 +0000 (Wed, 17 Dec 2008) Log Message: ----------- Fix UFILE_REGEX Modified Paths: -------------- csw/mgar/pkg/clusterit/trunk/Makefile Modified: csw/mgar/pkg/clusterit/trunk/Makefile =================================================================== --- csw/mgar/pkg/clusterit/trunk/Makefile 2008-12-17 23:52:39 UTC (rev 2644) +++ csw/mgar/pkg/clusterit/trunk/Makefile 2008-12-17 23:54:28 UTC (rev 2645) @@ -13,7 +13,9 @@ DISTFILES += $(call admfiles,CSWclusterit,) # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=154528 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*) PREFIX = /opt/csw/$(GARNAME) CONFIGURE_ARGS = --prefix=$(PREFIX) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 18 00:55:34 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 17 Dec 2008 23:55:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[2646] csw/mgar/pkg/clusterssh/trunk/Makefile Message-ID: Revision: 2646 http://gar.svn.sourceforge.net/gar/?rev=2646&view=rev Author: wbonnet Date: 2008-12-17 23:55:34 +0000 (Wed, 17 Dec 2008) Log Message: ----------- Fix UFILE_REGEX Modified Paths: -------------- csw/mgar/pkg/clusterssh/trunk/Makefile Modified: csw/mgar/pkg/clusterssh/trunk/Makefile =================================================================== --- csw/mgar/pkg/clusterssh/trunk/Makefile 2008-12-17 23:54:28 UTC (rev 2645) +++ csw/mgar/pkg/clusterssh/trunk/Makefile 2008-12-17 23:55:34 UTC (rev 2646) @@ -13,7 +13,9 @@ DISTFILES += $(call admfiles,CSWclusterssh,) # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=89139 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = (\d+(?:\.\d+)*) PREFIX = /opt/csw/ CONFIGURE_ARGS = --prefix=$(PREFIX) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 18 00:56:46 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 17 Dec 2008 23:56:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[2647] csw/mgar/pkg/ctags/trunk/Makefile Message-ID: Revision: 2647 http://gar.svn.sourceforge.net/gar/?rev=2647&view=rev Author: wbonnet Date: 2008-12-17 23:56:46 +0000 (Wed, 17 Dec 2008) Log Message: ----------- Fix UFILE_REGEX Modified Paths: -------------- csw/mgar/pkg/ctags/trunk/Makefile Modified: csw/mgar/pkg/ctags/trunk/Makefile =================================================================== --- csw/mgar/pkg/ctags/trunk/Makefile 2008-12-17 23:55:34 UTC (rev 2646) +++ csw/mgar/pkg/ctags/trunk/Makefile 2008-12-17 23:56:46 UTC (rev 2647) @@ -16,7 +16,9 @@ DISTFILES += CSWctags.gspec CSWctags.prototype # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=6556 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = (\d+(?:\.\d+)*) # Respect DESTDIR PATCHFILES += install.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 18 00:58:36 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 17 Dec 2008 23:58:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[2648] csw/mgar/pkg/easytag/trunk/Makefile Message-ID: Revision: 2648 http://gar.svn.sourceforge.net/gar/?rev=2648&view=rev Author: wbonnet Date: 2008-12-17 23:58:36 +0000 (Wed, 17 Dec 2008) Log Message: ----------- Fix UFILE_REGEX Modified Paths: -------------- csw/mgar/pkg/easytag/trunk/Makefile Modified: csw/mgar/pkg/easytag/trunk/Makefile =================================================================== --- csw/mgar/pkg/easytag/trunk/Makefile 2008-12-17 23:56:46 UTC (rev 2647) +++ csw/mgar/pkg/easytag/trunk/Makefile 2008-12-17 23:58:36 UTC (rev 2648) @@ -12,7 +12,9 @@ DISTFILES += $(call admfiles,CSWeasytag,depend) # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=5216 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = (\d+(?:\.\d+)*) GARCOMPILER = GNU This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 18 01:02:12 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 18 Dec 2008 00:02:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[2649] csw/mgar/gar Message-ID: Revision: 2649 http://gar.svn.sourceforge.net/gar/?rev=2649&view=rev Author: wbonnet Date: 2008-12-18 00:02:12 +0000 (Thu, 18 Dec 2008) Log Message: ----------- Fix loop when parsing file version in sf download page Modified Paths: -------------- csw/mgar/gar/v1/bin/upstream_watch csw/mgar/gar/v2/bin/upstream_watch Modified: csw/mgar/gar/v1/bin/upstream_watch =================================================================== --- csw/mgar/gar/v1/bin/upstream_watch 2008-12-17 23:58:36 UTC (rev 2648) +++ csw/mgar/gar/v1/bin/upstream_watch 2008-12-18 00:02:12 UTC (rev 2649) @@ -140,7 +140,7 @@ $url = "http://downloads.sourceforge.net" . $filename; open ($FH, "$wget_command -qO- $url 2>/dev/null | grep $filename | grep package_id= | grep release_id | "); - if (my $line = <$FH>) { + while (my $line = <$FH>) { my @cols = split (/>/, $line); my $filename = $cols[2]; chomp ($filename); @@ -149,10 +149,6 @@ chomp ($filename); push (@file_list, $filename); } - else { - close ($FH); - return \@file_list; - } close ($FH); @@ -186,7 +182,7 @@ $file_list = get_file_list_wget_sourceforge ($url); } else { $file_list = get_file_list_lftp ($url); - } + } foreach my $file (@{$file_list}) { if ($file =~ /^$file_pattern$/) { Modified: csw/mgar/gar/v2/bin/upstream_watch =================================================================== --- csw/mgar/gar/v2/bin/upstream_watch 2008-12-17 23:58:36 UTC (rev 2648) +++ csw/mgar/gar/v2/bin/upstream_watch 2008-12-18 00:02:12 UTC (rev 2649) @@ -140,7 +140,7 @@ $url = "http://downloads.sourceforge.net" . $filename; open ($FH, "$wget_command -qO- $url 2>/dev/null | grep $filename | grep package_id= | grep release_id | "); - if (my $line = <$FH>) { + while (my $line = <$FH>) { my @cols = split (/>/, $line); my $filename = $cols[2]; chomp ($filename); @@ -149,10 +149,6 @@ chomp ($filename); push (@file_list, $filename); } - else { - close ($FH); - return \@file_list; - } close ($FH); @@ -186,7 +182,7 @@ $file_list = get_file_list_wget_sourceforge ($url); } else { $file_list = get_file_list_lftp ($url); - } + } foreach my $file (@{$file_list}) { if ($file =~ /^$file_pattern$/) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 18 01:03:41 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 18 Dec 2008 00:03:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[2650] csw/mgar/pkg Message-ID: Revision: 2650 http://gar.svn.sourceforge.net/gar/?rev=2650&view=rev Author: wbonnet Date: 2008-12-18 00:03:41 +0000 (Thu, 18 Dec 2008) Log Message: ----------- Fix some UFILEREGEX Modified Paths: -------------- csw/mgar/pkg/x11/libXau/trunk/Makefile csw/mgar/pkg/zsh/trunk/Makefile Modified: csw/mgar/pkg/x11/libXau/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libXau/trunk/Makefile 2008-12-18 00:02:12 UTC (rev 2649) +++ csw/mgar/pkg/x11/libXau/trunk/Makefile 2008-12-18 00:03:41 UTC (rev 2650) @@ -18,22 +18,7 @@ DISTFILES += CSWlibXaudev.gspec CSWlibXaudev.prototype CSWlibXaudev.depend # DISTFILES += $(call admfiles,CSWlibXau, depend) -CFLAGS += -xlibmil -errtags=yes -erroff=E_EMPTY_DECLARATION -CXXFLAGS += -xlibmil -xlibmopt -features=tmplife -norunpath -LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib -export CFLAGS CXXFLAGS LDFLAGS - -TEST_SCRIPTS = none - -GREP = ggrep - include gar/category.mk -CONFIGURE_ARGS = --prefix=/opt/csw --mandir=/opt/csw/share/man -test-none: - @$(MAKECOOKIE) - -post-install: - ( gfind $(DESTDIR)/opt/csw -exec bash -c "file {} | ggrep ELF | ggrep -e 'executable' -e 'dynamic lib' | ggrep 'not stripped' && strip {}" \; ) Modified: csw/mgar/pkg/zsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/zsh/trunk/Makefile 2008-12-18 00:02:12 UTC (rev 2649) +++ csw/mgar/pkg/zsh/trunk/Makefile 2008-12-18 00:03:41 UTC (rev 2650) @@ -14,7 +14,9 @@ DISTFILES += $(call admfiles,CSWzsh,depend postinstall postremove) # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +UPSTREAM_MASTER_SITES = http://sourceforge.net/project/showfiles.php?group_id=4068 +#UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +UFILES_REGEX = (\d+(?:\.\d+)*) CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-maildir-support 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 Dec 18 02:24:49 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 18 Dec 2008 01:24:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[2651] csw/mgar/pkg/git/trunk Message-ID: Revision: 2651 http://gar.svn.sourceforge.net/gar/?rev=2651&view=rev Author: bdwalton Date: 2008-12-18 01:24:49 +0000 (Thu, 18 Dec 2008) Log Message: ----------- - Reorged the package split (somewhat...and not fully tested) - Build depend on pm_subversion now (so we can do git_svn) - Actually install documentation - Enable the git emacs contrib extra. Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile csw/mgar/pkg/git/trunk/checksums Added Paths: ----------- csw/mgar/pkg/git/trunk/files/CSWgitemacs.gspec Removed Paths: ------------- csw/mgar/pkg/git/trunk/files/CSWpmgit.gspec Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2008-12-18 00:03:41 UTC (rev 2650) +++ csw/mgar/pkg/git/trunk/Makefile 2008-12-18 01:24:49 UTC (rev 2651) @@ -3,12 +3,18 @@ CATEGORIES = devel PREREQUISITE_PKGS = CSWasciidoc CSWossldevel CSWxmlto CSWbash CSWcurl -PREREQUISITE_PKGS += CSWgsed CSWgnulinks CSWperl CSWtcl CSWtk +PREREQUISITE_PKGS += CSWgsed CSWgnulinks CSWperl CSWtcl CSWtk CSWexpat +PREREQUISITE_PKGS += CSWzlib CSWpmerror CSWpmsvn -REQUIRED_PKGS_CSWgit = CSWzlib CSWperl CSWrsync CSWcurl CSWosslrt CSWpmgit +REQUIRED_PKGS_CSWgit = CSWzlib CSWperl CSWrsync CSWcurlrt CSWosslrt +REQUIRED_PKGS_CSWgit += CSWossh CSWiconv CSWexpat CSWbash + REQUIRED_PKGS_CSWgitk = CSWgit CSWtk + REQUIRED_PKGS_CSWgitgui = CSWgit CSWtk +REQUIRED_PKGS_CSWgitdoc = CSWgit + DESCRIPTION = Fast Version Control System define BLURB Git is a popular version control system designed to handle @@ -18,36 +24,39 @@ MASTER_SITES = http://kernel.org/pub/software/scm/$(GARNAME)/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += $(call admfiles,CSWgit,) -DISTFILES += $(call admfiles,CSWgitdoc,) -DISTFILES += $(call admfiles,CSWpmgit,) DISTFILES += $(call admfiles,CSWgitgui,) DISTFILES += $(call admfiles,CSWgitk,) +DISTFILES += $(call admfiles,CSWgitemacs,) +DISTFILES += $(call admfiles,CSWgitdoc,) +DISTFILES += $(call admfiles,CSWgit,) PATCHFILES = doc-makefile.patch + PKGFILES_CSWgitgui = $(bindir)/git-gui $(bindir)/git-citool \ $(mandir)/man1/git-gui.* $(mandir)/man1/git-citool.* \ $(datadir)/git-gui/.* $(datadir)/doc/git-gui.* PKGFILES_CSWgitk = $(bindir)/gitk $(datadir)/doc/gitk.* $(datadir)/gitk.* \ $(mandir)/man1/gitk.* +PKGFILES_CSWgitemacs = $(datadir)/emacs/.* PKGFILES_CSWgitdoc = $(datadir)/doc/.* -PKGFILES_CSWpmgit = - # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 GARCOMPILER = GNU -CONFIGURE_ARGS = $(DIRPATHS) --with-shell=/opt/csw/bin/bash -CONFIGURE_ARGS += --with-perl=/opt/csw/bin/perl -CONFIGURE_ARGS += --with-tcltk=/opt/csw/bin/tclsh -CONFIGURE_ARGS += --with-zlib=/opt/csw +CONFIGURE_ARGS = $(DIRPATHS) --with-shell=$(bindir)/bash +CONFIGURE_ARGS += --with-perl=$(bindir)/perl +CONFIGURE_ARGS += --with-tcltk=$(bindir)/tclsh +CONFIGURE_ARGS += --with-zlib=$(prefix) +CONFIGURE_ARGS += --with-iconv=$(prefix) -BUILD_ARGS = MSGFMT=gmsgfmt SHELL_PATH=/opt/csw/bin/bash all doc +BUILD_ARGS = MSGFMT=gmsgfmt SHELL_PATH=/opt/csw/bin/bash \ + ETC_CONFIG=$(sysconfdir)/gitconfig \ + all doc -INSTALL_ARGS = install install-doc +INSTALL_ARGS = ETC_CONFIG=$(sysconfdir)/gitconfig install-doc include gar/category.mk @@ -55,8 +64,24 @@ # gnu must come first so xpg4/sed isn't found first. PATH := /opt/csw/gnu:/usr/xpg4/bin:$(PATH) +# force the elisp extension to be built too. +post-build-modulated: + @echo Builing Emacs Git extension + @( cd $(WORKSRC); $(MAKE) -C contrib/emacs ) + +post-install-modulated: GD=$(DESTDIR)/$(datadir)/doc/$(GARNAME)-$(GARVERSION) post-install-modulated: @echo Removing perllocal.pod - @rm -f ${DESTDIR}/opt/csw/lib/perl/5.8.8/perllocal.pod* + @rm -f ${DESTDIR}/$(perllib)/5.8.8/perllocal.pod* @chmod 644 ${DESTDIR}/${libdir}/perl5/site_perl/*pm + @echo Installing Emacs Git extension + @( cd $(WORKSRC); $(MAKE) -C contrib/emacs install \ + emacsdir=$(DESTDIR)/$(datadir)/emacs/site-lisp ) + @echo Installing Documentation + @( cd $(WORKSRC); \ + ginstall -c -m 0755 -d $(GD); \ + cp -R Documentation/*.txt $(GD)/; \ + cp -R contrib/hooks README COPYING $(GD)/; \ + cp -R Documentation/*.html Documentation/docbook-xsl.css $(GD)/; \ + cp -R Documentation/howto Documentation/technical $(GD)/; ) @$(MAKECOOKIE) Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2008-12-18 00:03:41 UTC (rev 2650) +++ csw/mgar/pkg/git/trunk/checksums 2008-12-18 01:24:49 UTC (rev 2651) @@ -1,7 +1,7 @@ 899172ebeac65f7a09a8e204d4f87d8c download/git-1.6.0.5.tar.bz2 -57d2c46660773d3a1e87651447e3252a download/CSWgit.gspec -5c5f3cd7951602129a5283c0c242ed3d download/CSWgitdoc.gspec -9ca606aeacf21b081e425a539b848567 download/CSWpmgit.gspec c5210335743e17938bde6f922891b02a download/CSWgitgui.gspec 82bc03b73b73a6f4b251992a1c671aab download/CSWgitk.gspec +9cac3cac85cac148c423d18d8b40d9ee download/CSWgitemacs.gspec +5c5f3cd7951602129a5283c0c242ed3d download/CSWgitdoc.gspec +57d2c46660773d3a1e87651447e3252a download/CSWgit.gspec 369547e8222dcf8be214b5013f28afcc download/doc-makefile.patch Added: csw/mgar/pkg/git/trunk/files/CSWgitemacs.gspec =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgitemacs.gspec (rev 0) +++ csw/mgar/pkg/git/trunk/files/CSWgitemacs.gspec 2008-12-18 01:24:49 UTC (rev 2651) @@ -0,0 +1,5 @@ +%var bitname gitemacs +%var pkgname CSWgitemacs +%var desc A Git VCS mode for Emacs +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Deleted: csw/mgar/pkg/git/trunk/files/CSWpmgit.gspec =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWpmgit.gspec 2008-12-18 00:03:41 UTC (rev 2650) +++ csw/mgar/pkg/git/trunk/files/CSWpmgit.gspec 2008-12-18 01:24:49 UTC (rev 2651) @@ -1,5 +0,0 @@ -%var bitname pm_git -%var pkgname CSWpmgit -%var desc Perl interface to Git -%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 bdwalton at users.sourceforge.net Thu Dec 18 03:13:58 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 18 Dec 2008 02:13:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[2652] csw/mgar/pkg/git/trunk Message-ID: Revision: 2652 http://gar.svn.sourceforge.net/gar/?rev=2652&view=rev Author: bdwalton Date: 2008-12-18 02:13:58 +0000 (Thu, 18 Dec 2008) Log Message: ----------- - More package splitting. - Cleaned up old package file regexes. - Still get (according to `make package` output) lib dependencies on SUNW expat and apache2...? Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile csw/mgar/pkg/git/trunk/checksums csw/mgar/pkg/git/trunk/files/CSWgitemacs.gspec csw/mgar/pkg/git/trunk/files/CSWgitgui.gspec Added Paths: ----------- csw/mgar/pkg/git/trunk/files/CSWgitcvs.gspec csw/mgar/pkg/git/trunk/files/CSWgitsvn.gspec Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2008-12-18 01:24:49 UTC (rev 2651) +++ csw/mgar/pkg/git/trunk/Makefile 2008-12-18 02:13:58 UTC (rev 2652) @@ -13,6 +13,10 @@ REQUIRED_PKGS_CSWgitgui = CSWgit CSWtk +REQUIRED_PKGS_CSWgitsvn = CSWgit CSWpmsvn + +REQUIRED_PKGS_CSWgitcvs = CSWgit CSWcvs + REQUIRED_PKGS_CSWgitdoc = CSWgit DESCRIPTION = Fast Version Control System @@ -28,15 +32,22 @@ DISTFILES += $(call admfiles,CSWgitk,) DISTFILES += $(call admfiles,CSWgitemacs,) DISTFILES += $(call admfiles,CSWgitdoc,) +DISTFILES += $(call admfiles,CSWgitsvn,) +DISTFILES += $(call admfiles,CSWgitcvs,) DISTFILES += $(call admfiles,CSWgit,) PATCHFILES = doc-makefile.patch - -PKGFILES_CSWgitgui = $(bindir)/git-gui $(bindir)/git-citool \ +PKGFILES_CSWgitsvn = $(libexecdir)/git-core/*svn $(datadir)/doc/.*svn.* \ + $(mandir)/man1/.*svn.* +PKGFILES_CSWgitcvs = $(libexecdir)/git-core/.*cvs.* $(datadir)/doc/.*cvs.* \ + $(mandir)/man1/.*cvs.* $(mandir)/man7/.*cvs.* \ + ($bindir)/.*cvs.* +PKGFILES_CSWgitgui = $(bindir)/git-gui \ $(mandir)/man1/git-gui.* $(mandir)/man1/git-citool.* \ - $(datadir)/git-gui/.* $(datadir)/doc/git-gui.* -PKGFILES_CSWgitk = $(bindir)/gitk $(datadir)/doc/gitk.* $(datadir)/gitk.* \ + $(datadir)/git-gui/.* $(datadir)/doc/.*git-gui.* \ + $(libexecdir)/git-core/git-gui.* +PKGFILES_CSWgitk = $(bindir)/gitk $(datadir)/doc/.*gitk.* $(datadir)/gitk.* \ $(mandir)/man1/gitk.* PKGFILES_CSWgitemacs = $(datadir)/emacs/.* PKGFILES_CSWgitdoc = $(datadir)/doc/.* @@ -71,9 +82,10 @@ post-install-modulated: GD=$(DESTDIR)/$(datadir)/doc/$(GARNAME)-$(GARVERSION) post-install-modulated: - @echo Removing perllocal.pod - @rm -f ${DESTDIR}/$(perllib)/5.8.8/perllocal.pod* - @chmod 644 ${DESTDIR}/${libdir}/perl5/site_perl/*pm + @echo Cleaning up perl stuff + @rm -rf $(DESTDIR)/$(libdir)/perl5/site_perl/5* + @rm -rf $(DESTDIR)/$(perllib)/ + @chmod 644 $(DESTDIR)/$(libdir)/perl5/site_perl/*pm @echo Installing Emacs Git extension @( cd $(WORKSRC); $(MAKE) -C contrib/emacs install \ emacsdir=$(DESTDIR)/$(datadir)/emacs/site-lisp ) Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2008-12-18 01:24:49 UTC (rev 2651) +++ csw/mgar/pkg/git/trunk/checksums 2008-12-18 02:13:58 UTC (rev 2652) @@ -1,7 +1,9 @@ 899172ebeac65f7a09a8e204d4f87d8c download/git-1.6.0.5.tar.bz2 -c5210335743e17938bde6f922891b02a download/CSWgitgui.gspec +61bd2360757ef9eb527763fb0947b4d8 download/CSWgitgui.gspec 82bc03b73b73a6f4b251992a1c671aab download/CSWgitk.gspec -9cac3cac85cac148c423d18d8b40d9ee download/CSWgitemacs.gspec +721e03b218e0e5116372b971838fcd31 download/CSWgitemacs.gspec 5c5f3cd7951602129a5283c0c242ed3d download/CSWgitdoc.gspec +20e88773629b851f5b986fa75f104813 download/CSWgitsvn.gspec +88464ba7e12561d3eb53e729c5a9600c download/CSWgitcvs.gspec 57d2c46660773d3a1e87651447e3252a download/CSWgit.gspec 369547e8222dcf8be214b5013f28afcc download/doc-makefile.patch Added: csw/mgar/pkg/git/trunk/files/CSWgitcvs.gspec =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgitcvs.gspec (rev 0) +++ csw/mgar/pkg/git/trunk/files/CSWgitcvs.gspec 2008-12-18 02:13:58 UTC (rev 2652) @@ -0,0 +1,5 @@ +%var bitname git_cvs +%var pkgname CSWgitcvs +%var desc Git tools for working with CVS repositories +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Modified: csw/mgar/pkg/git/trunk/files/CSWgitemacs.gspec =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgitemacs.gspec 2008-12-18 01:24:49 UTC (rev 2651) +++ csw/mgar/pkg/git/trunk/files/CSWgitemacs.gspec 2008-12-18 02:13:58 UTC (rev 2652) @@ -1,4 +1,4 @@ -%var bitname gitemacs +%var bitname git_emacs %var pkgname CSWgitemacs %var desc A Git VCS mode for Emacs %include url file://%{PKGLIB}/csw_dyndepend.gspec Modified: csw/mgar/pkg/git/trunk/files/CSWgitgui.gspec =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgitgui.gspec 2008-12-18 01:24:49 UTC (rev 2651) +++ csw/mgar/pkg/git/trunk/files/CSWgitgui.gspec 2008-12-18 02:13:58 UTC (rev 2652) @@ -1,4 +1,4 @@ -%var bitname gitgui +%var bitname git_gui %var pkgname CSWgitgui %var desc Git GUI tool %include url file://%{PKGLIB}/csw_dyndepend.gspec Added: csw/mgar/pkg/git/trunk/files/CSWgitsvn.gspec =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgitsvn.gspec (rev 0) +++ csw/mgar/pkg/git/trunk/files/CSWgitsvn.gspec 2008-12-18 02:13:58 UTC (rev 2652) @@ -0,0 +1,5 @@ +%var bitname git_svn +%var pkgname CSWgitsvn +%var desc Git tools for working with Subversion repositories +%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 bonivart at users.sourceforge.net Thu Dec 18 10:00:50 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 18 Dec 2008 09:00:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[2653] csw/mgar/pkg/cpan/Module-Load-Conditional/trunk Message-ID: Revision: 2653 http://gar.svn.sourceforge.net/gar/?rev=2653&view=rev Author: bonivart Date: 2008-12-18 09:00:50 +0000 (Thu, 18 Dec 2008) Log Message: ----------- Module-Load-Conditional: update to 0.28 Modified Paths: -------------- csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/checksums Modified: csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile 2008-12-18 02:13:58 UTC (rev 2652) +++ csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile 2008-12-18 09:00:50 UTC (rev 2653) @@ -1,5 +1,5 @@ GARNAME = Module-Load-Conditional -GARVERSION = 0.26 +GARVERSION = 0.28 CATEGORIES = cpan AUTHOR = KANE Modified: csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/checksums 2008-12-18 02:13:58 UTC (rev 2652) +++ csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/checksums 2008-12-18 09:00:50 UTC (rev 2653) @@ -1,2 +1,2 @@ e912706042be78943b1af9a349378bbd download/CSWpmmodloadcond.gspec -cc80e455e996fa2fbd6933283c3947ef download/Module-Load-Conditional-0.26.tar.gz +e4924b9903482aa88a1240cea9760aa8 download/Module-Load-Conditional-0.28.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Dec 18 10:27:24 2008 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 18 Dec 2008 09:27:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[2654] csw/mgar/pkg Message-ID: Revision: 2654 http://gar.svn.sourceforge.net/gar/?rev=2654&view=rev Author: skayser Date: 2008-12-18 09:27:24 +0000 (Thu, 18 Dec 2008) Log Message: ----------- mbuffer: Initial commit Added Paths: ----------- csw/mgar/pkg/mbuffer/ csw/mgar/pkg/mbuffer/branches/ csw/mgar/pkg/mbuffer/tags/ csw/mgar/pkg/mbuffer/trunk/ csw/mgar/pkg/mbuffer/trunk/Makefile csw/mgar/pkg/mbuffer/trunk/checksums csw/mgar/pkg/mbuffer/trunk/files/ csw/mgar/pkg/mbuffer/trunk/files/CSWpackage.gspec Property changes on: csw/mgar/pkg/mbuffer/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/mbuffer/trunk/Makefile =================================================================== --- csw/mgar/pkg/mbuffer/trunk/Makefile (rev 0) +++ csw/mgar/pkg/mbuffer/trunk/Makefile 2008-12-18 09:27:24 UTC (rev 2654) @@ -0,0 +1,32 @@ +GARNAME = mbuffer +GARVERSION = 20081207 +CATEGORIES = utils + +DESCRIPTION = A tool for buffering data streams +define BLURB + mbuffer is a tool for buffering data streams. Its special feature is to show + the I/O rate and summary to the user. It is especially useful, if you are + writing backups to fast tape drives or libraries. Those drives tend to stop + and rewind if they have a buffer underrun. This so called tape screwing + reduces the lifetime of the motors. mbuffer can prevent buffer underruns, + if used correctly and speed up the whole backup process. +endef + +MASTER_SITES = http://www.maier-komor.de/software/mbuffer/ +DISTFILES = $(GARNAME)-$(GARVERSION).tgz +DISTFILES += $(call admfiles,CSWpackage,) + +# We define upstream file regex so we can be notifed of new upstream software +# release +UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, +# then uncomment the next line. Otherwise it is set by default to the +# value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/mbuffer/trunk/checksums =================================================================== --- csw/mgar/pkg/mbuffer/trunk/checksums (rev 0) +++ csw/mgar/pkg/mbuffer/trunk/checksums 2008-12-18 09:27:24 UTC (rev 2654) @@ -0,0 +1,2 @@ +640dab1531246f4e93ba5f0ccccff65b download/mbuffer-20081207.tgz +6607910097dc7478838eed424c4ef45e download/CSWpackage.gspec Added: csw/mgar/pkg/mbuffer/trunk/files/CSWpackage.gspec =================================================================== --- csw/mgar/pkg/mbuffer/trunk/files/CSWpackage.gspec (rev 0) +++ csw/mgar/pkg/mbuffer/trunk/files/CSWpackage.gspec 2008-12-18 09:27:24 UTC (rev 2654) @@ -0,0 +1,4 @@ +%var bitname mbuffer +%var pkgname CSWmbuffer +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKSRC}/LICENSE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Dec 18 11:18:50 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 18 Dec 2008 10:18:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[2655] csw/mgar/pkg/clamav/trunk Message-ID: Revision: 2655 http://gar.svn.sourceforge.net/gar/?rev=2655&view=rev Author: bonivart Date: 2008-12-18 10:18:50 +0000 (Thu, 18 Dec 2008) Log Message: ----------- clamav: fix conf files Modified Paths: -------------- csw/mgar/pkg/clamav/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/clamav/trunk/files/CSWclamav.clamd.conf.p csw/mgar/pkg/clamav/trunk/files/CSWclamav.freshclam.conf.p Modified: csw/mgar/pkg/clamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamav/trunk/Makefile 2008-12-18 09:27:24 UTC (rev 2654) +++ csw/mgar/pkg/clamav/trunk/Makefile 2008-12-18 10:18:50 UTC (rev 2655) @@ -52,6 +52,8 @@ SPKG_SOURCEURL = http://www.clamav.net/ +ENABLE_CHECK=0 + include gar/category.mk DOCS = AUTHORS BUGS ChangeLog @@ -68,7 +70,11 @@ @ginstall -d $(DESTDIR)/etc/opt/csw/init.d @ginstall -m 755 $(FILEDIR)/CSWclamav.cswclamd $(DESTDIR)/etc/opt/csw/init.d/cswclamd @ginstall -m 755 $(FILEDIR)/CSWclamav.cswclamav-milter $(DESTDIR)/etc/opt/csw/init.d/cswclamav-milter + @( cd $(DESTDIR)$(sysconfdir) ; \ + gpatch < ../../../../../$(FILEDIR)/CSWclamav.clamd.conf.p ) @mv $(DESTDIR)$(sysconfdir)/clamd.conf $(DESTDIR)$(sysconfdir)/clamd.conf.CSW + @( cd $(DESTDIR)$(sysconfdir) ; \ + gpatch < ../../../../../$(FILEDIR)/CSWclamav.freshclam.conf.p ) @mv $(DESTDIR)$(sysconfdir)/freshclam.conf $(DESTDIR)$(sysconfdir)/freshclam.conf.CSW @ginstall -d $(DOCDEST) @$(foreach DOC,$(DOCS),ginstall -m 644 $(WORKSRC)/$(DOC) $(DOCDEST);) Added: csw/mgar/pkg/clamav/trunk/files/CSWclamav.clamd.conf.p =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWclamav.clamd.conf.p (rev 0) +++ csw/mgar/pkg/clamav/trunk/files/CSWclamav.clamd.conf.p 2008-12-18 10:18:50 UTC (rev 2655) @@ -0,0 +1,11 @@ +--- clamd.conf 2008-12-18 10:50:45.033181389 +0100 ++++ clamd.conf 2008-12-18 10:46:07.995146244 +0100 +@@ -5,7 +5,7 @@ + + + # Comment or remove the line below. +-Example ++#Example + + # Uncomment this option to enable logging. + # LogFile must be writable for the user running daemon. Added: csw/mgar/pkg/clamav/trunk/files/CSWclamav.freshclam.conf.p =================================================================== --- csw/mgar/pkg/clamav/trunk/files/CSWclamav.freshclam.conf.p (rev 0) +++ csw/mgar/pkg/clamav/trunk/files/CSWclamav.freshclam.conf.p 2008-12-18 10:18:50 UTC (rev 2655) @@ -0,0 +1,11 @@ +--- freshclam.conf 2008-12-18 10:50:48.949505178 +0100 ++++ freshclam.conf 2008-12-18 10:46:14.856162590 +0100 +@@ -5,7 +5,7 @@ + + + # Comment or remove the line below. +-Example ++#Example + + # Path to the database directory. + # WARNING: It must match clamd.conf's directive! This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Dec 18 13:55:57 2008 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 18 Dec 2008 12:55:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[2656] csw/mgar/pkg/mbuffer/trunk Message-ID: Revision: 2656 http://gar.svn.sourceforge.net/gar/?rev=2656&view=rev Author: skayser Date: 2008-12-18 12:55:57 +0000 (Thu, 18 Dec 2008) Log Message: ----------- mbuffer: reverted to gar v1 Modified Paths: -------------- csw/mgar/pkg/mbuffer/trunk/Makefile csw/mgar/pkg/mbuffer/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/mbuffer/trunk/ Property changes on: csw/mgar/pkg/mbuffer/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 Modified: csw/mgar/pkg/mbuffer/trunk/Makefile =================================================================== --- csw/mgar/pkg/mbuffer/trunk/Makefile 2008-12-18 10:18:50 UTC (rev 2655) +++ csw/mgar/pkg/mbuffer/trunk/Makefile 2008-12-18 12:55:57 UTC (rev 2656) @@ -16,6 +16,8 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tgz DISTFILES += $(call admfiles,CSWpackage,) +REQUIRED_PKGS = CSWosslrt + # We define upstream file regex so we can be notifed of new upstream software # release UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz @@ -27,6 +29,11 @@ CONFIGURE_ARGS = $(DIRPATHS) -TEST_TARGET = check +include gar/category.mk -include gar/category.mk +DOCS = ChangeLog README AUTHORS +DOCDEST = $(DESTDIR)$(docdir)/$(GARNAME) + +post-install: + @ginstall -d $(DOCDEST) + @$(foreach DOC,$(DOCS),ginstall -m 644 $(WORKSRC)/$(DOC) $(DOCDEST);) Modified: csw/mgar/pkg/mbuffer/trunk/checksums =================================================================== --- csw/mgar/pkg/mbuffer/trunk/checksums 2008-12-18 10:18:50 UTC (rev 2655) +++ csw/mgar/pkg/mbuffer/trunk/checksums 2008-12-18 12:55:57 UTC (rev 2656) @@ -1,2 +1,2 @@ 640dab1531246f4e93ba5f0ccccff65b download/mbuffer-20081207.tgz -6607910097dc7478838eed424c4ef45e download/CSWpackage.gspec +ee84b171939ddb3f60a49b5989626000 download/CSWpackage.gspec This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Thu Dec 18 14:15:26 2008 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Thu, 18 Dec 2008 13:15:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[2657] csw/mgar/pkg/mbuffer/trunk Message-ID: Revision: 2657 http://gar.svn.sourceforge.net/gar/?rev=2657&view=rev Author: skayser Date: 2008-12-18 13:15:26 +0000 (Thu, 18 Dec 2008) Log Message: ----------- mbuffer: minor fixes Modified Paths: -------------- csw/mgar/pkg/mbuffer/trunk/Makefile csw/mgar/pkg/mbuffer/trunk/checksums Modified: csw/mgar/pkg/mbuffer/trunk/Makefile =================================================================== --- csw/mgar/pkg/mbuffer/trunk/Makefile 2008-12-18 12:55:57 UTC (rev 2656) +++ csw/mgar/pkg/mbuffer/trunk/Makefile 2008-12-18 13:15:26 UTC (rev 2657) @@ -29,6 +29,8 @@ CONFIGURE_ARGS = $(DIRPATHS) +TEST_TARGET = check + include gar/category.mk DOCS = ChangeLog README AUTHORS Modified: csw/mgar/pkg/mbuffer/trunk/checksums =================================================================== --- csw/mgar/pkg/mbuffer/trunk/checksums 2008-12-18 12:55:57 UTC (rev 2656) +++ csw/mgar/pkg/mbuffer/trunk/checksums 2008-12-18 13:15:26 UTC (rev 2657) @@ -1,2 +1,2 @@ 640dab1531246f4e93ba5f0ccccff65b download/mbuffer-20081207.tgz -ee84b171939ddb3f60a49b5989626000 download/CSWpackage.gspec +6607910097dc7478838eed424c4ef45e download/CSWpackage.gspec This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Dec 18 15:47:00 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 18 Dec 2008 14:47:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[2658] csw/mgar/pkg/clamav/trunk/Makefile Message-ID: Revision: 2658 http://gar.svn.sourceforge.net/gar/?rev=2658&view=rev Author: bonivart Date: 2008-12-18 14:46:59 +0000 (Thu, 18 Dec 2008) Log Message: ----------- clamav: edit classes Modified Paths: -------------- csw/mgar/pkg/clamav/trunk/Makefile Modified: csw/mgar/pkg/clamav/trunk/Makefile =================================================================== --- csw/mgar/pkg/clamav/trunk/Makefile 2008-12-18 13:15:26 UTC (rev 2657) +++ csw/mgar/pkg/clamav/trunk/Makefile 2008-12-18 14:46:59 UTC (rev 2658) @@ -31,7 +31,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -SPKG_CLASSES = none cswcpsampleconf cswinitsmf +SPKG_CLASSES_CSWclamav = none cswcpsampleconf cswinitsmf CFLAGS=-xO2 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 Dec 18 16:57:42 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 18 Dec 2008 15:57:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[2659] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 2659 http://gar.svn.sourceforge.net/gar/?rev=2659&view=rev Author: bdwalton Date: 2008-12-18 15:57:42 +0000 (Thu, 18 Dec 2008) Log Message: ----------- fixed a few of the package split rules. Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2008-12-18 14:46:59 UTC (rev 2658) +++ csw/mgar/pkg/git/trunk/Makefile 2008-12-18 15:57:42 UTC (rev 2659) @@ -42,11 +42,11 @@ $(mandir)/man1/.*svn.* PKGFILES_CSWgitcvs = $(libexecdir)/git-core/.*cvs.* $(datadir)/doc/.*cvs.* \ $(mandir)/man1/.*cvs.* $(mandir)/man7/.*cvs.* \ - ($bindir)/.*cvs.* + $(bindir)/.*cvs.* PKGFILES_CSWgitgui = $(bindir)/git-gui \ - $(mandir)/man1/git-gui.* $(mandir)/man1/git-citool.* \ + $(mandir)/.*git-gui.* $(mandir)/.*git-citool.* \ $(datadir)/git-gui/.* $(datadir)/doc/.*git-gui.* \ - $(libexecdir)/git-core/git-gui.* + $(libexecdir)/.*git-gui.* $(libexecdir)/.*git-citool PKGFILES_CSWgitk = $(bindir)/gitk $(datadir)/doc/.*gitk.* $(datadir)/gitk.* \ $(mandir)/man1/gitk.* PKGFILES_CSWgitemacs = $(datadir)/emacs/.* 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 Dec 18 17:41:27 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 18 Dec 2008 16:41:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[2660] csw/mgar/pkg/git/trunk Message-ID: Revision: 2660 http://gar.svn.sourceforge.net/gar/?rev=2660&view=rev Author: bdwalton Date: 2008-12-18 16:41:24 +0000 (Thu, 18 Dec 2008) Log Message: ----------- rename gitdoc -> git_doc for better readability Modified Paths: -------------- csw/mgar/pkg/git/trunk/checksums csw/mgar/pkg/git/trunk/files/CSWgitdoc.gspec Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2008-12-18 15:57:42 UTC (rev 2659) +++ csw/mgar/pkg/git/trunk/checksums 2008-12-18 16:41:24 UTC (rev 2660) @@ -2,7 +2,7 @@ 61bd2360757ef9eb527763fb0947b4d8 download/CSWgitgui.gspec 82bc03b73b73a6f4b251992a1c671aab download/CSWgitk.gspec 721e03b218e0e5116372b971838fcd31 download/CSWgitemacs.gspec -5c5f3cd7951602129a5283c0c242ed3d download/CSWgitdoc.gspec +5130143dc4cdba927534852fdd39d7c5 download/CSWgitdoc.gspec 20e88773629b851f5b986fa75f104813 download/CSWgitsvn.gspec 88464ba7e12561d3eb53e729c5a9600c download/CSWgitcvs.gspec 57d2c46660773d3a1e87651447e3252a download/CSWgit.gspec Modified: csw/mgar/pkg/git/trunk/files/CSWgitdoc.gspec =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgitdoc.gspec 2008-12-18 15:57:42 UTC (rev 2659) +++ csw/mgar/pkg/git/trunk/files/CSWgitdoc.gspec 2008-12-18 16:41:24 UTC (rev 2660) @@ -1,4 +1,4 @@ -%var bitname gitdoc +%var bitname git_doc %var pkgname CSWgitdoc %var desc Documentation for Git %include url file://%{PKGLIB}/csw_dyndepend.gspec 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 Dec 18 22:07:42 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 18 Dec 2008 21:07:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[2661] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 2661 http://gar.svn.sourceforge.net/gar/?rev=2661&view=rev Author: bdwalton Date: 2008-12-18 21:07:42 +0000 (Thu, 18 Dec 2008) Log Message: ----------- clean up prereqs; s/tclsh/wish/ so that gitk (and likely git-gui) actually works Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2008-12-18 16:41:24 UTC (rev 2660) +++ csw/mgar/pkg/git/trunk/Makefile 2008-12-18 21:07:42 UTC (rev 2661) @@ -3,8 +3,8 @@ CATEGORIES = devel PREREQUISITE_PKGS = CSWasciidoc CSWossldevel CSWxmlto CSWbash CSWcurl -PREREQUISITE_PKGS += CSWgsed CSWgnulinks CSWperl CSWtcl CSWtk CSWexpat -PREREQUISITE_PKGS += CSWzlib CSWpmerror CSWpmsvn +PREREQUISITE_PKGS += CSWgsed CSWgnulinks CSWperl CSWtk CSWexpat +PREREQUISITE_PKGS += CSWzlib CSWpmerror CSWpmsvn CSWcvs REQUIRED_PKGS_CSWgit = CSWzlib CSWperl CSWrsync CSWcurlrt CSWosslrt REQUIRED_PKGS_CSWgit += CSWossh CSWiconv CSWexpat CSWbash @@ -59,7 +59,7 @@ CONFIGURE_ARGS = $(DIRPATHS) --with-shell=$(bindir)/bash CONFIGURE_ARGS += --with-perl=$(bindir)/perl -CONFIGURE_ARGS += --with-tcltk=$(bindir)/tclsh +CONFIGURE_ARGS += --with-tcltk=$(bindir)/wish CONFIGURE_ARGS += --with-zlib=$(prefix) CONFIGURE_ARGS += --with-iconv=$(prefix) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 18 22:24:10 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 18 Dec 2008 21:24:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[2662] csw/mgar/pkg/expat/trunk/Makefile Message-ID: Revision: 2662 http://gar.svn.sourceforge.net/gar/?rev=2662&view=rev Author: wbonnet Date: 2008-12-18 21:24:09 +0000 (Thu, 18 Dec 2008) Log Message: ----------- fix UFILE_REGEXP Modified Paths: -------------- csw/mgar/pkg/expat/trunk/Makefile Modified: csw/mgar/pkg/expat/trunk/Makefile =================================================================== --- csw/mgar/pkg/expat/trunk/Makefile 2008-12-18 21:07:42 UTC (rev 2661) +++ csw/mgar/pkg/expat/trunk/Makefile 2008-12-18 21:24:09 UTC (rev 2662) @@ -15,7 +15,9 @@ DISTFILES += $(call admfiles,CSWexpat-devel,depend prototype) # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=10127 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = (\d+(?:\.\d+)*) # Compatibility libraries EXTLIBS += libexpat.so.0.4.0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 18 22:53:08 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 18 Dec 2008 21:53:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[2663] csw/mgar/pkg/freeciv/trunk/Makefile Message-ID: Revision: 2663 http://gar.svn.sourceforge.net/gar/?rev=2663&view=rev Author: wbonnet Date: 2008-12-18 21:53:07 +0000 (Thu, 18 Dec 2008) Log Message: ----------- Fix UFILE_REGEX Modified Paths: -------------- csw/mgar/pkg/freeciv/trunk/Makefile Modified: csw/mgar/pkg/freeciv/trunk/Makefile =================================================================== --- csw/mgar/pkg/freeciv/trunk/Makefile 2008-12-18 21:24:09 UTC (rev 2662) +++ csw/mgar/pkg/freeciv/trunk/Makefile 2008-12-18 21:53:07 UTC (rev 2663) @@ -12,7 +12,9 @@ DISTFILES += $(call admfiles,CSWfreeciv, depend prototype ) # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=138322 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = (\d+(?:\.\d+)*) GARCOMPILER = GNU This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 18 22:56:13 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 18 Dec 2008 21:56:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[2664] csw/mgar/pkg/freetype/trunk/Makefile Message-ID: Revision: 2664 http://gar.svn.sourceforge.net/gar/?rev=2664&view=rev Author: wbonnet Date: 2008-12-18 21:56:13 +0000 (Thu, 18 Dec 2008) Log Message: ----------- Fix UFILE_REGEX Modified Paths: -------------- csw/mgar/pkg/freetype/trunk/Makefile Modified: csw/mgar/pkg/freetype/trunk/Makefile =================================================================== --- csw/mgar/pkg/freetype/trunk/Makefile 2008-12-18 21:53:07 UTC (rev 2663) +++ csw/mgar/pkg/freetype/trunk/Makefile 2008-12-18 21:56:13 UTC (rev 2664) @@ -18,7 +18,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=3157 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = (\d+(?:\.\d+)*) CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 18 22:59:02 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 18 Dec 2008 21:59:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[2665] csw/mgar/pkg/gaim/trunk/Makefile Message-ID: Revision: 2665 http://gar.svn.sourceforge.net/gar/?rev=2665&view=rev Author: wbonnet Date: 2008-12-18 21:59:02 +0000 (Thu, 18 Dec 2008) Log Message: ----------- Fix UFILE_REGEX Modified Paths: -------------- csw/mgar/pkg/gaim/trunk/Makefile Modified: csw/mgar/pkg/gaim/trunk/Makefile =================================================================== --- csw/mgar/pkg/gaim/trunk/Makefile 2008-12-18 21:56:13 UTC (rev 2664) +++ csw/mgar/pkg/gaim/trunk/Makefile 2008-12-18 21:59:02 UTC (rev 2665) @@ -15,7 +15,9 @@ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=3157 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = (\d+(?:\.\d+)*) ifneq ($(BUILD_XDEPS),0) LIBDEPS = lib/libao This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Thu Dec 18 23:00:22 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Thu, 18 Dec 2008 22:00:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[2666] csw/mgar/pkg/ganglia/trunk/Makefile Message-ID: Revision: 2666 http://gar.svn.sourceforge.net/gar/?rev=2666&view=rev Author: wbonnet Date: 2008-12-18 22:00:21 +0000 (Thu, 18 Dec 2008) Log Message: ----------- Fix UFILE_REGEX Modified Paths: -------------- csw/mgar/pkg/ganglia/trunk/Makefile Modified: csw/mgar/pkg/ganglia/trunk/Makefile =================================================================== --- csw/mgar/pkg/ganglia/trunk/Makefile 2008-12-18 21:59:02 UTC (rev 2665) +++ csw/mgar/pkg/ganglia/trunk/Makefile 2008-12-18 22:00:21 UTC (rev 2666) @@ -15,7 +15,9 @@ DISTFILES += $(call admfiles,CSWpackage,) # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=43021 +UPSTREAM_USE_SF = 1 +UFILES_REGEX = (\d+(?:\.\d+)*) # This is attachment #45 from Ganglia bug # http://bugzilla.ganglia.info/cgi-bin/bugzilla/show_bug.cgi?id=77 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 Dec 19 03:49:13 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 19 Dec 2008 02:49:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[2667] csw/mgar/pkg/git/trunk/files Message-ID: Revision: 2667 http://gar.svn.sourceforge.net/gar/?rev=2667&view=rev Author: bdwalton Date: 2008-12-19 02:49:13 +0000 (Fri, 19 Dec 2008) Log Message: ----------- set arch=all on subpackges that don't have any binary files Modified Paths: -------------- csw/mgar/pkg/git/trunk/files/CSWgitcvs.gspec csw/mgar/pkg/git/trunk/files/CSWgitdoc.gspec csw/mgar/pkg/git/trunk/files/CSWgitemacs.gspec csw/mgar/pkg/git/trunk/files/CSWgitgui.gspec csw/mgar/pkg/git/trunk/files/CSWgitk.gspec csw/mgar/pkg/git/trunk/files/CSWgitsvn.gspec Modified: csw/mgar/pkg/git/trunk/files/CSWgitcvs.gspec =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgitcvs.gspec 2008-12-18 22:00:21 UTC (rev 2666) +++ csw/mgar/pkg/git/trunk/files/CSWgitcvs.gspec 2008-12-19 02:49:13 UTC (rev 2667) @@ -1,5 +1,6 @@ %var bitname git_cvs %var pkgname CSWgitcvs %var desc Git tools for working with CVS repositories +%var arch all %include url file://%{PKGLIB}/csw_dyndepend.gspec %copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Modified: csw/mgar/pkg/git/trunk/files/CSWgitdoc.gspec =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgitdoc.gspec 2008-12-18 22:00:21 UTC (rev 2666) +++ csw/mgar/pkg/git/trunk/files/CSWgitdoc.gspec 2008-12-19 02:49:13 UTC (rev 2667) @@ -1,5 +1,6 @@ %var bitname git_doc %var pkgname CSWgitdoc %var desc Documentation for Git +%var arch all %include url file://%{PKGLIB}/csw_dyndepend.gspec %copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Modified: csw/mgar/pkg/git/trunk/files/CSWgitemacs.gspec =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgitemacs.gspec 2008-12-18 22:00:21 UTC (rev 2666) +++ csw/mgar/pkg/git/trunk/files/CSWgitemacs.gspec 2008-12-19 02:49:13 UTC (rev 2667) @@ -1,5 +1,6 @@ %var bitname git_emacs %var pkgname CSWgitemacs %var desc A Git VCS mode for Emacs +%var arch all %include url file://%{PKGLIB}/csw_dyndepend.gspec %copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Modified: csw/mgar/pkg/git/trunk/files/CSWgitgui.gspec =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgitgui.gspec 2008-12-18 22:00:21 UTC (rev 2666) +++ csw/mgar/pkg/git/trunk/files/CSWgitgui.gspec 2008-12-19 02:49:13 UTC (rev 2667) @@ -1,5 +1,6 @@ %var bitname git_gui %var pkgname CSWgitgui %var desc Git GUI tool +%var arch all %include url file://%{PKGLIB}/csw_dyndepend.gspec %copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Modified: csw/mgar/pkg/git/trunk/files/CSWgitk.gspec =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgitk.gspec 2008-12-18 22:00:21 UTC (rev 2666) +++ csw/mgar/pkg/git/trunk/files/CSWgitk.gspec 2008-12-19 02:49:13 UTC (rev 2667) @@ -1,5 +1,6 @@ %var bitname gitk %var pkgname CSWgitk %var desc Git revision tree visualiser +%var arch all %include url file://%{PKGLIB}/csw_dyndepend.gspec %copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Modified: csw/mgar/pkg/git/trunk/files/CSWgitsvn.gspec =================================================================== --- csw/mgar/pkg/git/trunk/files/CSWgitsvn.gspec 2008-12-18 22:00:21 UTC (rev 2666) +++ csw/mgar/pkg/git/trunk/files/CSWgitsvn.gspec 2008-12-19 02:49:13 UTC (rev 2667) @@ -1,5 +1,6 @@ %var bitname git_svn %var pkgname CSWgitsvn %var desc Git tools for working with Subversion repositories +%var arch all %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 bdwalton at users.sourceforge.net Fri Dec 19 03:51:10 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 19 Dec 2008 02:51:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[2668] csw/mgar/pkg/git/trunk/checksums Message-ID: Revision: 2668 http://gar.svn.sourceforge.net/gar/?rev=2668&view=rev Author: bdwalton Date: 2008-12-19 02:51:10 +0000 (Fri, 19 Dec 2008) Log Message: ----------- checksums to match updated arch in gspec files Modified Paths: -------------- csw/mgar/pkg/git/trunk/checksums Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2008-12-19 02:49:13 UTC (rev 2667) +++ csw/mgar/pkg/git/trunk/checksums 2008-12-19 02:51:10 UTC (rev 2668) @@ -1,9 +1,8 @@ 899172ebeac65f7a09a8e204d4f87d8c download/git-1.6.0.5.tar.bz2 -61bd2360757ef9eb527763fb0947b4d8 download/CSWgitgui.gspec -82bc03b73b73a6f4b251992a1c671aab download/CSWgitk.gspec -721e03b218e0e5116372b971838fcd31 download/CSWgitemacs.gspec -5130143dc4cdba927534852fdd39d7c5 download/CSWgitdoc.gspec -20e88773629b851f5b986fa75f104813 download/CSWgitsvn.gspec -88464ba7e12561d3eb53e729c5a9600c download/CSWgitcvs.gspec +2ad395619c97ef714738778be9132e6e download/CSWgitgui.gspec +2dfce68b5746df8dfe8da8941f0d757b download/CSWgitk.gspec +393d10b23a1ecb60f91bdc5f2d12a75d download/CSWgitemacs.gspec +01901aa2ffdf51c89d5b7ffc28dc9cfc download/CSWgitcvs.gspec +15faf599c27b35aad91a0af518831b29 download/CSWgitdoc.gspec 57d2c46660773d3a1e87651447e3252a download/CSWgit.gspec 369547e8222dcf8be214b5013f28afcc download/doc-makefile.patch 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 Dec 19 03:55:24 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 19 Dec 2008 02:55:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[2669] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 2669 http://gar.svn.sourceforge.net/gar/?rev=2669&view=rev Author: bdwalton Date: 2008-12-19 02:55:24 +0000 (Fri, 19 Dec 2008) Log Message: ----------- simplified the PKGFILES_ definitions; git-svn still ends up in CSWgit for some reason. Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2008-12-19 02:51:10 UTC (rev 2668) +++ csw/mgar/pkg/git/trunk/Makefile 2008-12-19 02:55:24 UTC (rev 2669) @@ -27,29 +27,22 @@ endef MASTER_SITES = http://kernel.org/pub/software/scm/$(GARNAME)/ +DISTFILES += $(call admfiles,CSWgitsvn,) DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWgitgui,) DISTFILES += $(call admfiles,CSWgitk,) DISTFILES += $(call admfiles,CSWgitemacs,) -DISTFILES += $(call admfiles,CSWgitdoc,) -DISTFILES += $(call admfiles,CSWgitsvn,) DISTFILES += $(call admfiles,CSWgitcvs,) +DISTFILES += $(call admfiles,CSWgitdoc,) DISTFILES += $(call admfiles,CSWgit,) PATCHFILES = doc-makefile.patch -PKGFILES_CSWgitsvn = $(libexecdir)/git-core/*svn $(datadir)/doc/.*svn.* \ - $(mandir)/man1/.*svn.* -PKGFILES_CSWgitcvs = $(libexecdir)/git-core/.*cvs.* $(datadir)/doc/.*cvs.* \ - $(mandir)/man1/.*cvs.* $(mandir)/man7/.*cvs.* \ - $(bindir)/.*cvs.* -PKGFILES_CSWgitgui = $(bindir)/git-gui \ - $(mandir)/.*git-gui.* $(mandir)/.*git-citool.* \ - $(datadir)/git-gui/.* $(datadir)/doc/.*git-gui.* \ - $(libexecdir)/.*git-gui.* $(libexecdir)/.*git-citool -PKGFILES_CSWgitk = $(bindir)/gitk $(datadir)/doc/.*gitk.* $(datadir)/gitk.* \ - $(mandir)/man1/gitk.* -PKGFILES_CSWgitemacs = $(datadir)/emacs/.* +PKGFILES_CSWgitsvn = .*svn.* +PKGFILES_CSWgitgui = .*git-gui.* .*git-citool.* +PKGFILES_CSWgitk = .*gitk.* +PKGFILES_CSWgitemacs = .*emacs.* +PKGFILES_CSWgitcvs = .*cvs.* PKGFILES_CSWgitdoc = $(datadir)/doc/.* # We define upstream file regex so we can be notifed of new upstream software release This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Fri Dec 19 07:13:19 2008 From: dam at opencsw.org (Dagobert Michelsen) Date: Fri, 19 Dec 2008 07:13:19 +0100 Subject: [csw-devel] SF.net SVN: gar:[2669] csw/mgar/pkg/git/trunk/Makefile In-Reply-To: References: Message-ID: Hi Ben, Am 19.12.2008 um 03:55 schrieb bdwalton at users.sourceforge.net: > Revision: 2669 > http://gar.svn.sourceforge.net/gar/?rev=2669&view=rev > Author: bdwalton > Date: 2008-12-19 02:55:24 +0000 (Fri, 19 Dec 2008) > > Log Message: > ----------- > simplified the PKGFILES_ definitions; git-svn still ends up in > CSWgit for some reason. > > Modified Paths: > -------------- > csw/mgar/pkg/git/trunk/Makefile > > Modified: csw/mgar/pkg/git/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/git/trunk/Makefile 2008-12-19 02:51:10 UTC (rev 2668) > +++ csw/mgar/pkg/git/trunk/Makefile 2008-12-19 02:55:24 UTC (rev 2669) > @@ -27,29 +27,22 @@ > endef > > MASTER_SITES = http://kernel.org/pub/software/scm/$(GARNAME)/ > +DISTFILES += $(call admfiles,CSWgitsvn,) > DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 ?h, you set DISTFILES to CSWgitsvn and then ovewrite it (missing +=?) Best regards -- Dago > > DISTFILES += $(call admfiles,CSWgitgui,) > DISTFILES += $(call admfiles,CSWgitk,) > DISTFILES += $(call admfiles,CSWgitemacs,) > -DISTFILES += $(call admfiles,CSWgitdoc,) > -DISTFILES += $(call admfiles,CSWgitsvn,) > DISTFILES += $(call admfiles,CSWgitcvs,) > +DISTFILES += $(call admfiles,CSWgitdoc,) > DISTFILES += $(call admfiles,CSWgit,) > > PATCHFILES = doc-makefile.patch > > -PKGFILES_CSWgitsvn = $(libexecdir)/git-core/*svn $(datadir)/ > doc/.*svn.* \ > - $(mandir)/man1/.*svn.* > -PKGFILES_CSWgitcvs = $(libexecdir)/git-core/.*cvs.* $(datadir)/ > doc/.*cvs.* \ > - $(mandir)/man1/.*cvs.* $(mandir)/man7/.*cvs.* \ > - $(bindir)/.*cvs.* > -PKGFILES_CSWgitgui = $(bindir)/git-gui \ > - $(mandir)/.*git-gui.* $(mandir)/.*git-citool.* \ > - $(datadir)/git-gui/.* $(datadir)/doc/.*git-gui.* \ > - $(libexecdir)/.*git-gui.* $(libexecdir)/.*git-citool > -PKGFILES_CSWgitk = $(bindir)/gitk $(datadir)/doc/.*gitk.* $ > (datadir)/gitk.* \ > - $(mandir)/man1/gitk.* > -PKGFILES_CSWgitemacs = $(datadir)/emacs/.* > +PKGFILES_CSWgitsvn = .*svn.* > +PKGFILES_CSWgitgui = .*git-gui.* .*git-citool.* > +PKGFILES_CSWgitk = .*gitk.* > +PKGFILES_CSWgitemacs = .*emacs.* > +PKGFILES_CSWgitcvs = .*cvs.* > PKGFILES_CSWgitdoc = $(datadir)/doc/.* > > # We define upstream file regex so we can be notifed of new upstream > software release > > > 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 bwalton at opencsw.org Fri Dec 19 13:31:53 2008 From: bwalton at opencsw.org (Ben Walton) Date: Fri, 19 Dec 2008 07:31:53 -0500 Subject: [csw-devel] SF.net SVN: gar:[2669] csw/mgar/pkg/git/trunk/Makefile In-Reply-To: References: Message-ID: <1229689776-sup-1547@ntdws12.chass.utoronto.ca> Excerpts from Dagobert Michelsen's message of Fri Dec 19 01:13:19 -0500 2008: Hi Dago, > ?h, you set DISTFILES to CSWgitsvn and then ovewrite it > (missing +=?) That is kind of silly isn't it! :) I was rearranging lines thinking that something to do with the ordering of the gspec files in the list was breaking my PKGFILES_ regex globs below (eg: picking their files in the wrong order). I later discovered that I simply wasn't squishing the old prototype files...this likely explains why I didn't notice this breakage too! :) As always, thanks! -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 GPG Key Id: 8E89F6D2; Key Server: pgp.mit.edu Contact me to arrange for a CAcert assurance meeting. -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 189 bytes Desc: not available URL: From bdwalton at users.sourceforge.net Fri Dec 19 13:33:26 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 19 Dec 2008 12:33:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[2670] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 2670 http://gar.svn.sourceforge.net/gar/?rev=2670&view=rev Author: bdwalton Date: 2008-12-19 12:33:26 +0000 (Fri, 19 Dec 2008) Log Message: ----------- corrected ordering mistake Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2008-12-19 02:55:24 UTC (rev 2669) +++ csw/mgar/pkg/git/trunk/Makefile 2008-12-19 12:33:26 UTC (rev 2670) @@ -27,8 +27,8 @@ endef MASTER_SITES = http://kernel.org/pub/software/scm/$(GARNAME)/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWgitsvn,) -DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 DISTFILES += $(call admfiles,CSWgitgui,) DISTFILES += $(call admfiles,CSWgitk,) DISTFILES += $(call admfiles,CSWgitemacs,) 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 Dec 19 13:40:57 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 19 Dec 2008 12:40:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[2671] csw/mgar/pkg/git/trunk/checksums Message-ID: Revision: 2671 http://gar.svn.sourceforge.net/gar/?rev=2671&view=rev Author: bdwalton Date: 2008-12-19 12:40:56 +0000 (Fri, 19 Dec 2008) Log Message: ----------- updated makesums to reinclude missing .gspec Modified Paths: -------------- csw/mgar/pkg/git/trunk/checksums Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2008-12-19 12:33:26 UTC (rev 2670) +++ csw/mgar/pkg/git/trunk/checksums 2008-12-19 12:40:56 UTC (rev 2671) @@ -1,4 +1,5 @@ 899172ebeac65f7a09a8e204d4f87d8c download/git-1.6.0.5.tar.bz2 +e2124d3e47454df813a2085a7a85597e download/CSWgitsvn.gspec 2ad395619c97ef714738778be9132e6e download/CSWgitgui.gspec 2dfce68b5746df8dfe8da8941f0d757b download/CSWgitk.gspec 393d10b23a1ecb60f91bdc5f2d12a75d download/CSWgitemacs.gspec 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 Dec 19 16:11:29 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 19 Dec 2008 15:11:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[2672] csw/mgar/pkg/xmlto/trunk Message-ID: Revision: 2672 http://gar.svn.sourceforge.net/gar/?rev=2672&view=rev Author: bdwalton Date: 2008-12-19 15:11:29 +0000 (Fri, 19 Dec 2008) Log Message: ----------- Depend on gnulinks so that the options used in some of the scripts shipped can find options no present in sol8 cp. (Use gnu c locally, switch back when running on buildfarm.) Modified Paths: -------------- csw/mgar/pkg/xmlto/trunk/Makefile csw/mgar/pkg/xmlto/trunk/checksums Modified: csw/mgar/pkg/xmlto/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlto/trunk/Makefile 2008-12-19 12:40:56 UTC (rev 2671) +++ csw/mgar/pkg/xmlto/trunk/Makefile 2008-12-19 15:11:29 UTC (rev 2672) @@ -2,7 +2,9 @@ GARVERSION = 0.0.21 CATEGORIES = utils -PREREQUISITE_PKGS = CSWmktemp CSWfindutils CSWdocbookxsl CSWlibxslt CSWflex CSWggetopt +PREREQUISITE_PKGS = CSWmktemp CSWfindutils CSWdocbookxsl CSWlibxslt +PREREQUISITE_PKGS = CSWflex CSWggetopt CSWgnulinks + REQUIRES_PKGS = CSWsgmlcommon CSWxmlcommon CSWlibxml2 CSWdocbookdtds REQUIRES_PKGS += CSWdocbookxsl CSWlibxslt CSWflex CSWw3m @@ -19,6 +21,8 @@ TEST_TARGET = check +GARCOMPILER = GNU + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 @@ -39,7 +43,7 @@ include gar/category.mk # We need this for 'tail -n' -PATH := /usr/xpg4/bin:/opt/csw/bin:$(PATH) +PATH := /opt/csw/gnu:/usr/xpg4/bin:/opt/csw/bin:$(PATH) #reset XML_CATALOG lookup (we rely on having packages that provide stylesheets #etc). Having xsltproc not find them during build makes us blow up!! Modified: csw/mgar/pkg/xmlto/trunk/checksums =================================================================== --- csw/mgar/pkg/xmlto/trunk/checksums 2008-12-19 12:40:56 UTC (rev 2671) +++ csw/mgar/pkg/xmlto/trunk/checksums 2008-12-19 15:11:29 UTC (rev 2672) @@ -1,3 +1,2 @@ cc2039dedc81f1a56b06e5fdac6f7570 download/xmlto-0.0.21.tar.bz2 -ca57ac3300751be169587c70ee43d421 download/CSWxmlto.gspec -0636e73ff0215e8d672dc4c32c317bb3 download/GPL +0eddffc425d6a0439d4ba307ec3a668b download/CSWxmlto.gspec 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 Dec 19 19:50:06 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 19 Dec 2008 18:50:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[2673] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 2673 http://gar.svn.sourceforge.net/gar/?rev=2673&view=rev Author: bdwalton Date: 2008-12-19 18:50:06 +0000 (Fri, 19 Dec 2008) Log Message: ----------- - Require emacs as a build dep (for compiling the .el files). - Setup the dependencies for CSWgitemacs. Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2008-12-19 15:11:29 UTC (rev 2672) +++ csw/mgar/pkg/git/trunk/Makefile 2008-12-19 18:50:06 UTC (rev 2673) @@ -4,7 +4,7 @@ PREREQUISITE_PKGS = CSWasciidoc CSWossldevel CSWxmlto CSWbash CSWcurl PREREQUISITE_PKGS += CSWgsed CSWgnulinks CSWperl CSWtk CSWexpat -PREREQUISITE_PKGS += CSWzlib CSWpmerror CSWpmsvn CSWcvs +PREREQUISITE_PKGS += CSWzlib CSWpmerror CSWpmsvn CSWcvs CSWemacs REQUIRED_PKGS_CSWgit = CSWzlib CSWperl CSWrsync CSWcurlrt CSWosslrt REQUIRED_PKGS_CSWgit += CSWossh CSWiconv CSWexpat CSWbash @@ -17,6 +17,8 @@ REQUIRED_PKGS_CSWgitcvs = CSWgit CSWcvs +REQUIRED_PKGS_CSWgitemacs = CSWgit CSWemacs + REQUIRED_PKGS_CSWgitdoc = CSWgit DESCRIPTION = Fast Version Control System This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Fri Dec 19 19:51:27 2008 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Fri, 19 Dec 2008 18:51:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[2674] csw/mgar/pkg/vim/trunk Message-ID: Revision: 2674 http://gar.svn.sourceforge.net/gar/?rev=2674&view=rev Author: harpchad Date: 2008-12-19 18:51:27 +0000 (Fri, 19 Dec 2008) Log Message: ----------- Updated for vim72, patches available from vim.org are no longer maintained in gar svn Modified Paths: -------------- csw/mgar/pkg/vim/trunk/Makefile csw/mgar/pkg/vim/trunk/checksums csw/mgar/pkg/vim/trunk/files/CSWvimrt.prototype csw/mgar/pkg/vim/trunk/files/config.mk csw/mgar/pkg/vim/trunk/files/patches.mk csw/mgar/pkg/vim/trunk/files/vimtutor.diff Removed Paths: ------------- csw/mgar/pkg/vim/trunk/files/7.1.001-147 Modified: csw/mgar/pkg/vim/trunk/Makefile =================================================================== --- csw/mgar/pkg/vim/trunk/Makefile 2008-12-19 18:50:06 UTC (rev 2673) +++ csw/mgar/pkg/vim/trunk/Makefile 2008-12-19 18:51:27 UTC (rev 2674) @@ -1,7 +1,7 @@ GARNAME = vim -DISTVERSION = 7.1 +DISTVERSION = 7.2 CATEGORIES = utils - +SPKG_SOURCEURL = http://www.vim.org/download.php DESCRIPTION = Vi IMproved define BLURB Vim is an almost fully-compatible version of the Unix editor Vi. Many new @@ -29,4 +29,3 @@ include gar/category.mk include files/rules.mk - Modified: csw/mgar/pkg/vim/trunk/checksums =================================================================== --- csw/mgar/pkg/vim/trunk/checksums 2008-12-19 18:50:06 UTC (rev 2673) +++ csw/mgar/pkg/vim/trunk/checksums 2008-12-19 18:51:27 UTC (rev 2674) @@ -1,10 +1,78 @@ -44c6b4914f38d6f9aa959640b89da329 download/vim-7.1.tar.bz2 -144aa049ba70621acf4247f0459f3ee7 download/vim-7.1-lang.tar.gz -605cc7ae31bcc9d7864bb0bb6025f55d download/vim-7.1-extra.tar.gz +7c2dc4a956cf315e546e347bc349968c download/7.2.001 +7f16f80814f1e071a689806c2056b39d download/7.2.002 +0de916fdfd450a4a0d95bed44ae2c398 download/7.2.003 +25cc99ad42b25b16a4610e2fad9cdab4 download/7.2.004 +a5b7b1c7c5b75aa7d730b0b9aa491558 download/7.2.005 +a93a72cd40c37da91dc634dc8dddefec download/7.2.006 +c2b2b63dea27ddad92668e63797406c5 download/7.2.007 +e65c8c2223eea5289d8cbef2e867a5de download/7.2.008 +ab1566b69bd0e0c82a866f00675ffe0e download/7.2.009 +d69f559bfb5436c157e8069a829ca50d download/7.2.010 +05334a6bb31402bfd49d82ea6f59a57b download/7.2.011 +a11dcd5552f36544a9e27978b5359935 download/7.2.012 +8bc70978291aadea9c82072b623c955d download/7.2.013 +a87826187cb77ad2e567a40c1609eea4 download/7.2.014 +47a466fbfdbca616f519fc4afa0432df download/7.2.015 +fd08bac73d7ffcabf53bd25a63dff893 download/7.2.016 +0f0284d87f6f52101802dbe1a45d54c3 download/7.2.017 +38d06ba325b716c1177c1012d781bada download/7.2.018 +661ca021fb70c24ef4df229512cfb14b download/7.2.019 +cb2c5ca0f9a9718fb635874925432dd8 download/7.2.020 +9073d2311ae7101c143237a45afb4efa download/7.2.021 +48ccb0deec77a3bb91bf967dacb43492 download/7.2.022 +d77ed8aa4de30d4dbd17a7998ae8f269 download/7.2.023 +cf983237e5e866ef459870fee2754bac download/7.2.024 +ab32defa4b2cfb509ccb34d4858b1223 download/7.2.025 +5e96c227c7765b1e0f03f44cb5b750f6 download/7.2.026 +f26b7ee0f271eacbb3652dbdf92dd860 download/7.2.027 +fc54a3d35bdc7b7a7660c6d2274f7b74 download/7.2.028 +d53630dc8f3a823f54dfba73dcd47b36 download/7.2.029 +208f8ed2db2665ebfc17674f78d47c6d download/7.2.030 +3387583af86faa78e10be979214071f3 download/7.2.031 +eca017686205ec8658bf9fa8c73f7af6 download/7.2.032 +88c91b84ffc772fd57f86475f7ba90f1 download/7.2.033 +c3d6eaaa0b74df423f90afaaafa3a0de download/7.2.034 +f4c35dae581d671dc271407d377f7199 download/7.2.035 +0ae8b6ed636fc013e2fa6bdabc182041 download/7.2.036 +1c6501c366cc8df205955f3e4d3ebba9 download/7.2.037 +ed3479ddb4ded7b74c82af5e50b0e4a6 download/7.2.038 +2a61f28f6f793c5a43abded6e59b6506 download/7.2.039 +4c493255ae227498016f30a0002ec1cc download/7.2.040 +66bde35426c09d9c666e23215f9a19c9 download/7.2.041 +99baedef8a9c908774b7ed74deacf184 download/7.2.042 +87035b208c9377c28d796b1e48ab8aac download/7.2.043 +b127def242996b4e7d7e870cab3e4b45 download/7.2.044 +5233327e4c97d310e3793b223892ea8d download/7.2.045 +9ecfa0454f5a329996b273cb12369962 download/7.2.046 +35e16f4e7198e861a71322fee2cb7909 download/7.2.047 +84ef9658181f49bfbd7a61ec87dd0b8d download/7.2.048 +fc9b65eef81954f6006c307ff11be925 download/7.2.049 +27a9700e39e266a31df702677acea52c download/7.2.050 +89ce3f5b513510fb288a4a301e7494c7 download/7.2.051 +5992bb56b07a9b9b4e3504f1f2f2c79c download/7.2.052 +3fe570c1317fee8a71ede17197358e02 download/7.2.053 +5b047e8e8413c4807d74a6d9716474a2 download/7.2.054 +c276080d95de2fafa9706f247c35ff74 download/7.2.055 +5b65e2654a78dcc4c15dc49dbce5418e download/7.2.056 +cab5a9ddf0ab180089d84bf9ec685574 download/7.2.057 +80991ff846f88222e3266dab6b07e2b8 download/7.2.058 +89cede639caf8beed5ea071790445e26 download/7.2.059 +9781d833263060308a9622dd097ad378 download/7.2.060 +71b4bc625bc1cdd68747262d329db551 download/7.2.061 +9243a773d19966dbfd98b7aff3fe3ab7 download/7.2.062 +08155711f8db2dfce217ec5a34253a76 download/7.2.063 +fd692f9624ec0170800b3d9a2a9a53cb download/7.2.064 +ee1a8dc311c7580608e3bd2196a7d042 download/7.2.065 +8d1d5f8aefabf0abcb54de5247893246 download/7.2.066 +fa0ccca2decdd2db64947658b04b8c99 download/7.2.067 +ca5ab057205023613020ca920d903028 download/7.2.068 +f3e6f3dd76278a9f7e396955faa4ca31 download/7.2.069 +198b5e809eddd24650dac5ab237e26d0 download/CSWvim.depend 59c166f15ad9e4db7aeef3ce7f6d89d9 download/CSWvim.gspec -198b5e809eddd24650dac5ab237e26d0 download/CSWvim.depend 7f886f132e8404332757262c82aac7af download/CSWvim.prototype c1ead6a1fa0f1a38b80689134cac8ca9 download/CSWvimrt.gspec -32117aac8751a78b7af78b9137922f85 download/CSWvimrt.prototype -79130ead83c4e2cd7dfdc9af4fc12fe5 download/7.1.001-147 -b07127874fa23a87bc703ec710be530c download/vimtutor.diff +9ca3e912af15f511018b08f568e9f9cf download/CSWvimrt.prototype +35e04482f07c57221c9a751aaa3b8dac download/vim-7.2-extra.tar.gz +d8884786979e0e520c112faf2e176f05 download/vim-7.2-lang.tar.gz +f0901284b338e448bfd79ccca0041254 download/vim-7.2.tar.bz2 +582717146f6bbd5b73db83a2f62e62a5 download/vimtutor.diff Deleted: csw/mgar/pkg/vim/trunk/files/7.1.001-147 =================================================================== --- csw/mgar/pkg/vim/trunk/files/7.1.001-147 2008-12-19 18:50:06 UTC (rev 2673) +++ csw/mgar/pkg/vim/trunk/files/7.1.001-147 2008-12-19 18:51:27 UTC (rev 2674) @@ -1,16747 +0,0 @@ -To: vim-dev at vim.org -Subject: patch 7.1.001 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.001 -Problem: Still can't build with Gnome libraries. -Solution: Fix typo in bind_textdomain_codeset. (Mike Kelly) -Files: src/gui_gtk.c, src/gui_gtk_x11.c - - -*** ../vim-7.1.000/src/gui_gtk.c Thu May 10 20:27:29 2007 ---- src/gui_gtk.c Mon May 14 14:40:54 2007 -*************** -*** 53,60 **** - # ifdef bindtextdomain - # undef bindtextdomain - # endif -! # ifdef bindtextdomain_codeset -! # undef bindtextdomain_codeset - # endif - # if defined(FEAT_GETTEXT) && !defined(ENABLE_NLS) - # define ENABLE_NLS /* so the texts in the dialog boxes are translated */ ---- 53,60 ---- - # ifdef bindtextdomain - # undef bindtextdomain - # endif -! # ifdef bind_textdomain_codeset -! # undef bind_textdomain_codeset - # endif - # if defined(FEAT_GETTEXT) && !defined(ENABLE_NLS) - # define ENABLE_NLS /* so the texts in the dialog boxes are translated */ -*** ../vim-7.1.000/src/gui_gtk_x11.c Thu May 10 21:17:51 2007 ---- src/gui_gtk_x11.c Mon May 14 14:41:06 2007 -*************** -*** 36,43 **** - # ifdef bindtextdomain - # undef bindtextdomain - # endif -! # ifdef bindtextdomain_codeset -! # undef bindtextdomain_codeset - # endif - # if defined(FEAT_GETTEXT) && !defined(ENABLE_NLS) - # define ENABLE_NLS /* so the texts in the dialog boxes are translated */ ---- 36,43 ---- - # ifdef bindtextdomain - # undef bindtextdomain - # endif -! # ifdef bind_textdomain_codeset -! # undef bind_textdomain_codeset - # endif - # if defined(FEAT_GETTEXT) && !defined(ENABLE_NLS) - # define ENABLE_NLS /* so the texts in the dialog boxes are translated */ -*** ../vim-7.1.000/src/version.c Sat May 12 16:34:15 2007 ---- src/version.c Mon May 14 14:42:19 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 1, - /**/ - --- -hundred-and-one symptoms of being an internet addict: -127. You bring your laptop and cellular phone to church. - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.002 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.002 -Problem: Oracle Pro*C/C++ files are not detected. -Solution: Add the missing star. (Micah J. Cowan) -Files: runtime/filetype.vim - - -*** ../vim-7.1.001/runtime/filetype.vim Thu May 10 20:42:30 2007 ---- runtime/filetype.vim Tue May 15 09:12:06 2007 -*************** -*** 1,7 **** - " Vim support file to detect file types - " - " Maintainer: Bram Moolenaar -! " Last Change: 2007 May 10 - - " Listen very carefully, I will say this only once - if exists("did_load_filetypes") ---- 1,7 ---- - " Vim support file to detect file types - " - " Maintainer: Bram Moolenaar -! " Last Change: 2007 May 15 - - " Listen very carefully, I will say this only once - if exists("did_load_filetypes") -*************** -*** 1286,1292 **** - au BufNewFile,BufRead *.it,*.ih setf ppwiz - - " Oracle Pro*C/C++ -! au BufNewFile,BufRead .pc setf proc - - " Privoxy actions file - au BufNewFile,BufRead *.action setf privoxy ---- 1286,1292 ---- - au BufNewFile,BufRead *.it,*.ih setf ppwiz - - " Oracle Pro*C/C++ -! au BufNewFile,BufRead *.pc setf proc - - " Privoxy actions file - au BufNewFile,BufRead *.action setf privoxy -*** ../vim-7.1.001/src/version.c Mon May 14 19:35:51 2007 ---- src/version.c Tue May 15 09:13:11 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 2, - /**/ - --- -hundred-and-one symptoms of being an internet addict: -132. You come back and check this list every half-hour. - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.003 (extra) -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.003 (extra) -Problem: The "Tear off this menu" message appears in the message history - when using a menu. (Yongwei Wu) -Solution: Disable message history when displaying the menu tip. -Files: src/gui_w32.c - - -*** ../vim-7.1.002/src/gui_w32.c Thu May 10 22:17:22 2007 ---- src/gui_w32.c Sat Jun 9 13:43:07 2007 -*************** -*** 1051,1057 **** ---- 1051,1059 ---- - if (pMenu != NULL && pMenu->strings[MENU_INDEX_TIP] != 0 - && GetMenuState(s_menuBar, pMenu->id, MF_BYCOMMAND) != -1) - { -+ ++msg_hist_off; - msg(pMenu->strings[MENU_INDEX_TIP]); -+ --msg_hist_off; - setcursor(); - out_flush(); - did_menu_tip = TRUE; -*** ../vim-7.1.002/src/version.c Tue May 15 09:14:33 2007 ---- src/version.c Tue Jun 19 10:08:17 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 3, - /**/ - --- -In his lifetime van Gogh painted 486 oil paintings. Oddly enough, 8975 -of them are to be found in the United States. - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.004 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.004 -Problem: Crash when doing ":next directory". (Raphael Finkel) -Solution: Do not use "buf", it may be invalid after autocommands. -Files: src/ex_cmds.c - - -*** ../vim-7.1.003/src/ex_cmds.c Thu May 10 21:24:24 2007 ---- src/ex_cmds.c Mon Jun 18 22:03:56 2007 -*************** -*** 3367,3373 **** - * was in this window (or another window). If not used - * before, reset the local window options to the global - * values. Also restores old folding stuff. */ -! get_winopts(buf); - #ifdef FEAT_SPELL - did_get_winopts = TRUE; - #endif ---- 3367,3373 ---- - * was in this window (or another window). If not used - * before, reset the local window options to the global - * values. Also restores old folding stuff. */ -! get_winopts(curbuf); - #ifdef FEAT_SPELL - did_get_winopts = TRUE; - #endif -*************** -*** 3649,3656 **** - #ifdef FEAT_SPELL - /* If the window options were changed may need to set the spell language. - * Can only do this after the buffer has been properly setup. */ -! if (did_get_winopts && curwin->w_p_spell && *buf->b_p_spl != NUL) -! did_set_spelllang(buf); - #endif - - if (command == NULL) ---- 3649,3656 ---- - #ifdef FEAT_SPELL - /* If the window options were changed may need to set the spell language. - * Can only do this after the buffer has been properly setup. */ -! if (did_get_winopts && curwin->w_p_spell && *curbuf->b_p_spl != NUL) -! did_set_spelllang(curbuf); - #endif - - if (command == NULL) -*** ../vim-7.1.003/src/version.c Tue Jun 19 10:09:15 2007 ---- src/version.c Tue Jun 19 11:53:34 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 4, - /**/ - --- -FIRST HEAD: Oh! quick! get the sword out I want to cut his head off. -THIRD HEAD: Oh, cut your own head off. -SECOND HEAD: Yes - do us all a favour. - "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.005 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.005 -Problem: "cit" used on deletes . Should not delete - anything and start insertion, like "ci'" does on "". (Michal - Bozon) -Solution: Handle an empty object specifically. Made it work consistent for - various text objects. -Files: src/search.c - - -*** ../vim-7.1.004/src/search.c Thu May 10 20:54:46 2007 ---- src/search.c Mon Jun 4 12:31:04 2007 -*************** -*** 3600,3612 **** - { - oap->start = start_pos; - oap->motion_type = MCHAR; - if (sol) -- { - incl(&curwin->w_cursor); -! oap->inclusive = FALSE; -! } -! else - oap->inclusive = TRUE; - } - - return OK; ---- 3600,3615 ---- - { - oap->start = start_pos; - oap->motion_type = MCHAR; -+ oap->inclusive = FALSE; - if (sol) - incl(&curwin->w_cursor); -! else if (lt(start_pos, curwin->w_cursor)) -! /* Include the character under the cursor. */ - oap->inclusive = TRUE; -+ else -+ /* End is before the start (no text in between <>, [], etc.): don't -+ * operate on any text. */ -+ curwin->w_cursor = start_pos; - } - - return OK; -*************** -*** 3734,3740 **** - - if (in_html_tag(FALSE)) - { -! /* cursor on start tag, move to just after it */ - while (*ml_get_cursor() != '>') - if (inc_cursor() < 0) - break; ---- 3737,3743 ---- - - if (in_html_tag(FALSE)) - { -! /* cursor on start tag, move to its '>' */ - while (*ml_get_cursor() != '>') - if (inc_cursor() < 0) - break; -*************** -*** 3838,3844 **** - /* Exclude the start tag. */ - curwin->w_cursor = start_pos; - while (inc_cursor() >= 0) -! if (*ml_get_cursor() == '>' && lt(curwin->w_cursor, end_pos)) - { - inc_cursor(); - start_pos = curwin->w_cursor; ---- 3841,3847 ---- - /* Exclude the start tag. */ - curwin->w_cursor = start_pos; - while (inc_cursor() >= 0) -! if (*ml_get_cursor() == '>') - { - inc_cursor(); - start_pos = curwin->w_cursor; -*************** -*** 3860,3866 **** - #ifdef FEAT_VISUAL - if (VIsual_active) - { -! if (*p_sel == 'e') - ++curwin->w_cursor.col; - VIsual = start_pos; - VIsual_mode = 'v'; ---- 3863,3873 ---- - #ifdef FEAT_VISUAL - if (VIsual_active) - { -! /* If the end is before the start there is no text between tags, select -! * the char under the cursor. */ -! if (lt(end_pos, start_pos)) -! curwin->w_cursor = start_pos; -! else if (*p_sel == 'e') - ++curwin->w_cursor.col; - VIsual = start_pos; - VIsual_mode = 'v'; -*************** -*** 3872,3878 **** - { - oap->start = start_pos; - oap->motion_type = MCHAR; -! oap->inclusive = TRUE; - } - retval = OK; - ---- 3879,3893 ---- - { - oap->start = start_pos; - oap->motion_type = MCHAR; -! if (lt(end_pos, start_pos)) -! { -! /* End is before the start: there is no text between tags; operate -! * on an empty area. */ -! curwin->w_cursor = start_pos; -! oap->inclusive = FALSE; -! } -! else -! oap->inclusive = TRUE; - } - retval = OK; - -*** ../vim-7.1.004/src/version.c Tue Jun 19 11:54:23 2007 ---- src/version.c Tue Jun 19 12:57:03 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 5, - /**/ - --- -Life would be so much easier if we could just look at the source code. - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.006 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.006 -Problem: Resetting 'modified' in a StdinReadPost autocommand doesn't work. -Solution: Set 'modified' before the autocommands instead of after it. -Files: src/buffer.c - - -*** ../vim-7.1.005/src/buffer.c Thu May 10 18:43:46 2007 ---- src/buffer.c Fri Jun 8 20:59:04 2007 -*************** -*** 171,176 **** ---- 171,183 ---- - /* Put the cursor on the first line. */ - curwin->w_cursor.lnum = 1; - curwin->w_cursor.col = 0; -+ -+ /* Set or reset 'modified' before executing autocommands, so that -+ * it can be changed there. */ -+ if (!readonlymode && !bufempty()) -+ changed(); -+ else if (retval != FAIL) -+ unchanged(curbuf, FALSE); - #ifdef FEAT_AUTOCMD - # ifdef FEAT_EVAL - apply_autocmds_retval(EVENT_STDINREADPOST, NULL, NULL, FALSE, -*************** -*** 194,209 **** - /* When reading stdin, the buffer contents always needs writing, so set - * the changed flag. Unless in readonly mode: "ls | gview -". - * When interrupted and 'cpoptions' contains 'i' set changed flag. */ -! if ((read_stdin && !readonlymode && !bufempty()) - #ifdef FEAT_AUTOCMD - || modified_was_set /* ":set modified" used in autocmd */ - # ifdef FEAT_EVAL - || (aborting() && vim_strchr(p_cpo, CPO_INTMOD) != NULL) - # endif - #endif -! || (got_int && vim_strchr(p_cpo, CPO_INTMOD) != NULL)) - changed(); -! else if (retval != FAIL) - unchanged(curbuf, FALSE); - save_file_ff(curbuf); /* keep this fileformat */ - ---- 201,216 ---- - /* When reading stdin, the buffer contents always needs writing, so set - * the changed flag. Unless in readonly mode: "ls | gview -". - * When interrupted and 'cpoptions' contains 'i' set changed flag. */ -! if ((got_int && vim_strchr(p_cpo, CPO_INTMOD) != NULL) - #ifdef FEAT_AUTOCMD - || modified_was_set /* ":set modified" used in autocmd */ - # ifdef FEAT_EVAL - || (aborting() && vim_strchr(p_cpo, CPO_INTMOD) != NULL) - # endif - #endif -! ) - changed(); -! else if (retval != FAIL && !read_stdin) - unchanged(curbuf, FALSE); - save_file_ff(curbuf); /* keep this fileformat */ - -*** ../vim-7.1.005/src/version.c Tue Jun 19 12:58:55 2007 ---- src/version.c Tue Jun 19 15:37:53 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 6, - /**/ - --- -If I tell you "you have a beautiful body", would you hold it against me? - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.007 (extra) -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.007 (extra) -Problem: Mac: Context menu doesn't work on Intel Macs. - Scrollbars are not dimmed when Vim is not the active application. -Solution: Remove the test whether context menus are supported. They are - always there in OS/X. Handle the dimming. (Nicolas Weber) -Files: src/gui_mac.c, src/gui.h - - -*** ../vim-7.1.006/src/gui_mac.c Thu May 10 20:07:25 2007 ---- src/gui_mac.c Sat Jun 9 14:19:25 2007 -*************** -*** 1676,1688 **** - /* TODO: NEEDED? */ - clickIsPopup = FALSE; - -! if ((gui.MacOSHaveCntxMenu) && (mouse_model_popup())) -! if (IsShowContextualMenuClick(theEvent)) -! { -! vimMouseButton = MOUSE_RIGHT; -! vimModifiers &= ~MOUSE_CTRL; -! clickIsPopup = TRUE; -! } - - /* Is it a double click ? */ - dblClick = ((theEvent->when - lastMouseTick) < GetDblTime()); ---- 1676,1687 ---- - /* TODO: NEEDED? */ - clickIsPopup = FALSE; - -! if (mouse_model_popup() && IsShowContextualMenuClick(theEvent)) -! { -! vimMouseButton = MOUSE_RIGHT; -! vimModifiers &= ~MOUSE_CTRL; -! clickIsPopup = TRUE; -! } - - /* Is it a double click ? */ - dblClick = ((theEvent->when - lastMouseTick) < GetDblTime()); -*************** -*** 1920,1943 **** - WindowPtr whichWindow; - - whichWindow = (WindowPtr) event->message; -! if ((event->modifiers) & activeFlag) -! /* Activate */ -! gui_focus_change(TRUE); -! else - { -! /* Deactivate */ -! gui_focus_change(FALSE); -! /* DON'T KNOW what the code below was doing -! found in the deactivate clause, but the -! clause writing TRUE into in_focus (BUG) -! */ -! -! #if 0 /* Removed by Dany as per above June 2001 */ -! a_bool = false; -! SetPreserveGlyph(a_bool); -! SetOutlinePreferred(a_bool); -! #endif - } - } - - ---- 1919,1937 ---- - WindowPtr whichWindow; - - whichWindow = (WindowPtr) event->message; -! /* Dim scrollbars */ -! if (whichWindow == gui.VimWindow) - { -! ControlRef rootControl; -! GetRootControl(gui.VimWindow, &rootControl); -! if ((event->modifiers) & activeFlag) -! ActivateControl(rootControl); -! else -! DeactivateControl(rootControl); - } -+ -+ /* Activate */ -+ gui_focus_change((event->modifiers) & activeFlag); - } - - -*************** -*** 2559,2574 **** - OSErr error; - - /* Handle contextual menu right now (if needed) */ -! if (gui.MacOSHaveCntxMenu) -! if (IsShowContextualMenuClick(event)) -! { - # if 0 -! gui_mac_handle_contextual_menu(event); - # else -! gui_mac_doMouseDownEvent(event); - # endif -! return; -! } - - /* Handle normal event */ - switch (event->what) ---- 2553,2567 ---- - OSErr error; - - /* Handle contextual menu right now (if needed) */ -! if (IsShowContextualMenuClick(event)) -! { - # if 0 -! gui_mac_handle_contextual_menu(event); - # else -! gui_mac_doMouseDownEvent(event); - # endif -! return; -! } - - /* Handle normal event */ - switch (event->what) -*************** -*** 2782,2795 **** - (void) InstallAEHandlers(); - #endif - -- if (Gestalt(gestaltContextualMenuAttr, &gestalt_rc) == noErr) -- gui.MacOSHaveCntxMenu = BitTst(&gestalt_rc, 31-gestaltContextualMenuTrapAvailable); -- else -- gui.MacOSHaveCntxMenu = false; -- -- if (gui.MacOSHaveCntxMenu) -- gui.MacOSHaveCntxMenu = (InitContextualMenus()==noErr); -- - pomme = NewMenu(256, "\p\024"); /* 0x14= = Apple Menu */ - - AppendMenu(pomme, "\pAbout VIM"); ---- 2775,2780 ---- -*************** -*** 2941,2946 **** ---- 2926,2932 ---- - #ifdef USE_CARBONKEYHANDLER - EventHandlerRef keyEventHandlerRef; - #endif -+ ControlRef rootControl; - - if (Gestalt(gestaltSystemVersion, &gMacSystemVersion) != noErr) - gMacSystemVersion = 0x1000; /* TODO: Default to minimum sensible value */ -*************** -*** 2954,2968 **** - (void) InstallAEHandlers(); - #endif - -- /* Ctrl click */ -- if (Gestalt(gestaltContextualMenuAttr, &gestalt_rc) == noErr) -- gui.MacOSHaveCntxMenu = BitTst(&gestalt_rc, 31-gestaltContextualMenuTrapAvailable); -- else -- gui.MacOSHaveCntxMenu = false; -- -- if (gui.MacOSHaveCntxMenu) -- gui.MacOSHaveCntxMenu = (InitContextualMenus()==noErr); -- - pomme = NewMenu(256, "\p\024"); /* 0x14= = Apple Menu */ - - AppendMenu(pomme, "\pAbout VIM"); ---- 2940,2945 ---- -*************** -*** 2981,2986 **** ---- 2958,2964 ---- - gui.VimWindow = NewCWindow(nil, &windRect, "\pgVim on Macintosh", true, - zoomDocProc, - (WindowPtr)-1L, true, 0); -+ CreateRootControl(gui.VimWindow, &rootControl); - InstallReceiveHandler((DragReceiveHandlerUPP)receiveHandler, - gui.VimWindow, NULL); - SetPortWindowPort(gui.VimWindow); -*** ../vim-7.1.006/src/gui.h Thu May 10 19:18:46 2007 ---- src/gui.h Sat Jun 9 14:10:34 2007 -*************** -*** 460,466 **** - WindowPtr VimWindow; - MenuHandle MacOSHelpMenu; /* Help menu provided by the MacOS */ - int MacOSHelpItems; /* Nr of help-items supplied by MacOS */ -- int MacOSHaveCntxMenu; /* Contextual menu available */ - WindowPtr wid; /* Window id of text area */ - int visibility; /* Is window partially/fully obscured? */ - #endif ---- 460,465 ---- -*** ../vim-7.1.006/src/version.c Tue Jun 19 15:40:51 2007 ---- src/version.c Tue Jun 19 15:44:15 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 7, - /**/ - --- - When danger reared its ugly head, - He bravely turned his tail and fled - Yes, Brave Sir Robin turned about - And gallantly he chickened out - Bravely taking to his feet - He beat a very brave retreat - Bravest of the brave Sir Robin - Petrified of being dead - Soiled his pants then brave Sir Robin - Turned away and fled. - "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.008 (correction -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Oops, forgot the src/version.c change. - -Patch 7.1.008 -Problem: getfsize() returns a negative number for very big files. -Solution: Check for overflow and return -2. -Files: runtime/doc/eval.txt, src/eval.c - - -*** ../vim-7.1.007/runtime/doc/eval.txt Sat May 12 16:38:23 2007 ---- runtime/doc/eval.txt Sat Jun 9 15:48:40 2007 -*************** -*** 1,4 **** -! *eval.txt* For Vim version 7.1. Last change: 2007 May 11 - - - VIM REFERENCE MANUAL by Bram Moolenaar ---- 1,4 ---- -! *eval.txt* For Vim version 7.1. Last change: 2007 Jun 09 - - - VIM REFERENCE MANUAL by Bram Moolenaar -*************** -*** 2824,2829 **** ---- 2824,2831 ---- - given file {fname}. - If {fname} is a directory, 0 is returned. - If the file {fname} can't be found, -1 is returned. -+ If the size of {fname} is too big to fit in a Number then -2 -+ is returned. - - getfontname([{name}]) *getfontname()* - Without an argument returns the name of the normal font being -*** ../vim-7.1.007/src/eval.c Thu May 10 21:30:00 2007 ---- src/eval.c Sat Jun 9 15:46:46 2007 -*************** -*** 10136,10142 **** ---- 10136,10148 ---- - if (mch_isdir(fname)) - rettv->vval.v_number = 0; - else -+ { - rettv->vval.v_number = (varnumber_T)st.st_size; -+ -+ /* non-perfect check for overflow */ -+ if ((off_t)rettv->vval.v_number != (off_t)st.st_size) -+ rettv->vval.v_number = -2; -+ } - } - else - rettv->vval.v_number = -1; -*** ../vim-7.1.007/src/version.c Tue Jun 19 16:33:53 2007 ---- src/version.c Tue Jun 19 17:30:50 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 8, - /**/ - - --- -ZOOT: I'm afraid our life must seem very dull and quiet compared to yours. - We are but eightscore young blondes, all between sixteen and - nineteen-and-a-half, cut off in this castle, with no one to protect us. - Oooh. It is a lonely life ... bathing ... dressing ... undressing ... - making exciting underwear.... - "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.009 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.009 -Problem: In diff mode, displaying the difference between a tab and spaces - is not highlighted correctly. -Solution: Only change highlighting at the end of displaying a tab. -Files: src/screen.c - - -*** ../vim-7.1.008/src/screen.c Thu May 10 20:15:31 2007 ---- src/screen.c Mon Jun 11 21:49:44 2007 -*************** -*** 3459,3467 **** - #ifdef FEAT_DIFF - if (diff_hlf != (hlf_T)0) - { -! if (diff_hlf == HLF_CHD && ptr - line >= change_start) - diff_hlf = HLF_TXD; /* changed text */ -! if (diff_hlf == HLF_TXD && ptr - line > change_end) - diff_hlf = HLF_CHD; /* changed line */ - line_attr = hl_attr(diff_hlf); - } ---- 3459,3469 ---- - #ifdef FEAT_DIFF - if (diff_hlf != (hlf_T)0) - { -! if (diff_hlf == HLF_CHD && ptr - line >= change_start -! && n_extra == 0) - diff_hlf = HLF_TXD; /* changed text */ -! if (diff_hlf == HLF_TXD && ptr - line > change_end -! && n_extra == 0) - diff_hlf = HLF_CHD; /* changed line */ - line_attr = hl_attr(diff_hlf); - } -*** ../vim-7.1.008/src/version.c Tue Jun 19 17:33:52 2007 ---- src/version.c Tue Jun 19 17:36:36 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 9, - /**/ - --- -Linux is just like a wigwam: no Windows, no Gates and an Apache inside. - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.010 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.010 -Problem: The Gnome session file doesn't restore tab pages. -Solution: Add SSOP_TABPAGES to the session flags. (Matias D'Ambrosio) -Files: src/gui_gtk_x11.c - - -*** ../vim-7.1.009/src/gui_gtk_x11.c Mon May 14 19:35:51 2007 ---- src/gui_gtk_x11.c Sat Jun 9 16:54:13 2007 -*************** -*** 2188,2195 **** - escaped_filename = vim_strsave_escaped(filename, escape_chars); - if (escaped_filename == NULL) - return FALSE; -! mksession_cmdline = g_strconcat("mksession ", (char *)escaped_filename, NULL); - vim_free(escaped_filename); - /* - * Use a reasonable hardcoded set of 'sessionoptions' flags to avoid - * unpredictable effects when the session is saved automatically. Also, ---- 2188,2197 ---- - escaped_filename = vim_strsave_escaped(filename, escape_chars); - if (escaped_filename == NULL) - return FALSE; -! mksession_cmdline = g_strconcat("mksession ", (char *)escaped_filename, -! NULL); - vim_free(escaped_filename); -+ - /* - * Use a reasonable hardcoded set of 'sessionoptions' flags to avoid - * unpredictable effects when the session is saved automatically. Also, -*************** -*** 2199,2205 **** - */ - save_ssop_flags = ssop_flags; - ssop_flags = (SSOP_BLANK|SSOP_CURDIR|SSOP_FOLDS|SSOP_GLOBALS -! |SSOP_HELP|SSOP_OPTIONS|SSOP_WINSIZE); - - do_cmdline_cmd((char_u *)"let Save_VV_this_session = v:this_session"); - failed = (do_cmdline_cmd((char_u *)mksession_cmdline) == FAIL); ---- 2201,2207 ---- - */ - save_ssop_flags = ssop_flags; - ssop_flags = (SSOP_BLANK|SSOP_CURDIR|SSOP_FOLDS|SSOP_GLOBALS -! |SSOP_HELP|SSOP_OPTIONS|SSOP_WINSIZE|SSOP_TABPAGES); - - do_cmdline_cmd((char_u *)"let Save_VV_this_session = v:this_session"); - failed = (do_cmdline_cmd((char_u *)mksession_cmdline) == FAIL); -*** ../vim-7.1.009/src/version.c Tue Jun 19 17:49:12 2007 ---- src/version.c Tue Jun 19 18:07:09 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 10, - /**/ - --- -GALAHAD: No look, really, this isn't nescess ... -PIGLET: We must examine you. -GALAHAD: There's nothing wrong with ... that. - "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.011 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.011 -Problem: Possible buffer overflow when $VIMRUNTIME is very long. (Victor - Stinner) -Solution: Use vim_snprintf(). -Files: src/main.c - - -*** ../vim-7.1.010/src/main.c Thu May 10 21:12:25 2007 ---- src/main.c Sat Jun 9 22:37:46 2007 -*************** -*** 1360,1367 **** - p = vim_getenv((char_u *)"VIMRUNTIME", &mustfree); - if (p != NULL && *p != NUL) - { -! STRCPY(NameBuff, p); -! STRCAT(NameBuff, "/lang"); - bindtextdomain(VIMPACKAGE, (char *)NameBuff); - } - if (mustfree) ---- 1360,1366 ---- - p = vim_getenv((char_u *)"VIMRUNTIME", &mustfree); - if (p != NULL && *p != NUL) - { -! vim_snprintf((char *)NameBuff, MAXPATHL, "%s/lang", p); - bindtextdomain(VIMPACKAGE, (char *)NameBuff); - } - if (mustfree) -*** ../vim-7.1.010/src/version.c Tue Jun 19 18:07:52 2007 ---- src/version.c Tue Jun 19 20:29:44 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 11, - /**/ - --- - GALAHAD hurries to the door and pushes through it. As he leaves the room - we CUT TO the reverse to show that he is now in a room full of bathing - and romping GIRLIES, all innocent, wide-eyed and beautiful. They smile - enchantingly at him as he tries to keep walking without being diverted by - the lovely sights assaulting his eyeballs. - "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.012 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.012 -Problem: ":let &shiftwidth = 'asdf'" doesn't produce an error message. -Solution: Check for a string argument. (Chris Lubinski) -Files: src/option.c - - -*** ../vim-7.1.011/src/option.c Sun May 6 15:37:32 2007 ---- src/option.c Tue Jun 19 20:56:36 2007 -*************** -*** 8219,8224 **** ---- 8219,8243 ---- - varp = get_varp(&options[opt_idx]); - if (varp != NULL) /* hidden option is not changed */ - { -+ if (number == 0 && string != NULL) -+ { -+ int index; -+ -+ /* Either we are given a string or we are setting option -+ * to zero. */ -+ for (index = 0; string[index] == '0'; ++index) -+ ; -+ if (string[index] != NUL || index == 0) -+ { -+ /* There's another character after zeros or the string -+ * is empty. In both cases, we are trying to set a -+ * num option using a string. */ -+ EMSG3(_("E521: Number required: &%s = '%s'"), -+ name, string); -+ return; /* do nothing as we hit an error */ -+ -+ } -+ } - if (flags & P_NUM) - (void)set_num_option(opt_idx, varp, number, - NULL, 0, opt_flags); -*** ../vim-7.1.011/src/version.c Tue Jun 19 20:30:46 2007 ---- src/version.c Tue Jun 19 20:53:15 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 12, - /**/ - --- -Ten million Linux users can't be wrong! - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.013 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.013 -Problem: ":syn include" only loads the first file, while it is documented - as doing the equivalent of ":runtime!". -Solution: Change the argument to source_runtime(). (James Vega) -Files: src/syntax.c - - -*** ../vim-7.1.012/src/syntax.c Thu May 10 20:54:33 2007 ---- src/syntax.c Sun Jun 17 22:03:30 2007 -*************** -*** 4460,4467 **** - current_syn_inc_tag = ++running_syn_inc_tag; - prev_toplvl_grp = curbuf->b_syn_topgrp; - curbuf->b_syn_topgrp = sgl_id; -! if (source ? do_source(eap->arg, FALSE, FALSE) == FAIL -! : source_runtime(eap->arg, DOSO_NONE) == FAIL) - EMSG2(_(e_notopen), eap->arg); - curbuf->b_syn_topgrp = prev_toplvl_grp; - current_syn_inc_tag = prev_syn_inc_tag; ---- 4460,4467 ---- - current_syn_inc_tag = ++running_syn_inc_tag; - prev_toplvl_grp = curbuf->b_syn_topgrp; - curbuf->b_syn_topgrp = sgl_id; -! if (source ? do_source(eap->arg, FALSE, DOSO_NONE) == FAIL -! : source_runtime(eap->arg, TRUE) == FAIL) - EMSG2(_(e_notopen), eap->arg); - curbuf->b_syn_topgrp = prev_toplvl_grp; - current_syn_inc_tag = prev_syn_inc_tag; -*** ../vim-7.1.012/src/version.c Tue Jun 19 20:56:52 2007 ---- src/version.c Thu Jun 28 11:58:25 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 13, - /**/ - --- -MORTICIAN: What? -CUSTOMER: Nothing -- here's your nine pence. -DEAD PERSON: I'm not dead! -MORTICIAN: Here -- he says he's not dead! -CUSTOMER: Yes, he is. -DEAD PERSON: I'm not! - The Quest for the Holy Grail (Monty Python) - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.014 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.014 -Problem: Crash when doing C indenting. (Chris Monson) -Solution: Obtain the current line again after invoking cin_islabel(). -Files: src/edit.c - - -*** ../vim-7.1.013/src/edit.c Thu May 10 20:44:18 2007 ---- src/edit.c Wed Jun 20 18:25:54 2007 -*************** -*** 7215,7220 **** ---- 7215,7222 ---- - p = ml_get_curline(); - if (cin_iscase(p) || cin_isscopedecl(p) || cin_islabel(30)) - return TRUE; -+ /* Need to get the line again after cin_islabel(). */ -+ p = ml_get_curline(); - if (curwin->w_cursor.col > 2 - && p[curwin->w_cursor.col - 1] == ':' - && p[curwin->w_cursor.col - 2] == ':') -*** ../vim-7.1.013/src/version.c Thu Jun 28 11:59:13 2007 ---- src/version.c Thu Jun 28 12:26:52 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 14, - /**/ - --- -Have you heard about the new Barbie doll? It's called Divorce -Barbie. It comes with all of Ken's stuff. - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.016 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.016 (after patch 7.1.012) -Problem: Error message about setting 'diff' to a string. -Solution: Don't pass an empty string to set_option_value() when setting - 'diff'. -Files: src/quickfix.c, src/popupmnu.c - - -*** ../vim-7.1.015/src/quickfix.c Sun Feb 4 02:58:00 2007 ---- src/quickfix.c Thu Jun 28 18:56:16 2007 -*************** -*** 2331,2337 **** - set_option_value((char_u *)"bt", 0L, (char_u *)"quickfix", - OPT_LOCAL); - set_option_value((char_u *)"bh", 0L, (char_u *)"wipe", OPT_LOCAL); -! set_option_value((char_u *)"diff", 0L, (char_u *)"", OPT_LOCAL); - } - - /* Only set the height when still in the same tab page and there is no ---- 2331,2337 ---- - set_option_value((char_u *)"bt", 0L, (char_u *)"quickfix", - OPT_LOCAL); - set_option_value((char_u *)"bh", 0L, (char_u *)"wipe", OPT_LOCAL); -! set_option_value((char_u *)"diff", 0L, NULL, OPT_LOCAL); - } - - /* Only set the height when still in the same tab page and there is no -*** ../vim-7.1.015/src/popupmnu.c Tue Mar 27 12:42:05 2007 ---- src/popupmnu.c Thu Jun 28 19:00:51 2007 -*************** -*** 466,472 **** - set_option_value((char_u *)"bh", 0L, - (char_u *)"wipe", OPT_LOCAL); - set_option_value((char_u *)"diff", 0L, -! (char_u *)"", OPT_LOCAL); - } - } - if (res == OK) ---- 466,472 ---- - set_option_value((char_u *)"bh", 0L, - (char_u *)"wipe", OPT_LOCAL); - set_option_value((char_u *)"diff", 0L, -! NULL, OPT_LOCAL); - } - } - if (res == OK) -*** ../vim-7.1.015/src/version.c Thu Jun 28 13:02:22 2007 ---- src/version.c Thu Jun 28 21:20:20 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 16, - /**/ - --- -We do not stumble over mountains, but over molehills. - Confucius - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.017 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.017 -Problem: ":confirm w" does give a prompt when 'readonly' is set, but not - when the file permissions are read-only. (Michael Schaap) -Solution: Provide a dialog in both situations. (Chris Lubinski) -Files: src/ex_cmds.c, src/fileio.c, src/proto/fileio.pro - - -*** ../vim-7.1.016/src/ex_cmds.c Tue Jun 19 11:54:23 2007 ---- src/ex_cmds.c Tue Jun 19 22:37:25 2007 -*************** -*** 2912,2933 **** - } - - /* -! * Check if a buffer is read-only. Ask for overruling in a dialog. -! * Return TRUE and give an error message when the buffer is readonly. - */ - static int - check_readonly(forceit, buf) - int *forceit; - buf_T *buf; - { -! if (!*forceit && buf->b_p_ro) - { - #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG) - if ((p_confirm || cmdmod.confirm) && buf->b_fname != NULL) - { - char_u buff[IOSIZE]; - -! dialog_msg(buff, _("'readonly' option is set for \"%s\".\nDo you wish to write anyway?"), - buf->b_fname); - - if (vim_dialog_yesno(VIM_QUESTION, NULL, buff, 2) == VIM_YES) ---- 2912,2946 ---- - } - - /* -! * Check if a buffer is read-only (either 'readonly' option is set or file is -! * read-only). Ask for overruling in a dialog. Return TRUE and give an error -! * message when the buffer is readonly. - */ - static int - check_readonly(forceit, buf) - int *forceit; - buf_T *buf; - { -! struct stat st; -! -! /* Handle a file being readonly when the 'readonly' option is set or when -! * the file exists and permissions are read-only. -! * We will send 0777 to check_file_readonly(), as the "perm" variable is -! * important for device checks but not here. */ -! if (!*forceit && (buf->b_p_ro -! || (mch_stat((char *)buf->b_ffname, &st) >= 0 -! && check_file_readonly(buf->b_ffname, 0777)))) - { - #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG) - if ((p_confirm || cmdmod.confirm) && buf->b_fname != NULL) - { - char_u buff[IOSIZE]; - -! if (buf->b_p_ro) -! dialog_msg(buff, _("'readonly' option is set for \"%s\".\nDo you wish to write anyway?"), -! buf->b_fname); -! else -! dialog_msg(buff, _("File permissions of \"%s\" are read-only.\nIt may still be possible to write it.\nDo you wish to try?"), - buf->b_fname); - - if (vim_dialog_yesno(VIM_QUESTION, NULL, buff, 2) == VIM_YES) -*************** -*** 2941,2949 **** ---- 2954,2967 ---- - } - else - #endif -+ if (buf->b_p_ro) - EMSG(_(e_readonly)); -+ else -+ EMSG2(_("E505: \"%s\" is read-only (add ! to override)"), -+ buf->b_fname); - return TRUE; - } -+ - return FALSE; - } - -*** ../vim-7.1.016/src/fileio.c Thu May 10 19:32:17 2007 ---- src/fileio.c Thu Jun 28 21:54:18 2007 -*************** -*** 424,430 **** - */ - if (!p_odev && mch_nodetype(fname) == NODE_WRITABLE) - { -! filemess(curbuf, fname, (char_u *)_("is a device (disabled with 'opendevice' option"), 0); - msg_end(); - msg_scroll = msg_save; - return FAIL; ---- 424,430 ---- - */ - if (!p_odev && mch_nodetype(fname) == NODE_WRITABLE) - { -! filemess(curbuf, fname, (char_u *)_("is a device (disabled with 'opendevice' option)"), 0); - msg_end(); - msg_scroll = msg_save; - return FAIL; -*************** -*** 2734,2739 **** ---- 2734,2765 ---- - #endif - - /* -+ * Return TRUE if a file appears to be read-only from the file permissions. -+ */ -+ int -+ check_file_readonly(fname, perm) -+ char_u *fname; /* full path to file */ -+ int perm; /* known permissions on file */ -+ { -+ #ifndef USE_MCH_ACCESS -+ int fd = 0; -+ #endif -+ -+ return ( -+ #ifdef USE_MCH_ACCESS -+ # ifdef UNIX -+ (perm & 0222) == 0 || -+ # endif -+ mch_access((char *)fname, W_OK) -+ #else -+ (fd = mch_open((char *)fname, O_RDWR | O_EXTRA, 0)) < 0 -+ ? TRUE : (close(fd), FALSE) -+ #endif -+ ); -+ } -+ -+ -+ /* - * buf_write() - write to file "fname" lines "start" through "end" - * - * We do our own buffering here because fwrite() is so slow. -*************** -*** 3219,3235 **** - * Check if the file is really writable (when renaming the file to - * make a backup we won't discover it later). - */ -! file_readonly = ( -! # ifdef USE_MCH_ACCESS -! # ifdef UNIX -! (perm & 0222) == 0 || -! # endif -! mch_access((char *)fname, W_OK) -! # else -! (fd = mch_open((char *)fname, O_RDWR | O_EXTRA, 0)) < 0 -! ? TRUE : (close(fd), FALSE) -! # endif -! ); - if (!forceit && file_readonly) - { - if (vim_strchr(p_cpo, CPO_FWRITE) != NULL) ---- 3245,3252 ---- - * Check if the file is really writable (when renaming the file to - * make a backup we won't discover it later). - */ -! file_readonly = check_file_readonly(fname, (int)perm); -! - if (!forceit && file_readonly) - { - if (vim_strchr(p_cpo, CPO_FWRITE) != NULL) -*** ../vim-7.1.016/src/proto/fileio.pro Sat May 5 19:59:00 2007 ---- src/proto/fileio.pro Thu Jun 28 21:09:59 2007 -*************** -*** 2,7 **** ---- 2,8 ---- - void filemess __ARGS((buf_T *buf, char_u *name, char_u *s, int attr)); - int readfile __ARGS((char_u *fname, char_u *sfname, linenr_T from, linenr_T lines_to_skip, linenr_T lines_to_read, exarg_T *eap, int flags)); - int prep_exarg __ARGS((exarg_T *eap, buf_T *buf)); -+ int check_file_readonly __ARGS((char_u *fname, int perm)); - int buf_write __ARGS((buf_T *buf, char_u *fname, char_u *sfname, linenr_T start, linenr_T end, exarg_T *eap, int append, int forceit, int reset_changed, int filtering)); - void msg_add_fname __ARGS((buf_T *buf, char_u *fname)); - void msg_add_lines __ARGS((int insert_space, long lnum, long nchars)); -*** ../vim-7.1.016/src/version.c Thu Jun 28 21:23:52 2007 ---- src/version.c Thu Jun 28 21:49:29 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 17, - /**/ - --- -CUSTOMER: Well, can you hang around a couple of minutes? He won't be - long. -MORTICIAN: Naaah, I got to go on to Robinson's -- they've lost nine today. -CUSTOMER: Well, when is your next round? -MORTICIAN: Thursday. -DEAD PERSON: I think I'll go for a walk. - The Quest for the Holy Grail (Monty Python) - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.018 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.018 -Problem: When 'virtualedit' is set a "p" of a block just past the end of - the line inserts before the cursor. (Engelke) -Solution: Check for the cursor being just after the line (Chris Lubinski) -Files: src/ops.c - - -*** ../vim-7.1.017/src/ops.c Thu May 10 20:34:55 2007 ---- src/ops.c Tue Jun 19 22:40:45 2007 -*************** -*** 3404,3410 **** - - #ifdef FEAT_VIRTUALEDIT - col += curwin->w_cursor.coladd; -! if (ve_flags == VE_ALL && curwin->w_cursor.coladd > 0) - { - if (dir == FORWARD && c == NUL) - ++col; ---- 3404,3412 ---- - - #ifdef FEAT_VIRTUALEDIT - col += curwin->w_cursor.coladd; -! if (ve_flags == VE_ALL -! && (curwin->w_cursor.coladd > 0 -! || endcol2 == curwin->w_cursor.col)) - { - if (dir == FORWARD && c == NUL) - ++col; -*** ../vim-7.1.017/src/version.c Thu Jun 28 21:57:08 2007 ---- src/version.c Thu Jun 28 22:12:49 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 18, - /**/ - --- - [clop clop] -MORTICIAN: Who's that then? -CUSTOMER: I don't know. -MORTICIAN: Must be a king. -CUSTOMER: Why? -MORTICIAN: He hasn't got shit all over him. - The Quest for the Holy Grail (Monty Python) - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.019 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.019 -Problem: ":py" asks for an argument, ":py asd" then gives the error that - ":py" isn't implemented. Should already happen for ":py". -Solution: Compare with ex_script_ni. (Chris Lubinski) -Files: src/ex_docmd.c - - -*** ../vim-7.1.018/src/ex_docmd.c Thu May 10 18:53:03 2007 ---- src/ex_docmd.c Sat Jun 23 13:36:37 2007 -*************** -*** 2118,2124 **** - #ifdef FEAT_USR_CMDS - !USER_CMDIDX(ea.cmdidx) && - #endif -! cmdnames[ea.cmdidx].cmd_func == ex_ni); - - #ifndef FEAT_EVAL - /* ---- 2118,2125 ---- - #ifdef FEAT_USR_CMDS - !USER_CMDIDX(ea.cmdidx) && - #endif -! (cmdnames[ea.cmdidx].cmd_func == ex_ni -! || cmdnames[ea.cmdidx].cmd_func == ex_script_ni)); - - #ifndef FEAT_EVAL - /* -*** ../vim-7.1.018/src/version.c Thu Jun 28 22:14:28 2007 ---- src/version.c Thu Jul 5 09:48:11 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 19, - /**/ - --- -MARTHA'S WAY: Don't throw out all that leftover wine. Freeze into ice cubes - for future use in casseroles and sauces. -MY WAY: What leftover wine? - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.020 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.020 -Problem: Reading from uninitialized memory when using a dialog. (Dominique - Pelle) -Solution: In msg_show_console_dialog() append a NUL after every appended - character. -Files: src/message.c - - -*** ../vim-7.1.019/src/message.c Thu May 10 18:49:39 2007 ---- src/message.c Sun Jul 1 12:06:52 2007 -*************** -*** 3456,3466 **** - /* advance to next hotkey and set default hotkey */ - #ifdef FEAT_MBYTE - if (has_mbyte) -! hotkp += (*mb_ptr2len)(hotkp); - else - #endif - ++hotkp; -! (void)copy_char(r + 1, hotkp, TRUE); - if (dfltbutton) - --dfltbutton; - ---- 3456,3466 ---- - /* advance to next hotkey and set default hotkey */ - #ifdef FEAT_MBYTE - if (has_mbyte) -! hotkp += STRLEN(hotkp); - else - #endif - ++hotkp; -! hotkp[copy_char(r + 1, hotkp, TRUE)] = NUL; - if (dfltbutton) - --dfltbutton; - -*************** -*** 3493,3499 **** - *msgp++ = (dfltbutton == 1) ? ']' : ')'; - - /* redefine hotkey */ -! (void)copy_char(r, hotkp, TRUE); - } - } - else ---- 3493,3499 ---- - *msgp++ = (dfltbutton == 1) ? ']' : ')'; - - /* redefine hotkey */ -! hotkp[copy_char(r, hotkp, TRUE)] = NUL; - } - } - else -*************** -*** 3519,3526 **** - *msgp++ = ':'; - *msgp++ = ' '; - *msgp = NUL; -- mb_ptr_adv(hotkp); -- *hotkp = NUL; - } - else - { ---- 3519,3524 ---- -*************** -*** 3555,3562 **** - msgp = confirm_msg + 1 + STRLEN(message); - hotkp = hotk; - -! /* define first default hotkey */ -! (void)copy_char(buttons, hotkp, TRUE); - - /* Remember where the choices start, displaying starts here when - * "hotkp" typed at the more prompt. */ ---- 3553,3561 ---- - msgp = confirm_msg + 1 + STRLEN(message); - hotkp = hotk; - -! /* Define first default hotkey. Keep the hotkey string NUL -! * terminated to avoid reading past the end. */ -! hotkp[copy_char(buttons, hotkp, TRUE)] = NUL; - - /* Remember where the choices start, displaying starts here when - * "hotkp" typed at the more prompt. */ -*** ../vim-7.1.019/src/version.c Thu Jul 5 09:53:20 2007 ---- src/version.c Thu Jul 5 10:09:34 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 20, - /**/ - --- -BLACK KNIGHT: Come on you pansy! - [hah] [parry thrust] - [ARTHUR chops the BLACK KNIGHT's right arm off] -ARTHUR: Victory is mine! [kneeling] - We thank thee Lord, that in thy merc- - [Black Knight kicks Arthur in the head while he is praying] - The Quest for the Holy Grail (Monty Python) - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.022 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.022 -Problem: When setting 'keymap' twice the b:keymap_name variable isn't set. - (Milan Berta) -Solution: Don't unlet b:keymap_name for ":loadkeymap". (Martin Toft) -Files: src/digraph.c - - -*** ../vim-7.1.021/src/digraph.c Wed May 3 00:07:11 2006 ---- src/digraph.c Mon Jul 2 21:24:30 2007 -*************** -*** 2349,2356 **** - - if (*curbuf->b_p_keymap == NUL) - { -! /* Stop any active keymap and clear the table. */ - keymap_unload(); - } - else - { ---- 2349,2358 ---- - - if (*curbuf->b_p_keymap == NUL) - { -! /* Stop any active keymap and clear the table. Also remove -! * b:keymap_unload, as no keymap is active now. */ - keymap_unload(); -+ do_cmdline_cmd((char_u *)"unlet! b:keymap_name"); - } - else - { -*************** -*** 2500,2506 **** - - ga_clear(&curbuf->b_kmap_ga); - curbuf->b_kmap_state &= ~KEYMAP_LOADED; -- do_cmdline_cmd((char_u *)"unlet! b:keymap_name"); - #ifdef FEAT_WINDOWS - status_redraw_curbuf(); - #endif ---- 2502,2507 ---- -*** ../vim-7.1.021/src/version.c Fri Jul 6 19:42:09 2007 ---- src/version.c Sat Jul 7 13:56:52 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 22, - /**/ - --- -If your life is a hard drive, -Christ can be your backup. - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.023 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.023 -Problem: "dw" in a line with one character deletes the line. Vi and nvi - don't do this. (Kjell Arne Rekaa) -Solution: Check for one-character words especially. -Files: src/search.c - - -*** ../vim-7.1.022/src/search.c Tue Jun 19 12:58:55 2007 ---- src/search.c Thu Jul 5 21:18:55 2007 -*************** -*** 2795,2801 **** - i = inc_cursor(); - if (i == -1 || (i >= 1 && last_line)) /* started at last char in file */ - return FAIL; -! if (i == 1 && eol && count == 0) /* started at last char in line */ - return OK; - - /* ---- 2802,2808 ---- - i = inc_cursor(); - if (i == -1 || (i >= 1 && last_line)) /* started at last char in file */ - return FAIL; -! if (i >= 1 && eol && count == 0) /* started at last char in line */ - return OK; - - /* -*** ../vim-7.1.022/src/version.c Sat Jul 7 13:57:39 2007 ---- src/version.c Tue Jul 10 12:35:36 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 23, - /**/ - --- -BRIDGEKEEPER: What is your favorite editor? -GAWAIN: Emacs ... No, Viiiiiiiiiiimmmmmmm! - "Monty Python and the Holy editor wars" PYTHON (MONTY) SOFTWARE LTD - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.024 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.024 -Problem: Using a pointer that has become invalid. (Chris Monson) -Solution: Obtain the line pointer again after we looked at another line. -Files: src/search.c - - -*** ../vim-7.1.023/src/search.c Tue Jul 10 12:36:51 2007 ---- src/search.c Thu Jul 5 21:18:55 2007 -*************** -*** 2124,2129 **** ---- 2128,2136 ---- - else if (!backwards) - inquote = TRUE; - } -+ -+ /* ml_get() only keeps one line, need to get linep again */ -+ linep = ml_get(pos.lnum); - } - } - } -*** ../vim-7.1.023/src/version.c Tue Jul 10 12:36:51 2007 ---- src/version.c Tue Jul 10 13:06:02 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 24, - /**/ - --- -Q: Why does /dev/null accept only integers? -A: You can't sink a float. - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.025 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.025 -Problem: search() and searchpos() don't use match under cursor at start of - line when using 'bc' flags. (Viktor Kojouharov) -Solution: Don't go to the previous line when the 'c' flag is present. - Also fix that "j" doesn't move the cursor to the right column. -Files: src/eval.c, src/search.c - - -*** ../vim-7.1.024/src/eval.c Tue Jun 19 17:23:46 2007 ---- src/eval.c Thu Jul 5 21:16:31 2007 -*************** -*** 13925,13930 **** ---- 13925,13932 ---- - /* If 'n' flag is used: restore cursor position. */ - if (flags & SP_NOMOVE) - curwin->w_cursor = save_cursor; -+ else -+ curwin->w_set_curswant = TRUE; - theend: - p_ws = save_p_ws; - -*** ../vim-7.1.024/src/search.c Tue Jul 10 13:07:08 2007 ---- src/search.c Thu Jul 5 21:18:55 2007 -*************** -*** 573,580 **** - /* - * Start searching in current line, unless searching backwards and - * we're in column 0. - */ -! if (dir == BACKWARD && start_pos.col == 0) - { - lnum = pos->lnum - 1; - at_first_line = FALSE; ---- 573,584 ---- - /* - * Start searching in current line, unless searching backwards and - * we're in column 0. -+ * If we are searching backwards, in column 0, and not including the -+ * current position, gain some efficiency by skipping back a line. -+ * Otherwise begin the search in the current line. - */ -! if (dir == BACKWARD && start_pos.col == 0 -! && (options & SEARCH_START) == 0) - { - lnum = pos->lnum - 1; - at_first_line = FALSE; -*** ../vim-7.1.024/src/version.c Tue Jul 10 13:07:08 2007 ---- src/version.c Tue Jul 10 13:26:13 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 25, - /**/ - --- -SIGFUN -- signature too funny (core dumped) - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.026 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.026 -Problem: "[p" doesn't work in Visual mode. (David Brown) -Solution: Use checkclearop() instead of checkclearopq(). -Files: src/normal.c - - -*** ../vim-7.1.025/src/normal.c Thu May 10 18:45:26 2007 ---- src/normal.c Wed Jul 4 21:16:36 2007 -*************** -*** 6379,6385 **** - */ - else if (cap->nchar == 'p' || cap->nchar == 'P') - { -! if (!checkclearopq(cap->oap)) - { - prep_redo_cmd(cap); - do_put(cap->oap->regname, ---- 6379,6385 ---- - */ - else if (cap->nchar == 'p' || cap->nchar == 'P') - { -! if (!checkclearop(cap->oap)) - { - prep_redo_cmd(cap); - do_put(cap->oap->regname, -*** ../vim-7.1.025/src/version.c Tue Jul 10 13:27:46 2007 ---- src/version.c Tue Jul 10 14:01:52 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 26, - /**/ - --- -BRIDGEKEEPER: What is the air-speed velocity of an unladen swallow? -ARTHUR: What do you mean? An African or European swallow? -BRIDGEKEEPER: Er ... I don't know that ... Aaaaarrrrrrggghhh! - BRIDGEKEEPER is cast into the gorge. - "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.027 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.027 -Problem: On Sun systems opening /dev/fd/N doesn't work, and they are used - by process substitutions. -Solution: Allow opening specific character special files for Sun systems. - (Gary Johnson) -Files: src/fileio.c, src/os_unix.h - - -*** ../vim-7.1.026/src/fileio.c Thu Jun 28 21:57:08 2007 ---- src/fileio.c Mon Jul 9 11:19:50 2007 -*************** -*** 44,49 **** ---- 44,53 ---- - /* Is there any system that doesn't have access()? */ - #define USE_MCH_ACCESS - -+ #if defined(sun) && defined(S_ISCHR) -+ # define OPEN_CHR_FILES -+ static int is_dev_fd_file(char_u *fname); -+ #endif - #ifdef FEAT_MBYTE - static char_u *next_fenc __ARGS((char_u **pp)); - # ifdef FEAT_EVAL -*************** -*** 406,411 **** ---- 410,419 ---- - # ifdef S_ISSOCK - && !S_ISSOCK(perm) /* ... or socket */ - # endif -+ # ifdef OPEN_CHR_FILES -+ && !(S_ISCHR(perm) && is_dev_fd_file(fname)) -+ /* ... or a character special file named /dev/fd/ */ -+ # endif - ) - { - if (S_ISDIR(perm)) -*************** -*** 2265,2270 **** ---- 2273,2285 ---- - } - # endif - # endif -+ # ifdef OPEN_CHR_FILES -+ if (S_ISCHR(perm)) /* or character special */ -+ { -+ STRCAT(IObuff, _("[character special]")); -+ c = TRUE; -+ } -+ # endif - #endif - if (curbuf->b_p_ro) - { -*************** -*** 2463,2468 **** ---- 2478,2502 ---- - return FAIL; - return OK; - } -+ -+ #ifdef OPEN_CHR_FILES -+ /* -+ * Returns TRUE if the file name argument is of the form "/dev/fd/\d\+", -+ * which is the name of files used for process substitution output by -+ * some shells on some operating systems, e.g., bash on SunOS. -+ * Do not accept "/dev/fd/[012]", opening these may hang Vim. -+ */ -+ static int -+ is_dev_fd_file(fname) -+ char_u *fname; -+ { -+ return (STRNCMP(fname, "/dev/fd/", 8) == 0 -+ && VIM_ISDIGIT(fname[8]) -+ && *skipdigits(fname + 9) == NUL -+ && (fname[9] != NUL -+ || (fname[8] != '0' && fname[8] != '1' && fname[8] != '2'))); -+ } -+ #endif - - #ifdef FEAT_MBYTE - -*** ../vim-7.1.026/src/os_unix.h Thu May 10 19:43:10 2007 ---- src/os_unix.h Sat Jul 7 13:08:56 2007 -*************** -*** 508,513 **** ---- 508,516 ---- - #if !defined(S_ISFIFO) && defined(S_IFIFO) - # define S_ISFIFO(m) (((m) & S_IFMT) == S_IFIFO) - #endif -+ #if !defined(S_ISCHR) && defined(S_IFCHR) -+ # define S_ISCHR(m) (((m) & S_IFMT) == S_IFCHR) -+ #endif - - /* Note: Some systems need both string.h and strings.h (Savage). However, - * some systems can't handle both, only use string.h in that case. */ -*** ../vim-7.1.026/src/version.c Tue Jul 10 14:02:51 2007 ---- src/version.c Tue Jul 10 17:00:43 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 27, - /**/ - --- -Every exit is an entrance into something else. - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.028 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.028 -Problem: Can't use last search pattern for ":sort". (Brian McKee) -Solution: When the pattern is emtpy use the last search pattern. (Martin - Toft) -Files: runtime/doc/change.txt, src/ex_cmds.c - - -*** ../vim-7.1.027/runtime/doc/change.txt Sat May 12 16:10:12 2007 ---- runtime/doc/change.txt Tue Jul 10 11:30:56 2007 -*************** -*** 1571,1576 **** ---- 1571,1580 ---- - in their original order, right before the sorted - lines. - -+ If {pattern} is empty (e.g. // is specified), the -+ last search pattern is used. This allows trying out -+ a pattern first. -+ - Note that using ":sort" with ":global" doesn't sort the matching lines, it's - quite useless. - -*** ../vim-7.1.027/src/ex_cmds.c Thu Jun 28 21:57:08 2007 ---- src/ex_cmds.c Tue Jul 10 17:25:10 2007 -*************** -*** 408,414 **** - goto sortend; - } - *s = NUL; -! regmatch.regprog = vim_regcomp(p + 1, RE_MAGIC); - if (regmatch.regprog == NULL) - goto sortend; - p = s; /* continue after the regexp */ ---- 408,418 ---- - goto sortend; - } - *s = NUL; -! /* Use last search pattern if sort pattern is empty. */ -! if (s == p + 1 && last_search_pat() != NULL) -! regmatch.regprog = vim_regcomp(last_search_pat(), RE_MAGIC); -! else -! regmatch.regprog = vim_regcomp(p + 1, RE_MAGIC); - if (regmatch.regprog == NULL) - goto sortend; - p = s; /* continue after the regexp */ -*** ../vim-7.1.027/src/version.c Tue Jul 10 17:09:51 2007 ---- src/version.c Tue Jul 10 17:20:01 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 28, - /**/ - --- -Every person is responsible for the choices he makes. - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.029 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.029 (after 7.1.019) -Problem: Can't compile when all interfaces are used. (Taylor Venable) -Solution: Only check for ex_script_ni when it's defined. -Files: src/ex_docmd.c - - -*** ../vim-7.1.028/src/ex_docmd.c Thu Jul 5 09:53:20 2007 ---- src/ex_docmd.c Sun Jul 15 17:20:09 2007 -*************** -*** 133,138 **** ---- 133,139 ---- - static void get_flags __ARGS((exarg_T *eap)); - #if !defined(FEAT_PERL) || !defined(FEAT_PYTHON) || !defined(FEAT_TCL) \ - || !defined(FEAT_RUBY) || !defined(FEAT_MZSCHEME) -+ # define HAVE_EX_SCRIPT_NI - static void ex_script_ni __ARGS((exarg_T *eap)); - #endif - static char_u *invalid_range __ARGS((exarg_T *eap)); -*************** -*** 2119,2125 **** - !USER_CMDIDX(ea.cmdidx) && - #endif - (cmdnames[ea.cmdidx].cmd_func == ex_ni -! || cmdnames[ea.cmdidx].cmd_func == ex_script_ni)); - - #ifndef FEAT_EVAL - /* ---- 2120,2129 ---- - !USER_CMDIDX(ea.cmdidx) && - #endif - (cmdnames[ea.cmdidx].cmd_func == ex_ni -! #ifdef HAVE_EX_SCRIPT_NI -! || cmdnames[ea.cmdidx].cmd_func == ex_script_ni -! #endif -! )); - - #ifndef FEAT_EVAL - /* -*************** -*** 3998,4005 **** - eap->errmsg = (char_u *)N_("E319: Sorry, the command is not available in this version"); - } - -! #if !defined(FEAT_PERL) || !defined(FEAT_PYTHON) || !defined(FEAT_TCL) \ -! || !defined(FEAT_RUBY) || !defined(FEAT_MZSCHEME) - /* - * Function called for script command which is Not Implemented. NI! - * Skips over ":perl <errmsg = (char_u *)N_("E319: Sorry, the command is not available in this version"); - } - -! #ifdef HAVE_EX_SCRIPT_NI - /* - * Function called for script command which is Not Implemented. NI! - * Skips over ":perl < -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.030 -Problem: The "vimtutor" shell script checks for "vim6" but not for "vim7". - (Christian Robinson) -Solution: Check for more versions, but prefer using "vim". -Files: src/vimtutor - - -*** ../vim-7.1.029/src/vimtutor Sun Jun 13 20:37:33 2004 ---- src/vimtutor Sun Jul 8 17:16:29 2007 -*************** -*** 39,56 **** - # remove the copy of the tutor on exit - trap "rm -rf $TODELETE" 0 1 2 3 9 11 13 15 - -! # Vim could be called "vim" or "vi". Also check for "vim6", for people who -! # have Vim 5.x installed as "vim" and Vim 6.0 as "vim6". -! testvim=`which vim6 2>/dev/null` -! if test -f "$testvim"; then -! VIM=vim6 -! else -! testvim=`which vim` - if test -f "$testvim"; then -! VIM=vim -! else -! VIM=vi - fi - fi - - # Use Vim to copy the tutor, it knows the value of $VIMRUNTIME ---- 39,60 ---- - # remove the copy of the tutor on exit - trap "rm -rf $TODELETE" 0 1 2 3 9 11 13 15 - -! # Vim could be called "vim" or "vi". Also check for "vimN", for people who -! # have Vim installed with its version number. -! # We anticipate up to a future Vim 8 version :-). -! seq="vim vim8 vim75 vim74 vim73 vim72 vim71 vim70 vim7 vim6 vi" -! for i in $seq; do -! testvim=`which $i 2>/dev/null` - if test -f "$testvim"; then -! VIM=$i -! break - fi -+ done -+ -+ # When no Vim version was found fall back to "vim", you'll get an error message -+ # below. -+ if test -z "$VIM"; then -+ VIM=vim - fi - - # Use Vim to copy the tutor, it knows the value of $VIMRUNTIME -*** ../vim-7.1.029/src/version.c Mon Jul 16 20:38:56 2007 ---- src/version.c Tue Jul 17 14:30:51 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 30, - /**/ - --- -BLACK KNIGHT: I'm invincible! -ARTHUR: You're a looney. - "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.031 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.031 -Problem: virtcol([123, '$']) doesn't work. (Michael Schaap) -Solution: When '$' is used for the column number get the last column. -Files: runtime/doc/eval.txt, src/eval.c - - -*** ../vim-7.1.030/runtime/doc/eval.txt Tue Jun 19 17:23:46 2007 ---- runtime/doc/eval.txt Wed Jul 11 21:21:28 2007 -*************** -*** 1,4 **** -! *eval.txt* For Vim version 7.1. Last change: 2007 Jun 09 - - - VIM REFERENCE MANUAL by Bram Moolenaar ---- 1,4 ---- -! *eval.txt* For Vim version 7.1. Last change: 2007 Jul 11 - - - VIM REFERENCE MANUAL by Bram Moolenaar -*************** -*** 2020,2025 **** ---- 2020,2029 ---- - number of characters in the cursor line plus one) - 'x position of mark x (if the mark is not set, 0 is - returned) -+ Additionally {expr} can be [lnum, col]: a |List| with the line -+ and column number. Most useful when the column is "$", to get -+ the las column of a specific line. When "lnum" or "col" is -+ out of range then col() returns zero. - To get the line number use |line()|. To get both use - |getpos()|. - For the screen column position use |virtcol()|. -*************** -*** 5024,5037 **** - position, the returned Number will be the column at the end of - the . For example, for a in column 1, with 'ts' - set to 8, it returns 8. -! For the use of {expr} see |col()|. Additionally you can use -! [lnum, col]: a |List| with the line and column number. When -! "lnum" or "col" is out of range then virtcol() returns zero. -! When 'virtualedit' is used it can be [lnum, col, off], where - "off" is the offset in screen columns from the start of the - character. E.g., a position within a or after the last - character. -- For the byte position use |col()|. - When Virtual editing is active in the current mode, a position - beyond the end of the line can be returned. |'virtualedit'| - The accepted positions are: ---- 5029,5040 ---- - position, the returned Number will be the column at the end of - the . For example, for a in column 1, with 'ts' - set to 8, it returns 8. -! For the byte position use |col()|. -! For the use of {expr} see |col()|. -! When 'virtualedit' is used {expr} can be [lnum, col, off], where - "off" is the offset in screen columns from the start of the - character. E.g., a position within a or after the last - character. - When Virtual editing is active in the current mode, a position - beyond the end of the line can be returned. |'virtualedit'| - The accepted positions are: -*** ../vim-7.1.030/src/eval.c Tue Jul 10 13:27:46 2007 ---- src/eval.c Wed Jul 11 19:50:27 2007 -*************** -*** 672,678 **** - static void f_writefile __ARGS((typval_T *argvars, typval_T *rettv)); - - static int list2fpos __ARGS((typval_T *arg, pos_T *posp, int *fnump)); -! static pos_T *var2fpos __ARGS((typval_T *varp, int lnum, int *fnum)); - static int get_env_len __ARGS((char_u **arg)); - static int get_id_len __ARGS((char_u **arg)); - static int get_name_len __ARGS((char_u **arg, char_u **alias, int evaluate, int verbose)); ---- 672,678 ---- - static void f_writefile __ARGS((typval_T *argvars, typval_T *rettv)); - - static int list2fpos __ARGS((typval_T *arg, pos_T *posp, int *fnump)); -! static pos_T *var2fpos __ARGS((typval_T *varp, int dollar_lnum, int *fnum)); - static int get_env_len __ARGS((char_u **arg)); - static int get_id_len __ARGS((char_u **arg)); - static int get_name_len __ARGS((char_u **arg, char_u **alias, int evaluate, int verbose)); -*************** -*** 16505,16513 **** - * Returns NULL when there is an error. - */ - static pos_T * -! var2fpos(varp, lnum, fnum) - typval_T *varp; -! int lnum; /* TRUE when $ is last line */ - int *fnum; /* set to fnum for '0, 'A, etc. */ - { - char_u *name; ---- 16508,16516 ---- - * Returns NULL when there is an error. - */ - static pos_T * -! var2fpos(varp, dollar_lnum, fnum) - typval_T *varp; -! int dollar_lnum; /* TRUE when $ is last line */ - int *fnum; /* set to fnum for '0, 'A, etc. */ - { - char_u *name; -*************** -*** 16520,16525 **** ---- 16523,16529 ---- - list_T *l; - int len; - int error = FALSE; -+ listitem_T *li; - - l = varp->vval.v_list; - if (l == NULL) -*************** -*** 16535,16540 **** ---- 16539,16552 ---- - if (error) - return NULL; - len = (long)STRLEN(ml_get(pos.lnum)); -+ -+ /* We accept "$" for the column number: last column. */ -+ li = list_find(l, 1L); -+ if (li != NULL && li->li_tv.v_type == VAR_STRING -+ && li->li_tv.vval.v_string != NULL -+ && STRCMP(li->li_tv.vval.v_string, "$") == 0) -+ pos.col = len + 1; -+ - /* Accept a position up to the NUL after the line. */ - if (pos.col == 0 || (int)pos.col > len + 1) - return NULL; /* invalid column number */ -*************** -*** 16567,16573 **** - pos.coladd = 0; - #endif - -! if (name[0] == 'w' && lnum) - { - pos.col = 0; - if (name[1] == '0') /* "w0": first visible line */ ---- 16579,16585 ---- - pos.coladd = 0; - #endif - -! if (name[0] == 'w' && dollar_lnum) - { - pos.col = 0; - if (name[1] == '0') /* "w0": first visible line */ -*************** -*** 16585,16591 **** - } - else if (name[0] == '$') /* last column or line */ - { -! if (lnum) - { - pos.lnum = curbuf->b_ml.ml_line_count; - pos.col = 0; ---- 16597,16603 ---- - } - else if (name[0] == '$') /* last column or line */ - { -! if (dollar_lnum) - { - pos.lnum = curbuf->b_ml.ml_line_count; - pos.col = 0; -*** ../vim-7.1.030/src/version.c Tue Jul 17 14:32:07 2007 ---- src/version.c Tue Jul 17 16:24:54 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 31, - /**/ - --- -CRONE: Who sent you? -ARTHUR: The Knights Who Say GNU! -CRONE: Aaaagh! (she looks around in rear) No! We have no licenses here. - "Monty Python and the Holy editor wars" PYTHON (MONTY) SOFTWARE LTD - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.032 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.032 -Problem: Potential crash when editing a command line. (Chris Monson) -Solution: Check the position to avoid access before the start of an array. -Files: src/ex_getln.c - - -*** ../vim-7.1.031/src/ex_getln.c Thu May 10 20:22:29 2007 ---- src/ex_getln.c Tue Jul 17 18:05:49 2007 -*************** -*** 484,490 **** - if (xpc.xp_context == EXPAND_MENUNAMES && p_wmnu) - { - /* Hitting after "emenu Name.": complete submenu */ -! if (ccline.cmdbuff[ccline.cmdpos - 1] == '.' && c == K_DOWN) - c = p_wc; - else if (c == K_UP) - { ---- 486,493 ---- - if (xpc.xp_context == EXPAND_MENUNAMES && p_wmnu) - { - /* Hitting after "emenu Name.": complete submenu */ -! if (c == K_DOWN && ccline.cmdpos > 0 -! && ccline.cmdbuff[ccline.cmdpos - 1] == '.') - c = p_wc; - else if (c == K_UP) - { -*************** -*** 533,541 **** - upseg[3] = PATHSEP; - upseg[4] = NUL; - -! if (ccline.cmdbuff[ccline.cmdpos - 1] == PATHSEP -! && c == K_DOWN -! && (ccline.cmdbuff[ccline.cmdpos - 2] != '.' - || ccline.cmdbuff[ccline.cmdpos - 3] != '.')) - { - /* go down a directory */ ---- 536,546 ---- - upseg[3] = PATHSEP; - upseg[4] = NUL; - -! if (c == K_DOWN -! && ccline.cmdpos > 0 -! && ccline.cmdbuff[ccline.cmdpos - 1] == PATHSEP -! && (ccline.cmdpos < 3 -! || ccline.cmdbuff[ccline.cmdpos - 2] != '.' - || ccline.cmdbuff[ccline.cmdpos - 3] != '.')) - { - /* go down a directory */ -*************** -*** 730,737 **** - /* In Ex mode a backslash escapes a newline. */ - if (exmode_active - && c != ESC -- && ccline.cmdpos > 0 - && ccline.cmdpos == ccline.cmdlen - && ccline.cmdbuff[ccline.cmdpos - 1] == '\\') - { - if (c == K_KENTER) ---- 735,742 ---- - /* In Ex mode a backslash escapes a newline. */ - if (exmode_active - && c != ESC - && ccline.cmdpos == ccline.cmdlen -+ && ccline.cmdpos > 0 - && ccline.cmdbuff[ccline.cmdpos - 1] == '\\') - { - if (c == K_KENTER) -*** ../vim-7.1.031/src/version.c Tue Jul 17 16:31:15 2007 ---- src/version.c Tue Jul 17 18:10:37 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 32, - /**/ - --- -ALL: A witch! A witch! -WITCH: It's a fair cop. -ALL: Burn her! Burn her! Let's make her into a ladder. - "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.033 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.033 -Problem: A buffer is marked modified when it was first deleted and then - added again using a ":next" command. (John Mullin) -Solution: When checking if a buffer is modified use the BF_NEVERLOADED flag. -Files: src/option.c - - -*** ../vim-7.1.032/src/option.c Tue Jun 19 20:56:52 2007 ---- src/option.c Sun Jul 22 16:42:47 2007 -*************** -*** 10624,10629 **** ---- 10624,10632 ---- - file_ff_differs(buf) - buf_T *buf; - { -+ /* In a buffer that was never loaded the options are not valid. */ -+ if (buf->b_flags & BF_NEVERLOADED) -+ return FALSE; - if ((buf->b_flags & BF_NEW) - && buf->b_ml.ml_line_count == 1 - && *ml_get_buf(buf, (linenr_T)1, FALSE) == NUL) -*** ../vim-7.1.032/src/version.c Tue Jul 17 18:14:14 2007 ---- src/version.c Mon Jul 23 09:45:44 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 33, - /**/ - --- -How To Keep A Healthy Level Of Insanity: -8. Don't use any punctuation marks. - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.034 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.034 -Problem: Win64: A few compiler warnings. Problems with optimizer. -Solution: Use int instead of size_t. Disable the optimizer in one function. - (George V. Reilly) -Files: src/eval.c, src/spell.c - - -*** ../vim-7.1.033/src/eval.c Tue Jul 17 16:31:15 2007 ---- src/eval.c Wed Jul 11 19:50:27 2007 -*************** -*** 992,1011 **** - char_u *value; - int value_len; - { -! size_t len; - - if (redir_lval == NULL) - return; - - if (value_len == -1) -! len = STRLEN(value); /* Append the entire string */ - else -! len = value_len; /* Append only "value_len" characters */ - -! if (ga_grow(&redir_ga, (int)len) == OK) - { - mch_memmove((char *)redir_ga.ga_data + redir_ga.ga_len, value, len); -! redir_ga.ga_len += (int)len; - } - else - var_redir_stop(); ---- 992,1011 ---- - char_u *value; - int value_len; - { -! int len; - - if (redir_lval == NULL) - return; - - if (value_len == -1) -! len = (int)STRLEN(value); /* Append the entire string */ - else -! len = value_len; /* Append only "value_len" characters */ - -! if (ga_grow(&redir_ga, len) == OK) - { - mch_memmove((char *)redir_ga.ga_data + redir_ga.ga_len, value, len); -! redir_ga.ga_len += len; - } - else - var_redir_stop(); -*** ../vim-7.1.033/src/spell.c Thu May 10 18:45:53 2007 ---- src/spell.c Sat Jul 14 17:17:52 2007 -*************** -*** 7829,7835 **** - # if (_MSC_VER <= 1200) - /* This line is required for VC6 without the service pack. Also see the - * matching #pragma below. */ -! /* # pragma optimize("", off) */ - # endif - #endif - ---- 7829,7835 ---- - # if (_MSC_VER <= 1200) - /* This line is required for VC6 without the service pack. Also see the - * matching #pragma below. */ -! # pragma optimize("", off) - # endif - #endif - -*************** -*** 7859,7865 **** - - #ifdef _MSC_VER - # if (_MSC_VER <= 1200) -! /* # pragma optimize("", on) */ - # endif - #endif - ---- 7859,7865 ---- - - #ifdef _MSC_VER - # if (_MSC_VER <= 1200) -! # pragma optimize("", on) - # endif - #endif - -*** ../vim-7.1.033/src/version.c Tue Jul 24 09:50:22 2007 ---- src/version.c Tue Jul 24 09:47:17 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 34, - /**/ - --- -How To Keep A Healthy Level Of Insanity: -17. When the money comes out the ATM, scream "I won!, I won! 3rd - time this week!!!!!" - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.035 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.035 -Problem: After ":s/./&/#" all listed lines have a line number. (Yakov - Lerner) -Solution: Reset the line number flag when not using the "&" flag. -Files: src/ex_cmds.c - - -*** ../vim-7.1.034/src/ex_cmds.c Tue Jul 10 17:25:20 2007 ---- src/ex_cmds.c Sat Jul 14 14:39:38 2007 -*************** -*** 4316,4321 **** ---- 4316,4322 ---- - do_error = TRUE; - do_print = FALSE; - do_count = FALSE; -+ do_number = FALSE; - do_ic = 0; - } - while (*cmd) -*** ../vim-7.1.034/src/version.c Tue Jul 24 10:44:10 2007 ---- src/version.c Tue Jul 24 11:15:09 2007 -*************** -*** 668,669 **** ---- 668,671 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 35, - /**/ - --- -The startling truth finally became apparent, and it was this: Numbers -written on restaurant checks within the confines of restaurants do not follow -the same mathematical laws as numbers written on any other pieces of paper in -any other parts of the Universe. This single statement took the scientific -world by storm. So many mathematical conferences got held in such good -restaurants that many of the finest minds of a generation died of obesity and -heart failure, and the science of mathematics was put back by years. - -- Douglas Adams, "The Hitchhiker's Guide to the Galaxy" - - /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -To: vim-dev at vim.org -Subject: patch 7.1.036 -Fcc: outbox -From: Bram Moolenaar -Mime-Version: 1.0 -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.1.036 -Problem: Completing ":echohl" argument should include "None". (Ori - Avtalion) ":match" should have "none" too. -Solution: Add flags to use expand_highlight(). Also fix that when disabling - FEAT_CMDL_COMPL compilation fails. (Chris Lubinski) -Files: src/eval.c, src/ex_docmd.c, src/ex_getln.c, src/proto/syntax.pro - src/syntax.c - - -*** ../vim-7.1.035/src/eval.c Tue Jul 24 10:44:10 2007 ---- src/eval.c Wed Jul 11 19:50:27 2007 -*************** -*** 1411,1417 **** - } - - -! #if (defined(FEAT_USR_CMDS) && defined(FEAT_CMDL_COMPL)) || defined(PROTO) - /* - * Call some vimL function and return the result in "*rettv". - * Uses argv[argc] for the function arguments. ---- 1411,1418 ---- - } - - -! #if (defined(FEAT_USR_CMDS) && defined(FEAT_CMDL_COMPL)) \ -! || defined(FEAT_COMPL_FUNC) || defined(PROTO) - /* - * Call some vimL function and return the result in "*rettv". - * Uses argv[argc] for the function arguments. -*************** -*** 1484,1489 **** ---- 1485,1491 ---- - return ret; - } - -+ # if (defined(FEAT_USR_CMDS) && defined(FEAT_CMDL_COMPL)) || defined(PROTO) - /* - * Call vimL function "func" and return the result as a string. - * Returns NULL when calling the function fails. -*************** -*** 1506,1513 **** - clear_tv(&rettv); - return retval; - } - -! #if defined(FEAT_COMPL_FUNC) || defined(PROTO) - /* - * Call vimL function "func" and return the result as a number. - * Returns -1 when calling the function fails. ---- 1508,1516 ---- - clear_tv(&rettv); - return retval; - } -+ # endif - -! # if defined(FEAT_COMPL_FUNC) || defined(PROTO) - /* - * Call vimL function "func" and return the result as a number. - * Returns -1 when calling the function fails. -*************** -*** 1530,1536 **** - clear_tv(&rettv); - return retval; - } -! #endif - - /* - * Call vimL function "func" and return the result as a list ---- 1533,1539 ---- - clear_tv(&rettv); - return retval; - } -! # endif - - /* - * Call vimL function "func" and return the result as a list -*************** -*** 1556,1563 **** - - return rettv.vval.v_list; - } -- - #endif - - /* - * Save the current function call pointer, and set it to NULL. ---- 1559,1566 ---- - - return rettv.vval.v_list; - } - #endif -+ - - /* - * Save the current function call pointer, and set it to NULL. -*** ../vim-7.1.035/src/ex_docmd.c Mon Jul 16 20:38:56 2007 ---- src/ex_docmd.c Sun Jul 15 17:20:09 2007 -*************** -*** 3406,3419 **** - case CMD_windo: - return arg; - -! #ifdef FEAT_SEARCH_EXTRA - case CMD_match: - if (*arg == NUL || !ends_excmd(*arg)) - { -! /* Dummy call to clear variables. */ -! set_context_in_highlight_cmd(xp, (char_u *)"link n"); -! xp->xp_context = EXPAND_HIGHLIGHT; -! xp->xp_pattern = arg; - arg = skipwhite(skiptowhite(arg)); - if (*arg != NUL) - { ---- 3406,3418 ---- - case CMD_windo: - return arg; - -! #ifdef FEAT_CMDL_COMPL -! # ifdef FEAT_SEARCH_EXTRA - case CMD_match: - if (*arg == NUL || !ends_excmd(*arg)) - { -! /* also complete "None" */ -! set_context_in_echohl_cmd(xp, arg); - arg = skipwhite(skiptowhite(arg)); - if (*arg != NUL) - { -*************** -*** 3422,3430 **** - } - } - return find_nextcmd(arg); -! #endif - -- #ifdef FEAT_CMDL_COMPL - /* - * All completion for the +cmdline_compl feature goes here. - */ ---- 3421,3428 ---- - } - } - return find_nextcmd(arg); -! # endif - - /* - * All completion for the +cmdline_compl feature goes here. - */ -*************** -*** 3622,3629 **** - break; - - case CMD_echohl: -! xp->xp_context = EXPAND_HIGHLIGHT; -! xp->xp_pattern = arg; - break; - #endif - case CMD_highlight: ---- 3620,3626 ---- - break; - - case CMD_echohl: -! set_context_in_echohl_cmd(xp, arg); - break; - #endif - case CMD_highlight: -*** ../vim-7.1.035/src/ex_getln.c Tue Jul 17 18:14:14 2007 ---- src/ex_getln.c Tue Jul 17 18:05:49 2007 -*************** -*** 268,274 **** ---- 268,276 ---- - { - xpc.xp_context = ccline.xp_context; - xpc.xp_pattern = ccline.cmdbuff; -+ # if defined(FEAT_USR_CMDS) && defined(FEAT_CMDL_COMPL) - xpc.xp_arg = ccline.xp_arg; -+ # endif - } - #endif - -*************** -*** 4151,4163 **** ---- 4153,4171 ---- - - #ifdef FEAT_EVAL - if (ccline.cmdfirstc == '=') -+ { -+ # ifdef FEAT_CMDL_COMPL - /* pass CMD_SIZE because there is no real command */ - set_context_for_expression(xp, str, CMD_SIZE); -+ # endif -+ } - else if (ccline.input_fn) - { - xp->xp_context = ccline.xp_context; - xp->xp_pattern = ccline.cmdbuff; -+ # if defined(FEAT_USR_CMDS) && defined(FEAT_CMDL_COMPL) - xp->xp_arg = ccline.xp_arg; -+ # endif - } - else - #endif -*************** -*** 4504,4509 **** ---- 4512,4523 ---- - /* Sort the results. Keep menu's in the specified order. */ - if (xp->xp_context != EXPAND_MENUNAMES && xp->xp_context != EXPAND_MENUS) - sort_strings(*file, *num_file); -+ -+ #ifdef FEAT_CMDL_COMPL -+ /* Reset the variables used for special highlight names expansion, so that -+ * they don't show up when getting normal highlight names by ID. */ -+ reset_expand_highlight(); -+ #endif - - return OK; - } -*** ../vim-7.1.035/src/proto/syntax.pro Sat May 5 19:23:52 2007 ---- src/proto/syntax.pro Fri Jul 13 19:51:43 2007 -*************** -*** 8,13 **** ---- 8,15 ---- - void syntax_clear __ARGS((buf_T *buf)); - void ex_syntax __ARGS((exarg_T *eap)); - int syntax_present __ARGS((buf_T *buf)); -+ void reset_expand_highlight __ARGS((void)); -+ void set_context_in_echohl_cmd __ARGS((expand_T *xp, char_u *arg)); - void set_context_in_syntax_cmd __ARGS((expand_T *xp, char_u *arg)); - char_u *get_syntax_name __ARGS((expand_T *xp, int idx)); - int syn_get_id __ARGS((win_T *wp, long lnum, colnr_T col, int trans, int *spellp)); -*** ../vim-7.1.035/src/syntax.c Thu Jun 28 11:59:13 2007 ---- src/syntax.c Fri Jul 13 19:51:39 2007 -*************** -*** 66,73 **** - #define HL_TABLE() ((struct hl_group *)((highlight_ga.ga_data))) - - #ifdef FEAT_CMDL_COMPL -! static int include_default = FALSE; /* include "default" for expansion */ -! static int include_link = FALSE; /* include "link" for expansion */ - #endif - - /* ---- 66,75 ---- - #define HL_TABLE() ((struct hl_group *)((highlight_ga.ga_data))) - - #ifdef FEAT_CMDL_COMPL -! /* Flags to indicate an additional string for highlight name completion. */ -! static int include_none = 0; /* when 1 include "None" */ -! static int include_default = 0; /* when 1 include "default" */ -! static int include_link = 0; /* when 2 include "link" and "clear" */ - #endif - - /* -*************** -*** 5968,5973 **** @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Fri Dec 19 20:11:49 2008 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Fri, 19 Dec 2008 19:11:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[2675] csw/mgar/pkg/gvim/trunk Message-ID: Revision: 2675 http://gar.svn.sourceforge.net/gar/?rev=2675&view=rev Author: harpchad Date: 2008-12-19 19:11:49 +0000 (Fri, 19 Dec 2008) Log Message: ----------- - Updated for vim72 - Removed patches available from vim.org from gar svn, they will be downloaded at build time - Added GNOME desktop integration (gvim.desktop) Modified Paths: -------------- csw/mgar/pkg/gvim/trunk/Makefile csw/mgar/pkg/gvim/trunk/checksums csw/mgar/pkg/gvim/trunk/files/CSWgvim.prototype Added Paths: ----------- csw/mgar/pkg/gvim/trunk/files/gvim.desktop Removed Paths: ------------- csw/mgar/pkg/gvim/trunk/files/7.1.001-147 Modified: csw/mgar/pkg/gvim/trunk/Makefile =================================================================== --- csw/mgar/pkg/gvim/trunk/Makefile 2008-12-19 18:51:27 UTC (rev 2674) +++ csw/mgar/pkg/gvim/trunk/Makefile 2008-12-19 19:11:49 UTC (rev 2675) @@ -1,7 +1,7 @@ GARNAME = vim -DISTVERSION = 7.1 +DISTVERSION = 7.2 CATEGORIES = utils - +SPKG_SOURCEURL = http://www.vim.org/download.php DESCRIPTION = Vi IMproved with GTK+ support define BLURB Vim is an almost fully-compatible version of the Unix editor Vi. Many new @@ -15,6 +15,7 @@ include ../vim/files/config.mk DISTFILES += $(call admfiles,CSWgvim,prototype depend) +DISTFILES += gvim.desktop CONFIGURE_ARGS += --with-vim-name="vim-x11" CONFIGURE_ARGS += --enable-gui=gnome2 @@ -31,7 +32,11 @@ # Don't install the runtime install-minimal: @$(INSTALL_ENV) $(MAKE) -C $(WORKSRC)/src \ - installvimbin installlinks installtools + installvimbin installlinks installtools installgtutorbin + mkdir -p $(DESTDIR)/opt/csw/share/pixmaps + cp $(WORKSRC)/runtime/vim48x48.png $(DESTDIR)/opt/csw/share/pixmaps/gvim.png + mkdir -p $(DESTDIR)/opt/csw/share/applications + cp $(DOWNLOADDIR)/gvim.desktop $(DESTDIR)/opt/csw/share/applications/gvim.desktop + mv $(DESTDIR)/opt/csw/bin/gvim-x11tutor $(DESTDIR)/opt/csw/bin/gvimtutor @$(MAKECOOKIE) $(DONADA) - Modified: csw/mgar/pkg/gvim/trunk/checksums =================================================================== --- csw/mgar/pkg/gvim/trunk/checksums 2008-12-19 18:51:27 UTC (rev 2674) +++ csw/mgar/pkg/gvim/trunk/checksums 2008-12-19 19:11:49 UTC (rev 2675) @@ -1,8 +1,77 @@ -44c6b4914f38d6f9aa959640b89da329 download/vim-7.1.tar.bz2 -144aa049ba70621acf4247f0459f3ee7 download/vim-7.1-lang.tar.gz -605cc7ae31bcc9d7864bb0bb6025f55d download/vim-7.1-extra.tar.gz +7c2dc4a956cf315e546e347bc349968c download/7.2.001 +7f16f80814f1e071a689806c2056b39d download/7.2.002 +0de916fdfd450a4a0d95bed44ae2c398 download/7.2.003 +25cc99ad42b25b16a4610e2fad9cdab4 download/7.2.004 +a5b7b1c7c5b75aa7d730b0b9aa491558 download/7.2.005 +a93a72cd40c37da91dc634dc8dddefec download/7.2.006 +c2b2b63dea27ddad92668e63797406c5 download/7.2.007 +e65c8c2223eea5289d8cbef2e867a5de download/7.2.008 +ab1566b69bd0e0c82a866f00675ffe0e download/7.2.009 +d69f559bfb5436c157e8069a829ca50d download/7.2.010 +05334a6bb31402bfd49d82ea6f59a57b download/7.2.011 +a11dcd5552f36544a9e27978b5359935 download/7.2.012 +8bc70978291aadea9c82072b623c955d download/7.2.013 +a87826187cb77ad2e567a40c1609eea4 download/7.2.014 +47a466fbfdbca616f519fc4afa0432df download/7.2.015 +fd08bac73d7ffcabf53bd25a63dff893 download/7.2.016 +0f0284d87f6f52101802dbe1a45d54c3 download/7.2.017 +38d06ba325b716c1177c1012d781bada download/7.2.018 +661ca021fb70c24ef4df229512cfb14b download/7.2.019 +cb2c5ca0f9a9718fb635874925432dd8 download/7.2.020 +9073d2311ae7101c143237a45afb4efa download/7.2.021 +48ccb0deec77a3bb91bf967dacb43492 download/7.2.022 +d77ed8aa4de30d4dbd17a7998ae8f269 download/7.2.023 +cf983237e5e866ef459870fee2754bac download/7.2.024 +ab32defa4b2cfb509ccb34d4858b1223 download/7.2.025 +5e96c227c7765b1e0f03f44cb5b750f6 download/7.2.026 +f26b7ee0f271eacbb3652dbdf92dd860 download/7.2.027 +fc54a3d35bdc7b7a7660c6d2274f7b74 download/7.2.028 +d53630dc8f3a823f54dfba73dcd47b36 download/7.2.029 +208f8ed2db2665ebfc17674f78d47c6d download/7.2.030 +3387583af86faa78e10be979214071f3 download/7.2.031 +eca017686205ec8658bf9fa8c73f7af6 download/7.2.032 +88c91b84ffc772fd57f86475f7ba90f1 download/7.2.033 +c3d6eaaa0b74df423f90afaaafa3a0de download/7.2.034 +f4c35dae581d671dc271407d377f7199 download/7.2.035 +0ae8b6ed636fc013e2fa6bdabc182041 download/7.2.036 +1c6501c366cc8df205955f3e4d3ebba9 download/7.2.037 +ed3479ddb4ded7b74c82af5e50b0e4a6 download/7.2.038 +2a61f28f6f793c5a43abded6e59b6506 download/7.2.039 +4c493255ae227498016f30a0002ec1cc download/7.2.040 +66bde35426c09d9c666e23215f9a19c9 download/7.2.041 +99baedef8a9c908774b7ed74deacf184 download/7.2.042 +87035b208c9377c28d796b1e48ab8aac download/7.2.043 +b127def242996b4e7d7e870cab3e4b45 download/7.2.044 +5233327e4c97d310e3793b223892ea8d download/7.2.045 +9ecfa0454f5a329996b273cb12369962 download/7.2.046 +35e16f4e7198e861a71322fee2cb7909 download/7.2.047 +84ef9658181f49bfbd7a61ec87dd0b8d download/7.2.048 +fc9b65eef81954f6006c307ff11be925 download/7.2.049 +27a9700e39e266a31df702677acea52c download/7.2.050 +89ce3f5b513510fb288a4a301e7494c7 download/7.2.051 +5992bb56b07a9b9b4e3504f1f2f2c79c download/7.2.052 +3fe570c1317fee8a71ede17197358e02 download/7.2.053 +5b047e8e8413c4807d74a6d9716474a2 download/7.2.054 +c276080d95de2fafa9706f247c35ff74 download/7.2.055 +5b65e2654a78dcc4c15dc49dbce5418e download/7.2.056 +cab5a9ddf0ab180089d84bf9ec685574 download/7.2.057 +80991ff846f88222e3266dab6b07e2b8 download/7.2.058 +89cede639caf8beed5ea071790445e26 download/7.2.059 +9781d833263060308a9622dd097ad378 download/7.2.060 +71b4bc625bc1cdd68747262d329db551 download/7.2.061 +9243a773d19966dbfd98b7aff3fe3ab7 download/7.2.062 +08155711f8db2dfce217ec5a34253a76 download/7.2.063 +fd692f9624ec0170800b3d9a2a9a53cb download/7.2.064 +ee1a8dc311c7580608e3bd2196a7d042 download/7.2.065 +8d1d5f8aefabf0abcb54de5247893246 download/7.2.066 +fa0ccca2decdd2db64947658b04b8c99 download/7.2.067 +ca5ab057205023613020ca920d903028 download/7.2.068 +f3e6f3dd76278a9f7e396955faa4ca31 download/7.2.069 +35e04482f07c57221c9a751aaa3b8dac download/vim-7.2-extra.tar.gz +d8884786979e0e520c112faf2e176f05 download/vim-7.2-lang.tar.gz +f0901284b338e448bfd79ccca0041254 download/vim-7.2.tar.bz2 +582717146f6bbd5b73db83a2f62e62a5 download/vimtutor.diff +2f6bf1938bfdc77a305903e70e3d1de2 download/CSWgvim.depend 3d2b62d6810417d562ed17aaada29868 download/CSWgvim.gspec -777d000bb1697e8ab2f16f2b9428c606 download/CSWgvim.prototype -2f6bf1938bfdc77a305903e70e3d1de2 download/CSWgvim.depend -79130ead83c4e2cd7dfdc9af4fc12fe5 download/7.1.001-147 -b07127874fa23a87bc703ec710be530c download/vimtutor.diff +2b8beca0088c83291df67af00616a197 download/CSWgvim.prototype +47396843634a6e3c05d4f5d6b4bf8a72 download/gvim.desktop Deleted: csw/mgar/pkg/gvim/trunk/files/7.1.001-147 =================================================================== --- csw/mgar/pkg/gvim/trunk/files/7.1.001-147 2008-12-19 18:51:27 UTC (rev 2674) +++ csw/mgar/pkg/gvim/trunk/files/7.1.001-147 2008-12-19 19:11:49 UTC (rev 2675) @@ -1 +0,0 @@ -link ../../vim/files/7.1.001-147 \ No newline at end of file Modified: csw/mgar/pkg/gvim/trunk/files/CSWgvim.prototype =================================================================== --- csw/mgar/pkg/gvim/trunk/files/CSWgvim.prototype 2008-12-19 18:51:27 UTC (rev 2674) +++ csw/mgar/pkg/gvim/trunk/files/CSWgvim.prototype 2008-12-19 19:11:49 UTC (rev 2675) @@ -1,7 +1,15 @@ d none /opt/csw/bin 0755 root bin f none /opt/csw/bin/vim-x11 0755 root bin +s none /opt/csw/bin/evim=vim-x11 +s none /opt/csw/bin/eview=vim-x11 s none /opt/csw/bin/gview=vim-x11 s none /opt/csw/bin/gvim=vim-x11 s none /opt/csw/bin/gvimdiff=vim-x11 s none /opt/csw/bin/rgview=vim-x11 s none /opt/csw/bin/rgvim=vim-x11 +f none /opt/csw/bin/gvimtutor 0755 root bin +d none /opt/csw/share 0755 root bin +d none /opt/csw/share/pixmaps 0755 root bin +f none /opt/csw/share/pixmaps/gvim.png 0644 root bin +d none /opt/csw/share/applications 0755 root bin +f none /opt/csw/share/applications/gvim.desktop 0644 root bin Added: csw/mgar/pkg/gvim/trunk/files/gvim.desktop =================================================================== --- csw/mgar/pkg/gvim/trunk/files/gvim.desktop (rev 0) +++ csw/mgar/pkg/gvim/trunk/files/gvim.desktop 2008-12-19 19:11:49 UTC (rev 2675) @@ -0,0 +1,79 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=GVim Text Editor +Comment=Edit text files +Comment[af]=Redigeer teksl?ers +Comment[am]=???? ???? ?????? +Comment[ar]=???? ????? ???? +Comment[az]=M?tn fayllar?n? redakt? edin +Comment[be]=???????????? ????????? ?????? +Comment[bg]=??????????? ?? ???????? ??????? +Comment[bn]=??????? ???? ???? ???? +Comment[bs]=Izmijeni tekstualne datoteke +Comment[ca]=Edita fitxers de text +Comment[cs]=?prava textov?ch soubor? +Comment[cy]=Golygu ffeiliau testun +Comment[da]=Redig?r tekstfiler +Comment[de]=Textdateien bearbeiten +Comment[el]=??????????? ??????? ???????? +Comment[en_CA]=Edit text files +Comment[en_GB]=Edit text files +Comment[es]=Edita archivos de texto +Comment[et]=Redigeeri tekstifaile +Comment[eu]=Editatu testu-fitxategiak +Comment[fa]=?????? ?????????? ???? +Comment[fi]=Muokkaa tekstitiedostoja +Comment[fr]=?dite des fichiers texte +Comment[ga]=Eagar comhad T?acs +Comment[gu]=???? ???????? ?????? ??? +Comment[he]=???? ???? ???? +Comment[hi]=??? ??????? ??????? ???? +Comment[hr]=Ure?ivanje tekstualne datoteke +Comment[hu]=Sz?vegf?jlok szerkeszt?se +Comment[id]=Edit file teks +Comment[it]=Modifica file di testo +Comment[ja]=??????????????? +Comment[kn]=???? ????????? ???????? +Comment[ko]=??? ??? ????? +Comment[lt]=Redaguoti tekstines bylas +Comment[lv]=Redi??t teksta failus +Comment[mk]=????? ?????????? ??????? +Comment[ml]=???? ?????? ????????? +Comment[mn]=????? ???? ???????????? +Comment[mr]=???? ???? ??????? ??? +Comment[ms]=Edit fail teks +Comment[nb]=Rediger tekstfiler +Comment[ne]=??? ??????? ?????? ????????? +Comment[nl]=Tekstbestanden bewerken +Comment[nn]=Rediger tekstfiler +Comment[no]=Rediger tekstfiler +Comment[or]=????? ??????????? ??????? ?????? +Comment[pa]=??? ?????? ?????? +Comment[pl]=Edytor plik?w tekstowych +Comment[pt]=Editar ficheiros de texto +Comment[pt_BR]=Edite arquivos de texto +Comment[ro]=Editare fi?iere text +Comment[ru]=???????? ????????? ?????? +Comment[sk]=?prava textov?ch s?borov +Comment[sl]=Urejanje datotek z besedili +Comment[sq]=P?rpuno files teksti +Comment[sr]=?????? ?????????? ???????? +Comment[sr at Latn]=Izmeni tekstualne datoteke +Comment[sv]=Redigera textfiler +Comment[ta]=??? ????????? ??????????? +Comment[th]=???????????????? +Comment[tk]=Metin fa?llary editle +Comment[tr]=Metin dosyalar?n? d?zenle +Comment[uk]=???????? ????????? ?????? +Comment[vi]=So?n th?o t?p tin v?n b?n +Comment[wa]=Asspougn? des fitch?s tecses +Comment[zh_CN]=?????? +Comment[zh_TW]=????? +Exec=gvim -f %F +Terminal=false +Type=Application +Icon=/opt/csw/share/pixmaps/gvim.png +Categories=Application;Utility;TextEditor; +StartupNotify=true +MimeType=text/plain; +NoDisplay=true This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Dec 20 15:18:23 2008 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 20 Dec 2008 14:18:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[2676] csw/mgar/pkg/cyrus_imapd/trunk Message-ID: Revision: 2676 http://gar.svn.sourceforge.net/gar/?rev=2676&view=rev Author: chninkel Date: 2008-12-20 14:18:23 +0000 (Sat, 20 Dec 2008) Log Message: ----------- cyrus_imapd: added mupdate in /etc/services Modified Paths: -------------- csw/mgar/pkg/cyrus_imapd/trunk/Makefile csw/mgar/pkg/cyrus_imapd/trunk/checksums csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW csw/mgar/pkg/cyrus_imapd/trunk/files/services Removed Paths: ------------- csw/mgar/pkg/cyrus_imapd/trunk/files/master-rename.patch Modified: csw/mgar/pkg/cyrus_imapd/trunk/Makefile =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2008-12-19 19:11:49 UTC (rev 2675) +++ csw/mgar/pkg/cyrus_imapd/trunk/Makefile 2008-12-20 14:18:23 UTC (rev 2676) @@ -1,5 +1,5 @@ GARNAME = cyrus_imapd -GARVERSION = 2.3.11 +GARVERSION = 2.3.13 CATEGORIES = server DESCRIPTION = Pop and Imap server from the Cyrus mail system @@ -63,10 +63,6 @@ # contains bare newlines PATCHFILES += cyrus-imapd-2.3.7-nobarenewlinescheck.patch -# master is a too common name, so we rename it cyrus-master -# this patch does a part of this job -PATCHFILES += master-rename.patch - # the default value for allowplaintext changed since 2.3.9 # we restore the previous default value to avoid upgrade problem PATCHFILES += restore_allowplaintext_default.patch @@ -106,10 +102,14 @@ pre-patch: cp $(WORKDIR)/install-upgrade $(WORKSRC)/doc/text -pre-build: +pre-configure: # master is a too common name, so we rename it cyrus-master cp $(WORKSRC)/man/master.8 $(WORKSRC)/man/cyrus-master.8 cp $(WORKSRC)/doc/man/master.8.html $(WORKSRC)/doc/man/cyrus-master.8.html + find $(WORKSRC)/doc/ -type f -exec perl -pi -e 's/(cyrus-)?master/cyrus-master/g' '{}' ';' + find $(WORKSRC)/man/ -type f -exec perl -pi -e 's/(cyrus-)?master/cyrus-master/g' '{}' ';' + perl -pi -e 's/(cyrus-)?master/cyrus-master/' $(WORKSRC)/master/Makefile.in + # we delete autogenerated error files to force regeneration find $(WORKSRC) \( -name "*_err.c" -o -name "*_err.h" \) ! -name "com_err.*" -exec rm {} \; @@ -136,7 +136,7 @@ cp -r $(WORKSRC)/tools/* $(DESTDIR)$(sbindir) ginstall -D $(DESTDIR)$(sbindir)/arbitronsort.pl $(DESTDIR)$(sbindir)/arbitronsort - # we want perl script to use blastwave perl + # we want perl script to use opencsw perl perl -pi -e 's/exec\s+perl/exec \/opt\/csw\/bin\/perl/g' $(DESTDIR)$(sbindir)/* $(DESTDIR)$(bindir)/* ( for FILE in convert-sieve.pl mupdate-loadgen.pl translatesieve undohash upgradesieve arbitronsort; do \ perl -pi -e 's/^#!\/usr\/(local\/)?bin\/perl/#!\/usr\/bin\/perl/' $(DESTDIR)$(sbindir)/$$FILE; \ Modified: csw/mgar/pkg/cyrus_imapd/trunk/checksums =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/checksums 2008-12-19 19:11:49 UTC (rev 2675) +++ csw/mgar/pkg/cyrus_imapd/trunk/checksums 2008-12-20 14:18:23 UTC (rev 2676) @@ -1,14 +1,14 @@ -df632eb2a89e36e6296e4abd687435ed download/cyrus-imapd-2.3.11.tar.gz +7dc48324c3a99e210bf777ea74aae694 download/cyrus-imapd-2.3.13.tar.gz 7423d96cacb8162b7987c9983cc85171 download/CSWcyrusimapd.gspec a22944187eb6b75e2437aa9a4c754c07 download/CSWcyrusimapd.prototype 5111a5573aa6d4878b852780aeae8a27 download/CSWcyrusimapd.preinstall 46cfc3ee1f366efdd105963422b53fc6 download/CSWcyrusimapd.depend a55d22e88ee57fa81da2ea75c6e0e3d8 download/CSWcyrusimapd.checkinstall -1d1b48887178a20b74c7d8ed34e4723d download/cyrus_imapd.changelog.CSW +1218c3ab6c7d0d5ab996a309698a43c8 download/cyrus_imapd.changelog.CSW d0b97b33e75ac75f89ee6236a2d53f05 download/README.CSW 79211aee56db01e15566ced1ba4078da download/i.services 149ac6b6d82ef9ef4bb1b314f1a1cac4 download/r.services -d00c34fe0c54a4eb07389e2baf3af399 download/services +6dfee20f7c02139350caf9f75199e587 download/services 9b2ae27f98333b73ff2b16ed98ee896a download/i.conf 5d9e9fb1a5b6af82ce915f72ebc5e3b7 download/r.conf a5326ab0d66431d057db02c5ae9c5e4a download/cswcyrus.init @@ -22,15 +22,14 @@ d47ff67f45001cdda175616a543d7052 download/CSWcyrusimapdutils.gspec 7e99e825a1d6b134b91392beec1807f4 download/CSWcyrusimapdutils.prototype cba5a4c4a05d4af940a323c5d7d64ca0 download/CSWcyrusimapdutils.depend -292a334f016b2a6b7cfbc377234134c5 download/cyrus_imapd_utils.changelog.CSW -598fc0d014664de114f85d57728605af download/pm_cyrus.changelog.CSW +45211ad9938528d4e5e6333ac1ec1f33 download/cyrus_imapd_utils.changelog.CSW +a700bb603514320b6d7e7959ed71618e download/pm_cyrus.changelog.CSW 9cbebaeeafa6eb3320eafa594c253bc1 download/compile_et 5375c25c8bc325a90553d0be87a64a04 download/et_c.awk d1d86e61463a1dfefccbadedb11a8604 download/et_h.awk 14bb6e8c6d6914351f80df293982e88a download/install-upgrade -e2f3c6e948cc73e28c5a7a8e3e53854e download/cyrus-imapd-2.3.11-autocreate-0.10-0.diff -7177f3abd0736a14e11af4905decb6ff download/cyrus-imapd-2.3.11-autosieve-0.6.0.diff +f1957096f173dcc9ea94d0544a07e9db download/cyrus-imapd-2.3.13-autocreate-0.10-0.diff +cce2e7fbc847791182b8f431c59e473a download/cyrus-imapd-2.3.13-autosieve-0.6.0.diff 6127a7b62ec4679a54985f6a2d915e52 download/cyrus-imapd-acceptinvalidfrom.patch b4c99489eacf0fb7befeef5e3098a5c1 download/cyrus-imapd-2.3.7-nobarenewlinescheck.patch -0454ac02701faec98532669854f75724 download/master-rename.patch dce627f9a464ae4efe8a66c8dbd358d5 download/restore_allowplaintext_default.patch Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW 2008-12-19 19:11:49 UTC (rev 2675) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW 2008-12-20 14:18:23 UTC (rev 2676) @@ -1,3 +1,15 @@ +cyrus_imapd (2.3.13,REV=2008.12.20) unstable + + * Added mupdate service in /etc/services. + + -- Yann Rouillard Sat, 20 Dec 2008 15:13:33 +0100 + +cyrus_imapd (2.3.13,REV=2008.11.30) unstable + + * New upstream version. + + -- Yann Rouillard Sun, 30 Nov 2008 20:58:22 +0100 + cyrus_imapd (2.3.11,REV=2008.03.22) unstable * Added missing pcre dependancy (closes: #2830). Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW 2008-12-19 19:11:49 UTC (rev 2675) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW 2008-12-20 14:18:23 UTC (rev 2676) @@ -1,3 +1,15 @@ +cyrus_imapd_utils (2.3.13,REV=2008.12.20) unstable + + * Added mupdate service in /etc/services. + + -- Yann Rouillard Sat, 20 Dec 2008 15:13:33 +0100 + +cyrus_imapd_utils (2.3.13,REV=2008.11.30) unstable + + * New upstream version. + + -- Yann Rouillard Sun, 30 Nov 2008 20:58:22 +0100 + cyrus_imapd_utils (2.3.9,REV=2008.01.21) unstable * New upstream version. Deleted: csw/mgar/pkg/cyrus_imapd/trunk/files/master-rename.patch =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/master-rename.patch 2008-12-19 19:11:49 UTC (rev 2675) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/master-rename.patch 2008-12-20 14:18:23 UTC (rev 2676) @@ -1,957 +0,0 @@ -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/bugs.html cyrus-imapd-2.3.11/doc/bugs.html ---- cyrus-imapd-2.3.11.orig/doc/bugs.html 2006-11-30 12:11:16.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/bugs.html 2008-01-22 04:19:22.968333000 -0500 -@@ -33,12 +33,12 @@ -
  • during appendstage(), the message is parsed once per delivery, - not once at the beginning. - --
  • master should pay attention to processes that have told -+
  • cyrus-master should pay attention to processes that have told - it they are listening, and make sure they don't die abnormally. - likewise, it should be on the lookout for continually forking - services. - --
  • master should probably have a babysitting service -+
  • cyrus-master should probably have a babysitting service - ("always keep this process running"). - - -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/faq.html cyrus-imapd-2.3.11/doc/faq.html ---- cyrus-imapd-2.3.11.orig/doc/faq.html 2006-11-30 12:11:16.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/faq.html 2008-01-22 04:19:23.008338000 -0500 -@@ -78,7 +78,7 @@ -

    Troubleshooting

    - -
    --
    Q: I'm getting syslog'd messages from the master process -+
    Q: I'm getting syslog'd messages from the cyrus-master process - saying processes are "signaled to death by 10". What's up?
    - -
    -@@ -142,7 +142,7 @@ -
    -

    A: Remove all imap, pop, lmtp - and sieve lines from [x]inetd.conf and restart --[x]inetd. Cyrus is run out of its own "master" process.

    -+[x]inetd. Cyrus is run out of its own "cyrus-master" process.

    -
    - -
    Q: How do I use different SSL/TLS certificates for imap -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/install-configure.html cyrus-imapd-2.3.11/doc/install-configure.html ---- cyrus-imapd-2.3.11.orig/doc/install-configure.html 2006-11-30 12:11:16.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/install-configure.html 2008-01-22 04:19:23.038343000 -0500 -@@ -230,16 +230,16 @@ - enabling certain services, or to tune the number of preforked copies. - Be sure not to remove the entries that are labeled required. - --

  • Arrange to start "/usr/cyrus/bin/master" as root when -+

  • Arrange to start "/usr/cyrus/bin/cyrus-master" as root when - the system starts. It will bind some ports and then give up it's root --privileges. Until your system reboots, you can start the master -+privileges. Until your system reboots, you can start the cyrus-master - process by hand: - - 
    --   /usr/cyrus/bin/master &
-+   /usr/cyrus/bin/cyrus-master &
-
    - --

  • Monitor the progress of the master process by examining the -+

  • Monitor the progress of the cyrus-master process by examining the - imapd.log file. It should never exit by itself, but you can - shut down the mail system by sending it a signal with kill. - -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/install-perf.html cyrus-imapd-2.3.11/doc/install-perf.html ---- cyrus-imapd-2.3.11.orig/doc/install-perf.html 2003-01-02 14:23:11.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/install-perf.html 2008-01-22 04:19:23.078346000 -0500 -@@ -81,7 +81,7 @@ - don't leave them there.
    • - -
  • You may want to increase the listen queue value when starting --up the master process. For example, you may want to do this if you -+up the cyrus-master process. For example, you may want to do this if you - see the Listen queue drop counter increasing quickly. For example, - under Solaris, look at the variable tcpListenDrop (from netstat - -sP tcp).
    • -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/install-upgrade.html cyrus-imapd-2.3.11/doc/install-upgrade.html ---- cyrus-imapd-2.3.11.orig/doc/install-upgrade.html 2007-12-08 14:24:25.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/install-upgrade.html 2008-01-22 04:19:23.118352000 -0500 -@@ -229,7 +229,7 @@ - allowusermoves option, which defaults to off.
    • - -
  • If you use ptloader, it now runs as a regular cyrus --service. This means that you will need master to acquire and maintain -+service. This means that you will need cyrus-master to acquire and maintain - AFS tokens for it. You will also need to create the ptclient - directory under your imap configdirectory, to hold the PTS cache (now - a full-fledged cyrusdb) and UNIX socket. In cyrus.conf, -@@ -409,7 +409,7 @@ - popd3d lines need to be removed from /etc/inetd.conf - and inetd needs to be restarted. - --
  • master process configuration: You'll need to configure the master -+
  • cyrus-master process configuration: You'll need to configure the cyrus-master - process Cyrus process and ensure that it starts on boot. see this section of the - configuration instructions. -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/chk_cyrus.8.html cyrus-imapd-2.3.11/doc/man/chk_cyrus.8.html ---- cyrus-imapd-2.3.11.orig/doc/man/chk_cyrus.8.html 2007-12-10 10:24:05.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/man/chk_cyrus.8.html 2008-01-22 04:19:23.188360000 -0500 -@@ -120,7 +120,7 @@ - - - --

    imapd.conf(5), master(8)

    -+

    imapd.conf(5), cyrus-master(8)

    - - -
    -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/ctl_cyrusdb.8.html cyrus-imapd-2.3.11/doc/man/ctl_cyrusdb.8.html ---- cyrus-imapd-2.3.11.orig/doc/man/ctl_cyrusdb.8.html 2007-12-10 10:24:05.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/man/ctl_cyrusdb.8.html 2008-01-22 04:19:23.218363000 -0500 -@@ -140,7 +140,7 @@ - - - --

    imapd.conf(5), master(8)

    -+

    imapd.conf(5), cyrus-master(8)

    - - -
    -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/ctl_deliver.8.html cyrus-imapd-2.3.11/doc/man/ctl_deliver.8.html ---- cyrus-imapd-2.3.11.orig/doc/man/ctl_deliver.8.html 2007-12-10 10:24:05.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/man/ctl_deliver.8.html 2008-01-22 04:19:23.248368000 -0500 -@@ -129,7 +129,7 @@ - - - --

    imapd.conf(5), master(8)

    -+

    imapd.conf(5), cyrus-master(8)

    - - -
    -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/ctl_mboxlist.8.html cyrus-imapd-2.3.11/doc/man/ctl_mboxlist.8.html ---- cyrus-imapd-2.3.11.orig/doc/man/ctl_mboxlist.8.html 2007-12-10 10:24:05.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/man/ctl_mboxlist.8.html 2008-01-22 04:19:23.268371000 -0500 -@@ -259,7 +259,7 @@ - - - --

    imapd.conf(5), master(8)

    -+

    imapd.conf(5), cyrus-master(8)

    - - -
    -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/cyr_expire.8.html cyrus-imapd-2.3.11/doc/man/cyr_expire.8.html ---- cyrus-imapd-2.3.11.orig/doc/man/cyr_expire.8.html 2007-12-10 10:24:05.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/man/cyr_expire.8.html 2008-01-22 04:19:23.298374000 -0500 -@@ -220,7 +220,7 @@ - - - --

    imapd.conf(5), master(8)

    -+

    imapd.conf(5), cyrus-master(8)

    - - -
    -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/cyrus.conf.5.html cyrus-imapd-2.3.11/doc/man/cyrus.conf.5.html ---- cyrus-imapd-2.3.11.orig/doc/man/cyrus.conf.5.html 2007-12-10 10:24:05.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/man/cyrus.conf.5.html 2008-01-22 04:19:23.328380000 -0500 -@@ -563,7 +563,7 @@ - - - --

    master(8), imapd(8), pop3d(8), -+

    cyrus-master(8), imapd(8), pop3d(8), - lmtpd(8), timsieved(8), idled(8), - notifyd(8), ctl_cyrusdb(8), - ctl_deliver(8), tls_prune(8), -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/fud.8.html cyrus-imapd-2.3.11/doc/man/fud.8.html ---- cyrus-imapd-2.3.11.orig/doc/man/fud.8.html 2007-12-10 10:24:05.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/man/fud.8.html 2008-01-22 04:19:23.368382000 -0500 -@@ -50,7 +50,7 @@ - - -

    FUD is a long lived datagram daemon started from --master that provides information about when a user last read -+cyrus-master that provides information about when a user last read - their mail, when mail last arrived in a user’s - mailbox, and how many messages are recent for that user.

    - -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/idled.8.html cyrus-imapd-2.3.11/doc/man/idled.8.html ---- cyrus-imapd-2.3.11.orig/doc/man/idled.8.html 2007-12-10 10:24:05.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/man/idled.8.html 2008-01-22 04:19:23.398385000 -0500 -@@ -52,7 +52,7 @@ - receives notifications of mailbox changes and signals the - appropriate imapd to report the changes to the - client. Idled is usually started from --master.

    -+cyrus-master.

    - -

    Idled reads its configuration options out of the - imapd.conf(5) file unless specified otherwise by -@@ -97,7 +97,7 @@ - - - --

    imapd.conf(5), master(8)

    -+

    imapd.conf(5), cyrus-master(8)

    - - -
    -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/imapd.8.html cyrus-imapd-2.3.11/doc/man/imapd.8.html ---- cyrus-imapd-2.3.11.orig/doc/man/imapd.8.html 2007-12-10 10:24:05.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/man/imapd.8.html 2008-01-22 04:19:23.428390000 -0500 -@@ -52,7 +52,7 @@ - -

    Imapd is an IMAP4rev1 server. It accepts commands - on its standard input and responds on its standard output. --It MUST be invoked by master(8) with those -+It MUST be invoked by cyrus-master(8) with those - descriptors attached to a remote client connection.

    - -

    Imapd reads its configuration options out of the -@@ -199,7 +199,7 @@ - - - --

    imapd.conf(5), master(8)

    -+

    imapd.conf(5), cyrus-master(8)

    - - -
    -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/imapd.conf.5.html cyrus-imapd-2.3.11/doc/man/imapd.conf.5.html ---- cyrus-imapd-2.3.11.orig/doc/man/imapd.conf.5.html 2007-12-10 10:24:06.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/man/imapd.conf.5.html 2008-01-22 04:19:23.468400000 -0500 -@@ -4053,7 +4053,7 @@ - -

    imapd(8), pop3d(8), nntpd(8), - lmtpd(8), timsieved(8), idled(8), --notifyd(8), deliver(8), master(8), -+notifyd(8), deliver(8), cyrus-master(8), - ciphers(1)

    - -

    Allowed values: off, userid, on

    -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/lmtpd.8.html cyrus-imapd-2.3.11/doc/man/lmtpd.8.html ---- cyrus-imapd-2.3.11.orig/doc/man/lmtpd.8.html 2007-12-10 10:24:06.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/man/lmtpd.8.html 2008-01-22 04:19:23.508399000 -0500 -@@ -53,7 +53,7 @@ -

    Lmtpd is an LMTP server used to deliver mail to - the IMAP mailstore. It accepts commands on its standard - input and responds on its standard output. It MUST be --invoked by master(8) with those descriptors attached -+invoked by cyrus-master(8) with those descriptors attached - to a remote client connection.

    - -

    Lmtpd reads its configuration options out of the -@@ -164,7 +164,7 @@ - - - --

    imapd.conf(5), master(8)

    -+

    imapd.conf(5), cyrus-master(8)

    - - -
    -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/master.8.html cyrus-imapd-2.3.11/doc/man/master.8.html ---- cyrus-imapd-2.3.11.orig/doc/man/master.8.html 2007-12-10 10:24:06.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/man/master.8.html 2008-01-22 04:19:23.538404000 -0500 -@@ -4,11 +4,11 @@ - - - --MASTER -+CYRUS-MASTER - - - --

    MASTER

    -+

    CYRUS-MASTER

    - NAME
    - SYNOPSIS
    - DESCRIPTION
    -@@ -27,7 +27,7 @@ - - - --

    master − master Cyrus process

    -+

    cyrus-master − master Cyrus process

    - - - -@@ -38,7 +38,7 @@ - - - --

    master [ −C alternate -+

    cyrus-master [ −C alternate - imapd.conf ] [ −M alternate - cyrus.conf ] [ −l listen queue ] [ - −p pidfile ] [ −P snmp -@@ -55,7 +55,7 @@ - - - --

    Master is the process that controls all of the -+

    Cyrus-master is the process that controls all of the - Cyrus processes. This process is responsible for creating - all imapd, pop3d, lmtpd and sieved child processes. This - process also initializes the Berkeley DB code and performs -@@ -84,9 +84,9 @@ - - - --

    Specifies an alternate imapd.conf for use by master (note -+

    Specifies an alternate imapd.conf for use by cyrus-master (note - that this will not affect any sub-processes spawned by --master, you should specify those specifically in the -+cyrus-master, you should specify those specifically in the - respective entries in cyrus.conf).

    - - -@@ -104,7 +104,7 @@ - - - --

    Specifies an alternate cyrus.conf for use by master.

    -+

    Specifies an alternate cyrus.conf for use by cyrus-master.

    - - - -@@ -241,10 +241,10 @@ - - - --

    Upon execution, master reads its configuration -+

    Upon execution, cyrus-master reads its configuration - information out of the cyrus.conf(5) file.

    - --

    Master rereads its configuration file when it -+

    Cyrus-master rereads its configuration file when it - receives a hangup signal, SIGHUP. Services and events may be - added, deleted or modified when the configuration file is - reread. Any active services removed from the configuration -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/nntpd.8.html cyrus-imapd-2.3.11/doc/man/nntpd.8.html ---- cyrus-imapd-2.3.11.orig/doc/man/nntpd.8.html 2007-12-10 10:24:06.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/man/nntpd.8.html 2008-01-22 04:19:23.558406000 -0500 -@@ -53,7 +53,7 @@ - -

    Nntpd is a NNTP server. It accepts commands on its - standard input and responds on its standard output. It MUST --invoked by master(8) with those descriptors attached -+invoked by cyrus-master(8) with those descriptors attached - to a remote client connection.

    - -

    Nntpd reads its configuration options out of the -@@ -220,7 +220,7 @@ - - - --

    imapd.conf(5), master(8)

    -+

    imapd.conf(5), cyrus-master(8)

    - - -
    -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/notifyd.8.html cyrus-imapd-2.3.11/doc/man/notifyd.8.html ---- cyrus-imapd-2.3.11.orig/doc/man/notifyd.8.html 2007-12-10 10:24:06.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/man/notifyd.8.html 2008-01-22 04:19:23.588410000 -0500 -@@ -51,7 +51,7 @@ - - - --

    Notifyd is a daemon started from master(8) that -+

    Notifyd is a daemon started from cyrus-master(8) that - handles notification requests on behalf of lmtpd(8). - Notifyd accepts the request and performs the - notification using the method specified in the request.

    -@@ -235,7 +235,7 @@ - - -

    imapd.conf(5), cyrus.conf, --master(8), lmtpd(8)

    -+cyrus-master(8), lmtpd(8)

    - - -
    -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/pop3d.8.html cyrus-imapd-2.3.11/doc/man/pop3d.8.html ---- cyrus-imapd-2.3.11.orig/doc/man/pop3d.8.html 2007-12-10 10:24:06.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/man/pop3d.8.html 2008-01-22 04:19:23.618414000 -0500 -@@ -53,7 +53,7 @@ - -

    Pop3d is a POP3 server. It accepts commands on its - standard input and responds on its standard output. It MUST --invoked by master(8) with those descriptors attached -+invoked by cyrus-master(8) with those descriptors attached - to a remote client connection.

    - -

    Pop3d reads its configuration options out of the -@@ -198,7 +198,7 @@ - - - --

    imapd.conf(5), master(8)

    -+

    imapd.conf(5), cyrus-master(8)

    - - -
    -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/smmapd.8.html cyrus-imapd-2.3.11/doc/man/smmapd.8.html ---- cyrus-imapd-2.3.11.orig/doc/man/smmapd.8.html 2007-12-10 10:24:07.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/man/smmapd.8.html 2008-01-22 04:19:23.648417000 -0500 -@@ -53,7 +53,7 @@ - used to verify that a Cyrus mailbox exists, that it is - postable and it is under quota. It accepts commands on its - standard input and responds on its standard output. It MUST --be invoked by master(8) with those descriptors -+be invoked by cyrus-master(8) with those descriptors - attached to a remote client connection.

    - -

    SMMAPD reads its configuration options out of the -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/timsieved.8.html cyrus-imapd-2.3.11/doc/man/timsieved.8.html ---- cyrus-imapd-2.3.11.orig/doc/man/timsieved.8.html 2007-12-10 10:24:07.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/man/timsieved.8.html 2008-01-22 04:19:23.678421000 -0500 -@@ -52,7 +52,7 @@ -

    timsieved is a server that allows users to - remotely manage their sieve scripts kept on the server. It - accepts commands on its standard input and responds on its --standard output. It MUST be invoked by master(8) with -+standard output. It MUST be invoked by cyrus-master(8) with - those descriptors attached to a remote client - connection.

    - -@@ -102,7 +102,7 @@ - - - --

    imapd.conf(5), master(8)

    -+

    imapd.conf(5), cyrus-master(8)

    - - -
    -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man/tls_prune.8.html cyrus-imapd-2.3.11/doc/man/tls_prune.8.html ---- cyrus-imapd-2.3.11.orig/doc/man/tls_prune.8.html 2007-12-10 10:24:07.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/man/tls_prune.8.html 2008-01-22 04:19:23.708425000 -0500 -@@ -96,7 +96,7 @@ - - - --

    imapd.conf(5), master(8)

    -+

    imapd.conf(5), cyrus-master(8)

    - - -
    -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/man.html cyrus-imapd-2.3.11/doc/man.html ---- cyrus-imapd-2.3.11.orig/doc/man.html 2007-02-09 08:23:27.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/man.html 2008-01-22 04:19:23.158355000 -0500 -@@ -48,7 +48,7 @@ -
  • imapd(8) -
  • ipurge(8) -
  • lmtpd(8) --
  • master(8) -+
  • cyrus-master(8) -
  • mbexamine(8) -
  • mbpath(8) -
  • nntpd(8) -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/text/bugs cyrus-imapd-2.3.11/doc/text/bugs ---- cyrus-imapd-2.3.11.orig/doc/text/bugs 2007-12-10 10:24:08.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/text/bugs 2008-01-22 04:19:23.738429000 -0500 -@@ -16,10 +16,10 @@ - threadsafe. - * during appendstage(), the message is parsed once per delivery, not - once at the beginning. -- * master should pay attention to processes that have told it they are -+ * cyrus-master should pay attention to processes that have told it they are - listening, and make sure they don't die abnormally. likewise, it - should be on the lookout for continually forking services. -- * master should probably have a babysitting service ("always keep -+ * cyrus-master should probably have a babysitting service ("always keep - this process running"). - - proxyd and Cyrus Murder -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/text/faq cyrus-imapd-2.3.11/doc/text/faq ---- cyrus-imapd-2.3.11.orig/doc/text/faq 2007-12-10 10:24:08.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/text/faq 2008-01-22 04:19:23.768433000 -0500 -@@ -52,7 +52,7 @@ - - Troubleshooting - -- Q: I'm getting syslog'd messages from the master process saying -+ Q: I'm getting syslog'd messages from the cyrus-master process saying - processes are "signaled to death by 10". What's up? - - -@@ -98,7 +98,7 @@ - - A: Remove all imap, pop, lmtp and sieve lines from - [x]inetd.conf and restart [x]inetd. Cyrus is run out of its own -- "master" process. -+ "cyrus-master" process. - Q: How do I use different SSL/TLS certificates for imap and pop? - - -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/text/install-configure cyrus-imapd-2.3.11/doc/text/install-configure ---- cyrus-imapd-2.3.11.orig/doc/text/install-configure 2007-12-10 10:24:08.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/text/install-configure 2008-01-22 04:19:23.798438000 -0500 -@@ -160,7 +160,7 @@ - kpop, lmtp and sieve lines need to be removed from - /etc/[x]inetd.conf and [x]inetd needs to be restarted. - --Configuring the Master Process -+Configuring the Cyrus-master Process - - 1. Choose a configuration from the master/conf directory: - -@@ -186,14 +186,14 @@ - certain services, or to tune the number of preforked copies. Be - sure not to remove the entries that are labeled required. - -- 2. Arrange to start "/usr/cyrus/bin/master" as root when the system -+ 2. Arrange to start "/opt/csw/sbin/cyrus-master" as root when the system - starts. It will bind some ports and then give up it's root - privileges. Until your system reboots, you can start the master - process by hand: - -- /usr/cyrus/bin/master & -+ /usr/cyrus/bin/cyrus-master & - -- 3. Monitor the progress of the master process by examining the -+ 3. Monitor the progress of the cyrus-master process by examining the - imapd.log file. It should never exit by itself, but you can shut - down the mail system by sending it a signal with kill. - -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/text/install-perf cyrus-imapd-2.3.11/doc/text/install-perf ---- cyrus-imapd-2.3.11.orig/doc/text/install-perf 2007-12-10 10:24:08.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/text/install-perf 2008-01-22 04:19:23.828440000 -0500 -@@ -62,7 +62,7 @@ - /usr/lib/sasl2 and if you don't plan on using those mechanisms, - don't leave them there. - * You may want to increase the listen queue value when starting up -- the master process. For example, you may want to do this if you see -+ the cyrus-master process. For example, you may want to do this if you see - the Listen queue drop counter increasing quickly. For example, - under Solaris, look at the variable tcpListenDrop (from netstat -sP - tcp). -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/text/install-upgrade cyrus-imapd-2.3.11/doc/text/install-upgrade ---- cyrus-imapd-2.3.11.orig/doc/text/install-upgrade 2007-12-10 10:24:08.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/text/install-upgrade 2008-01-22 04:24:50.079616000 -0500 -@@ -134,7 +134,7 @@ - * User moves via RENAME and XFER are now controlled by the - allowusermoves option, which defaults to off. - * If you use ptloader, it now runs as a regular cyrus service. This -- means that you will need master to acquire and maintain AFS tokens -+ means that you will need cyrus-master to acquire and maintain AFS tokens - for it. You will also need to create the ptclient directory under - your imap configdirectory, to hold the PTS cache (now a - full-fledged cyrusdb) and UNIX socket. In cyrus.conf, ptloader -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/doc/text/man cyrus-imapd-2.3.11/doc/text/man ---- cyrus-imapd-2.3.11.orig/doc/text/man 2007-12-10 10:24:08.000000000 -0500 -+++ cyrus-imapd-2.3.11/doc/text/man 2008-01-22 04:19:23.908450000 -0500 -@@ -39,7 +39,7 @@ - * imapd(8) - * ipurge(8) - * lmtpd(8) -- * master(8) -+ * cyrus-master(8) - * mbexamine(8) - * mbpath(8) - * nntpd(8) -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/lib/imapoptions cyrus-imapd-2.3.11/lib/imapoptions ---- cyrus-imapd-2.3.11.orig/lib/imapoptions 2007-10-18 14:14:48.000000000 -0400 -+++ cyrus-imapd-2.3.11/lib/imapoptions 2008-01-22 04:19:23.948460000 -0500 -@@ -1045,5 +1045,5 @@ - .PP - \fBimapd(8)\fR, \fBpop3d(8)\fR, \fBnntpd(8)\fR, \fBlmtpd(8)\fR, - \fBtimsieved(8)\fR, \fBidled(8)\fR, \fBnotifyd(8)\fR, --\fBdeliver(8)\fR, \fBmaster(8)\fR, \fBciphers(1)\fR -+\fBdeliver(8)\fR, \fBcyrus-master(8)\fR, \fBciphers(1)\fR - */ -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/Makefile.in cyrus-imapd-2.3.11/man/Makefile.in ---- cyrus-imapd-2.3.11.orig/man/Makefile.in 2007-10-18 14:14:48.000000000 -0400 -+++ cyrus-imapd-2.3.11/man/Makefile.in 2008-01-22 04:19:23.998461000 -0500 -@@ -61,7 +61,7 @@ - MAN8 = $(srcdir)/arbitron.8 $(srcdir)/cyr_expire.8 $(srcdir)/deliver.8 \ - $(srcdir)/fud.8 $(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/quota.8 \ - $(srcdir)/reconstruct.8 $(srcdir)/rmnews.8 $(srcdir)/syncnews.8 \ -- $(srcdir)/mbpath.8 $(srcdir)/timsieved.8 $(srcdir)/master.8 \ -+ $(srcdir)/mbpath.8 $(srcdir)/timsieved.8 $(srcdir)/cyrus-master.8 \ - $(srcdir)/lmtpd.8 $(srcdir)/idled.8 $(srcdir)/ctl_mboxlist.8 \ - $(srcdir)/ctl_deliver.8 $(srcdir)/ctl_cyrusdb.8 $(srcdir)/ipurge.8 \ - $(srcdir)/tls_prune.8 $(srcdir)/squatter.8 $(srcdir)/cvt_cyrusdb.8 \ -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/chk_cyrus.8 cyrus-imapd-2.3.11/man/chk_cyrus.8 ---- cyrus-imapd-2.3.11.orig/man/chk_cyrus.8 2006-06-19 09:05:54.000000000 -0400 -+++ cyrus-imapd-2.3.11/man/chk_cyrus.8 2008-01-22 04:19:24.028465000 -0500 -@@ -83,4 +83,4 @@ - .B /etc/imapd.conf - .SH SEE ALSO - .PP --\fBimapd.conf(5)\fR, \fBmaster(8)\fR -+\fBimapd.conf(5)\fR, \fBcyrus-master(8)\fR -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/ctl_cyrusdb.8 cyrus-imapd-2.3.11/man/ctl_cyrusdb.8 ---- cyrus-imapd-2.3.11.orig/man/ctl_cyrusdb.8 2003-08-09 19:43:14.000000000 -0400 -+++ cyrus-imapd-2.3.11/man/ctl_cyrusdb.8 2008-01-22 04:19:24.068470000 -0500 -@@ -94,4 +94,4 @@ - .B /etc/imapd.conf - .SH SEE ALSO - .PP --\fBimapd.conf(5)\fR, \fBmaster(8)\fR -+\fBimapd.conf(5)\fR, \fBcyrus-master(8)\fR -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/ctl_deliver.8 cyrus-imapd-2.3.11/man/ctl_deliver.8 ---- cyrus-imapd-2.3.11.orig/man/ctl_deliver.8 2003-10-22 14:50:13.000000000 -0400 -+++ cyrus-imapd-2.3.11/man/ctl_deliver.8 2008-01-22 04:19:24.098473000 -0500 -@@ -78,4 +78,4 @@ - .B /etc/imapd.conf - .SH SEE ALSO - .PP --\fBimapd.conf(5)\fR, \fBmaster(8)\fR -+\fBimapd.conf(5)\fR, \fBcyrus-master(8)\fR -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/ctl_mboxlist.8 cyrus-imapd-2.3.11/man/ctl_mboxlist.8 ---- cyrus-imapd-2.3.11.orig/man/ctl_mboxlist.8 2007-10-05 14:39:48.000000000 -0400 -+++ cyrus-imapd-2.3.11/man/ctl_mboxlist.8 2008-01-22 04:19:24.138477000 -0500 -@@ -166,4 +166,4 @@ - .B /etc/imapd.conf - .SH SEE ALSO - .PP --\fBimapd.conf(5)\fR, \fBmaster(8)\fR -+\fBimapd.conf(5)\fR, \fBcyrus-master(8)\fR -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/cyr_expire.8 cyrus-imapd-2.3.11/man/cyr_expire.8 ---- cyrus-imapd-2.3.11.orig/man/cyr_expire.8 2007-09-04 11:13:27.000000000 -0400 -+++ cyrus-imapd-2.3.11/man/cyr_expire.8 2008-01-22 04:19:24.178482000 -0500 -@@ -121,4 +121,4 @@ - .B /etc/imapd.conf - .SH SEE ALSO - .PP --\fBimapd.conf(5)\fR, \fBmaster(8)\fR -+\fBimapd.conf(5)\fR, \fBcyrus-master(8)\fR -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/cyrus.conf.5 cyrus-imapd-2.3.11/man/cyrus.conf.5 ---- cyrus-imapd-2.3.11.orig/man/cyrus.conf.5 2007-09-24 08:48:32.000000000 -0400 -+++ cyrus-imapd-2.3.11/man/cyrus.conf.5 2008-01-22 04:19:24.218489000 -0500 -@@ -44,9 +44,9 @@ - cyrus.conf \- Cyrus configuration file - .SH DESCRIPTION - \fB/etc/cyrus.conf\fR --is the configuration file for the Cyrus \fBmaster\fR process. It -+is the configuration file for the Cyrus \fBcyrus-master\fR process. It - defines the startup procedures, services and events to be spawned by --\fBmaster\fR. -+\fBcyrus-master\fR. - .PP - The \fB/etc/cyrus.conf\fR file consists of a series of entries divided - into sections of the form -@@ -177,6 +177,6 @@ - still have separate access control rules. - .SH SEE ALSO - .PP --\fBmaster(8)\fR, \fBimapd(8)\fR, \fBpop3d(8)\fR, \fBlmtpd(8)\fR, -+\fBcyrus-master(8)\fR, \fBimapd(8)\fR, \fBpop3d(8)\fR, \fBlmtpd(8)\fR, - \fBtimsieved(8)\fR, \fBidled(8)\fR, \fBnotifyd(8)\fR, \fBctl_cyrusdb(8)\fR, - \fBctl_deliver(8)\fR, \fBtls_prune(8)\fR, \fBhosts_access(5)\fR -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/fud.8 cyrus-imapd-2.3.11/man/fud.8 ---- cyrus-imapd-2.3.11.orig/man/fud.8 2003-10-22 14:50:13.000000000 -0400 -+++ cyrus-imapd-2.3.11/man/fud.8 2008-01-22 04:19:24.268494000 -0500 -@@ -61,7 +61,7 @@ - ] - .SH DESCRIPTION - .B FUD --is a long lived datagram daemon started from master that provides -+is a long lived datagram daemon started from cyrus-master that provides - information about when a user last - read their mail, when mail last arrived in a user's mailbox, and how - many messages are recent for that user. -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/idled.8 cyrus-imapd-2.3.11/man/idled.8 ---- cyrus-imapd-2.3.11.orig/man/idled.8 2003-08-09 19:43:14.000000000 -0400 -+++ cyrus-imapd-2.3.11/man/idled.8 2008-01-22 04:19:24.298497000 -0500 -@@ -56,7 +56,7 @@ - to report the changes to the client. - .I Idled - is usually started from --.I master. -+.I cyrus-master. - .PP - .I Idled - reads its configuration options out of the -@@ -75,4 +75,4 @@ - .B /etc/imapd.conf - .SH SEE ALSO - .PP --\fBimapd.conf(5)\fR, \fBmaster(8)\fR -+\fBimapd.conf(5)\fR, \fBcyrus-master(8)\fR -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/imapd.8 cyrus-imapd-2.3.11/man/imapd.8 ---- cyrus-imapd-2.3.11.orig/man/imapd.8 2002-10-03 15:02:41.000000000 -0400 -+++ cyrus-imapd-2.3.11/man/imapd.8 2008-01-22 04:19:24.338503000 -0500 -@@ -72,7 +72,7 @@ - is an IMAP4rev1 server. - It accepts commands on its standard input and responds on its standard output. - It MUST be invoked by --.IR master (8) -+.IR cyrus-master (8) - with those descriptors attached to a remote client connection. - .PP - .I Imapd -@@ -148,4 +148,4 @@ - .B /etc/imapd.conf - .SH SEE ALSO - .PP --\fBimapd.conf(5)\fR, \fBmaster(8)\fR -+\fBimapd.conf(5)\fR, \fBcyrus-master(8)\fR -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/imapd.conf.5 cyrus-imapd-2.3.11/man/imapd.conf.5 ---- cyrus-imapd-2.3.11.orig/man/imapd.conf.5 2007-12-10 10:24:04.000000000 -0500 -+++ cyrus-imapd-2.3.11/man/imapd.conf.5 2008-01-22 04:19:24.368513000 -0500 -@@ -872,7 +872,7 @@ - .PP - \fBimapd(8)\fR, \fBpop3d(8)\fR, \fBnntpd(8)\fR, \fBlmtpd(8)\fR, - \fBtimsieved(8)\fR, \fBidled(8)\fR, \fBnotifyd(8)\fR, --\fBdeliver(8)\fR, \fBmaster(8)\fR, \fBciphers(1)\fR -+\fBdeliver(8)\fR, \fBcyrus-master(8)\fR, \fBciphers(1)\fR - - - Allowed values: \fIoff\fR, \fIuserid\fR, \fIon\fR -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/lmtpd.8 cyrus-imapd-2.3.11/man/lmtpd.8 ---- cyrus-imapd-2.3.11.orig/man/lmtpd.8 2002-10-03 15:02:41.000000000 -0400 -+++ cyrus-imapd-2.3.11/man/lmtpd.8 2008-01-22 04:19:24.418512000 -0500 -@@ -68,7 +68,7 @@ - is an LMTP server used to deliver mail to the IMAP mailstore. - It accepts commands on its standard input and responds on its standard output. - It MUST be invoked by --.IR master (8) -+.IR cyrus-master (8) - with those descriptors attached to a remote client connection. - .PP - .I Lmtpd -@@ -101,4 +101,4 @@ - .B /etc/imapd.conf - .SH SEE ALSO - .PP --\fBimapd.conf(5)\fR, \fBmaster(8)\fR -+\fBimapd.conf(5)\fR, \fBcyrus-master(8)\fR -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/master.8 cyrus-imapd-2.3.11/man/master.8 ---- cyrus-imapd-2.3.11.orig/man/master.8 2006-11-30 12:11:23.000000000 -0500 -+++ cyrus-imapd-2.3.11/man/master.8 2008-01-22 04:19:24.448517000 -0500 -@@ -1,5 +1,5 @@ - .\" -*- nroff -*- --.TH MASTER 8 "Project Cyrus" CMU -+.TH CYRUS-MASTER 8 "Project Cyrus" CMU - .\" - .\" Copyright (c) 1996-2000 Carnegie Mellon University. All rights reserved. - .\" -@@ -41,9 +41,9 @@ - .\" - .\" $Id: master.8,v 1.14 2006/11/30 17:11:23 murch Exp $ - .SH NAME --master \- master Cyrus process -+cyrus-master \- master Cyrus process - .SH SYNOPSIS --.B master -+.B cyrus-master - [ - .B \-C - .I alternate imapd.conf -@@ -79,7 +79,7 @@ - .I snmp agentx socket - ] - .SH DESCRIPTION --.I Master -+.I Cyrus-master - is the process that controls all of the Cyrus processes. This process - is responsible for creating all imapd, pop3d, lmtpd and sieved child - processes. This process also initializes the Berkeley DB code and -@@ -92,12 +92,12 @@ - .SH OPTIONS - .TP - .BI \-C " alternate imapd.conf" --Specifies an alternate imapd.conf for use by master (note that this will --not affect any sub-processes spawned by master, you should specify those -+Specifies an alternate imapd.conf for use by cyrus-master (note that this will -+not affect any sub-processes spawned by cyrus-master, you should specify those - specifically in the respective entries in cyrus.conf). - .TP - .BI \-M " alternate cyrus.conf" --Specifies an alternate cyrus.conf for use by master. -+Specifies an alternate cyrus.conf for use by cyrus-master. - .TP - .BI \-l " listen queue backlog" - Increase the listen queue backlog. By default, the listen queue is set -@@ -132,12 +132,12 @@ - Requires net-snmp 5.0 or higher. - .SH CONFIGURATION - Upon execution, --.I master -+.I cyrus-master - reads its configuration information out of the - .IR cyrus.conf (5) - file. - .PP --.I Master -+.I Cyrus-master - rereads its configuration file when it receives a hangup signal, - SIGHUP. Services and events may be added, deleted or modified when the - configuration file is reread. Any active services removed from the -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/nntpd.8 cyrus-imapd-2.3.11/man/nntpd.8 ---- cyrus-imapd-2.3.11.orig/man/nntpd.8 2006-11-30 12:11:23.000000000 -0500 -+++ cyrus-imapd-2.3.11/man/nntpd.8 2008-01-22 04:19:24.488523000 -0500 -@@ -78,7 +78,7 @@ - is a NNTP server. - It accepts commands on its standard input and responds on its standard output. - It MUST invoked by --.IR master (8) -+.IR cyrus-master (8) - with those descriptors attached to a remote client connection. - .PP - .I Nntpd -@@ -153,4 +153,4 @@ - .B /etc/imapd.conf - .SH SEE ALSO - .PP --\fBimapd.conf(5)\fR, \fBmaster(8)\fR -+\fBimapd.conf(5)\fR, \fBcyrus-master(8)\fR -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/notifyd.8 cyrus-imapd-2.3.11/man/notifyd.8 ---- cyrus-imapd-2.3.11.orig/man/notifyd.8 2003-08-09 19:43:14.000000000 -0400 -+++ cyrus-imapd-2.3.11/man/notifyd.8 2008-01-22 04:19:24.538528000 -0500 -@@ -62,7 +62,7 @@ - ] - .SH DESCRIPTION - .B Notifyd --is a daemon started from master(8) that handles notification requests on -+is a daemon started from cyrus-master(8) that handles notification requests on - behalf of lmtpd(8). - .B Notifyd - accepts the request and performs the notification using the method -@@ -122,4 +122,4 @@ - Cyrus Master process configuration file. - .SH SEE ALSO - .PP --\fBimapd.conf(5)\fR, \fBcyrus.conf\fR, \fBmaster(8)\fR, \fBlmtpd(8)\fR -+\fBimapd.conf(5)\fR, \fBcyrus.conf\fR, \fBcyrus-master(8)\fR, \fBlmtpd(8)\fR -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/pop3d.8 cyrus-imapd-2.3.11/man/pop3d.8 ---- cyrus-imapd-2.3.11.orig/man/pop3d.8 2006-11-30 12:11:23.000000000 -0500 -+++ cyrus-imapd-2.3.11/man/pop3d.8 2008-01-22 04:19:24.568532000 -0500 -@@ -75,7 +75,7 @@ - is a POP3 server. - It accepts commands on its standard input and responds on its standard output. - It MUST invoked by --.IR master (8) -+.IR cyrus-master (8) - with those descriptors attached to a remote client connection. - .PP - .I Pop3d -@@ -132,4 +132,4 @@ - .B /etc/imapd.conf - .SH SEE ALSO - .PP --\fBimapd.conf(5)\fR, \fBmaster(8)\fR -+\fBimapd.conf(5)\fR, \fBcyrus-master(8)\fR -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/smmapd.8 cyrus-imapd-2.3.11/man/smmapd.8 ---- cyrus-imapd-2.3.11.orig/man/smmapd.8 2006-11-30 12:11:23.000000000 -0500 -+++ cyrus-imapd-2.3.11/man/smmapd.8 2008-01-22 04:19:24.608537000 -0500 -@@ -67,7 +67,7 @@ - It accepts commands on its standard input and responds on its standard - output. - It MUST be invoked by --.IR master (8) -+.IR cyrus-master (8) - with those descriptors attached to a remote client connection. - .PP - .B SMMAPD -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/timsieved.8 cyrus-imapd-2.3.11/man/timsieved.8 ---- cyrus-imapd-2.3.11.orig/man/timsieved.8 2006-11-30 12:11:23.000000000 -0500 -+++ cyrus-imapd-2.3.11/man/timsieved.8 2008-01-22 04:19:24.638540000 -0500 -@@ -53,7 +53,7 @@ - is a server that allows users to remotely manage their sieve scripts - kept on the server. It accepts commands on its standard input and - responds on its standard output. It MUST be invoked by --.IR master (8) -+.IR cyrus-master (8) - with those descriptors attached to a remote client connection. - .PP - Cyrus admins that authenticate and authorize as themselves (e.g. don't -@@ -73,4 +73,4 @@ - .B /etc/imapd.conf - .SH SEE ALSO - .PP --\fBimapd.conf(5)\fR, \fBmaster(8)\fR -+\fBimapd.conf(5)\fR, \fBcyrus-master(8)\fR -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/man/tls_prune.8 cyrus-imapd-2.3.11/man/tls_prune.8 ---- cyrus-imapd-2.3.11.orig/man/tls_prune.8 2003-08-09 19:43:15.000000000 -0400 -+++ cyrus-imapd-2.3.11/man/tls_prune.8 2008-01-22 04:19:24.678545000 -0500 -@@ -67,4 +67,4 @@ - .B /etc/imapd.conf - .SH SEE ALSO - .PP --\fBimapd.conf(5)\fR, \fBmaster(8)\fR -+\fBimapd.conf(5)\fR, \fBcyrus-master(8)\fR -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/master/Makefile.in cyrus-imapd-2.3.11/master/Makefile.in ---- cyrus-imapd-2.3.11.orig/master/Makefile.in 2007-09-24 08:48:32.000000000 -0400 -+++ cyrus-imapd-2.3.11/master/Makefile.in 2008-01-22 04:20:08.954063000 -0500 -@@ -71,7 +71,7 @@ - - LOBJS=service.o service-thread.o - --PROGS=master -+PROGS=cyrus-master - - all: $(PROGS) $(LOBJS) - -@@ -86,8 +86,8 @@ - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \ - $< - --master: master.o masterconf.o cyrusMasterMIB.o ../lib/lock_ at WITH_LOCK@.o -- $(CC) $(LDFLAGS) -o master master.o masterconf.o cyrusMasterMIB.o ../lib/lock_ at WITH_LOCK@.o $(LIBS) $(DEPLIBS) -+cyrus-master: master.o masterconf.o cyrusMasterMIB.o ../lib/lock_ at WITH_LOCK@.o -+ $(CC) $(LDFLAGS) -o cyrus-master master.o masterconf.o cyrusMasterMIB.o ../lib/lock_ at WITH_LOCK@.o $(LIBS) $(DEPLIBS) - - clean: - rm -f *.o *.a Makefile.bak $(PROGS) -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/master/master.c cyrus-imapd-2.3.11/master/master.c ---- cyrus-imapd-2.3.11.orig/master/master.c 2007-10-10 09:59:48.000000000 -0400 -+++ cyrus-imapd-2.3.11/master/master.c 2008-01-22 04:19:24.748554000 -0500 -@@ -1738,7 +1738,7 @@ - pid = fork(); - - if ((pid == -1) && (errno == EAGAIN)) { -- syslog(LOG_WARNING, "master fork failed (sleeping): %m"); -+ syslog(LOG_WARNING, "cyrus-master fork failed (sleeping): %m"); - sleep(5); - } - } while ((pid == -1) && (errno == EAGAIN)); -@@ -1799,7 +1799,7 @@ - /* Tell our parent that we failed. */ - write(startup_pipe[1], &exit_result, sizeof(exit_result)); - -- fatal("cannot get exclusive lock on pidfile (is another master still running?)", EX_OSERR); -+ fatal("cannot get exclusive lock on pidfile (is another cyrus-master still running?)", EX_OSERR); - } else { - int pidfd_flags = fcntl(pidfd, F_GETFD, 0); - if (pidfd_flags != -1) -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/master/service-thread.c cyrus-imapd-2.3.11/master/service-thread.c ---- cyrus-imapd-2.3.11.orig/master/service-thread.c 2006-11-30 12:11:23.000000000 -0500 -+++ cyrus-imapd-2.3.11/master/service-thread.c 2008-01-22 04:19:24.778558000 -0500 -@@ -79,11 +79,11 @@ - void notify_master(int fd, int msg) - { - struct notify_message notifymsg; -- if (verbose) syslog(LOG_DEBUG, "telling master %x", msg); -+ if (verbose) syslog(LOG_DEBUG, "telling cyrus-master %x", msg); - notifymsg.message = msg; - notifymsg.service_pid = getpid(); - if (write(fd, ¬ifymsg, sizeof(notifymsg)) != sizeof(notifymsg)) { -- syslog(LOG_ERR, "unable to tell master %x: %m", msg); -+ syslog(LOG_ERR, "unable to tell cyrus-master %x: %m", msg); - } - } - -diff --speed-large-files --minimal -Nru cyrus-imapd-2.3.11.orig/master/service.c cyrus-imapd-2.3.11/master/service.c ---- cyrus-imapd-2.3.11.orig/master/service.c 2007-09-27 16:10:39.000000000 -0400 -+++ cyrus-imapd-2.3.11/master/service.c 2008-01-22 04:19:24.808564000 -0500 -@@ -86,11 +86,11 @@ - void notify_master(int fd, int msg) - { - struct notify_message notifymsg; -- if (verbose) syslog(LOG_DEBUG, "telling master %x", msg); -+ if (verbose) syslog(LOG_DEBUG, "telling cyrus-master %x", msg); - notifymsg.message = msg; - notifymsg.service_pid = getpid(); - if (write(fd, ¬ifymsg, sizeof(notifymsg)) != sizeof(notifymsg)) { -- syslog(LOG_ERR, "unable to tell master %x: %m", msg); -+ syslog(LOG_ERR, "unable to tell cyrus-master %x: %m", msg); - } - } - Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW 2008-12-19 19:11:49 UTC (rev 2675) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/pm_cyrus.changelog.CSW 2008-12-20 14:18:23 UTC (rev 2676) @@ -1,3 +1,15 @@ +pm_cyrus (2.3.13,REV=2008.12.20) unstable + + * Added mupdate service in /etc/services. + + -- Yann Rouillard Sat, 20 Dec 2008 15:13:33 +0100 + +pm_cyrus (2.3.13,REV=2008.11.30) unstable + + * New upstream version. + + -- Yann Rouillard Sun, 30 Nov 2008 20:58:22 +0100 + pm_cyrus (2.3.9,REV=2008.01.21) unstable * New upstream version. Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/services =================================================================== --- csw/mgar/pkg/cyrus_imapd/trunk/files/services 2008-12-19 19:11:49 UTC (rev 2675) +++ csw/mgar/pkg/cyrus_imapd/trunk/files/services 2008-12-20 14:18:23 UTC (rev 2676) @@ -16,6 +16,7 @@ kpop 1109/tcp # Pop with Kerberos sieve 2000/tcp # Sieve mail filter daemon lmtp 2003/tcp # Local Mail Transfer Protocol +mupdate 3905/tcp fud 4201/udp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Dec 21 21:59:36 2008 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 21 Dec 2008 20:59:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[2677] csw/mgar/pkg/x11/libXau/trunk Message-ID: Revision: 2677 http://gar.svn.sourceforge.net/gar/?rev=2677&view=rev Author: wbonnet Date: 2008-12-21 20:59:36 +0000 (Sun, 21 Dec 2008) Log Message: ----------- Update libXau makefiles Modified Paths: -------------- csw/mgar/pkg/x11/libXau/trunk/Makefile csw/mgar/pkg/x11/libXau/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x11/libXau/trunk/files/CSWlibxau.gspec csw/mgar/pkg/x11/libXau/trunk/files/CSWlibxaudevel.gspec Removed Paths: ------------- csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXau.depend csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXau.gspec csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXau.prototype csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXaudev.depend csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXaudev.gspec csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXaudev.prototype Modified: csw/mgar/pkg/x11/libXau/trunk/Makefile =================================================================== --- csw/mgar/pkg/x11/libXau/trunk/Makefile 2008-12-20 14:18:23 UTC (rev 2676) +++ csw/mgar/pkg/x11/libXau/trunk/Makefile 2008-12-21 20:59:36 UTC (rev 2677) @@ -14,10 +14,10 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz -DISTFILES += CSWlibXau.gspec CSWlibXau.prototype CSWlibXau.depend -DISTFILES += CSWlibXaudev.gspec CSWlibXaudev.prototype CSWlibXaudev.depend -# DISTFILES += $(call admfiles,CSWlibXau, depend) +DISTFILES += $(call admfiles,CSWlibxaudevel, ) +DISTFILES += $(call admfiles,CSWlibxau, ) +PKGFILES_CSWlibxaudevel = $(PKGFILES_DEVEL) include gar/category.mk Modified: csw/mgar/pkg/x11/libXau/trunk/checksums =================================================================== --- csw/mgar/pkg/x11/libXau/trunk/checksums 2008-12-20 14:18:23 UTC (rev 2676) +++ csw/mgar/pkg/x11/libXau/trunk/checksums 2008-12-21 20:59:36 UTC (rev 2677) @@ -1,7 +1,3 @@ 77c3de874155456c857b331063ad2fd9 download/libXau-1.0.4.tar.gz -d987d62443ccb06edc51d6984f9c5e00 download/CSWlibXau.gspec -d9dfaadc29ebcfddad888bb4d1ac347c download/CSWlibXau.prototype -c46676dbe305dd1a76701a52899afbf8 download/CSWlibXau.depend -6b9f39ea5225419f95cf6fd001505548 download/CSWlibXaudev.gspec -89680d18777fdcad32e518093adb0066 download/CSWlibXaudev.prototype -0a284be99d29cdfd141d0df6c13baa8e download/CSWlibXaudev.depend +03fd9250999932312a8f773cf5bc036d download/CSWlibxaudevel.gspec +4dba507bb4e471f3f15a039958063ee8 download/CSWlibxau.gspec Deleted: csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXau.depend =================================================================== --- csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXau.depend 2008-12-20 14:18:23 UTC (rev 2676) +++ csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXau.depend 2008-12-21 20:59:36 UTC (rev 2677) @@ -1,5 +0,0 @@ -P CSWfconfig -P CSWftype2 -P CSWpixman -P CSWpng -P CSWzlib Deleted: csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXau.gspec =================================================================== --- csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXau.gspec 2008-12-20 14:18:23 UTC (rev 2676) +++ csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXau.gspec 2008-12-21 20:59:36 UTC (rev 2677) @@ -1,4 +0,0 @@ -%var bitname libxau -%var pkgname CSWlibxau -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING Deleted: csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXau.prototype =================================================================== --- csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXau.prototype 2008-12-20 14:18:23 UTC (rev 2676) +++ csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXau.prototype 2008-12-21 20:59:36 UTC (rev 2677) @@ -1,20 +0,0 @@ -d none /opt/csw/lib 0755 root bin -f none /opt/csw/lib/libXau.la 0755 root bin -f none /opt/csw/lib/libXau.so.6.0.0 0755 root bin -s none /opt/csw/lib/libXau.so.6=libXau.so.6.0.0 -s none /opt/csw/lib/libXau.so=libXau.so.6.0.0 -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/Xau.3 0644 root bin -f none /opt/csw/share/man/man3/XauDisposeAuth.3 0644 root bin -f none /opt/csw/share/man/man3/XauFileName.3 0644 root bin -f none /opt/csw/share/man/man3/XauGetAuthByAddr.3 0644 root bin -f none /opt/csw/share/man/man3/XauGetBestAuthByAddr.3 0644 root bin -f none /opt/csw/share/man/man3/XauLockAuth.3 0644 root bin -f none /opt/csw/share/man/man3/XauReadAuth.3 0644 root bin -f none /opt/csw/share/man/man3/XauUnlockAuth.3 0644 root bin -f none /opt/csw/share/man/man3/XauWriteAuth.3 0644 root bin -i copyright=CSWlibXau.copyright -i depend=CSWlibXau.depend -i pkginfo=CSWlibXau.pkginfo Deleted: csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXaudev.depend =================================================================== --- csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXaudev.depend 2008-12-20 14:18:23 UTC (rev 2676) +++ csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXaudev.depend 2008-12-21 20:59:36 UTC (rev 2677) @@ -1 +0,0 @@ -P CSWlibxau Deleted: csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXaudev.gspec =================================================================== --- csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXaudev.gspec 2008-12-20 14:18:23 UTC (rev 2676) +++ csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXaudev.gspec 2008-12-21 20:59:36 UTC (rev 2677) @@ -1,4 +0,0 @@ -%var bitname libxau_dev -%var pkgname CSWlibxaudev -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING Deleted: csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXaudev.prototype =================================================================== --- csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXaudev.prototype 2008-12-20 14:18:23 UTC (rev 2676) +++ csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXaudev.prototype 2008-12-21 20:59:36 UTC (rev 2677) @@ -1,9 +0,0 @@ -d none /opt/csw/include/X11 0755 root bin -f none /opt/csw/include/X11/Xauth.h 0644 root bin -d none /opt/csw/lib 0755 root bin -f none /opt/csw/lib/libXau.a 0644 root bin -d none /opt/csw/lib/pkgconfig 0755 root bin -f none /opt/csw/lib/pkgconfig/xau.pc 0644 root bin -i copyright=CSWlibXaudev.copyright -i depend=CSWlibXaudev.depend -i pkginfo=CSWlibXaudev.pkginfo Copied: csw/mgar/pkg/x11/libXau/trunk/files/CSWlibxau.gspec (from rev 2660, csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXau.gspec) =================================================================== --- csw/mgar/pkg/x11/libXau/trunk/files/CSWlibxau.gspec (rev 0) +++ csw/mgar/pkg/x11/libXau/trunk/files/CSWlibxau.gspec 2008-12-21 20:59:36 UTC (rev 2677) @@ -0,0 +1,4 @@ +%var bitname libxau +%var pkgname CSWlibxau +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING Copied: csw/mgar/pkg/x11/libXau/trunk/files/CSWlibxaudevel.gspec (from rev 2660, csw/mgar/pkg/x11/libXau/trunk/files/CSWlibXaudev.gspec) =================================================================== --- csw/mgar/pkg/x11/libXau/trunk/files/CSWlibxaudevel.gspec (rev 0) +++ csw/mgar/pkg/x11/libXau/trunk/files/CSWlibxaudevel.gspec 2008-12-21 20:59:36 UTC (rev 2677) @@ -0,0 +1,4 @@ +%var bitname libxau_devel +%var pkgname CSWlibxaudevel +%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 trygvis at users.sourceforge.net Sun Dec 21 22:10:09 2008 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Sun, 21 Dec 2008 21:10:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[2678] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 2678 http://gar.svn.sourceforge.net/gar/?rev=2678&view=rev Author: trygvis Date: 2008-12-21 21:10:08 +0000 (Sun, 21 Dec 2008) Log Message: ----------- o Making sure checkpkg always is executed with the 'C' locale to prevent errors like 'ERROR: libxau_devel must be all lowercase'. Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2008-12-21 20:59:36 UTC (rev 2677) +++ csw/mgar/gar/v2/gar.pkg.mk 2008-12-21 21:10:08 UTC (rev 2678) @@ -247,7 +247,7 @@ pkgcheck-%: @echo " ==> Checking compliance: $*" - @( checkpkg $(SPKG_EXPORT)/`$(call _PKG_ENV,$1) mkpackage -qs $(WORKDIR)/$*.gspec -D pkgfile`.gz ) || exit 2 + @( LC_ALL=C checkpkg $(SPKG_EXPORT)/`$(call _PKG_ENV,$1) mkpackage -qs $(WORKDIR)/$*.gspec -D pkgfile`.gz ) || exit 2 pkgcheck-p: @$(foreach COOKIEFILE,$(PKGCHECK_TARGETS), test -e $(COOKIEDIR)/$(COOKIEFILE) ;) 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 Dec 21 22:55:24 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 21 Dec 2008 21:55:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[2679] csw/mgar/pkg Message-ID: Revision: 2679 http://gar.svn.sourceforge.net/gar/?rev=2679&view=rev Author: bonivart Date: 2008-12-21 21:55:24 +0000 (Sun, 21 Dec 2008) Log Message: ----------- dhcp: first commit Added Paths: ----------- csw/mgar/pkg/dhcp/ csw/mgar/pkg/dhcp/branches/ csw/mgar/pkg/dhcp/tags/ csw/mgar/pkg/dhcp/trunk/ csw/mgar/pkg/dhcp/trunk/Makefile csw/mgar/pkg/dhcp/trunk/checksums csw/mgar/pkg/dhcp/trunk/files/ csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.gspec Property changes on: csw/mgar/pkg/dhcp/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/dhcp/trunk/Makefile =================================================================== --- csw/mgar/pkg/dhcp/trunk/Makefile (rev 0) +++ csw/mgar/pkg/dhcp/trunk/Makefile 2008-12-21 21:55:24 UTC (rev 2679) @@ -0,0 +1,29 @@ +# split into devel package +# use cswclassutils for conf files and smf support (add init file) +# create doc dir with license + +GARNAME = dhcp +GARVERSION = 4.1.0 +CATEGORIES = net + +DESCRIPTION = ISC DHCP reference implementation +define BLURB + ISC DHCP is open-source software that implements the Dynamic Host + Configuration Protocols for connection to a local network. It is a reference + implementation of those protocols, but it is also production-grade software, + suitable for use in high-volume and high-reliability applications. +endef + +MASTER_SITES = http://ftp.isc.org/isc/dhcp/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWdhcp,) + +GARCOMPILER = GNU +TEST_TARGET = check + +CONFIGURE_ARGS = $(DIRPATHS) + +SPKG_SOURCEURL = https://www.isc.org/software/dhcp + +include gar/category.mk + Added: csw/mgar/pkg/dhcp/trunk/checksums =================================================================== --- csw/mgar/pkg/dhcp/trunk/checksums (rev 0) +++ csw/mgar/pkg/dhcp/trunk/checksums 2008-12-21 21:55:24 UTC (rev 2679) @@ -0,0 +1,2 @@ +1fffed2e8c3d67b111316d6a9b33db7a download/dhcp-4.1.0.tar.gz +688cb75529efcf37de7526cd4111eea9 download/CSWdhcp.gspec Added: csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.gspec =================================================================== --- csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.gspec (rev 0) +++ csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.gspec 2008-12-21 21:55:24 UTC (rev 2679) @@ -0,0 +1,7 @@ +%var bitname dhcp +%var pkgname CSWdhcp +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/dhcp/LICENSE for license information + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From william at wbonnet.net Sun Dec 21 23:11:34 2008 From: william at wbonnet.net (William Bonnet) Date: Sun, 21 Dec 2008 23:11:34 +0100 Subject: [csw-devel] Using dynamic prototype Message-ID: <494EBF16.6080700@wbonnet.net> Hi Dago, I am trying to switch my package to the use of dynamic prototypes, especially for devel and doc stuff. I tried to set it up in libXau package (under x11). But it seems that the devel package is empty, and as a newbie i don't really understand what i did wrong. Please can you tell me what is missing from my Makefile ? I am trying to create two packages, libxau and libxaudevel. The second one will include file under include, pkgconfig and the .a lib. Thanks in advance. I send this question to the list since it may serve as example to other. Cheers W. -- William http://www.wbonnet.net http://www.sunwizard.net Le site fran?ais des amateurs de stations Unix http://www.blastwave.org An OpenSolaris Community Site http://www.opencsw.org Community SoftWare for Solaris http://www.guses.org French speaking Solaris User Group From jake_goerzen at users.sourceforge.net Mon Dec 22 00:25:22 2008 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Sun, 21 Dec 2008 23:25:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[2680] csw/mgar/pkg/freeciv/trunk Message-ID: Revision: 2680 http://gar.svn.sourceforge.net/gar/?rev=2680&view=rev Author: jake_goerzen Date: 2008-12-21 23:25:22 +0000 (Sun, 21 Dec 2008) Log Message: ----------- update src to version 2.1.8 Modified Paths: -------------- csw/mgar/pkg/freeciv/trunk/Makefile csw/mgar/pkg/freeciv/trunk/checksums Modified: csw/mgar/pkg/freeciv/trunk/Makefile =================================================================== --- csw/mgar/pkg/freeciv/trunk/Makefile 2008-12-21 21:55:24 UTC (rev 2679) +++ csw/mgar/pkg/freeciv/trunk/Makefile 2008-12-21 23:25:22 UTC (rev 2680) @@ -1,5 +1,5 @@ GARNAME = freeciv -GARVERSION = 2.1.6 +GARVERSION = 2.1.8 CATEGORIES = apps DESCRIPTION = a free turn-based multiplayer strategy game Modified: csw/mgar/pkg/freeciv/trunk/checksums =================================================================== --- csw/mgar/pkg/freeciv/trunk/checksums 2008-12-21 21:55:24 UTC (rev 2679) +++ csw/mgar/pkg/freeciv/trunk/checksums 2008-12-21 23:25:22 UTC (rev 2680) @@ -1,4 +1,4 @@ -5446d2e759617c565d30c250cc22aa41 download/freeciv-2.1.6.tar.gz +3e9925e868a816c1fba58993cced92ef download/freeciv-2.1.8.tar.gz 4f6b34dbb2143663d82ebea710c56863 download/CSWfreeciv.gspec 8b2248c58bd3ed3d7ce1fb5274f0b0f7 download/CSWfreeciv.depend d3acfde4316e7011beccd69b21d2ad67 download/CSWfreeciv.prototype This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Mon Dec 22 00:49:56 2008 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 21 Dec 2008 23:49:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[2681] csw/mgar/pkg Message-ID: Revision: 2681 http://gar.svn.sourceforge.net/gar/?rev=2681&view=rev Author: chninkel Date: 2008-12-21 23:49:55 +0000 (Sun, 21 Dec 2008) Log Message: ----------- ca_certificates: initial commit Added Paths: ----------- csw/mgar/pkg/ca_certificates/ csw/mgar/pkg/ca_certificates/branches/ csw/mgar/pkg/ca_certificates/tags/ csw/mgar/pkg/ca_certificates/trunk/ csw/mgar/pkg/ca_certificates/trunk/Makefile csw/mgar/pkg/ca_certificates/trunk/checksums csw/mgar/pkg/ca_certificates/trunk/files/ csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.depend csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.gspec csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postinstall csw/mgar/pkg/ca_certificates/trunk/files/certdata2pem.pl csw/mgar/pkg/ca_certificates/trunk/files/update-ca-certificates Property changes on: csw/mgar/pkg/ca_certificates/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 Added: csw/mgar/pkg/ca_certificates/trunk/Makefile =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/Makefile (rev 0) +++ csw/mgar/pkg/ca_certificates/trunk/Makefile 2008-12-21 23:49:55 UTC (rev 2681) @@ -0,0 +1,36 @@ +GARNAME = ca-certificates +GARVERSION = $(shell date '+%Y%m%d') +CATEGORIES = xtra + +DESCRIPTION = CA certificates +define BLURB + CA certificates +endef + +MASTER_SITES = http://hg.mozilla.org/mozilla-central/raw-file/default/security/nss/lib/ckfw/builtins/ +DISTFILES = certdata.txt certdata2pem.pl update-ca-certificates +DISTFILES += $(call admfiles,CSWcacertificates,depend postinstall) + +# We define upstream file regex so we can be notifed of new upstream software release +# UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +SPKG_CLASSES = none cswpreserveconf + +include gar/category.mk + + +install-custom: + ginstall -d "$(DESTDIR)/$(sysconfdir)/ssl/certs" + ginstall -d "$(DESTDIR)/$(sharedstatedir)/ca-certificates" + ginstall -D "$(CURDIR)/$(WORKDIR)/update-ca-certificates" "$(DESTDIR)/$(sbindir)/update-ca-certificates" + cd "$(DESTDIR)/$(sharedstatedir)/ca-certificates" && perl "$(CURDIR)/$(WORKDIR)/certdata2pem.pl" < "$(CURDIR)/$(WORKDIR)/certdata.txt" + cd "$(DESTDIR)/$(sharedstatedir)/ca-certificates" && ls -1 > "$(CURDIR)/$(WORKDIR)/ca-certificate.conf" + sed -ne '/BEGIN LICENSE BLOCK/,/END LICENSE BLOCK/p' "$(CURDIR)/$(WORKDIR)/certdata.txt" | grep -v "LICENSE BLOCK" \ + > "$(CURDIR)/$(WORKDIR)/LICENSE" Added: csw/mgar/pkg/ca_certificates/trunk/checksums =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/checksums (rev 0) +++ csw/mgar/pkg/ca_certificates/trunk/checksums 2008-12-21 23:49:55 UTC (rev 2681) @@ -0,0 +1,6 @@ +4dabeaecfd46395da152e51d312107e4 download/certdata.txt +6087aaa070808190680dcd5cb03c0cb9 download/certdata2pem.pl +f7b1df4e84e70b1cf7023779ba11698b download/update-ca-certificates +3bb0b5d545c0bd8f4381cfd2d500586c download/CSWcacertificates.gspec +df81c8c6eb55786ebefd47fc6400b8b6 download/CSWcacertificates.depend +48e4c60f385981c1430313584f527b50 download/CSWcacertificates.postinstall Added: csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.depend =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.depend (rev 0) +++ csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.depend 2008-12-21 23:49:55 UTC (rev 2681) @@ -0,0 +1,2 @@ +P CSWcswclassutils +P CSWosslutils Added: csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.gspec =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.gspec (rev 0) +++ csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.gspec 2008-12-21 23:49:55 UTC (rev 2681) @@ -0,0 +1,7 @@ +%var bitname ca_certificates +%var pkgname CSWcacertificates +%var arch all +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKDIR}/LICENSE +%prototype:merge +e cswpreserveconf /opt/csw/etc/ca-certificates.conf.csw=ca-certificate.conf 0644 root bin Added: csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postinstall =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postinstall (rev 0) +++ csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postinstall 2008-12-21 23:49:55 UTC (rev 2681) @@ -0,0 +1,7 @@ + +# Update ca lists +if [ -n "${BASEDIR}" ]; then + chroot ${BASEDIR} /opt/csw/sbin/update-ca-certificates +else + /opt/csw/sbin/update-ca-certificates +fi Added: csw/mgar/pkg/ca_certificates/trunk/files/certdata2pem.pl =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/files/certdata2pem.pl (rev 0) +++ csw/mgar/pkg/ca_certificates/trunk/files/certdata2pem.pl 2008-12-21 23:49:55 UTC (rev 2681) @@ -0,0 +1,64 @@ +#!/usr/bin/perl + +sub encode_base64 +{ + my $string = shift; + my $res = pack("u", $string); + # Remove first character of each line, remove newlines + $res =~ s/^.//mg; + $res =~ s/\n//g; + + $res =~ tr|` -_|AA-Za-z0-9+/|; # `# help emacs + # fix padding at the end + my $padding = (3 - length($string) % 3) % 3; + $res =~ s/.{$padding}$/'=' x $padding/e if $padding; + # break encoded string into lines of no more than 76 characters each + $res =~ s/(.{1,60})/$1\n/g; + + return $res; +} + + +while (my $line = ) { + next if $line =~ /^#/; + + if ($line =~ /^\s*$/) { + undef $fname; + next; + } + + chomp ($line); + + if ($line =~ /CKA_LABEL/) { + my ($label, $type, $val) = split (/ /, $line, 3); + $val =~ s/^"//; + $val =~ s/"$//; + $val =~ s/[\/\s,]/_/g; + $val =~ s/[()]//g; + $fname = $val . ".crt"; + next; + } + + if ($line =~ /CKA_VALUE MULTILINE_OCTAL/) { + if (not $fname) { + print "ERROR: unexpected CKA_VALUE MULTILINE_OCTAL\n"; + next; + } + my @cert_data; + while ($line = ) { + last if $line =~ /^END/; + chomp ($line); + my @data = split (/\\/, $line); + shift (@data); + push (@cert_data, @data); + } + @cert_data = map (oct, @cert_data); + @cert_data = map (chr, @cert_data); + open (FH, "> $fname"); + print FH "-----BEGIN CERTIFICATE-----\n"; + print FH encode_base64 (join ("", @cert_data)); + print FH "-----END CERTIFICATE-----\n"; + close (FH); + print "Created $fname certificate\n"; + } +} Added: csw/mgar/pkg/ca_certificates/trunk/files/update-ca-certificates =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/files/update-ca-certificates (rev 0) +++ csw/mgar/pkg/ca_certificates/trunk/files/update-ca-certificates 2008-12-21 23:49:55 UTC (rev 2681) @@ -0,0 +1,77 @@ +#!/bin/sh -e +# +# update-ca-certificates +# Debian script adapted for Solaris by Yann Rouillard +# +# Copyright (c) 2003 Fumitoshi UKAI +# Copyright (c) 2008 Yann Rouillard +# +# 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 2 of the License, 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# + +verbose=0 +fresh=0 +while [ $# -gt 0 ]; +do + case $1 in + --verbose|-v) + verbose=1;; + + --help|-h|*) + echo "$0: [--verbose] [--fresh]" + exit;; + esac + shift +done + +CERTSCONF=/opt/csw/etc/ca-certificates.conf +CERTSDIR=/opt/csw/share/ca-certificates +CERTBUNDLE=ca-certificates.crt +ETCCERTSDIR=/opt/csw/etc/ssl/certs + +if [ ! -f "$CERTSCONF" ]; then + echo "ERROR: $CERTSCONF doesn't exist !" >&2 + exit 2 +fi + +cd $ETCCERTSDIR +find . -type l -print | while read SYMLINK; do + test -f $SYMLINK || rm -f $SYMLINK +done + +printf "Updating certificates in $ETCCERTSDIR..." + +BUNDLETMP=`mktemp "${CERTBUNDLE}.tmp.XXXXXX"` +sed -e '/^#/g' "$CERTSCONF" | while read CERTFILE; do + if [ ! -f "$CERTFILE" ]; then + if [ ! -f "$CERTSDIR/$CERTFILE" ]; then + continue + fi + CERTFILE="$CERTSDIR/$CERTFILE" + fi + + cd "$ETCCERTSDIR" && ln -sf "$CERTFILE" "`basename $CERTFILE`.pem" +done + +cd "$ETCCERTSDIR" && cat *.pem > "$BUNDLETMP" +chmod 0644 "$BUNDLETMP" +mv -f "$BUNDLETMP" "$ETCCERTSDIR/$CERTBUNDLE" + +if [ "$verbose" = 0 ]; then + OPENSSL=/opt/csw/bin/openssl /opt/csw/bin/c_rehash . >/dev/null 2>&1 +else + OPENSSL=/opt/csw/bin/openssl /opt/csw/bin/c_rehash . +fi +echo "done." Property changes on: csw/mgar/pkg/ca_certificates/trunk/files/update-ca-certificates ___________________________________________________________________ Added: svn:executable + * 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 Mon Dec 22 02:28:00 2008 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Mon, 22 Dec 2008 01:28:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[2682] csw/mgar/pkg/wesnoth/trunk Message-ID: Revision: 2682 http://gar.svn.sourceforge.net/gar/?rev=2682&view=rev Author: jake_goerzen Date: 2008-12-22 01:28:00 +0000 (Mon, 22 Dec 2008) Log Message: ----------- update src to version 1.4.7 Modified Paths: -------------- csw/mgar/pkg/wesnoth/trunk/Makefile csw/mgar/pkg/wesnoth/trunk/checksums csw/mgar/pkg/wesnoth/trunk/files/CSWwesnoth.depend Modified: csw/mgar/pkg/wesnoth/trunk/Makefile =================================================================== --- csw/mgar/pkg/wesnoth/trunk/Makefile 2008-12-21 23:49:55 UTC (rev 2681) +++ csw/mgar/pkg/wesnoth/trunk/Makefile 2008-12-22 01:28:00 UTC (rev 2682) @@ -1,5 +1,5 @@ GARNAME = wesnoth -GARVERSION = 1.2.5 +GARVERSION = 1.4.7 CATEGORIES = apps DESCRIPTION = a free turn-based strategy game with a fanasy theme @@ -14,26 +14,20 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 -GARCOMPILER ?= GNU +GARCOMPILER ?= SUN PATCHFILES = language.cpp.diff -CONFIGURE_ARGS = --prefix=$(prefix) --mandir=/opt/csw/share/man LDFLAGS='-lsunmath -lintl' -CONFIGURE_ARGS += LD_OPTIONS=-L/opt/csw/lib -CONFIGURE_ARGS += --with-server-uid=60001 -CONFIGURE_ARGS += --with-server-gid=60001 +CONFIGURE_ARGS = --prefix=$(prefix) +CONFIGURE_ARGS += CXXFLAGS='-features=extensions -library=stlport4' +CONFIGURE_ARGS += LDFLAGS='-L/opt/csw/lib -lstlport -lintl -lsocket -lboost_iostreams -lsunmath' CONFIGURE_ARGS += --disable-nls -CONFIGURE_ARGS += --enable-server -CONFIGURE_ARGS += --enable-campaign-server -CONFIGURE_ARGS += --enable-tools -CONFIGURE_ARGS += --enable-editor -CONFIGURE_ARGS += --with-kde -CONFIGURE_ARGS += --with-gnome +#CONFIGURE_ARGS += --enable-server +#CONFIGURE_ARGS += --enable-campaign-server +#CONFIGURE_ARGS += --enable-tools +#CONFIGURE_ARGS += --enable-editor +CONFIGURE_ARGS += --with-boost=/opt/csw TEST_SCRIPTS = include gar/category.mk - -#pre-configure: -# ( cd $(WORKSRC) ; aclocal ; autoconf ; automake -a ) -# @$(MAKECOOKIE) Modified: csw/mgar/pkg/wesnoth/trunk/checksums =================================================================== --- csw/mgar/pkg/wesnoth/trunk/checksums 2008-12-21 23:49:55 UTC (rev 2681) +++ csw/mgar/pkg/wesnoth/trunk/checksums 2008-12-22 01:28:00 UTC (rev 2682) @@ -1,4 +1,4 @@ -40e00ac97680fb69499191c30f130774 download/wesnoth-1.2.5.tar.bz2 +fdd341c3d66bf1bea2113c79db852d68 download/wesnoth-1.4.7.tar.bz2 724aaa92df2d85d3e69b96837786cb64 download/CSWwesnoth.gspec -9060626d8f3bebb849fcd169149c959a download/CSWwesnoth.depend +67b02fe682088a0450b99dc386884dcd download/CSWwesnoth.depend 59968804e93a18220d7d18e8252fff8d download/language.cpp.diff Modified: csw/mgar/pkg/wesnoth/trunk/files/CSWwesnoth.depend =================================================================== --- csw/mgar/pkg/wesnoth/trunk/files/CSWwesnoth.depend 2008-12-21 23:49:55 UTC (rev 2681) +++ csw/mgar/pkg/wesnoth/trunk/files/CSWwesnoth.depend 2008-12-22 01:28:00 UTC (rev 2682) @@ -1,6 +1,7 @@ P CSWftype2 -P CSWgcc3corert -P CSWgcc3g++rt +P CSWboostrt +P CSWpython +P CSWstlport P CSWggettext P CSWlibsdl P CSWpng @@ -10,3 +11,4 @@ P CSWsunmath P CSWzlib P CSWfribidi +P CSWcommon common - common files and dirs for CSW packages This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Mon Dec 22 12:31:17 2008 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Mon, 22 Dec 2008 11:31:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[2683] csw/mgar/gar/v2 Message-ID: Revision: 2683 http://gar.svn.sourceforge.net/gar/?rev=2683&view=rev Author: trygvis Date: 2008-12-22 11:31:17 +0000 (Mon, 22 Dec 2008) Log Message: ----------- o Adding some targets to work with svn. Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Added Paths: ----------- csw/mgar/gar/v2/bin/svnignore csw/mgar/gar/v2/gar.svn.mk csw/mgar/gar/v2/scm-help Added: csw/mgar/gar/v2/bin/svnignore =================================================================== --- csw/mgar/gar/v2/bin/svnignore (rev 0) +++ csw/mgar/gar/v2/bin/svnignore 2008-12-22 11:31:17 UTC (rev 2683) @@ -0,0 +1,28 @@ +#!/bin/sh +# +# Copyright 2008-2009 OpenCSW +# +# Redistribution and/or use, with or without modification, is +# permitted. This software is without warranty of any kind. The +# author(s) shall not be liable in the event that use of the +# software causes damage. +# +# gar.svn.mk - Targets for working with svn + +# Read the comma separated ignores from stdin and merges it with any existing +# ignores set on the directory. + +ignores=`mktemp`-ignores +existing_ignores=`mktemp`-existing +new_ignores=`mktemp`-new + +while [ "$1" != "" ]; do + echo $1 >> $ignores + shift +done + +svn pg svn:ignore . > $existing_ignores +cat $ignores $existing_ignores | sort | uniq > $new_ignores +svn ps svn:ignore . -F $new_ignores + +rm -rf $ignores $existing_ignores $new_ignores Property changes on: csw/mgar/gar/v2/bin/svnignore ___________________________________________________________________ Added: svn:executable + * Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2008-12-22 01:28:00 UTC (rev 2682) +++ csw/mgar/gar/v2/gar.conf.mk 2008-12-22 11:31:17 UTC (rev 2683) @@ -568,8 +568,7 @@ FILE_SITES = $(foreach DIR,$(FILEDIR) $(GARCHIVEPATH),file://$(DIR)/) # Extra libraries -EXTRA_LIBS = gar.pkg.mk gar.common.mk - +EXTRA_LIBS = gar.pkg.mk gar.common.mk gar.svn.mk ccenv: @echo " Compiler: $(GARCOMPILER)" @echo Added: csw/mgar/gar/v2/gar.svn.mk =================================================================== --- csw/mgar/gar/v2/gar.svn.mk (rev 0) +++ csw/mgar/gar/v2/gar.svn.mk 2008-12-22 11:31:17 UTC (rev 2683) @@ -0,0 +1,29 @@ +# vim: ft=make ts=4 sw=4 noet +# +# $Id$ +# +# Copyright 2008-2009 OpenCSW +# +# Redistribution and/or use, with or without modification, is +# permitted. This software is without warranty of any kind. The +# author(s) shall not be liable in the event that use of the +# software causes damage. +# +# gar.svn.mk - Targets for working with svn +# + +scm-help: + @cat $(GARDIR)/scm-help + +scm-update-all: scm-update-package scm-update-gar + +scm-update-package: + $(SVN) --ignore-externals up + +scm-update-gar: + cd $(GARDIR) && $(SVN) --ignore-externals up + +scm-update-ignores: + $(GARDIR)/bin/svnignore work cookies download + +.PHONY: scm-help scm-update-all scm-update-package scm-update-gar Added: csw/mgar/gar/v2/scm-help =================================================================== --- csw/mgar/gar/v2/scm-help (rev 0) +++ csw/mgar/gar/v2/scm-help 2008-12-22 11:31:17 UTC (rev 2683) @@ -0,0 +1,10 @@ +These are the available SCM targets + +scm-update-all: + Updates both the package files and the gar/ directory + +scm-update-package: + Updates the package files + +scm-update-gar: + Updates the contents of the gar/ directory This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Mon Dec 22 12:34:48 2008 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Mon, 22 Dec 2008 11:34:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[2684] csw/mgar/pkg Message-ID: Revision: 2684 http://gar.svn.sourceforge.net/gar/?rev=2684&view=rev Author: trygvis Date: 2008-12-22 11:34:48 +0000 (Mon, 22 Dec 2008) Log Message: ----------- o First version of ghc (Glasgow Haskell Compiler). Added Paths: ----------- csw/mgar/pkg/ghc/ csw/mgar/pkg/ghc/Makefile csw/mgar/pkg/ghc/branches/ csw/mgar/pkg/ghc/tags/ csw/mgar/pkg/ghc/trunk/ csw/mgar/pkg/ghc/trunk/Makefile csw/mgar/pkg/ghc/trunk/checksums csw/mgar/pkg/ghc/trunk/files/ csw/mgar/pkg/ghc/trunk/files/CSWghc-prof.gspec csw/mgar/pkg/ghc/trunk/files/CSWghc.gspec Added: csw/mgar/pkg/ghc/Makefile =================================================================== --- csw/mgar/pkg/ghc/Makefile (rev 0) +++ csw/mgar/pkg/ghc/Makefile 2008-12-22 11:34:48 UTC (rev 2684) @@ -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/ghc/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/ghc/trunk/Makefile =================================================================== --- csw/mgar/pkg/ghc/trunk/Makefile (rev 0) +++ csw/mgar/pkg/ghc/trunk/Makefile 2008-12-22 11:34:48 UTC (rev 2684) @@ -0,0 +1,73 @@ +# Copyright 2008 OpenCSW +# +# Redistribution and/or use, with or without modification, is +# permitted. This software is without warranty of any kind. The +# author(s) shall not be liable in the event that use of the +# software causes damage. + +# TODO: Unpack the bootstrap binaries. Right now they're assumed to be installed under /tmp/ghc. +# Might not be too useful when re-building this package. + +GARNAME = ghc +GARVERSION = 6.8.3 +CATEGORIES = apps + +DESCRIPTION = State-of-the-art, compiler and interactive environment for Haskell. +define BLURB +Haskell is an advanced purely functional programming language. An open source +product of more than twenty years of cutting edge research, it allows rapid +development of robust, concise, correct software. With strong support for +integration with other languages, built-in concurrency and parallelism, +debuggers, profilers, rich libraries and an active community, Haskell makes it +easier to produce flexible, maintainable high-quality software +endef + +GARCOMPILER = GCC4 + +# Calculate the correct platform specification for ghc to use when bootstrapping +ifeq ($(shell uname -p),sparc) +GHC_PLATFORM = sparc-sun +else +GHC_PLATFORM = i386-unknown +endif + +# The location of the solaris binaries seems to vary a bit from version to version + +MASTER_SITES = http://www.haskell.org/ghc/dist/$(GARVERSION)/ http://www.haskell.org/ghc/dist/$(GARVERSION)/maeder/ +DISTFILES = $(GARNAME)-$(GARVERSION)-src.tar.bz2 ghc-$(GARVERSION)-$(GHC_PLATFORM)-solaris2.tar.bz2 testsuite-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSW$(GARNAME),) +DISTFILES += $(call admfiles,CSW$(GARNAME)-prof,) + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(GARVERSION)/$(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 + +PKGFILES_CSWghc-prof = $(prefix)/.*\.p_hi + +CONFIGURE_ARGS = $(DIRPATHS) +# Disabled for now +TEST_SCRIPTS = +#TEST_SCRIPTS = custom + +include gar/category.mk + +PATH := /tmp/ghc/bin:$(PATH) + +LD_LIBRARY_PATH=/opt/csw/lib +export LD_LIBRARY_PATH + +# This might not be needed anymore +pre-build-modulated: + @( cd $(WORKSRC); $(MAKE) -C utils/pwd boot ) + +pre-test-custom: + @echo Extracting the testsuite + @( echo cd $(WORKSRC); echo gtar jxf $(DOWNLOADDIR)/testsuite-$(GARVERSION).tar.gz) + false + @$(MAKECOOKIE) + +test-custom: + @echo ******************************* + @echo *** RUNNING TESTS (not) + @echo ******************************* + @( cd $(WORKSRC)/testsuite/tests/ghc-regress; echo $(MAKE) stage=2 ) + @$(MAKECOOKIE) Added: csw/mgar/pkg/ghc/trunk/checksums =================================================================== --- csw/mgar/pkg/ghc/trunk/checksums (rev 0) +++ csw/mgar/pkg/ghc/trunk/checksums 2008-12-22 11:34:48 UTC (rev 2684) @@ -0,0 +1,5 @@ +dfa31028b4d06d1d226f55fe3a2ab7b3 download/ghc-6.8.3-src.tar.bz2 +907c15e1d7d33dfd5a829936fe18176a download/ghc-6.8.3-i386-unknown-solaris2.tar.bz2 +c92b368262a194e8b859815415bc10d0 download/testsuite-6.8.3.tar.gz +41b4ca8ae020320be23571cd8a71d4dd download/CSWghc.gspec +2c370b5638a7c14488b6844972e74aae download/CSWghc-prof.gspec Added: csw/mgar/pkg/ghc/trunk/files/CSWghc-prof.gspec =================================================================== --- csw/mgar/pkg/ghc/trunk/files/CSWghc-prof.gspec (rev 0) +++ csw/mgar/pkg/ghc/trunk/files/CSWghc-prof.gspec 2008-12-22 11:34:48 UTC (rev 2684) @@ -0,0 +1,7 @@ +%var bitname ghc_prof +%var pkgname CSWghc-prof +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/ghc_prof/LICENSE for license information + Added: csw/mgar/pkg/ghc/trunk/files/CSWghc.gspec =================================================================== --- csw/mgar/pkg/ghc/trunk/files/CSWghc.gspec (rev 0) +++ csw/mgar/pkg/ghc/trunk/files/CSWghc.gspec 2008-12-22 11:34:48 UTC (rev 2684) @@ -0,0 +1,7 @@ +%var bitname ghc +%var pkgname CSWghc +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/ghc/LICENSE for license information + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvel at opencsw.org Mon Dec 22 12:37:04 2008 From: trygvel at opencsw.org (=?ISO-8859-1?Q?Trygve_Laugst=F8l?=) Date: Mon, 22 Dec 2008 12:37:04 +0100 Subject: [csw-devel] [Fwd: SF.net SVN: gar:[2683] csw/mgar/gar/v2] Message-ID: <494F7BE0.7090303@opencsw.org> Hei! I've added some targets to gar [1] to make it easier to work with Subversion. Currently it support updating the package and updating gar. I'd like to get some feedback on the process that people are using when working with the source tree to create targets that match how people use it. Do an update of your gar/ directory and go "gmake scm-help" to get the overview (or just read further down in the email). [1]: only v2 for now until they're deemed useful for everyone. -- Trygve -------- Original Message -------- Subject: [csw-devel] SF.net SVN: gar:[2683] csw/mgar/gar/v2 Date: Mon, 22 Dec 2008 11:31:17 +0000 From: trygvis at users.sourceforge.net Reply-To: Developers list To: devel at lists.opencsw.org Revision: 2683 http://gar.svn.sourceforge.net/gar/?rev=2683&view=rev Author: trygvis Date: 2008-12-22 11:31:17 +0000 (Mon, 22 Dec 2008) Log Message: ----------- o Adding some targets to work with svn. Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Added Paths: ----------- csw/mgar/gar/v2/bin/svnignore csw/mgar/gar/v2/gar.svn.mk csw/mgar/gar/v2/scm-help Added: csw/mgar/gar/v2/bin/svnignore =================================================================== --- csw/mgar/gar/v2/bin/svnignore (rev 0) +++ csw/mgar/gar/v2/bin/svnignore 2008-12-22 11:31:17 UTC (rev 2683) @@ -0,0 +1,28 @@ +#!/bin/sh +# +# Copyright 2008-2009 OpenCSW +# +# Redistribution and/or use, with or without modification, is +# permitted. This software is without warranty of any kind. The +# author(s) shall not be liable in the event that use of the +# software causes damage. +# +# gar.svn.mk - Targets for working with svn + +# Read the comma separated ignores from stdin and merges it with any existing +# ignores set on the directory. + +ignores=`mktemp`-ignores +existing_ignores=`mktemp`-existing +new_ignores=`mktemp`-new + +while [ "$1" != "" ]; do + echo $1 >> $ignores + shift +done + +svn pg svn:ignore . > $existing_ignores +cat $ignores $existing_ignores | sort | uniq > $new_ignores +svn ps svn:ignore . -F $new_ignores + +rm -rf $ignores $existing_ignores $new_ignores Property changes on: csw/mgar/gar/v2/bin/svnignore ___________________________________________________________________ Added: svn:executable + * Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2008-12-22 01:28:00 UTC (rev 2682) +++ csw/mgar/gar/v2/gar.conf.mk 2008-12-22 11:31:17 UTC (rev 2683) @@ -568,8 +568,7 @@ FILE_SITES = $(foreach DIR,$(FILEDIR) $(GARCHIVEPATH),file://$(DIR)/) # Extra libraries -EXTRA_LIBS = gar.pkg.mk gar.common.mk - +EXTRA_LIBS = gar.pkg.mk gar.common.mk gar.svn.mk ccenv: @echo " Compiler: $(GARCOMPILER)" @echo Added: csw/mgar/gar/v2/gar.svn.mk =================================================================== --- csw/mgar/gar/v2/gar.svn.mk (rev 0) +++ csw/mgar/gar/v2/gar.svn.mk 2008-12-22 11:31:17 UTC (rev 2683) @@ -0,0 +1,29 @@ +# vim: ft=make ts=4 sw=4 noet +# +# $Id$ +# +# Copyright 2008-2009 OpenCSW +# +# Redistribution and/or use, with or without modification, is +# permitted. This software is without warranty of any kind. The +# author(s) shall not be liable in the event that use of the +# software causes damage. +# +# gar.svn.mk - Targets for working with svn +# + +scm-help: + @cat $(GARDIR)/scm-help + +scm-update-all: scm-update-package scm-update-gar + +scm-update-package: + $(SVN) --ignore-externals up + +scm-update-gar: + cd $(GARDIR) && $(SVN) --ignore-externals up + +scm-update-ignores: + $(GARDIR)/bin/svnignore work cookies download + +.PHONY: scm-help scm-update-all scm-update-package scm-update-gar Added: csw/mgar/gar/v2/scm-help =================================================================== --- csw/mgar/gar/v2/scm-help (rev 0) +++ csw/mgar/gar/v2/scm-help 2008-12-22 11:31:17 UTC (rev 2683) @@ -0,0 +1,10 @@ +These are the available SCM targets + +scm-update-all: + Updates both the package files and the gar/ directory + +scm-update-package: + Updates the package files + +scm-update-gar: + Updates the contents of the gar/ directory 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 bonivart at users.sourceforge.net Mon Dec 22 14:35:36 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 22 Dec 2008 13:35:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[2685] csw/mgar/pkg/dhcp/trunk Message-ID: Revision: 2685 http://gar.svn.sourceforge.net/gar/?rev=2685&view=rev Author: bonivart Date: 2008-12-22 13:35:36 +0000 (Mon, 22 Dec 2008) Log Message: ----------- dhcp: upgrade to 4.1.0 Modified Paths: -------------- csw/mgar/pkg/dhcp/trunk/Makefile csw/mgar/pkg/dhcp/trunk/checksums Added Paths: ----------- csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.README.CSW csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.cswdhcpd csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.preremove csw/mgar/pkg/dhcp/trunk/files/CSWdhcpdevel.gspec Modified: csw/mgar/pkg/dhcp/trunk/Makefile =================================================================== --- csw/mgar/pkg/dhcp/trunk/Makefile 2008-12-22 11:34:48 UTC (rev 2684) +++ csw/mgar/pkg/dhcp/trunk/Makefile 2008-12-22 13:35:36 UTC (rev 2685) @@ -1,7 +1,3 @@ -# split into devel package -# use cswclassutils for conf files and smf support (add init file) -# create doc dir with license - GARNAME = dhcp GARVERSION = 4.1.0 CATEGORIES = net @@ -16,14 +12,51 @@ MASTER_SITES = http://ftp.isc.org/isc/dhcp/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWdhcp,) +DISTFILES += $(call admfiles,CSWdhcp,preremove) +DISTFILES += $(call admfiles,CSWdhcpdevel,) +SPKG_DESC_CSWdhcp = ISC DHCP reference implementation + +REQUIRED_PKGS_CSWdhcp = CSWcswclassutils CSWosslrt +REQUIRED_PKGS_CSWdhcpdevel = CSWdhcp + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = (\d+(?:\.\d+)*) + GARCOMPILER = GNU TEST_TARGET = check CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw +CONFIGURE_ARGS += --localstatedir=/var/opt/csw/dhcp +EXTRA_MERGE_EXCLUDE_FILES = .*~ $(libdir)/.*\.a $(libdir)/.*\.la + +PKGFILES_CSWdhcpdevel = $(PKGFILES_DEVEL) + +ENABLE_CHECK = 0 + +INSTALL_SCRIPTS = custom + +PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswdhcpd$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/dhcpd.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } $$$$3 ~ /\/dhclient.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } { print }' + SPKG_SOURCEURL = https://www.isc.org/software/dhcp +SPKG_CLASSES_CSWdhcp = none cswcpsampleconf cswinitsmf include gar/category.mk +install-custom: + @echo " ==> Installing $(GARNAME) (custom)" + @( cd $(WORKSRC) ; \ + gmake DESTDIR=$(DESTDIR) install ) + @ginstall -d $(DESTDIR)/etc/opt/csw/init.d + @cp $(FILEDIR)/CSWdhcp.cswdhcpd $(DESTDIR)/etc/opt/csw/init.d/cswdhcpd + @( cd $(DESTDIR)/etc/opt/csw ; \ + mv dhcpd.conf dhcpd.conf.CSW ; \ + mv dhclient.conf dhclient.conf.CSW ) + @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) + @cp $(WORKSRC)/LICENSE $(DESTDIR)$(docdir)/$(GARNAME) + @cp $(FILEDIR)/CSWdhcp.README.CSW $(DESTDIR)$(docdir)/$(GARNAME)/README.CSW + @ginstall -d $(DESTDIR)/var/opt/csw/$(GARNAME) + @touch $(DESTDIR)/var/opt/csw/dhcp/dhcpd.pid + @$(MAKECOOKIE) Modified: csw/mgar/pkg/dhcp/trunk/checksums =================================================================== --- csw/mgar/pkg/dhcp/trunk/checksums 2008-12-22 11:34:48 UTC (rev 2684) +++ csw/mgar/pkg/dhcp/trunk/checksums 2008-12-22 13:35:36 UTC (rev 2685) @@ -1,2 +1,4 @@ 1fffed2e8c3d67b111316d6a9b33db7a download/dhcp-4.1.0.tar.gz 688cb75529efcf37de7526cd4111eea9 download/CSWdhcp.gspec +cceb064ddfcd48d8dbaba37f3fc7dbd3 download/CSWdhcp.preremove +5d8f4f34a43f235e28db4da8ecb1837d download/CSWdhcpdevel.gspec Added: csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.README.CSW =================================================================== --- csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.README.CSW (rev 0) +++ csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.README.CSW 2008-12-22 13:35:36 UTC (rev 2685) @@ -0,0 +1,17 @@ +README.CSW +========== + +Default locations +----------------- +Configuration directory: /etc/opt/csw. +Work directory: /var/opt/csw/dhcp. + +Installation +------------ +1. Modify the dhcpd.conf file in /etc/opt/csw. +2. Start DHCP with "/etc/init.d/cswdhcp start". + +More info here: http://www.isc.org/products/DHCP/. + + +bonivart/071024 Added: csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.cswdhcpd =================================================================== --- csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.cswdhcpd (rev 0) +++ csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.cswdhcpd 2008-12-22 13:35:36 UTC (rev 2685) @@ -0,0 +1,33 @@ +#!/sbin/sh + +# rc-script for CSW DHCP +# Peter Bonivart, 2008-12-21 + +PID=/var/opt/csw/dhcp/dhcpd.pid +#OPTIONS="-cf /opt/csw/etc/dhcpd.conf" # use old location of conf file + +ZONE= # used for initialization, do not change + +case "$1" in + 'start') + if [ -f /opt/csw/sbin/dhcpd -a -f /etc/opt/csw/dhcpd.conf ]; then + echo 'Starting dhcp.' + /opt/csw/sbin/dhcpd $OPTIONS & + fi + ;; + 'stop') + echo 'Shutting down dhcp.' + if [ -x /usr/bin/zonename ]; then + if [ "`/usr/bin/zonename`" = "global" ]; then + ZONE="-z global" + fi + fi + pkill $ZONE -x dhcpd + [ -f $PID ] && /usr/bin/rm $PID + exit 0 + ;; + *) + echo "Usage: $0 { start | stop }" + exit 1 + ;; +esac Added: csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.preremove =================================================================== --- csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.preremove (rev 0) +++ csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.preremove 2008-12-22 13:35:36 UTC (rev 2685) @@ -0,0 +1,12 @@ +#!/bin/sh + +# 2008-12-22 + +VAR=$PKG_INSTALL_ROOT/var/opt/csw/dhcp + +# clean up work dir +[ -f "$VAR/dhcpd.leases" -a ! -s "$VAR/dhcpd.leases" ] && /bin/rm "$VAR/dhcpd.leases" +[ -f "$VAR/dhcpd.leases~" -a ! -s "$VAR/dhcpd.leases~" ] && /bin/rm "$VAR/dhcpd.leases~" +[ -f "$VAR/dhcpd.pid" ] && /bin/rm "$VAR/dhcpd.pid" + +exit 0 Added: csw/mgar/pkg/dhcp/trunk/files/CSWdhcpdevel.gspec =================================================================== --- csw/mgar/pkg/dhcp/trunk/files/CSWdhcpdevel.gspec (rev 0) +++ csw/mgar/pkg/dhcp/trunk/files/CSWdhcpdevel.gspec 2008-12-22 13:35:36 UTC (rev 2685) @@ -0,0 +1,7 @@ +%var bitname dhcp_devel +%var pkgname CSWdhcpdevel +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright + +Please see /opt/csw/share/doc/dhcp/LICENSE for license information + 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 Dec 22 14:37:15 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 22 Dec 2008 13:37:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[2686] csw/mgar/pkg/dhcp/trunk/checksums Message-ID: Revision: 2686 http://gar.svn.sourceforge.net/gar/?rev=2686&view=rev Author: bonivart Date: 2008-12-22 13:37:15 +0000 (Mon, 22 Dec 2008) Log Message: ----------- dhcp: checksums Modified Paths: -------------- csw/mgar/pkg/dhcp/trunk/checksums Modified: csw/mgar/pkg/dhcp/trunk/checksums =================================================================== --- csw/mgar/pkg/dhcp/trunk/checksums 2008-12-22 13:35:36 UTC (rev 2685) +++ csw/mgar/pkg/dhcp/trunk/checksums 2008-12-22 13:37:15 UTC (rev 2686) @@ -1,4 +1,4 @@ 1fffed2e8c3d67b111316d6a9b33db7a download/dhcp-4.1.0.tar.gz 688cb75529efcf37de7526cd4111eea9 download/CSWdhcp.gspec -cceb064ddfcd48d8dbaba37f3fc7dbd3 download/CSWdhcp.preremove +4c15df7a456274832321edd6c2c85ba4 download/CSWdhcp.preremove 5d8f4f34a43f235e28db4da8ecb1837d download/CSWdhcpdevel.gspec 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 Dec 22 19:37:35 2008 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 22 Dec 2008 18:37:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[2687] csw/mgar/pkg/dhcp/trunk Message-ID: Revision: 2687 http://gar.svn.sourceforge.net/gar/?rev=2687&view=rev Author: bonivart Date: 2008-12-22 18:37:35 +0000 (Mon, 22 Dec 2008) Log Message: ----------- dhcp: removed preremove Modified Paths: -------------- csw/mgar/pkg/dhcp/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.preremove Modified: csw/mgar/pkg/dhcp/trunk/Makefile =================================================================== --- csw/mgar/pkg/dhcp/trunk/Makefile 2008-12-22 13:37:15 UTC (rev 2686) +++ csw/mgar/pkg/dhcp/trunk/Makefile 2008-12-22 18:37:35 UTC (rev 2687) @@ -12,7 +12,7 @@ MASTER_SITES = http://ftp.isc.org/isc/dhcp/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWdhcp,preremove) +DISTFILES += $(call admfiles,CSWdhcp,) DISTFILES += $(call admfiles,CSWdhcpdevel,) SPKG_DESC_CSWdhcp = ISC DHCP reference implementation @@ -38,7 +38,7 @@ INSTALL_SCRIPTS = custom -PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswdhcpd$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/dhcpd.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } $$$$3 ~ /\/dhclient.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } { print }' +PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswdhcpd$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/dhcpd.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } $$$$3 ~ /\/dhclient.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } $$$$3 ~ /\/dhcpd.leases.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } { print }' SPKG_SOURCEURL = https://www.isc.org/software/dhcp SPKG_CLASSES_CSWdhcp = none cswcpsampleconf cswinitsmf @@ -57,6 +57,6 @@ @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) @cp $(WORKSRC)/LICENSE $(DESTDIR)$(docdir)/$(GARNAME) @cp $(FILEDIR)/CSWdhcp.README.CSW $(DESTDIR)$(docdir)/$(GARNAME)/README.CSW - @ginstall -d $(DESTDIR)/var/opt/csw/$(GARNAME) - @touch $(DESTDIR)/var/opt/csw/dhcp/dhcpd.pid + @ginstall -d $(DESTDIR)/var/opt/csw/$(GARNAME)/db + @touch $(DESTDIR)/var/opt/csw/$(GARNAME)/db/dhcpd.leases.CSW @$(MAKECOOKIE) Deleted: csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.preremove =================================================================== --- csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.preremove 2008-12-22 13:37:15 UTC (rev 2686) +++ csw/mgar/pkg/dhcp/trunk/files/CSWdhcp.preremove 2008-12-22 18:37:35 UTC (rev 2687) @@ -1,12 +0,0 @@ -#!/bin/sh - -# 2008-12-22 - -VAR=$PKG_INSTALL_ROOT/var/opt/csw/dhcp - -# clean up work dir -[ -f "$VAR/dhcpd.leases" -a ! -s "$VAR/dhcpd.leases" ] && /bin/rm "$VAR/dhcpd.leases" -[ -f "$VAR/dhcpd.leases~" -a ! -s "$VAR/dhcpd.leases~" ] && /bin/rm "$VAR/dhcpd.leases~" -[ -f "$VAR/dhcpd.pid" ] && /bin/rm "$VAR/dhcpd.pid" - -exit 0 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 Mon Dec 22 23:03:18 2008 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Mon, 22 Dec 2008 22:03:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[2688] csw/mgar/pkg/wesnoth/trunk Message-ID: Revision: 2688 http://gar.svn.sourceforge.net/gar/?rev=2688&view=rev Author: jake_goerzen Date: 2008-12-22 22:03:18 +0000 (Mon, 22 Dec 2008) Log Message: ----------- configured fifodir=/var/opt/csw/run/wesnothd, enabled NLS support, added new dependancies and removed unused dependancies Modified Paths: -------------- csw/mgar/pkg/wesnoth/trunk/Makefile csw/mgar/pkg/wesnoth/trunk/checksums csw/mgar/pkg/wesnoth/trunk/files/CSWwesnoth.depend Modified: csw/mgar/pkg/wesnoth/trunk/Makefile =================================================================== --- csw/mgar/pkg/wesnoth/trunk/Makefile 2008-12-22 18:37:35 UTC (rev 2687) +++ csw/mgar/pkg/wesnoth/trunk/Makefile 2008-12-22 22:03:18 UTC (rev 2688) @@ -20,8 +20,8 @@ CONFIGURE_ARGS = --prefix=$(prefix) CONFIGURE_ARGS += CXXFLAGS='-features=extensions -library=stlport4' -CONFIGURE_ARGS += LDFLAGS='-L/opt/csw/lib -lstlport -lintl -lsocket -lboost_iostreams -lsunmath' -CONFIGURE_ARGS += --disable-nls +CONFIGURE_ARGS += LDFLAGS='-L. -L/opt/csw/lib -lstlport -lintl -lsocket -lboost_iostreams -lsunmath -lSDL_ttf' +CONFIGURE_ARGS += --with-fifodir=/var/opt/csw/run/wesnothd #CONFIGURE_ARGS += --enable-server #CONFIGURE_ARGS += --enable-campaign-server #CONFIGURE_ARGS += --enable-tools Modified: csw/mgar/pkg/wesnoth/trunk/checksums =================================================================== --- csw/mgar/pkg/wesnoth/trunk/checksums 2008-12-22 18:37:35 UTC (rev 2687) +++ csw/mgar/pkg/wesnoth/trunk/checksums 2008-12-22 22:03:18 UTC (rev 2688) @@ -1,4 +1,4 @@ fdd341c3d66bf1bea2113c79db852d68 download/wesnoth-1.4.7.tar.bz2 724aaa92df2d85d3e69b96837786cb64 download/CSWwesnoth.gspec -67b02fe682088a0450b99dc386884dcd download/CSWwesnoth.depend +3ad3f94e881c3be62ec6424df8013ab4 download/CSWwesnoth.depend 59968804e93a18220d7d18e8252fff8d download/language.cpp.diff Modified: csw/mgar/pkg/wesnoth/trunk/files/CSWwesnoth.depend =================================================================== --- csw/mgar/pkg/wesnoth/trunk/files/CSWwesnoth.depend 2008-12-22 18:37:35 UTC (rev 2687) +++ csw/mgar/pkg/wesnoth/trunk/files/CSWwesnoth.depend 2008-12-22 22:03:18 UTC (rev 2688) @@ -2,13 +2,15 @@ P CSWboostrt P CSWpython P CSWstlport +P CSWiconv P CSWggettext P CSWlibsdl P CSWpng P CSWsdlimage P CSWsdlmixer P CSWsdlnet +P CSWsdlttf P CSWsunmath P CSWzlib P CSWfribidi -P CSWcommon common - common files and dirs for CSW packages +P CSWcommon common - common files and dirs for CSW packages This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From trygvis at users.sourceforge.net Tue Dec 23 16:36:04 2008 From: trygvis at users.sourceforge.net (trygvis at users.sourceforge.net) Date: Tue, 23 Dec 2008 15:36:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[2689] csw/mgar/pkg/ghc/trunk Message-ID: Revision: 2689 http://gar.svn.sourceforge.net/gar/?rev=2689&view=rev Author: trygvis Date: 2008-12-23 15:36:04 +0000 (Tue, 23 Dec 2008) Log Message: ----------- o Downloading and extracting the bootstrap blob correctly. Modified Paths: -------------- csw/mgar/pkg/ghc/trunk/Makefile csw/mgar/pkg/ghc/trunk/checksums Modified: csw/mgar/pkg/ghc/trunk/Makefile =================================================================== --- csw/mgar/pkg/ghc/trunk/Makefile 2008-12-22 22:03:18 UTC (rev 2688) +++ csw/mgar/pkg/ghc/trunk/Makefile 2008-12-23 15:36:04 UTC (rev 2689) @@ -5,8 +5,7 @@ # author(s) shall not be liable in the event that use of the # software causes damage. -# TODO: Unpack the bootstrap binaries. Right now they're assumed to be installed under /tmp/ghc. -# Might not be too useful when re-building this package. +# TODO: Run the test suite GARNAME = ghc GARVERSION = 6.8.3 @@ -34,7 +33,9 @@ # The location of the solaris binaries seems to vary a bit from version to version MASTER_SITES = http://www.haskell.org/ghc/dist/$(GARVERSION)/ http://www.haskell.org/ghc/dist/$(GARVERSION)/maeder/ -DISTFILES = $(GARNAME)-$(GARVERSION)-src.tar.bz2 ghc-$(GARVERSION)-$(GHC_PLATFORM)-solaris2.tar.bz2 testsuite-$(GARVERSION).tar.gz +DISTFILES = $(GARNAME)-$(GARVERSION)-src.tar.bz2 testsuite-$(GARVERSION).tar.gz +DISTFILES += $(GARNAME)-$(GARVERSION)-sparc-sun-solaris2.tar.bz2 +DISTFILES += $(GARNAME)-$(GARVERSION)-i386-unknown-solaris2.tar.bz2 DISTFILES += $(call admfiles,CSW$(GARNAME),) DISTFILES += $(call admfiles,CSW$(GARNAME)-prof,) @@ -50,18 +51,41 @@ include gar/category.mk -PATH := /tmp/ghc/bin:$(PATH) +# Prevent the extracttion of the binary blobs. This has to be after GAR is included +tar-bz-extract-ghc-$(GARVERSION)-sparc-sun-solaris2.tar.bz2: + @$(MAKECOOKIE) +tar-bz-extract-ghc-$(GARVERSION)-i386-unknown-solaris2.tar.bz2: + @$(MAKECOOKIE) + +STAGE_1_FILE = $(DOWNLOADDIR)/$(GARNAME)-$(GARVERSION)-$(GHC_PLATFORM)-solaris2.tar.bz2 +STAGE_1_BASEDIR=$(WORKDIR)/stage1 +STAGE_1_SRC_DIR=$(STAGE_1_BASEDIR)/ghc-$(GARVERSION) +STAGE_1_DIR=$(shell mkdir -p $(STAGE_1_BASEDIR) && cd $(STAGE_1_BASEDIR) && pwd)/ghc + +PATH := $(STAGE_1_DIR)/bin:$(PATH) + LD_LIBRARY_PATH=/opt/csw/lib export LD_LIBRARY_PATH -# This might not be needed anymore -pre-build-modulated: - @( cd $(WORKSRC); $(MAKE) -C utils/pwd boot ) +$(STAGE_1_SRC_DIR): + @echo Extracting the bootstrap compiler + mkdir -p $(STAGE_1_BASEDIR) + cat $(STAGE_1_FILE) | ( cd $(STAGE_1_BASEDIR) && gtar jxf -) +$(STAGE_1_SRC_DIR)/Makefile: $(STAGE_1_SRC_DIR) + cd $(STAGE_1_SRC_DIR) && ./configure --prefix=$(STAGE_1_DIR) + +$(STAGE_1_DIR)/bin/ghc: $(STAGE_1_SRC_DIR)/Makefile + cd $(STAGE_1_SRC_DIR) && gmake install + +pre-configure-modulated: $(STAGE_1_DIR)/bin/ghc + echo $$PATH + @$(MAKECOOKIE) + pre-test-custom: @echo Extracting the testsuite - @( echo cd $(WORKSRC); echo gtar jxf $(DOWNLOADDIR)/testsuite-$(GARVERSION).tar.gz) + @( echo cd $(WORKSRC); echo gtar zxf $(DOWNLOADDIR)/testsuite-$(GARVERSION).tar.gz) false @$(MAKECOOKIE) Modified: csw/mgar/pkg/ghc/trunk/checksums =================================================================== --- csw/mgar/pkg/ghc/trunk/checksums 2008-12-22 22:03:18 UTC (rev 2688) +++ csw/mgar/pkg/ghc/trunk/checksums 2008-12-23 15:36:04 UTC (rev 2689) @@ -1,4 +1,5 @@ dfa31028b4d06d1d226f55fe3a2ab7b3 download/ghc-6.8.3-src.tar.bz2 +ee43ceea42b9353b6613db6d4058ab0a download/ghc-6.8.3-sparc-sun-solaris2.tar.bz2 907c15e1d7d33dfd5a829936fe18176a download/ghc-6.8.3-i386-unknown-solaris2.tar.bz2 c92b368262a194e8b859815415bc10d0 download/testsuite-6.8.3.tar.gz 41b4ca8ae020320be23571cd8a71d4dd download/CSWghc.gspec This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Dec 24 00:31:29 2008 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 23 Dec 2008 23:31:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[2690] csw/mgar/pkg/ca_certificates/trunk Message-ID: Revision: 2690 http://gar.svn.sourceforge.net/gar/?rev=2690&view=rev Author: chninkel Date: 2008-12-23 23:31:29 +0000 (Tue, 23 Dec 2008) Log Message: ----------- ca_certificates: improved certification selection configuration Modified Paths: -------------- csw/mgar/pkg/ca_certificates/trunk/Makefile csw/mgar/pkg/ca_certificates/trunk/checksums csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.depend csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.gspec csw/mgar/pkg/ca_certificates/trunk/files/certdata2pem.pl csw/mgar/pkg/ca_certificates/trunk/files/update-ca-certificates Modified: csw/mgar/pkg/ca_certificates/trunk/Makefile =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/Makefile 2008-12-23 15:36:04 UTC (rev 2689) +++ csw/mgar/pkg/ca_certificates/trunk/Makefile 2008-12-23 23:31:29 UTC (rev 2690) @@ -8,7 +8,7 @@ endef MASTER_SITES = http://hg.mozilla.org/mozilla-central/raw-file/default/security/nss/lib/ckfw/builtins/ -DISTFILES = certdata.txt certdata2pem.pl update-ca-certificates +DISTFILES = certdata.txt certdata2pem.pl update-ca-certificates ca-certificates.conf DISTFILES += $(call admfiles,CSWcacertificates,depend postinstall) # We define upstream file regex so we can be notifed of new upstream software release @@ -25,12 +25,21 @@ include gar/category.mk +$(WORKDIR)/hash.db: $(WORKDIR)/certdata.txt + rm -f $(WORKDIR)/hash.db + find "$(DESTDIR)/$(sharedstatedir)/ca-certificates" -name *.pem | while read FILE; do \ + echo "`basename $$FILE`=`/opt/csw/bin/openssl x509 -hash -fingerprint -noout -in "$$FILE" | head -n 1`.0" >> hash.db; \ + done -install-custom: +$(WORKDIR)/LICENSE: $(WORKDIR)/certdata.txt + sed -ne '/BEGIN LICENSE BLOCK/,/END LICENSE BLOCK/p' "$(WORKDIR)/certdata.txt" | grep -v "LICENSE BLOCK" \ + > "$(WORKDIR)/LICENSE" + +install-custom: $(WORKDIR)/hash.db $(WORKDIR)/LICENSE ginstall -d "$(DESTDIR)/$(sysconfdir)/ssl/certs" ginstall -d "$(DESTDIR)/$(sharedstatedir)/ca-certificates" - ginstall -D "$(CURDIR)/$(WORKDIR)/update-ca-certificates" "$(DESTDIR)/$(sbindir)/update-ca-certificates" - cd "$(DESTDIR)/$(sharedstatedir)/ca-certificates" && perl "$(CURDIR)/$(WORKDIR)/certdata2pem.pl" < "$(CURDIR)/$(WORKDIR)/certdata.txt" - cd "$(DESTDIR)/$(sharedstatedir)/ca-certificates" && ls -1 > "$(CURDIR)/$(WORKDIR)/ca-certificate.conf" - sed -ne '/BEGIN LICENSE BLOCK/,/END LICENSE BLOCK/p' "$(CURDIR)/$(WORKDIR)/certdata.txt" | grep -v "LICENSE BLOCK" \ - > "$(CURDIR)/$(WORKDIR)/LICENSE" + ginstall -D $(WORKDIR)/update-ca-certificates "$(DESTDIR)/$(sbindir)/update-ca-certificates" + ginstall -D hash.db "$(DESTDIR)/$(sharedstatedir)/ca-certificates/hash.db" + ginstall -d "$(DESTDIR)/$(sharedstatedir)/ca-certificates/mozilla" + cd "$(DESTDIR)/$(sharedstatedir)/ca-certificates/mozilla" && perl "$(CURDIR)/$(WORKDIR)/certdata2pem.pl" < "$(CURDIR)/$(WORKDIR)/certdata.txt" + Modified: csw/mgar/pkg/ca_certificates/trunk/checksums =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/checksums 2008-12-23 15:36:04 UTC (rev 2689) +++ csw/mgar/pkg/ca_certificates/trunk/checksums 2008-12-23 23:31:29 UTC (rev 2690) @@ -1,6 +1,7 @@ 4dabeaecfd46395da152e51d312107e4 download/certdata.txt -6087aaa070808190680dcd5cb03c0cb9 download/certdata2pem.pl -f7b1df4e84e70b1cf7023779ba11698b download/update-ca-certificates -3bb0b5d545c0bd8f4381cfd2d500586c download/CSWcacertificates.gspec -df81c8c6eb55786ebefd47fc6400b8b6 download/CSWcacertificates.depend -48e4c60f385981c1430313584f527b50 download/CSWcacertificates.postinstall +77fe4c8feb1b341814a6ed03d4ff764a download/certdata2pem.pl +e4b769f7250ea1c929252a13fe09e4ee download/update-ca-certificates +b4f6772525da6772d51eb30f90605d60 download/ca-certificates.conf +787d361f8d8b8ecf89e83bb813fdaec5 download/CSWcacertificates.gspec +31227010faaad1c2b9893ba91d6b16bb download/CSWcacertificates.depend +32e6ea27867c760d2279330fd4c480d3 download/CSWcacertificates.postinstall Modified: csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.depend =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.depend 2008-12-23 15:36:04 UTC (rev 2689) +++ csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.depend 2008-12-23 23:31:29 UTC (rev 2690) @@ -1,2 +1 @@ P CSWcswclassutils -P CSWosslutils Modified: csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.gspec =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.gspec 2008-12-23 15:36:04 UTC (rev 2689) +++ csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.gspec 2008-12-23 23:31:29 UTC (rev 2690) @@ -4,4 +4,4 @@ %include url file://%{PKGLIB}/csw_dyndepend.gspec %copyright url file://%{WORKDIR}/LICENSE %prototype:merge -e cswpreserveconf /opt/csw/etc/ca-certificates.conf.csw=ca-certificate.conf 0644 root bin +e cswpreserveconf /opt/csw/etc/ca-certificates.conf.csw=ca-certificates.conf 0644 root bin Modified: csw/mgar/pkg/ca_certificates/trunk/files/certdata2pem.pl =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/files/certdata2pem.pl 2008-12-23 15:36:04 UTC (rev 2689) +++ csw/mgar/pkg/ca_certificates/trunk/files/certdata2pem.pl 2008-12-23 23:31:29 UTC (rev 2690) @@ -35,7 +35,7 @@ $val =~ s/"$//; $val =~ s/[\/\s,]/_/g; $val =~ s/[()]//g; - $fname = $val . ".crt"; + $fname = $val . ".pem"; next; } Modified: csw/mgar/pkg/ca_certificates/trunk/files/update-ca-certificates =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/files/update-ca-certificates 2008-12-23 15:36:04 UTC (rev 2689) +++ csw/mgar/pkg/ca_certificates/trunk/files/update-ca-certificates 2008-12-23 23:31:29 UTC (rev 2690) @@ -1,7 +1,7 @@ #!/bin/sh -e # # update-ca-certificates -# Debian script adapted for Solaris by Yann Rouillard +# Script inspired by debian script update-ca-certificates # # Copyright (c) 2003 Fumitoshi UKAI # Copyright (c) 2008 Yann Rouillard @@ -21,13 +21,59 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -verbose=0 -fresh=0 -while [ $# -gt 0 ]; -do +CACERTS_CONF=/opt/csw/etc/ca-certificates.conf +CACERTS_DIR=/opt/csw/share/ca-certificates +CERTBUNDLE=ca-certificates.crt +CERTSDIR=/opt/csw/etc/ssl/certs + + +# find the certificate files corresponding to the given pattern +find_certfile () +{ + if [ -f "$CACERTS_DIR/$1" ]; then + echo "$CACERTS_DIR/$1" + elif [ -f "$1" ]; then + echo "$1" + else + # if the file doesn't exist we suppose it's a find pattern + # like *.crt + DIRNAME="`dirname "$1"`" + if [ "$DIRNAME" = "." ]; then + DIRNAME="$CACERTS_DIR" + fi + BASENAME="`basename "$1"`" + find $DIRNAME -name "$BASENAME" + fi +} + + +# return the full paths of all certificate files +get_certfile_list () +{ + # first we find all excluded certificates, excluding duplicates + sed -ne '/^ *!/s/^ *! *//p' "$CACERTS_CONF" | while read CERTFILE; do + [ -n "$CERTFILE" ] && find_certfile "$CERTFILE" + done | sort -u > /tmp/update-ca-certificates.tmp.$$ + + # then we find all certificates excluding duplicates + # and excluded certificates + sed -e '/^ *[#!]/d' "$CACERTS_CONF" | while read CERTFILE; do + [ -n "$CERTFILE" ] && find_certfile "$CERTFILE" + done | sort -u | { + while read CERTFILE; do + grep -w "$CERTFILE" /tmp/update-ca-certificates.tmp.$$ >/dev/null || echo "$CERTFILE" + done + } + + rm -f /tmp/update-ca-certificates.tmp.$$ +} + + +VERBOSE=0 +while [ $# -gt 0 ]; do case $1 in --verbose|-v) - verbose=1;; + VERBOSE=1;; --help|-h|*) echo "$0: [--verbose] [--fresh]" @@ -36,42 +82,59 @@ shift done -CERTSCONF=/opt/csw/etc/ca-certificates.conf -CERTSDIR=/opt/csw/share/ca-certificates -CERTBUNDLE=ca-certificates.crt -ETCCERTSDIR=/opt/csw/etc/ssl/certs -if [ ! -f "$CERTSCONF" ]; then - echo "ERROR: $CERTSCONF doesn't exist !" >&2 +if [ ! -f "$CACERTS_CONF" ]; then + echo "ERROR: $CACERTS_CONF doesn't exist !" >&2 exit 2 fi -cd $ETCCERTSDIR -find . -type l -print | while read SYMLINK; do - test -f $SYMLINK || rm -f $SYMLINK +printf "Updating certificates in $CERTSDIR..." + + +# first we remove the existing symlink +find "$CERTSDIR" -type l -print | while read SYMLINK; do + [ ! -L "$SYMLINK" ] || rm -f "$SYMLINK" done -printf "Updating certificates in $ETCCERTSDIR..." +# then we recreate them +get_certfile_list | while read CERTFILE; do + SYMLINK="`basename "$CERTFILE"`" + SYMLINK="`echo $SYMLINK | sed -e 's/\.[^\.]*$//'`.pem" -BUNDLETMP=`mktemp "${CERTBUNDLE}.tmp.XXXXXX"` -sed -e '/^#/g' "$CERTSCONF" | while read CERTFILE; do - if [ ! -f "$CERTFILE" ]; then - if [ ! -f "$CERTSDIR/$CERTFILE" ]; then - continue - fi - CERTFILE="$CERTSDIR/$CERTFILE" - fi - - cd "$ETCCERTSDIR" && ln -sf "$CERTFILE" "`basename $CERTFILE`.pem" + cd "$CERTSDIR" && ln -sf "$CERTFILE" "$SYMLINK" done -cd "$ETCCERTSDIR" && cat *.pem > "$BUNDLETMP" -chmod 0644 "$BUNDLETMP" -mv -f "$BUNDLETMP" "$ETCCERTSDIR/$CERTBUNDLE" +# we create the certificate bundle file which contains all the +# certificate, some software prefer to use this file +# (and this is mandatory for software linked with gnutls) +cat "$CERTSDIR/"*.pem > "$CERTSDIR/$CERTBUNDLE.tmp" 2>/dev/null || true +chmod 0644 "$CERTSDIR/$CERTBUNDLE.tmp" +mv -f "$CERTSDIR/$CERTBUNDLE.tmp" "$CERTSDIR/$CERTBUNDLE" -if [ "$verbose" = 0 ]; then - OPENSSL=/opt/csw/bin/openssl /opt/csw/bin/c_rehash . >/dev/null 2>&1 -else - OPENSSL=/opt/csw/bin/openssl /opt/csw/bin/c_rehash . + +# we create the hash links for certificate, openssl library need +# this link to be able to find a CA certificate +if { openssl version; } >/dev/null 2>&1; then + c_rehash "$CERTSDIR" >/dev/null 2>&1 + +elif { /opt/csw/bin/openssl version; } >/dev/null 2>&1; then + OPENSSL="/opt/csw/bin/openssl" /opt/csw/bin/c_rehash "$CERTSDIR" >/dev/null 2>&1 + +# openssl binary isn't available, so we fall back our own provided file containing +# hash value for certificates provided by this package +# this way, we don't stricly depend on the openssl_utils package +elif [ -f "$CACERTS_DIR/hash.db" ]; then + cd "$CERTSDIR" + for FILE in *.pem; do + HASH=`awk -F= " \\\$1 == \"$FILE\" { print \\\$2; exit 0 }" "$CACERTS_DIR/hash.db"` + if [ -n "$HASH" ]; then + ln -s "$FILE" "$HASH" + else + echo + echo "WARNING: a custom certificate was installed, you need to install openssl_utils so" + echo " update-ca-certificates is able to generate the hash of your custom certificate." + fi + done fi + echo "done." This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Dec 24 00:59:15 2008 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 23 Dec 2008 23:59:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[2691] csw/mgar/pkg/ca_certificates/trunk/files/ update-ca-certificates Message-ID: Revision: 2691 http://gar.svn.sourceforge.net/gar/?rev=2691&view=rev Author: chninkel Date: 2008-12-23 23:59:15 +0000 (Tue, 23 Dec 2008) Log Message: ----------- ca_certificates: fixed certificates exclusion Modified Paths: -------------- csw/mgar/pkg/ca_certificates/trunk/files/update-ca-certificates Modified: csw/mgar/pkg/ca_certificates/trunk/files/update-ca-certificates =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/files/update-ca-certificates 2008-12-23 23:31:29 UTC (rev 2690) +++ csw/mgar/pkg/ca_certificates/trunk/files/update-ca-certificates 2008-12-23 23:59:15 UTC (rev 2691) @@ -61,7 +61,7 @@ [ -n "$CERTFILE" ] && find_certfile "$CERTFILE" done | sort -u | { while read CERTFILE; do - grep -w "$CERTFILE" /tmp/update-ca-certificates.tmp.$$ >/dev/null || echo "$CERTFILE" + grep "^$CERTFILE$" /tmp/update-ca-certificates.tmp.$$ >/dev/null || echo "$CERTFILE" done } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Dec 24 01:21:36 2008 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 24 Dec 2008 00:21:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[2692] csw/mgar/pkg/ca_certificates/trunk Message-ID: Revision: 2692 http://gar.svn.sourceforge.net/gar/?rev=2692&view=rev Author: chninkel Date: 2008-12-24 00:21:36 +0000 (Wed, 24 Dec 2008) Log Message: ----------- ca_certificates: added symlinks removal upon package removal Modified Paths: -------------- csw/mgar/pkg/ca_certificates/trunk/Makefile csw/mgar/pkg/ca_certificates/trunk/checksums Added Paths: ----------- csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postremove Modified: csw/mgar/pkg/ca_certificates/trunk/Makefile =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/Makefile 2008-12-23 23:59:15 UTC (rev 2691) +++ csw/mgar/pkg/ca_certificates/trunk/Makefile 2008-12-24 00:21:36 UTC (rev 2692) @@ -9,7 +9,7 @@ MASTER_SITES = http://hg.mozilla.org/mozilla-central/raw-file/default/security/nss/lib/ckfw/builtins/ DISTFILES = certdata.txt certdata2pem.pl update-ca-certificates ca-certificates.conf -DISTFILES += $(call admfiles,CSWcacertificates,depend postinstall) +DISTFILES += $(call admfiles,CSWcacertificates,depend postinstall postremove) # 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/ca_certificates/trunk/checksums =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/checksums 2008-12-23 23:59:15 UTC (rev 2691) +++ csw/mgar/pkg/ca_certificates/trunk/checksums 2008-12-24 00:21:36 UTC (rev 2692) @@ -1,7 +1,8 @@ 4dabeaecfd46395da152e51d312107e4 download/certdata.txt 77fe4c8feb1b341814a6ed03d4ff764a download/certdata2pem.pl -e4b769f7250ea1c929252a13fe09e4ee download/update-ca-certificates +86f62a09c9a90d0257a738656a3ed9f3 download/update-ca-certificates b4f6772525da6772d51eb30f90605d60 download/ca-certificates.conf 787d361f8d8b8ecf89e83bb813fdaec5 download/CSWcacertificates.gspec 31227010faaad1c2b9893ba91d6b16bb download/CSWcacertificates.depend 32e6ea27867c760d2279330fd4c480d3 download/CSWcacertificates.postinstall +0e166bd746f506c06e1001b0c6274958 download/CSWcacertificates.postremove Added: csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postremove =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postremove (rev 0) +++ csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postremove 2008-12-24 00:21:36 UTC (rev 2692) @@ -0,0 +1,10 @@ + +# We remove all dead links in /opt/csw/etc/ssl/certs/, +# that should remove all the links to the cerfificates +# provided in this package +find /opt/csw/etc/ssl/certs/ -type l | while read FILE; do + [ -f "$FILE" ] || rm -f "$FILE" +done +rm -f /opt/csw/etc/ssl/certs/ca-certificates.crt + +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 Wed Dec 24 02:04:51 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 24 Dec 2008 01:04:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[2693] csw/mgar/pkg/docbook-dtds/trunk Message-ID: Revision: 2693 http://gar.svn.sourceforge.net/gar/?rev=2693&view=rev Author: bdwalton Date: 2008-12-24 01:04:51 +0000 (Wed, 24 Dec 2008) Log Message: ----------- dropped openjade dependency; ripped out the part of the postinstall script that required openjade Modified Paths: -------------- csw/mgar/pkg/docbook-dtds/trunk/Makefile csw/mgar/pkg/docbook-dtds/trunk/checksums csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.preremove Modified: csw/mgar/pkg/docbook-dtds/trunk/Makefile =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/Makefile 2008-12-24 00:21:36 UTC (rev 2692) +++ csw/mgar/pkg/docbook-dtds/trunk/Makefile 2008-12-24 01:04:51 UTC (rev 2693) @@ -13,7 +13,7 @@ PATCHLEVEL = 30.1 CATEGORIES = xtra -REQUIRED_PKGS = CSWsgmlcommon CSWxmlcommon CSWopenjade CSWlibxml2 +REQUIRED_PKGS = CSWsgmlcommon CSWxmlcommon CSWlibxml2 DESCRIPTION = SGML and XML document type definitions for DocBook. define BLURB Modified: csw/mgar/pkg/docbook-dtds/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/checksums 2008-12-24 00:21:36 UTC (rev 2692) +++ csw/mgar/pkg/docbook-dtds/trunk/checksums 2008-12-24 01:04:51 UTC (rev 2693) @@ -10,8 +10,8 @@ f89e1bd0b2c7a361e3f1f739e16b5d0d download/docbook-4.4.zip cbb04e9a700955d88c50962ef22c1634 download/docbook-xml-4.4.zip 536104a1ab1e8eac583cf27f4f8844a4 download/CSWdocbookdtds.gspec -15aa1d4d660b64c96f0e68bdaa04facb download/CSWdocbookdtds.postinstall -140c5f6cda37568a76f43f349bef8453 download/CSWdocbookdtds.preremove +58c926e94c472fd0842d7850732cbcc8 download/CSWdocbookdtds.postinstall +935e0f00b12f0a6888839bccac460eb8 download/CSWdocbookdtds.preremove 318742d3a6648a6905727f071cbc9847 download/docbook-4.2-euro.patch e3067045964536cc7445d5c3f1e99916 download/docbook-dtd30-sgml-1.0.catalog.patch 856d40f5d1e3fc8fd939b88bf5fedc87 download/docbook-dtd31-sgml-1.0.catalog.patch Modified: csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall 2008-12-24 00:21:36 UTC (rev 2692) +++ csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.postinstall 2008-12-24 01:04:51 UTC (rev 2693) @@ -10,15 +10,12 @@ esac XMLCAT=/opt/csw/bin/xmlcatalog -INSTCAT=/opt/csw/bin/install-catalog CSWSGMLCNF=/opt/csw/etc/sgml CSWSGML=/opt/csw/share/sgml VERSION=1.0 RELEASE=30.1 -OPENJADEVER=1.3.2 - ## ## SGML catalog ## @@ -112,100 +109,6 @@ $CSWSGMLCNF/xml-docbook-4.4-$VERSION-$RELEASE.cat \ $CSWSGML/docbook/xml-dtd-4.4-$VERSION-$RELEASE/catalog -# The following lines are for the case in which the style sheets -# were installed after another DTD but before this DTD -SS=`echo $PKG_INSTALL_ROOT/$CSWSGML/docbook/dsssl-stylesheets-*` -STYLESHEETS=`echo $SS | sed 's#[^ ]*/dsssl-stylesheets-##g'` -if [ "$STYLESHEETS" != "*" ]; then - # DocBook V3.0 - $PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/sgml-docbook-3.0-$VERSION-$RELEASE.cat \ - $CSWSGML/openjade-$OPENJADEVER/catalog - $PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/sgml-docbook-3.0-$VERSION-$RELEASE.cat \ - $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog - - # DocBook V3.1 - $PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/sgml-docbook-3.1-$VERSION-$RELEASE.cat \ - $CSWSGML/openjade-$OPENJADEVER/catalog - $PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/sgml-docbook-3.1-$VERSION-$RELEASE.cat \ - $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog - - # DocBook V4.0 - $PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/sgml-docbook-4.0-$VERSION-$RELEASE.cat \ - $CSWSGML/openjade-$OPENJADEVER/catalog - $PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/sgml-docbook-4.0-$VERSION-$RELEASE.cat \ - $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog - - # DocBook V4.1 - $PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/sgml-docbook-4.1-$VERSION-$RELEASE.cat \ - $CSWSGML/openjade-$OPENJADEVER/catalog - $PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/sgml-docbook-4.1-$VERSION-$RELEASE.cat \ - $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog - - # DocBook XML V4.1.2 - $PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/xml-docbook-4.1.2-$VERSION-$RELEASE.cat \ - $CSWSGML/openjade-$OPENJADEVER/catalog - $PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/xml-docbook-4.1.2-$VERSION-$RELEASE.cat \ - $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog - - # DocBook V4.2 - $PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/sgml-docbook-4.2-$VERSION-$RELEASE.cat \ - $CSWSGML/openjade-$OPENJADEVER/catalog - $PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/sgml-docbook-4.2-$VERSION-$RELEASE.cat \ - $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog - - # DocBook XML V4.2 - $PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/xml-docbook-4.2-$VERSION-$RELEASE.cat \ - $CSWSGML/openjade-$OPENJADEVER/catalog - $PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/xml-docbook-4.2-$VERSION-$RELEASE.cat \ - $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog - - # DocBook V4.3 - $PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/sgml-docbook-4.3-$VERSION-$RELEASE.cat \ - $CSWSGML/openjade-$OPENJADEVER/catalog - $PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/sgml-docbook-4.3-$VERSION-$RELEASE.cat \ - $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog - - # DocBook XML V4.3 - $PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/xml-docbook-4.3-$VERSION-$RELEASE.cat \ - $CSWSGML/openjade-$OPENJADEVER/catalog - $PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/xml-docbook-4.3-$VERSION-$RELEASE.cat \ - $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog - - # DocBook V4.4 - $PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/sgml-docbook-4.4-$VERSION-$RELEASE.cat \ - $CSWSGML/openjade-$OPENJADEVER/catalog - $PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/sgml-docbook-4.4-$VERSION-$RELEASE.cat \ - $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog - - # DocBook XML V4.4 - $PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/xml-docbook-4.4-$VERSION-$RELEASE.cat \ - $CSWSGML/openjade-$OPENJADEVER/catalog - $PREFIX $XMLCAT --sgml --noout --add \ - $CSWSGMLCNF/xml-docbook-4.4-$VERSION-$RELEASE.cat \ - $CSWSGML/docbook/dsssl-stylesheets-$STYLESHEETS/catalog -fi - # Fix up SGML super catalog so that there isn't an XML DTD before an # SGML one. We need to do this (*sigh*) because xmlcatalog messes up # the order of the lines, and SGML tools don't like to see XML things Modified: csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.preremove =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.preremove 2008-12-24 00:21:36 UTC (rev 2692) +++ csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.preremove 2008-12-24 01:04:51 UTC (rev 2693) @@ -16,8 +16,6 @@ VERSION=1.0 RELEASE=30.1 -OPENJADEVER=1.3.2 - ## ## SGML catalog ## 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 Dec 24 02:14:56 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 24 Dec 2008 01:14:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[2694] csw/mgar/pkg/docbook-dtds/trunk Message-ID: Revision: 2694 http://gar.svn.sourceforge.net/gar/?rev=2694&view=rev Author: bdwalton Date: 2008-12-24 01:14:55 +0000 (Wed, 24 Dec 2008) Log Message: ----------- corrected preremove script to remove all catalogs properly. Modified Paths: -------------- csw/mgar/pkg/docbook-dtds/trunk/checksums csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.preremove Modified: csw/mgar/pkg/docbook-dtds/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/checksums 2008-12-24 01:04:51 UTC (rev 2693) +++ csw/mgar/pkg/docbook-dtds/trunk/checksums 2008-12-24 01:14:55 UTC (rev 2694) @@ -11,7 +11,7 @@ cbb04e9a700955d88c50962ef22c1634 download/docbook-xml-4.4.zip 536104a1ab1e8eac583cf27f4f8844a4 download/CSWdocbookdtds.gspec 58c926e94c472fd0842d7850732cbcc8 download/CSWdocbookdtds.postinstall -935e0f00b12f0a6888839bccac460eb8 download/CSWdocbookdtds.preremove +81e9ec3839d7fc7585515aaf6d412135 download/CSWdocbookdtds.preremove 318742d3a6648a6905727f071cbc9847 download/docbook-4.2-euro.patch e3067045964536cc7445d5c3f1e99916 download/docbook-dtd30-sgml-1.0.catalog.patch 856d40f5d1e3fc8fd939b88bf5fedc87 download/docbook-dtd31-sgml-1.0.catalog.patch Modified: csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.preremove =================================================================== --- csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.preremove 2008-12-24 01:04:51 UTC (rev 2693) +++ csw/mgar/pkg/docbook-dtds/trunk/files/CSWdocbookdtds.preremove 2008-12-24 01:14:55 UTC (rev 2694) @@ -29,7 +29,7 @@ # DocBook V3.1 $PREFIX $XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ $CSWSGMLCNF/sgml-docbook-3.1-$VERSION-$RELEASE.cat -rm -f $PKG_INSTALL_ROOT/CSWSGMLCNF/sgml-docbook-3.1-$VERSION-$RELEASE.cat +rm -f $PKG_INSTALL_ROOT/$CSWSGMLCNF/sgml-docbook-3.1-$VERSION-$RELEASE.cat # DocBook V4.0 $PREFIX $XMLCAT --sgml --noout --del $CSWSGMLCNF/catalog \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Dec 24 16:12:48 2008 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 24 Dec 2008 15:12:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[2695] csw/mgar/pkg/ca_certificates/trunk Message-ID: Revision: 2695 http://gar.svn.sourceforge.net/gar/?rev=2695&view=rev Author: chninkel Date: 2008-12-24 15:12:48 +0000 (Wed, 24 Dec 2008) Log Message: ----------- ca_certificates: handles the case where openssl_rt is not installed but openssl_utils is Modified Paths: -------------- csw/mgar/pkg/ca_certificates/trunk/checksums csw/mgar/pkg/ca_certificates/trunk/files/update-ca-certificates Modified: csw/mgar/pkg/ca_certificates/trunk/checksums =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/checksums 2008-12-24 01:14:55 UTC (rev 2694) +++ csw/mgar/pkg/ca_certificates/trunk/checksums 2008-12-24 15:12:48 UTC (rev 2695) @@ -1,6 +1,6 @@ 4dabeaecfd46395da152e51d312107e4 download/certdata.txt 77fe4c8feb1b341814a6ed03d4ff764a download/certdata2pem.pl -86f62a09c9a90d0257a738656a3ed9f3 download/update-ca-certificates +8163827375c4cb08f9734930adb06ee2 download/update-ca-certificates b4f6772525da6772d51eb30f90605d60 download/ca-certificates.conf 787d361f8d8b8ecf89e83bb813fdaec5 download/CSWcacertificates.gspec 31227010faaad1c2b9893ba91d6b16bb download/CSWcacertificates.depend Modified: csw/mgar/pkg/ca_certificates/trunk/files/update-ca-certificates =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/files/update-ca-certificates 2008-12-24 01:14:55 UTC (rev 2694) +++ csw/mgar/pkg/ca_certificates/trunk/files/update-ca-certificates 2008-12-24 15:12:48 UTC (rev 2695) @@ -114,12 +114,33 @@ # we create the hash links for certificate, openssl library need # this link to be able to find a CA certificate -if { openssl version; } >/dev/null 2>&1; then - c_rehash "$CERTSDIR" >/dev/null 2>&1 -elif { /opt/csw/bin/openssl version; } >/dev/null 2>&1; then - OPENSSL="/opt/csw/bin/openssl" /opt/csw/bin/c_rehash "$CERTSDIR" >/dev/null 2>&1 +PATH="$PATH:/opt/csw/bin:" +OIFS="$IFS"; IFS=":" +set -- $PATH +IFS="$OIFS" +OPENSSL="" +while [ $# -ne 0 ]; do + if [ -x "$1/openssl" ] && [ -x "$1/c_rehash" ]; then + + # update-ca-certificates might be called when openssl_rt is removed + # that would mean that openssl binary is present but wouldn't work + # because of missing libraries so we test that case + if LANG=C ldd /opt/csw/bin/openssl | grep "not found" >/dev/null; then + shift + continue + fi + OPENSSL="$1/openssl" + C_REHASH="$1/c_rehash" + break + fi + shift +done + +if [ -n "$OPENSSL" ]; then + OPENSSL="$OPENSSL" "$C_REHASH" "$CERTSDIR" >/dev/null 2>&1 + # openssl binary isn't available, so we fall back our own provided file containing # hash value for certificates provided by this package # this way, we don't stricly depend on the openssl_utils package This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Thu Dec 25 14:07:54 2008 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Thu, 25 Dec 2008 13:07:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[2696] csw/mgar/pkg/apache2/trunk Message-ID: Revision: 2696 http://gar.svn.sourceforge.net/gar/?rev=2696&view=rev Author: idogan23 Date: 2008-12-25 13:07:54 +0000 (Thu, 25 Dec 2008) Log Message: ----------- apache2: updated to 2.2.11 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 2008-12-24 15:12:48 UTC (rev 2695) +++ csw/mgar/pkg/apache2/trunk/Makefile 2008-12-25 13:07:54 UTC (rev 2696) @@ -1,5 +1,5 @@ GARNAME = httpd -GARVERSION = 2.2.10 +GARVERSION = 2.2.11 CATEGORIES = server DESCRIPTION = A high performance Unix-based HTTP server. Modified: csw/mgar/pkg/apache2/trunk/checksums =================================================================== --- csw/mgar/pkg/apache2/trunk/checksums 2008-12-24 15:12:48 UTC (rev 2695) +++ csw/mgar/pkg/apache2/trunk/checksums 2008-12-25 13:07:54 UTC (rev 2696) @@ -1,4 +1,4 @@ -f611aff3ddba114499e623a5259faa5c download/httpd-2.2.10.tar.gz +03e0a99a5de0f3f568a0087fb9993af9 download/httpd-2.2.11.tar.gz a7467a756cbd980d4cfe3c2cfb6a9e35 download/config.layout a8d5878f31f6a2081bc178351b2dda1e download/CSWapache2.gspec 44ec414654dec572fd43d6a45c001746 download/CSWapache2.depend This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Thu Dec 25 15:08:24 2008 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Thu, 25 Dec 2008 14:08:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[2697] csw/mgar/pkg/amavisd-new/trunk Message-ID: Revision: 2697 http://gar.svn.sourceforge.net/gar/?rev=2697&view=rev Author: idogan23 Date: 2008-12-25 14:08:24 +0000 (Thu, 25 Dec 2008) Log Message: ----------- amavsid-new: update to 2.6.2 Modified Paths: -------------- csw/mgar/pkg/amavisd-new/trunk/Makefile csw/mgar/pkg/amavisd-new/trunk/checksums csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.prototype Modified: csw/mgar/pkg/amavisd-new/trunk/Makefile =================================================================== --- csw/mgar/pkg/amavisd-new/trunk/Makefile 2008-12-25 13:07:54 UTC (rev 2696) +++ csw/mgar/pkg/amavisd-new/trunk/Makefile 2008-12-25 14:08:24 UTC (rev 2697) @@ -1,5 +1,5 @@ GARNAME = amavisd-new -GARVERSION = 2.6.1 +GARVERSION = 2.6.2 CATEGORIES = server DESCRIPTION = Interface between MTA and content checkers Modified: csw/mgar/pkg/amavisd-new/trunk/checksums =================================================================== --- csw/mgar/pkg/amavisd-new/trunk/checksums 2008-12-25 13:07:54 UTC (rev 2696) +++ csw/mgar/pkg/amavisd-new/trunk/checksums 2008-12-25 14:08:24 UTC (rev 2697) @@ -1,9 +1,9 @@ -2474d4c034f96a58e5b8af91af514689 download/amavisd-new-2.6.1.tar.gz +0b3b0ef8771af8e4a950e7381d42adbd download/amavisd-new-2.6.2.tar.gz 979fd28f16513f660912311c3566786d download/CSWamavisdnew.gspec 1a54bc6b9d92afadc704c394cb93fa00 download/CSWamavisdnew.depend 65f66fb3036b7949057733aa99cff724 download/CSWamavisdnew.postinstall 171767585ab6662c0cbedae26e9baa2c download/CSWamavisdnew.preinstall -6061cecc2d1bdc09e05ac39ea7d2c20f download/CSWamavisdnew.prototype +631e33b02eb813b9f3f13db03b5c12eb download/CSWamavisdnew.prototype b9cafe6715bc2703ac9411f24f248cd3 download/amavisd-agent.diff 3e81998c8b933129870e3cab68d40261 download/amavisd-nanny.diff f218d10e5280940268a3ffaa125a00ae download/amavisd-release.diff Modified: csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.prototype =================================================================== --- csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.prototype 2008-12-25 13:07:54 UTC (rev 2696) +++ csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.prototype 2008-12-25 14:08:24 UTC (rev 2697) @@ -67,7 +67,6 @@ f none /opt/csw/share/doc/amavisd-new/README_FILES/images/toc-plus.png 0644 root bin f none /opt/csw/share/doc/amavisd-new/README_FILES/images/up.png 0644 root bin f none /opt/csw/share/doc/amavisd-new/README_FILES/images/warning.png 0644 root bin -f none /opt/csw/share/doc/amavisd-new/README_FILES/rfc4871.txt 0644 root bin f none /opt/csw/share/doc/amavisd-new/README_FILES/screen.css 0644 root bin f none /opt/csw/share/doc/amavisd-new/RELEASE_NOTES 0644 root bin f none /opt/csw/share/doc/amavisd-new/amavisd.conf-default 0644 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Thu Dec 25 15:21:48 2008 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Thu, 25 Dec 2008 14:21:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[2698] csw/mgar/pkg/syslog_ng/trunk Message-ID: Revision: 2698 http://gar.svn.sourceforge.net/gar/?rev=2698&view=rev Author: idogan23 Date: 2008-12-25 14:21:48 +0000 (Thu, 25 Dec 2008) Log Message: ----------- syslog_ng: updated to 2.0.10 Modified Paths: -------------- csw/mgar/pkg/syslog_ng/trunk/Makefile csw/mgar/pkg/syslog_ng/trunk/checksums Modified: csw/mgar/pkg/syslog_ng/trunk/Makefile =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/Makefile 2008-12-25 14:08:24 UTC (rev 2697) +++ csw/mgar/pkg/syslog_ng/trunk/Makefile 2008-12-25 14:21:48 UTC (rev 2698) @@ -1,5 +1,5 @@ GARNAME = syslog-ng -GARVERSION = 2.0.9 +GARVERSION = 2.0.10 CATEGORIES = server DESCRIPTION = A powerful syslogd replacement Modified: csw/mgar/pkg/syslog_ng/trunk/checksums =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/checksums 2008-12-25 14:08:24 UTC (rev 2697) +++ csw/mgar/pkg/syslog_ng/trunk/checksums 2008-12-25 14:21:48 UTC (rev 2698) @@ -1,4 +1,4 @@ -2d4232f7167c2b4f48794e4f8f80e863 download/syslog-ng-2.0.9.tar.gz +3f96ccf13dda0b9e150e511bcffde795 download/syslog-ng-2.0.10.tar.gz 6726e851fa8e6e6658584faaeaa6716d download/CSWsyslogng.gspec 3de835dbfde225227a1ed36f548e1d34 download/CSWsyslogng.postinstall bb5490a23e8480b6e9d625389885c346 download/CSWsyslogng.depend This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Fri Dec 26 13:41:09 2008 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Fri, 26 Dec 2008 12:41:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[2699] csw/mgar/pkg/rrdtool/trunk Message-ID: Revision: 2699 http://gar.svn.sourceforge.net/gar/?rev=2699&view=rev Author: idogan23 Date: 2008-12-26 12:41:09 +0000 (Fri, 26 Dec 2008) Log Message: ----------- rrdtool: update to 1.3.5 Modified Paths: -------------- csw/mgar/pkg/rrdtool/trunk/Makefile csw/mgar/pkg/rrdtool/trunk/checksums csw/mgar/pkg/rrdtool/trunk/files/CSWrrdtool.prototype Modified: csw/mgar/pkg/rrdtool/trunk/Makefile =================================================================== --- csw/mgar/pkg/rrdtool/trunk/Makefile 2008-12-25 14:21:48 UTC (rev 2698) +++ csw/mgar/pkg/rrdtool/trunk/Makefile 2008-12-26 12:41:09 UTC (rev 2699) @@ -1,5 +1,5 @@ GARNAME = rrdtool -GARVERSION = 1.3.4 +GARVERSION = 1.3.5 CATEGORIES = utils DESCRIPTION = time-series data logging and graphing. @@ -17,9 +17,10 @@ UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz # Patch to make it build on x86 -PATCHFILES += rrd_config.diff +#PATCHFILES += rrd_config.diff CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --docdir=$(prefix)/doc/$(GARNAME) CONFIGURE_ARGS += --disable-python CONFIGURE_ARGS += --disable-ruby CONFIGURE_ARGS += --disable-libintl Modified: csw/mgar/pkg/rrdtool/trunk/checksums =================================================================== --- csw/mgar/pkg/rrdtool/trunk/checksums 2008-12-25 14:21:48 UTC (rev 2698) +++ csw/mgar/pkg/rrdtool/trunk/checksums 2008-12-26 12:41:09 UTC (rev 2699) @@ -1,4 +1,3 @@ -7db3bffc3f3b24e828a88fe02165266f download/rrdtool-1.3.4.tar.gz +3f14381e64c2037f40af16380be9e9f3 download/rrdtool-1.3.5.tar.gz 52bb91d1dad69b8911e787e9347b4e8a download/CSWrrdtool.gspec -9be46cfbb1068056b1466d79cbebbff6 download/CSWrrdtool.prototype -6d78fae545c47faa61f37b216eeeda90 download/rrd_config.diff +a59044180a9795b229c1ea1667fec2f0 download/CSWrrdtool.prototype Modified: csw/mgar/pkg/rrdtool/trunk/files/CSWrrdtool.prototype =================================================================== --- csw/mgar/pkg/rrdtool/trunk/files/CSWrrdtool.prototype 2008-12-25 14:21:48 UTC (rev 2698) +++ csw/mgar/pkg/rrdtool/trunk/files/CSWrrdtool.prototype 2008-12-26 12:41:09 UTC (rev 2699) @@ -7,114 +7,102 @@ f none /opt/csw/include/rrd_format.h 0644 root bin d none /opt/csw/lib 0755 root bin f none /opt/csw/lib/librrd.a 0644 root bin -f none /opt/csw/lib/librrd.so.4.0.3 0755 root bin -s none /opt/csw/lib/librrd.so.4=librrd.so.4.0.3 -s none /opt/csw/lib/librrd.so=librrd.so.4.0.3 +f none /opt/csw/lib/librrd.so.4.0.4 0755 root bin +s none /opt/csw/lib/librrd.so.4=librrd.so.4.0.4 +s none /opt/csw/lib/librrd.so=librrd.so.4.0.4 f none /opt/csw/lib/librrd_th.a 0644 root bin -f none /opt/csw/lib/librrd_th.so.4.0.3 0755 root bin -s none /opt/csw/lib/librrd_th.so.4=librrd_th.so.4.0.3 -s none /opt/csw/lib/librrd_th.so=librrd_th.so.4.0.3 -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/5.8.8 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -f none /opt/csw/lib/perl/csw/RRDs.pm 0444 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin +f none /opt/csw/lib/librrd_th.so.4.0.4 0755 root bin +s none /opt/csw/lib/librrd_th.so.4=librrd_th.so.4.0.4 +s none /opt/csw/lib/librrd_th.so=librrd_th.so.4.0.4 d none /opt/csw/lib/perl/csw/auto/RRDp 0755 root bin f none /opt/csw/lib/perl/csw/auto/RRDp/.packlist 0644 root bin d none /opt/csw/lib/perl/csw/auto/RRDs 0755 root bin f none /opt/csw/lib/perl/csw/auto/RRDs/.packlist 0644 root bin -f none /opt/csw/lib/perl/csw/auto/RRDs/RRDs.bs 0444 root bin -f none /opt/csw/lib/perl/csw/auto/RRDs/RRDs.so 0555 root bin -f none /opt/csw/lib/perl/csw/ntmake.pl 0444 root bin d none /opt/csw/lib/pkgconfig 0755 root bin f none /opt/csw/lib/pkgconfig/librrd.pc 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/doc 0755 root bin -d none /opt/csw/share/doc/rrdtool-1.3.4 0755 root bin -d none /opt/csw/share/doc/rrdtool-1.3.4/html 0755 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/RRDp.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/RRDs.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/bin_dec_hex.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/cdeftutorial.html 0644 root bin -s none /opt/csw/share/doc/rrdtool-1.3.4/html/index.html=rrdtool.html -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rpntutorial.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rrd-beginners.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rrdbuild.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rrdcgi.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rrdcreate.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rrddump.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rrdfetch.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rrdfirst.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rrdgraph.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rrdgraph_data.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rrdgraph_examples.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rrdgraph_graph.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rrdgraph_rpn.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rrdinfo.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rrdlast.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rrdlastupdate.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rrdresize.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rrdrestore.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rrdthreads.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rrdtool.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rrdtune.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rrdtutorial.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rrdupdate.html 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/html/rrdxport.html 0644 root bin -d none /opt/csw/share/doc/rrdtool-1.3.4/txt 0755 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/bin_dec_hex.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/bin_dec_hex.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/cdeftutorial.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/cdeftutorial.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rpntutorial.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rpntutorial.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrd-beginners.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrd-beginners.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdbuild.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdbuild.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdcgi.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdcgi.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdcreate.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdcreate.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrddump.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrddump.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdfetch.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdfetch.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdfirst.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdfirst.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdgraph.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdgraph.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdgraph_data.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdgraph_data.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdgraph_examples.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdgraph_examples.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdgraph_graph.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdgraph_graph.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdgraph_rpn.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdgraph_rpn.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdinfo.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdinfo.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdlast.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdlast.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdlastupdate.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdlastupdate.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdresize.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdresize.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdrestore.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdrestore.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdthreads.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdthreads.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdtool.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdtool.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdtune.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdtune.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdtutorial.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdtutorial.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdupdate.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdupdate.txt 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdxport.pod 0644 root bin -f none /opt/csw/share/doc/rrdtool-1.3.4/txt/rrdxport.txt 0644 root bin -d none /opt/csw/share/man 0755 root bin +d none /opt/csw/share/doc/rrdtool-1.3.5/html 0755 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/RRDp.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/RRDs.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/bin_dec_hex.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/cdeftutorial.html 0644 root bin +s none /opt/csw/share/doc/rrdtool-1.3.5/html/index.html=rrdtool.html +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rpntutorial.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rrd-beginners.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rrdbuild.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rrdcgi.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rrdcreate.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rrddump.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rrdfetch.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rrdfirst.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rrdgraph.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rrdgraph_data.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rrdgraph_examples.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rrdgraph_graph.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rrdgraph_rpn.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rrdinfo.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rrdlast.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rrdlastupdate.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rrdresize.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rrdrestore.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rrdthreads.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rrdtool.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rrdtune.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rrdtutorial.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rrdupdate.html 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/html/rrdxport.html 0644 root bin +d none /opt/csw/share/doc/rrdtool-1.3.5/txt 0755 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/bin_dec_hex.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/bin_dec_hex.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/cdeftutorial.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/cdeftutorial.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rpntutorial.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rpntutorial.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrd-beginners.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrd-beginners.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdbuild.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdbuild.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdcgi.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdcgi.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdcreate.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdcreate.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrddump.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrddump.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdfetch.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdfetch.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdfirst.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdfirst.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdgraph.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdgraph.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdgraph_data.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdgraph_data.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdgraph_examples.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdgraph_examples.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdgraph_graph.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdgraph_graph.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdgraph_rpn.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdgraph_rpn.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdinfo.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdinfo.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdlast.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdlast.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdlastupdate.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdlastupdate.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdresize.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdresize.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdrestore.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdrestore.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdthreads.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdthreads.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdtool.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdtool.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdtune.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdtune.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdtutorial.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdtutorial.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdupdate.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdupdate.txt 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdxport.pod 0644 root bin +f none /opt/csw/share/doc/rrdtool-1.3.5/txt/rrdxport.txt 0644 root bin d none /opt/csw/share/man/man1 0755 root bin f none /opt/csw/share/man/man1/bin_dec_hex.1 0644 root bin f none /opt/csw/share/man/man1/cdeftutorial.1 0644 root bin @@ -142,13 +130,6 @@ f none /opt/csw/share/man/man1/rrdtutorial.1 0644 root bin f none /opt/csw/share/man/man1/rrdupdate.1 0644 root bin f none /opt/csw/share/man/man1/rrdxport.1 0644 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/RRDp.3perl 0444 root bin -f none /opt/csw/share/man/man3/RRDs.3perl 0444 root bin -d none /opt/csw/share/perl 0755 root bin -d none /opt/csw/share/perl/csw 0755 root bin -f none /opt/csw/share/perl/csw/RRDp.pm 0444 root bin -d none /opt/csw/share/rrdtool 0755 root bin d none /opt/csw/share/rrdtool/examples 0755 root bin f none /opt/csw/share/rrdtool/examples/4charts.pl 0755 root bin f none /opt/csw/share/rrdtool/examples/bigtops.pl 0755 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Fri Dec 26 16:24:21 2008 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 26 Dec 2008 15:24:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[2700] csw/mgar/pkg/openssl/trunk Message-ID: Revision: 2700 http://gar.svn.sourceforge.net/gar/?rev=2700&view=rev Author: chninkel Date: 2008-12-26 15:24:20 +0000 (Fri, 26 Dec 2008) Log Message: ----------- openssl: added scripts to migrate certificates in /opt/csw/etc/ssl/certs Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile csw/mgar/pkg/openssl/trunk/checksums csw/mgar/pkg/openssl/trunk/files/CSWossl.prototype csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-i386 csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-sparc csw/mgar/pkg/openssl/trunk/files/CSWosslrt.checkinstall csw/mgar/pkg/openssl/trunk/files/CSWosslrt.depend csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-i386 csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-sparc csw/mgar/pkg/openssl/trunk/files/CSWosslutils.prototype csw/mgar/pkg/openssl/trunk/files/changelog.CSW Added Paths: ----------- csw/mgar/pkg/openssl/trunk/files/CSWosslrt.postinstall csw/mgar/pkg/openssl/trunk/files/CSWosslrt.preinstall csw/mgar/pkg/openssl/trunk/files/README.CSW Removed Paths: ------------- csw/mgar/pkg/openssl/trunk/files/certs.tar.gz Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2008-12-26 12:41:09 UTC (rev 2699) +++ csw/mgar/pkg/openssl/trunk/Makefile 2008-12-26 15:24:20 UTC (rev 2700) @@ -21,12 +21,14 @@ DISTNAME = $(GARNAME)-$(GARVERSION) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWossl,depend prototype) -DISTFILES += $(call admfiles,CSWosslrt,checkinstall depend prototype-i386 prototype-sparc) +DISTFILES += $(call admfiles,CSWosslrt,checkinstall preinstall postinstall depend prototype-i386 prototype-sparc) DISTFILES += $(call admfiles,CSWossldevel,depend prototype-i386 prototype-sparc) DISTFILES += $(call admfiles,CSWosslutils,depend prototype) -DISTFILES += changelog.CSW +DISTFILES += changelog.CSW README.CSW DISTFILES += i.conf r.conf +DOCFILES = CHANGES CHANGES.SSLeay PROBLEMS README FAQ README.ASN1 INSTALL NEWS README.ENGINE + SPKG_CLASSES = none conf PATCHFILES = openssl.$(OPENSSL_VERSION).patch @@ -105,13 +107,14 @@ ginstall -D $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/changelog.CSW $(SPKG_PKGBASE)/changelog.CSW @$(MAKECOOKIE) +install-doc: + cd $(WORKSRC_FIRSTMOD)/ && ginstall $(DOCFILES) $(SPKG_PKGBASE)/ + ginstall -D $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/README.CSW $(SPKG_PKGBASE)/README.CSW + @$(MAKECOOKIE) + install-certs: [ -f $(PKGROOT)$(prefix)/ssl/openssl.cnf ] && \ ginstall -D $(PKGROOT)$(prefix)/ssl/openssl.cnf $(PKGROOT)$(sysconfdir)/ssl/openssl.cnf - gunzip --stdout $(CURDIR)/$(FILEDIR)/certs.tar.gz | (cd $(PKGROOT)$(prefix)/ssl/certs && tar xf -) - cp -r $(WORKSRC_FIRSTMOD)/certs/* $(PKGROOT)$(prefix)/ssl/certs - OPENSSL=$(PKGROOT)/$(bindir)/openssl $(PKGROOT)/$(bindir)/c_rehash $(PKGROOT)/$(prefix)/ssl/certs/ - @$(MAKECOOKIE) install-oldlibs: $(addprefix install-oldlibs-,$(OLDLIBS)) install-oldlibs-%: @@ -119,4 +122,4 @@ cd $(PKGROOT) && gunzip -c $(CURDIR)/$(FILEDIR)/oldlibs.$*-$(GARCH).tar.gz | tar xvf - @$(MAKECOOKIE) -post-merge: install-certs install-oldlibs install-changelog +post-merge: install-certs install-oldlibs install-changelog install-doc Modified: csw/mgar/pkg/openssl/trunk/checksums =================================================================== --- csw/mgar/pkg/openssl/trunk/checksums 2008-12-26 12:41:09 UTC (rev 2699) +++ csw/mgar/pkg/openssl/trunk/checksums 2008-12-26 15:24:20 UTC (rev 2700) @@ -1,20 +1,23 @@ 561e00f18821c74b2b86c8c7786f9d8b download/openssl-0.9.8i.tar.gz b5ded4412606a0996595015bc2ff6974 download/CSWossl.gspec 05b45e7124833dee48e5f3c45591e95b download/CSWossl.depend -7fe01ca4ef9d0e971d57b00f4d0b168b download/CSWossl.prototype +bd9bb4dfb9602fba461b21fa37f97765 download/CSWossl.prototype 83480e01971e71d037bd44fa5ed4e4e5 download/CSWosslrt.gspec -78c26f65b14f3ebf4a29069a3f675285 download/CSWosslrt.checkinstall -d41d8cd98f00b204e9800998ecf8427e download/CSWosslrt.depend -cba143e52cb08dd3ee39f275aefa075d download/CSWosslrt.prototype-i386 -ceeb4a59f1c31ae4deac9f2b61dadca2 download/CSWosslrt.prototype-sparc +44afcc5a68551370907b9da130acc62b download/CSWosslrt.checkinstall +c9de908daad1a31fca20329cb043ad3c download/CSWosslrt.preinstall +990506284d440001e4f23f7fbffa404a download/CSWosslrt.postinstall +cbf34987267073fb1f60bff86492dd8b download/CSWosslrt.depend +e4ae37693f304010a024329151d7620e download/CSWosslrt.prototype-i386 +b71924fca6e324743e6977f370cce76b download/CSWosslrt.prototype-sparc 2ac43ebf4689d236540e22171541be4e download/CSWossldevel.gspec 37995caa7f4155066b00fb7503e853da download/CSWossldevel.depend -45161ff3a5b00fd6942f63b77c0b0ed1 download/CSWossldevel.prototype-i386 -7b1dd2e8c78b033ca2a8be4de097b147 download/CSWossldevel.prototype-sparc +e85eb38fc1a7301fa4951355859ee5e9 download/CSWossldevel.prototype-i386 +427edaecb41b1536013db23a02d69f42 download/CSWossldevel.prototype-sparc eec77249fb642c525cad67dcd055fb77 download/CSWosslutils.gspec 37995caa7f4155066b00fb7503e853da download/CSWosslutils.depend -6e0c86ddc23d044757810cca6f31f017 download/CSWosslutils.prototype -1bd6e7ee77845fc4de843d7479a4bdb9 download/changelog.CSW +a441995e4e3c95497e77aa613d2c673c download/CSWosslutils.prototype +1b23306c534a4c0a3920bdf1984b39bd download/changelog.CSW +b78faa440d6f6a2a07663de331678648 download/README.CSW 7fdc09cd3c11db459c83c8946f7872f6 download/i.conf a454ac09091085813ec8900f5a0c917c download/r.conf 64f7c3f3a6cae483209b69c31c82557d download/openssl.0.9.8.patch Modified: csw/mgar/pkg/openssl/trunk/files/CSWossl.prototype =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWossl.prototype 2008-12-26 12:41:09 UTC (rev 2699) +++ csw/mgar/pkg/openssl/trunk/files/CSWossl.prototype 2008-12-26 15:24:20 UTC (rev 2700) @@ -1,2 +1,12 @@ d none /opt/csw/share/doc/openssl 0755 root bin f none /opt/csw/share/doc/openssl/changelog.CSW=changelog.CSW 644 root bin +f none /opt/csw/share/doc/openssl/CHANGES=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl/CHANGES.SSLeay=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl/PROBLEMS=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl/README=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl/FAQ=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl/README.ASN1=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl/INSTALL=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl/NEWS=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl/README.ENGINE=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl/README.CSW=README.CSW 644 root bin Modified: csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-i386 =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-i386 2008-12-26 12:41:09 UTC (rev 2699) +++ csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-i386 2008-12-26 15:24:20 UTC (rev 2700) @@ -1042,3 +1042,14 @@ f none /opt/csw/share/man/man3/ui.3 0644 root bin f none /opt/csw/share/man/man3/ui_compat.3 0644 root bin f none /opt/csw/share/man/man3/x509.3 0644 root bin +f none /opt/csw/share/doc/openssl_devel/changelog.CSW=changelog.CSW 644 root bin +f none /opt/csw/share/doc/openssl_devel/CHANGES=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl_devel/CHANGES.SSLeay=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl_devel/PROBLEMS=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl_devel/README=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl_devel/FAQ=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl_devel/README.ASN1=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl_devel/INSTALL=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl_devel/NEWS=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl_devel/README.ENGINE=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl_devel/README.CSW=README.CSW 644 root bin Modified: csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-sparc =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-sparc 2008-12-26 12:41:09 UTC (rev 2699) +++ csw/mgar/pkg/openssl/trunk/files/CSWossldevel.prototype-sparc 2008-12-26 15:24:20 UTC (rev 2700) @@ -1042,3 +1042,14 @@ f none /opt/csw/share/man/man3/ui.3 0644 root bin f none /opt/csw/share/man/man3/ui_compat.3 0644 root bin f none /opt/csw/share/man/man3/x509.3 0644 root bin +f none /opt/csw/share/doc/openssl_devel/changelog.CSW=changelog.CSW 644 root bin +f none /opt/csw/share/doc/openssl_devel/CHANGES=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl_devel/CHANGES.SSLeay=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl_devel/PROBLEMS=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl_devel/README=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl_devel/FAQ=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl_devel/README.ASN1=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl_devel/INSTALL=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl_devel/NEWS=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl_devel/README.ENGINE=CHANGES 644 root bin +f none /opt/csw/share/doc/openssl_devel/README.CSW=README.CSW 644 root bin Modified: csw/mgar/pkg/openssl/trunk/files/CSWosslrt.checkinstall =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWosslrt.checkinstall 2008-12-26 12:41:09 UTC (rev 2699) +++ csw/mgar/pkg/openssl/trunk/files/CSWosslrt.checkinstall 2008-12-26 15:24:20 UTC (rev 2700) @@ -26,4 +26,23 @@ fi fi +# Certification Authority have been moved under /opt/csw/etc/ssl/certs +# under the ca_certificates package control +# and /opt/csw/ssl/certs is now a symbolic links + +# we test if certificates were manually installed in this directory +if [ ! -L "/opt/csw/ssl/certs" ] && [ -n "`ls -1 /opt/csw/ssl/certs/`" ]; then + + echo "Custom certificates have been installed in /opt/csw/ssl/certs/." + echo "They will be moved under /opt/csw/etc/ssl/certs." + echo "see /opt/csw/share/doc/openssl_rt/README.CSW for more information" + echo "about CA." + + # we define the MOVE_CERTS variable so preinstall and postinstall scripts + # will now they have to do something about theses certificates + cat >>$1 < Revision: 2701 http://gar.svn.sourceforge.net/gar/?rev=2701&view=rev Author: chninkel Date: 2008-12-26 16:07:08 +0000 (Fri, 26 Dec 2008) Log Message: ----------- openssl: revmoed debug mode for update-ca-certificates Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/checksums csw/mgar/pkg/openssl/trunk/files/CSWosslrt.postinstall Modified: csw/mgar/pkg/openssl/trunk/checksums =================================================================== --- csw/mgar/pkg/openssl/trunk/checksums 2008-12-26 15:24:20 UTC (rev 2700) +++ csw/mgar/pkg/openssl/trunk/checksums 2008-12-26 16:07:08 UTC (rev 2701) @@ -5,7 +5,7 @@ 83480e01971e71d037bd44fa5ed4e4e5 download/CSWosslrt.gspec 44afcc5a68551370907b9da130acc62b download/CSWosslrt.checkinstall c9de908daad1a31fca20329cb043ad3c download/CSWosslrt.preinstall -990506284d440001e4f23f7fbffa404a download/CSWosslrt.postinstall +1c3f600eaf942a18ecab3637e1fc32bd download/CSWosslrt.postinstall cbf34987267073fb1f60bff86492dd8b download/CSWosslrt.depend e4ae37693f304010a024329151d7620e download/CSWosslrt.prototype-i386 b71924fca6e324743e6977f370cce76b download/CSWosslrt.prototype-sparc Modified: csw/mgar/pkg/openssl/trunk/files/CSWosslrt.postinstall =================================================================== --- csw/mgar/pkg/openssl/trunk/files/CSWosslrt.postinstall 2008-12-26 15:24:20 UTC (rev 2700) +++ csw/mgar/pkg/openssl/trunk/files/CSWosslrt.postinstall 2008-12-26 16:07:08 UTC (rev 2701) @@ -3,7 +3,7 @@ # we regenerate the certificate hash if we moved certificates from the old /opt/csw/ssl/certs # directory to /opt/csw/etc/ssl/certs if [ "$MOVE_CERTS" = "Yes" ]; then - [ ! -x "/opt/csw/sbin/update-ca-certificates" ] || sh -xe /opt/csw/sbin/update-ca-certificates + [ ! -x "/opt/csw/sbin/update-ca-certificates" ] || /opt/csw/sbin/update-ca-certificates fi true This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Sat Dec 27 20:04:05 2008 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sat, 27 Dec 2008 19:04:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[2702] csw/mgar/pkg Message-ID: Revision: 2702 http://gar.svn.sourceforge.net/gar/?rev=2702&view=rev Author: idogan23 Date: 2008-12-27 19:04:05 +0000 (Sat, 27 Dec 2008) Log Message: ----------- libytnef: initial commit Added Paths: ----------- csw/mgar/pkg/libytnef/ csw/mgar/pkg/libytnef/branches/ csw/mgar/pkg/libytnef/tags/ csw/mgar/pkg/libytnef/trunk/ csw/mgar/pkg/libytnef/trunk/Makefile csw/mgar/pkg/libytnef/trunk/checksums csw/mgar/pkg/libytnef/trunk/files/ csw/mgar/pkg/libytnef/trunk/files/CSWlibytnef.gspec Property changes on: csw/mgar/pkg/libytnef/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 Added: csw/mgar/pkg/libytnef/trunk/Makefile =================================================================== --- csw/mgar/pkg/libytnef/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libytnef/trunk/Makefile 2008-12-27 19:04:05 UTC (rev 2702) @@ -0,0 +1,31 @@ +GARNAME = libytnef +GARVERSION = 1.5 +CATEGORIES = lib + +DESCRIPTION = Brief description +define BLURB + This is the library needed to YTNEF application. + This program decodes those annoying application/ms-tnef MIME attachments that + Microsoft mail servers helpfully use to encapsulate your already MIME encoded + attachments. + The YTNEF program allows one to unpack the attachments which were encapsulated + into the YTNEF attachment. Thus alleviating the need to use Microsoft Outlook + to view them. +endef + +MASTER_SITES = http://ytnef.sourceforge.net/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWlibytnef,) + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +UPSTREAM_MASTER_SITES = http://ovh.dl.sourceforge.net/sourceforge/ytnef/ + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_SCRIPTS = + +include gar/category.mk Added: csw/mgar/pkg/libytnef/trunk/checksums =================================================================== --- csw/mgar/pkg/libytnef/trunk/checksums (rev 0) +++ csw/mgar/pkg/libytnef/trunk/checksums 2008-12-27 19:04:05 UTC (rev 2702) @@ -0,0 +1,2 @@ +6c44b955f33cf714c75a7bbe895cc352 download/libytnef-1.5.tar.gz +1a4a0d9a1f8654a3b6e3c7968cd5017c download/CSWpackage.gspec Added: csw/mgar/pkg/libytnef/trunk/files/CSWlibytnef.gspec =================================================================== --- csw/mgar/pkg/libytnef/trunk/files/CSWlibytnef.gspec (rev 0) +++ csw/mgar/pkg/libytnef/trunk/files/CSWlibytnef.gspec 2008-12-27 19:04:05 UTC (rev 2702) @@ -0,0 +1,4 @@ +%var bitname libytnef +%var pkgname CSWlibytnef +%include url file://%{PKGLIB}/csw_dyndepend.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 idogan23 at users.sourceforge.net Sat Dec 27 20:08:05 2008 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sat, 27 Dec 2008 19:08:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[2703] csw/mgar/pkg/libytnef/trunk/checksums Message-ID: Revision: 2703 http://gar.svn.sourceforge.net/gar/?rev=2703&view=rev Author: idogan23 Date: 2008-12-27 19:07:57 +0000 (Sat, 27 Dec 2008) Log Message: ----------- libytnef: forgot to run gmake makesum before commit Modified Paths: -------------- csw/mgar/pkg/libytnef/trunk/checksums Modified: csw/mgar/pkg/libytnef/trunk/checksums =================================================================== --- csw/mgar/pkg/libytnef/trunk/checksums 2008-12-27 19:04:05 UTC (rev 2702) +++ csw/mgar/pkg/libytnef/trunk/checksums 2008-12-27 19:07:57 UTC (rev 2703) @@ -1,2 +1,2 @@ 6c44b955f33cf714c75a7bbe895cc352 download/libytnef-1.5.tar.gz -1a4a0d9a1f8654a3b6e3c7968cd5017c download/CSWpackage.gspec +1a4a0d9a1f8654a3b6e3c7968cd5017c download/CSWlibytnef.gspec 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 Dec 28 03:02:57 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 28 Dec 2008 02:02:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[2704] csw/mgar/pkg/docbook-style-xsl/trunk/checksums Message-ID: Revision: 2704 http://gar.svn.sourceforge.net/gar/?rev=2704&view=rev Author: bdwalton Date: 2008-12-28 02:02:56 +0000 (Sun, 28 Dec 2008) Log Message: ----------- forgot to update checksums with prior checkin Modified Paths: -------------- csw/mgar/pkg/docbook-style-xsl/trunk/checksums Modified: csw/mgar/pkg/docbook-style-xsl/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-style-xsl/trunk/checksums 2008-12-27 19:07:57 UTC (rev 2703) +++ csw/mgar/pkg/docbook-style-xsl/trunk/checksums 2008-12-28 02:02:56 UTC (rev 2704) @@ -3,7 +3,7 @@ 4120f10e50070dd8fc2284d5214bf51d download/CSWdocbookxsl.gspec 8911f851d78a1ab1a21c49286f37f6cb download/CSWdocbookxsl.postinstall 88f331d079de730ef77a5091e69989e2 download/CSWdocbookxsl.preremove -2da0402bea01c8235e6fffac147382d5 download/CSWdocbookxsldoc.gspec +a0c6ee83fdef595158d9eed95d508d8f download/CSWdocbookxsldoc.gspec 84b37b559cc95c747e39a5a8f79558a3 download/docbook-xsl-pagesetup.patch 1d1ff63f5ebd3527c925f68e55138b6f download/docbook-xsl-marginleft.patch cec8c281ed1c9be99ad47a74362248d5 download/docbook-xsl-lists.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Sun Dec 28 05:29:27 2008 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Sun, 28 Dec 2008 04:29:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[2705] csw/mgar/pkg/vim/trunk Message-ID: Revision: 2705 http://gar.svn.sourceforge.net/gar/?rev=2705&view=rev Author: harpchad Date: 2008-12-28 04:29:26 +0000 (Sun, 28 Dec 2008) Log Message: ----------- Update to patch level 75 Modified Paths: -------------- csw/mgar/pkg/vim/trunk/checksums csw/mgar/pkg/vim/trunk/files/patches.mk Modified: csw/mgar/pkg/vim/trunk/checksums =================================================================== --- csw/mgar/pkg/vim/trunk/checksums 2008-12-28 02:02:56 UTC (rev 2704) +++ csw/mgar/pkg/vim/trunk/checksums 2008-12-28 04:29:26 UTC (rev 2705) @@ -67,6 +67,12 @@ fa0ccca2decdd2db64947658b04b8c99 download/7.2.067 ca5ab057205023613020ca920d903028 download/7.2.068 f3e6f3dd76278a9f7e396955faa4ca31 download/7.2.069 +805cdc76da46e73ae908038e09efae16 download/7.2.070 +9224b5e9c85fa4d47d418c248aff542e download/7.2.071 +45ca3d6526b653253b05d91a1e89bd3d download/7.2.072 +0d77ee653eabe4b7fdb640d768d7c1be download/7.2.073 +5b0a423e9f3ca07e5c62d4f0f5803a5c download/7.2.074 +d7eccf57f8fc04cf0385f85eff3d989a download/7.2.075 198b5e809eddd24650dac5ab237e26d0 download/CSWvim.depend 59c166f15ad9e4db7aeef3ce7f6d89d9 download/CSWvim.gspec 7f886f132e8404332757262c82aac7af download/CSWvim.prototype Modified: csw/mgar/pkg/vim/trunk/files/patches.mk =================================================================== --- csw/mgar/pkg/vim/trunk/files/patches.mk 2008-12-28 02:02:56 UTC (rev 2704) +++ csw/mgar/pkg/vim/trunk/files/patches.mk 2008-12-28 04:29:26 UTC (rev 2705) @@ -1,5 +1,5 @@ # Vim 72 patchset -PATCHREV = 069 +PATCHREV = 075 PATCHDIRLEVEL = 0 GARVERSION = $(DISTVERSION).$(PATCHREV) PATCHFILES += $(foreach T,$(shell gseq -f "%03g" 001 $(PATCHREV)),$(DISTVERSION).$(T)) 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 Dec 28 14:34:11 2008 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 28 Dec 2008 13:34:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[2706] csw/mgar/pkg Message-ID: Revision: 2706 http://gar.svn.sourceforge.net/gar/?rev=2706&view=rev Author: idogan23 Date: 2008-12-28 13:34:11 +0000 (Sun, 28 Dec 2008) Log Message: ----------- smartmontools: initial commit Added Paths: ----------- csw/mgar/pkg/smartmontools/ csw/mgar/pkg/smartmontools/branches/ csw/mgar/pkg/smartmontools/tags/ csw/mgar/pkg/smartmontools/trunk/ csw/mgar/pkg/smartmontools/trunk/Makefile csw/mgar/pkg/smartmontools/trunk/checksums csw/mgar/pkg/smartmontools/trunk/files/ csw/mgar/pkg/smartmontools/trunk/files/CSWsmartmontools.depend csw/mgar/pkg/smartmontools/trunk/files/CSWsmartmontools.gspec csw/mgar/pkg/smartmontools/trunk/files/CSWsmartmontools.postinstall csw/mgar/pkg/smartmontools/trunk/files/CSWsmartmontools.prototype Property changes on: csw/mgar/pkg/smartmontools/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 Added: csw/mgar/pkg/smartmontools/trunk/Makefile =================================================================== --- csw/mgar/pkg/smartmontools/trunk/Makefile (rev 0) +++ csw/mgar/pkg/smartmontools/trunk/Makefile 2008-12-28 13:34:11 UTC (rev 2706) @@ -0,0 +1,48 @@ +GARNAME = smartmontools +GARVERSION = 5.38 +CATEGORIES = utils + +DESCRIPTION = S.M.A.R.T. disk monitoring tools +define BLURB + The smartmontools package contains two utility programs (smartctl and smartd) + to control and monitor storage systems using the Self-Monitoring, Analysis + and Reporting Technology System (S.M.A.R.T.) built into most modern ATA and + SCSI hard disks. It is derived from the smartsuite package, and includes + support for ATA/ATAPI-5 disks. +endef + +MASTER_SITES = http://smartmontools.sourceforge.net/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWsmartmontools, postinstall depend prototype) + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +UPSTREAM_MASTER_SITES = http://surfnet.dl.sourceforge.net/sourceforge/smartmontools/ + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-docdir=$(sharedstatedir)/doc/$(GARNAME) +CONFIGURE_ARGS += --with-initscriptdir=/etc/opt/csw/init.d + +TEST_TARGET = check + +# moving configuration file +post-install: + (cd $(DESTDIR)$(prefix)/etc; \ + for i in smartd.conf; do \ + if [ -r "$$i" ]; then \ + echo "$$i -> $$i.CSW"; \ + mv "$$i" "$$i.CSW"; \ + fi \ + done) + (cd $(DESTDIR)/etc/opt/csw/init.d; \ + for i in smartd; do \ + if [ -r "$$i" ]; then \ + echo "$$i -> csw$$i"; \ + mv "$$i" "csw$$i"; \ + fi \ + done) + +include gar/category.mk Added: csw/mgar/pkg/smartmontools/trunk/checksums =================================================================== --- csw/mgar/pkg/smartmontools/trunk/checksums (rev 0) +++ csw/mgar/pkg/smartmontools/trunk/checksums 2008-12-28 13:34:11 UTC (rev 2706) @@ -0,0 +1,5 @@ +a282846532ecbd6b4a28072373b3a70b download/smartmontools-5.38.tar.gz +28e1281d77b7c5920cb90f4d6c97f7df download/CSWsmartmontools.gspec +307c061f168249834c527eeb8d6e0501 download/CSWsmartmontools.postinstall +e5586868ebec465f4b66d0da3c1eedda download/CSWsmartmontools.depend +9e07053388cfc10816db34c6053af0a9 download/CSWsmartmontools.prototype Added: csw/mgar/pkg/smartmontools/trunk/files/CSWsmartmontools.depend =================================================================== --- csw/mgar/pkg/smartmontools/trunk/files/CSWsmartmontools.depend (rev 0) +++ csw/mgar/pkg/smartmontools/trunk/files/CSWsmartmontools.depend 2008-12-28 13:34:11 UTC (rev 2706) @@ -0,0 +1,2 @@ +P CSWcommon +P CSWcswclassutils Added: csw/mgar/pkg/smartmontools/trunk/files/CSWsmartmontools.gspec =================================================================== --- csw/mgar/pkg/smartmontools/trunk/files/CSWsmartmontools.gspec (rev 0) +++ csw/mgar/pkg/smartmontools/trunk/files/CSWsmartmontools.gspec 2008-12-28 13:34:11 UTC (rev 2706) @@ -0,0 +1,4 @@ +%var bitname smartmontools +%var pkgname CSWsmartmontools +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKSRC}/COPYING Added: csw/mgar/pkg/smartmontools/trunk/files/CSWsmartmontools.postinstall =================================================================== --- csw/mgar/pkg/smartmontools/trunk/files/CSWsmartmontools.postinstall (rev 0) +++ csw/mgar/pkg/smartmontools/trunk/files/CSWsmartmontools.postinstall 2008-12-28 13:34:11 UTC (rev 2706) @@ -0,0 +1,3 @@ +if [ ! -f $BASEDIR/opt/csw/etc/smartd.conf ] ; then + cp $BASEDIR/opt/csw/etc/smartd.conf.CSW $BASEDIR/opt/csw/etc/smartd.conf +fi Added: csw/mgar/pkg/smartmontools/trunk/files/CSWsmartmontools.prototype =================================================================== --- csw/mgar/pkg/smartmontools/trunk/files/CSWsmartmontools.prototype (rev 0) +++ csw/mgar/pkg/smartmontools/trunk/files/CSWsmartmontools.prototype 2008-12-28 13:34:11 UTC (rev 2706) @@ -0,0 +1,30 @@ +d none /opt/csw/etc 0755 root bin +f none /opt/csw/etc/smartd.conf.CSW 0644 root bin +d none /opt/csw/sbin 0755 root bin +f none /opt/csw/sbin/smartctl 0755 root bin +f none /opt/csw/sbin/smartd 0755 root bin +d none /opt/csw/share 0755 root bin +d none /opt/csw/share/doc 0755 root bin +d none /opt/csw/share/doc/smartmontools 0755 root bin +f none /opt/csw/share/doc/smartmontools/AUTHORS 0644 root bin +f none /opt/csw/share/doc/smartmontools/CHANGELOG 0644 root bin +f none /opt/csw/share/doc/smartmontools/COPYING 0644 root bin +f none /opt/csw/share/doc/smartmontools/INSTALL 0644 root bin +f none /opt/csw/share/doc/smartmontools/NEWS 0644 root bin +f none /opt/csw/share/doc/smartmontools/README 0644 root bin +f none /opt/csw/share/doc/smartmontools/TODO 0644 root bin +f none /opt/csw/share/doc/smartmontools/WARNINGS 0644 root bin +d none /opt/csw/share/doc/smartmontools/examplescripts 0755 root bin +f none /opt/csw/share/doc/smartmontools/examplescripts/Example1 0755 root bin +f none /opt/csw/share/doc/smartmontools/examplescripts/Example2 0755 root bin +f none /opt/csw/share/doc/smartmontools/examplescripts/Example3 0755 root bin +f none /opt/csw/share/doc/smartmontools/examplescripts/Example4 0755 root bin +f none /opt/csw/share/doc/smartmontools/examplescripts/README 0644 root bin +f none /opt/csw/share/doc/smartmontools/smartd.conf 0644 root bin +d none /opt/csw/share/man 0755 root bin +d none /opt/csw/share/man/man1m 0755 root bin +f none /opt/csw/share/man/man1m/smartctl.1m 0644 root bin +f none /opt/csw/share/man/man1m/smartd.1m 0644 root bin +d none /opt/csw/share/man/man4 0755 root bin +f none /opt/csw/share/man/man4/smartd.conf.4 0644 root bin +f cswinitsmf /etc/opt/csw/init.d/cswsmartd 0755 root bin 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 Dec 28 14:37:59 2008 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 28 Dec 2008 13:37:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[2707] csw/mgar/pkg/syslog_ng/trunk Message-ID: Revision: 2707 http://gar.svn.sourceforge.net/gar/?rev=2707&view=rev Author: idogan23 Date: 2008-12-28 13:37:59 +0000 (Sun, 28 Dec 2008) Log Message: ----------- syslog_ng: fixed dependency to cswaclassutils Modified Paths: -------------- csw/mgar/pkg/syslog_ng/trunk/checksums csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.prototype Modified: csw/mgar/pkg/syslog_ng/trunk/checksums =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/checksums 2008-12-28 13:34:11 UTC (rev 2706) +++ csw/mgar/pkg/syslog_ng/trunk/checksums 2008-12-28 13:37:59 UTC (rev 2707) @@ -2,6 +2,6 @@ 6726e851fa8e6e6658584faaeaa6716d download/CSWsyslogng.gspec 3de835dbfde225227a1ed36f548e1d34 download/CSWsyslogng.postinstall bb5490a23e8480b6e9d625389885c346 download/CSWsyslogng.depend -a36e217b9ee103b28eb8946e6622a235 download/CSWsyslogng.prototype +d906b84aa704d887fc98179d49dd5db2 download/CSWsyslogng.prototype ae942a41cbdc6fb0f8a4438d7f5a00d5 download/syslog-ng.conf.CSW 168ce024423e8dbee8c1597d8a1ef3ef download/cswsyslog_ng Modified: csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.prototype =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.prototype 2008-12-28 13:34:11 UTC (rev 2706) +++ csw/mgar/pkg/syslog_ng/trunk/files/CSWsyslogng.prototype 2008-12-28 13:37:59 UTC (rev 2707) @@ -10,4 +10,4 @@ f none /opt/csw/share/man/man5/syslog-ng.conf.5 0644 root bin d none /opt/csw/share/man/man8 0755 root bin f none /opt/csw/share/man/man8/syslog-ng.8 0644 root bin -f none /etc/opt/csw/init.d/cswsyslog_ng 0755 root bin +f cswinitsmf /etc/opt/csw/init.d/cswsyslog_ng 0755 root bin 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 Dec 28 17:31:12 2008 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 28 Dec 2008 16:31:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[2708] csw/mgar/pkg Message-ID: Revision: 2708 http://gar.svn.sourceforge.net/gar/?rev=2708&view=rev Author: idogan23 Date: 2008-12-28 16:31:12 +0000 (Sun, 28 Dec 2008) Log Message: ----------- gnupg: initial commit Added Paths: ----------- csw/mgar/pkg/gnupg/ csw/mgar/pkg/gnupg/branches/ csw/mgar/pkg/gnupg/tags/ csw/mgar/pkg/gnupg/trunk/ csw/mgar/pkg/gnupg/trunk/Makefile csw/mgar/pkg/gnupg/trunk/checksums csw/mgar/pkg/gnupg/trunk/files/ csw/mgar/pkg/gnupg/trunk/files/CSWgnupg.depend csw/mgar/pkg/gnupg/trunk/files/CSWgnupg.gspec csw/mgar/pkg/gnupg/trunk/files/CSWgnupg.prototype Property changes on: csw/mgar/pkg/gnupg/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 Added: csw/mgar/pkg/gnupg/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnupg/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gnupg/trunk/Makefile 2008-12-28 16:31:12 UTC (rev 2708) @@ -0,0 +1,31 @@ +GARNAME = gnupg +GARVERSION = 1.4.9 +CATEGORIES = apps + +DESCRIPTION = RFC 2440 compliant tool for secure communication and data storage +define BLURB + GnuPG is a complete and free replacement for PGP. +endef + +MASTER_SITES = http://www.gnupg.org/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWgnupg, depend prototype) + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +UPSTREAM_MASTER_SITES = ftp://ftp.gnupg.org/gcrypt/gnupg/ + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-libcurl +CONFIGURE_ARGS += --with-ldap +CONFIGURE_ARGS += --with-zlib +CONFIGURE_ARGS += --with-bzip2 +CONFIGURE_ARGS += --with-readline +CONFIGURE_ARGS += --enable-threads=solaris + +TEST_TARGET = check + +include gar/category.mk Added: csw/mgar/pkg/gnupg/trunk/checksums =================================================================== --- csw/mgar/pkg/gnupg/trunk/checksums (rev 0) +++ csw/mgar/pkg/gnupg/trunk/checksums 2008-12-28 16:31:12 UTC (rev 2708) @@ -0,0 +1,4 @@ +3537dedea45cc09e8d88d1ef4f774246 download/gnupg-1.4.9.tar.gz +7978eaabeceaa781a1600ede3a6d3f67 download/CSWgnupg.gspec +7c870727fcc4d65844d7ccca2d609cab download/CSWgnupg.depend +d403a353dd4eca4185b00f2cc80a17fd download/CSWgnupg.prototype Added: csw/mgar/pkg/gnupg/trunk/files/CSWgnupg.depend =================================================================== --- csw/mgar/pkg/gnupg/trunk/files/CSWgnupg.depend (rev 0) +++ csw/mgar/pkg/gnupg/trunk/files/CSWgnupg.depend 2008-12-28 16:31:12 UTC (rev 2708) @@ -0,0 +1,11 @@ +P CSWcommon +P CSWbzip2 +P CSWcurlrt +P CSWggettext +P CSWiconv +P CSWlibidn +P CSWoldaprt +P CSWosslrt +P CSWreadline +P CSWzlib +P CSWtexinfo Added: csw/mgar/pkg/gnupg/trunk/files/CSWgnupg.gspec =================================================================== --- csw/mgar/pkg/gnupg/trunk/files/CSWgnupg.gspec (rev 0) +++ csw/mgar/pkg/gnupg/trunk/files/CSWgnupg.gspec 2008-12-28 16:31:12 UTC (rev 2708) @@ -0,0 +1,4 @@ +%var bitname gnupg +%var pkgname CSWgnupg +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKSRC}/COPYING Added: csw/mgar/pkg/gnupg/trunk/files/CSWgnupg.prototype =================================================================== --- csw/mgar/pkg/gnupg/trunk/files/CSWgnupg.prototype (rev 0) +++ csw/mgar/pkg/gnupg/trunk/files/CSWgnupg.prototype 2008-12-28 16:31:12 UTC (rev 2708) @@ -0,0 +1,115 @@ +d none /opt/csw/bin 0755 root bin +f none /opt/csw/bin/gpg 0755 root bin +f none /opt/csw/bin/gpg-zip 0755 root bin +f none /opt/csw/bin/gpgsplit 0755 root bin +f none /opt/csw/bin/gpgv 0755 root bin +d none /opt/csw/libexec 0755 root bin +d none /opt/csw/libexec/gnupg 0755 root bin +f none /opt/csw/libexec/gnupg/gpgkeys_curl 0755 root bin +f none /opt/csw/libexec/gnupg/gpgkeys_finger 0755 root bin +f none /opt/csw/libexec/gnupg/gpgkeys_hkp 0755 root bin +f none /opt/csw/libexec/gnupg/gpgkeys_ldap 0755 root bin +d none /opt/csw/share 0755 root bin +d none /opt/csw/share/gnupg 0755 root bin +f none /opt/csw/share/gnupg/FAQ 0644 root bin +f none /opt/csw/share/gnupg/faq.html 0644 root bin +f none /opt/csw/share/gnupg/options.skel 0644 root bin +f none /opt/csw/share/info/gnupg1.info 0644 root bin +d none /opt/csw/share/locale 0755 root bin +d none /opt/csw/share/locale/be 0755 root bin +d none /opt/csw/share/locale/be/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/be/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/ca 0755 root bin +d none /opt/csw/share/locale/ca/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/ca/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/cs 0755 root bin +d none /opt/csw/share/locale/cs/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/cs/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/da 0755 root bin +d none /opt/csw/share/locale/da/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/da/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/de 0755 root bin +d none /opt/csw/share/locale/de/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/de/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/el 0755 root bin +d none /opt/csw/share/locale/el/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/el/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/en at boldquot 0755 root bin +d none /opt/csw/share/locale/en at boldquot/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/en at boldquot/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/en at quot 0755 root bin +d none /opt/csw/share/locale/en at quot/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/en at quot/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/eo 0755 root bin +d none /opt/csw/share/locale/eo/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/eo/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/es 0755 root bin +d none /opt/csw/share/locale/es/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/es/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/et 0755 root bin +d none /opt/csw/share/locale/et/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/et/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/fi 0755 root bin +d none /opt/csw/share/locale/fi/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/fi/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/fr 0755 root bin +d none /opt/csw/share/locale/fr/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/fr/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/gl 0755 root bin +d none /opt/csw/share/locale/gl/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/gl/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/hu 0755 root bin +d none /opt/csw/share/locale/hu/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/hu/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/id 0755 root bin +d none /opt/csw/share/locale/id/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/id/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/it 0755 root bin +d none /opt/csw/share/locale/it/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/it/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/ja 0755 root bin +d none /opt/csw/share/locale/ja/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/ja/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/nb 0755 root bin +d none /opt/csw/share/locale/nb/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/nb/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/nl 0755 root bin +d none /opt/csw/share/locale/nl/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/nl/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/pl 0755 root bin +d none /opt/csw/share/locale/pl/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/pl/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/pt 0755 root bin +d none /opt/csw/share/locale/pt/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/pt/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/pt_BR 0755 root bin +d none /opt/csw/share/locale/pt_BR/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/pt_BR/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/ro 0755 root bin +d none /opt/csw/share/locale/ro/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/ro/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/ru 0755 root bin +d none /opt/csw/share/locale/ru/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/ru/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/sk 0755 root bin +d none /opt/csw/share/locale/sk/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/sk/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/sv 0755 root bin +d none /opt/csw/share/locale/sv/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/sv/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/tr 0755 root bin +d none /opt/csw/share/locale/tr/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/tr/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/zh_CN 0755 root bin +d none /opt/csw/share/locale/zh_CN/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/zh_CN/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/locale/zh_TW 0755 root bin +d none /opt/csw/share/locale/zh_TW/LC_MESSAGES 0755 root bin +f none /opt/csw/share/locale/zh_TW/LC_MESSAGES/gnupg.mo 0644 root bin +d none /opt/csw/share/man 0755 root bin +d none /opt/csw/share/man/man1 0755 root bin +f none /opt/csw/share/man/man1/gpg.1 0644 root bin +f none /opt/csw/share/man/man1/gpg.ru.1 0644 root bin +f none /opt/csw/share/man/man1/gpgv.1 0644 root bin +d none /opt/csw/share/man/man7 0755 root bin +f none /opt/csw/share/man/man7/gnupg.7 0644 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Mon Dec 29 22:25:22 2008 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Mon, 29 Dec 2008 21:25:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[2709] csw/mgar/pkg Message-ID: Revision: 2709 http://gar.svn.sourceforge.net/gar/?rev=2709&view=rev Author: harpchad Date: 2008-12-29 21:25:20 +0000 (Mon, 29 Dec 2008) Log Message: ----------- Add meanwhile gar profile Added Paths: ----------- csw/mgar/pkg/meanwhile/ csw/mgar/pkg/meanwhile/branches/ csw/mgar/pkg/meanwhile/tags/ csw/mgar/pkg/meanwhile/trunk/ csw/mgar/pkg/meanwhile/trunk/Makefile csw/mgar/pkg/meanwhile/trunk/checksums csw/mgar/pkg/meanwhile/trunk/files/ csw/mgar/pkg/meanwhile/trunk/files/CSWmeanwhile.depend csw/mgar/pkg/meanwhile/trunk/files/CSWmeanwhile.gspec csw/mgar/pkg/meanwhile/trunk/files/CSWmeanwhile.prototype csw/mgar/pkg/meanwhile/trunk/files/doc_dir.patch csw/mgar/pkg/meanwhile/trunk/files/ft_fix.patch csw/mgar/pkg/meanwhile/trunk/files/presence_fix_v2.patch csw/mgar/pkg/meanwhile/trunk/files/status_timestamp_workaround.patch Property changes on: csw/mgar/pkg/meanwhile/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 Added: csw/mgar/pkg/meanwhile/trunk/Makefile =================================================================== --- csw/mgar/pkg/meanwhile/trunk/Makefile (rev 0) +++ csw/mgar/pkg/meanwhile/trunk/Makefile 2008-12-29 21:25:20 UTC (rev 2709) @@ -0,0 +1,33 @@ +GARNAME = meanwhile +GARVERSION = 1.0.2 +CATEGORIES = lib + +#Need to use either gcc or studio 12 with -features=extensions +GARCOMPILER = GNU + +DESCRIPTION = Open implementation of the lotus sametime community client +define BLURB + The Meanwhile project is an open implementation of the Lotus Sametime client protocol. The project provides a library written in C, a python module, and a Gaim plugin utilizing the library. +endef + +MASTER_SITES = $(SF_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWmeanwhile,depend prototype) +PATCHFILES += ft_fix.patch +PATCHFILES += presence_fix_v2.patch +PATCHFILES += status_timestamp_workaround.patch +PATCHFILES += doc_dir.patch + +#No tests +TEST_SCRIPTS = + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/meanwhile/trunk/checksums =================================================================== --- csw/mgar/pkg/meanwhile/trunk/checksums (rev 0) +++ csw/mgar/pkg/meanwhile/trunk/checksums 2008-12-29 21:25:20 UTC (rev 2709) @@ -0,0 +1,8 @@ +bf4ced109a367b4c5d71fe63c043270e download/meanwhile-1.0.2.tar.gz +5a1ed24a8d6778dcf79373a6b5d512db download/CSWmeanwhile.depend +16c8ea92ec1e7d763ab92aab8f7f6559 download/CSWmeanwhile.gspec +5d4bb9c3a21bec7f9eefa14db1bc1c03 download/CSWmeanwhile.prototype +85017081328f7ddd4968f6f6f18a55ec download/ft_fix.patch +7637b2f7dfe8ec2516dd6aa5f66d90c6 download/presence_fix_v2.patch +692c92e2a4e099b27a83667009e430f5 download/status_timestamp_workaround.patch +c1fdb077407e627ae8ed9b726f5b07ef download/doc_dir.patch Added: csw/mgar/pkg/meanwhile/trunk/files/CSWmeanwhile.depend =================================================================== --- csw/mgar/pkg/meanwhile/trunk/files/CSWmeanwhile.depend (rev 0) +++ csw/mgar/pkg/meanwhile/trunk/files/CSWmeanwhile.depend 2008-12-29 21:25:20 UTC (rev 2709) @@ -0,0 +1,5 @@ +P CSWggettext ggettext - GNU gettext +P CSWiconv libiconv - GNU iconv library +P CSWsunmath libsunmath - Sun maths library +P CSWglib2 glib2 - The low-level core lib for GNOME and GTK+ +P CSWgcc3corert gcc3corert - GNU C Compiler Run Time Added: csw/mgar/pkg/meanwhile/trunk/files/CSWmeanwhile.gspec =================================================================== --- csw/mgar/pkg/meanwhile/trunk/files/CSWmeanwhile.gspec (rev 0) +++ csw/mgar/pkg/meanwhile/trunk/files/CSWmeanwhile.gspec 2008-12-29 21:25:20 UTC (rev 2709) @@ -0,0 +1,4 @@ +%var bitname meanwhile +%var pkgname CSWmeanwhile +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKSRC}/LICENSE Added: csw/mgar/pkg/meanwhile/trunk/files/CSWmeanwhile.prototype =================================================================== --- csw/mgar/pkg/meanwhile/trunk/files/CSWmeanwhile.prototype (rev 0) +++ csw/mgar/pkg/meanwhile/trunk/files/CSWmeanwhile.prototype 2008-12-29 21:25:20 UTC (rev 2709) @@ -0,0 +1,278 @@ +d none /opt/csw/include 0755 root bin +d none /opt/csw/include/meanwhile 0755 root bin +f none /opt/csw/include/meanwhile/mw_message.h 0644 root bin +f none /opt/csw/include/meanwhile/mw_srvc_dir.h 0644 root bin +f none /opt/csw/include/meanwhile/mw_common.h 0644 root bin +f none /opt/csw/include/meanwhile/mw_error.h 0644 root bin +f none /opt/csw/include/meanwhile/mw_channel.h 0644 root bin +f none /opt/csw/include/meanwhile/mw_st_list.h 0644 root bin +f none /opt/csw/include/meanwhile/mw_session.h 0644 root bin +f none /opt/csw/include/meanwhile/mw_srvc_resolve.h 0644 root bin +f none /opt/csw/include/meanwhile/mw_srvc_place.h 0644 root bin +f none /opt/csw/include/meanwhile/mw_srvc_im.h 0644 root bin +f none /opt/csw/include/meanwhile/mw_srvc_aware.h 0644 root bin +f none /opt/csw/include/meanwhile/mw_service.h 0644 root bin +f none /opt/csw/include/meanwhile/mw_srvc_ft.h 0644 root bin +f none /opt/csw/include/meanwhile/mw_cipher.h 0644 root bin +f none /opt/csw/include/meanwhile/mw_srvc_store.h 0644 root bin +f none /opt/csw/include/meanwhile/mw_srvc_conf.h 0644 root bin +d none /opt/csw/share 0755 root bin +d none /opt/csw/share/doc 0755 root bin +d none /opt/csw/share/doc/meanwhile 0755 root bin +d none /opt/csw/share/doc/meanwhile/html 0755 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__srvc__store_8h-source.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__channel_8h.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_0x70.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_0x6c.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/todo.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_0x68.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwDirectoryMember.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__srvc__aware_8h.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwDirectoryHandler.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwAwareList.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwMsgChannelSend.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_0x74.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__util_8h-source.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwUserStatus.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__st__list_8h-source.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwCipherInstance.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__error_8h-source.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwServiceAware.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmw__datum.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwChannel.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwMsgAnnounce.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwServiceFileTransfer.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwConference.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_type.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwFileTransferHandler.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwConversation.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_0x64.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwServiceIm.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwUserItem.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwMsgHandshakeAck.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwSametimeUser.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/pages.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__srvc__store_8h.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_func.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwMsgHandshake.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwService.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwServicePlace.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__srvc__resolve_8h-source.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__cipher_8h.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__channel_8h-source.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__debug_8h.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_0x61.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwMsgLoginContinue.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__srvc__dir_8h-source.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwGetBuffer.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__session_8h-source.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwAddressBook.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__session_8h.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwStorage.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_0x65.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwEncryptAccept.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwAwareSnapshot.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__srvc__resolve_8h.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwServiceDirectory.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/doxygen.png 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwMsgSetPrivacyList.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/tab_r.gif 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__error_8h.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwPutBuffer.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwMsgLoginAck.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__service_8h-source.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwMsgAdmin.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwAwareHandler.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwEncryptItem.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/doxygen.css 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_0x6b.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__srvc__conf_8h.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_0x69.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwFileTransfer.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwChannelSet.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwCipher.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_0x75.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/files.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwImHandler.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__util_8h.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwIdBlock.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__srvc__im_8h.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwConferenceHandler.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwMsgSenseService.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/classes.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_0x63.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__srvc__ft_8h-source.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwSession.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__cipher_8h-source.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_defs.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_0x67.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwMsgChannelCreate.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwMessage.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_eval.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__srvc__conf_8h-source.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwServiceConference.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_0x73.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__srvc__im_8h-source.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwMsgChannelDestroy.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwEncryptOffer.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/functions_rela.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__common_8h.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__service_8h.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_0x77.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwDirectory.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwAwareAttribute.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/annotated.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__message_8h-source.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwResolveMatch.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwMsgChannelAccept.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwMsgLoginRedirect.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_0x6d.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/functions.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwAwareListHandler.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwPlaceHandler.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/functions_vars.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwMsgSetUserStatus.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/tab_l.gif 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwSametimeList.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_0x72.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_func_0x6d.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__srvc__place_8h-source.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwPlace.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/index.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/tab_b.gif 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwLoginInfo.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwOpaque.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_0x76.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwMsgLogin.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwMpi.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_enum.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__srvc__dir_8h.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_0x6e.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwAwareIdBlock.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/tabs.css 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_0x62.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwPrivacyInfo.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__common_8h-source.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwServiceStorage.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__srvc__place_8h.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwServiceResolve.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__srvc__aware_8h-source.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__srvc__ft_8h.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwSametimeGroup.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__st__list_8h.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/globals_0x66.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__debug_8h-source.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwResolveResult.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/mw__message_8h.html 0644 root bin +f none /opt/csw/share/doc/meanwhile/html/structmwSessionHandler.html 0644 root bin +d none /opt/csw/share/doc/meanwhile/latex 0755 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwConference.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwResolveResult.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwSametimeUser.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwIdBlock.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/mw__channel_8h.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/mw__srvc__store_8h.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwMsgAnnounce.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwSession.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/files.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwMsgLoginContinue.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwPlace.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/mw__common_8h.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwMsgChannelCreate.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwConferenceHandler.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/mw__cipher_8h.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwCipherInstance.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwMsgAdmin.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwDirectory.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/annotated.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/mw__srvc__resolve_8h.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwMpi.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/Makefile 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwMsgHandshake.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/mw__srvc__conf_8h.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwServiceStorage.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwAwareSnapshot.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwMsgLoginAck.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/mw__error_8h.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwService.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwDirectoryHandler.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwUserStatus.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwServiceConference.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwUserItem.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwSametimeList.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwDirectoryMember.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwPlaceHandler.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwServiceAware.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/mw__srvc__place_8h.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwFileTransfer.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwChannelSet.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/todo.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/mw__session_8h.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwAwareListHandler.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwFileTransferHandler.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwPutBuffer.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/FreeSans.ttf 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwMsgSetUserStatus.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwEncryptOffer.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwMsgSenseService.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/mw__util_8h.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/mw__srvc__ft_8h.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/mw__srvc__dir_8h.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/pages.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwLoginInfo.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwCipher.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwSametimeGroup.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/mw__message_8h.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwConversation.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwSessionHandler.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwMsgChannelSend.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwMsgSetPrivacyList.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwPrivacyInfo.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/mw__debug_8h.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/refman.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwOpaque.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwMsgChannelDestroy.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/mw__st__list_8h.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwAwareList.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwServiceDirectory.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwMsgLoginRedirect.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwImHandler.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/mw__srvc__aware_8h.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwServiceFileTransfer.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwChannel.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwResolveMatch.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwAwareHandler.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/mw__service_8h.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwMessage.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/mw__srvc__im_8h.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwAwareAttribute.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwMsgHandshakeAck.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwAwareIdBlock.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwEncryptAccept.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwEncryptItem.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/doxygen.sty 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwGetBuffer.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwStorage.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwAddressBook.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwServiceIm.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwServicePlace.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmw__datum.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwServiceResolve.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwMsgChannelAccept.tex 0644 root bin +f none /opt/csw/share/doc/meanwhile/latex/structmwMsgLogin.tex 0644 root bin +d none /opt/csw/share/doc/meanwhile/samples 0755 root bin +f none /opt/csw/share/doc/meanwhile/samples/nocipher_proxy.c 0644 root bin +f none /opt/csw/share/doc/meanwhile/samples/login_server.c 0644 root bin +f none /opt/csw/share/doc/meanwhile/samples/sendmessage.c 0644 root bin +f none /opt/csw/share/doc/meanwhile/samples/redirect_server.c 0644 root bin +f none /opt/csw/share/doc/meanwhile/samples/socket.c 0644 root bin +f none /opt/csw/share/doc/meanwhile/samples/build 0755 root bin +f none /opt/csw/share/doc/meanwhile/samples/README 0644 root bin +f none /opt/csw/share/doc/meanwhile/samples/logging_proxy.c 0644 root bin +d none /opt/csw/lib 0755 root bin +s none /opt/csw/lib/libmeanwhile.so=libmeanwhile.so.1.0.2 +f none /opt/csw/lib/libmeanwhile.so.1.0.2 0755 root bin +s none /opt/csw/lib/libmeanwhile.so.1=libmeanwhile.so.1.0.2 +d none /opt/csw/lib/pkgconfig 0755 root bin +f none /opt/csw/lib/pkgconfig/meanwhile.pc 0644 root bin Added: csw/mgar/pkg/meanwhile/trunk/files/doc_dir.patch =================================================================== --- csw/mgar/pkg/meanwhile/trunk/files/doc_dir.patch (rev 0) +++ csw/mgar/pkg/meanwhile/trunk/files/doc_dir.patch 2008-12-29 21:25:20 UTC (rev 2709) @@ -0,0 +1,68 @@ +diff -rud meanwhile-1.0.2.o/doc/Makefile.am meanwhile-1.0.2/doc/Makefile.am +--- meanwhile-1.0.2.o/doc/Makefile.am 2005-10-28 21:22:38.000000000 -0500 ++++ meanwhile-1.0.2/doc/Makefile.am 2008-12-29 13:37:18.400083313 -0600 +@@ -5,10 +5,10 @@ + if ENABLE_DOXYGEN + + htmldoc_DATA = html/* +-htmldocdir = $(datadir)/doc/@PACKAGE at -doc-@VERSION@/html ++htmldocdir = $(datadir)/doc/@PACKAGE@/html + + latexdoc_DATA = latex/* +-latexdocdir = $(datadir)/doc/@PACKAGE at -doc-@VERSION@/latex ++latexdocdir = $(datadir)/doc/@PACKAGE@@/latex + + docdata = $(htmldoc_DATA) $(latexdoc_DATA) + +diff -rud meanwhile-1.0.2.o/doc/Makefile.in meanwhile-1.0.2/doc/Makefile.in +--- meanwhile-1.0.2.o/doc/Makefile.in 2005-12-29 19:55:16.000000000 -0600 ++++ meanwhile-1.0.2/doc/Makefile.in 2008-12-29 13:37:18.398638856 -0600 +@@ -172,9 +172,9 @@ + target_alias = @target_alias@ + noinst_DATA = Doxyfile + @ENABLE_DOXYGEN_TRUE at htmldoc_DATA = html/* +- at ENABLE_DOXYGEN_TRUE@htmldocdir = $(datadir)/doc/@PACKAGE at -doc-@VERSION@/html ++ at ENABLE_DOXYGEN_TRUE@htmldocdir = $(datadir)/doc/@PACKAGE@/html + @ENABLE_DOXYGEN_TRUE at latexdoc_DATA = latex/* +- at ENABLE_DOXYGEN_TRUE@latexdocdir = $(datadir)/doc/@PACKAGE at -doc-@VERSION@/latex ++ at ENABLE_DOXYGEN_TRUE@latexdocdir = $(datadir)/doc/@PACKAGE@/latex + @ENABLE_DOXYGEN_TRUE at docdata = $(htmldoc_DATA) $(latexdoc_DATA) + all: all-am + +diff -rud meanwhile-1.0.2.o/meanwhile.spec.in meanwhile-1.0.2/meanwhile.spec.in +--- meanwhile-1.0.2.o/meanwhile.spec.in 2005-12-29 20:05:55.000000000 -0600 ++++ meanwhile-1.0.2/meanwhile.spec.in 2008-12-29 13:33:36.734731451 -0600 +@@ -89,7 +89,7 @@ + + %files doc + %defattr(-,root,root,-) +-%{_datadir}/doc/%{name}-doc-%{version}/ ++%{_datadir}/doc/%{name}/ + %endif + + +diff -rud meanwhile-1.0.2.o/samples/Makefile.am meanwhile-1.0.2/samples/Makefile.am +--- meanwhile-1.0.2.o/samples/Makefile.am 2008-12-29 13:59:26.003161765 -0600 ++++ meanwhile-1.0.2/samples/Makefile.am 2008-12-29 14:00:22.451646848 -0600 +@@ -19,7 +19,7 @@ + $(SAMPLES_SRC) + + +-sampledir = $(datadir)/doc/@PACKAGE at -doc-@VERSION@/samples ++sampledir = $(datadir)/doc/@PACKAGE@/samples + + + EXTRA_DIST = $(sample_DATA) $(sample_SCRIPTS) + +diff -rud meanwhile-1.0.2.o/samples/Makefile.in meanwhile-1.0.2/samples/Makefile.in +--- meanwhile-1.0.2.o/samples/Makefile.in 2008-12-29 14:03:42.998631273 -0600 ++++ meanwhile-1.0.2/samples/Makefile.in 2008-12-29 14:04:01.256144581 -0600 +@@ -188,7 +188,7 @@ + README \ + $(SAMPLES_SRC) + +-sampledir = $(datadir)/doc/@PACKAGE at -doc-@VERSION@/samples ++sampledir = $(datadir)/doc/@PACKAGE@/samples + EXTRA_DIST = $(sample_DATA) $(sample_SCRIPTS) + all: all-am + Added: csw/mgar/pkg/meanwhile/trunk/files/ft_fix.patch =================================================================== --- csw/mgar/pkg/meanwhile/trunk/files/ft_fix.patch (rev 0) +++ csw/mgar/pkg/meanwhile/trunk/files/ft_fix.patch 2008-12-29 21:25:20 UTC (rev 2709) @@ -0,0 +1,21 @@ +# User Mikael Berthe +# Date 1194544713 -3600 +Fix file transfers with recent Sametime servers + +It seems that the last guint32_get() fails when Meanwhile receives +the FT offer. +I think we can skip it -- works for me but I can't check it with an +older server. + +diff -r 4aabc56c0e5f src/srvc_ft.c +--- a/src/srvc_ft.c Tue Nov 06 11:46:26 2007 +0100 ++++ b/src/srvc_ft.c Thu Nov 08 18:58:33 2007 +0100 +@@ -142,7 +142,7 @@ static void recv_channelCreate(struct mw + mwString_get(b, &fnm); /* offered filename */ + mwString_get(b, &txt); /* offering message */ + guint32_get(b, &size); /* size of offered file */ +- guint32_get(b, &junk); /* unknown */ ++ /* guint32_get(b, &junk); */ /* unknown */ + /* and we just skip an unknown guint16 at the end */ + + b_err = mwGetBuffer_error(b); Added: csw/mgar/pkg/meanwhile/trunk/files/presence_fix_v2.patch =================================================================== --- csw/mgar/pkg/meanwhile/trunk/files/presence_fix_v2.patch (rev 0) +++ csw/mgar/pkg/meanwhile/trunk/files/presence_fix_v2.patch 2008-12-29 21:25:20 UTC (rev 2709) @@ -0,0 +1,41 @@ +# User Mikael Berthe +# Date 1194208892 -3600 +Fix Awareness Snapshots with recent Sametime servers + +With recent Sametime servers there seem to be 2 bytes +after the Snapshot Message Blocks. +This patch tries to use the end of block offset provided +by the server. + +diff -r be8d8f1d3ebc src/common.c +--- a/src/common.c Sun Nov 04 18:48:00 2007 +0100 ++++ b/src/common.c Tue Nov 06 11:46:26 2007 +0100 +@@ -878,23 +878,24 @@ gboolean mwAwareIdBlock_equal(const stru + /* 8.4.2.4 Snapshot */ + + void mwAwareSnapshot_get(struct mwGetBuffer *b, struct mwAwareSnapshot *idb) { +- guint32 junk; +- char *empty = NULL; ++ guint32 end_of_block; + + g_return_if_fail(b != NULL); + g_return_if_fail(idb != NULL); + +- guint32_get(b, &junk); ++ guint32_get(b, &end_of_block); + mwAwareIdBlock_get(b, &idb->id); + mwString_get(b, &idb->group); + gboolean_get(b, &idb->online); +- +- g_free(empty); + + if(idb->online) { + mwString_get(b, &idb->alt_id); + mwUserStatus_get(b, &idb->status); + mwString_get(b, &idb->name); ++ } ++ ++ if( b->ptr < b->buf + end_of_block ) { ++ mwGetBuffer_advance(b, b->buf + end_of_block - b->ptr); + } + } Added: csw/mgar/pkg/meanwhile/trunk/files/status_timestamp_workaround.patch =================================================================== --- csw/mgar/pkg/meanwhile/trunk/files/status_timestamp_workaround.patch (rev 0) +++ csw/mgar/pkg/meanwhile/trunk/files/status_timestamp_workaround.patch 2008-12-29 21:25:20 UTC (rev 2709) @@ -0,0 +1,19 @@ +# User Mikael Berthe +# Date 1195749751 -3600 +Fix Awareness status timestamps with recent Sametime clients + +For some reason the status timestamps I receive from people with a recent +Sametime client make no sense. This patch simply sets the timestamp to 0, +as I have no idea how to interpret these time values. + +diff -r 17977a4e7da1 -r e7601af90b31 src/common.c +--- a/src/common.c Thu Nov 08 18:58:33 2007 +0100 ++++ b/src/common.c Thu Nov 22 17:42:31 2007 +0100 +@@ -688,6 +688,9 @@ void mwUserStatus_get(struct mwGetBuffer + guint16_get(b, &stat->status); + guint32_get(b, &stat->time); + mwString_get(b, &stat->desc); ++ ++ // Quick'n ugly hack for recent Sametime clients ++ stat->time = 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 Dec 30 05:28:52 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 30 Dec 2008 04:28:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[2710] csw/mgar/pkg Message-ID: Revision: 2710 http://gar.svn.sourceforge.net/gar/?rev=2710&view=rev Author: bdwalton Date: 2008-12-30 04:28:48 +0000 (Tue, 30 Dec 2008) Log Message: ----------- docbook dsssl stub Added Paths: ----------- csw/mgar/pkg/docbook-style-dsssl/ csw/mgar/pkg/docbook-style-dsssl/branches/ csw/mgar/pkg/docbook-style-dsssl/tags/ csw/mgar/pkg/docbook-style-dsssl/trunk/ csw/mgar/pkg/docbook-style-dsssl/trunk/Makefile csw/mgar/pkg/docbook-style-dsssl/trunk/files/ csw/mgar/pkg/docbook-style-dsssl/trunk/files/CSWdocbookdsssl.gspec Property changes on: csw/mgar/pkg/docbook-style-dsssl/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/docbook-style-dsssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/docbook-style-dsssl/trunk/Makefile (rev 0) +++ csw/mgar/pkg/docbook-style-dsssl/trunk/Makefile 2008-12-30 04:28:48 UTC (rev 2710) @@ -0,0 +1,34 @@ +GARNAME = docbookdsssl +GARVERSION = 1.79 +PATCHLEVEL = 4.1 +CATEGORIES = xtra + +DESCRIPTION = Norman Walsh's modular stylesheets for DocBook +define BLURB +These DSSSL stylesheets allow to convert any DocBook document to another +printed (for example, RTF or PostScript) or online (for example, HTML) +format. They are highly customizable. +endef + +SF_PROJ = docbook +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = docbook-dsssl-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWdocbookdsssl,) + +REQUIRED_PKGS = CSWdocbookdtds CSWsgmlcommon CSWopenjade + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +#nothing to configure or test +CONFIGURE_SCRIPTS = +TEST_SCRIPTS = + +BUILD_ARGS = DESTDIR=$(DESTDIR) VERSION=$(GARVERSION)-$(PATCHLEVEL) +BUILD_ARGS += bindir=$(bindir) datadir=$(datadir) + +include gar/category.mk Added: csw/mgar/pkg/docbook-style-dsssl/trunk/files/CSWdocbookdsssl.gspec =================================================================== --- csw/mgar/pkg/docbook-style-dsssl/trunk/files/CSWdocbookdsssl.gspec (rev 0) +++ csw/mgar/pkg/docbook-style-dsssl/trunk/files/CSWdocbookdsssl.gspec 2008-12-30 04:28:48 UTC (rev 2710) @@ -0,0 +1,4 @@ +%var bitname docbookdsssl +%var pkgname CSWdocbookdsssl +%include url file://%{PKGLIB}/csw_dyndepend.gspec + 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 Dec 30 05:35:25 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 30 Dec 2008 04:35:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[2711] csw/mgar/pkg/docbook-style-dsssl/trunk Message-ID: Revision: 2711 http://gar.svn.sourceforge.net/gar/?rev=2711&view=rev Author: bdwalton Date: 2008-12-30 04:35:22 +0000 (Tue, 30 Dec 2008) Log Message: ----------- revert to gar1 (temporary); add checksums Added Paths: ----------- csw/mgar/pkg/docbook-style-dsssl/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/docbook-style-dsssl/trunk/ Property changes on: csw/mgar/pkg/docbook-style-dsssl/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 Added: csw/mgar/pkg/docbook-style-dsssl/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-style-dsssl/trunk/checksums (rev 0) +++ csw/mgar/pkg/docbook-style-dsssl/trunk/checksums 2008-12-30 04:35:22 UTC (rev 2711) @@ -0,0 +1,2 @@ +8459913bbd8a5724a6fe4b9ed5bab5af download/docbook-dsssl-1.79.tar.gz +a5f6d634639ce7d3259c07d0a68734da download/CSWdocbookdsssl.gspec 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 Dec 30 05:37:44 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 30 Dec 2008 04:37:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[2712] csw/mgar/pkg/docbook-style-dsssl/trunk/ Message-ID: Revision: 2712 http://gar.svn.sourceforge.net/gar/?rev=2712&view=rev Author: bdwalton Date: 2008-12-30 04:37:44 +0000 (Tue, 30 Dec 2008) Log Message: ----------- back to gar2 Property Changed: ---------------- csw/mgar/pkg/docbook-style-dsssl/trunk/ Property changes on: csw/mgar/pkg/docbook-style-dsssl/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Tue Dec 30 18:06:57 2008 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Tue, 30 Dec 2008 17:06:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[2713] csw/mgar/pkg Message-ID: Revision: 2713 http://gar.svn.sourceforge.net/gar/?rev=2713&view=rev Author: harpchad Date: 2008-12-30 17:06:57 +0000 (Tue, 30 Dec 2008) Log Message: ----------- Add gar profile for libgadu Added Paths: ----------- csw/mgar/pkg/libgadu/ csw/mgar/pkg/libgadu/branches/ csw/mgar/pkg/libgadu/tags/ csw/mgar/pkg/libgadu/trunk/ csw/mgar/pkg/libgadu/trunk/Makefile csw/mgar/pkg/libgadu/trunk/checksums csw/mgar/pkg/libgadu/trunk/files/ csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.depend csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.gspec csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.prototype Property changes on: csw/mgar/pkg/libgadu/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 Added: csw/mgar/pkg/libgadu/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgadu/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libgadu/trunk/Makefile 2008-12-30 17:06:57 UTC (rev 2713) @@ -0,0 +1,27 @@ +GARNAME = libgadu +GARVERSION = 1.8.2 +CATEGORIES = lib +SPKG_SOURCEURL = http://toxygen.net/libgadu + +#Need to use either gcc or studio 12 with -features=extensions +GARCOMPILER = GNU + +DESCRIPTION = Gadu-Gadu protocol implementation library + +MASTER_SITES = http://toxygen.net/libgadu/files/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWlibgadu,depend prototype) + +#No tests +TEST_SCRIPTS = + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/libgadu/trunk/checksums =================================================================== --- csw/mgar/pkg/libgadu/trunk/checksums (rev 0) +++ csw/mgar/pkg/libgadu/trunk/checksums 2008-12-30 17:06:57 UTC (rev 2713) @@ -0,0 +1,4 @@ +f64d4d0222c7adf37aed7a8ef98059a7 download/CSWlibgadu.depend +c5145da14173d6e111f8b45ef8510f3a download/CSWlibgadu.gspec +dff83971a51fe7177617fb3dbc749757 download/CSWlibgadu.prototype +1090f82f8a1bb99e9cdf5853188f625f download/libgadu-1.8.2.tar.gz Added: csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.depend =================================================================== --- csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.depend (rev 0) +++ csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.depend 2008-12-30 17:06:57 UTC (rev 2713) @@ -0,0 +1,2 @@ +P CSWosslrt openssl_rt - Openssl runtime libraries +P CSWgcc3corert gcc3corert - GNU C Compiler Run Time Added: csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.gspec =================================================================== --- csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.gspec (rev 0) +++ csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.gspec 2008-12-30 17:06:57 UTC (rev 2713) @@ -0,0 +1,4 @@ +%var bitname libgadu +%var pkgname CSWlibgadu +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKSRC}/COPYING Added: csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.prototype =================================================================== --- csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.prototype (rev 0) +++ csw/mgar/pkg/libgadu/trunk/files/CSWlibgadu.prototype 2008-12-30 17:06:57 UTC (rev 2713) @@ -0,0 +1,8 @@ +d none /opt/csw/lib 0755 root bin +d none /opt/csw/lib/pkgconfig 0755 root bin +f none /opt/csw/lib/pkgconfig/libgadu.pc 0644 root bin +s none /opt/csw/lib/libgadu.so.3=libgadu.so.3.9.0 +f none /opt/csw/lib/libgadu.so.3.9.0 0755 root bin +s none /opt/csw/lib/libgadu.so=libgadu.so.3.9.0 +d none /opt/csw/include 0755 root bin +f none /opt/csw/include/libgadu.h 0644 root bin 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 Dec 30 19:55:26 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 30 Dec 2008 18:55:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[2714] csw/mgar/pkg/docbook-style-dsssl/trunk Message-ID: Revision: 2714 http://gar.svn.sourceforge.net/gar/?rev=2714&view=rev Author: bdwalton Date: 2008-12-30 18:55:26 +0000 (Tue, 30 Dec 2008) Log Message: ----------- install works; set arch=all; patch in a Makefile to install files Modified Paths: -------------- csw/mgar/pkg/docbook-style-dsssl/trunk/Makefile csw/mgar/pkg/docbook-style-dsssl/trunk/checksums csw/mgar/pkg/docbook-style-dsssl/trunk/files/CSWdocbookdsssl.gspec Added Paths: ----------- csw/mgar/pkg/docbook-style-dsssl/trunk/files/add_makefile.patch Modified: csw/mgar/pkg/docbook-style-dsssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/docbook-style-dsssl/trunk/Makefile 2008-12-30 17:06:57 UTC (rev 2713) +++ csw/mgar/pkg/docbook-style-dsssl/trunk/Makefile 2008-12-30 18:55:26 UTC (rev 2714) @@ -14,6 +14,7 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = docbook-dsssl-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWdocbookdsssl,) +PATCHFILES = add_makefile.patch REQUIRED_PKGS = CSWdocbookdtds CSWsgmlcommon CSWopenjade @@ -24,11 +25,23 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = +tar-gz-extract-docbook-dsssl-$(GARVERSION).tar.gz: + @echo " ==> Extracting $(DOWNLOADDIR)/docbook-dsssl-$(GARVERSION).tar.gz" + @mkdir -p $(WORKSRC) + gzip -dc $(DOWNLOADDIR)/docbook-dsssl-$(GARVERSION).tar.gz | gtar $(TAR_ARGS) -xf - -C $(WORKSRC) --strip-components 1 + @$(MAKECOOKIE) + #nothing to configure or test CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = TEST_SCRIPTS = -BUILD_ARGS = DESTDIR=$(DESTDIR) VERSION=$(GARVERSION)-$(PATCHLEVEL) -BUILD_ARGS += bindir=$(bindir) datadir=$(datadir) +INSTALL_ARGS = DESTDIR=$(DESTDIR) VERSION=$(GARVERSION) +INSTALL_ARGS += bindir=$(bindir) datadir=$(datadir) +post-install-modulated: + @echo "Symlinking dsssl-stylesheets" + @(cd $(INSTALLISADIR)/$(datadir)/sgml/docbook; \ + ln -s dsssl-stylesheets-$(GARVERSION) dsssl-stylesheets ) + include gar/category.mk Modified: csw/mgar/pkg/docbook-style-dsssl/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-style-dsssl/trunk/checksums 2008-12-30 17:06:57 UTC (rev 2713) +++ csw/mgar/pkg/docbook-style-dsssl/trunk/checksums 2008-12-30 18:55:26 UTC (rev 2714) @@ -1,2 +1,3 @@ 8459913bbd8a5724a6fe4b9ed5bab5af download/docbook-dsssl-1.79.tar.gz -a5f6d634639ce7d3259c07d0a68734da download/CSWdocbookdsssl.gspec +02510cf81c864e00a76bcda6c479341b download/CSWdocbookdsssl.gspec +08e9e44df56f41c8f5f700114fe69b58 download/add_makefile.patch Modified: csw/mgar/pkg/docbook-style-dsssl/trunk/files/CSWdocbookdsssl.gspec =================================================================== --- csw/mgar/pkg/docbook-style-dsssl/trunk/files/CSWdocbookdsssl.gspec 2008-12-30 17:06:57 UTC (rev 2713) +++ csw/mgar/pkg/docbook-style-dsssl/trunk/files/CSWdocbookdsssl.gspec 2008-12-30 18:55:26 UTC (rev 2714) @@ -1,4 +1,5 @@ %var bitname docbookdsssl %var pkgname CSWdocbookdsssl +%var arch all %include url file://%{PKGLIB}/csw_dyndepend.gspec Added: csw/mgar/pkg/docbook-style-dsssl/trunk/files/add_makefile.patch =================================================================== --- csw/mgar/pkg/docbook-style-dsssl/trunk/files/add_makefile.patch (rev 0) +++ csw/mgar/pkg/docbook-style-dsssl/trunk/files/add_makefile.patch 2008-12-30 18:55:26 UTC (rev 2714) @@ -0,0 +1,55 @@ +--- /dev/null 2008-12-30 05:37:09.000000000 +0100 ++++ docbook-dsssl-1.79/Makefile 2008-12-30 05:40:27.256449575 +0100 +@@ -0,0 +1,52 @@ ++BINDIR = $(DESTDIR)/$(bindir) ++DEST = $(DESTDIR)/$(datadir)/sgml/docbook/dsssl-stylesheets-$(VERSION) ++DOCS = $(DESTDIR)/$(datadir)/doc/docbookdsssl-$(VERSION) ++ ++INSTALLDATA = ginstall -c -m 0644 ++INSTALLDIR = ginstall -c -m 0755 -d ++ ++all: install ++ ++install: install-bin install-dtd install-dsl install-img install-misc install-doc ++ ++install-doc: ++ $(INSTALLDIR) $(DOCS) ++ $(INSTALLDATA) BUGS ChangeLog README WhatsNew $(DOCS) ++ ++install-bin: ++ $(INSTALLDIR) $(BINDIR) ++ $(INSTALLDATA) bin/collateindex.pl $(BINDIR) ++ chmod 755 $(BINDIR)/* ++ ++install-dtd: ++ for d in decls dbdsssl html imagelib olink; do \ ++ $(INSTALLDIR) $(DEST)/dtds/$$d; \ ++ done ++ $(INSTALLDATA) dtds/decls/docbook.dcl $(DEST)/dtds/decls ++ $(INSTALLDATA) dtds/decls/xml.dcl $(DEST)/dtds/decls ++ $(INSTALLDATA) dtds/dbdsssl/dbdsssl.dtd $(DEST)/dtds/dbdsssl ++ $(INSTALLDATA) dtds/html/dbhtml.dtd $(DEST)/dtds/html ++ $(INSTALLDATA) dtds/html/ISOlat1.gml $(DEST)/dtds/html ++ $(INSTALLDATA) dtds/imagelib/imagelib.dtd $(DEST)/dtds/imagelib ++ $(INSTALLDATA) dtds/olink/olinksum.dtd $(DEST)/dtds/olink ++ ++install-dsl: ++ @for d in lib common html print olink; do \ ++ $(INSTALLDIR) $(DEST)/$$d; \ ++ done ++ $(INSTALLDATA) lib/dblib.dsl $(DEST)/lib ++ $(INSTALLDATA) common/*.dsl $(DEST)/common ++ $(INSTALLDATA) common/*.ent $(DEST)/common ++ $(INSTALLDATA) html/*.dsl $(DEST)/html ++ $(INSTALLDATA) lib/dblib.dsl $(DEST)/lib ++ $(INSTALLDATA) print/*.dsl $(DEST)/print ++ $(INSTALLDATA) olink/*.dsl $(DEST)/olink ++ ++install-img: ++ $(INSTALLDIR) $(DEST)/images/callouts ++ $(INSTALLDATA) images/*.gif $(DEST)/images ++ $(INSTALLDATA) images/callouts/*.gif $(DEST)/images/callouts ++ ++install-misc: ++ $(INSTALLDATA) catalog $(DEST) ++ $(INSTALLDATA) VERSION $(DEST) 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 Dec 30 20:06:08 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 30 Dec 2008 19:06:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[2715] csw/mgar/pkg/docbook-style-dsssl/trunk Message-ID: Revision: 2715 http://gar.svn.sourceforge.net/gar/?rev=2715&view=rev Author: bdwalton Date: 2008-12-30 19:06:08 +0000 (Tue, 30 Dec 2008) Log Message: ----------- added perl dependency; patch path in script that is installed; install manpage for script Modified Paths: -------------- csw/mgar/pkg/docbook-style-dsssl/trunk/Makefile csw/mgar/pkg/docbook-style-dsssl/trunk/checksums csw/mgar/pkg/docbook-style-dsssl/trunk/files/add_makefile.patch Added Paths: ----------- csw/mgar/pkg/docbook-style-dsssl/trunk/files/fix_perl_path.patch Modified: csw/mgar/pkg/docbook-style-dsssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/docbook-style-dsssl/trunk/Makefile 2008-12-30 18:55:26 UTC (rev 2714) +++ csw/mgar/pkg/docbook-style-dsssl/trunk/Makefile 2008-12-30 19:06:08 UTC (rev 2715) @@ -14,9 +14,9 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = docbook-dsssl-$(GARVERSION).tar.gz DISTFILES += $(call admfiles,CSWdocbookdsssl,) -PATCHFILES = add_makefile.patch +PATCHFILES = add_makefile.patch fix_perl_path.patch -REQUIRED_PKGS = CSWdocbookdtds CSWsgmlcommon CSWopenjade +REQUIRED_PKGS = CSWdocbookdtds CSWsgmlcommon CSWopenjade CSWperl # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz @@ -28,7 +28,7 @@ tar-gz-extract-docbook-dsssl-$(GARVERSION).tar.gz: @echo " ==> Extracting $(DOWNLOADDIR)/docbook-dsssl-$(GARVERSION).tar.gz" @mkdir -p $(WORKSRC) - gzip -dc $(DOWNLOADDIR)/docbook-dsssl-$(GARVERSION).tar.gz | gtar $(TAR_ARGS) -xf - -C $(WORKSRC) --strip-components 1 + @gzip -dc $(DOWNLOADDIR)/docbook-dsssl-$(GARVERSION).tar.gz | gtar $(TAR_ARGS) -xf - -C $(WORKSRC) --strip-components 1 @$(MAKECOOKIE) #nothing to configure or test Modified: csw/mgar/pkg/docbook-style-dsssl/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-style-dsssl/trunk/checksums 2008-12-30 18:55:26 UTC (rev 2714) +++ csw/mgar/pkg/docbook-style-dsssl/trunk/checksums 2008-12-30 19:06:08 UTC (rev 2715) @@ -1,3 +1,4 @@ 8459913bbd8a5724a6fe4b9ed5bab5af download/docbook-dsssl-1.79.tar.gz 02510cf81c864e00a76bcda6c479341b download/CSWdocbookdsssl.gspec -08e9e44df56f41c8f5f700114fe69b58 download/add_makefile.patch +0ef217556ebfc23d51bc90684464dd6e download/add_makefile.patch +bcd9c3faeba3e034152c26b489f2abcc download/fix_perl_path.patch Modified: csw/mgar/pkg/docbook-style-dsssl/trunk/files/add_makefile.patch =================================================================== --- csw/mgar/pkg/docbook-style-dsssl/trunk/files/add_makefile.patch 2008-12-30 18:55:26 UTC (rev 2714) +++ csw/mgar/pkg/docbook-style-dsssl/trunk/files/add_makefile.patch 2008-12-30 19:06:08 UTC (rev 2715) @@ -1,6 +1,6 @@ --- /dev/null 2008-12-30 05:37:09.000000000 +0100 +++ docbook-dsssl-1.79/Makefile 2008-12-30 05:40:27.256449575 +0100 -@@ -0,0 +1,52 @@ +@@ -0,0 +1,54 @@ +BINDIR = $(DESTDIR)/$(bindir) +DEST = $(DESTDIR)/$(datadir)/sgml/docbook/dsssl-stylesheets-$(VERSION) +DOCS = $(DESTDIR)/$(datadir)/doc/docbookdsssl-$(VERSION) @@ -15,6 +15,8 @@ +install-doc: + $(INSTALLDIR) $(DOCS) + $(INSTALLDATA) BUGS ChangeLog README WhatsNew $(DOCS) ++ $(INSTALLDIR) $(DESTDIR)/$(datadir)/man/man1 ++ $(INSTALLDATA) bin/collateindex.pl.1 $(DESTDIR)/$(datadir)/man/man1 + +install-bin: + $(INSTALLDIR) $(BINDIR) Added: csw/mgar/pkg/docbook-style-dsssl/trunk/files/fix_perl_path.patch =================================================================== --- csw/mgar/pkg/docbook-style-dsssl/trunk/files/fix_perl_path.patch (rev 0) +++ csw/mgar/pkg/docbook-style-dsssl/trunk/files/fix_perl_path.patch 2008-12-30 19:06:08 UTC (rev 2715) @@ -0,0 +1,8 @@ +--- docbookdsssl-1.79/bin/collateindex.pl.orig 2008-12-30 19:56:58.997386933 +0100 ++++ docbookdsssl-1.79/bin/collateindex.pl 2008-12-30 19:57:22.214915722 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -- # -*- Perl -*- ++#!/opt/csw/bin/perl -- # -*- Perl -*- + # + # $Id: collateindex.pl,v 1.10 2004/10/24 17:05:41 petere78 Exp $ + 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 Dec 30 21:59:54 2008 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 30 Dec 2008 20:59:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[2716] csw/mgar/pkg/gtar/trunk Message-ID: Revision: 2716 http://gar.svn.sourceforge.net/gar/?rev=2716&view=rev Author: dmichelsen Date: 2008-12-30 20:59:53 +0000 (Tue, 30 Dec 2008) Log Message: ----------- gtar: Update to 1.21 Modified Paths: -------------- csw/mgar/pkg/gtar/trunk/Makefile csw/mgar/pkg/gtar/trunk/checksums Modified: csw/mgar/pkg/gtar/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtar/trunk/Makefile 2008-12-30 19:06:08 UTC (rev 2715) +++ csw/mgar/pkg/gtar/trunk/Makefile 2008-12-30 20:59:53 UTC (rev 2716) @@ -1,5 +1,5 @@ GARNAME = tar -GARVERSION = 1.20 +GARVERSION = 1.21 CATEGORIES = utils DESCRIPTION = GNU tape archiver Modified: csw/mgar/pkg/gtar/trunk/checksums =================================================================== --- csw/mgar/pkg/gtar/trunk/checksums 2008-12-30 19:06:08 UTC (rev 2715) +++ csw/mgar/pkg/gtar/trunk/checksums 2008-12-30 20:59:53 UTC (rev 2716) @@ -1,3 +1,3 @@ -c1a4ff43157ac60dd4b96dab09a3197c download/tar-1.20.tar.gz +e7ae56b3bf924d5108b57b544b247c50 download/tar-1.21.tar.gz ccf6b6c60769531581e94a45d24283be download/CSWgtar.gspec 5237ff9f4dbe4ec493425d4ffc5fc51a download/CSWgtar.depend This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Tue Dec 30 22:28:28 2008 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Tue, 30 Dec 2008 21:28:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[2717] csw/mgar/pkg Message-ID: Revision: 2717 http://gar.svn.sourceforge.net/gar/?rev=2717&view=rev Author: harpchad Date: 2008-12-30 21:28:28 +0000 (Tue, 30 Dec 2008) Log Message: ----------- Add gar profile for silctoolkit Added Paths: ----------- csw/mgar/pkg/silctoolkit/ csw/mgar/pkg/silctoolkit/branches/ csw/mgar/pkg/silctoolkit/tags/ csw/mgar/pkg/silctoolkit/trunk/ csw/mgar/pkg/silctoolkit/trunk/Makefile csw/mgar/pkg/silctoolkit/trunk/checksums csw/mgar/pkg/silctoolkit/trunk/files/ csw/mgar/pkg/silctoolkit/trunk/files/CSWsilctoolkit.gspec csw/mgar/pkg/silctoolkit/trunk/files/CSWsilctoolkit.prototype csw/mgar/pkg/silctoolkit/trunk/files/function.patch Property changes on: csw/mgar/pkg/silctoolkit/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 Added: csw/mgar/pkg/silctoolkit/trunk/Makefile =================================================================== --- csw/mgar/pkg/silctoolkit/trunk/Makefile (rev 0) +++ csw/mgar/pkg/silctoolkit/trunk/Makefile 2008-12-30 21:28:28 UTC (rev 2717) @@ -0,0 +1,28 @@ +GARNAME = silc-toolkit +GARVERSION = 1.1.8 +CATEGORIES = lib +SPKG_SOURCEURL = http://silcnet.org/software/download/toolkit/ + +DESCRIPTION = secure internet live conferencing toolkit +define BLURB + SILC Project develops the Secure Internet Live Conferencing protocol, which provides secure conferencing services. +endef + +MASTER_SITES = http://silcnet.org/download/toolkit/sources/ +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWsilctoolkit,prototype) +PATCHFILES += function.patch + +#No tests +TEST_SCRIPTS = + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/silctoolkit/trunk/checksums =================================================================== --- csw/mgar/pkg/silctoolkit/trunk/checksums (rev 0) +++ csw/mgar/pkg/silctoolkit/trunk/checksums 2008-12-30 21:28:28 UTC (rev 2717) @@ -0,0 +1,4 @@ +17915a1b0ad602fa31fff47f6bd7471b download/silc-toolkit-1.1.8.tar.gz +de3f8fbb54aacfa9f4f83938601ce676 download/CSWsilctoolkit.gspec +b73e637b218248a68cf955483ddb3085 download/CSWsilctoolkit.prototype +245879ba88f7159d1062e05307de9633 download/function.patch Added: csw/mgar/pkg/silctoolkit/trunk/files/CSWsilctoolkit.gspec =================================================================== --- csw/mgar/pkg/silctoolkit/trunk/files/CSWsilctoolkit.gspec (rev 0) +++ csw/mgar/pkg/silctoolkit/trunk/files/CSWsilctoolkit.gspec 2008-12-30 21:28:28 UTC (rev 2717) @@ -0,0 +1,4 @@ +%var bitname silctoolkit +%var pkgname CSWsilctoolkit +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKSRC}/COPYING Added: csw/mgar/pkg/silctoolkit/trunk/files/CSWsilctoolkit.prototype =================================================================== --- csw/mgar/pkg/silctoolkit/trunk/files/CSWsilctoolkit.prototype (rev 0) +++ csw/mgar/pkg/silctoolkit/trunk/files/CSWsilctoolkit.prototype 2008-12-30 21:28:28 UTC (rev 2717) @@ -0,0 +1,1593 @@ +d none /opt/csw/include 0755 root bin +f none /opt/csw/include/silcmessage_i.h 0644 root bin +f none /opt/csw/include/silcbuffmt.h 0644 root bin +f none /opt/csw/include/silcske_groups.h 0644 root bin +f none /opt/csw/include/silcber.h 0644 root bin +f none /opt/csw/include/silchmac.h 0644 root bin +f none /opt/csw/include/tma_class.h 0644 root bin +f none /opt/csw/include/silcattrs.h 0644 root bin +f none /opt/csw/include/tma_superclass.h 0644 root bin +f none /opt/csw/include/stacktrace.h 0644 root bin +f none /opt/csw/include/silccond.h 0644 root bin +f none /opt/csw/include/silcpubkey.h 0644 root bin +f none /opt/csw/include/silcnet.h 0644 root bin +f none /opt/csw/include/silcske_i.h 0644 root bin +f none /opt/csw/include/silcske.h 0644 root bin +f none /opt/csw/include/silcclient_entry.h 0644 root bin +f none /opt/csw/include/silcatomic.h 0644 root bin +f none /opt/csw/include/silcdlist.h 0644 root bin +f none /opt/csw/include/silcsocketstream.h 0644 root bin +f none /opt/csw/include/silcasn1_i.h 0644 root bin +f none /opt/csw/include/silcmode.h 0644 root bin +f none /opt/csw/include/silcstrutil.h 0644 root bin +f none /opt/csw/include/silcnotify.h 0644 root bin +f none /opt/csw/include/silcstack.h 0644 root bin +f none /opt/csw/include/silcfsm_i.h 0644 root bin +f none /opt/csw/include/silcskr.h 0644 root bin +f none /opt/csw/include/silcmutex.h 0644 root bin +f none /opt/csw/include/silcasync.h 0644 root bin +f none /opt/csw/include/mp_gmp.h 0644 root bin +f none /opt/csw/include/silcske_payload.h 0644 root bin +f none /opt/csw/include/silcidcache.h 0644 root bin +f none /opt/csw/include/silcargument.h 0644 root bin +f none /opt/csw/include/silcschedule.h 0644 root bin +f none /opt/csw/include/silcmime_i.h 0644 root bin +f none /opt/csw/include/silcconfig.h 0644 root bin +f none /opt/csw/include/silccommand.h 0644 root bin +f none /opt/csw/include/tma.h 0644 root bin +f none /opt/csw/include/silcfileutil.h 0644 root bin +f none /opt/csw/include/silcrng.h 0644 root bin +f none /opt/csw/include/silcutf8.h 0644 root bin +f none /opt/csw/include/client.h 0644 root bin +f none /opt/csw/include/silcsimutil.h 0644 root bin +f none /opt/csw/include/silcsim.h 0644 root bin +f none /opt/csw/include/silclog_i.h 0644 root bin +f none /opt/csw/include/silcbuffer.h 0644 root bin +f none /opt/csw/include/silcsocketstream_i.h 0644 root bin +f none /opt/csw/include/silcmemory.h 0644 root bin +f none /opt/csw/include/silcutil.h 0644 root bin +f none /opt/csw/include/silcasync_i.h 0644 root bin +f none /opt/csw/include/silcstringprep.h 0644 root bin +f none /opt/csw/include/silctime.h 0644 root bin +f none /opt/csw/include/silctypes.h 0644 root bin +f none /opt/csw/include/silcversion.h 0644 root bin +f none /opt/csw/include/silcskr_i.h 0644 root bin +f none /opt/csw/include/silcthread.h 0644 root bin +f none /opt/csw/include/silcfdstream.h 0644 root bin +f none /opt/csw/include/silcmp.h 0644 root bin +f none /opt/csw/include/silchttpphp.h 0644 root bin +f none /opt/csw/include/silcnet_i.h 0644 root bin +f none /opt/csw/include/silcmessage.h 0644 root bin +f none /opt/csw/include/silcmime.h 0644 root bin +f none /opt/csw/include/silcasn1.h 0644 root bin +f none /opt/csw/include/silcpk.h 0644 root bin +f none /opt/csw/include/silcclient.h 0644 root bin +f none /opt/csw/include/silcauth.h 0644 root bin +f none /opt/csw/include/silchashtable.h 0644 root bin +f none /opt/csw/include/silcchannel.h 0644 root bin +f none /opt/csw/include/silccipher.h 0644 root bin +f none /opt/csw/include/silc.h 0644 root bin +f none /opt/csw/include/silcid.h 0644 root bin +f none /opt/csw/include/silcsftp.h 0644 root bin +f none /opt/csw/include/silcsftp_fs.h 0644 root bin +f none /opt/csw/include/silchttpserver.h 0644 root bin +f none /opt/csw/include/silcpkcs1.h 0644 root bin +f none /opt/csw/include/silcsnprintf.h 0644 root bin +f none /opt/csw/include/silcschedule_i.h 0644 root bin +f none /opt/csw/include/silcpkcs.h 0644 root bin +f none /opt/csw/include/silclog.h 0644 root bin +f none /opt/csw/include/silcmath.h 0644 root bin +f none /opt/csw/include/mp_tma.h 0644 root bin +f none /opt/csw/include/silcstack_i.h 0644 root bin +f none /opt/csw/include/silcwin32.h 0644 root bin +f none /opt/csw/include/silcvcard.h 0644 root bin +f none /opt/csw/include/silcconnauth.h 0644 root bin +f none /opt/csw/include/silcsymbian.h 0644 root bin +f none /opt/csw/include/silcfsm.h 0644 root bin +f none /opt/csw/include/silcapputil.h 0644 root bin +f none /opt/csw/include/silcpacket.h 0644 root bin +f none /opt/csw/include/silcstatus.h 0644 root bin +f none /opt/csw/include/silclist.h 0644 root bin +f none /opt/csw/include/silchash.h 0644 root bin +f none /opt/csw/include/silcstream.h 0644 root bin +d none /opt/csw/share 0755 root bin +d none /opt/csw/share/doc 0755 root bin +d none /opt/csw/share/doc/silc-toolkit 0755 root bin +f none /opt/csw/share/doc/silc-toolkit/CREDITS 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/draft-riikonen-silc-multimedia-session-00.txt 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/TODO 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/draft-riikonen-silc-flags-payloads-04.txt 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/README.CVS 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/draft-riikonen-silc-spec-09.txt 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/draft-riikonen-silc-pp-09.txt 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/COPYING 0644 root bin +d none /opt/csw/share/doc/silc-toolkit/toolkit 0755 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmutex-silc_mutex_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-silc_hash_fingerprint.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccond-silc_cond_wait.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_inc16.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcClientFileMonitor.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-silc_auth_verify_data.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-SilcGetChannelCallback.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-silc_ske_get_security_properties.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_put_head.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_add_int8.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng_intro.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_command_pending.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfdstream.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_find_set_context.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccommand-SilcCommandPayload.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcdlist-SilcDList.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-SILC_ID_SERVER_COMPARE.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclientlib.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstrutil-silc_base_decode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_thread_init.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccipher-silc_cipher_get_iv.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_verify.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccipher-silc_cipher_register.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-silc_ske_parse_version.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_scopy.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_set_context.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcdlist-silc_dlist_del.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstrutil-silc_strncat.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_hash_string_compare.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_finish.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-silc_schedule_set_notify.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpubkey.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmath-silc_math_prime_test.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_senlarge.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_len.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_set_ui.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpk_i.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-silc_log_reset_callbacks.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcClientConnectionParams.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccond-silc_cond_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcchannel-silc_channel_payload_parse.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-SilcPacketError.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_private_message_wait_init.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconfig-SilcConfigCallback.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SILC_GET32_LSB.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_mp2bin_noalloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclist-silc_list_end.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-silc_attribute_get_data.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-silc_hash_unregister_all.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchttpserver.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_stream_is_udp.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_lstat.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-SilcClientID.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-silc_hash_table_add_ext.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-silc_auth_get_public_data.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutf8-silc_utf8_valid.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_data.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_salloc_size.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmemory-silc_srealloc_ua.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-silc_schedule_task_add_timeout.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmime.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_get_sender.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-SILC_STR_DATA.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_VISIBLE_STRING.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_dec16.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmode-ChannelUserModes.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-SilcFSMThreadStruct.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-silc_schedule_get_context.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-SilcTaskNotifyCb.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasync-SilcAsyncOperation.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_init32.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_get_int8.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng-silc_rng_global_uninit.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp_fs-silc_sftp_fs_memory_add_dir.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_push_tail.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccommand-silc_command_reply_payload_encode_vap.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil-silc_client_chumode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_load_public_key.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske_payload.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng-silc_rng_global_add_noise.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp_fs-silc_sftp_fs_memory_add_file.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccipher-silc_cipher_register_default.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclist-silc_list_init_prev.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcidcache-silc_idcache_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcargument-silc_argument_get_arg_num.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctime-silc_time_generalized_string.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcchannel.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-silc_attribute_payload_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcserver_params-silc_server_params_add_hash.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_get_engine.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcKeyAgreementCallback.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-SILC_ID_CLIENT_COMPARE.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_UNIVERSAL_STRING.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutf8-silc_utf8_encode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng-silc_rng_init.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccommand-silc_command_set_command.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_file_close.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconfig-SilcConfigFile.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-silc_log_set_callback.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_get_username.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp_fs-silc_sftp_fs_memory_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstatus.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_to_upper.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcdlist.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcserver-silc_server_run(1).html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcdlist-silc_dlist_end.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-SilcBufferUnformatFunc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmutex.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccipher-SilcCipher.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SILC_SWAB_32.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-SILC_FSM_EVENT_SIGNAL.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SilcUInt32.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfileutil.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfdstream-silc_fd_stream_create2.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_hash_utf8_compare.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-SilcSKERekeyMaterial.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstream-silc_stream_read.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil-silc_channel_name_verify.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-SilcBufferParamType.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-SilcHashTable.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_stream_set_iv_included.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_pow.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-SilcAtomicPointer.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-SilcAttributeFlags.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil-silc_show_public_key.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcClientMonitorStatus.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-silc_key_agreement_payload_encode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-silc_hash_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclist-silc_list_del.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_set_ids.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconnauth-silc_connauth_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_datalen.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsocketstream-SilcSocketStreamCallback.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-silc_log_set_debug_string.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_stream_is_valid.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstrutil.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-silc_id_id2str.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsocketstream-silc_socket_stream_get_error.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_ref_channel.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcber-silc_ber_encoded_len.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstream-silc_stream_set_notifier.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_perform_key_agreement_stream.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_hash_data_compare.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_stat.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac-SilcHmac.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_unlock_server.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-silc_asn1_init.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasync.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-silc_auth_public_key_auth_verify.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_unref_client.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_mul_2exp.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasync-silc_async_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcserver_params-silc_server_params_add_connparam.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/programming_conv.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SILC_GET16_MSB.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog_i.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmessage_i.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclist-silc_list_insert.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-silc_schedule_uninit.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcber-silc_ber_encode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcdh-silc_dh_compute_public.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng-silc_rng_get_rn16.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnotify-silc_notify_payload_encode_args.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-silc_id_get_len.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_event_init.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfileutil-silc_file_close.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp_fs-silc_sftp_fs_memory_del_file.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcChannelUser.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_client_start.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_realloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcvcard-silc_vcard_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_set_int16.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-silc_hash_table_get.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsocketstream-silc_socket_stream_set_info.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-SilcChannelEntry.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcClientConnectCallback.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcdlist-silc_dlist_init.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-silc_asn1_decode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske_groups-silc_ske_get_supported_groups.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske_payload-silc_ske_payload_ke_encode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-SilcPacketCallbacks.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-SilcSKEKeyMaterial.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_get_clients_whois.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac-silc_hmac_init.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-silc_auth_get_method.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-SilcTask.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmutex-silc_mutex_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm_i.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_public_key_compare.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_get_client_by_id.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac-silc_hmac_update.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-SilcIDPayload.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconnauth.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccond-silc_cond_signal.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_udp_send.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmemory-silc_scalloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-SilcHashForeach.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-silc_asn1_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/box2.gif 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs1.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_attributes_request.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmemory-silc_calloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsocketstream.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-SilcBufferFormatFunc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_sign.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_load_private_key.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-silc_attribute_payload_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchttpphp.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac-silc_hmac_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasync-silc_async_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-silc_schedule_wakeup.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet_i.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmime-silc_mime_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-silc_id_payload_get_data.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmessage-SilcMessageFlags.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-silc_log_flushdelay.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_del_private_message_key.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_set_context.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-silc_log_reset_all.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcserver_params-silc_server_params_set_serverinfo.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconnauth-silc_connauth_get_ske.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_get_channel_resolve.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_extended.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconfig.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-SilcSFTPHandle.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclist-SilcList.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_list_private_message_keys.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_del_channel_private_keys.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SILC_PUT32_LSB.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_alloc_size.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccond-SilcCond.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcAskPassphrase.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_truelen.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng-silc_rng_global_init.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_init.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_hash_public_key_compare.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-SilcServerID.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_wait.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_readlink.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-silc_attribute_payload_encode_data.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcvcard-silc_vcard_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcdlist-silc_dlist_count.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-silc_hash_make.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske_groups.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_BMP_STRING.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasync-silc_async_halt.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_free_private_message_keys.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmath.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpubkey-silc_public_key_payload_encode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-SilcNetResolveCallback.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcargument-silc_argument_get_first_arg.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-SilcAttributeDevice.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsocketstream-silc_socket_tcp_stream_create.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccipher-silc_cipher_get_iv_len.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac-silc_hmac_get_supported.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_to_lower.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_uninit16.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-silc_schedule_task_del_by_all.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_perform_key_agreement.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_set_keys.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcserver_params.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconnauth-silc_connauth_initiator.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_find_set_email.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-SilcAtomic16.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_event_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac-silc_hmac_make_truncated.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccipher-silc_cipher_get_supported.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-silc_buffer_unformat.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/index.tmpl 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_or.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil-silc_create_key_pair.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcidcache-silc_idcache_find_by_context.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac-silc_hmac_unregister_all.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SilcBool.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske_payload-silc_ske_payload_start_decode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctime-silc_time_value.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-SILC_FSM_YIELD.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_stream_destroy.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_gethostbyname_async.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_set_str.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-SILC_ID_GET_ID.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_find_set_realname.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-silc_hash_table_del_by_context.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_END.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcexample-SilcExampleType.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_mul.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-SilcSFTPHandleCallback.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfileutil-silc_file_readfile.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcidcache.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-SILC_FSM_THREAD_WAIT.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-silc_ske_rekey_initiator.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_gcdext.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-silc_key_agreement_get_hostname.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcchannel-silc_channel_get_id_parse.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-SilcSFTPAttributes.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-silc_id_payload_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng-silc_rng_global_get_rn16.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_rmdir.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp_fs-SilcSFTPFSMemoryPerm.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SILC_PTR_TO_32.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcidcache-silc_idcache_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_GEN_TIME.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchttplib.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmessage-silc_message_get_flags.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstrutil-silc_string_match.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_thread_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_add_public_key.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-SilcAuthMethod.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_SET_OF.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcber.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil-silc_channel_name_check.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-silc_ske_get_context.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-SILC_STRFMT_END.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-silc_hash_table_add.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_find_pkcs.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcdh.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_find_add_pkcs_type.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil-silc_load_key_pair.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_NUMERIC_STRING.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutf8-silc_utf8_w2c.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_unregister.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstream-SilcStream.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_unref_server.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_check_host_by_sock.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs1-SilcPkcs1BlockType.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_del_public_key.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_unlock_client.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/index_pic.gif 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-SILC_STR_*_INT.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_set.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-SilcID.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_unicode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmemory.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-SilcIdType.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_send_va.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_add_private_message_key.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstream-SilcStreamOps.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcchannel-silc_channel_get_mode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpk-silc_pkcs_silc_public_key_version.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconfig-silc_config_register.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SILC_PUT16_MSB.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-SilcSKEStatus.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmessage-silc_message_get_mac.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-SILC_ID_CHANNEL_COMPARE.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_pow_ui.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsnprintf-silc_vsnprintf.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_init8.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcPrivateMessageKeys.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-silc_schedule_get_fd_events.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_public_key_copy.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsocketstream_i.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-SilcSFTPErrorCallback.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske_groups-silc_ske_group_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil-silc_get_mode_list.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_del_channel_private_key.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctime-silc_usleep.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnotify-SilcNotifyType.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-silc_auth_public_key_auth_generate_wpub.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_pull_tail.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_push.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmode-SilcUserMode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_clone.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmutex-silc_rwlock_unlock.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccommand-silc_command_set_ident.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-SilcPacketEosCb.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftplib.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-silc_schedule_task_add_signal.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_run.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconfig-silc_config_read_current_line.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_save_private_key.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconfig-SilcConfigErrno.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstringprep-SilcStringprepFlags.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccommand-silc_command_payload_encode_vap.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_mod.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SilcUInt16.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-SilcKeyAgreementPayload.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcClientConnectionStatus.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_write.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_get_str.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_hash_id_compare.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-SilcSKESecurityPropertyFlag.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SILC_SWAB_16.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfdstream-silc_fd_stream_file.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmessage-silc_message_signed_get_public_key.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_SET.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-silc_hash_table_list_reset.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasync-SilcAsyncOperationStruct.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-SilcServerEntry.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-silc_ske_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_mod_2exp.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_send_ext.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcserver_params-silc_server_params_add_cipher.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_public_key_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcserver_params-silc_server_params_serverinfo_alloc(1).html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_is_ip.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-SilcAttributeObjGeo.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchttpphp-silc_http_php.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_fsetstat.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SILC_PTR_TO_64.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_BIT_STRING.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-silc_ske_rekey_responder.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfileutil-silc_file_writefile_mode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_start.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcidcache-SilcIDCacheEntry.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-silc_id_payload_parse.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutf8-silc_utf8_decoded_len.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_unregister_all.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_end.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcchannel-silc_channel_key_get_cipher.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-SilcBufferSUnformatFunc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcvcard-silc_vcard_encode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccipher-silc_cipher_set_key.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcidcache-silc_idcache_del_by_id.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclist-silc_list_init.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-SilcSFTPNameCallback.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcargument-silc_argument_payload_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccommand-silc_command_get_args.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_srealloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-silc_attribute_payload_encode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcaputillib.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_public_key_export.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccipher.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutf8.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnotify-silc_notify_payload_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcexample.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccommand.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-SILC_LOG_DEBUG.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_SEQUENCE.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmime-silc_mime_is_multipart.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconfig-silc_config_close.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpk-SilcSILCPrivateKey.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng-silc_rng_get_rn32.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/platforms.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SilcUInt8.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcvcard-SilcVCard.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcchannel-silc_channel_key_payload_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske_groups-silc_ske_group_get_by_number.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-SilcSFTP.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-silc_hash_block_len.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmime-silc_mime_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcber-SilcBerEncoding.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_inc32.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccommand-silc_command_payload_parse.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_tcp_create_listener.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsnprintf-silc_snprintf.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccommand-SilcCommandFlags.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsymbiansocketstream.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_IA5_STRING.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-silc_hash_alloc_by_oid.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsim.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcchannel-silc_channel_key_payload_encode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_va_copy.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_udp_receive.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcClientConnection.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconnauth-silc_connauth_responder.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstrutil-silc_base64_encode_file.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-silc_log_get_file.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-silc_hash_table_del_ext.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_fingerprint.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_send_key_agreement.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstringprep-silc_stringprep.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcdh-silc_dh_remote_public(1).html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcidcache-silc_idcache_add.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpk.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnotify-silc_notify_payload_parse.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmessage-silc_message_payload_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_add_channel_private_key.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclist.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-SILC_LOG_HEXDUMP.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccommand-silc_command_get.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccond-silc_cond_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfileutil-silc_file_read.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp_fs-silc_sftp_fs_memory_del_dir.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasync-SilcAsyncOperationPause.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-silc_hash_table_rehash.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchttpserver-silc_http_server_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-SilcSKEVerifyCb.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_hash_utf8_string.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil-silc_identifier_check.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-SilcNetStatus.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_read.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-SilcHashObject.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-silc_id_str2id.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_get_server_by_id.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-silc_hash_table_del_by_context_ext.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_format.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_put.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-silc_auth_payload_parse.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_private_key_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconfig-SilcConfigEntity.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpk-silc_pkcs_silc_encode_identifier.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-SILC_STR_BUFFER.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_div.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng-silc_rng_get_byte.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-SilcMPInt.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmessage-silc_message_payload_decrypt.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-silc_attribute_get_verify_data.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcserver_params-silc_server_params_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmemory-silc_smalloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp_fs.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_tcp_connect.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_server_start.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_abs.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccommand-silc_command_reply_payload_encode_va.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_next.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-silc_auth_verify.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_init16.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmemory-silc_malloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-silc_key_agreement_payload_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske_payload-SilcSKEStartPayload.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_get_state_context.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_list_channel_private_keys.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-SilcAtomic8.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_dec32.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_is_ip4.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcClientCommandReply.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_stream_wrap.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-SilcPacket.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstack-SilcStackFrame.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchttpserver-SilcHttpServer.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_init.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-silc_schedule_unset_listen_fd.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1_i.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs1_i.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-SILC_LOG_INFO.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctime-silc_compare_timeval.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmime-silc_mime_assemble.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_algorithm_register.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnotify.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_attribute_add.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_pow_mod_ui.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng-silc_rng_global_get_rn_string.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_div_2exp_qr.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_check_line.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconfig-silc_config_strerror.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-SilcPacketErrorCb.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-silc_hash_table_find_ext.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-SilcPKCSType.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_init.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_client_shutdown.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-SilcSKECompletionCb.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmime-silc_mime_get_field.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-SilcBuffer.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_continue_sync.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsnprintf.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-silc_schedule_task_del_by_callback.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_send_channel_message.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcthread-SilcThread.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfileutil-silc_file_open.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcserver_params-silc_server_params_add_admin.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconfig-silc_config_get_line.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctime.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-SilcPacketStream.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmutex-silc_rwlock_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs1-silc_pkcs1_encode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcClientMessageType.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/space.gif 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-SilcTaskEvent.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-SilcFSM.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_check_local_by_sock.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-SilcSKRFindCallback.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-silc_asn1_uninit.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng-silc_rng_global_get_rn32.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_sqrt.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcClientStopped.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-silc_hash_table_find_by_context.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_private_message_key_is_set.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_ANY_PRIMITIVE.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_OID.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_mod_ui.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil-silc_get_command_name.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconfig-silc_config_main.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-silc_log_reset_debug_callbacks.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_list_free_server.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmime-silc_mime_get_multiparts.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_get_socket_opt.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasync_i.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-silc_hash_unregister.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccipher-silc_cipher_get_name.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske_i.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsocketstream-silc_socket_udp_stream_create.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpk-SilcSILCPublicKey.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_list_free_channel.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/toolkit_index.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnotify-silc_notify_get_type.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-silc_attribute_payload_parse.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_enlarge.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-SILC_FSM_FINISH.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-SilcAttribute.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-SilcSKRStatus.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_server_set_monitor.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_bin2mp.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_div_2exp.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnotify-SilcNotifyPayload.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SilcUInt64.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-silc_buffer_sstrformat.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstream-SilcStreamStatus.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcidcache-silc_idcache_get_all.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-SilcSFTPStatusCallback.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmessage-silc_message_payload_parse.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-SilcAttributeObjPk.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-silc_log_flush_all.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_get_clients.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcargument-silc_argument_get_decoded.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-silc_hash_is_supported.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_hash_ptr.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-SilcClientEntry.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule_i.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-SilcPacketReceiveCb.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsimutil.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_taillen.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_start_sync.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_realpath.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcserver.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-SilcAttributePayload.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske_payload-SilcSKEKEPayload.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstringprep.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-SILC_LOG_ERROR.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_open.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_get_ids.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstream-SilcStreamNotifier.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconnauth-SilcConnectionType.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_salloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasync-silc_async_resume.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-SILC_STR_ADVANCE.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcexample-SilcExampleStruct.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_add.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcchannel-silc_channel_key_get_id.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_set_int32.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcidcache-silc_idcache_del_by_context.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_hash_id_compare_full.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmime-silc_mime_add_field.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/porting.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmime_i.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccond.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng-silc_rng_global_get_byte.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutf8-silc_utf8_encoded_len.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstream-silc_stream_close.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-silc_schedule_task_del.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-SILC_STR_OFFSET.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-silc_attribute_get_object.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_ANY.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccommand-silc_command_payload_encode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmessage.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstatus-silc_status_get_args.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_clear.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclist-silc_list_count.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcthread.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmime-silc_mime_encode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmime-silc_mime_assembler_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr_i.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutf8-silc_utf8_strcasecmp.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_wait_uninit.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng-silc_rng_get_rn_data.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_SEQUENCE_OF.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske_groups-silc_ske_group_get_by_name.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-silc_buffer_format_vp.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-silc_buffer_unformat_vp.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcvcard-silc_vcard_fprintf.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-silc_hash_init.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_set_pointer.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnotify-silc_notify_get_arg_num.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_close_listener.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_encrypt.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_unref_public_key.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconfig-SILC_CONFIG_CALLBACK.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcserver-SilcServerRunning.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-SILC_FSM_CALL.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-SilcPacketWrapCoder.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcClientFileName.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskrlib.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-silc_hash_table_replace.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstack.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_save_public_key.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmutex-silc_mutex_lock.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_sizeinbase.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_add_private_message_key_ske.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstream.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_cmp_si.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-silc_log_quick.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_GENERAL_STRING.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmemory-silc_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac-silc_hmac_make.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng-silc_rng_get_byte_fast.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_get_pkcs.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-SilcHash.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_realloc_size.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_hash_id.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmime-silc_mime_add_multipart.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstringprep-SilcStringprepStatus.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_hash_uint.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-SilcSchedule.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstack_i.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasync-silc_async_abort.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcargument.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-SilcPKCSFileEncoding.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp_fs-silc_sftp_fs_memory_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil-silc_client_chumode_char.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcClientFileAskName.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcidcache-silc_idcache_find_by_name_one.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcidcache-silc_idcache_find_by_id.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_opendir.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_OCTET_STRING.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccipher-silc_cipher_decrypt.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-SilcSKEParams.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-SilcAtomic32.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcthread-silc_thread_yield.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_uninit32.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SilcAsn1Struct.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcvcard.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcGetAuthMeth.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-silc_key_agreement_payload_parse.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-silc_hash_transform.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_set_int8.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_get_server.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-SilcSKRKey.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SilcInt32.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_get_machine.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_get_context.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfileutil-silc_file_open_mode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutf8-silc_utf8_strncasecmp.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil-silc_parse_version_string.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_wait_init.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-silc_id_payload_get_len.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_find_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcdlist-silc_dlist_get.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-SilcLogDebugCb.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1_i.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_steal.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs1_i.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_string_is_ascii.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-silc_hash_table_list.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-SILC_FSM_EVENT_TIMEDWAIT.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-SilcSKEPKType.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_stream_create.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_stop.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_stream_link.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_public_key_get_len.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-silc_id_payload_get_type.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcvcardlib.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_remove.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsnprintf-silc_asprintf.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_get_remote_port.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_fstat.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_get_context.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_listener_get_hostname.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-SilcSFTPStatus.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp_fs.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-SilcHashCompare.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclist-silc_list_add.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmath-silc_math_gen_prime.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-silc_buffer_sunformat_vp.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac-silc_hmac_make_with_key.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstream-silc_stream_destroy.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SILC_GET64_MSB.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctime-silc_time_generalized.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_add_int32.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-silc_id_dup.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconfig-silc_config_register_table.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclist.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_get_type.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-SilcSFTPVersionCallback.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil-silc_id_render.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_purge.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_cas16.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpk.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_set.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_is_started.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-silc_ske_free_rekey_material.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_attributes_get.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-SilcSFTPName.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-SilcBufferSFormatFunc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-SilcPacketFlags.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng-silc_rng_global_get_byte_fast.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctime-silc_timezone.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-FALSE.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil-silc_version_to_num.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_ref_public_key.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_init.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcdh-SilcDH.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmessage-silc_message_signed_verify.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-silc_ske_process_key_material_data.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_find_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-SilcFSMEvent.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil-silc_client_chmode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_find_set_username.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-SILC_ASSERT.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_close.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_mp2bin.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_reset.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-SilcFSMThread.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_accept_connection.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac-silc_hmac_get_hash.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsymbiansocketstream.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsim.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SILC_32_TO_PTR.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_uninit_pointer.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccipher.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstack-silc_stack_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutf8.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmemory-silc_sstrdup.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_private_key_get_len.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/zlib.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_sub_ui.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-silc_hash_table_find_foreach.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstrutil-silc_base64_encode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccommand-silc_command_payload_encode_payload.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-SilcSKR.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcrng-silc_rng_get_rn_string.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_sub_int32.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-SilcFSMEventStruct.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnotify-silc_notify_get_args.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcexample.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmime-silc_mime_set_multipart.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccommand.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-TRUE.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_sub.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcargument-silc_argument_payload_encode_one.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_setstat.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccipher-silc_cipher_get_mode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-silc_auth_payload_encode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-SILC_FSM_CONTINUE.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_add_public_key_simple.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-SilcClientOperations.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SilcSocket.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-silc_ske_initiator.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_PRINTABLE_STRING.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac-silc_hmac_get_key.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_cas_pointer.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcthread-silc_thread_self.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-SilcIDIP.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcske-silc_ske_map_status.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-silc_hash_update.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcserver_params-silc_server_params_add_hmac.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_pow_mod.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcchannel-silc_channel_payload_encode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-silc_auth_public_key_auth_generate.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_nickname_format.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsocketstream-silc_socket_stream_is_udp.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmutex-silc_mutex_assert_locked.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcserver_params-silc_server_params_add_client.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcauth-silc_auth_get_data.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsocketstream-SilcSocketStreamStatus.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/command_reply_args.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcschedule-silc_schedule_set_listen_fd.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_dec8.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_get_clients_local.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutil-silc_hash_client_id_hash.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-SilcSFTPExtendedCallback.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcid-silc_id_payload_parse_id.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac-silc_hmac_register_default.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/box.gif 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-SilcSKRKeyUsage.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_get_client_by_id_resolve.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcdlist-silc_dlist_add.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac-silc_hmac_final.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffmt-silc_buffer_format.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_get_int32.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-silc_hash_register.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic-silc_atomic_inc8.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_localip.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_div_ui.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctime-silc_gettimeofday.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-SilcPrivateKey.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsocketstream_i.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_lock_client.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcutf8-silc_utf8_c2w.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-silc_hash_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcdh-silc_dh_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcvcard-silc_vcard_decode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp_fs-SilcSFTPFilesystemOps.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconnauth-SilcConnAuth.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_gethostbyaddr_async.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmemory-silc_srealloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_is_ip6.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_file_send.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcapputil-silc_identifier_verify.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcdoc_xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclist-silc_list_get.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_register_default.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-silc_log_timestamp.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient-silc_client_nickname_parse.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcargument.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_get_error_string.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcthread-SilcThreadStart.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmime-silc_mime_decode.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcasn1-SILC_ASN1_SHORT_INT.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-SILC_FSM_EVENT_WAIT.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_register.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-SilcAttributeMood.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmp-silc_mp_uninit.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcvcard.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_public_key_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac-silc_hmac_is_supported.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcidcache-silc_idcache_update_by_context.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_get_keys.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchttpserver-silc_http_server_send.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_copy.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-silc_log_debug.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SilcInt8.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconnauth-silc_connauth_alloc.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcskr-silc_skr_find_set_country.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcmime-silc_mime_steal_data.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcconfig-silc_config_get_filename.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcclient_entry-silc_client_get_server_by_id_resolve.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcargument-silc_argument_list_parse_decoded.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcatomic.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcbuffer-silc_buffer_pull.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs-SilcAttributeObjDevice.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silctypes-SILC_PUT64_MSB.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcsftp-silc_sftp_rename.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstream.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash-silc_hash_final.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchash.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcattrs.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchmac-silc_hmac_register.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_localhost.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_stream_unref.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchttpserver-silc_http_server_send_error.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstack_i.xref 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-silc_fsm_continue.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcchannel-silc_channel_payload_free.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpkcs-silc_pkcs_get_algorithm.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcnet-silc_net_listener_get_ip.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silccryptlib.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silchashtable-silc_hash_table_del.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcthread-silc_thread_create.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silclog-SILC_LOG_WARNING.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcstack-silc_stack_pop.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcchannel-silc_channel_key_get_key.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcpacket-silc_packet_get_context.html 0644 root bin +f none /opt/csw/share/doc/silc-toolkit/toolkit/silcfsm-SilcFSMThreadDestructor.html 0644 root bin @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Tue Dec 30 23:21:47 2008 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Tue, 30 Dec 2008 22:21:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[2718] csw/mgar/pkg Message-ID: Revision: 2718 http://gar.svn.sourceforge.net/gar/?rev=2718&view=rev Author: harpchad Date: 2008-12-30 22:21:47 +0000 (Tue, 30 Dec 2008) Log Message: ----------- intltool: Initial commit Added Paths: ----------- csw/mgar/pkg/intltool/ csw/mgar/pkg/intltool/branches/ csw/mgar/pkg/intltool/tags/ csw/mgar/pkg/intltool/trunk/ csw/mgar/pkg/intltool/trunk/Makefile csw/mgar/pkg/intltool/trunk/checksums csw/mgar/pkg/intltool/trunk/files/ csw/mgar/pkg/intltool/trunk/files/CSWintltool.gspec Property changes on: csw/mgar/pkg/intltool/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1 Added: csw/mgar/pkg/intltool/trunk/Makefile =================================================================== --- csw/mgar/pkg/intltool/trunk/Makefile (rev 0) +++ csw/mgar/pkg/intltool/trunk/Makefile 2008-12-30 22:21:47 UTC (rev 2718) @@ -0,0 +1,29 @@ +GARNAME = intltool +MAJOR_VER = 0.40 +MINOR_VER = 5 +GARVERSION = $(MAJOR_VER).$(MINOR_VER) +GNOME_SUBV = $(MAJOR_VER) +CATEGORIES = utils + +DESCRIPTION = A collection of tools for internationalization +define BLURB + The intltool package is a set of tools for translating the contents of data files using the gettext translation framework. +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES += $(call admfiles,CSWintltool,) + +#No tests +TEST_SCRIPTS = + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Added: csw/mgar/pkg/intltool/trunk/checksums =================================================================== --- csw/mgar/pkg/intltool/trunk/checksums (rev 0) +++ csw/mgar/pkg/intltool/trunk/checksums 2008-12-30 22:21:47 UTC (rev 2718) @@ -0,0 +1,2 @@ +157e0570774dd76b59126d3908d5675f download/intltool-0.40.5.tar.gz +37feb95db3f5a2e184a2c45b254e2788 download/CSWintltool.gspec Added: csw/mgar/pkg/intltool/trunk/files/CSWintltool.gspec =================================================================== --- csw/mgar/pkg/intltool/trunk/files/CSWintltool.gspec (rev 0) +++ csw/mgar/pkg/intltool/trunk/files/CSWintltool.gspec 2008-12-30 22:21:47 UTC (rev 2718) @@ -0,0 +1,4 @@ +%var bitname intltool +%var pkgname CSWintltool +%include url file://%{PKGLIB}/csw_dyndepend.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 harpchad at users.sourceforge.net Tue Dec 30 23:39:19 2008 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Tue, 30 Dec 2008 22:39:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[2719] csw/mgar/pkg/intltool/trunk Message-ID: Revision: 2719 http://gar.svn.sourceforge.net/gar/?rev=2719&view=rev Author: harpchad Date: 2008-12-30 22:39:19 +0000 (Tue, 30 Dec 2008) Log Message: ----------- Add .depend Modified Paths: -------------- csw/mgar/pkg/intltool/trunk/Makefile csw/mgar/pkg/intltool/trunk/checksums Added Paths: ----------- csw/mgar/pkg/intltool/trunk/files/CSWintltool.depend Modified: csw/mgar/pkg/intltool/trunk/Makefile =================================================================== --- csw/mgar/pkg/intltool/trunk/Makefile 2008-12-30 22:21:47 UTC (rev 2718) +++ csw/mgar/pkg/intltool/trunk/Makefile 2008-12-30 22:39:19 UTC (rev 2719) @@ -12,7 +12,7 @@ MASTER_SITES = $(GNOME_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWintltool,) +DISTFILES += $(call admfiles,CSWintltool,depend) #No tests TEST_SCRIPTS = Modified: csw/mgar/pkg/intltool/trunk/checksums =================================================================== --- csw/mgar/pkg/intltool/trunk/checksums 2008-12-30 22:21:47 UTC (rev 2718) +++ csw/mgar/pkg/intltool/trunk/checksums 2008-12-30 22:39:19 UTC (rev 2719) @@ -1,2 +1,3 @@ 157e0570774dd76b59126d3908d5675f download/intltool-0.40.5.tar.gz 37feb95db3f5a2e184a2c45b254e2788 download/CSWintltool.gspec +fd19c6295f6211062d4e4cdd93bc3278 download/CSWintltool.depend Added: csw/mgar/pkg/intltool/trunk/files/CSWintltool.depend =================================================================== --- csw/mgar/pkg/intltool/trunk/files/CSWintltool.depend (rev 0) +++ csw/mgar/pkg/intltool/trunk/files/CSWintltool.depend 2008-12-30 22:39:19 UTC (rev 2719) @@ -0,0 +1 @@ +P CSWperl perl - A high-level, general-purpose programming language. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Tue Dec 30 23:54:19 2008 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Tue, 30 Dec 2008 22:54:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[2720] csw/mgar/pkg/intltool/trunk Message-ID: Revision: 2720 http://gar.svn.sourceforge.net/gar/?rev=2720&view=rev Author: harpchad Date: 2008-12-30 22:54:19 +0000 (Tue, 30 Dec 2008) Log Message: ----------- - Add prototype - Change to arch=all Modified Paths: -------------- csw/mgar/pkg/intltool/trunk/Makefile csw/mgar/pkg/intltool/trunk/checksums csw/mgar/pkg/intltool/trunk/files/CSWintltool.gspec Added Paths: ----------- csw/mgar/pkg/intltool/trunk/files/CSWintltool.prototype Modified: csw/mgar/pkg/intltool/trunk/Makefile =================================================================== --- csw/mgar/pkg/intltool/trunk/Makefile 2008-12-30 22:39:19 UTC (rev 2719) +++ csw/mgar/pkg/intltool/trunk/Makefile 2008-12-30 22:54:19 UTC (rev 2720) @@ -12,7 +12,7 @@ MASTER_SITES = $(GNOME_MIRROR) DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWintltool,depend) +DISTFILES += $(call admfiles,CSWintltool,depend prototype) #No tests TEST_SCRIPTS = Modified: csw/mgar/pkg/intltool/trunk/checksums =================================================================== --- csw/mgar/pkg/intltool/trunk/checksums 2008-12-30 22:39:19 UTC (rev 2719) +++ csw/mgar/pkg/intltool/trunk/checksums 2008-12-30 22:54:19 UTC (rev 2720) @@ -1,3 +1,4 @@ 157e0570774dd76b59126d3908d5675f download/intltool-0.40.5.tar.gz -37feb95db3f5a2e184a2c45b254e2788 download/CSWintltool.gspec fd19c6295f6211062d4e4cdd93bc3278 download/CSWintltool.depend +792a4a570fa86f7a275114b99fc9adbe download/CSWintltool.gspec +7ea28b8cc2a8f3179d50cd2a5c66c04e download/CSWintltool.prototype Modified: csw/mgar/pkg/intltool/trunk/files/CSWintltool.gspec =================================================================== --- csw/mgar/pkg/intltool/trunk/files/CSWintltool.gspec 2008-12-30 22:39:19 UTC (rev 2719) +++ csw/mgar/pkg/intltool/trunk/files/CSWintltool.gspec 2008-12-30 22:54:19 UTC (rev 2720) @@ -1,4 +1,5 @@ %var bitname intltool %var pkgname CSWintltool +%var arch all %include url file://%{PKGLIB}/csw_dyndepend.gspec %copyright url file://%{WORKSRC}/COPYING Added: csw/mgar/pkg/intltool/trunk/files/CSWintltool.prototype =================================================================== --- csw/mgar/pkg/intltool/trunk/files/CSWintltool.prototype (rev 0) +++ csw/mgar/pkg/intltool/trunk/files/CSWintltool.prototype 2008-12-30 22:54:19 UTC (rev 2720) @@ -0,0 +1,16 @@ +d none /opt/csw/bin 0755 root bin +f none /opt/csw/bin/intltool-extract 0755 root bin +f none /opt/csw/bin/intltool-merge 0755 root bin +f none /opt/csw/bin/intltool-prepare 0755 root bin +f none /opt/csw/bin/intltool-update 0755 root bin +f none /opt/csw/bin/intltoolize 0755 root bin +d none /opt/csw/share/aclocal 0755 root bin +f none /opt/csw/share/aclocal/intltool.m4 0644 root bin +d none /opt/csw/share/intltool 0755 root bin +f none /opt/csw/share/intltool/Makefile.in.in 0644 root bin +d none /opt/csw/share/man/man8 0755 root bin +f none /opt/csw/share/man/man8/intltool-extract.8 0644 root bin +f none /opt/csw/share/man/man8/intltool-merge.8 0644 root bin +f none /opt/csw/share/man/man8/intltool-prepare.8 0644 root bin +f none /opt/csw/share/man/man8/intltool-update.8 0644 root bin +f none /opt/csw/share/man/man8/intltoolize.8 0644 root bin 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 Dec 31 14:35:13 2008 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 31 Dec 2008 13:35:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[2721] csw/mgar/pkg/docbook-style-dsssl/trunk Message-ID: Revision: 2721 http://gar.svn.sourceforge.net/gar/?rev=2721&view=rev Author: bdwalton Date: 2008-12-31 13:35:12 +0000 (Wed, 31 Dec 2008) Log Message: ----------- added a postinstall script; still need preremove Modified Paths: -------------- csw/mgar/pkg/docbook-style-dsssl/trunk/Makefile csw/mgar/pkg/docbook-style-dsssl/trunk/checksums Added Paths: ----------- csw/mgar/pkg/docbook-style-dsssl/trunk/files/CSWdocbookdsssl.postinstall Modified: csw/mgar/pkg/docbook-style-dsssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/docbook-style-dsssl/trunk/Makefile 2008-12-30 22:54:19 UTC (rev 2720) +++ csw/mgar/pkg/docbook-style-dsssl/trunk/Makefile 2008-12-31 13:35:12 UTC (rev 2721) @@ -13,7 +13,7 @@ SF_PROJ = docbook MASTER_SITES = $(SF_MIRRORS) DISTFILES = docbook-dsssl-$(GARVERSION).tar.gz -DISTFILES += $(call admfiles,CSWdocbookdsssl,) +DISTFILES += $(call admfiles,CSWdocbookdsssl,postinstall) PATCHFILES = add_makefile.patch fix_perl_path.patch REQUIRED_PKGS = CSWdocbookdtds CSWsgmlcommon CSWopenjade CSWperl Modified: csw/mgar/pkg/docbook-style-dsssl/trunk/checksums =================================================================== --- csw/mgar/pkg/docbook-style-dsssl/trunk/checksums 2008-12-30 22:54:19 UTC (rev 2720) +++ csw/mgar/pkg/docbook-style-dsssl/trunk/checksums 2008-12-31 13:35:12 UTC (rev 2721) @@ -1,4 +1,5 @@ 8459913bbd8a5724a6fe4b9ed5bab5af download/docbook-dsssl-1.79.tar.gz 02510cf81c864e00a76bcda6c479341b download/CSWdocbookdsssl.gspec +ca3151dd10e081a972d51cd1421ec933 download/CSWdocbookdsssl.postinstall 0ef217556ebfc23d51bc90684464dd6e download/add_makefile.patch bcd9c3faeba3e034152c26b489f2abcc download/fix_perl_path.patch Added: csw/mgar/pkg/docbook-style-dsssl/trunk/files/CSWdocbookdsssl.postinstall =================================================================== --- csw/mgar/pkg/docbook-style-dsssl/trunk/files/CSWdocbookdsssl.postinstall (rev 0) +++ csw/mgar/pkg/docbook-style-dsssl/trunk/files/CSWdocbookdsssl.postinstall 2008-12-31 13:35:12 UTC (rev 2721) @@ -0,0 +1,38 @@ +#!/bin/sh + +PATH=/opt/csw/bin:$PATH +export PATH + +case "$PKG_INSTALL_ROOT" in + ""|"/") PREFIX= ;; + *) PREFIX="chroot $PKG_INSTALL_ROOT";; +esac + +# set SGML_BASE_DIR and SGML_CATALOGS_DIR +. `$PKG_INSTALL_ROOT/opt/csw/bin/sgmlwhich` + +dsssldir=$SGML_BASE_DIR/docbook/dsssl-stylesheets +ojadedir=`$PREFIX echo $SGML_BASE_DIR/openjade-*` + +rel=`echo $PKG_INSTALL_ROOT/$SGML_CATALOGS_DIR/sgml-docbook-3.0-*.cat | sed 's#.*-##; s/\.cat//'` + +#clean up _any_ old entries +for cat in $PKG_INSTALL_ROOT/$SGML_CATALOGS_DIR/*-docbook-*.cat; do + if [ "x$PKG_INSTALL_ROOT" != "x" ]; then + cat=`echo $cat | sed "s#$PKG_INSTALL_ROOT##"` + fi + catalog=`echo $cat | sed 's#//#/#g'` + + echo $PREFIX install-catalog --remove $catalog $dsssldir/catalog +done + +#add new entries for the current release of the docbook dtds. +for cat in $PKG_INSTALL_ROOT/$SGML_CATALOGS_DIR/*-docbook-*$rel.cat; do + if [ "x$PKG_INSTALL_ROOT" != "x" ]; then + cat=`echo $cat | sed "s#$PKG_INSTALL_ROOT##; s#//#/#g"` + fi + catalog=`echo $cat | sed 's#//#/#g'` + + echo $PREFIX install-catalog --add $catalog $ojadedir/catalog + echo $PREFIX install-catalog --add $catalog $dsssldir/catalog +done \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Wed Dec 31 18:47:52 2008 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Wed, 31 Dec 2008 17:47:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[2722] csw/mgar/pkg/curl/trunk Message-ID: Revision: 2722 http://gar.svn.sourceforge.net/gar/?rev=2722&view=rev Author: harpchad Date: 2008-12-31 17:47:52 +0000 (Wed, 31 Dec 2008) Log Message: ----------- - Update for curl 7.19.2 - Seperate into the two currently offered packages (CSWcurl, CSWcurlrt) Modified Paths: -------------- csw/mgar/pkg/curl/trunk/Makefile csw/mgar/pkg/curl/trunk/checksums csw/mgar/pkg/curl/trunk/files/CSWcurl.gspec Added Paths: ----------- csw/mgar/pkg/curl/trunk/files/CSWcurl.depend csw/mgar/pkg/curl/trunk/files/CSWcurl.prototype csw/mgar/pkg/curl/trunk/files/CSWcurlrt.depend csw/mgar/pkg/curl/trunk/files/CSWcurlrt.gspec csw/mgar/pkg/curl/trunk/files/CSWcurlrt.prototype Modified: csw/mgar/pkg/curl/trunk/Makefile =================================================================== --- csw/mgar/pkg/curl/trunk/Makefile 2008-12-31 13:35:12 UTC (rev 2721) +++ csw/mgar/pkg/curl/trunk/Makefile 2008-12-31 17:47:52 UTC (rev 2722) @@ -1,5 +1,5 @@ GARNAME = curl -GARVERSION = 7.15.3 +GARVERSION = 7.19.2 CATEGORIES = net DESCRIPTION = Command line tool and library for client-side URL transfers. @@ -15,7 +15,8 @@ MASTER_SITES = http://curl.haxx.se/download/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2 -DISTFILES += $(call admfiles,CSWcurl,) +DISTFILES += $(call admfiles,CSWcurl,prototype depend) +DISTFILES += $(call admfiles,CSWcurlrt,prototype depend) # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2 Modified: csw/mgar/pkg/curl/trunk/checksums =================================================================== --- csw/mgar/pkg/curl/trunk/checksums 2008-12-31 13:35:12 UTC (rev 2721) +++ csw/mgar/pkg/curl/trunk/checksums 2008-12-31 17:47:52 UTC (rev 2722) @@ -1,2 +1,7 @@ -d71b2ee8febfde2c7dc30a43638ec0d9 download/curl-7.15.3.tar.bz2 -1436ae206adad60b90563d6e34405693 download/CSWcurl.gspec +3a461b145a4a31fe7d5a44684e7fbdbc download/curl-7.19.2.tar.bz2 +6ca086ce31b3036a315f9d29ac648056 download/CSWcurl.depend +a5a35282d48619f9a94d768b3bb5a525 download/CSWcurl.gspec +2c5cb969b0409caa925504686cefe0df download/CSWcurl.prototype +5b7397f8f7cab315bec471d05c7f5036 download/CSWcurlrt.gspec +49c05ba155f955632e624f08b076de51 download/CSWcurlrt.prototype +7298b0ca5c36e82d12cb46cd9fc621dc download/CSWcurlrt.depend Added: csw/mgar/pkg/curl/trunk/files/CSWcurl.depend =================================================================== --- csw/mgar/pkg/curl/trunk/files/CSWcurl.depend (rev 0) +++ csw/mgar/pkg/curl/trunk/files/CSWcurl.depend 2008-12-31 17:47:52 UTC (rev 2722) @@ -0,0 +1,9 @@ +P CSWcommon common - common files and dirs for CSW packages +P CSWiconv libiconv - GNU iconv library +P CSWlibidn libidn - Implementation of the Stringprep, Punycode and IDNA +P CSWlibnet libnet - the libnet packet construction library +P CSWoldaprt openldap_rt - OpenLDAP runtime libraries (oldaprt) +P CSWosslrt openssl_rt - Openssl runtime libraries +P CSWsasl sasl - Simple Authentication and Security Layer +P CSWzlib zlib - Zlib Data Compression Library +P CSWcurlrt curlrt - Library for common Internet protocols Runtime Modified: csw/mgar/pkg/curl/trunk/files/CSWcurl.gspec =================================================================== --- csw/mgar/pkg/curl/trunk/files/CSWcurl.gspec 2008-12-31 13:35:12 UTC (rev 2721) +++ csw/mgar/pkg/curl/trunk/files/CSWcurl.gspec 2008-12-31 17:47:52 UTC (rev 2722) @@ -1,4 +1,4 @@ %var bitname curl %var pkgname CSWcurl %include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYRIGHT +%copyright url file://%{WORKSRC}/COPYING Added: csw/mgar/pkg/curl/trunk/files/CSWcurl.prototype =================================================================== --- csw/mgar/pkg/curl/trunk/files/CSWcurl.prototype (rev 0) +++ csw/mgar/pkg/curl/trunk/files/CSWcurl.prototype 2008-12-31 17:47:52 UTC (rev 2722) @@ -0,0 +1,5 @@ +d none /opt/csw/bin 0755 root bin +f none /opt/csw/bin/curl 0755 root bin +d none /opt/csw/share/man 0755 root bin +d none /opt/csw/share/man/man1 0755 root bin +f none /opt/csw/share/man/man1/curl.1 0644 root bin Added: csw/mgar/pkg/curl/trunk/files/CSWcurlrt.depend =================================================================== --- csw/mgar/pkg/curl/trunk/files/CSWcurlrt.depend (rev 0) +++ csw/mgar/pkg/curl/trunk/files/CSWcurlrt.depend 2008-12-31 17:47:52 UTC (rev 2722) @@ -0,0 +1,4 @@ +P CSWlibidn libidn - Implementation of the Stringprep, Punycode and IDNA +P CSWoldaprt openldap_rt - OpenLDAP runtime libraries (oldaprt) +P CSWosslrt openssl_rt - Openssl runtime libraries +P CSWzlib zlib - Zlib Data Compression Library Added: csw/mgar/pkg/curl/trunk/files/CSWcurlrt.gspec =================================================================== --- csw/mgar/pkg/curl/trunk/files/CSWcurlrt.gspec (rev 0) +++ csw/mgar/pkg/curl/trunk/files/CSWcurlrt.gspec 2008-12-31 17:47:52 UTC (rev 2722) @@ -0,0 +1,4 @@ +%var bitname curlrt +%var pkgname CSWcurlrt +%include url file://%{PKGLIB}/csw_dyndepend.gspec +%copyright url file://%{WORKSRC}/COPYING Added: csw/mgar/pkg/curl/trunk/files/CSWcurlrt.prototype =================================================================== --- csw/mgar/pkg/curl/trunk/files/CSWcurlrt.prototype (rev 0) +++ csw/mgar/pkg/curl/trunk/files/CSWcurlrt.prototype 2008-12-31 17:47:52 UTC (rev 2722) @@ -0,0 +1,77 @@ +d none /opt/csw/bin 0755 root bin +f none /opt/csw/bin/curl-config 0755 root bin +d none /opt/csw/include 0755 root bin +d none /opt/csw/include/curl 0755 root bin +f none /opt/csw/include/curl/curl.h 0644 root bin +f none /opt/csw/include/curl/curlbuild.h 0644 root bin +f none /opt/csw/include/curl/curlrules.h 0644 root bin +f none /opt/csw/include/curl/curlver.h 0644 root bin +f none /opt/csw/include/curl/easy.h 0644 root bin +f none /opt/csw/include/curl/mprintf.h 0644 root bin +f none /opt/csw/include/curl/multi.h 0644 root bin +f none /opt/csw/include/curl/stdcheaders.h 0644 root bin +f none /opt/csw/include/curl/typecheck-gcc.h 0644 root bin +f none /opt/csw/include/curl/types.h 0644 root bin +d none /opt/csw/lib 0755 root bin +f none /opt/csw/lib/libcurl.a 0644 root bin +f none /opt/csw/lib/libcurl.so.4.1.1 0755 root bin +s none /opt/csw/lib/libcurl.so.4=libcurl.so.4.1.1 +s none /opt/csw/lib/libcurl.so=libcurl.so.4.1.1 +d none /opt/csw/lib/pkgconfig 0755 root bin +f none /opt/csw/lib/pkgconfig/libcurl.pc 0644 root bin +d none /opt/csw/share/man 0755 root bin +d none /opt/csw/share/man/man1 0755 root bin +f none /opt/csw/share/man/man1/curl-config.1 0644 root bin +d none /opt/csw/share/man/man3 0755 root bin +f none /opt/csw/share/man/man3/curl_easy_cleanup.3 0644 root bin +f none /opt/csw/share/man/man3/curl_easy_duphandle.3 0644 root bin +f none /opt/csw/share/man/man3/curl_easy_escape.3 0644 root bin +f none /opt/csw/share/man/man3/curl_easy_getinfo.3 0644 root bin +f none /opt/csw/share/man/man3/curl_easy_init.3 0644 root bin +f none /opt/csw/share/man/man3/curl_easy_pause.3 0644 root bin +f none /opt/csw/share/man/man3/curl_easy_perform.3 0644 root bin +f none /opt/csw/share/man/man3/curl_easy_recv.3 0644 root bin +f none /opt/csw/share/man/man3/curl_easy_reset.3 0644 root bin +f none /opt/csw/share/man/man3/curl_easy_send.3 0644 root bin +f none /opt/csw/share/man/man3/curl_easy_setopt.3 0644 root bin +f none /opt/csw/share/man/man3/curl_easy_strerror.3 0644 root bin +f none /opt/csw/share/man/man3/curl_easy_unescape.3 0644 root bin +f none /opt/csw/share/man/man3/curl_escape.3 0644 root bin +f none /opt/csw/share/man/man3/curl_formadd.3 0644 root bin +f none /opt/csw/share/man/man3/curl_formfree.3 0644 root bin +f none /opt/csw/share/man/man3/curl_formget.3 0644 root bin +f none /opt/csw/share/man/man3/curl_free.3 0644 root bin +f none /opt/csw/share/man/man3/curl_getdate.3 0644 root bin +f none /opt/csw/share/man/man3/curl_getenv.3 0644 root bin +f none /opt/csw/share/man/man3/curl_global_cleanup.3 0644 root bin +f none /opt/csw/share/man/man3/curl_global_init.3 0644 root bin +f none /opt/csw/share/man/man3/curl_global_init_mem.3 0644 root bin +f none /opt/csw/share/man/man3/curl_mprintf.3 0644 root bin +f none /opt/csw/share/man/man3/curl_multi_add_handle.3 0644 root bin +f none /opt/csw/share/man/man3/curl_multi_assign.3 0644 root bin +f none /opt/csw/share/man/man3/curl_multi_cleanup.3 0644 root bin +f none /opt/csw/share/man/man3/curl_multi_fdset.3 0644 root bin +f none /opt/csw/share/man/man3/curl_multi_info_read.3 0644 root bin +f none /opt/csw/share/man/man3/curl_multi_init.3 0644 root bin +f none /opt/csw/share/man/man3/curl_multi_perform.3 0644 root bin +f none /opt/csw/share/man/man3/curl_multi_remove_handle.3 0644 root bin +f none /opt/csw/share/man/man3/curl_multi_setopt.3 0644 root bin +f none /opt/csw/share/man/man3/curl_multi_socket.3 0644 root bin +f none /opt/csw/share/man/man3/curl_multi_strerror.3 0644 root bin +f none /opt/csw/share/man/man3/curl_multi_timeout.3 0644 root bin +f none /opt/csw/share/man/man3/curl_share_cleanup.3 0644 root bin +f none /opt/csw/share/man/man3/curl_share_init.3 0644 root bin +f none /opt/csw/share/man/man3/curl_share_setopt.3 0644 root bin +f none /opt/csw/share/man/man3/curl_share_strerror.3 0644 root bin +f none /opt/csw/share/man/man3/curl_slist_append.3 0644 root bin +f none /opt/csw/share/man/man3/curl_slist_free_all.3 0644 root bin +f none /opt/csw/share/man/man3/curl_strequal.3 0644 root bin +f none /opt/csw/share/man/man3/curl_unescape.3 0644 root bin +f none /opt/csw/share/man/man3/curl_version.3 0644 root bin +f none /opt/csw/share/man/man3/curl_version_info.3 0644 root bin +f none /opt/csw/share/man/man3/libcurl-easy.3 0644 root bin +f none /opt/csw/share/man/man3/libcurl-errors.3 0644 root bin +f none /opt/csw/share/man/man3/libcurl-multi.3 0644 root bin +f none /opt/csw/share/man/man3/libcurl-share.3 0644 root bin +f none /opt/csw/share/man/man3/libcurl-tutorial.3 0644 root bin +f none /opt/csw/share/man/man3/libcurl.3 0644 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Wed Dec 31 18:58:34 2008 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Wed, 31 Dec 2008 17:58:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[2723] csw/mgar/pkg/curl/trunk Message-ID: Revision: 2723 http://gar.svn.sourceforge.net/gar/?rev=2723&view=rev Author: harpchad Date: 2008-12-31 17:58:34 +0000 (Wed, 31 Dec 2008) Log Message: ----------- Remove redundant dependency Modified Paths: -------------- csw/mgar/pkg/curl/trunk/checksums csw/mgar/pkg/curl/trunk/files/CSWcurl.depend Modified: csw/mgar/pkg/curl/trunk/checksums =================================================================== --- csw/mgar/pkg/curl/trunk/checksums 2008-12-31 17:47:52 UTC (rev 2722) +++ csw/mgar/pkg/curl/trunk/checksums 2008-12-31 17:58:34 UTC (rev 2723) @@ -1,5 +1,5 @@ 3a461b145a4a31fe7d5a44684e7fbdbc download/curl-7.19.2.tar.bz2 -6ca086ce31b3036a315f9d29ac648056 download/CSWcurl.depend +8413cf2aff529cb995c14a57bd41a10a download/CSWcurl.depend a5a35282d48619f9a94d768b3bb5a525 download/CSWcurl.gspec 2c5cb969b0409caa925504686cefe0df download/CSWcurl.prototype 5b7397f8f7cab315bec471d05c7f5036 download/CSWcurlrt.gspec Modified: csw/mgar/pkg/curl/trunk/files/CSWcurl.depend =================================================================== --- csw/mgar/pkg/curl/trunk/files/CSWcurl.depend 2008-12-31 17:47:52 UTC (rev 2722) +++ csw/mgar/pkg/curl/trunk/files/CSWcurl.depend 2008-12-31 17:58:34 UTC (rev 2723) @@ -1,4 +1,3 @@ -P CSWcommon common - common files and dirs for CSW packages P CSWiconv libiconv - GNU iconv library P CSWlibidn libidn - Implementation of the Stringprep, Punycode and IDNA P CSWlibnet libnet - the libnet packet construction library This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Wed Dec 31 19:32:13 2008 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Wed, 31 Dec 2008 18:32:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[2724] csw/mgar/pkg/vim/trunk Message-ID: Revision: 2724 http://gar.svn.sourceforge.net/gar/?rev=2724&view=rev Author: harpchad Date: 2008-12-31 18:32:13 +0000 (Wed, 31 Dec 2008) Log Message: ----------- Update to patch level 77 Modified Paths: -------------- csw/mgar/pkg/vim/trunk/checksums csw/mgar/pkg/vim/trunk/files/patches.mk Modified: csw/mgar/pkg/vim/trunk/checksums =================================================================== --- csw/mgar/pkg/vim/trunk/checksums 2008-12-31 17:58:34 UTC (rev 2723) +++ csw/mgar/pkg/vim/trunk/checksums 2008-12-31 18:32:13 UTC (rev 2724) @@ -69,10 +69,12 @@ f3e6f3dd76278a9f7e396955faa4ca31 download/7.2.069 805cdc76da46e73ae908038e09efae16 download/7.2.070 9224b5e9c85fa4d47d418c248aff542e download/7.2.071 -45ca3d6526b653253b05d91a1e89bd3d download/7.2.072 +ab9250d36651dde9267d1241cac9fb74 download/7.2.072 0d77ee653eabe4b7fdb640d768d7c1be download/7.2.073 5b0a423e9f3ca07e5c62d4f0f5803a5c download/7.2.074 d7eccf57f8fc04cf0385f85eff3d989a download/7.2.075 +99750c988d0c48f56cb12a04b78aebc2 download/7.2.076 +1967f5e7fa4cec07bd67cc47925ec3c8 download/7.2.077 198b5e809eddd24650dac5ab237e26d0 download/CSWvim.depend 59c166f15ad9e4db7aeef3ce7f6d89d9 download/CSWvim.gspec 7f886f132e8404332757262c82aac7af download/CSWvim.prototype Modified: csw/mgar/pkg/vim/trunk/files/patches.mk =================================================================== --- csw/mgar/pkg/vim/trunk/files/patches.mk 2008-12-31 17:58:34 UTC (rev 2723) +++ csw/mgar/pkg/vim/trunk/files/patches.mk 2008-12-31 18:32:13 UTC (rev 2724) @@ -1,5 +1,5 @@ # Vim 72 patchset -PATCHREV = 075 +PATCHREV = 077 PATCHDIRLEVEL = 0 GARVERSION = $(DISTVERSION).$(PATCHREV) PATCHFILES += $(foreach T,$(shell gseq -f "%03g" 001 $(PATCHREV)),$(DISTVERSION).$(T)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From harpchad at users.sourceforge.net Wed Dec 31 19:56:47 2008 From: harpchad at users.sourceforge.net (harpchad at users.sourceforge.net) Date: Wed, 31 Dec 2008 18:56:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[2725] csw/mgar/pkg/gvim/trunk/checksums Message-ID: Revision: 2725 http://gar.svn.sourceforge.net/gar/?rev=2725&view=rev Author: harpchad Date: 2008-12-31 18:56:46 +0000 (Wed, 31 Dec 2008) Log Message: ----------- Updated to patch level 77 Modified Paths: -------------- csw/mgar/pkg/gvim/trunk/checksums Modified: csw/mgar/pkg/gvim/trunk/checksums =================================================================== --- csw/mgar/pkg/gvim/trunk/checksums 2008-12-31 18:32:13 UTC (rev 2724) +++ csw/mgar/pkg/gvim/trunk/checksums 2008-12-31 18:56:46 UTC (rev 2725) @@ -67,6 +67,14 @@ fa0ccca2decdd2db64947658b04b8c99 download/7.2.067 ca5ab057205023613020ca920d903028 download/7.2.068 f3e6f3dd76278a9f7e396955faa4ca31 download/7.2.069 +805cdc76da46e73ae908038e09efae16 download/7.2.070 +9224b5e9c85fa4d47d418c248aff542e download/7.2.071 +ab9250d36651dde9267d1241cac9fb74 download/7.2.072 +0d77ee653eabe4b7fdb640d768d7c1be download/7.2.073 +5b0a423e9f3ca07e5c62d4f0f5803a5c download/7.2.074 +d7eccf57f8fc04cf0385f85eff3d989a download/7.2.075 +99750c988d0c48f56cb12a04b78aebc2 download/7.2.076 +1967f5e7fa4cec07bd67cc47925ec3c8 download/7.2.077 35e04482f07c57221c9a751aaa3b8dac download/vim-7.2-extra.tar.gz d8884786979e0e520c112faf2e176f05 download/vim-7.2-lang.tar.gz f0901284b338e448bfd79ccca0041254 download/vim-7.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.