From maciej at opencsw.org Sun Jan 4 12:09:31 2015 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Sun, 4 Jan 2015 11:09:31 +0000 Subject: Package GAR status In-Reply-To: References: Message-ID: [+devel for some posterity] 2015-01-04 11:08 GMT+00:00 Maciej (Matchek) Blizi?ski : > Hi Dago, > > Is this report up to date? > > http://www.opencsw.org/package-gar-status.html > > If not, can we make it be up to date? Where's the code? > > Maciej > -------------- next part -------------- An HTML attachment was scrubbed... URL: From maciej at opencsw.org Sun Jan 4 14:12:09 2015 From: maciej at opencsw.org (Maciej =?utf-8?Q?Blizi=C5=84ski?=) Date: Sun, 4 Jan 2015 13:12:09 +0000 Subject: SF.net SVN: gar:[24515] csw/mgar/pkg/subversion/trunk/Makefile In-Reply-To: <3k6Yld2F6Wz1Tb@mail.opencsw.org> References: <3k6Yld2F6Wz1Tb@mail.opencsw.org> Message-ID: <20150104131209.GA10509@cotton.home.blizinski.pl> On Tue, Dec 23, 2014 at 11:33:39PM +0000, rthurner at users.sourceforge.net wrote: > Revision: 24515 > http://sourceforge.net/p/gar/code/24515 > Author: rthurner > Date: 2014-12-23 23:33:39 +0000 (Tue, 23 Dec 2014) > Log Message: > ----------- > subversion/trunk: ignore checkpkg errors. > +CHECKPKG_OVERRIDES_CSWpmsvn += missing-dependency|CSWlibapr1-0 Hi Rupert, Did you look why did checkpkg think that CSWlibapr1-0 is needed? If not, can you look? Maciej -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 181 bytes Desc: Digital signature URL: From wahwah at users.sourceforge.net Sun Jan 4 17:08:26 2015 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 4 Jan 2015 16:08:26 +0000 Subject: SF.net SVN: gar:[24530] csw/mgar/pkg/opencsw-manual/trunk/files/ for-maintainers/contributing-to-recipes.rst Message-ID: <3kFlJX4mvNz19p@mail.opencsw.org> Revision: 24530 http://sourceforge.net/p/gar/code/24530 Author: wahwah Date: 2015-01-04 16:08:26 +0000 (Sun, 04 Jan 2015) Log Message: ----------- opencsw-manual/trunk: A rewrite of contributing-to-recipes.rst Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/contributing-to-recipes.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/contributing-to-recipes.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/contributing-to-recipes.rst 2015-01-04 14:58:33 UTC (rev 24529) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/contributing-to-recipes.rst 2015-01-04 16:08:26 UTC (rev 24530) @@ -2,31 +2,32 @@ Contributing to recipes ----------------------- -It often happens that a maintainer wants to make a change or an update to -another maintainer's package. +When you need a change to a package uploaded by somebody else, check their +maintainer status via `http://www.opencsw.org/maintainers//` and the +`maintainer activity report`_ which shows inactive maintainers (retired or +not). +- When the maintainer is active: -- The maintainer is retired: + (This means that the maintainer uploads packages, answers to bug reports and + email.) - On the maintainers mailing list, announce your intention to work on - the recipe and eventually take up the maintenance. + Ask them about the change you want. In many cases they will just make the + change for you. They might ask you to do it instead. Do whatever you've + agreed on. - When you have a working recipe and generated the package, upload-it - and you became the active maintainer. +- The maintainer is inactive or retired: -- The maintainer is inactive: + (Inactive means there were no uploaded packages in a long time.) - Contact them before starting your work, and allow them 1 to 2 weeks to - respond. If you don't get an answer, proceed as described above. + Send them a note that you will be updating such-and-such package, then go + ahead, make your change and upload the updated package. -- The maintainer is active, i.e. answers to bug reports, messages sent - on the maintainers mailing list or private messages: +Use common sense. For example, if you're making a change to CSWpython, you +really don't want to mess it up. Talk to people, ask on maintainers@, and get +help if you need it. The bigger the change you're making, the more need to +discuss it. When in doubt, write to maintainers at . - `Work in a branch`_, and when you obtain satisfying results explain your - changes to the maintainer such as he or she can use what you've done and/or, - if you obtain his or her explicit permission, merge your modifications on - the trunk. - References ========== @@ -39,3 +40,5 @@ .. [#branch] `Working in a branch`_ in OpenCSW wiki .. [#source] The original post on the maintainers mailing list: `[csw-maintainers] reminder on contributing on recipes`_ +.. _maintainer activity report: + http://buildfarm.opencsw.org/obsolete-pkgs/maintainer-activity.html This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 4 20:02:56 2015 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 4 Jan 2015 19:02:56 +0000 Subject: SF.net SVN: gar:[24542] csw/mgar/pkg/p7zip/trunk/Makefile Message-ID: <3kFq9j4pRjz1Jg@mail.opencsw.org> Revision: 24542 http://sourceforge.net/p/gar/code/24542 Author: wahwah Date: 2015-01-04 19:02:56 +0000 (Sun, 04 Jan 2015) Log Message: ----------- p7zip/trunk: uwatch works Modified Paths: -------------- csw/mgar/pkg/p7zip/trunk/Makefile Modified: csw/mgar/pkg/p7zip/trunk/Makefile =================================================================== --- csw/mgar/pkg/p7zip/trunk/Makefile 2015-01-04 17:50:26 UTC (rev 24541) +++ csw/mgar/pkg/p7zip/trunk/Makefile 2015-01-04 19:02:56 UTC (rev 24542) @@ -34,8 +34,8 @@ VENDOR_URL = http://p7zip.sourceforge.net/ LICENSE = DOCS/License.txt -UPSTREAM_MASTER_SITES = https://sourceforge.net/projects/p7zip/files/p7zip/ -UFILES_REGEX = p7zip_(\d\.)+_src_all.tar.bz2 +UPSTREAM_MASTER_SITES = http://sourceforge.net/projects/p7zip/files/p7zip/ +UFILES_REGEX = p7zip_([\d\.]+) PACKAGING_PLATFORMS = solaris9-i386 solaris9-sparc This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Jan 5 00:29:38 2015 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 4 Jan 2015 23:29:38 +0000 Subject: SF.net SVN: gar:[24543] csw/mgar/gar/v2/go/src Message-ID: <3kFx5X3WYJz1PX@mail.opencsw.org> Revision: 24543 http://sourceforge.net/p/gar/code/24543 Author: wahwah Date: 2015-01-04 23:29:38 +0000 (Sun, 04 Jan 2015) Log Message: ----------- package-gar-status: Initial commit First version of the GAR package status report. It will be a replacement for updateGarSvnPackageStatus[1] used to generate the GAR package status[2]. [1] http://sourceforge.net/p/opencsw/code/HEAD/tree/utilities/upstream_watch/updateGarSvnPackageStatus.sh [2] http://www.opencsw.org/package-gar-status.html Added Paths: ----------- csw/mgar/gar/v2/go/src/package-gar-status/ csw/mgar/gar/v2/go/src/package-gar-status/package-gar-status.go Added: csw/mgar/gar/v2/go/src/package-gar-status/package-gar-status.go =================================================================== --- csw/mgar/gar/v2/go/src/package-gar-status/package-gar-status.go (rev 0) +++ csw/mgar/gar/v2/go/src/package-gar-status/package-gar-status.go 2015-01-04 23:29:38 UTC (rev 24543) @@ -0,0 +1,115 @@ +// We're only including fields that are relevant now. Fields that are present in +// JSON data but are not in structs, are ignored by the unmarshaller. + +package main + +import ( + "fmt" + "flag" + "net/http" + "encoding/json" + "log" + "opencsw/diskformat" + "time" + "text/template" + "os" +) + +var outputFile string + +const tmpl = `GAR package status report +Generated on {{ .Date }} + +{{ range .Pkgs }} +{{ .Pkg.Catalogname }} is {{ if .InGar }} in GAR {{ else }} NOT in GAR {{ end }}{{ end }} +` + +func init() { + flag.StringVar(&outputFile, "output-file", "gar-package-status.txt", + "Where to write output.") +} + +type BasicStatsType struct { + Catalogname string `json:"catalogname"` + Md5_sum diskformat.Md5Sum `json:"md5_sum"` +} + +type PackageStats struct { + BadPaths map[string][]string `json:"bad_paths"` + BasicStats BasicStatsType `json:"basic_stats"` + Mtime string `json:"mtime"` // decode as time.Time? + Binaries []string `json:"binaries"` + Pkginfo map[string]string `json:"pkginfo"` +} + +func FindOutIfPackageIsInGar(md5 diskformat.Md5Sum) (bool, error) { + url := fmt.Sprintf("%s/srv4/%s/pkg-stats/", diskformat.PkgdbUrl, md5) + log.Println("Fetching", url) + resp, err := http.Get(url) + if err != nil { + return false, err + } + defer resp.Body.Close() + + var stats PackageStats + dec := json.NewDecoder(resp.Body) + if err := dec.Decode(&stats); err != nil { + log.Println("Failed to decode JSON from", url, ":", err) + return false, err + } + _, inGar := stats.Pkginfo["OPENCSW_REPOSITORY"] + return inGar, nil +} + +type PackageWithExtraData struct { + Pkg diskformat.Package + InGar bool +} + +type TemplateData struct { + Pkgs []PackageWithExtraData + Date time.Time +} + +func main() { + log.Println("Program start") + spec := diskformat.CatalogSpec { + "unstable", + "i386", + "SunOS5.10", + } + log.Println("spec:", spec) + + inGarByPkgname := make(map[string]PackageWithExtraData) + if cws, err := diskformat.GetCatalogWithSpec(spec); err != nil { + log.Fatalln("Error unmarshalling JSON data:", err) + } else { + for _, pkg := range cws.Pkgs { + log.Println("Processing", fmt.Sprintf("%+v", pkg)) + if inGar, err := FindOutIfPackageIsInGar(pkg.Md5_sum); err != nil { + log.Fatalln(pkg.Md5_sum, "boo", err) + } else { + log.Println("Result: ", pkg.Md5_sum, "is", inGar) + var pwed PackageWithExtraData + pwed.Pkg = pkg + pwed.InGar = inGar + inGarByPkgname[pkg.Catalogname] = pwed + } + } + } + f, err := os.Create(outputFile) + if err != nil { + panic(err) + } + defer f.Close() + var td TemplateData + td.Pkgs = make([]PackageWithExtraData, 0) + for _, pkg := range inGarByPkgname { + td.Pkgs = append(td.Pkgs, pkg) + } + td.Date = time.Now() + t := template.Must(template.New("tmpl").Parse(tmpl)) + if err := t.Execute(f, td); err != nil { + log.Fatal(err) + } +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Mon Jan 5 11:43:51 2015 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Mon, 5 Jan 2015 10:43:51 +0000 Subject: SF.net SVN: gar:[24544] csw/mgar/pkg/znapzend/trunk Message-ID: <3kGD3N2V4Hz3K@mail.opencsw.org> Revision: 24544 http://sourceforge.net/p/gar/code/24544 Author: lblume Date: 2015-01-05 10:43:51 +0000 (Mon, 05 Jan 2015) Log Message: ----------- znapzend/trunk: Bump to 0.14.0 Modified Paths: -------------- csw/mgar/pkg/znapzend/trunk/Makefile csw/mgar/pkg/znapzend/trunk/checksums Modified: csw/mgar/pkg/znapzend/trunk/Makefile =================================================================== --- csw/mgar/pkg/znapzend/trunk/Makefile 2015-01-04 23:29:38 UTC (rev 24543) +++ csw/mgar/pkg/znapzend/trunk/Makefile 2015-01-05 10:43:51 UTC (rev 24544) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = znapzend -VERSION = 0.13.0 +VERSION = 0.14.0 GARTYPE = v2 DESCRIPTION = The Multilevel Backup Tool for ZFS Modified: csw/mgar/pkg/znapzend/trunk/checksums =================================================================== --- csw/mgar/pkg/znapzend/trunk/checksums 2015-01-04 23:29:38 UTC (rev 24543) +++ csw/mgar/pkg/znapzend/trunk/checksums 2015-01-05 10:43:51 UTC (rev 24544) @@ -1 +1 @@ -1c62af89e2995d540cc5a217164299fd znapzend-0.13.0.tar.gz +08b849cc05158374f533aeb2cc9bf7ea znapzend-0.14.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Jan 6 13:24:54 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 6 Jan 2015 12:24:54 +0000 Subject: SF.net SVN: gar:[24548] csw/mgar/gar/v2/gar.conf.mk Message-ID: <3kGtFd5DrhzVg@mail.opencsw.org> Revision: 24548 http://sourceforge.net/p/gar/code/24548 Author: dmichelsen Date: 2015-01-06 12:24:52 +0000 (Tue, 06 Jan 2015) Log Message: ----------- mGAR v2: Automatically use FTP mirror Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2015-01-05 20:44:29 UTC (rev 24547) +++ csw/mgar/gar/v2/gar.conf.mk 2015-01-06 12:24:52 UTC (rev 24548) @@ -787,7 +787,7 @@ BERLIOS_MIRROR ?= http://download.berlios.de/$(BERLIOS_PROJECT)/ http://download2.berlios.de/$(BERLIOS_PROJECT)/ # GNU -GNU_SITE = http://ftp.gnu.org +GNU_SITE = http://ftpmirror.gnu.org/ GNU_GNUROOT = $(GNU_SITE)/gnu GNU_NGNUROOT = $(GNU_SITE)/non-gnu $(if $(GNU_PROJ),$(warning GNU_PROJ is deprecated, please use GNU_PROJECT instead)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Wed Jan 7 10:54:01 2015 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 7 Jan 2015 09:54:01 +0000 Subject: SF.net SVN: gar:[24551] csw/mgar/pkg/netsnmp/trunk/Makefile Message-ID: <3kHQrz0zHmz16s@mail.opencsw.org> Revision: 24551 http://sourceforge.net/p/gar/code/24551 Author: cgrzemba Date: 2015-01-07 09:54:01 +0000 (Wed, 07 Jan 2015) Log Message: ----------- netsnmp/trunk: add bug reference Modified Paths: -------------- csw/mgar/pkg/netsnmp/trunk/Makefile Modified: csw/mgar/pkg/netsnmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/netsnmp/trunk/Makefile 2015-01-07 09:50:54 UTC (rev 24550) +++ csw/mgar/pkg/netsnmp/trunk/Makefile 2015-01-07 09:54:01 UTC (rev 24551) @@ -35,6 +35,7 @@ PATCHFILES += 0002-workaround-ksh-stop-alias-problem.patch PATCHFILES += 0003-configure-disable-perl-cc-checks.patch PATCHFILES += 0004-enable-python-version-select.patch +# bug https://sourceforge.net/p/net-snmp/bugs/2585/ PATCHFILES += 0005-autotools-config_os_progs.patch # the following patches inspired by https://java.net/projects/solaris-userland of different authors PATCHFILES += 0002-pkcs.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guillomovitch at users.sourceforge.net Thu Jan 8 10:11:08 2015 From: guillomovitch at users.sourceforge.net (guillomovitch at users.sourceforge.net) Date: Thu, 8 Jan 2015 09:11:08 +0000 Subject: SF.net SVN: gar:[24553] csw/mgar/pkg/fusioninventory-agent/trunk Message-ID: <3kJ1s75KQ1z8j@mail.opencsw.org> Revision: 24553 http://sourceforge.net/p/gar/code/24553 Author: guillomovitch Date: 2015-01-08 09:11:08 +0000 (Thu, 08 Jan 2015) Log Message: ----------- fusioninventory-agent/trunk: new version 2.3.15 Modified Paths: -------------- csw/mgar/pkg/fusioninventory-agent/trunk/Makefile csw/mgar/pkg/fusioninventory-agent/trunk/checksums Modified: csw/mgar/pkg/fusioninventory-agent/trunk/Makefile =================================================================== --- csw/mgar/pkg/fusioninventory-agent/trunk/Makefile 2015-01-07 13:07:05 UTC (rev 24552) +++ csw/mgar/pkg/fusioninventory-agent/trunk/Makefile 2015-01-08 09:11:08 UTC (rev 24553) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = fusioninventory-agent -VERSION = 2.3.14 +VERSION = 2.3.15 GARTYPE = v2 CATEGORIES = cpan Modified: csw/mgar/pkg/fusioninventory-agent/trunk/checksums =================================================================== --- csw/mgar/pkg/fusioninventory-agent/trunk/checksums 2015-01-07 13:07:05 UTC (rev 24552) +++ csw/mgar/pkg/fusioninventory-agent/trunk/checksums 2015-01-08 09:11:08 UTC (rev 24553) @@ -1 +1 @@ -dd959dac759e2a1ec3bcfb0789be9e5c FusionInventory-Agent-2.3.14.tar.gz +9c34fefcb70076f860677eea056077ed FusionInventory-Agent-2.3.15.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Jan 8 23:55:28 2015 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Thu, 8 Jan 2015 22:55:28 +0000 Subject: SF.net SVN: gar:[24554] csw/mgar/pkg/openssl1/trunk Message-ID: <3kJN894vVHz13S@mail.opencsw.org> Revision: 24554 http://sourceforge.net/p/gar/code/24554 Author: chninkel Date: 2015-01-08 22:55:27 +0000 (Thu, 08 Jan 2015) Log Message: ----------- openssl1/trunk: Updated to 1.0.1k Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile csw/mgar/pkg/openssl1/trunk/checksums Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2015-01-08 09:11:08 UTC (rev 24553) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2015-01-08 22:55:27 UTC (rev 24554) @@ -13,7 +13,7 @@ ###### Package information ####### NAME = openssl -VERSION = 1.0.1j +VERSION = 1.0.1k GARTYPE = v2 SONAME=$(shell echo $(VERSION) | tr -d '[a-z]') Modified: csw/mgar/pkg/openssl1/trunk/checksums =================================================================== --- csw/mgar/pkg/openssl1/trunk/checksums 2015-01-08 09:11:08 UTC (rev 24553) +++ csw/mgar/pkg/openssl1/trunk/checksums 2015-01-08 22:55:27 UTC (rev 24554) @@ -1 +1 @@ -f7175c9cd3c39bb1907ac8bba9df8ed3 openssl-1.0.1j.tar.gz +d4f002bd22a56881340105028842ae1f openssl-1.0.1k.tar.gz 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 Jan 9 00:44:02 2015 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Thu, 8 Jan 2015 23:44:02 +0000 Subject: SF.net SVN: gar:[24555] csw/mgar/pkg/openssl/trunk Message-ID: <3kJPDC47S5z16G@mail.opencsw.org> Revision: 24555 http://sourceforge.net/p/gar/code/24555 Author: chninkel Date: 2015-01-08 23:44:01 +0000 (Thu, 08 Jan 2015) Log Message: ----------- openssl/trunk: updated to 0.9.8zd Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile csw/mgar/pkg/openssl/trunk/checksums Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2015-01-08 22:55:27 UTC (rev 24554) +++ csw/mgar/pkg/openssl/trunk/Makefile 2015-01-08 23:44:01 UTC (rev 24555) @@ -13,7 +13,7 @@ ###### Package information ####### NAME = openssl -VERSION = 0.9.8zc +VERSION = 0.9.8zd GARTYPE = v2 DESCRIPTION = The Open Source toolkit for SSL and TLS Modified: csw/mgar/pkg/openssl/trunk/checksums =================================================================== --- csw/mgar/pkg/openssl/trunk/checksums 2015-01-08 22:55:27 UTC (rev 24554) +++ csw/mgar/pkg/openssl/trunk/checksums 2015-01-08 23:44:01 UTC (rev 24555) @@ -1 +1 @@ -1b239eea3a60d67863e7b66700e47a16 openssl-0.9.8zc.tar.gz +e9b9ee12f2911e1a378e2458d9bfff77 openssl-0.9.8zd.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Fri Jan 9 15:08:13 2015 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Fri, 9 Jan 2015 14:08:13 +0000 Subject: SF.net SVN: gar:[24557] csw/mgar/pkg/ansible/trunk/Makefile Message-ID: <3kJmPV60XtzKJ@mail.opencsw.org> Revision: 24557 http://sourceforge.net/p/gar/code/24557 Author: janholzh Date: 2015-01-09 14:08:13 +0000 (Fri, 09 Jan 2015) Log Message: ----------- ansible/trunk: add CSWpython dep Modified Paths: -------------- csw/mgar/pkg/ansible/trunk/Makefile Modified: csw/mgar/pkg/ansible/trunk/Makefile =================================================================== --- csw/mgar/pkg/ansible/trunk/Makefile 2015-01-09 13:22:46 UTC (rev 24556) +++ csw/mgar/pkg/ansible/trunk/Makefile 2015-01-09 14:08:13 UTC (rev 24557) @@ -48,6 +48,7 @@ REINPLACE_WITH_usr = /opt/csw/share/ansible REINPLACE_FILES_usr = lib/ansible/constants.py +RUNTIME_DEP_PKGS = CSWpython RUNTIME_DEP_PKGS = CSWpy-jinja2 RUNTIME_DEP_PKGS += CSWpy-markupsafe RUNTIME_DEP_PKGS += CSWpy-yaml 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 Jan 9 15:59:51 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 9 Jan 2015 14:59:51 +0000 Subject: SF.net SVN: gar:[24558] csw/mgar/pkg/ghostscript/trunk Message-ID: <3kJnYD46MmzNF@mail.opencsw.org> Revision: 24558 http://sourceforge.net/p/gar/code/24558 Author: dmichelsen Date: 2015-01-09 14:59:50 +0000 (Fri, 09 Jan 2015) Log Message: ----------- ghostscript/trunk: Remove libijs building as it is not needed and general cleanup Modified Paths: -------------- csw/mgar/pkg/ghostscript/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/ghostscript/trunk/files/0001-Fix-for-latest-autotools.patch csw/mgar/pkg/ghostscript/trunk/files/0001-Use-ksh-and-GNU-sed-as-reported-in-4913.patch csw/mgar/pkg/ghostscript/trunk/files/map.ghostscript Modified: csw/mgar/pkg/ghostscript/trunk/Makefile =================================================================== --- csw/mgar/pkg/ghostscript/trunk/Makefile 2015-01-09 14:08:13 UTC (rev 24557) +++ csw/mgar/pkg/ghostscript/trunk/Makefile 2015-01-09 14:59:50 UTC (rev 24558) @@ -10,25 +10,13 @@ MASTER_SITES = http://downloads.ghostscript.com/public/ DISTFILES = $(NAME)-$(VERSION).tar.gz -#DISTFILES += map.ghostscript -# See for details https://www.opencsw.org/mantis/view.php?id=4913 -#PATCHFILES += 0001-Use-ksh-and-GNU-sed-as-reported-in-4913.patch - -# Use patch until this is fixed: -# http://bugs.ghostscript.com/show_bug.cgi?id=695692 -PATCHFILES += 0001-Fix-for-latest-autotools.patch - VENDOR_URL = http://www.ghostscript.com LICENSE = LICENSE GARCOMPILER = GCC4 -#GARFLAVOR = DBG - -#LINKER_MAPS ?= -M "$(abspath $(WORKDIR)/map.ghostscript)" - # Many more missing BUILD_DEP_PKGS += CSWlibpng-dev BUILD_DEP_PKGS += CSWlibz-dev @@ -39,7 +27,7 @@ BUILD_DEP_PKGS += CSWfontconfig-dev BUILD_DEP_PKGS += CSWlibjpeg-dev BUILD_DEP_PKGS += CSWlibpaper-dev -BUILD_DEP_PKGS += CSWlibcairo2 +BUILD_DEP_PKGS += CSWlibcairo-dev FOREIGN_PACKAGES += CSWlibgs8 @@ -65,7 +53,6 @@ RUNTIME_DEP_PKGS_CSWghostscript += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWghostscript += CSWlibgtk-x11-2-0-0 RUNTIME_DEP_PKGS_CSWghostscript += CSWliblcms2-2 -RUNTIME_DEP_PKGS_CSWghostscript += CSWlibijs0-35 RUNTIME_DEP_PKGS_CSWghostscript-sparc += CSWlibintl8 RUNTIME_DEP_PKGS_CSWghostscript += $(RUNTIME_DEP_PKGS_CSWghostscript-$(GARCH)) @@ -74,7 +61,7 @@ CHECKPKG_OVERRIDES_CSWghostscript += file-with-bad-content|/usr/local|root/opt/csw/bin/sparcv9/unix-lpr.sh CHECKPKG_OVERRIDES_CSWghostscript += file-with-bad-content|/usr/local|root/opt/csw/bin/sparcv8plus/lprsetup.sh CHECKPKG_OVERRIDES_CSWghostscript += file-with-bad-content|/usr/local|root/opt/csw/bin/sparcv8plus/unix-lpr.sh -CHECKPKG_OVERRIDES_CSWghostscript += file-with-bad-content|/usr/local|root/opt/csw/bin/pentium_pro/unix-lpr.sh +CHECKPKG_OVERRIDES_CSWghostscript += file-with-bad-content|/usr/local|root/opt/csw/bin/pentium_pro/unix-lpr.sh CHECKPKG_OVERRIDES_CSWghostscript += file-with-bad-content|/usr/local|root/opt/csw/bin/pentium_pro/lprsetup.sh CHECKPKG_OVERRIDES_CSWghostscript += file-with-bad-content|/usr/local|root/opt/csw/bin/amd64/lprsetup.sh CHECKPKG_OVERRIDES_CSWghostscript += file-with-bad-content|/usr/local|root/opt/csw/bin/amd64/unix-lpr.sh @@ -107,14 +94,6 @@ RUNTIME_DEP_PKGS_CSWlibgs9-sparc += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibgs9 += $(RUNTIME_DEP_PKGS_CSWlibgs9-$(GARCH)) -# This used to be a separate library and is now maintained as part of Ghostscript -PACKAGES += CSWlibijs0-35 -PKGFILES_CSWlibijs0-35 += $(call pkgfiles_lib,libijs-0.35.so) -SPKG_DESC_CSWlibijs0-35 = $(DESCRIPTION), libijs-0.35.so -RUNTIME_DEP_PKGS_CSWlibijs0-35 += CSWlibgcc-s1 -OBSOLETED_BY_CSWlibijs0-35 = CSWijs -CHECKPKG_OVERRIDES_CSWlibijs0-35 += soname-equals-filename - PACKAGES += CSWghostscript-dev SPKG_DESC_CSWghostscript-dev = Development files for ghostscript and libgs.so.9 # This remove all the .so symlinks for PKGFILES_DEVEL @@ -123,16 +102,9 @@ PKGFILES_DEVEL_SHAREDLIBLINK = PKGFILES_CSWghostscript-dev += $(PKGFILES_DEVEL) PKGFILES_CSWghostscript-dev += $(call baseisadirs,$(libdir),libgs\.so) -PKGFILES_CSWghostscript-dev += $(call baseisadirs,$(libdir),libijs\.so) RUNTIME_DEP_PKGS_CSWghostscript-dev += CSWlibgs9 -RUNTIME_DEP_PKGS_CSWghostscript-dev += CSWlibijs0-35 RUNTIME_DEP_PKGS_CSWghostscript-dev += CSWghostscript -REINPLACEMENTS += fontpath -REINPLACE_MATCH_fontpath = /usr/share/cups/fonts -REINPLACE_WITH_fontpath = $(sharedstatedir)/cups/fonts -REINPLACE_FILES_fontpath += cups/gstopxl.in - # This is for cups/gstoraster.c which doesn't seem to honour --with-fontpath EXTRA_CPPFLAGS += -DCUPS_FONTPATH=\\\"$(datadir)/ghostscript/fonts\\\" @@ -152,26 +124,19 @@ CONFIGURE_ARGS-DBG += --disable-compile-inits CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GARFLAVOR)) -# The arguments used for libijs -CONFIGURE_ARGS_ijs = $(DIRPATHS) -CONFIGURE_ARGS_ijs += --enable-shared -CONFIGURE_ARGS_ijs += --disable-static +# We do not bootstrap and compile libijs any more as Ghostscript statically compiles +# against the local ijs sources and the libijs library is not useful. See for details +# http://bugs.ghostscript.com/show_bug.cgi?id=695692 # We want the shared library BUILD_ARGS += so -# This is needed because libidn.so and libpaper.so are not linked with LDFLAGS set -#BUILD_ARGS += XTRALIBS="$(strip $(LINKER_FLAGS))" - -#TEST_ARGS += XTRALIBS="$(strip $(LINKER_FLAGS))" - INSTALL_ARGS += soinstall include gar/category.mk +# Remove local versions of libraies we want to link against system-wide post-extract: - # http://www.linuxfromscratch.org/blfs/view/svn/pst/gs.html - gsed -i 's/ZLIBDIR=src/ZLIBDIR=$$includedir/' $(WORKSRC)/configure.ac $(WORKSRC)/configure rm -rf $(WORKSRC)/lcms2 rm -rf $(WORKSRC)/zlib rm -rf $(WORKSRC)/jpeg @@ -183,25 +148,3 @@ rm -rf $(WORKSRC)/expat @$(MAKECOOKIE) -# For building IJS take this into account: -# http://bugs.ghostscript.com/show_bug.cgi?id=692040 - -post-configure: - # Specific for libijs - cd $(WORKSRC)/ijs && ./autogen.sh - cd $(WORKSRC)/ijs && \ - /usr/bin/env -i $(CONFIGURE_ENV) PWD=$(abspath $(WORKSRC)/ijs) \ - ./configure $(CONFIGURE_ARGS_ijs) - @$(MAKECOOKIE) - -post-build: - # Specific for libijs - cd $(WORKSRC)/ijs && \ - /usr/bin/env -i $(BUILD_ENV) $(MAKE) MAKEFLAGS= $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(BUILD_ARGS_ijs) - @$(MAKECOOKIE) - -post-install: - # Specific for libijs - cd $(WORKSRC)/ijs && \ - /usr/bin/env -i $(INSTALL_ENV) $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $(OBJDIR) $(INSTALL_ARGS_ijs) install - @$(MAKECOOKIE) Deleted: csw/mgar/pkg/ghostscript/trunk/files/0001-Fix-for-latest-autotools.patch =================================================================== --- csw/mgar/pkg/ghostscript/trunk/files/0001-Fix-for-latest-autotools.patch 2015-01-09 14:08:13 UTC (rev 24557) +++ csw/mgar/pkg/ghostscript/trunk/files/0001-Fix-for-latest-autotools.patch 2015-01-09 14:59:50 UTC (rev 24558) @@ -1,97 +0,0 @@ -From 5732afdaaa749b7caf4757c1d6f7b92c87bf5e5b Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Tue, 11 Nov 2014 15:27:55 +0100 -Subject: [PATCH] Fix for latest autotools - ---- - ijs/Makefile.am | 4 +++- - ijs/autogen.sh | 4 ++-- - ijs/configure.ac | 7 ++++--- - 3 files changed, 9 insertions(+), 6 deletions(-) - -diff --git a/ijs/Makefile.am b/ijs/Makefile.am -index 6ca2adf..50c5755 100644 ---- a/ijs/Makefile.am -+++ b/ijs/Makefile.am -@@ -23,7 +23,9 @@ - - ## Process this file with automake to produce Makefile.in. - --AUTOMAKE_OPTIONS = 1.8 foreign dist-bzip2 no-dependencies -+AUTOMAKE_OPTIONS = 1.6 foreign dist-bzip2 no-dependencies -+ -+ACLOCAL_AMFLAGS = -I m4 - - @SET_MAKE@ - -diff --git a/ijs/autogen.sh b/ijs/autogen.sh -index 4e346eb..3b3c509 100755 ---- a/ijs/autogen.sh -+++ b/ijs/autogen.sh -@@ -51,7 +51,7 @@ VERSIONGREP="sed -e s/.*[^0-9\.]\([0-9]\.[0-9]\).*/\1/" - echo - else - echo -n "checking for automake $AM_NEEDED or later... " -- for am in automake-$AM_NEEDED automake$AM_NEEDED automake; do -+ for am in automake automake-$AM_NEEDED automake$AM_NEEDED automake; do - ($am --version < /dev/null > /dev/null 2>&1) || continue - AM_MAJOR=`echo $AM_NEEDED |cut -d. -f1` - AM_MINOR=`echo $AM_NEEDED |cut -d. -f2` -@@ -65,7 +65,7 @@ VERSIONGREP="sed -e s/.*[^0-9\.]\([0-9]\.[0-9]\).*/\1/" - done - test -z $AUTOMAKE && echo "no" - echo -n "checking for aclocal $AM_NEEDED or later... " -- for ac in aclocal-$AM_NEEDED aclocal$AM_NEEDED aclocal; do -+ for ac in aclocal aclocal-$AM_NEEDED aclocal$AM_NEEDED aclocal; do - ($ac --version < /dev/null > /dev/null 2>&1) || continue - AM_MAJOR=`echo $AM_NEEDED |cut -d. -f1` - AM_MINOR=`echo $AM_NEEDED |cut -d. -f2` -diff --git a/ijs/configure.ac b/ijs/configure.ac -index df0260f..f0fae9f 100644 ---- a/ijs/configure.ac -+++ b/ijs/configure.ac -@@ -51,6 +51,7 @@ pushdef([IJS_VERSION], IJS_MAJOR_VERSION.IJS_MINOR_VERSION[]IJS_EXTRA_VERSION) - - AC_INIT(IJS_NAME, IJS_VERSION, [inkjet-list at linuxprinting.org]) - AC_PREREQ(2.53) -+AC_CONFIG_MACRO_DIR([m4]) - AC_CONFIG_SRCDIR(ijs.c) - AC_REVISION($Revision: 5783 $) - -@@ -84,7 +85,7 @@ popdef([IJS_INTERFACE_AGE]) - popdef([IJS_BINARY_AGE]) - - dnl Initialize automake stuff. --AM_INIT_AUTOMAKE(IJS_NAME, IJS_VERSION) -+AM_INIT_AUTOMAKE - popdef([IJS_NAME]) - popdef([IJS_VERSION]) - -@@ -117,7 +118,7 @@ AC_SUBST(LIBTOOL_DEPS) - dnl Checks for programs - - AC_PROG_CC --AM_PROG_LIBTOOL -+AC_PROG_LIBTOOL - AC_SUBST(LIBTOOL_DEPS) - AC_ISC_POSIX - AC_PROG_INSTALL -@@ -140,6 +141,7 @@ case ${host_os} in - cygwin | mingw32 | pw32 | interix3 | interix | uwin) libijs_sysdeps="windows";; - *) libijs_sysdeps="unix";; - esac -+ - AM_CONDITIONAL(SYSDEPS_WINDOWS, test x$libijs_sysdeps = xwindows) - - -@@ -151,7 +153,6 @@ AC_SUBST(IJS_VERSION) - AC_SUBST(ijs_cflags) - ijs_libs="${IJS_LIBS} ${IJS_DEPLIBS}" - AC_SUBST(ijs_libs) --AC_SUBST(INCLUDES) - LIBIJS_LIBS="${LIBIJS_LIBS} ${IJS_DEPLIBS}" - AC_SUBST(LIBIJS_LIBS) - --- -2.0.3 - Deleted: csw/mgar/pkg/ghostscript/trunk/files/0001-Use-ksh-and-GNU-sed-as-reported-in-4913.patch =================================================================== --- csw/mgar/pkg/ghostscript/trunk/files/0001-Use-ksh-and-GNU-sed-as-reported-in-4913.patch 2015-01-09 14:08:13 UTC (rev 24557) +++ csw/mgar/pkg/ghostscript/trunk/files/0001-Use-ksh-and-GNU-sed-as-reported-in-4913.patch 2015-01-09 14:59:50 UTC (rev 24558) @@ -1,120 +0,0 @@ -From 120c2d04e6e3693608a686bd56f5a71a7cf1a860 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Thu, 6 Jun 2013 11:55:38 +0200 -Subject: [PATCH] Use ksh and GNU sed as reported in #4913 - ---- - cups/gstopxl.in | 32 ++++++++++++++++---------------- - 1 file changed, 16 insertions(+), 16 deletions(-) - -diff --git a/cups/gstopxl.in b/cups/gstopxl.in -index 7c4fe88..4e5972b 100755 ---- a/cups/gstopxl.in -+++ b/cups/gstopxl.in -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/bin/ksh - # - # - # CUPS PCL XL/PCL 6 filter script for Ghostscript. -@@ -50,9 +50,9 @@ ps_code= - ppd_opts= - - resolution= --eval "$(printf "%s" "$5" | sed @SED_EXTENDED_REGEX_OPT@ 's/.*(^|[[:space:]])Resolution=([0-9.]+(x[0-9.]+)?).*/resolution="${resolution:-\2}"/p')" -+eval "$(printf "%s" "$5" | /opt/csw/bin/sed @SED_EXTENDED_REGEX_OPT@ 's/.*(^|[[:space:]])Resolution=([0-9.]+(x[0-9.]+)?).*/resolution="${resolution:-\2}"/p')" - if test -e "$PPD"; then -- eval "$(sed @SED_EXTENDED_REGEX_OPT@ 's/^\*DefaultResolution:[[:space:]]+([0-9.]+(x[0-9.]+)?).*/resolution="${resolution:-\1}"/p' "$PPD")" -+ eval "$(/opt/csw/bin/sed @SED_EXTENDED_REGEX_OPT@ 's/^\*DefaultResolution:[[:space:]]+([0-9.]+(x[0-9.]+)?).*/resolution="${resolution:-\1}"/p' "$PPD")" - fi - echo "DEBUG: Resolution: $resolution" >&2 - if test -n "$resolution"; then -@@ -60,15 +60,15 @@ if test -n "$resolution"; then - fi - - pagesize= --eval "$(printf "%s" "$5" | sed @SED_EXTENDED_REGEX_OPT@ 's/.*(^|[[:space:]])(media|PageSize)=([^[:space:]]+).*/pagesize="${pagesize:-\3}"/p')" -+eval "$(printf "%s" "$5" | /opt/csw/bin/sed @SED_EXTENDED_REGEX_OPT@ 's/.*(^|[[:space:]])(media|PageSize)=([^[:space:]]+).*/pagesize="${pagesize:-\3}"/p')" - if test -e "$PPD"; then -- eval "$(sed @SED_EXTENDED_REGEX_OPT@ 's/^\*DefaultPageSize:[[:space:]]+([^[:space:]]+).*/pagesize="${pagesize:-\1}"/p' "$PPD")" -+ eval "$(/opt/csw/bin/sed @SED_EXTENDED_REGEX_OPT@ 's/^\*DefaultPageSize:[[:space:]]+([^[:space:]]+).*/pagesize="${pagesize:-\1}"/p' "$PPD")" - fi - echo "DEBUG: Page size: $pagesize" >&2 - width= - height= - if test -n "$pagesize" && test -e "$PPD"; then -- eval "$(sed @SED_EXTENDED_REGEX_OPT@ 's|^\*PaperDimension[[:space:]]+'"$pagesize"'/[^:]+:[[:space:]]+"([^[:space:]]+)[[:space:]]+([^[:space:]]+)".*|width="\1"; height="\2"|p' "$PPD")" -+ eval "$(/opt/csw/bin/sed @SED_EXTENDED_REGEX_OPT@ 's|^\*PaperDimension[[:space:]]+'"$pagesize"'/[^:]+:[[:space:]]+"([^[:space:]]+)[[:space:]]+([^[:space:]]+)".*|width="\1"; height="\2"|p' "$PPD")" - fi - echo "DEBUG: Width: $width, height: $height" >&2 - if test -n "$width"; then -@@ -83,7 +83,7 @@ bl_y= - tr_x= - tr_y= - if test -n "$pagesize" && test -e "$PPD"; then -- eval "$(sed @SED_EXTENDED_REGEX_OPT@ 's|^\*ImageableArea[[:space:]]+'"$pagesize"'/[^:]+:[[:space:]]+"([^[:space:]]+)[[:space:]]+([^[:space:]]+)[[:space:]]+([^[:space:]]+)[[:space:]]+([^[:space:]]+)".*|bl_x="\1"; bl_y="\2"; tr_x="\3"; tr_y="\4"|p' "$PPD")" -+ eval "$(/opt/csw/bin/sed @SED_EXTENDED_REGEX_OPT@ 's|^\*ImageableArea[[:space:]]+'"$pagesize"'/[^:]+:[[:space:]]+"([^[:space:]]+)[[:space:]]+([^[:space:]]+)[[:space:]]+([^[:space:]]+)[[:space:]]+([^[:space:]]+)".*|bl_x="\1"; bl_y="\2"; tr_x="\3"; tr_y="\4"|p' "$PPD")" - fi - echo "DEBUG: Absolute margins: $bl_x, $bl_y, $tr_x, $tr_y" >&2 - margin_l= -@@ -105,14 +105,14 @@ if test -n "$margin_l" && test -n "$margin_b" && \ - fi - - inputslot= --eval "$(printf "%s" "$5" | sed @SED_EXTENDED_REGEX_OPT@ 's/.*(^|[[:space:]])(InputSlot)=([^[:space:]]+).*/inputslot="${inputslot:-\3}"/p')" -+eval "$(printf "%s" "$5" | /opt/csw/bin/sed @SED_EXTENDED_REGEX_OPT@ 's/.*(^|[[:space:]])(InputSlot)=([^[:space:]]+).*/inputslot="${inputslot:-\3}"/p')" - if test -e "$PPD"; then -- eval "$(sed @SED_EXTENDED_REGEX_OPT@ 's/^\*DefaultInputSlot:[[:space:]]+([^[:space:]]+).*/inputslot="${inputslot:-\1}"/p' "$PPD")" -+ eval "$(/opt/csw/bin/sed @SED_EXTENDED_REGEX_OPT@ 's/^\*DefaultInputSlot:[[:space:]]+([^[:space:]]+).*/inputslot="${inputslot:-\1}"/p' "$PPD")" - fi - echo "DEBUG: InputSlot: $inputslot" >&2 - inputslot_val= - if test -n "$inputslot" && test -e "$PPD"; then -- eval "$(sed @SED_EXTENDED_REGEX_OPT@ 's|^\*InputSlot[[:space:]]+'"$inputslot"'/[^:]+:[[:space:]]+"[[:space:]]*<[[:space:]]*<[[:space:]]*/MediaPosition[[:space:]]*([0-9]+)[[:space:]]*>[[:space:]]*>[[:space:]]*setpagedevice[[:space:]]*".*|inputslot_val="\1"|p' "$PPD")" -+ eval "$(/opt/csw/bin/sed @SED_EXTENDED_REGEX_OPT@ 's|^\*InputSlot[[:space:]]+'"$inputslot"'/[^:]+:[[:space:]]+"[[:space:]]*<[[:space:]]*<[[:space:]]*/MediaPosition[[:space:]]*([0-9]+)[[:space:]]*>[[:space:]]*>[[:space:]]*setpagedevice[[:space:]]*".*|inputslot_val="\1"|p' "$PPD")" - fi - echo "DEBUG: Value for MediaPosition: $inputslot_val" >&2 - if test -n "$inputslot_val"; then -@@ -120,9 +120,9 @@ if test -n "$inputslot_val"; then - fi - - colormodel= --eval "$(printf "%s" "$5" | sed @SED_EXTENDED_REGEX_OPT@ 's/.*(^|[[:space:]])(ColorModel)=([^[:space:]]+).*/colormodel="${colormodel:-\3}"/p')" -+eval "$(printf "%s" "$5" | /opt/csw/bin/sed @SED_EXTENDED_REGEX_OPT@ 's/.*(^|[[:space:]])(ColorModel)=([^[:space:]]+).*/colormodel="${colormodel:-\3}"/p')" - if test -e "$PPD"; then -- eval "$(sed @SED_EXTENDED_REGEX_OPT@ 's/^\*DefaultColorModel:[[:space:]]+([^[:space:]]+).*/colormodel="${colormodel:-\1}"/p' "$PPD")" -+ eval "$(/opt/csw/bin/sed @SED_EXTENDED_REGEX_OPT@ 's/^\*DefaultColorModel:[[:space:]]+([^[:space:]]+).*/colormodel="${colormodel:-\1}"/p' "$PPD")" - fi - echo "DEBUG: ColorModel: $colormodel" >&2 - if test "$colormodel" = "Gray"; then -@@ -130,7 +130,7 @@ if test "$colormodel" = "Gray"; then - fi - colormodel_val= - if test -n "$colormodel" && test -e "$PPD"; then -- eval "$(sed @SED_EXTENDED_REGEX_OPT@ 's|^\*ColorModel[[:space:]]+'"$colormodel"'/[^:]+:[[:space:]]+"[[:space:]]*<[[:space:]]*<[[:space:]]*/BitsPerPixel[[:space:]]*([0-9]*)[[:space:]]*>[[:space:]]*>[[:space:]]*setpagedevice[[:space:]]*".*|colormodel_val="\1"|p' "$PPD")" -+ eval "$(/opt/csw/bin/sed @SED_EXTENDED_REGEX_OPT@ 's|^\*ColorModel[[:space:]]+'"$colormodel"'/[^:]+:[[:space:]]+"[[:space:]]*<[[:space:]]*<[[:space:]]*/BitsPerPixel[[:space:]]*([0-9]*)[[:space:]]*>[[:space:]]*>[[:space:]]*setpagedevice[[:space:]]*".*|colormodel_val="\1"|p' "$PPD")" - fi - echo "DEBUG: Value for BitsPerPixel: $colormodel_val" >&2 - if test -n "$colormodel_val"; then -@@ -138,15 +138,15 @@ if test -n "$colormodel_val"; then - fi - - duplex= --eval "$(printf "%s" "$5" | sed @SED_EXTENDED_REGEX_OPT@ 's/.*(^|[[:space:]])(Duplex)=([^[:space:]]+).*/duplex="${duplex:-\3}"/p')" -+eval "$(printf "%s" "$5" | /opt/csw/bin/sed @SED_EXTENDED_REGEX_OPT@ 's/.*(^|[[:space:]])(Duplex)=([^[:space:]]+).*/duplex="${duplex:-\3}"/p')" - if test -e "$PPD"; then -- eval "$(sed @SED_EXTENDED_REGEX_OPT@ 's/^\*DefaultDuplex:[[:space:]]+([^[:space:]]+).*/duplex="${duplex:-\1}"/p' "$PPD")" -+ eval "$(/opt/csw/bin/sed @SED_EXTENDED_REGEX_OPT@ 's/^\*DefaultDuplex:[[:space:]]+([^[:space:]]+).*/duplex="${duplex:-\1}"/p' "$PPD")" - fi - echo "DEBUG: Duplex: $duplex" >&2 - duplex_val= - tumble_val= - if test -n "$duplex" && test -e "$PPD"; then -- eval "$(sed @SED_EXTENDED_REGEX_OPT@ 's|^\*Duplex[[:space:]]+'"$duplex"'/[^:]+:[[:space:]]+"[[:space:]]*<[[:space:]]*<[[:space:]]*/Duplex[[:space:]]*([^[:space:]]*)[[:space:]]*(/Tumble[[:space:]]*([^[:space:]]*)[[:space:]]*)?>[[:space:]]*>[[:space:]]*setpagedevice[[:space:]]*".*|duplex_val="\1"; tumble_val="\3"|p' "$PPD")" -+ eval "$(/opt/csw/bin/sed @SED_EXTENDED_REGEX_OPT@ 's|^\*Duplex[[:space:]]+'"$duplex"'/[^:]+:[[:space:]]+"[[:space:]]*<[[:space:]]*<[[:space:]]*/Duplex[[:space:]]*([^[:space:]]*)[[:space:]]*(/Tumble[[:space:]]*([^[:space:]]*)[[:space:]]*)?>[[:space:]]*>[[:space:]]*setpagedevice[[:space:]]*".*|duplex_val="\1"; tumble_val="\3"|p' "$PPD")" - fi - echo "DEBUG: Value for Duplex: $duplex_val; Value for Tumble: $tumble_val" >&2 - if test -n "$duplex_val"; then --- -1.8.1.4 - Deleted: csw/mgar/pkg/ghostscript/trunk/files/map.ghostscript =================================================================== --- csw/mgar/pkg/ghostscript/trunk/files/map.ghostscript 2015-01-09 14:08:13 UTC (rev 24557) +++ csw/mgar/pkg/ghostscript/trunk/files/map.ghostscript 2015-01-09 14:59:50 UTC (rev 24558) @@ -1 +0,0 @@ -libc.so - SUNW_1.22.5 SUNWprivate_1.1 $ADDVERS=SUNW_1.22.5; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Sun Jan 11 23:39:50 2015 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sun, 11 Jan 2015 22:39:50 +0000 Subject: SF.net SVN: gar:[24559] csw/mgar/pkg/ImageMagick/trunk Message-ID: <3kLCft3vRQz1X4@mail.opencsw.org> Revision: 24559 http://sourceforge.net/p/gar/code/24559 Author: lblume Date: 2015-01-11 22:39:49 +0000 (Sun, 11 Jan 2015) Log Message: ----------- ImageMagick/trunk: Bump to 6.9.0-3 (2nd try) Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile csw/mgar/pkg/ImageMagick/trunk/checksums Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2015-01-09 14:59:50 UTC (rev 24558) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2015-01-11 22:39:49 UTC (rev 24559) @@ -1,6 +1,6 @@ NAME = imagemagick VERSION = 6.9.0 -GARSUBREV = 0 +GARSUBREV = 3 #BETAREV = beta20140518 GARTYPE = v2 Modified: csw/mgar/pkg/ImageMagick/trunk/checksums =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/checksums 2015-01-09 14:59:50 UTC (rev 24558) +++ csw/mgar/pkg/ImageMagick/trunk/checksums 2015-01-11 22:39:49 UTC (rev 24559) @@ -1 +1 @@ -3714e7d5d248c13aee95a7f54970349f ImageMagick-6.9.0-0.tar.xz +353201b0f5d8c86a50303769bbca6c9e ImageMagick-6.9.0-3.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Tue Jan 13 00:47:41 2015 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Mon, 12 Jan 2015 23:47:41 +0000 Subject: SF.net SVN: gar:[24331] csw/mgar/pkg/perl/trunk/Makefile In-Reply-To: <3jd5w51htqz1Sv@mail.opencsw.org> References: <3jd5w51htqz1Sv@mail.opencsw.org> Message-ID: These build options are best kept in your ~/.garrc I think. 2014-11-12 13:12 GMT+00:00 : > Revision: 24331 > http://sourceforge.net/p/gar/code/24331 > Author: claudio_sf > Date: 2014-11-12 13:12:42 +0000 (Wed, 12 Nov 2014) > Log Message: > ----------- > perl/trunk: Some overrides > > Modified Paths: > -------------- > csw/mgar/pkg/perl/trunk/Makefile > > Modified: csw/mgar/pkg/perl/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/perl/trunk/Makefile 2014-11-12 07:13:41 UTC (rev 24330) > +++ csw/mgar/pkg/perl/trunk/Makefile 2014-11-12 13:12:42 UTC (rev 24331) > @@ -27,8 +27,8 @@ > > # GCC build (Sun Studio build has been fixed) > GARCOMPILER = GCC4 > -MAKE_OPT_unstable10s = -j 24 > -MAKE_OPT_unstable10x = -j 4 > +#MAKE_OPT_unstable10s = -j 24 > +#MAKE_OPT_unstable10x = -j 4 > MAKE_OPT = $(MAKE_OPT_$(shell hostname)) > BUILD64 = 1 > ISAEXEC = 1 > > This was sent by the SourceForge.net collaborative development platform, > the world's largest Open Source development site. > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From maciej at opencsw.org Tue Jan 13 00:48:28 2015 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Mon, 12 Jan 2015 23:48:28 +0000 Subject: SF.net SVN: gar:[24330] csw/mgar/pkg/augeas/trunk/Makefile In-Reply-To: <3jcxxp2gL4z1Jf@mail.opencsw.org> References: <3jcxxp2gL4z1Jf@mail.opencsw.org> Message-ID: Why add these dependencies? What are they needed for? 2014-11-12 7:13 GMT+00:00 : > Revision: 24330 > http://sourceforge.net/p/gar/code/24330 > Author: tosmi > Date: 2014-11-12 07:13:41 +0000 (Wed, 12 Nov 2014) > Log Message: > ----------- > checkpkg overrides for dependencies > > Modified Paths: > -------------- > csw/mgar/pkg/augeas/trunk/Makefile > > Modified: csw/mgar/pkg/augeas/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/augeas/trunk/Makefile 2014-11-12 07:10:23 UTC (rev 24329) > +++ csw/mgar/pkg/augeas/trunk/Makefile 2014-11-12 07:13:41 UTC (rev 24330) > @@ -54,7 +54,9 @@ > > CHECKPKG_OVERRIDES_CSWaugeas += surplus-dependency|CSWlibxml2-2 > CHECKPKG_OVERRIDES_CSWaugeas += surplus-dependency|CSWlibgcc-s1 > -CHECKPKG_OVERRIDES_CSWlibfa1 += missing-dependency|CSWlibgnugetopt0 > +CHECKPKG_OVERRIDES_CSWaugeas += surplus-dependency|CSWlibgnugetopt0 > +CHECKPKG_OVERRIDES_CSWlibfa1 += surplus-dependency|CSWlibgnugetopt0 > +CHECKPKG_OVERRIDES_CSWlibaugeas0 += surplus-dependency|CSWlibgnugetopt0 > > GARCOMPILER = GCC4 > EXTRA_LDFLAGS = -lgnugetopt > > This was sent by the SourceForge.net collaborative development platform, > the world's largest Open Source development site. > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From maciej at opencsw.org Tue Jan 13 00:50:19 2015 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Mon, 12 Jan 2015 23:50:19 +0000 Subject: SF.net SVN: gar:[24326] csw/mgar/pkg/facter/trunk/Makefile In-Reply-To: <3jch1C3FZfzsH@mail.opencsw.org> References: <3jch1C3FZfzsH@mail.opencsw.org> Message-ID: I was wondering, did you scroll up and read about why checkpkg thinks that CSWlibruby1-9-1-1 or CSWruby or CSWruby18 or CSWruby191 are needed as dependencies? The reason could be different than you think. 2014-11-11 20:45 GMT+00:00 : > Revision: 24326 > http://sourceforge.net/p/gar/code/24326 > Author: tosmi > Date: 2014-11-11 20:45:36 +0000 (Tue, 11 Nov 2014) > Log Message: > ----------- > fixed checkpkg errors > > Modified Paths: > -------------- > csw/mgar/pkg/facter/trunk/Makefile > > Modified: csw/mgar/pkg/facter/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/facter/trunk/Makefile 2014-11-11 20:36:08 UTC (rev 24325) > +++ csw/mgar/pkg/facter/trunk/Makefile 2014-11-11 20:45:36 UTC (rev 24326) > @@ -32,10 +32,14 @@ > TEST_SCRIPTS = > INSTALL_SCRIPTS = facter > > -CHECKPKG_OVERRIDES_CSWfacter += > file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/site_ruby/1.8/facter/ssh.rb > -CHECKPKG_OVERRIDES_CSWfacter += > file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/site_ruby/1.8/facter/Cfkey.rb > -CHECKPKG_OVERRIDES_CSWfacter += > file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/site_ruby/1.8/facter/util/manufacturer.rb > +CHECKPKG_OVERRIDES_CSWfacter += > file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/site_ruby/2.0.0/facter/ssh.rb > +CHECKPKG_OVERRIDES_CSWfacter += > file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/site_ruby/2.0.0/facter/Cfkey.rb > +CHECKPKG_OVERRIDES_CSWfacter += > file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/site_ruby/2.0.0/facter/util/manufacturer.rb > > +# we depend on ruby20 but checkpkg does not know anything about it > +CHECKPKG_OVERRIDES_CSWfacter += > missing-dependency|CSWlibruby1-9-1-1|or|CSWruby|or|CSWruby18|or|CSWruby191 > +CHECKPKG_OVERRIDES_CSWfacter += surplus-dependency|CSWruby20 > + > include gar/category.mk > > install-facter: > > This was sent by the SourceForge.net collaborative development platform, > the world's largest Open Source development site. > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From dmichelsen at users.sourceforge.net Tue Jan 13 11:01:40 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 13 Jan 2015 10:01:40 +0000 Subject: SF.net SVN: gar:[24560] csw/mgar/pkg/php5/branches/php-5.6.x Message-ID: <3kM6l9563CzVm@mail.opencsw.org> Revision: 24560 http://sourceforge.net/p/gar/code/24560 Author: dmichelsen Date: 2015-01-13 10:01:40 +0000 (Tue, 13 Jan 2015) Log Message: ----------- php5/branches/php-5.6.x: Update to 5.6.0 Modified Paths: -------------- csw/mgar/pkg/php5/branches/php-5.6.x/Makefile csw/mgar/pkg/php5/branches/php-5.6.x/checksums Modified: csw/mgar/pkg/php5/branches/php-5.6.x/Makefile =================================================================== --- csw/mgar/pkg/php5/branches/php-5.6.x/Makefile 2015-01-11 22:39:49 UTC (rev 24559) +++ csw/mgar/pkg/php5/branches/php-5.6.x/Makefile 2015-01-13 10:01:40 UTC (rev 24560) @@ -1,5 +1,5 @@ NAME = php -VERSION = 5.6-201404160230 +VERSION = 5.6.0 GARTYPE = v2 DESCRIPTION = A high-level scripting language. @@ -39,7 +39,7 @@ VENDOR_URL = http://www.php.net/ LICENSE = LICENSE -DISTNAME = $(NAME)$(VERSION) +DISTNAME = $(NAME)-$(VERSION) DISTFILES += $(DISTNAME).tar.xz DISTFILES += phpext pear.conf.CSW CSWphp5.postinstall DISTFILES += CSWphp5.cswreleasenotes Modified: csw/mgar/pkg/php5/branches/php-5.6.x/checksums =================================================================== --- csw/mgar/pkg/php5/branches/php-5.6.x/checksums 2015-01-11 22:39:49 UTC (rev 24559) +++ csw/mgar/pkg/php5/branches/php-5.6.x/checksums 2015-01-13 10:01:40 UTC (rev 24560) @@ -1 +1 @@ -70f03bbab8a96f4edc97fa230df4032b php5.6-201404160230.tar.xz +642825d75ce2634d9513d5b21dbee521 php-5.6.0.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jan 14 09:25:22 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 14 Jan 2015 08:25:22 +0000 Subject: SF.net SVN: gar:[24561] csw/mgar/pkg/subversion/trunk Message-ID: <3kMhYZ27htzl9@mail.opencsw.org> Revision: 24561 http://sourceforge.net/p/gar/code/24561 Author: dmichelsen Date: 2015-01-14 08:25:22 +0000 (Wed, 14 Jan 2015) Log Message: ----------- subversion/trunk: Undo all of the wrong stuff since my last commit Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile csw/mgar/pkg/subversion/trunk/checksums Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2015-01-13 10:01:40 UTC (rev 24560) +++ csw/mgar/pkg/subversion/trunk/Makefile 2015-01-14 08:25:22 UTC (rev 24561) @@ -20,7 +20,7 @@ # http://subversion.apache.org/mailing-lists.html NAME = subversion -VERSION = 1.8.11 +VERSION = 1.8.5 GARTYPE = v2 DESCRIPTION = Version control rethought @@ -59,9 +59,6 @@ SPKG_DESC_CSWsvn = Version control rethought CATALOGNAME_CSWsvn = subversion CHECKPKG_OVERRIDES_CSWsvn += catalogname-does-not-match-pkgname|pkgname=CSWsvn|catalogname=subversion|expected-catalogname=svn -CHECKPKG_OVERRIDES_CSWsvn += file-needed-but-no-package-satisfies-it|/opt/csw/lib/svn/libsvn_ra_neon-1.so.0.0.0|CSWsvn|contains|symlink|/opt/csw/lib/svn/libsvn_ra_dav-1.so|which|needs|the|target|file:|/opt/csw/lib/svn/libsvn_ra_neon-1.so.0.0.0 -CHECKPKG_OVERRIDES_CSWsvn += file-needed-but-no-package-satisfies-it|/opt/csw/lib/svn/libsvn_ra_neon-1.so.0.0.0|CSWsvn|contains|symlink|/opt/csw/lib/svn/libsvn_ra_dav-1.so.0|which|needs|the|target|file:|/opt/csw/lib/svn/libsvn_ra_neon-1.so.0.0.0 -CHECKPKG_OVERRIDES_CSWsvn += file-with-bad-content|/usr/local|root/opt/csw/lib/svn/libsvn_repos-1.so.0.0.0 RUNTIME_DEP_PKGS_CSWsvn = CSWbdb48 RUNTIME_DEP_PKGS_CSWsvn += CSWlibsasl2-2 RUNTIME_DEP_PKGS_CSWsvn += CSWlibmagic1 @@ -72,16 +69,17 @@ RUNTIME_DEP_PKGS_CSWsvn += CSWlibapr1-0 RUNTIME_DEP_PKGS_CSWsvn += CSWlibaprutil1-0 RUNTIME_DEP_PKGS_CSWsvn += CSWlibserf1-1 +RUNTIME_DEP_PKGS_CSWsvn += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWsvn += CSWlibgnome-keyring0 RUNTIME_DEP_PKGS_CSWsvn_5.9 += CSWglib2 RUNTIME_DEP_PKGS_CSWsvn_5.10 += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWsvn += $(RUNTIME_DEP_PKGS_CSWsvn_$(GAROSREL)) - PACKAGES += CSWsvn-dev SPKG_DESC_CSWsvn-dev = Subversion Development Support PKGFILES_CSWsvn-dev += $(PKGFILES_DEVEL) PKGFILES_CSWsvn-dev += $(docdir)/$(CATALOGNAME_CSWsvn-dev)/changelog.CSW +OBSOLETED_BY_CSWsvn-dev += CSWsvn-devel PACKAGES += CSWap2svn SPKG_DESC_CSWap2svn = Subversion Modules for Apache 2.2 @@ -101,7 +99,6 @@ RUNTIME_DEP_PKGS_CSWap2svn += CSWbdb48 RUNTIME_DEP_PKGS_CSWap2svn += CSWlibiconv2 - PACKAGES += CSWjavasvn SPKG_DESC_CSWjavasvn = Subversion Java Language Binding PKGFILES_CSWjavasvn += $(SVNLIB)/.*java.* @@ -122,11 +119,11 @@ # This would go away when -norunpath would make it to the linker, but at this point this is difficult. # Override for now as it is not harmful. CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 +CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 -CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib/sparc|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 +CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 - PACKAGES += CSWpmsvn SPKG_DESC_CSWpmsvn = Subversion Perl Language Binding CATALOGNAME_CSWpmsvn = pm_subversion @@ -137,6 +134,14 @@ PKGFILES_CSWpmsvn += $(docdir)/$(CATALOGNAME_CSWpmsvn)/changelog.CSW RUNTIME_DEP_PKGS_CSWpmsvn += CSWperl RUNTIME_DEP_PKGS_CSWpmsvn += CSWsvn +RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibapr1-0 +RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibmagic1 +RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibz1 +RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibaprutil1-0 +RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibsqlite3-0 PACKAGES += CSWrbsvn SPKG_DESC_CSWrbsvn = Subversion Ruby Language Binding @@ -148,7 +153,6 @@ RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibapr1-0 RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibintl8 RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibruby18-1 -#RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibruby1-9-1-1 RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibmagic1 RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibexpat1 @@ -158,9 +162,7 @@ RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibsqlite3-0 RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibaprutil1-0 RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibserf1-1 -CHECKPKG_OVERRIDES_CSWrbsvn += dependency-on-stub|ruby_stub - PACKAGES += CSWpythonsvn SPKG_DESC_CSWpythonsvn = Subversion Python Language Binding PKGFILES_CSWpythonsvn += $(libdir)/python.* @@ -190,7 +192,7 @@ CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWlibmagic1 CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWlibexpat1 CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWlibsqlite3-0 -CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibserf1-1 +HECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibserf1-1 CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibsasl2-2 CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibaprutil1-0 CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWbdb48 @@ -200,15 +202,13 @@ CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibexpat1 CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibsqlite3-0 CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibserf1-1 -CHECKPKG_OVERRIDES_CSWpmsvn += missing-dependency|CSWlibapr1-0 -CHECKPKG_OVERRIDES_CSWpmsvn += missing-dependency|CSWlibmagic1 -CHECKPKG_OVERRIDES_CSWpmsvn += missing-dependency|CSWlibiconv2 -CHECKPKG_OVERRIDES_CSWpmsvn += missing-dependency|CSWlibexpat1 -CHECKPKG_OVERRIDES_CSWpmsvn += missing-dependency|CSWlibz1 -CHECKPKG_OVERRIDES_CSWpmsvn += missing-dependency|CSWlibintl8 -CHECKPKG_OVERRIDES_CSWpmsvn += missing-dependency|CSWlibapr1-0 -CHECKPKG_OVERRIDES_CSWpmsvn += missing-dependency|CSWlibaprutil1-0 -CHECKPKG_OVERRIDES_CSWpmsvn += missing-dependency|CSWlibsqlite3-0 +CHECKPKG_OVERRIDES_CSWpmsvn += surplus-dependency|CSWlibaprutil1-0 +CHECKPKG_OVERRIDES_CSWpmsvn += surplus-dependency|CSWlibintl8 +CHECKPKG_OVERRIDES_CSWpmsvn += surplus-dependency|CSWlibiconv2 +CHECKPKG_OVERRIDES_CSWpmsvn += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWpmsvn += surplus-dependency|CSWlibmagic1 +CHECKPKG_OVERRIDES_CSWpmsvn += surplus-dependency|CSWlibexpat1 +CHECKPKG_OVERRIDES_CSWpmsvn += surplus-dependency|CSWlibsqlite3-0 CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibserf1-1 CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibsasl2-2 CHECKPKG_OVERRIDES_CSWpythonsvn += surplus-dependency|CSWlibintl8 @@ -228,6 +228,8 @@ CHECKPKG_OVERRIDES_CSWrbsvn += surplus-dependency|CSWlibmagic1 CHECKPKG_OVERRIDES_CSWrbsvn += surplus-dependency|CSWlibexpat1 CHECKPKG_OVERRIDES_CSWrbsvn += surplus-dependency|CSWlibsqlite3-0 +CHECKPKG_OVERRIDES_CSWsvn += surplus-dependency|CSWlibserf1-1 +CHECKPKG_OVERRIDES_CSWsvn += surplus-dependency|CSWlibiconv2 # should be in lib ... put something below to at least make it compile. # on the svn mailing list people say we should not build the package Modified: csw/mgar/pkg/subversion/trunk/checksums =================================================================== --- csw/mgar/pkg/subversion/trunk/checksums 2015-01-13 10:01:40 UTC (rev 24560) +++ csw/mgar/pkg/subversion/trunk/checksums 2015-01-14 08:25:22 UTC (rev 24561) @@ -1 +1 @@ -766a89bbbb388f8eb76166672d3b9e49 subversion-1.8.11.tar.bz2 +77349caf0ef5a612c9718c53516a9934 subversion-1.8.5.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 Fri Jan 16 18:46:35 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 16 Jan 2015 17:46:35 +0000 Subject: SF.net SVN: gar:[24566] csw/mgar/pkg/tomcat6/trunk/Makefile Message-ID: <3kP8wC3zMFzJ1@mail.opencsw.org> Revision: 24566 http://sourceforge.net/p/gar/code/24566 Author: dmichelsen Date: 2015-01-16 17:46:34 +0000 (Fri, 16 Jan 2015) Log Message: ----------- tomcat6/trunk: Put .so into library package - java wants it that way Modified Paths: -------------- csw/mgar/pkg/tomcat6/trunk/Makefile Modified: csw/mgar/pkg/tomcat6/trunk/Makefile =================================================================== --- csw/mgar/pkg/tomcat6/trunk/Makefile 2015-01-16 14:08:26 UTC (rev 24565) +++ csw/mgar/pkg/tomcat6/trunk/Makefile 2015-01-16 17:46:34 UTC (rev 24566) @@ -24,12 +24,15 @@ PACKAGES += CSWlibtcnative1-0 SPKG_DESC_CSWlibtcnative1-0 = Tomcat Native Java library -PKGFILES_CSWlibtcnative1-0 += $(call pkgfiles_lib,libtcnative-1.so.0) +PKGFILES_CSWlibtcnative1-0 += $(call pkgfiles_lib,libtcnative-1.so) RUNTIME_DEP_PKGS_CSWlibtcnative1-0 += CSWlibapr1-0 RUNTIME_DEP_PKGS_CSWlibtcnative1-0 += CSWlibssl1-0-0 PACKAGES += CSWlibtcnative-dev SPKG_DESC_CSWlibtcnative-dev = Development files for Tomcat Native Java library +# The .so *must* go into the library package as this name id dlopen'ed by java +PKGFILES_DEVEL_SHAREDLIBLINK = +CHECKPKG_OVERRIDES_CSWlibtcnative1-0 += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libtcnative-1.so PKGFILES_CSWlibtcnative-dev += $(PKGFILES_DEVEL) RUNTIME_DEP_PKGS_CSWlibtcnative-dev += CSWlibtcnative1-0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From tosmi at users.sourceforge.net Mon Jan 19 13:48:59 2015 From: tosmi at users.sourceforge.net (tosmi at users.sourceforge.net) Date: Mon, 19 Jan 2015 12:48:59 +0000 Subject: SF.net SVN: gar:[24571] csw/mgar/pkg/facter/trunk/Makefile Message-ID: <3kQt9Q2TT0z1G9@mail.opencsw.org> Revision: 24571 http://sourceforge.net/p/gar/code/24571 Author: tosmi Date: 2015-01-19 12:48:58 +0000 (Mon, 19 Jan 2015) Log Message: ----------- facter: removed ruby checkpkg overrides Modified Paths: -------------- csw/mgar/pkg/facter/trunk/Makefile Modified: csw/mgar/pkg/facter/trunk/Makefile =================================================================== --- csw/mgar/pkg/facter/trunk/Makefile 2015-01-19 12:22:35 UTC (rev 24570) +++ csw/mgar/pkg/facter/trunk/Makefile 2015-01-19 12:48:58 UTC (rev 24571) @@ -40,10 +40,6 @@ CHECKPKG_OVERRIDES_CSWfacter += file-collision|/opt/csw/bin/facter|CSWfacter|CSWfacter-ruby18 CHECKPKG_OVERRIDES_CSWfacter += file-collision|/opt/csw/share/man/man8/facter.8|CSWfacter|CSWfacter-ruby18 -# we depend on ruby20 but checkpkg does not know anything about it -# CHECKPKG_OVERRIDES_CSWfacter += missing-dependency|CSWlibruby1-9-1-1|or|CSWruby|or|CSWruby18|or|CSWruby191 -# CHECKPKG_OVERRIDES_CSWfacter += surplus-dependency|CSWruby20 - include gar/category.mk install-facter: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From tosmi at users.sourceforge.net Mon Jan 19 20:41:11 2015 From: tosmi at users.sourceforge.net (tosmi at users.sourceforge.net) Date: Mon, 19 Jan 2015 19:41:11 +0000 Subject: SF.net SVN: gar:[24573] csw/mgar/pkg Message-ID: <3kR3Jz4gXDz1QP@mail.opencsw.org> Revision: 24573 http://sourceforge.net/p/gar/code/24573 Author: tosmi Date: 2015-01-19 19:41:00 +0000 (Mon, 19 Jan 2015) Log Message: ----------- facter2: import new pkg Added Paths: ----------- csw/mgar/pkg/facter2/ csw/mgar/pkg/facter2/Makefile csw/mgar/pkg/facter2/branches/ csw/mgar/pkg/facter2/tags/ csw/mgar/pkg/facter2/trunk/ csw/mgar/pkg/facter2/trunk/Makefile csw/mgar/pkg/facter2/trunk/checksums csw/mgar/pkg/facter2/trunk/files/ Copied: csw/mgar/pkg/facter2/Makefile (from rev 24569, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/facter2/Makefile (rev 0) +++ csw/mgar/pkg/facter2/Makefile 2015-01-19 19:41:00 UTC (rev 24573) @@ -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) Index: csw/mgar/pkg/facter2/trunk =================================================================== --- csw/mgar/pkg/facter2/trunk 2015-01-19 18:55:36 UTC (rev 24572) +++ csw/mgar/pkg/facter2/trunk 2015-01-19 19:41:00 UTC (rev 24573) Property changes on: csw/mgar/pkg/facter2/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1,2 ## +work + Added: csw/mgar/pkg/facter2/trunk/Makefile =================================================================== --- csw/mgar/pkg/facter2/trunk/Makefile (rev 0) +++ csw/mgar/pkg/facter2/trunk/Makefile 2015-01-19 19:41:00 UTC (rev 24573) @@ -0,0 +1,50 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +NAME = facter2 +VERSION = 2.3.0 +GARTYPE = v2 + +DESCRIPTION = A system fact gatherer +define BLURB + A cross-platform Ruby library for retrieving facts from operating systems. + Supports multiple resolution mechanisms, any of which can be restricted to + working only on certain operating systems or environments. Facter is + especially useful for retrieving things like operating system names, IP + addresses, MAC addresses, and SSH keys. + + It is easy to extend Facter to include your own custom facts or to include + additional mechanisms for retrieving facts. +endef + +MASTER_SITES = http://puppetlabs.com/downloads/facter/ +DISTFILES = facter-$(VERSION).tar.gz +SPKG_SOURCEURL = http://puppetlabs.com/ +LICENSE = LICENSE + +RUNTIME_DEP_PKGS = CSWruby20 +BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) + +INCOMPATIBLE_PKGS += CSWfacter-ruby18 +INCOMPATIBLE_PKGS += CSWfacter + +ARCHALL = 1 +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = facter + +CHECKPKG_OVERRIDES_CSWfacter += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/site_ruby/2.0.0/facter/ssh.rb +CHECKPKG_OVERRIDES_CSWfacter += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/site_ruby/2.0.0/facter/Cfkey.rb +CHECKPKG_OVERRIDES_CSWfacter += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/site_ruby/2.0.0/facter/util/manufacturer.rb +CHECKPKG_OVERRIDES_CSWfacter += file-collision|/opt/csw/bin/facter|CSWfacter|CSWfacter-ruby18 +CHECKPKG_OVERRIDES_CSWfacter += file-collision|/opt/csw/share/man/man8/facter.8|CSWfacter|CSWfacter-ruby18 + +include gar/category.mk + +install-facter: + (cd $(WORKDIR)/$(DISTNAME); ruby2.0 install.rb --destdir=$(DESTDIR)) + # we depend on ruby20 so fix the shebang + find $(DESTDIR)$(bindir) -type f -depth -print | xargs -n 1 gsed -i -e '1 s|ruby$$|ruby2.0|g' + gunzip $(DESTDIR)/$(mandir)/man8/facter.8.gz Property changes on: csw/mgar/pkg/facter2/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/facter2/trunk/checksums =================================================================== --- csw/mgar/pkg/facter2/trunk/checksums (rev 0) +++ csw/mgar/pkg/facter2/trunk/checksums 2015-01-19 19:41:00 UTC (rev 24573) @@ -0,0 +1 @@ +7bb6dbeaef86cd79300b4723c06932bc facter-2.3.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From tosmi at users.sourceforge.net Mon Jan 19 20:49:22 2015 From: tosmi at users.sourceforge.net (tosmi at users.sourceforge.net) Date: Mon, 19 Jan 2015 19:49:22 +0000 Subject: SF.net SVN: gar:[24574] csw/mgar/pkg/facter2/trunk/Makefile Message-ID: <3kR3VL43tqz1T0@mail.opencsw.org> Revision: 24574 http://sourceforge.net/p/gar/code/24574 Author: tosmi Date: 2015-01-19 19:49:22 +0000 (Mon, 19 Jan 2015) Log Message: ----------- facter2: fixed distname Modified Paths: -------------- csw/mgar/pkg/facter2/trunk/Makefile Modified: csw/mgar/pkg/facter2/trunk/Makefile =================================================================== --- csw/mgar/pkg/facter2/trunk/Makefile 2015-01-19 19:41:00 UTC (rev 24573) +++ csw/mgar/pkg/facter2/trunk/Makefile 2015-01-19 19:49:22 UTC (rev 24574) @@ -5,6 +5,7 @@ NAME = facter2 VERSION = 2.3.0 GARTYPE = v2 +DISTNAME = facter-$(VERSION) DESCRIPTION = A system fact gatherer define BLURB This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From tosmi at users.sourceforge.net Mon Jan 19 21:57:08 2015 From: tosmi at users.sourceforge.net (tosmi at users.sourceforge.net) Date: Mon, 19 Jan 2015 20:57:08 +0000 Subject: SF.net SVN: gar:[24578] csw/mgar/pkg/puppet3/trunk/Makefile Message-ID: <3kR50l1wNdz1Xn@mail.opencsw.org> Revision: 24578 http://sourceforge.net/p/gar/code/24578 Author: tosmi Date: 2015-01-19 20:57:07 +0000 (Mon, 19 Jan 2015) Log Message: ----------- puppet: cleanup some checkpkg overrides Modified Paths: -------------- csw/mgar/pkg/puppet3/trunk/Makefile Modified: csw/mgar/pkg/puppet3/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet3/trunk/Makefile 2015-01-19 20:07:09 UTC (rev 24577) +++ csw/mgar/pkg/puppet3/trunk/Makefile 2015-01-19 20:57:07 UTC (rev 24578) @@ -45,8 +45,9 @@ # service isn't started upon the installation of CSWpuppet. PACKAGES += CSWpuppetmaster3 SPKG_DESC_CSWpuppetmaster3 = System configuration management tool, server -RUNTIME_DEP_PKGS_CSWpuppetmaster3 = $(RUNTIME_DEP_PKGS) -BUILD_DEP_PKGS_CSWpuppet3 = $(RUNTIME_DEP_PKGS_CSWpuppet3) +RUNTIME_DEP_PKGS_CSWpuppetmaster3 += CSWhiera +RUNTIME_DEP_PKGS_CSWpuppetmaster3 += CSWruby20 +BUILD_DEP_PKGS_CSWpuppetmaster3 = $(RUNTIME_DEP_PKGS_CSWpuppetmaster3) INCOMPATIBLE_PKGS += CSWpuppet INCOMPATIBLE_PKGS += CSWpuppetmaster @@ -68,9 +69,6 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = puppet -CHECKPKG_OVERRIDES_CSWpuppet3 += missing-dependency|CSWlibruby1-9-1-1|or|CSWruby|or|CSWruby18|or|CSWruby191 -CHECKPKG_OVERRIDES_CSWpuppet3 += surplus-dependency|CSWruby20 -CHECKPKG_OVERRIDES_CSWpuppet3 += surplus-dependency|CSWrubyaugeas CHECKPKG_OVERRIDES_CSWpuppet3 += surplus-dependency|CSWfacter CHECKPKG_OVERRIDES_CSWpuppet3 += surplus-dependency|CSWhiera # Puppet has hardcoded paths to look at for many OSes, many of which involve @@ -87,9 +85,6 @@ # INCOMPATIBLE_PKGS CHECKPKG_OVERRIDES_CSWpuppet3 += file-collision -CHECKPKG_OVERRIDES_CSWpuppetmaster3 += missing-dependency|CSWlibruby1-9-1-1|or|CSWruby|or|CSWruby18|or|CSWruby191 -CHECKPKG_OVERRIDES_CSWpuppetmaster3 += surplus-dependency|CSWrubyaugeas -CHECKPKG_OVERRIDES_CSWpuppetmaster3 += surplus-dependency|CSWfacter CHECKPKG_OVERRIDES_CSWpuppetmaster3 += surplus-dependency|CSWhiera CHECKPKG_OVERRIDES_CSWpuppetmaster3 += surplus-dependency|CSWruby20 # yes, yes, we know it conflicts with puppet{,master} - that's the point of 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 Jan 20 14:38:07 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 20 Jan 2015 13:38:07 +0000 Subject: SF.net SVN: gar:[24580] csw/mgar/pkg/xmms/trunk/Makefile Message-ID: <3kRWCh5ZZnzCD@mail.opencsw.org> Revision: 24580 http://sourceforge.net/p/gar/code/24580 Author: dmichelsen Date: 2015-01-20 13:38:05 +0000 (Tue, 20 Jan 2015) Log Message: ----------- xmms/trunk: Update dependencies Modified Paths: -------------- csw/mgar/pkg/xmms/trunk/Makefile Modified: csw/mgar/pkg/xmms/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmms/trunk/Makefile 2015-01-19 21:27:40 UTC (rev 24579) +++ csw/mgar/pkg/xmms/trunk/Makefile 2015-01-20 13:38:05 UTC (rev 24580) @@ -21,8 +21,10 @@ PACKAGES += CSWlibxmms1 SPKG_DESC_CSWlibxmms1 += The X MultiMedia System library, libxmms.so.1 PKGFILES_CSWlibxmms1 += $(call pkgfiles_lib,libxmms.so.1) -RUNTIME_DEP_PKGS_CSWlibxmms1 += CSWglib -RUNTIME_DEP_PKGS_CSWlibxmms1 += CSWgtk +RUNTIME_DEP_PKGS_CSWlibxmms1 += CSWlibglib1-2-0 +RUNTIME_DEP_PKGS_CSWlibxmms1 += CSWlibgtk1-2-0 +RUNTIME_DEP_PKGS_CSWlibxmms1 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibxmms1 += CSWlibgdk1-2-0 PACKAGES += CSWlibxmms-dev SPKG_DESC_CSWlibxmms-dev = Development files for libxmms.so.1 @@ -31,13 +33,15 @@ PACKAGES += CSWxmms SPKG_DESC_CSWxmms = The X MultiMedia System +# PKGFILES is catchall RUNTIME_DEP_PKGS_CSWxmms += CSWlibxmms1 -RUNTIME_DEP_PKGS_CSWxmms += CSWiconv -RUNTIME_DEP_PKGS_CSWxmms += CSWzlib +RUNTIME_DEP_PKGS_CSWxmms += CSWlibz1 RUNTIME_DEP_PKGS_CSWxmms += CSWmesa -RUNTIME_DEP_PKGS_CSWxmms += CSWglib +RUNTIME_DEP_PKGS_CSWxmms += CSWlibglib1-2-0 RUNTIME_DEP_PKGS_CSWxmms += CSWmikmod -RUNTIME_DEP_PKGS_CSWxmms += CSWgtk +RUNTIME_DEP_PKGS_CSWxmms += CSWlibgthread1-2-0 +RUNTIME_DEP_PKGS_CSWxmms += CSWlibgdk1-2-0 +RUNTIME_DEP_PKGS_CSWxmms += CSWlibgtk1-2-0 RUNTIME_DEP_PKGS_CSWxmms += CSWlibintl8 RUNTIME_DEP_PKGS_CSWxmms += CSWlibogg0 RUNTIME_DEP_PKGS_CSWxmms += CSWlibvorbis0 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 Jan 20 22:23:13 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 20 Jan 2015 21:23:13 +0000 Subject: SF.net SVN: gar:[24582] csw/mgar/pkg Message-ID: <3kRjXM1Q3RzL7@mail.opencsw.org> Revision: 24582 http://sourceforge.net/p/gar/code/24582 Author: dmichelsen Date: 2015-01-20 21:23:13 +0000 (Tue, 20 Jan 2015) Log Message: ----------- libpsl/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/libpsl/ csw/mgar/pkg/libpsl/Makefile csw/mgar/pkg/libpsl/branches/ csw/mgar/pkg/libpsl/tags/ csw/mgar/pkg/libpsl/trunk/ csw/mgar/pkg/libpsl/trunk/Makefile csw/mgar/pkg/libpsl/trunk/checksums csw/mgar/pkg/libpsl/trunk/files/ csw/mgar/pkg/libpsl/trunk/files/0001-Solaris-needs-lsocket-lnsl-for-inet_ntop.patch csw/mgar/pkg/libpsl/trunk/files/0001-Use-GTK_DOC_USE_LIBTOOL.patch Added: csw/mgar/pkg/libpsl/Makefile =================================================================== --- csw/mgar/pkg/libpsl/Makefile (rev 0) +++ csw/mgar/pkg/libpsl/Makefile 2015-01-20 21:23:13 UTC (rev 24582) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/libpsl/trunk =================================================================== --- csw/mgar/pkg/libpsl/trunk 2015-01-20 14:47:31 UTC (rev 24581) +++ csw/mgar/pkg/libpsl/trunk 2015-01-20 21:23:13 UTC (rev 24582) Property changes on: csw/mgar/pkg/libpsl/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/libpsl/trunk/Makefile =================================================================== --- csw/mgar/pkg/libpsl/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libpsl/trunk/Makefile 2015-01-20 21:23:13 UTC (rev 24582) @@ -0,0 +1,50 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = libpsl +VERSION = 0.6.2 +GARTYPE = v2 + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = https://github.com/rockdaboot/libpsl/archive/ +DISTFILES += $(VERSION).tar.gz + +# Use patch until this is fixed: +# https://github.com/rockdaboot/libpsl/issues/19 +#PATCHFILES += 0001-Use-GTK_DOC_USE_LIBTOOL.patch + +PATCHFILES += 0001-Solaris-needs-lsocket-lnsl-for-inet_ntop.patch + +PACKAGES += CSWlibpsl0 +SPKG_DESC_CSWlibpsl0 = Public Suffix List library, libpsl.so.0 +# PKGFILES is catchall + +PACKAGES += CSWlibpsl-dev +SPKG_DESC_CSWlibpsl-dev = Development files for libpsl.so.0 +PKGFILES_CSWlibpsl-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWlibpsl-dev += $(bindir)/.* +RUNTIME_DEP_PKGS_CSWlibpsl-dev += CSWlibicuuc52 +RUNTIME_DEP_PKGS_CSWlibpsl-dev += CSWlibpsl0 + +BUILD64_LIBS_ONLY = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +# This is needed for sha1sum +BUILD_ENV_PATH = /opt/csw/gnu:$(PATH) + +include gar/category.mk + +post-patch: + cd $(WORKSRC) && ./autogen.sh + @$(MAKECOOKIE) + +post-install: + @# Remove directory until this is fixed: + @# https://github.com/rockdaboot/libpsl/issues/21 + rmdir $(DESTDIR)/libpsl + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/libpsl/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/libpsl/trunk/checksums =================================================================== --- csw/mgar/pkg/libpsl/trunk/checksums (rev 0) +++ csw/mgar/pkg/libpsl/trunk/checksums 2015-01-20 21:23:13 UTC (rev 24582) @@ -0,0 +1 @@ +635982e26375a4d2737771fe985b056f 0.6.2.tar.gz Added: csw/mgar/pkg/libpsl/trunk/files/0001-Solaris-needs-lsocket-lnsl-for-inet_ntop.patch =================================================================== --- csw/mgar/pkg/libpsl/trunk/files/0001-Solaris-needs-lsocket-lnsl-for-inet_ntop.patch (rev 0) +++ csw/mgar/pkg/libpsl/trunk/files/0001-Solaris-needs-lsocket-lnsl-for-inet_ntop.patch 2015-01-20 21:23:13 UTC (rev 24582) @@ -0,0 +1,46 @@ +From 8315319044b92330fb9ce0c9fd78a97892e9d024 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 20 Jan 2015 20:21:55 +0100 +Subject: [PATCH] Solaris needs -lsocket -lnsl for inet_ntop + +--- + configure.ac | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/configure.ac b/configure.ac +index da9936c..af6525c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -28,6 +28,9 @@ GTK_DOC_CHECK([1.15],[--flavour no-tmpl]) + ],[ + AM_CONDITIONAL([ENABLE_GTK_DOC], false) + ]) ++m4_ifdef([GTK_DOC_USE_LIBTOOL], [], [ ++AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], false) ++]) + + # + # enable creation of man pages +@@ -171,6 +174,19 @@ AM_CONDITIONAL([BUILTIN_GENERATOR_LIBIDN2], test "x$enable_builtin" = "xlibidn2" + AM_CONDITIONAL([BUILTIN_GENERATOR_LIBIDN], test "x$enable_builtin" = "xlibidn") + AM_CONDITIONAL([WITH_BUILTIN], test $enable_builtin = yes) + ++# Solaris has socket in libsocket and inet_ntop in libnsl, but also needs libsocket, so the order is important here ++AC_CHECK_LIB([socket], [socket], [NEEDS_SOCKET=yes], []) ++if test -n "$NEEDS_SOCKET" ; then ++ AC_CHECK_LIB([nsl], [inet_ntop], [NEEDS_NSL=yes], []) ++fi ++if test -n "$NEEDS_SOCKET" && test -n "$NEEDS_NSL" ; then ++ LIBS="$LIBS -lsocket -lnsl" ++elif test -n "$NEEDS_SOCKET" ; then ++ LIBS="$LIBS -lsocket" ++elif test -n "$NEEDS_NSL" ; then ++ LIBS="$LIBS -lnsl" ++fi ++ + # Check for valgrind + ac_enable_valgrind=no + AC_ARG_ENABLE(valgrind-tests, +-- +2.2.1 + Added: csw/mgar/pkg/libpsl/trunk/files/0001-Use-GTK_DOC_USE_LIBTOOL.patch =================================================================== --- csw/mgar/pkg/libpsl/trunk/files/0001-Use-GTK_DOC_USE_LIBTOOL.patch (rev 0) +++ csw/mgar/pkg/libpsl/trunk/files/0001-Use-GTK_DOC_USE_LIBTOOL.patch 2015-01-20 21:23:13 UTC (rev 24582) @@ -0,0 +1,26 @@ +From 9b4689bad0183bd155cb57b512aad9de693e8884 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 20 Jan 2015 15:39:53 +0100 +Subject: [PATCH] Use GTK_DOC_USE_LIBTOOL + +--- + configure.ac | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/configure.ac b/configure.ac +index da9936c..c04ccb7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -28,6 +28,9 @@ GTK_DOC_CHECK([1.15],[--flavour no-tmpl]) + ],[ + AM_CONDITIONAL([ENABLE_GTK_DOC], false) + ]) ++m4_ifdef([GTK_DOC_USE_LIBTOOL], [], [ ++AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], false) ++]) + + # + # enable creation of man pages +-- +2.2.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jan 21 16:29:01 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 21 Jan 2015 15:29:01 +0000 Subject: SF.net SVN: gar:[24583] csw/mgar/pkg Message-ID: <3kS9d82GSNzWw@mail.opencsw.org> Revision: 24583 http://sourceforge.net/p/gar/code/24583 Author: dmichelsen Date: 2015-01-21 15:29:00 +0000 (Wed, 21 Jan 2015) Log Message: ----------- libicu*: Remove old libicu42 branch Removed Paths: ------------- csw/mgar/pkg/libicu48/branches/libicu42/ csw/mgar/pkg/libicu49/branches/libicu42/ csw/mgar/pkg/libicu50/branches/libicu42/ csw/mgar/pkg/libicu51/branches/libicu42/ csw/mgar/pkg/libicu52/branches/libicu42/ 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 Jan 22 11:25:07 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 22 Jan 2015 10:25:07 +0000 Subject: SF.net SVN: gar:[24584] csw/mgar/pkg Message-ID: <3kSfr609SFz14V@mail.opencsw.org> Revision: 24584 http://sourceforge.net/p/gar/code/24584 Author: dmichelsen Date: 2015-01-22 10:25:06 +0000 (Thu, 22 Jan 2015) Log Message: ----------- Libicu54: Initial commit for 54.1 Modified Paths: -------------- csw/mgar/pkg/libicu54/trunk/Makefile csw/mgar/pkg/libicu54/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libicu54/ Removed Paths: ------------- csw/mgar/pkg/libicu54/branches/libicu42/ Modified: csw/mgar/pkg/libicu54/trunk/Makefile =================================================================== --- csw/mgar/pkg/libicu52/trunk/Makefile 2014-11-19 15:00:40 UTC (rev 24362) +++ csw/mgar/pkg/libicu54/trunk/Makefile 2015-01-22 10:25:06 UTC (rev 24584) @@ -1,6 +1,6 @@ # $Id$ NAME = libicu -VERSION = 52.1 +VERSION = 54.1 GARTYPE = v2 DESCRIPTION = International Components for Unicode @@ -15,81 +15,90 @@ LICENSE = license.html -PACKAGES += CSWlibicudata52 -SPKG_DESC_CSWlibicudata52 = International Components for Unicode, libicudata.so.52 -PKGFILES_CSWlibicudata52 += $(call pkgfiles_lib,libicudata.so.52) +PACKAGES += CSWlibicudata54 +SPKG_DESC_CSWlibicudata54 = International Components for Unicode, libicudata.so.54 +PKGFILES_CSWlibicudata54 += $(call pkgfiles_lib,libicudata.so.54) -PACKAGES += CSWlibicui18n52 -SPKG_DESC_CSWlibicui18n52 = International Components for Unicode, libicui18n.so.52 -PKGFILES_CSWlibicui18n52 += $(call pkgfiles_lib,libicui18n.so.52) -RUNTIME_DEP_PKGS_CSWlibicui18n52 += CSWlibicuuc52 -RUNTIME_DEP_PKGS_CSWlibicui18n52 += CSWlibicudata52 +PACKAGES += CSWlibicui18n54 +SPKG_DESC_CSWlibicui18n54 = International Components for Unicode, libicui18n.so.54 +PKGFILES_CSWlibicui18n54 += $(call pkgfiles_lib,libicui18n.so.54) +RUNTIME_DEP_PKGS_CSWlibicui18n54 += CSWlibicuuc54 +RUNTIME_DEP_PKGS_CSWlibicui18n54 += CSWlibicudata54 -PACKAGES += CSWlibicuio52 -SPKG_DESC_CSWlibicuio52 = International Components for Unicode, libicuio.so.52 -PKGFILES_CSWlibicuio52 += $(call pkgfiles_lib,libicuio.so.52) -RUNTIME_DEP_PKGS_CSWlibicuio52 += CSWlibicui18n52 -RUNTIME_DEP_PKGS_CSWlibicuio52 += CSWlibicuuc52 -RUNTIME_DEP_PKGS_CSWlibicuio52 += CSWlibicudata52 +PACKAGES += CSWlibicuio54 +SPKG_DESC_CSWlibicuio54 = International Components for Unicode, libicuio.so.54 +PKGFILES_CSWlibicuio54 += $(call pkgfiles_lib,libicuio.so.54) +RUNTIME_DEP_PKGS_CSWlibicuio54 += CSWlibicui18n54 +RUNTIME_DEP_PKGS_CSWlibicuio54 += CSWlibicuuc54 +RUNTIME_DEP_PKGS_CSWlibicuio54 += CSWlibicudata54 -PACKAGES += CSWlibicule52 -SPKG_DESC_CSWlibicule52 = International Components for Unicode, libicule.so.52 -PKGFILES_CSWlibicule52 += $(call pkgfiles_lib,libicule.so.52) -RUNTIME_DEP_PKGS_CSWlibicule52 += CSWlibicuuc52 -RUNTIME_DEP_PKGS_CSWlibicule52 += CSWlibicudata52 +PACKAGES += CSWlibicule54 +SPKG_DESC_CSWlibicule54 = International Components for Unicode, libicule.so.54 +PKGFILES_CSWlibicule54 += $(call pkgfiles_lib,libicule.so.54) +RUNTIME_DEP_PKGS_CSWlibicule54 += CSWlibicuuc54 +RUNTIME_DEP_PKGS_CSWlibicule54 += CSWlibicudata54 -PACKAGES += CSWlibiculx52 -SPKG_DESC_CSWlibiculx52 = International Components for Unicode, libiculx.so.52 -PKGFILES_CSWlibiculx52 += $(call pkgfiles_lib,libiculx.so.52) -RUNTIME_DEP_PKGS_CSWlibiculx52 += CSWlibicuuc52 -RUNTIME_DEP_PKGS_CSWlibiculx52 += CSWlibicule52 -RUNTIME_DEP_PKGS_CSWlibiculx52 += CSWlibicudata52 +PACKAGES += CSWlibiculx54 +SPKG_DESC_CSWlibiculx54 = International Components for Unicode, libiculx.so.54 +PKGFILES_CSWlibiculx54 += $(call pkgfiles_lib,libiculx.so.54) +RUNTIME_DEP_PKGS_CSWlibiculx54 += CSWlibicuuc54 +RUNTIME_DEP_PKGS_CSWlibiculx54 += CSWlibicule54 +RUNTIME_DEP_PKGS_CSWlibiculx54 += CSWlibicudata54 -PACKAGES += CSWlibicutest52 -SPKG_DESC_CSWlibicutest52 = International Components for Unicode, libicutest.so.52 -PKGFILES_CSWlibicutest52 += $(call pkgfiles_lib,libicutest.so.52) -RUNTIME_DEP_PKGS_CSWlibicutest52 += CSWlibicutu52 -RUNTIME_DEP_PKGS_CSWlibicutest52 += CSWlibicuuc52 -RUNTIME_DEP_PKGS_CSWlibicutest52 += CSWlibicui18n52 -RUNTIME_DEP_PKGS_CSWlibicutest52 += CSWlibicudata52 +PACKAGES += CSWlibicutest54 +SPKG_DESC_CSWlibicutest54 = International Components for Unicode, libicutest.so.54 +PKGFILES_CSWlibicutest54 += $(call pkgfiles_lib,libicutest.so.54) +RUNTIME_DEP_PKGS_CSWlibicutest54 += CSWlibicutu54 +RUNTIME_DEP_PKGS_CSWlibicutest54 += CSWlibicuuc54 +RUNTIME_DEP_PKGS_CSWlibicutest54 += CSWlibicui18n54 +RUNTIME_DEP_PKGS_CSWlibicutest54 += CSWlibicudata54 -PACKAGES += CSWlibicutu52 -SPKG_DESC_CSWlibicutu52 = International Components for Unicode, libicutu.so.52 -PKGFILES_CSWlibicutu52 += $(call pkgfiles_lib,libicutu.so.52) -RUNTIME_DEP_PKGS_CSWlibicutu52 += CSWlibicuuc52 -RUNTIME_DEP_PKGS_CSWlibicutu52 += CSWlibicui18n52 -RUNTIME_DEP_PKGS_CSWlibicutu52 += CSWlibicudata52 +PACKAGES += CSWlibicutu54 +SPKG_DESC_CSWlibicutu54 = International Components for Unicode, libicutu.so.54 +PKGFILES_CSWlibicutu54 += $(call pkgfiles_lib,libicutu.so.54) +RUNTIME_DEP_PKGS_CSWlibicutu54 += CSWlibicuuc54 +RUNTIME_DEP_PKGS_CSWlibicutu54 += CSWlibicui18n54 +RUNTIME_DEP_PKGS_CSWlibicutu54 += CSWlibicudata54 -PACKAGES += CSWlibicuuc52 -SPKG_DESC_CSWlibicuuc52 = International Components for Unicode, libicuuc.so.52 -PKGFILES_CSWlibicuuc52 += $(call pkgfiles_lib,libicuuc.so.52) -RUNTIME_DEP_PKGS_CSWlibicuuc52 += CSWlibicudata52 +PACKAGES += CSWlibicuuc54 +SPKG_DESC_CSWlibicuuc54 = International Components for Unicode, libicuuc.so.54 +PKGFILES_CSWlibicuuc54 += $(call pkgfiles_lib,libicuuc.so.54) +RUNTIME_DEP_PKGS_CSWlibicuuc54 += CSWlibicudata54 # This is the presence of /usr/share/lib/zoneinfo which is ok -CHECKPKG_OVERRIDES_CSWlibicuuc52 += file-with-bad-content|/usr/share|root/opt/csw/lib/libicuuc.so.52.1 -CHECKPKG_OVERRIDES_CSWlibicuuc52 += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libicuuc.so.52.1 -CHECKPKG_OVERRIDES_CSWlibicuuc52 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libicuuc.so.52.1 +CHECKPKG_OVERRIDES_CSWlibicuuc54 += file-with-bad-content|/usr/share|root/opt/csw/lib/libicuuc.so.54.1 +CHECKPKG_OVERRIDES_CSWlibicuuc54 += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libicuuc.so.54.1 +CHECKPKG_OVERRIDES_CSWlibicuuc54 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libicuuc.so.54.1 PACKAGES += CSWlibicu-dev -SPKG_DESC_CSWlibicu-dev = Development files for libicu.so.52 +SPKG_DESC_CSWlibicu-dev = Development files for libicu.so.54 # This package is PKGFILES catchall -RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicudata52 -RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicui18n52 -RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicuio52 -RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicule52 -RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibiculx52 -RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicutest52 -RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicutu52 -RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicuuc52 +RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicudata54 +RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicui18n54 +RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicuio54 +RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicule54 +RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibiculx54 +RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicutest54 +RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicutu54 +RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicuuc54 +# This is a false positive. Override until this is fixed: +# http://lists.opencsw.org/pipermail/maintainers/2015-January/019612.html +CHECKPKG_OVERRIDES_CSWlibicu-dev += file-needed-but-no-package-satisfies-it|/opt/csw/lib/sparcv9/icu/current/Makefile.inc|CSWlibicu-dev|contains|symlink|/opt/csw/lib/sparcv9/icu/Makefile.inc|which|needs|the|target|file:|/opt/csw/lib/sparcv9/icu/current/Makefile.inc +CHECKPKG_OVERRIDES_CSWlibicu-dev += file-needed-but-no-package-satisfies-it|/opt/csw/lib/sparcv9/icu/current/pkgdata.inc|CSWlibicu-dev|contains|symlink|/opt/csw/lib/sparcv9/icu/pkgdata.inc|which|needs|the|target|file:|/opt/csw/lib/sparcv9/icu/current/pkgdata.inc +CHECKPKG_OVERRIDES_CSWlibicu-dev += file-needed-but-no-package-satisfies-it|/opt/csw/lib/amd64/icu/current/Makefile.inc|CSWlibicu-dev|contains|symlink|/opt/csw/lib/amd64/icu/Makefile.inc|which|needs|the|target|file:|/opt/csw/lib/amd64/icu/current/Makefile.inc +CHECKPKG_OVERRIDES_CSWlibicu-dev += file-needed-but-no-package-satisfies-it|/opt/csw/lib/amd64/icu/current/pkgdata.inc|CSWlibicu-dev|contains|symlink|/opt/csw/lib/amd64/icu/pkgdata.inc|which|needs|the|target|file:|/opt/csw/lib/amd64/icu/current/pkgdata.inc +CHECKPKG_OVERRIDES_CSWlibicu-dev += file-needed-but-no-package-satisfies-it|/opt/csw/lib/icu/current/Makefile.inc|CSWlibicu-dev|contains|symlink|/opt/csw/lib/icu/Makefile.inc|which|needs|the|target|file:|/opt/csw/lib/icu/current/Makefile.inc +CHECKPKG_OVERRIDES_CSWlibicu-dev += file-needed-but-no-package-satisfies-it|/opt/csw/lib/icu/current/pkgdata.inc|CSWlibicu-dev|contains|symlink|/opt/csw/lib/icu/pkgdata.inc|which|needs|the|target|file:|/opt/csw/lib/icu/current/pkgdata.inc + # For i386 due to different linker settings -CHECKPKG_OVERRIDES_CSWlibicule52 += surplus-dependency|CSWlibicudata52 -CHECKPKG_OVERRIDES_CSWlibicutu52 += surplus-dependency|CSWlibicudata52 -CHECKPKG_OVERRIDES_CSWlibiculx52 += surplus-dependency|CSWlibicudata52 -CHECKPKG_OVERRIDES_CSWlibicuio52 += surplus-dependency|CSWlibicudata52 -CHECKPKG_OVERRIDES_CSWlibicutest52 += surplus-dependency|CSWlibicudata52 -CHECKPKG_OVERRIDES_CSWlibicutest52 += surplus-dependency|CSWlibicui18n52 -CHECKPKG_OVERRIDES_CSWlibicui18n52 += surplus-dependency|CSWlibicudata52 +CHECKPKG_OVERRIDES_CSWlibicule54 += surplus-dependency|CSWlibicudata54 +CHECKPKG_OVERRIDES_CSWlibicutu54 += surplus-dependency|CSWlibicudata54 +CHECKPKG_OVERRIDES_CSWlibiculx54 += surplus-dependency|CSWlibicudata54 +CHECKPKG_OVERRIDES_CSWlibicuio54 += surplus-dependency|CSWlibicudata54 +CHECKPKG_OVERRIDES_CSWlibicutest54 += surplus-dependency|CSWlibicudata54 +CHECKPKG_OVERRIDES_CSWlibicutest54 += surplus-dependency|CSWlibicui18n54 +CHECKPKG_OVERRIDES_CSWlibicui18n54 += surplus-dependency|CSWlibicudata54 DISTNAME = icu WORKSRC = $(WORKDIR)/$(DISTNAME)/source Modified: csw/mgar/pkg/libicu54/trunk/checksums =================================================================== --- csw/mgar/pkg/libicu52/trunk/checksums 2014-11-19 15:00:40 UTC (rev 24362) +++ csw/mgar/pkg/libicu54/trunk/checksums 2015-01-22 10:25:06 UTC (rev 24584) @@ -1 +1 @@ -9e96ed4c1d99c0d14ac03c140f9f346c icu4c-52_1-src.tgz +e844caed8f2ca24c088505b0d6271bc0 icu4c-54_1-src.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Thu Jan 22 12:14:04 2015 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Thu, 22 Jan 2015 11:14:04 +0000 Subject: SF.net SVN: gar:[24585] csw/mgar/pkg/zabbix/trunk Message-ID: <3kSgwQ26grz1Bh@mail.opencsw.org> Revision: 24585 http://sourceforge.net/p/gar/code/24585 Author: wilbury Date: 2015-01-22 11:14:04 +0000 (Thu, 22 Jan 2015) Log Message: ----------- zabbix/trunk: Version upgrade. Modified Paths: -------------- csw/mgar/pkg/zabbix/trunk/Makefile csw/mgar/pkg/zabbix/trunk/checksums Modified: csw/mgar/pkg/zabbix/trunk/Makefile =================================================================== --- csw/mgar/pkg/zabbix/trunk/Makefile 2015-01-22 10:25:06 UTC (rev 24584) +++ csw/mgar/pkg/zabbix/trunk/Makefile 2015-01-22 11:14:04 UTC (rev 24585) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = zabbix -VERSION = 2.2.5 +VERSION = 2.2.8 GARTYPE = v2 DESCRIPTION = Zabbix monitoring system @@ -35,7 +35,7 @@ RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibcurl4 RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibssh2-1 RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibmysqlclient18 -RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibnetsnmp25 +RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibnetsnmp30 RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibldap2-4-2 RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWliblber2-4-2 @@ -53,7 +53,7 @@ RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibcurl4 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWliblber2-4-2 -RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibnetsnmp25 +RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibnetsnmp30 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibssh2-1 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibldap2-4-2 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibiksemel3 @@ -86,9 +86,9 @@ # CONFIGURE_ARGS += --with-sqlite3 # CONFIGURE_ARGS += --with-postgresql -CONFIGURE_ARGS += --with-libcurl=$(bindir)/curl-config +CONFIGURE_ARGS += --with-libcurl=$(prefix)/bin/curl-config -CONFIGURE_ARGS += --with-net-snmp=$(bindir)/net-snmp-config +CONFIGURE_ARGS += --with-net-snmp=$(prefix)/bin/net-snmp-config CONFIGURE_ARGS += --with-jabber Modified: csw/mgar/pkg/zabbix/trunk/checksums =================================================================== --- csw/mgar/pkg/zabbix/trunk/checksums 2015-01-22 10:25:06 UTC (rev 24584) +++ csw/mgar/pkg/zabbix/trunk/checksums 2015-01-22 11:14:04 UTC (rev 24585) @@ -1 +1 @@ -e7b74a0208743f743585d9cc1d46eccf zabbix-2.2.5.tar.gz +8dc2f909cf4587a8ca8144dcf7ee7fa5 zabbix-2.2.8.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jan 23 11:19:22 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 23 Jan 2015 10:19:22 +0000 Subject: SF.net SVN: gar:[24586] csw/mgar/pkg/rcs/trunk Message-ID: <3kTGfx1GmxzRh@mail.opencsw.org> Revision: 24586 http://sourceforge.net/p/gar/code/24586 Author: dmichelsen Date: 2015-01-23 10:19:22 +0000 (Fri, 23 Jan 2015) Log Message: ----------- rcs/trunk: Update to 5.9.4 Modified Paths: -------------- csw/mgar/pkg/rcs/trunk/Makefile csw/mgar/pkg/rcs/trunk/checksums Modified: csw/mgar/pkg/rcs/trunk/Makefile =================================================================== --- csw/mgar/pkg/rcs/trunk/Makefile 2015-01-22 11:14:04 UTC (rev 24585) +++ csw/mgar/pkg/rcs/trunk/Makefile 2015-01-23 10:19:22 UTC (rev 24586) @@ -1,5 +1,5 @@ NAME = rcs -VERSION = 5.9.2 +VERSION = 5.9.4 GARTYPE = v2 DESCRIPTION = GNU Revision Control System Modified: csw/mgar/pkg/rcs/trunk/checksums =================================================================== --- csw/mgar/pkg/rcs/trunk/checksums 2015-01-22 11:14:04 UTC (rev 24585) +++ csw/mgar/pkg/rcs/trunk/checksums 2015-01-23 10:19:22 UTC (rev 24586) @@ -1 +1 @@ -2af60f0baa0262888d229c2f0f5b8390 rcs-5.9.2.tar.xz +ab57933fb214384e69664ec1c81775fc rcs-5.9.4.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jan 23 21:24:10 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 23 Jan 2015 20:24:10 +0000 Subject: SF.net SVN: gar:[24590] csw/mgar/pkg/padl-migration-tools/trunk/Makefile Message-ID: <3kTX4g0ns8zrk@mail.opencsw.org> Revision: 24590 http://sourceforge.net/p/gar/code/24590 Author: dmichelsen Date: 2015-01-23 20:24:09 +0000 (Fri, 23 Jan 2015) Log Message: ----------- padl-migration-tools/trunk: Make package archall Modified Paths: -------------- csw/mgar/pkg/padl-migration-tools/trunk/Makefile Modified: csw/mgar/pkg/padl-migration-tools/trunk/Makefile =================================================================== --- csw/mgar/pkg/padl-migration-tools/trunk/Makefile 2015-01-23 20:22:39 UTC (rev 24589) +++ csw/mgar/pkg/padl-migration-tools/trunk/Makefile 2015-01-23 20:24:09 UTC (rev 24590) @@ -13,6 +13,7 @@ SPKG_DESC_CSWpadl-ldap-migration-tools = PADL LDAP Mirgation Tools # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWpadl-ldap-migration-tools += CSWperl +ARCHALL_CSWpadl-ldap-migration-tools = 1 CONFIGURE_SCRIPTS = BUILD_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rmottola at users.sourceforge.net Sat Jan 24 00:15:02 2015 From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net) Date: Fri, 23 Jan 2015 23:15:02 +0000 Subject: SF.net SVN: gar:[24592] csw/mgar/pkg/gnustep-base/trunk Message-ID: <3kTbsw4pM7z11d@mail.opencsw.org> Revision: 24592 http://sourceforge.net/p/gar/code/24592 Author: rmottola Date: 2015-01-23 23:15:02 +0000 (Fri, 23 Jan 2015) Log Message: ----------- upgraded ICU dependency, added certain overrides and patch timezone to avoid /usr/local references (backport from upstream) Modified Paths: -------------- csw/mgar/pkg/gnustep-base/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/gnustep-base/trunk/files/0002-timezone.patch Modified: csw/mgar/pkg/gnustep-base/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnustep-base/trunk/Makefile 2015-01-23 21:05:41 UTC (rev 24591) +++ csw/mgar/pkg/gnustep-base/trunk/Makefile 2015-01-23 23:15:02 UTC (rev 24592) @@ -26,25 +26,45 @@ RUNTIME_DEP_PKGS_CSWgnustep-base += CSWlibz1 RUNTIME_DEP_PKGS_CSWgnustep-base += CSWlibxslt1 RUNTIME_DEP_PKGS_CSWgnustep-base += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWgnustep-base += CSWlibicuuc52 +RUNTIME_DEP_PKGS_CSWgnustep-base += CSWlibicuuc54 RUNTIME_DEP_PKGS_CSWgnustep-base += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWgnustep-base += CSWlibgnutls28 RUNTIME_DEP_PKGS_CSWgnustep-base += CSWlibgmp10 RUNTIME_DEP_PKGS_CSWgnustep-base += CSWlibobjc4 -RUNTIME_DEP_PKGS_CSWgnustep-base += CSWlibicudata52 +RUNTIME_DEP_PKGS_CSWgnustep-base += CSWlibicudata54 RUNTIME_DEP_PKGS_CSWgnustep-base += CSWlibffi5 -RUNTIME_DEP_PKGS_CSWgnustep-base += CSWlibicui18n52 +RUNTIME_DEP_PKGS_CSWgnustep-base += CSWlibicui18n54 RUNTIME_DEP_PKGS_CSWgnustep-base += CSWlibiconv2 #overrides CHECKPKG_OVERRIDES_CSWgnustep-base += surplus-dependency|CSWgnustep-make CHECKPKG_OVERRIDES_CSWgnustep-base += file-with-bad-content|/usr/local|root/opt/csw/GNUstep/System/Library/Libraries/gnustep-base/Versions/1.24/Resources/NSTimeZones/README +CHECKPKG_OVERRIDES_CSWgnustep-base += binary-architecture-does-not-match-placement|file=opt/csw/GNUstep/System/Tools/autogsdoc|arch_id=18|arch_name=sparcv8+ +CHECKPKG_OVERRIDES_CSWgnustep-base += file-with-bad-content|/usr/share|root/opt/csw/GNUstep/System/Library/Libraries/libgnustep-base.so.1.24.7 +#overrides for binaries on own package, these are expected: +CHECKPKG_OVERRIDES_CSWgnustep-base += soname-not-found|libgnustep-base.so.1.24|is|needed|by|opt/csw/GNUstep/System/Tools/plget +CHECKPKG_OVERRIDES_CSWgnustep-base += soname-not-found|libgnustep-base.so.1.24|is|needed|by|opt/csw/GNUstep/System/Tools/xmlparse +CHECKPKG_OVERRIDES_CSWgnustep-base += soname-not-found|libgnustep-base.so.1.24|is|needed|by|opt/csw/GNUstep/System/Tools/pl2link +CHECKPKG_OVERRIDES_CSWgnustep-base += soname-not-found|libgnustep-base.so.1.24|is|needed|by|opt/csw/GNUstep/System/Tools/plmerge +CHECKPKG_OVERRIDES_CSWgnustep-base += soname-not-found|libgnustep-base.so.1.24|is|needed|by|opt/csw/GNUstep/System/Tools/sfparse +CHECKPKG_OVERRIDES_CSWgnustep-base += soname-not-found|libgnustep-base.so.1.24|is|needed|by|opt/csw/GNUstep/System/Tools/plparse +CHECKPKG_OVERRIDES_CSWgnustep-base += soname-not-found|libgnustep-base.so.1.24|is|needed|by|opt/csw/GNUstep/System/Tools/pldes +CHECKPKG_OVERRIDES_CSWgnustep-base += soname-not-found|libgnustep-base.so.1.24|is|needed|by|opt/csw/GNUstep/System/Tools/cvtenc +CHECKPKG_OVERRIDES_CSWgnustep-base += soname-not-found|libgnustep-base.so.1.24|is|needed|by|opt/csw/GNUstep/System/Tools/gspath +CHECKPKG_OVERRIDES_CSWgnustep-base += soname-not-found|libgnustep-base.so.1.24|is|needed|by|opt/csw/GNUstep/System/Tools/HTMLLinker +CHECKPKG_OVERRIDES_CSWgnustep-base += soname-not-found|libgnustep-base.so.1.24|is|needed|by|opt/csw/GNUstep/System/Tools/autogsdoc +CHECKPKG_OVERRIDES_CSWgnustep-base += soname-not-found|libgnustep-base.so.1.24|is|needed|by|opt/csw/GNUstep/System/Tools/pl +CHECKPKG_OVERRIDES_CSWgnustep-base += soname-not-found|libgnustep-base.so.1.24|is|needed|by|opt/csw/GNUstep/System/Tools/defaults +CHECKPKG_OVERRIDES_CSWgnustep-base += soname-not-found|libgnustep-base.so.1.24|is|needed|by|opt/csw/GNUstep/System/Tools/make_strings +CHECKPKG_OVERRIDES_CSWgnustep-base += soname-not-found|libgnustep-base.so.1.24|is|needed|by|opt/csw/GNUstep/System/Tools/plser + #where can we build? PACKAGING_PLATFORMS += solaris9-sparc PACKAGING_PLATFORMS += solaris10-sparc #PATCHFILES += 0001-configure-tweak-align.patch +PATCHFILES += 0002-timezone.patch #we absolutely need GCC for Objective-C support. The only alternative in the future would be clang GARCOMPILER = GNU Added: csw/mgar/pkg/gnustep-base/trunk/files/0002-timezone.patch =================================================================== --- csw/mgar/pkg/gnustep-base/trunk/files/0002-timezone.patch (rev 0) +++ csw/mgar/pkg/gnustep-base/trunk/files/0002-timezone.patch 2015-01-23 23:15:02 UTC (rev 24592) @@ -0,0 +1,40 @@ +Index: Source/NSTimeZone.m +=================================================================== +--- a/Source/NSTimeZone.m (revision 38165) ++++ b/Source/NSTimeZone.m (working copy) +@@ -112,7 +112,6 @@ + #ifdef HAVE_TZHEAD + #include + #else +-#define NOID + #include "nstzfile.h" + #endif + +Index: Source/nstzfile.h +=================================================================== +--- a/Source/nstzfile.h (revision 38165) ++++ b/Source/nstzfile.h (working copy) +@@ -16,23 +16,9 @@ + */ + + /* +-** ID +-*/ +- +-#ifndef lint +-#ifndef NOID +-static char tzfilehid[] = "@(#)tzfile.h 7.14"; +-#endif /* !defined NOID */ +-#endif /* !defined lint */ +- +-/* + ** Information about time zone files. + */ + +-#ifndef TZDIR +-#define TZDIR "/usr/local/etc/zoneinfo" /* Time zone object file directory */ +-#endif /* !defined TZDIR */ +- + #ifndef TZDEFAULT + #define TZDEFAULT "localtime" + #endif /* !defined TZDEFAULT */ 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 Jan 24 20:48:30 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 24 Jan 2015 19:48:30 +0000 Subject: SF.net SVN: gar:[24593] csw/mgar/pkg/pigz/trunk Message-ID: <3kV7FC19hdz1RK@mail.opencsw.org> Revision: 24593 http://sourceforge.net/p/gar/code/24593 Author: dmichelsen Date: 2015-01-24 19:48:30 +0000 (Sat, 24 Jan 2015) Log Message: ----------- pigz/trunk: Update to 2.3.3 Modified Paths: -------------- csw/mgar/pkg/pigz/trunk/Makefile csw/mgar/pkg/pigz/trunk/checksums Modified: csw/mgar/pkg/pigz/trunk/Makefile =================================================================== --- csw/mgar/pkg/pigz/trunk/Makefile 2015-01-23 23:15:02 UTC (rev 24592) +++ csw/mgar/pkg/pigz/trunk/Makefile 2015-01-24 19:48:30 UTC (rev 24593) @@ -1,5 +1,5 @@ NAME = pigz -VERSION = 2.3.1 +VERSION = 2.3.3 GARTYPE = v2 DESCRIPTION = A parallel implementation of gzip Modified: csw/mgar/pkg/pigz/trunk/checksums =================================================================== --- csw/mgar/pkg/pigz/trunk/checksums 2015-01-23 23:15:02 UTC (rev 24592) +++ csw/mgar/pkg/pigz/trunk/checksums 2015-01-24 19:48:30 UTC (rev 24593) @@ -1 +1 @@ -e803f8bc0770c7a5e96dccb1d2dd2aab pigz-2.3.1.tar.gz +01d7a16cce77929cc1a78aa1bdfb68cb pigz-2.3.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Sun Jan 25 17:12:43 2015 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Sun, 25 Jan 2015 16:12:43 +0000 Subject: SF.net SVN: gar:[24595] csw/mgar/pkg/sqlitebrowser/trunk/Makefile Message-ID: <3kVfPd0gsvz7N@mail.opencsw.org> Revision: 24595 http://sourceforge.net/p/gar/code/24595 Author: cgrzemba Date: 2015-01-25 16:12:42 +0000 (Sun, 25 Jan 2015) Log Message: ----------- sqlitebrowser/trunk: add runtime dependency Modified Paths: -------------- csw/mgar/pkg/sqlitebrowser/trunk/Makefile Modified: csw/mgar/pkg/sqlitebrowser/trunk/Makefile =================================================================== --- csw/mgar/pkg/sqlitebrowser/trunk/Makefile 2015-01-25 16:12:06 UTC (rev 24594) +++ csw/mgar/pkg/sqlitebrowser/trunk/Makefile 2015-01-25 16:12:42 UTC (rev 24595) @@ -31,6 +31,9 @@ RUNTIME_DEP_PKGS_CSWsqlitebrowser += CSWlibsqlite3-0 RUNTIME_DEP_PKGS_CSWsqlitebrowser += CSWlibqtgui4 RUNTIME_DEP_PKGS_CSWsqlitebrowser += CSWlibgcc-s1 +# QT apps need fonconfig +RUNTIME_DEP_PKGS_CSWsqlitebrowser += CSWfontconfig +CHECKPKG_OVERRIDES_CSWsqlitebrowser += surplus-dependency|CSWfontconfig CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Sun Jan 25 17:29:02 2015 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Sun, 25 Jan 2015 16:29:02 +0000 Subject: SF.net SVN: gar:[24596] csw/mgar/pkg/lang-python/python-augeas/trunk/ Makefile Message-ID: <3kVfmT0Cy3zB2@mail.opencsw.org> Revision: 24596 http://sourceforge.net/p/gar/code/24596 Author: janholzh Date: 2015-01-25 16:29:02 +0000 (Sun, 25 Jan 2015) Log Message: ----------- lang-python/python-augeas/trunk: change package name,add override Modified Paths: -------------- csw/mgar/pkg/lang-python/python-augeas/trunk/Makefile Modified: csw/mgar/pkg/lang-python/python-augeas/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python-augeas/trunk/Makefile 2015-01-25 16:12:42 UTC (rev 24595) +++ csw/mgar/pkg/lang-python/python-augeas/trunk/Makefile 2015-01-25 16:29:02 UTC (rev 24596) @@ -16,11 +16,18 @@ VENDOR_URL = http://augeas.net -PACKAGES = CSWpyaugeas +PACKAGES = CSWpy-augeas +SPKG_DESC_CSWpy-augeas = Augeas Python Bindings CATALOGNAME = py_augeas +OBSOLETED_BY_CSWpy-augeas = CSWpyaugeas + + DEP_PKGS = CSWaugeas +#Lib needed: +CHECKPKG_OVERRIDES_CSWpy-augeas += surplus-dependency|CSWaugeas + CONFIGURE_ARGS = $(DIRPATHS) TEST_SCRIPTS = 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 Jan 29 16:35:27 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 29 Jan 2015 15:35:27 +0000 Subject: SF.net SVN: gar:[24599] csw/mgar/pkg/ansible/trunk Message-ID: <3kY5P25rcqz1Th@mail.opencsw.org> Revision: 24599 http://sourceforge.net/p/gar/code/24599 Author: dmichelsen Date: 2015-01-29 15:35:26 +0000 (Thu, 29 Jan 2015) Log Message: ----------- ansible/trunk: Move to release tarball, otherwise core and extra modules are missing, general cleanup Modified Paths: -------------- csw/mgar/pkg/ansible/trunk/Makefile csw/mgar/pkg/ansible/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/ansible/trunk/files/README.CSW Modified: csw/mgar/pkg/ansible/trunk/Makefile =================================================================== --- csw/mgar/pkg/ansible/trunk/Makefile 2015-01-28 15:02:31 UTC (rev 24598) +++ csw/mgar/pkg/ansible/trunk/Makefile 2015-01-29 15:35:26 UTC (rev 24599) @@ -7,22 +7,32 @@ define BLURB endef -GITHUB_USER = ansible -GITHUB_REFERENCE= release$(VERSION) -MASTER_SITES = $(GITHUB_MIRROR) -DISTNAME = $(GITHUB_USER)-$(NAME)-6f568bd -DISTFILES = $(GITHUB_REFERENCE)$(GITHUB_BALL_EXT) -DISTFILES += README.CSW -DISTFILES += hosts.CSW +MASTER_SITES += http://releases.ansible.com/ansible/ +DISTFILES += $(DISTNAME).tar.gz +DISTFILES += hosts.CSW -PACKAGES = CSWansible -CATALOGNAME = ansible +PATCHFILES += 0003-Extended-sbin_paths-by-opt-csw-sbin.patch +PATCHFILES += 0003-Add-etc-opt-csw-ssl-certs-to-the-path-searched-for-..patch + +PACKAGES += CSWansible +# Stick with upstream naming CHECKPKG_OVERRIDES_CSWansible += pkgname-does-not-start-with-CSWpy- CHECKPKG_OVERRIDES_CSWansible += catalogname-does-not-start-with-py_ +SPKG_DESC_CSWansible = Deploy, manage, and orchestrate computer systems +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWansible += CSWpython +RUNTIME_DEP_PKGS_CSWansible = CSWpy-jinja2 +RUNTIME_DEP_PKGS_CSWansible += CSWpy-markupsafe +RUNTIME_DEP_PKGS_CSWansible += CSWpy-yaml +RUNTIME_DEP_PKGS_CSWansible += CSWpy-paramiko +RUNTIME_DEP_PKGS_CSWansible += CSWopenssh-client +# checkpkg cannot detect these +CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWpy-markupsafe +CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWpy-yaml +CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWpy-paramiko +CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWopenssh-client +CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWpy-jinja2 -PATCHFILES += 0003-Extended-sbin_paths-by-opt-csw-sbin.patch -PATCHFILES += 0003-Add-etc-opt-csw-ssl-certs-to-the-path-searched-for-..patch - # There are many OS specific (Linux, FreeBSD, etc.) paths stored in those files. CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/module_common.py CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/callbacks.py @@ -32,28 +42,32 @@ CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/module_utils/basic.py CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/module_utils/urls.py CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/ansible/module_utils/urls.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/extras/packaging/os/homebrew_tap.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/extras/packaging/os/homebrew_cask.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/extras/packaging/os/pkgng.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/extras/packaging/os/homebrew.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/extras/packaging/language/composer.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/extras/monitoring/nagios.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/extras/monitoring/logentries.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/core/packaging/language/pip.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/core/packaging/os/yum.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/core/cloud/amazon/s3.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/core/cloud/google/gc_storage.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/core/files/unarchive.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/ansible/modules/core/system/service.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/ansible/modules/extras/system/alternatives.py +CHECKPKG_OVERRIDES_CSWansible += file-with-bad-content|/usr/share|root/opt/csw/lib/python2.6/site-packages/ansible/modules/core/packaging/os/rhn_register.py -CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWpy-yaml -CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWopenssh-client -CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWpy-jinja2 -CHECKPKG_OVERRIDES_CSWansible += surplus-dependency|CSWpy-markupsafe - -REINPLACEMENTS = etc +REINPLACEMENTS += etc REINPLACE_MATCH_etc = /etc/ansible REINPLACE_WITH_etc = /etc/opt/csw/ansible REINPLACE_FILES_etc = lib/ansible/constants.py REINPLACEMENTS += usr REINPLACE_MATCH_usr = /usr/share/ansible -REINPLACE_WITH_usr = /opt/csw/share/ansible +REINPLACE_WITH_usr = /opt/csw/share/ansible REINPLACE_FILES_usr = lib/ansible/constants.py -RUNTIME_DEP_PKGS = CSWpython -RUNTIME_DEP_PKGS = CSWpy-jinja2 -RUNTIME_DEP_PKGS += CSWpy-markupsafe -RUNTIME_DEP_PKGS += CSWpy-yaml -RUNTIME_DEP_PKGS += CSWopenssh-client - ARCHALL = 1 TEST_SCRIPTS = Modified: csw/mgar/pkg/ansible/trunk/checksums =================================================================== --- csw/mgar/pkg/ansible/trunk/checksums 2015-01-28 15:02:31 UTC (rev 24598) +++ csw/mgar/pkg/ansible/trunk/checksums 2015-01-29 15:35:26 UTC (rev 24599) @@ -1 +1,2 @@ -74911fe25193f2f8799bfd78599876a8 release1.8.2.tar.gz +33d96058f7b52794fe8dd34fa4f37a80 README.CSW +c2ac0e5a4c092dfa84c7e9e51cd45095 ansible-1.8.2.tar.gz Deleted: csw/mgar/pkg/ansible/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/ansible/trunk/files/README.CSW 2015-01-28 15:02:31 UTC (rev 24598) +++ csw/mgar/pkg/ansible/trunk/files/README.CSW 2015-01-29 15:35:26 UTC (rev 24599) @@ -1,19 +0,0 @@ -Note -==== - -OpenCSW Ansible does not support Paramiko as a connection method, due -to lack of a Paramiko OpenCSW package. Therefore, OpenCSW Ansible -requires an SSH implementation supporting ControlPersist -functionality, which is provided by the OpenCSW OpenSSH Client -package. - -In order to make to make use of the OpenCSW OpenSSH Client, please -make sure /opt/csw/bin is listed before /usr/bin in your PATH -environment variable, e.g. - - - PATH=/opt/csw/bin:$PATH ansible ... - - -Or you might follow the instructions given in the section `Setting -your PATH' on http://www.opencsw.org/use-it/. 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 Jan 30 15:44:36 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 30 Jan 2015 14:44:36 +0000 Subject: SF.net SVN: gar:[24602] csw/mgar/pkg/lang-python/paramiko/trunk/Makefile Message-ID: <3kYhCd2ft0zPs@mail.opencsw.org> Revision: 24602 http://sourceforge.net/p/gar/code/24602 Author: dmichelsen Date: 2015-01-30 14:44:35 +0000 (Fri, 30 Jan 2015) Log Message: ----------- lang-python/paramiko/trunk: CSWpy- is the right name, looks like we had both versions in the catalog with contents, obsolete strange named one Modified Paths: -------------- csw/mgar/pkg/lang-python/paramiko/trunk/Makefile Modified: csw/mgar/pkg/lang-python/paramiko/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/paramiko/trunk/Makefile 2015-01-30 12:31:09 UTC (rev 24601) +++ csw/mgar/pkg/lang-python/paramiko/trunk/Makefile 2015-01-30 14:44:35 UTC (rev 24602) @@ -17,16 +17,17 @@ MASTER_SITES = $(PYPI_MIRROR) DISTFILES += $(DISTNAME).tar.gz -PACKAGES += CSWparamiko +PACKAGES += CSWpy-paramiko # We stick with upstream naming -CHECKPKG_OVERRIDES_CSWparamiko += pkgname-does-not-start-with-CSWpy- -CHECKPKG_OVERRIDES_CSWparamiko += catalogname-does-not-start-with-py_ -SPKG_DESC_CSWparamiko = Python module that implements the SSH2 protocol +CHECKPKG_OVERRIDES_CSWpy-paramiko += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWpy-paramiko += catalogname-does-not-start-with-py_ +SPKG_DESC_CSWpy-paramiko = Python module that implements the SSH2 protocol # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWparamiko += CSWpy-crypto +RUNTIME_DEP_PKGS_CSWpy-paramiko += CSWpy-crypto # checkpkg cannot track this -CHECKPKG_OVERRIDES_CSWparamiko += surplus-dependency|CSWpy-crypto +CHECKPKG_OVERRIDES_CSWpy-paramiko += surplus-dependency|CSWpy-crypto ARCHALL_CSWparamiko = 1 +OBSOLETED_BY_CSWpy-paramiko = CSWparamiko REINPLACEMENTS += moduli REINPLACE_MATCH_moduli += /usr/local/etc/moduli 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 Jan 30 16:01:30 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 30 Jan 2015 15:01:30 +0000 Subject: SF.net SVN: gar:[24603] csw/mgar/pkg/lang-python/paramiko/trunk/Makefile Message-ID: <3kYhb62GgHzSW@mail.opencsw.org> Revision: 24603 http://sourceforge.net/p/gar/code/24603 Author: dmichelsen Date: 2015-01-30 15:01:29 +0000 (Fri, 30 Jan 2015) Log Message: ----------- lang-python/paramiko/trunk: Adjust archall Modified Paths: -------------- csw/mgar/pkg/lang-python/paramiko/trunk/Makefile Modified: csw/mgar/pkg/lang-python/paramiko/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/paramiko/trunk/Makefile 2015-01-30 14:44:35 UTC (rev 24602) +++ csw/mgar/pkg/lang-python/paramiko/trunk/Makefile 2015-01-30 15:01:29 UTC (rev 24603) @@ -26,7 +26,7 @@ RUNTIME_DEP_PKGS_CSWpy-paramiko += CSWpy-crypto # checkpkg cannot track this CHECKPKG_OVERRIDES_CSWpy-paramiko += surplus-dependency|CSWpy-crypto -ARCHALL_CSWparamiko = 1 +ARCHALL_CSWpy-paramiko = 1 OBSOLETED_BY_CSWpy-paramiko = CSWparamiko REINPLACEMENTS += moduli 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 Jan 30 17:02:57 2015 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 30 Jan 2015 16:02:57 +0000 Subject: SF.net SVN: gar:[24604] csw/mgar/pkg/ansible/trunk Message-ID: <3kYjy96M25zYh@mail.opencsw.org> Revision: 24604 http://sourceforge.net/p/gar/code/24604 Author: dmichelsen Date: 2015-01-30 16:02:57 +0000 (Fri, 30 Jan 2015) Log Message: ----------- ansible/trunk: Preserve hosts file and comment out all examples Modified Paths: -------------- csw/mgar/pkg/ansible/trunk/Makefile csw/mgar/pkg/ansible/trunk/files/hosts.CSW Modified: csw/mgar/pkg/ansible/trunk/Makefile =================================================================== --- csw/mgar/pkg/ansible/trunk/Makefile 2015-01-30 15:01:29 UTC (rev 24603) +++ csw/mgar/pkg/ansible/trunk/Makefile 2015-01-30 16:02:57 UTC (rev 24604) @@ -60,7 +60,7 @@ REINPLACEMENTS += etc REINPLACE_MATCH_etc = /etc/ansible -REINPLACE_WITH_etc = /etc/opt/csw/ansible +REINPLACE_WITH_etc = $(sysconfdir)/ansible REINPLACE_FILES_etc = lib/ansible/constants.py REINPLACEMENTS += usr @@ -75,15 +75,10 @@ MODULATIONS_PYTHON_VERSION = 2_6 +PRESERVECONF += $(sysconfdir)/ansible/hosts + include gar/category.mk -post-merge: - if [ -d $(PKGROOT)/usr/share/ansible ] ; then \ - mv $(PKGROOT)/usr/share $(PKGROOT)$(prefix)/share ; \ - rmdir $(PKGROOT)/usr || exit 1 ; \ - fi - if [ ! -d $(PKGROOT)$(sysconfdir)/ansible ] ; then \ - ginstall -d $(PKGROOT)$(sysconfdir)/ansible ; \ - fi - cp $(FILEDIR)/hosts.CSW $(PKGROOT)$(sysconfdir)/ansible/ +post-install: + ginstall -D -m 0644 $(WORKDIR)/hosts.CSW $(DESTDIR)$(sysconfdir)/ansible/hosts.CSW @$(MAKECOOKIE) Modified: csw/mgar/pkg/ansible/trunk/files/hosts.CSW =================================================================== --- csw/mgar/pkg/ansible/trunk/files/hosts.CSW 2015-01-30 15:01:29 UTC (rev 24603) +++ csw/mgar/pkg/ansible/trunk/files/hosts.CSW 2015-01-30 16:02:57 UTC (rev 24604) @@ -10,35 +10,34 @@ # Ex 1: Ungrouped hosts, specify before any group headers. -green.example.com -blue.example.com -192.168.100.1 -192.168.100.10 +#green.example.com +#blue.example.com +#192.168.100.1 +#192.168.100.10 # Ex 2: A collection of hosts belonging to the 'webservers' group -[webservers] -alpha.example.org -beta.example.org -192.168.1.100 -192.168.1.110 +#[webservers] +#alpha.example.org +#beta.example.org +#192.168.1.100 +#192.168.1.110 # If you have multiple hosts following a pattern you can specify # them like this: -www[001:006].example.com +#www[001:006].example.com # Ex 3: A collection of database servers in the 'dbservers' group -[dbservers] +#[dbservers] +#db01.intranet.mydomain.net +#db02.intranet.mydomain.net +#10.25.1.56 +#10.25.1.57 -db01.intranet.mydomain.net -db02.intranet.mydomain.net -10.25.1.56 -10.25.1.57 - # Here's another example of host ranges, this time there are no # leading 0s: -db-[99:101]-node.example.com +#db-[99:101]-node.example.com This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From g_sauthoff at users.sourceforge.net Sat Jan 31 16:43:26 2015 From: g_sauthoff at users.sourceforge.net (g_sauthoff at users.sourceforge.net) Date: Sat, 31 Jan 2015 15:43:26 +0000 Subject: SF.net SVN: gar:[24607] csw/mgar/pkg/libcheck/trunk/Makefile Message-ID: <3kZKT45RjPz71@mail.opencsw.org> Revision: 24607 http://sourceforge.net/p/gar/code/24607 Author: g_sauthoff Date: 2015-01-31 15:43:26 +0000 (Sat, 31 Jan 2015) Log Message: ----------- explicitly specify the license filename, cosmetic whitespace edit because libcheck does not use the standard COPYING name. Otherwise, the resulting package includes a 0 byte size license file. Modified Paths: -------------- csw/mgar/pkg/libcheck/trunk/Makefile Modified: csw/mgar/pkg/libcheck/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcheck/trunk/Makefile 2015-01-31 13:54:12 UTC (rev 24606) +++ csw/mgar/pkg/libcheck/trunk/Makefile 2015-01-31 15:43:26 UTC (rev 24607) @@ -1,7 +1,7 @@ # $Id$ # TODO (release-critical prefixed with !, non release-critical with *) # -NAME = check +NAME = check VERSION = 0.9.14 GARTYPE = v2 @@ -19,10 +19,12 @@ VENDOR_URL = http://check.sourceforge.net/ MASTER_SITES = $(SF_MIRROR) -DISTFILES = $(DISTNAME).tar.gz +DISTFILES = $(DISTNAME).tar.gz -GARCOMPILER = GNU +LICENSE = COPYING.LESSER +GARCOMPILER = GNU + PACKAGES += CSWlibcheck0 SPKG_DESC_CSWlibcheck0 = A unit test framework for C, libcheck.so.0 PKGFILES_CSWlibcheck0 += $(call pkgfiles_lib,libcheck.so.0) @@ -37,8 +39,6 @@ CONFIGURE_ARGS += $(DIRPATHS) -include gar/category.mk - OUR_PATH = /usr/xpg6/bin:/usr/xpg4/bin:/usr/ccs/bin:/usr/bin:/sbin:/usr/sbin:/opt/csw/bin:$(PATH) CONFIGURE_ENV_PATH = $(OUR_PATH) @@ -46,3 +46,4 @@ TEST_ENV_PATH = $(OUR_PATH) INSTALL_ENV_PATH = $(OUR_PATH) +include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.