From maciej at opencsw.org Mon Aug 1 12:05:02 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Mon, 1 Aug 2011 11:05:02 +0100 Subject: [csw-devel] SF.net SVN: gar:[15232] csw/mgar/pkg In-Reply-To: <20110801085218.GA24263@bender.opencsw.org> References: <20110801085218.GA24263@bender.opencsw.org> Message-ID: 2011/8/1 Kester Habermann : > Hi Maciej, > > On Sun, Jul 31, 2011 at 11:58:12AM +0100, Maciej Blizi??ski wrote: >> > +install-custom: >> > + ? ? ? ( TCL_INSTDIR=$(DESTDIR)/opt/csw/lib/tcl`echo 'puts $$tcl_version' >> | /opt/csw/bin/tclsh`/$(NAME)$(VERSION) ;\ >> >> If you use $(bindir) instead of /opt/csw/bin, you avoid hardcoding /opt/csw. >> This way, you make it easier to build this package in a different prefix. > > Thanks for the hints again. Before I coded this, I actually looked for a GAR > variable that held the installation prefix (/opt/csw/), but I could not find one. > The $(bindir) only gives /opt/csw/bin. Is there also something for /opt/csw/lib/? > In same cases the generic one for /opt/csw/ would also be useful. The variable that holds /opt/csw is $(prefix). Ideally, you would set that variable to something else such as /usr/local, and build into that prefix. For bits like /opt/csw/lib/tcl, I often use $(libdir)/tcl. I hope this helps! Maciej From aigoshin at users.sourceforge.net Mon Aug 1 13:02:54 2011 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Mon, 01 Aug 2011 11:02:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[15233] csw/mgar/pkg/nginx/trunk/Makefile Message-ID: Revision: 15233 http://gar.svn.sourceforge.net/gar/?rev=15233&view=rev Author: aigoshin Date: 2011-08-01 11:02:54 +0000 (Mon, 01 Aug 2011) Log Message: ----------- nginx: debugging Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2011-07-29 14:23:37 UTC (rev 15232) +++ csw/mgar/pkg/nginx/trunk/Makefile 2011-08-01 11:02:54 UTC (rev 15233) @@ -50,6 +50,7 @@ sysconfdir=/etc/opt/csw localstatedir=/var/opt/csw +CONFIGURE_ARGS += --with-debug CONFIGURE_ARGS += --with-cpu-opt=$(NGINXCPU) CONFIGURE_ARGS += --with-cc-opt="-I$(includedir) -I$(includedir)/openssl" CONFIGURE_ARGS += --with-ld-opt="$(LDFLAGS)" 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 Aug 1 15:45:47 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 01 Aug 2011 13:45:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[15234] csw/mgar/pkg/libgmp/trunk/Makefile Message-ID: Revision: 15234 http://gar.svn.sourceforge.net/gar/?rev=15234&view=rev Author: wahwah Date: 2011-08-01 13:45:46 +0000 (Mon, 01 Aug 2011) Log Message: ----------- pkg/libgmp/trunk: Removing UFILES_REGEX Modified Paths: -------------- csw/mgar/pkg/libgmp/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/libgmp/trunk/Makefile Modified: csw/mgar/pkg/libgmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgmp/trunk/Makefile 2011-08-01 11:02:54 UTC (rev 15233) +++ csw/mgar/pkg/libgmp/trunk/Makefile 2011-08-01 13:45:46 UTC (rev 15234) @@ -1,3 +1,5 @@ +# $Id$ + NAME = gmp VERSION = 5.0.1 CATEGORIES = lib @@ -22,9 +24,6 @@ SPKG_SOURCEURL = http://gmplib.org/ -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 - #GARCOMPILER = GCC4 BUILD64 = 1 Property changes on: csw/mgar/pkg/libgmp/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Aug 1 16:32:07 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 01 Aug 2011 14:32:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[15235] csw/mgar/pkg/mgar/trunk/Makefile Message-ID: Revision: 15235 http://gar.svn.sourceforge.net/gar/?rev=15235&view=rev Author: wahwah Date: 2011-08-01 14:32:06 +0000 (Mon, 01 Aug 2011) Log Message: ----------- pkg/mgar/trunk: Bump up the version to 380 Modified Paths: -------------- csw/mgar/pkg/mgar/trunk/Makefile Modified: csw/mgar/pkg/mgar/trunk/Makefile =================================================================== --- csw/mgar/pkg/mgar/trunk/Makefile 2011-08-01 13:45:46 UTC (rev 15234) +++ csw/mgar/pkg/mgar/trunk/Makefile 2011-08-01 14:32:06 UTC (rev 15235) @@ -1,3 +1,4 @@ +# $Id$ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = mgar @@ -11,7 +12,7 @@ VENDOR_URL = http://gar.opencsw.org SVNROOT = https://opencsw.svn.sourceforge.net/svnroot/opencsw/gar-wrapper -SVNREV = 360 +SVNREV = 380 ARCHALL = 1 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 Aug 1 16:33:11 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 01 Aug 2011 14:33:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[15236] csw/mgar/pkg/mgar/trunk/Makefile Message-ID: Revision: 15236 http://gar.svn.sourceforge.net/gar/?rev=15236&view=rev Author: wahwah Date: 2011-08-01 14:33:11 +0000 (Mon, 01 Aug 2011) Log Message: ----------- pkg/mgar/trunk: Bump the package version to 0.92 Modified Paths: -------------- csw/mgar/pkg/mgar/trunk/Makefile Modified: csw/mgar/pkg/mgar/trunk/Makefile =================================================================== --- csw/mgar/pkg/mgar/trunk/Makefile 2011-08-01 14:32:06 UTC (rev 15235) +++ csw/mgar/pkg/mgar/trunk/Makefile 2011-08-01 14:33:11 UTC (rev 15236) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = mgar -VERSION = 0.91 +VERSION = 0.92 CATEGORIES = apps DESCRIPTION = Command line interface to the OpenCSW build system This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Mon Aug 1 18:15:57 2011 From: maciej at opencsw.org (Maciej Blizinski) Date: Mon, 1 Aug 2011 18:15:57 +0200 Subject: [csw-devel] [PATCH] Fix SPKG_DESC duplicate checking Message-ID: <1312215357-25360-1-git-send-email-maciej@opencsw.org> Works around ticket #56. http://sourceforge.net/apps/trac/gar/ticket/56 Previous attempt at fixing it: http://sourceforge.net/apps/trac/gar/changeset/11424 --- gar/v2/gar.pkg.mk | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/gar/v2/gar.pkg.mk b/gar/v2/gar.pkg.mk index 41495e0..6419b54 100644 --- a/gar/v2/gar.pkg.mk +++ b/gar/v2/gar.pkg.mk @@ -640,9 +640,16 @@ $(if $(filter-out $(firstword $(SPKG_SPECS)),$(SPKG_SPECS)),\ $(foreach P,$(SPKG_SPECS),\ $(if $(SPKG_DESC_$(P)),,$(error Multiple packages defined and SPKG_DESC_$(P) is not set.)))) +# There was a bug here. +# http://sourceforge.net/apps/trac/gar/ticket/56 +# The workaround was to add an additional check whether the strings are the +# same or not. $(foreach P,$(SPKG_SPECS),\ $(foreach Q,$(filter-out $(P) $(OBSOLETED_PKGS),$(SPKG_SPECS)),\ - $(if $(filter-out $(subst ,_,$(SPKG_DESC_$(P))),$(subst ,_,$(SPKG_DESC_$(Q)))),,$(error The package descriptions for $(P) [$(if $(SPKG_DESC_$(P)),$(SPKG_DESC_$(P)),)] and $(Q) [$(if $(SPKG_DESC_$(Q)),$(SPKG_DESC_$(Q)),)] are identical. Please make sure that all descriptions are unique by setting SPKG_DESC_ for each package.)))) + $(if $(filter-out $(subst ,_,$(SPKG_DESC_$(P))),$(subst ,_,$(SPKG_DESC_$(Q)))),\ + ,\ + $(if $(shell if [ "$(SPKG_DESC_$(P))" = "$(SPKG_DESC_$(Q))" ]; then echo bad; fi),\ + $(error The package descriptions for $(P) [$(if $(SPKG_DESC_$(P)),$(SPKG_DESC_$(P)),)] and $(Q) [$(if $(SPKG_DESC_$(Q)),$(SPKG_DESC_$(Q)),)] are identical. Please make sure that all descriptions are unique by setting SPKG_DESC_ for each package.),)))) .PRECIOUS: $(WORKDIR)/%.pkginfo -- 1.7.5.4 From wahwah at users.sourceforge.net Mon Aug 1 22:03:53 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 01 Aug 2011 20:03:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[15237] csw/mgar/pkg/libgmp3/trunk/Makefile Message-ID: Revision: 15237 http://gar.svn.sourceforge.net/gar/?rev=15237&view=rev Author: wahwah Date: 2011-08-01 20:03:53 +0000 (Mon, 01 Aug 2011) Log Message: ----------- pkg/libgmp3/trunk: removing UFILES_REGEX Modified Paths: -------------- csw/mgar/pkg/libgmp3/trunk/Makefile Modified: csw/mgar/pkg/libgmp3/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgmp3/trunk/Makefile 2011-08-01 14:33:11 UTC (rev 15236) +++ csw/mgar/pkg/libgmp3/trunk/Makefile 2011-08-01 20:03:53 UTC (rev 15237) @@ -22,9 +22,6 @@ SPKG_SOURCEURL = http://gmplib.org/ -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 - GARCOMPILER = GCC4 BUILD64 = 1 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 Aug 1 22:06:34 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 01 Aug 2011 20:06:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[15238] csw/mgar/pkg/libgmp/trunk Message-ID: Revision: 15238 http://gar.svn.sourceforge.net/gar/?rev=15238&view=rev Author: wahwah Date: 2011-08-01 20:06:34 +0000 (Mon, 01 Aug 2011) Log Message: ----------- pkg/libgmp/trunk: an override for bad content in .info Modified Paths: -------------- csw/mgar/pkg/libgmp/trunk/Makefile csw/mgar/pkg/libgmp/trunk/checksums Modified: csw/mgar/pkg/libgmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgmp/trunk/Makefile 2011-08-01 20:03:53 UTC (rev 15237) +++ csw/mgar/pkg/libgmp/trunk/Makefile 2011-08-01 20:06:34 UTC (rev 15238) @@ -1,7 +1,7 @@ # $Id$ NAME = gmp -VERSION = 5.0.1 +VERSION = 5.0.2 CATEGORIES = lib DESCRIPTION = GNU Multiple Precision Arithmetic Library @@ -76,6 +76,9 @@ # We have collisions with legacy CSWlibgmp until re-release CHECKPKG_OVERRIDES_CSWlibgmp-dev += file-collision +# It's only an .info file. +CHECKPKG_OVERRIDES_CSWlibgmp-dev += file-with-bad-content|/usr/local|root/opt/csw/share/info/gmp.info-1 + include gar/category.mk #ifeq ($(ISA), sparcv8plus) Modified: csw/mgar/pkg/libgmp/trunk/checksums =================================================================== --- csw/mgar/pkg/libgmp/trunk/checksums 2011-08-01 20:03:53 UTC (rev 15237) +++ csw/mgar/pkg/libgmp/trunk/checksums 2011-08-01 20:06:34 UTC (rev 15238) @@ -1 +1 @@ -6bac6df75c192a13419dfd71d19240a7 gmp-5.0.1.tar.bz2 +0bbaedc82fb30315b06b1588b9077cd3 gmp-5.0.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Aug 1 22:07:49 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 01 Aug 2011 20:07:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[15239] csw/mgar/pkg/libgmp3/trunk/Makefile Message-ID: Revision: 15239 http://gar.svn.sourceforge.net/gar/?rev=15239&view=rev Author: wahwah Date: 2011-08-01 20:07:49 +0000 (Mon, 01 Aug 2011) Log Message: ----------- pkg/libgmp3/trunk: splitting off a dev package to be later replaced Modified Paths: -------------- csw/mgar/pkg/libgmp3/trunk/Makefile Modified: csw/mgar/pkg/libgmp3/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgmp3/trunk/Makefile 2011-08-01 20:06:34 UTC (rev 15238) +++ csw/mgar/pkg/libgmp3/trunk/Makefile 2011-08-01 20:07:49 UTC (rev 15239) @@ -59,6 +59,13 @@ # This is a legacy package, tolerate the wrong name until this is obsoleted CHECKPKG_OVERRIDES_CSWlibgmp += shared-lib-pkgname-mismatch +PACKAGES += CSWlibgmp-dev +CATALOGNAME_CSWlibgmp-dev = libgmp_dev +SPKG_DESC_CSWlibgmp-dev = GNU Multiple Precision Arithmetic Library, development files +RUNTIME_DEP_PKGS_CSWlibgmp-dev += CSWlibgmp +# /usr/local mentioned content in .info file. +CHECKPKG_OVERRIDES_CSWlibgmp-dev += file-with-bad-content|/usr/local|root/opt/csw/share/info/gmp.info-1 + RUNTIME_DEP_PKGS = CSWgcc4corert include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Aug 2 00:50:25 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 01 Aug 2011 22:50:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[15240] csw/mgar/pkg/libgmp/trunk/Makefile Message-ID: Revision: 15240 http://gar.svn.sourceforge.net/gar/?rev=15240&view=rev Author: wahwah Date: 2011-08-01 22:50:24 +0000 (Mon, 01 Aug 2011) Log Message: ----------- pkg/libgmp/trunk: thanks to the dev package split, file collisions are gone Modified Paths: -------------- csw/mgar/pkg/libgmp/trunk/Makefile Modified: csw/mgar/pkg/libgmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgmp/trunk/Makefile 2011-08-01 20:07:49 UTC (rev 15239) +++ csw/mgar/pkg/libgmp/trunk/Makefile 2011-08-01 22:50:24 UTC (rev 15240) @@ -73,9 +73,6 @@ #RUNTIME_DEP_PKGS = CSWgcc4corert -# We have collisions with legacy CSWlibgmp until re-release -CHECKPKG_OVERRIDES_CSWlibgmp-dev += file-collision - # It's only an .info file. CHECKPKG_OVERRIDES_CSWlibgmp-dev += file-with-bad-content|/usr/local|root/opt/csw/share/info/gmp.info-1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Aug 2 08:14:46 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 02 Aug 2011 06:14:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[15241] csw/mgar/pkg/gcc4/trunk Message-ID: Revision: 15241 http://gar.svn.sourceforge.net/gar/?rev=15241&view=rev Author: wahwah Date: 2011-08-02 06:14:45 +0000 (Tue, 02 Aug 2011) Log Message: ----------- pkg/gcc4/trunk: version bump to 4.6.1, other small changes, does not build yet Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile csw/mgar/pkg/gcc4/trunk/checksums csw/mgar/pkg/gcc4/trunk/files/gar_override.mk csw/mgar/pkg/gcc4/trunk/files/package_def.mk Property Changed: ---------------- csw/mgar/pkg/gcc4/trunk/Makefile Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2011-08-01 22:50:24 UTC (rev 15240) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2011-08-02 06:14:45 UTC (rev 15241) @@ -1,6 +1,9 @@ +# $Id$ + NAME = gcc -VERSION = 4.5.0 +VERSION = 4.6.1 CATEGORIES = lang +GARTYPE = v2 DESCRIPTION = The GNU Compiler Collection define BLURB @@ -12,10 +15,6 @@ DISTFILES = $(NAME)-$(VERSION).tar.bz2 MASTER_SITES = $(GNU_MIRROR)/$(NAME)-$(VERSION)/ -# We define upstream file regex so we can be notifed -# of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 - PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 Property changes on: csw/mgar/pkg/gcc4/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/gcc4/trunk/checksums =================================================================== --- csw/mgar/pkg/gcc4/trunk/checksums 2011-08-01 22:50:24 UTC (rev 15240) +++ csw/mgar/pkg/gcc4/trunk/checksums 2011-08-02 06:14:45 UTC (rev 15241) @@ -1,2 +1 @@ -9883bd7887c22e1180b9dae4f2acd8ec CSWgcc4core.space -ff27b7c4a5d5060c8a8543a44abca31f gcc-4.5.0.tar.bz2 +c57a9170c677bf795bdc04ed796ca491 gcc-4.6.1.tar.bz2 Modified: csw/mgar/pkg/gcc4/trunk/files/gar_override.mk =================================================================== --- csw/mgar/pkg/gcc4/trunk/files/gar_override.mk 2011-08-01 22:50:24 UTC (rev 15240) +++ csw/mgar/pkg/gcc4/trunk/files/gar_override.mk 2011-08-02 06:14:45 UTC (rev 15241) @@ -40,6 +40,6 @@ post-configure-modulated: fix-bootflags MERGE_SCRIPTS_isa-i386 = amd -## Run checkpkg Manually -ENABLE_CHECK = 0 - +# This should not be necessary any more thanks to checkpkg overrides. +# ## Run checkpkg Manually +# ENABLE_CHECK = 0 Modified: csw/mgar/pkg/gcc4/trunk/files/package_def.mk =================================================================== --- csw/mgar/pkg/gcc4/trunk/files/package_def.mk 2011-08-01 22:50:24 UTC (rev 15240) +++ csw/mgar/pkg/gcc4/trunk/files/package_def.mk 2011-08-02 06:14:45 UTC (rev 15241) @@ -1,7 +1,16 @@ ### Package Section ### -PACKAGES = CSWgcc4ada CSWgcc4adart CSWgcc4gfortran CSWgcc4gfortranrt -PACKAGES += CSWgcc4java CSWgcc4javart CSWgcc4objc CSWgcc4objcrt -PACKAGES += CSWgcc4g++ CSWgcc4g++rt CSWgcc4corert CSWgcc4core +PACKAGES = CSWgcc4ada +PACKAGES += CSWgcc4adart +PACKAGES += CSWgcc4core +PACKAGES += CSWgcc4corert +PACKAGES += CSWgcc4g++ +PACKAGES += CSWgcc4g++rt +PACKAGES += CSWgcc4gfortran +PACKAGES += CSWgcc4gfortranrt +PACKAGES += CSWgcc4java +PACKAGES += CSWgcc4javart +PACKAGES += CSWgcc4objc +PACKAGES += CSWgcc4objcrt ## Define Package Catalog Names CATALOGNAME_CSWgcc4ada = gcc4ada This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Aug 2 09:05:14 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 02 Aug 2011 07:05:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[15242] csw/mgar/pkg/libmpfr/trunk Message-ID: Revision: 15242 http://gar.svn.sourceforge.net/gar/?rev=15242&view=rev Author: wahwah Date: 2011-08-02 07:05:14 +0000 (Tue, 02 Aug 2011) Log Message: ----------- libmpfr/trunk: Version bump to 3.0.1, builds but tests are failing Modified Paths: -------------- csw/mgar/pkg/libmpfr/trunk/Makefile csw/mgar/pkg/libmpfr/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/libmpfr/trunk/Makefile Modified: csw/mgar/pkg/libmpfr/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmpfr/trunk/Makefile 2011-08-02 06:14:45 UTC (rev 15241) +++ csw/mgar/pkg/libmpfr/trunk/Makefile 2011-08-02 07:05:14 UTC (rev 15242) @@ -1,5 +1,7 @@ +# $Id$ + NAME = mpfr -VERSION = 2.4.2 +VERSION = 3.0.1 CATEGORIES = lib DESCRIPTION = GNU Multiple Precision floating-point arithmetic library @@ -19,10 +21,6 @@ RUNTIME_DEP_PKGS_CSWlibmpfr = #PATCHFILES = patches -# We define upstream file regex so we can be notifed of -# new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 - BUILD64 = 1 STRIP_LIBTOOL = 1 Property changes on: csw/mgar/pkg/libmpfr/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/libmpfr/trunk/checksums =================================================================== --- csw/mgar/pkg/libmpfr/trunk/checksums 2011-08-02 06:14:45 UTC (rev 15241) +++ csw/mgar/pkg/libmpfr/trunk/checksums 2011-08-02 07:05:14 UTC (rev 15242) @@ -1 +1 @@ -89e59fe665e2b3ad44a6789f40b059a0 mpfr-2.4.2.tar.bz2 +bfbecb2eacb6d48432ead5cfc3f7390a mpfr-3.0.1.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Aug 2 10:24:19 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 02 Aug 2011 08:24:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[15243] csw/mgar/pkg/libmpfr/branches Message-ID: Revision: 15243 http://gar.svn.sourceforge.net/gar/?rev=15243&view=rev Author: wahwah Date: 2011-08-02 08:24:19 +0000 (Tue, 02 Aug 2011) Log Message: ----------- libmpfr: a branch for the legacy version build Added Paths: ----------- csw/mgar/pkg/libmpfr/branches/libmpfr-2.3.1/ csw/mgar/pkg/libmpfr/branches/libmpfr-2.3.1/Makefile csw/mgar/pkg/libmpfr/branches/libmpfr-2.3.1/checksums Removed Paths: ------------- csw/mgar/pkg/libmpfr/branches/libmpfr-2.3.1/Makefile csw/mgar/pkg/libmpfr/branches/libmpfr-2.3.1/checksums Deleted: csw/mgar/pkg/libmpfr/branches/libmpfr-2.3.1/Makefile =================================================================== --- csw/mgar/pkg/libmpfr/trunk/Makefile 2011-08-02 06:14:45 UTC (rev 15241) +++ csw/mgar/pkg/libmpfr/branches/libmpfr-2.3.1/Makefile 2011-08-02 08:24:19 UTC (rev 15243) @@ -1,31 +0,0 @@ -NAME = mpfr -VERSION = 2.4.2 -CATEGORIES = lib - -DESCRIPTION = GNU Multiple Precision floating-point arithmetic library -define BLURB - The MPFR library is a C library for multiple-precision floating-point - computations with correct rounding. -endef - -MASTER_SITES = http://www.mpfr.org/mpfr-current/ -DISTFILES = $(NAME)-$(VERSION).tar.bz2 - -PACKAGES = CSWlibmpfr -CATALOGNAME_CSWlibmpfr = libmpfr -SPKG_DESC_CSWlibmpfr = $(DESCRIPTION) -SPKG_SOURCEURL_CSWlibmpfr = http://www.mpfr.org/ - -RUNTIME_DEP_PKGS_CSWlibmpfr = -#PATCHFILES = patches - -# We define upstream file regex so we can be notifed of -# new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 - -BUILD64 = 1 -STRIP_LIBTOOL = 1 - -CONFIGURE_ARGS = $(DIRPATHS) - -include gar/category.mk Copied: csw/mgar/pkg/libmpfr/branches/libmpfr-2.3.1/Makefile (from rev 15242, csw/mgar/pkg/libmpfr/trunk/Makefile) =================================================================== --- csw/mgar/pkg/libmpfr/branches/libmpfr-2.3.1/Makefile (rev 0) +++ csw/mgar/pkg/libmpfr/branches/libmpfr-2.3.1/Makefile 2011-08-02 08:24:19 UTC (rev 15243) @@ -0,0 +1,29 @@ +# $Id$ + +NAME = mpfr +VERSION = 2.3.1 +CATEGORIES = lib + +DESCRIPTION = GNU Multiple Precision floating-point arithmetic library +define BLURB + The MPFR library is a C library for multiple-precision floating-point + computations with correct rounding. +endef + +MASTER_SITES = http://www.mpfr.org/mpfr-current/ +DISTFILES = $(NAME)-$(VERSION).tar.bz2 + +PACKAGES = CSWlibmpfr +CATALOGNAME_CSWlibmpfr = libmpfr +SPKG_DESC_CSWlibmpfr = $(DESCRIPTION) +SPKG_SOURCEURL_CSWlibmpfr = http://www.mpfr.org/ + +RUNTIME_DEP_PKGS_CSWlibmpfr = +#PATCHFILES = patches + +BUILD64 = 1 +STRIP_LIBTOOL = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Deleted: csw/mgar/pkg/libmpfr/branches/libmpfr-2.3.1/checksums =================================================================== --- csw/mgar/pkg/libmpfr/trunk/checksums 2011-08-02 06:14:45 UTC (rev 15241) +++ csw/mgar/pkg/libmpfr/branches/libmpfr-2.3.1/checksums 2011-08-02 08:24:19 UTC (rev 15243) @@ -1 +0,0 @@ -89e59fe665e2b3ad44a6789f40b059a0 mpfr-2.4.2.tar.bz2 Copied: csw/mgar/pkg/libmpfr/branches/libmpfr-2.3.1/checksums (from rev 15242, csw/mgar/pkg/libmpfr/trunk/checksums) =================================================================== --- csw/mgar/pkg/libmpfr/branches/libmpfr-2.3.1/checksums (rev 0) +++ csw/mgar/pkg/libmpfr/branches/libmpfr-2.3.1/checksums 2011-08-02 08:24:19 UTC (rev 15243) @@ -0,0 +1 @@ +bfbecb2eacb6d48432ead5cfc3f7390a mpfr-3.0.1.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Aug 2 12:34:35 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 02 Aug 2011 10:34:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[15244] csw/mgar/pkg/libmpfr/branches/libmpfr-2.3.1 Message-ID: Revision: 15244 http://gar.svn.sourceforge.net/gar/?rev=15244&view=rev Author: wahwah Date: 2011-08-02 10:34:35 +0000 (Tue, 02 Aug 2011) Log Message: ----------- pkg/libmpfr/branches/libmpfr-2.3.1: 3 of 133 tests failed, debugging needed Modified Paths: -------------- csw/mgar/pkg/libmpfr/branches/libmpfr-2.3.1/Makefile csw/mgar/pkg/libmpfr/branches/libmpfr-2.3.1/checksums Modified: csw/mgar/pkg/libmpfr/branches/libmpfr-2.3.1/Makefile =================================================================== --- csw/mgar/pkg/libmpfr/branches/libmpfr-2.3.1/Makefile 2011-08-02 08:24:19 UTC (rev 15243) +++ csw/mgar/pkg/libmpfr/branches/libmpfr-2.3.1/Makefile 2011-08-02 10:34:35 UTC (rev 15244) @@ -3,14 +3,17 @@ NAME = mpfr VERSION = 2.3.1 CATEGORIES = lib +GARTYPE = v2 +# ! 3 tests are failing, debugging necessary + DESCRIPTION = GNU Multiple Precision floating-point arithmetic library define BLURB The MPFR library is a C library for multiple-precision floating-point computations with correct rounding. endef -MASTER_SITES = http://www.mpfr.org/mpfr-current/ +MASTER_SITES = http://www.mpfr.org/mpfr-$(VERSION)/ DISTFILES = $(NAME)-$(VERSION).tar.bz2 PACKAGES = CSWlibmpfr Modified: csw/mgar/pkg/libmpfr/branches/libmpfr-2.3.1/checksums =================================================================== --- csw/mgar/pkg/libmpfr/branches/libmpfr-2.3.1/checksums 2011-08-02 08:24:19 UTC (rev 15243) +++ csw/mgar/pkg/libmpfr/branches/libmpfr-2.3.1/checksums 2011-08-02 10:34:35 UTC (rev 15244) @@ -1 +1 @@ -bfbecb2eacb6d48432ead5cfc3f7390a mpfr-3.0.1.tar.bz2 +8352b619e04dcc73411a38b39dd855f6 mpfr-2.3.1.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From khabermann at users.sourceforge.net Tue Aug 2 16:23:08 2011 From: khabermann at users.sourceforge.net (khabermann at users.sourceforge.net) Date: Tue, 02 Aug 2011 14:23:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[15245] csw/mgar/pkg/tcl-bwidget/trunk/Makefile Message-ID: Revision: 15245 http://gar.svn.sourceforge.net/gar/?rev=15245&view=rev Author: khabermann Date: 2011-08-02 14:23:08 +0000 (Tue, 02 Aug 2011) Log Message: ----------- tcl-bwidget: use $(prefix) instead of /opt/csw Modified Paths: -------------- csw/mgar/pkg/tcl-bwidget/trunk/Makefile Modified: csw/mgar/pkg/tcl-bwidget/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcl-bwidget/trunk/Makefile 2011-08-02 10:34:35 UTC (rev 15244) +++ csw/mgar/pkg/tcl-bwidget/trunk/Makefile 2011-08-02 14:23:08 UTC (rev 15245) @@ -25,10 +25,9 @@ TEST_TARGET = install-custom: - ( TCL_INSTDIR=$(DESTDIR)/opt/csw/lib/tcl`echo 'puts $$tcl_version' | /opt/csw/bin/tclsh`/$(NAME)$(VERSION) ;\ + ( TCL_INSTDIR=$(DESTDIR)$(libdir)/tcl`echo 'puts $$tcl_version' | $(bindir)/tclsh`/$(NAME)$(VERSION) ;\ mkdir -p -m 755 $$TCL_INSTDIR ;\ cp -pr $(WORKSRC)/* $$TCL_INSTDIR ) $(MAKECOOKIE) include gar/category.mk - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From khabermann at users.sourceforge.net Tue Aug 2 16:23:56 2011 From: khabermann at users.sourceforge.net (khabermann at users.sourceforge.net) Date: Tue, 02 Aug 2011 14:23:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[15246] csw/mgar/pkg/tcl-iwidgets/trunk/Makefile Message-ID: Revision: 15246 http://gar.svn.sourceforge.net/gar/?rev=15246&view=rev Author: khabermann Date: 2011-08-02 14:23:56 +0000 (Tue, 02 Aug 2011) Log Message: ----------- tcl-iwidgets: use $(prefix) instead of /opt/csw Modified Paths: -------------- csw/mgar/pkg/tcl-iwidgets/trunk/Makefile Modified: csw/mgar/pkg/tcl-iwidgets/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcl-iwidgets/trunk/Makefile 2011-08-02 14:23:08 UTC (rev 15245) +++ csw/mgar/pkg/tcl-iwidgets/trunk/Makefile 2011-08-02 14:23:56 UTC (rev 15246) @@ -21,7 +21,7 @@ # It also requires the files /opt/csw/src/config/mkinstalldirs # and /opt/csw/src/config/installFile.tcl to be present. # (location is specified using --with-itcl) -CONFIGURE_ARGS = $(DIRPATHS) --with-itcl=/opt/csw/src +CONFIGURE_ARGS = $(DIRPATHS) --with-itcl=$(prefix)/src BUILD_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bwalton at opencsw.org Wed Aug 3 02:55:53 2011 From: bwalton at opencsw.org (Ben Walton) Date: Tue, 02 Aug 2011 20:55:53 -0400 Subject: [csw-devel] [PATCH] Fix SPKG_DESC duplicate checking In-Reply-To: <1312215357-25360-1-git-send-email-maciej@opencsw.org> References: <1312215357-25360-1-git-send-email-maciej@opencsw.org> Message-ID: <1312332130-sup-5521@pinkfloyd.chass.utoronto.ca> Excerpts from Maciej Blizinski's message of Mon Aug 01 12:15:57 -0400 2011: > Works around ticket #56. > > http://sourceforge.net/apps/trac/gar/ticket/56 > > Previous attempt at fixing it: > http://sourceforge.net/apps/trac/gar/changeset/11424 If we're shelling out, why not offload the whole thing to shell code via an external script in gar/bin? I wonder if checkpkg isn't a better place for this check though? Separating package building from package verification makes sense to me. I know it's low hanging fruit to catch this directly in GAR but it feels wrong to me. If I want to build two packages with the same description, I should be able to do so...and then override checkpkg which enforces the policy. What do others think about moving the check? Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From bdwalton at users.sourceforge.net Wed Aug 3 03:36:31 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 03 Aug 2011 01:36:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[15247] csw/mgar/pkg/libxml2/trunk Message-ID: Revision: 15247 http://gar.svn.sourceforge.net/gar/?rev=15247&view=rev Author: bdwalton Date: 2011-08-03 01:36:31 +0000 (Wed, 03 Aug 2011) Log Message: ----------- libxml2/trunk: update the version script crippling patch Modified Paths: -------------- csw/mgar/pkg/libxml2/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/libxml2/trunk/files/0001-Forcefully-disable-the-symbol-versioning.patch Removed Paths: ------------- csw/mgar/pkg/libxml2/trunk/files/ld-symbol-handling-fixup.patch Modified: csw/mgar/pkg/libxml2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libxml2/trunk/Makefile 2011-08-02 14:23:56 UTC (rev 15246) +++ csw/mgar/pkg/libxml2/trunk/Makefile 2011-08-03 01:36:31 UTC (rev 15247) @@ -9,7 +9,7 @@ MASTER_SITES = ftp://xmlsoft.org/libxml2/ DISTFILES = $(NAME)-$(VERSION).tar.gz -PATCHFILES = ld-symbol-handling-fixup.patch +PATCHFILES = 0001-Forcefully-disable-the-symbol-versioning.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz Added: csw/mgar/pkg/libxml2/trunk/files/0001-Forcefully-disable-the-symbol-versioning.patch =================================================================== --- csw/mgar/pkg/libxml2/trunk/files/0001-Forcefully-disable-the-symbol-versioning.patch (rev 0) +++ csw/mgar/pkg/libxml2/trunk/files/0001-Forcefully-disable-the-symbol-versioning.patch 2011-08-03 01:36:31 UTC (rev 15247) @@ -0,0 +1,38 @@ +From 022f9c9f9f02233f175bd6c1d604072b82790c3f Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Wed, 3 Aug 2011 03:28:15 +0200 +Subject: [PATCH] Forcefully disable the symbol versioning + +Signed-off-by: Ben Walton +--- + configure | 11 +++-------- + 1 files changed, 3 insertions(+), 8 deletions(-) + +diff --git a/configure b/configure +index 605e8c4..068295c 100755 +--- a/configure ++++ b/configure +@@ -11410,17 +11410,12 @@ if test "$lt_cv_prog_gnu_ld" = yes; then + VERSION_SCRIPT_FLAGS=-Wl,--version-script= + else + case $host in +- *-*-sunos*) VERSION_SCRIPT_FLAGS="-Wl,-M -Wl,";; ++ *-*-sunos*) VERSION_SCRIPT_FLAGS="-Wl,-M";; + esac + fi + +- if test -z "$VERSION_SCRIPT_FLAGS"; then +- USE_VERSION_SCRIPT_TRUE= +- USE_VERSION_SCRIPT_FALSE='#' +-else +- USE_VERSION_SCRIPT_TRUE='#' +- USE_VERSION_SCRIPT_FALSE= +-fi ++USE_VERSION_SCRIPT_TRUE='#' ++USE_VERSION_SCRIPT_FALSE= + + + +-- +1.7.6 + Deleted: csw/mgar/pkg/libxml2/trunk/files/ld-symbol-handling-fixup.patch =================================================================== --- csw/mgar/pkg/libxml2/trunk/files/ld-symbol-handling-fixup.patch 2011-08-02 14:23:56 UTC (rev 15246) +++ csw/mgar/pkg/libxml2/trunk/files/ld-symbol-handling-fixup.patch 2011-08-03 01:36:31 UTC (rev 15247) @@ -1,23 +0,0 @@ ---- libxml2-2.7.7/configure.orig 2010-03-16 03:22:07.931504296 +0100 -+++ libxml2-2.7.7/configure 2010-03-16 03:22:59.183232519 +0100 -@@ -12157,17 +12157,12 @@ - VERSION_SCRIPT_FLAGS=-Wl,--version-script= - else - case $host in -- *-*-sunos*) VERSION_SCRIPT_FLAGS="-Wl,-M -Wl,";; -+ *-*-sunos*) VERSION_SCRIPT_FLAGS="-Wl,-M";; - esac - fi - -- if test -n "$VERSION_SCRIPT_FLAGS"; then -- USE_VERSION_SCRIPT_TRUE= -- USE_VERSION_SCRIPT_FALSE='#' --else -- USE_VERSION_SCRIPT_TRUE='#' -- USE_VERSION_SCRIPT_FALSE= --fi -+USE_VERSION_SCRIPT_TRUE='#' -+USE_VERSION_SCRIPT_FALSE= - - - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Wed Aug 3 10:36:31 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Wed, 3 Aug 2011 09:36:31 +0100 Subject: [csw-devel] [PATCH] Fix SPKG_DESC duplicate checking In-Reply-To: <1312332130-sup-5521@pinkfloyd.chass.utoronto.ca> References: <1312215357-25360-1-git-send-email-maciej@opencsw.org> <1312332130-sup-5521@pinkfloyd.chass.utoronto.ca> Message-ID: 2011/8/3 Ben Walton : > I wonder if checkpkg isn't a better place for this check though? > Separating package building from package verification makes sense to > me. I like the early detection of the issue. You could consider it a build recipe check, as opposed to a binary package check. Nevertheless, checking the resulting binary package set could be a good idea. Something like "no two packages from the set under test should have the same description field". As an extended check, descriptions could be matched against all descriptions in the catalog, but the database doesn't have the metadata yet. Maciej From wahwah at users.sourceforge.net Wed Aug 3 11:05:46 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 03 Aug 2011 09:05:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[15248] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 15248 http://gar.svn.sourceforge.net/gar/?rev=15248&view=rev Author: wahwah Date: 2011-08-03 09:05:46 +0000 (Wed, 03 Aug 2011) Log Message: ----------- Fix SPKG_DESC duplicate checking Works around ticket #56. http://sourceforge.net/apps/trac/gar/ticket/56 Previous attempt at fixing it: http://sourceforge.net/apps/trac/gar/changeset/11424 Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2011-08-03 01:36:31 UTC (rev 15247) +++ csw/mgar/gar/v2/gar.pkg.mk 2011-08-03 09:05:46 UTC (rev 15248) @@ -640,9 +640,16 @@ $(foreach P,$(SPKG_SPECS),\ $(if $(SPKG_DESC_$(P)),,$(error Multiple packages defined and SPKG_DESC_$(P) is not set.)))) +# There was a bug here. +# http://sourceforge.net/apps/trac/gar/ticket/56 +# The workaround was to add an additional check whether the strings are the +# same or not. $(foreach P,$(SPKG_SPECS),\ $(foreach Q,$(filter-out $(P) $(OBSOLETED_PKGS),$(SPKG_SPECS)),\ - $(if $(filter-out $(subst ,_,$(SPKG_DESC_$(P))),$(subst ,_,$(SPKG_DESC_$(Q)))),,$(error The package descriptions for $(P) [$(if $(SPKG_DESC_$(P)),$(SPKG_DESC_$(P)),)] and $(Q) [$(if $(SPKG_DESC_$(Q)),$(SPKG_DESC_$(Q)),)] are identical. Please make sure that all descriptions are unique by setting SPKG_DESC_ for each package.)))) + $(if $(filter-out $(subst ,_,$(SPKG_DESC_$(P))),$(subst ,_,$(SPKG_DESC_$(Q)))),\ + ,\ + $(if $(shell if [ "$(SPKG_DESC_$(P))" = "$(SPKG_DESC_$(Q))" ]; then echo bad; fi),\ + $(error The package descriptions for $(P) [$(if $(SPKG_DESC_$(P)),$(SPKG_DESC_$(P)),)] and $(Q) [$(if $(SPKG_DESC_$(Q)),$(SPKG_DESC_$(Q)),)] are identical. Please make sure that all descriptions are unique by setting SPKG_DESC_ for each package.),)))) .PRECIOUS: $(WORKDIR)/%.pkginfo This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Aug 3 11:06:51 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 03 Aug 2011 09:06:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[15249] csw/mgar/gar/v2/lib/python Message-ID: Revision: 15249 http://gar.svn.sourceforge.net/gar/?rev=15249&view=rev Author: wahwah Date: 2011-08-03 09:06:51 +0000 (Wed, 03 Aug 2011) Log Message: ----------- checkpkg: Shared libraries need the .so extension Based on the libdnet example and bug 4811. http://lists.opencsw.org/pipermail/maintainers/2011-August/015089.html https://www.opencsw.org/mantis/view.php?id=4811 Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2011-08-03 09:05:46 UTC (rev 15248) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2011-08-03 09:06:51 UTC (rev 15249) @@ -1307,3 +1307,12 @@ error_mgr.NeedFile( "/opt/csw/sbin/alternatives", "The alternatives subsystem is used") + + +def CheckSharedLibrarySoExtension(pkg_data, error_mgr, logger, messenger): + shared_libs = set(su.GetSharedLibs(pkg_data)) + for shared_lib in shared_libs: + if ".so" not in shared_lib: + error_mgr.ReportError( + "shared-library-missing-dot-so", + "file=%s" % shared_lib) Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2011-08-03 09:05:46 UTC (rev 15248) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2011-08-03 09:06:51 UTC (rev 15249) @@ -1819,5 +1819,21 @@ "The alternatives subsystem is used") +class TestCheckSharedLibrarySoExtension( + CheckpkgUnitTestHelper, unittest.TestCase): + FUNCTION_NAME = 'CheckSharedLibrarySoExtension' + def CheckpkgTest(self): + self.pkg_data = copy.deepcopy(neon_stats[0]) + + def CheckpkgTest2(self): + self.pkg_data = copy.deepcopy(neon_stats[0]) + self.pkg_data["files_metadata"][11]["path"] = "foo.1" + self.error_mgr_mock.ReportError( + 'shared-library-missing-dot-so', 'file=foo.1') + + def testTwo(self): + self.RunCheckpkgTest(self.CheckpkgTest2) + + if __name__ == '__main__': unittest.main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Wed Aug 3 11:58:23 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Wed, 3 Aug 2011 10:58:23 +0100 Subject: [csw-devel] SF.net SVN: gar:[15248] csw/mgar/gar/v2/gar.pkg.mk In-Reply-To: References: Message-ID: 2011/8/3 : > Fix SPKG_DESC duplicate checking I meant to only submit the other change. Well, if this got in, I'll let it be, since it allows to work on the gcc packages. We'll do further improvements later. Maciej From bwalton at opencsw.org Wed Aug 3 14:12:38 2011 From: bwalton at opencsw.org (Ben Walton) Date: Wed, 03 Aug 2011 08:12:38 -0400 Subject: [csw-devel] [PATCH] Fix SPKG_DESC duplicate checking In-Reply-To: References: <1312215357-25360-1-git-send-email-maciej@opencsw.org> <1312332130-sup-5521@pinkfloyd.chass.utoronto.ca> Message-ID: <1312373446-sup-1219@pinkfloyd.chass.utoronto.ca> Excerpts from Maciej Blizi?ski's message of Wed Aug 03 04:36:31 -0400 2011: > I like the early detection of the issue. You could consider it a > build recipe check, as opposed to a binary package check. Fail fast is good, but doing the check in GAR removes the opportunity to intentionally have two the same. This isn't a likely scenario though. > Nevertheless, checking the resulting binary package set could be a > good idea. Something like "no two packages from the set under test > should have the same description field". As an extended check, > descriptions could be matched against all descriptions in the > catalog, but the database doesn't have the metadata yet. I would only look at the current set for a check like this. Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From bonivart at users.sourceforge.net Wed Aug 3 16:33:07 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 03 Aug 2011 14:33:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[15250] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 15250 http://gar.svn.sourceforge.net/gar/?rev=15250&view=rev Author: bonivart Date: 2011-08-03 14:33:07 +0000 (Wed, 03 Aug 2011) Log Message: ----------- pkgutil/trunk: update to 2.5 beta 1 Modified Paths: -------------- csw/mgar/pkg/pkgutil/trunk/Makefile csw/mgar/pkg/pkgutil/trunk/checksums Modified: csw/mgar/pkg/pkgutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkgutil/trunk/Makefile 2011-08-03 09:06:51 UTC (rev 15249) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2011-08-03 14:33:07 UTC (rev 15250) @@ -1,5 +1,5 @@ NAME = pkgutil -VERSION = 2.4 +VERSION = 2.5b1 CATEGORIES = utils DESCRIPTION = Installs Solaris packages easily @@ -10,9 +10,6 @@ package automatically. endef -# Disable inclusion of CSWcommon by default. -COMMON_PKG_DEPENDS = - MASTER_SITES = $(SF_MIRRORS) #MASTER_SITES = http://sourceforge.net/projects/pkgutil/files/pkgutil/2.4/ DISTFILES = $(NAME)-$(VERSION).zip @@ -34,6 +31,11 @@ DISTFILES += opencsw.py DISTFILES += cswcatalog +LICENSE = license + +# Disable inclusion of CSWcommon by default. +COMMON_PKG_DEPENDS = + PACKAGES = CSWpkgutil CATALOGNAME_CSWpkgutil = pkgutil SPKG_DESC_CSWpkgutil = $(DESCRIPTION) @@ -98,9 +100,10 @@ @ginstall -m 755 $(FILEDIR)/build_sun_catalog.py $(FILEDIR)/opencsw.py $(DESTDIR)/opt/csw/libexec/$(NAME) @ln -s ../libexec/pkgutil/build_sun_catalog.py $(DESTDIR)$(bindir)/build_sun_catalog @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(NAME) - @ginstall -m 444 $(WORKSRC)/readme $(WORKSRC)/license $(DESTDIR)$(docdir)/$(NAME)/ + @ginstall -m 444 $(WORKSRC)/readme $(DESTDIR)$(docdir)/$(NAME)/ +# @ginstall -m 444 $(WORKSRC)/license $(DESTDIR)$(docdir)/$(NAME)/ @ginstall -m 755 -d $(DESTDIR)$(docdir)/$(NAME)plus - @ginstall -m 444 $(WORKSRC)/license $(DESTDIR)$(docdir)/$(NAME)plus/ +# @ginstall -m 444 $(WORKSRC)/license $(DESTDIR)$(docdir)/$(NAME)plus/ @ginstall -m 444 $(WORKSRC)/readme.pkgutilplus $(DESTDIR)$(docdir)/$(NAME)plus/readme @ginstall -m 755 -d $(DESTDIR)$(mandir)/man1 @pod2man --section=1 $(WORKSRC)/$(NAME) > $(DESTDIR)$(mandir)/man1/pkgutil.1 Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2011-08-03 09:06:51 UTC (rev 15249) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2011-08-03 14:33:07 UTC (rev 15250) @@ -1 +1 @@ -e87b64770282e68713692dce6e0808c3 pkgutil-2.4.zip +e69620e109e75ade9f1c7ea83b302786 pkgutil-2.5b1.zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From khabermann at users.sourceforge.net Wed Aug 3 17:06:49 2011 From: khabermann at users.sourceforge.net (khabermann at users.sourceforge.net) Date: Wed, 03 Aug 2011 15:06:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[15251] csw/mgar/pkg/libdshconfig/trunk/Makefile Message-ID: Revision: 15251 http://gar.svn.sourceforge.net/gar/?rev=15251&view=rev Author: khabermann Date: 2011-08-03 15:06:49 +0000 (Wed, 03 Aug 2011) Log Message: ----------- libdshconfig: cleanup Makefile (remove unused code) Modified Paths: -------------- csw/mgar/pkg/libdshconfig/trunk/Makefile Modified: csw/mgar/pkg/libdshconfig/trunk/Makefile =================================================================== --- csw/mgar/pkg/libdshconfig/trunk/Makefile 2011-08-03 14:33:07 UTC (rev 15250) +++ csw/mgar/pkg/libdshconfig/trunk/Makefile 2011-08-03 15:06:49 UTC (rev 15251) @@ -12,15 +12,6 @@ DISTFILES = $(DISTNAME).tar.gz -# File name regex to get notifications about upstream software releases -# NOTE: Use this only if the automatic regex creation -# does not work for your package -# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - -# If the url used to check for software update is different of MASTER_SITES, then -# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES -# UPSTREAM_MASTER_SITES = - CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From khabermann at users.sourceforge.net Wed Aug 3 17:08:59 2011 From: khabermann at users.sourceforge.net (khabermann at users.sourceforge.net) Date: Wed, 03 Aug 2011 15:08:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[15252] csw/mgar/pkg/dsh/trunk/Makefile Message-ID: Revision: 15252 http://gar.svn.sourceforge.net/gar/?rev=15252&view=rev Author: khabermann Date: 2011-08-03 15:08:59 +0000 (Wed, 03 Aug 2011) Log Message: ----------- dsh: cleanup Makefile (better solution for extra libs, remove unused code) Modified Paths: -------------- csw/mgar/pkg/dsh/trunk/Makefile Modified: csw/mgar/pkg/dsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/dsh/trunk/Makefile 2011-08-03 15:06:49 UTC (rev 15251) +++ csw/mgar/pkg/dsh/trunk/Makefile 2011-08-03 15:08:59 UTC (rev 15252) @@ -13,18 +13,8 @@ MASTER_SITES = http://www.netfort.gr.jp/~dancer/software/downloads/dsh-0.25.9.tar.gz DISTFILES = $(DISTNAME).tar.gz -# File name regex to get notifications about upstream software releases -# NOTE: Use this only if the automatic regex creation -# does not work for your package -# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - -# If the url used to check for software update is different of MASTER_SITES, then -# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES -# UPSTREAM_MASTER_SITES = - # for libintl_gettext, libintl_textdomain, libintl_bindtextdomain -LIBS += -lintl -export LIBS +EXTRA_LINKER_FLAGS = -lintl CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Aug 3 18:37:11 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 03 Aug 2011 16:37:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[15253] csw/mgar/pkg/libdnet/trunk Message-ID: Revision: 15253 http://gar.svn.sourceforge.net/gar/?rev=15253&view=rev Author: wahwah Date: 2011-08-03 16:37:11 +0000 (Wed, 03 Aug 2011) Log Message: ----------- pkg/libdnet/trunk: upgrade to 1.12, upstream address change Modified Paths: -------------- csw/mgar/pkg/libdnet/trunk/Makefile csw/mgar/pkg/libdnet/trunk/checksums Modified: csw/mgar/pkg/libdnet/trunk/Makefile =================================================================== --- csw/mgar/pkg/libdnet/trunk/Makefile 2011-08-03 15:08:59 UTC (rev 15252) +++ csw/mgar/pkg/libdnet/trunk/Makefile 2011-08-03 16:37:11 UTC (rev 15253) @@ -1,22 +1,20 @@ # $Id$ NAME = libdnet -VERSION = 1.11 +VERSION = 1.12 CATEGORIES = lib +GARTYPE = v2 DESCRIPTION = A simplified, portable interface to several low-level networking routines define BLURB endef -MASTER_SITES = $(SF_MIRROR) +VENDOR_URL = http://code.google.com/p/libdnet/ +MASTER_SITES = $(GOOGLE_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.gz -# File name regex to get notifications about upstream software releases -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - LICENSE = LICENSE BUILD64 = 1 -NOISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) MERGE_DIRS_isa-extra = $(libdir) Modified: csw/mgar/pkg/libdnet/trunk/checksums =================================================================== --- csw/mgar/pkg/libdnet/trunk/checksums 2011-08-03 15:08:59 UTC (rev 15252) +++ csw/mgar/pkg/libdnet/trunk/checksums 2011-08-03 16:37:11 UTC (rev 15253) @@ -1 +1 @@ -04c394ed8e1e7fc455456e79e908916d libdnet-1.11.tar.gz +0984cf799f070ec51be753d697830143 libdnet-1.12.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Aug 3 18:38:03 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 03 Aug 2011 16:38:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[15254] csw/mgar/pkg/libdnet/trunk/Makefile Message-ID: Revision: 15254 http://gar.svn.sourceforge.net/gar/?rev=15254&view=rev Author: wahwah Date: 2011-08-03 16:38:03 +0000 (Wed, 03 Aug 2011) Log Message: ----------- pkg/libdnet/trunk: link to the upstream bug Modified Paths: -------------- csw/mgar/pkg/libdnet/trunk/Makefile Modified: csw/mgar/pkg/libdnet/trunk/Makefile =================================================================== --- csw/mgar/pkg/libdnet/trunk/Makefile 2011-08-03 16:37:11 UTC (rev 15253) +++ csw/mgar/pkg/libdnet/trunk/Makefile 2011-08-03 16:38:03 UTC (rev 15254) @@ -4,6 +4,8 @@ CATEGORIES = lib GARTYPE = v2 +# ! .so extension missing http://code.google.com/p/libdnet/issues/detail?id=18 + DESCRIPTION = A simplified, portable interface to several low-level networking routines define BLURB endef This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Aug 3 19:59:06 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 03 Aug 2011 17:59:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[15255] csw/mgar/pkg/libdnet/trunk/Makefile Message-ID: Revision: 15255 http://gar.svn.sourceforge.net/gar/?rev=15255&view=rev Author: wahwah Date: 2011-08-03 17:59:06 +0000 (Wed, 03 Aug 2011) Log Message: ----------- pkg/libdnet/trunk: Found a link about a very similar issue Modified Paths: -------------- csw/mgar/pkg/libdnet/trunk/Makefile Modified: csw/mgar/pkg/libdnet/trunk/Makefile =================================================================== --- csw/mgar/pkg/libdnet/trunk/Makefile 2011-08-03 16:38:03 UTC (rev 15254) +++ csw/mgar/pkg/libdnet/trunk/Makefile 2011-08-03 17:59:06 UTC (rev 15255) @@ -5,6 +5,9 @@ GARTYPE = v2 # ! .so extension missing http://code.google.com/p/libdnet/issues/detail?id=18 +# An idea: +# http://www.v7w.com/debian/libtool-missing_so.html +# http://www.v7w.com/debian/libtool-updating.html DESCRIPTION = A simplified, portable interface to several low-level networking routines define BLURB This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Aug 4 13:19:20 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 04 Aug 2011 11:19:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[15256] csw/mgar/pkg/libmpfr/trunk/Makefile Message-ID: Revision: 15256 http://gar.svn.sourceforge.net/gar/?rev=15256&view=rev Author: wahwah Date: 2011-08-04 11:19:20 +0000 (Thu, 04 Aug 2011) Log Message: ----------- pkg/libmpfr/trunk: lowering the optimization level as it makes the tests pass Modified Paths: -------------- csw/mgar/pkg/libmpfr/trunk/Makefile Modified: csw/mgar/pkg/libmpfr/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmpfr/trunk/Makefile 2011-08-03 17:59:06 UTC (rev 15255) +++ csw/mgar/pkg/libmpfr/trunk/Makefile 2011-08-04 11:19:20 UTC (rev 15256) @@ -26,4 +26,10 @@ CONFIGURE_ARGS = $(DIRPATHS) +# With the default -xO3, there are failing unit tests. +OPT_FLAGS_SOS = -xO2 + include gar/category.mk + +# Might be useful, not sure yet: +# PATH := /opt/csw/gnu:/usr/xpg4/bin:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Aug 4 14:58:01 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 04 Aug 2011 12:58:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[15257] csw/mgar/pkg/autoproject/trunk/Makefile Message-ID: Revision: 15257 http://gar.svn.sourceforge.net/gar/?rev=15257&view=rev Author: wahwah Date: 2011-08-04 12:58:01 +0000 (Thu, 04 Aug 2011) Log Message: ----------- pkg/autoproject/trunk: small moderinzation; no new version is available Modified Paths: -------------- csw/mgar/pkg/autoproject/trunk/Makefile Modified: csw/mgar/pkg/autoproject/trunk/Makefile =================================================================== --- csw/mgar/pkg/autoproject/trunk/Makefile 2011-08-04 11:19:20 UTC (rev 15256) +++ csw/mgar/pkg/autoproject/trunk/Makefile 2011-08-04 12:58:01 UTC (rev 15257) @@ -23,13 +23,17 @@ MASTER_SITES = http://ftp.de.debian.org/debian/pool/main/a/$(NAME)/ DISTFILES = $(NAME)_$(VERSION).orig.tar.gz PATCHFILES = 0001-gawk-and-ggrep.patch -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz ARCHALL = 1 RUNTIME_DEP_PKGS = CSWautomake CSWbash CSWgawk CSWggrep TEST_SCRIPTS = CONFIGURE_ARGS = $(DIRPATHS) AWK=gawk -export AWK GREP=ggrep -export GREP +EXTRA_EXPORTS = AWK GREP + +# checkpkg can't detect that gawk and ggrep are necessary +CHECKPKG_OVERRIDES_CSWautoproject += surplus-dependency +# /usr/local in the documentation. +CHECKPKG_OVERRIDES_CSWautoproject += file-with-bad-content + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Aug 4 15:33:52 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 04 Aug 2011 13:33:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[15258] csw/mgar/pkg/libdnet/trunk Message-ID: Revision: 15258 http://gar.svn.sourceforge.net/gar/?rev=15258&view=rev Author: wahwah Date: 2011-08-04 13:33:52 +0000 (Thu, 04 Aug 2011) Log Message: ----------- pkg/libdnet/trunk: autoreconf -fi does not fix this, unfortunately Modified Paths: -------------- csw/mgar/pkg/libdnet/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/libdnet/trunk/files/0001-Using-the-m4-subdirectory-for-macros.patch csw/mgar/pkg/libdnet/trunk/files/0002-Moved-acinclude.m4-to-the-m4-directory.patch Modified: csw/mgar/pkg/libdnet/trunk/Makefile =================================================================== --- csw/mgar/pkg/libdnet/trunk/Makefile 2011-08-04 12:58:01 UTC (rev 15257) +++ csw/mgar/pkg/libdnet/trunk/Makefile 2011-08-04 13:33:52 UTC (rev 15258) @@ -22,6 +22,13 @@ BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) +PATCHFILES = 0001-Using-the-m4-subdirectory-for-macros.patch +PATCHFILES += 0002-Moved-acinclude.m4-to-the-m4-directory.patch + MERGE_DIRS_isa-extra = $(libdir) include gar/category.mk + +pre-configure-modulated: + (cd $(WORKSRC) && autoreconf -fi) + @$(MAKECOOKIE) Added: csw/mgar/pkg/libdnet/trunk/files/0001-Using-the-m4-subdirectory-for-macros.patch =================================================================== --- csw/mgar/pkg/libdnet/trunk/files/0001-Using-the-m4-subdirectory-for-macros.patch (rev 0) +++ csw/mgar/pkg/libdnet/trunk/files/0001-Using-the-m4-subdirectory-for-macros.patch 2011-08-04 13:33:52 UTC (rev 15258) @@ -0,0 +1,40 @@ +From f97e55e5fb9b8ad5ba3d049db75a27fa8e834fbc Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Thu, 4 Aug 2011 15:21:51 +0200 +Subject: [PATCH 1/2] Using the m4 subdirectory for macros + +--- + Makefile.am | 2 ++ + configure.in | 3 +++ + 2 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index add9529..fc61b0b 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,6 +2,8 @@ + + include $(top_srcdir)/Makefile.am.common + ++ACLOCAL_AMFLAGS = -I m4 ++ + SUBDIRS = include man src python test + + bin_SCRIPTS = dnet-config +diff --git a/configure.in b/configure.in +index 72ac63c..0ddbdcd 100644 +--- a/configure.in ++++ b/configure.in +@@ -12,6 +12,9 @@ AC_SUBST(ac_aux_dir) + AM_INIT_AUTOMAKE(libdnet, 1.12) + AM_CONFIG_HEADER(include/config.h) + ++# for libtoolize ++AC_CONFIG_MACRO_DIR([m4]) ++ + dnl XXX - stop the insanity!@#$ + AM_MAINTAINER_MODE + +-- +1.7.6 + Added: csw/mgar/pkg/libdnet/trunk/files/0002-Moved-acinclude.m4-to-the-m4-directory.patch =================================================================== --- csw/mgar/pkg/libdnet/trunk/files/0002-Moved-acinclude.m4-to-the-m4-directory.patch (rev 0) +++ csw/mgar/pkg/libdnet/trunk/files/0002-Moved-acinclude.m4-to-the-m4-directory.patch 2011-08-04 13:33:52 UTC (rev 15258) @@ -0,0 +1,665 @@ +From 1658d72b8fb16d17283cb1abc7da29d2fc260575 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Thu, 4 Aug 2011 15:24:03 +0200 +Subject: [PATCH 2/2] Moved acinclude.m4 to the m4 directory + +--- + config/acinclude.m4 | 319 --------------------------------------------------- + m4/acinclude.m4 | 319 +++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 319 insertions(+), 319 deletions(-) + delete mode 100644 config/acinclude.m4 + create mode 100644 m4/acinclude.m4 + +diff --git a/config/acinclude.m4 b/config/acinclude.m4 +deleted file mode 100644 +index c54710b..0000000 +--- a/config/acinclude.m4 ++++ /dev/null +@@ -1,319 +0,0 @@ +-dnl +-dnl Check for 4.4 BSD sa_len member in sockaddr struct +-dnl +-dnl usage: AC_DNET_SOCKADDR_SA_LEN +-dnl results: HAVE_SOCKADDR_SA_LEN (defined) +-dnl +-AC_DEFUN(AC_DNET_SOCKADDR_SA_LEN, +- [AC_MSG_CHECKING(for sa_len in sockaddr struct) +- AC_CACHE_VAL(ac_cv_dnet_sockaddr_has_sa_len, +- AC_TRY_COMPILE([ +-# ifndef _SOCKADDR_LEN +-# define _SOCKADDR_LEN 1 +-# endif +-# include +-# include ], +- [u_int i = sizeof(((struct sockaddr *)0)->sa_len)], +- ac_cv_dnet_sockaddr_has_sa_len=yes, +- ac_cv_dnet_sockaddr_has_sa_len=no)) +- AC_MSG_RESULT($ac_cv_dnet_sockaddr_has_sa_len) +- if test $ac_cv_dnet_sockaddr_has_sa_len = yes ; then +- AC_DEFINE(HAVE_SOCKADDR_SA_LEN, 1, +- [Define if sockaddr struct has sa_len.]) +- fi]) +- +-dnl +-dnl Check for sockaddr_in6 struct in +-dnl +-dnl usage: AC_DNET_SOCKADDR_IN6 +-dnl results: HAVE_SOCKADDR_IN6 +-dnl +-AC_DEFUN(AC_DNET_SOCKADDR_IN6, +- [AC_MSG_CHECKING(for sockaddr_in6 struct in ) +- AC_CACHE_VAL(ac_cv_dnet_netinet_in_h_has_sockaddr_in6, +- AC_TRY_COMPILE([ +-# include +-# include +-# include ], +- [struct sockaddr_in6 sin6; sin6.sin6_family = AF_INET6;], +- ac_cv_dnet_netinet_in_h_has_sockaddr_in6=yes, +- ac_cv_dnet_netinet_in_h_has_sockaddr_in6=no)) +- AC_MSG_RESULT($ac_cv_dnet_netinet_in_h_has_sockaddr_in6) +- if test $ac_cv_dnet_netinet_in_h_has_sockaddr_in6 = yes ; then +- AC_DEFINE(HAVE_SOCKADDR_IN6, 1, +- [Define if has sockaddr_in6 struct.]) +- fi]) +- +-dnl +-dnl Check for arp_dev member in arpreq struct +-dnl +-dnl usage: AC_DNET_ARPREQ_ARP_DEV +-dnl results: HAVE_ARPREQ_ARP_DEV (defined) +-dnl +-AC_DEFUN(AC_DNET_ARPREQ_ARP_DEV, +- [AC_MSG_CHECKING(for arp_dev in arpreq struct) +- AC_CACHE_VAL(ac_cv_dnet_arpreq_has_arp_dev, +- AC_TRY_COMPILE([ +-# include +-# include +-# include ], +- [void *p = ((struct arpreq *)0)->arp_dev], +- ac_cv_dnet_arpreq_has_arp_dev=yes, +- ac_cv_dnet_arpreq_has_arp_dev=no)) +- AC_MSG_RESULT($ac_cv_dnet_arpreq_has_arp_dev) +- if test $ac_cv_dnet_arpreq_has_arp_dev = yes ; then +- AC_DEFINE(HAVE_ARPREQ_ARP_DEV, 1, +- [Define if arpreq struct has arp_dev.]) +- fi]) +- +-dnl +-dnl Check for rt_msghdr struct in +-dnl +-dnl usage: AC_DNET_ROUTE_RT_MSGHDR +-dnl results: HAVE_ROUTE_RT_MSGHDR +-dnl +-AC_DEFUN(AC_DNET_ROUTE_RT_MSGHDR, +- [AC_MSG_CHECKING(for rt_msghdr struct in ) +- AC_CACHE_VAL(ac_cv_dnet_route_h_has_rt_msghdr, +- AC_TRY_COMPILE([ +-# include +-# include +-# include +-# include ], +- [struct rt_msghdr rtm; rtm.rtm_msglen = 0;], +- ac_cv_dnet_route_h_has_rt_msghdr=yes, +- ac_cv_dnet_route_h_has_rt_msghdr=no)) +- AC_MSG_RESULT($ac_cv_dnet_route_h_has_rt_msghdr) +- if test $ac_cv_dnet_route_h_has_rt_msghdr = yes ; then +- AC_DEFINE(HAVE_ROUTE_RT_MSGHDR, 1, +- [Define if has rt_msghdr struct.]) +- fi]) +- +-dnl +-dnl Check for the Berkeley Packet Filter +-dnl +-dnl usage: AC_DNET_BSD_BPF +-dnl results: HAVE_BSD_BPF +-dnl +-AC_DEFUN(AC_DNET_BSD_BPF, +- [AC_MSG_CHECKING(for Berkeley Packet Filter) +- AC_CACHE_VAL(ac_cv_dnet_bsd_bpf, +- if test -c /dev/bpf0 ; then +- ac_cv_dnet_bsd_bpf=yes +- else +- ac_cv_dnet_bsd_bpf=no +- fi) +- AC_MSG_RESULT($ac_cv_dnet_bsd_bpf) +- if test $ac_cv_dnet_bsd_bpf = yes ; then +- AC_DEFINE(HAVE_BSD_BPF, 1, +- [Define if you have the Berkeley Packet Filter.]) +- fi]) +- +-dnl +-dnl Check for the Linux /proc filesystem +-dnl +-dnl usage: AC_DNET_LINUX_PROCFS +-dnl results: HAVE_LINUX_PROCFS +-dnl +-AC_DEFUN(AC_DNET_LINUX_PROCFS, +- [AC_MSG_CHECKING(for Linux proc filesystem) +- AC_CACHE_VAL(ac_cv_dnet_linux_procfs, +- if test "x`cat /proc/sys/kernel/ostype 2>&-`" = "xLinux" ; then +- ac_cv_dnet_linux_procfs=yes +- else +- ac_cv_dnet_linux_procfs=no +- fi) +- AC_MSG_RESULT($ac_cv_dnet_linux_procfs) +- if test $ac_cv_dnet_linux_procfs = yes ; then +- AC_DEFINE(HAVE_LINUX_PROCFS, 1, +- [Define if you have the Linux /proc filesystem.]) +- fi]) +- +-dnl +-dnl Check for Linux PF_PACKET sockets +-dnl +-dnl usage: AC_DNET_LINUX_PF_PACKET +-dnl results: HAVE_LINUX_PF_PACKET +-dnl +-AC_DEFUN(AC_DNET_LINUX_PF_PACKET, +- [AC_MSG_CHECKING(for Linux PF_PACKET sockets) +- AC_CACHE_VAL(ac_cv_dnet_linux_pf_packet, +- if test -f /usr/include/netpacket/packet.h ; then +- ac_cv_dnet_linux_pf_packet=yes +- else +- ac_cv_dnet_linux_pf_packet=no +- fi) +- AC_MSG_RESULT($ac_cv_dnet_linux_pf_packet) +- if test $ac_cv_dnet_linux_pf_packet = yes ; then +- AC_DEFINE(HAVE_LINUX_PF_PACKET, 1, +- [Define if you have Linux PF_PACKET sockets.]) +- fi]) +- +-dnl +-dnl Check for SNMP MIB2 STREAMS (Solaris only?) +-dnl +-dnl usage: AC_DNET_STREAMS_MIB2 +-dnl results: HAVE_STREAMS_MIB2 +-dnl +-AC_DEFUN(AC_DNET_STREAMS_MIB2, +- [AC_MSG_CHECKING(for SNMP MIB2 STREAMS) +- AC_CACHE_VAL(ac_cv_dnet_streams_mib2, +- if test -f /usr/include/inet/mib2.h -a -c /dev/ip ; then +- ac_cv_dnet_streams_mib2=yes +- else +- ac_cv_dnet_streams_mib2=no +- fi) +- AC_MSG_RESULT($ac_cv_dnet_streams_mib2) +- if test $ac_cv_dnet_streams_mib2 = yes ; then +- AC_DEFINE(HAVE_STREAMS_MIB2, 1, +- [Define if you have SNMP MIB2 STREAMS.]) +- fi]) +- +-dnl +-dnl Check for route(7) STREAMS (UnixWare only?) +-dnl +-dnl usage: AC_DNET_STREAMS_ROUTE +-dnl results: HAVE_STREAMS_ROUTE +-dnl +-AC_DEFUN(AC_DNET_STREAMS_ROUTE, +- [AC_MSG_CHECKING(for route(7) STREAMS) +- AC_CACHE_VAL(ac_cv_dnet_streams_route, +- if grep RTSTR_SEND /usr/include/net/route.h >/dev/null 2>&1 ; then +- ac_cv_dnet_streams_route=yes +- else +- ac_cv_dnet_streams_route=no +- fi) +- AC_MSG_RESULT($ac_cv_dnet_streams_route) +- if test $ac_cv_dnet_streams_route = yes ; then +- AC_DEFINE(HAVE_STREAMS_ROUTE, 1, +- [Define if you have route(7) STREAMS.]) +- fi]) +- +-dnl +-dnl Check for arp(7) ioctls +-dnl +-dnl usage: AC_DNET_IOCTL_ARP +-dnl results: HAVE_IOCTL_ARP +-dnl +-AC_DEFUN(AC_DNET_IOCTL_ARP, +- [AC_MSG_CHECKING(for arp(7) ioctls) +- AC_CACHE_VAL(ac_cv_dnet_ioctl_arp, +- AC_EGREP_CPP(werd, [ +-# include +-# define BSD_COMP +-# include +-# ifdef SIOCGARP +- werd +-# endif], +- ac_cv_dnet_ioctl_arp=yes, +- ac_cv_dnet_ioctl_arp=no)) +- case "$host_os" in +- irix*) +- ac_cv_dnet_ioctl_arp=no ;; +- esac +- AC_MSG_RESULT($ac_cv_dnet_ioctl_arp) +- if test $ac_cv_dnet_ioctl_arp = yes ; then +- AC_DEFINE(HAVE_IOCTL_ARP, 1, +- [Define if you have arp(7) ioctls.]) +- fi]) +- +-dnl +-dnl Check for raw IP sockets ip_{len,off} host byte ordering +-dnl +-dnl usage: AC_DNET_RAWIP_HOST_OFFLEN +-dnl results: HAVE_RAWIP_HOST_OFFLEN +-dnl +-AC_DEFUN(AC_DNET_RAWIP_HOST_OFFLEN, +- [AC_MSG_CHECKING([for raw IP sockets ip_{len,off} host byte ordering]) +- AC_CACHE_VAL(ac_cv_dnet_rawip_host_offlen, [ +- case "$host_os" in +- *openbsd*) +- ac_cv_dnet_rawip_host_offlen=no ;; +- *bsd*|*darwin*|*osf*|*unixware*) +- ac_cv_dnet_rawip_host_offlen=yes ;; +- *) +- ac_cv_dnet_rawip_host_offlen=no ;; +- esac]) +- AC_MSG_RESULT($ac_cv_dnet_rawip_host_offlen) +- if test $ac_cv_dnet_rawip_host_offlen = yes ; then +- AC_DEFINE(HAVE_RAWIP_HOST_OFFLEN, 1, +- [Define if raw IP sockets require host byte ordering for ip_off, ip_len.]) +- fi]) +- +-dnl +-dnl Check for cooked raw IP sockets +-dnl +-dnl usage: AC_DNET_RAWIP_COOKED +-dnl results: HAVE_RAWIP_COOKED +-dnl +-AC_DEFUN(AC_DNET_RAWIP_COOKED, +- [AC_MSG_CHECKING(for cooked raw IP sockets) +- AC_CACHE_VAL(ac_cv_dnet_rawip_cooked, [ +- case "$host_os" in +- solaris*|irix*) +- ac_cv_dnet_rawip_cooked=yes ;; +- *) +- ac_cv_dnet_rawip_cooked=no ;; +- esac]) +- AC_MSG_RESULT($ac_cv_dnet_rawip_cooked) +- if test $ac_cv_dnet_rawip_cooked = yes ; then +- AC_DEFINE(HAVE_RAWIP_COOKED, 1, +- [Define if you have cooked raw IP sockets.]) +- fi]) +- +-dnl +-dnl AC_LBL_LIBRARY_NET +-dnl +-dnl This test is for network applications that need socket() and +-dnl gethostbyname() -ish functions. Under Solaris, those applications +-dnl need to link with "-lsocket -lnsl". Under IRIX, they need to link +-dnl with "-lnsl" but should *not* link with "-lsocket" because +-dnl libsocket.a breaks a number of things (for instance: +-dnl gethostbyname() under IRIX 5.2, and snoop sockets under most +-dnl versions of IRIX). +-dnl +-dnl Unfortunately, many application developers are not aware of this, +-dnl and mistakenly write tests that cause -lsocket to be used under +-dnl IRIX. It is also easy to write tests that cause -lnsl to be used +-dnl under operating systems where neither are necessary (or useful), +-dnl such as SunOS 4.1.4, which uses -lnsl for TLI. +-dnl +-dnl This test exists so that every application developer does not test +-dnl this in a different, and subtly broken fashion. +- +-dnl It has been argued that this test should be broken up into two +-dnl seperate tests, one for the resolver libraries, and one for the +-dnl libraries necessary for using Sockets API. Unfortunately, the two +-dnl are carefully intertwined and allowing the autoconf user to use +-dnl them independantly potentially results in unfortunate ordering +-dnl dependancies -- as such, such component macros would have to +-dnl carefully use indirection and be aware if the other components were +-dnl executed. Since other autoconf macros do not go to this trouble, +-dnl and almost no applications use sockets without the resolver, this +-dnl complexity has not been implemented. +-dnl +-dnl The check for libresolv is in case you are attempting to link +-dnl statically and happen to have a libresolv.a lying around (and no +-dnl libnsl.a). +-dnl +-AC_DEFUN(AC_LBL_LIBRARY_NET, [ +- # Most operating systems have gethostbyname() in the default searched +- # libraries (i.e. libc): +- AC_CHECK_FUNC(gethostbyname, , +- # Some OSes (eg. Solaris) place it in libnsl: +- AC_CHECK_LIB(nsl, gethostbyname, , +- # Some strange OSes (SINIX) have it in libsocket: +- AC_CHECK_LIB(socket, gethostbyname, , +- # Unfortunately libsocket sometimes depends on libnsl. +- # AC_CHECK_LIB's API is essentially broken so the +- # following ugliness is necessary: +- AC_CHECK_LIB(socket, gethostbyname, +- LIBS="-lsocket -lnsl $LIBS", +- AC_CHECK_LIB(resolv, gethostbyname), +- -lnsl)))) +- AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket, , +- AC_CHECK_LIB(socket, socket, LIBS="-lsocket -lnsl $LIBS", , +- -lnsl))) +- # DLPI needs putmsg under HPUX so test for -lstr while we're at it +- AC_CHECK_LIB(str, putmsg) +- ]) +diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 +new file mode 100644 +index 0000000..c54710b +--- /dev/null ++++ b/m4/acinclude.m4 +@@ -0,0 +1,319 @@ ++dnl ++dnl Check for 4.4 BSD sa_len member in sockaddr struct ++dnl ++dnl usage: AC_DNET_SOCKADDR_SA_LEN ++dnl results: HAVE_SOCKADDR_SA_LEN (defined) ++dnl ++AC_DEFUN(AC_DNET_SOCKADDR_SA_LEN, ++ [AC_MSG_CHECKING(for sa_len in sockaddr struct) ++ AC_CACHE_VAL(ac_cv_dnet_sockaddr_has_sa_len, ++ AC_TRY_COMPILE([ ++# ifndef _SOCKADDR_LEN ++# define _SOCKADDR_LEN 1 ++# endif ++# include ++# include ], ++ [u_int i = sizeof(((struct sockaddr *)0)->sa_len)], ++ ac_cv_dnet_sockaddr_has_sa_len=yes, ++ ac_cv_dnet_sockaddr_has_sa_len=no)) ++ AC_MSG_RESULT($ac_cv_dnet_sockaddr_has_sa_len) ++ if test $ac_cv_dnet_sockaddr_has_sa_len = yes ; then ++ AC_DEFINE(HAVE_SOCKADDR_SA_LEN, 1, ++ [Define if sockaddr struct has sa_len.]) ++ fi]) ++ ++dnl ++dnl Check for sockaddr_in6 struct in ++dnl ++dnl usage: AC_DNET_SOCKADDR_IN6 ++dnl results: HAVE_SOCKADDR_IN6 ++dnl ++AC_DEFUN(AC_DNET_SOCKADDR_IN6, ++ [AC_MSG_CHECKING(for sockaddr_in6 struct in ) ++ AC_CACHE_VAL(ac_cv_dnet_netinet_in_h_has_sockaddr_in6, ++ AC_TRY_COMPILE([ ++# include ++# include ++# include ], ++ [struct sockaddr_in6 sin6; sin6.sin6_family = AF_INET6;], ++ ac_cv_dnet_netinet_in_h_has_sockaddr_in6=yes, ++ ac_cv_dnet_netinet_in_h_has_sockaddr_in6=no)) ++ AC_MSG_RESULT($ac_cv_dnet_netinet_in_h_has_sockaddr_in6) ++ if test $ac_cv_dnet_netinet_in_h_has_sockaddr_in6 = yes ; then ++ AC_DEFINE(HAVE_SOCKADDR_IN6, 1, ++ [Define if has sockaddr_in6 struct.]) ++ fi]) ++ ++dnl ++dnl Check for arp_dev member in arpreq struct ++dnl ++dnl usage: AC_DNET_ARPREQ_ARP_DEV ++dnl results: HAVE_ARPREQ_ARP_DEV (defined) ++dnl ++AC_DEFUN(AC_DNET_ARPREQ_ARP_DEV, ++ [AC_MSG_CHECKING(for arp_dev in arpreq struct) ++ AC_CACHE_VAL(ac_cv_dnet_arpreq_has_arp_dev, ++ AC_TRY_COMPILE([ ++# include ++# include ++# include ], ++ [void *p = ((struct arpreq *)0)->arp_dev], ++ ac_cv_dnet_arpreq_has_arp_dev=yes, ++ ac_cv_dnet_arpreq_has_arp_dev=no)) ++ AC_MSG_RESULT($ac_cv_dnet_arpreq_has_arp_dev) ++ if test $ac_cv_dnet_arpreq_has_arp_dev = yes ; then ++ AC_DEFINE(HAVE_ARPREQ_ARP_DEV, 1, ++ [Define if arpreq struct has arp_dev.]) ++ fi]) ++ ++dnl ++dnl Check for rt_msghdr struct in ++dnl ++dnl usage: AC_DNET_ROUTE_RT_MSGHDR ++dnl results: HAVE_ROUTE_RT_MSGHDR ++dnl ++AC_DEFUN(AC_DNET_ROUTE_RT_MSGHDR, ++ [AC_MSG_CHECKING(for rt_msghdr struct in ) ++ AC_CACHE_VAL(ac_cv_dnet_route_h_has_rt_msghdr, ++ AC_TRY_COMPILE([ ++# include ++# include ++# include ++# include ], ++ [struct rt_msghdr rtm; rtm.rtm_msglen = 0;], ++ ac_cv_dnet_route_h_has_rt_msghdr=yes, ++ ac_cv_dnet_route_h_has_rt_msghdr=no)) ++ AC_MSG_RESULT($ac_cv_dnet_route_h_has_rt_msghdr) ++ if test $ac_cv_dnet_route_h_has_rt_msghdr = yes ; then ++ AC_DEFINE(HAVE_ROUTE_RT_MSGHDR, 1, ++ [Define if has rt_msghdr struct.]) ++ fi]) ++ ++dnl ++dnl Check for the Berkeley Packet Filter ++dnl ++dnl usage: AC_DNET_BSD_BPF ++dnl results: HAVE_BSD_BPF ++dnl ++AC_DEFUN(AC_DNET_BSD_BPF, ++ [AC_MSG_CHECKING(for Berkeley Packet Filter) ++ AC_CACHE_VAL(ac_cv_dnet_bsd_bpf, ++ if test -c /dev/bpf0 ; then ++ ac_cv_dnet_bsd_bpf=yes ++ else ++ ac_cv_dnet_bsd_bpf=no ++ fi) ++ AC_MSG_RESULT($ac_cv_dnet_bsd_bpf) ++ if test $ac_cv_dnet_bsd_bpf = yes ; then ++ AC_DEFINE(HAVE_BSD_BPF, 1, ++ [Define if you have the Berkeley Packet Filter.]) ++ fi]) ++ ++dnl ++dnl Check for the Linux /proc filesystem ++dnl ++dnl usage: AC_DNET_LINUX_PROCFS ++dnl results: HAVE_LINUX_PROCFS ++dnl ++AC_DEFUN(AC_DNET_LINUX_PROCFS, ++ [AC_MSG_CHECKING(for Linux proc filesystem) ++ AC_CACHE_VAL(ac_cv_dnet_linux_procfs, ++ if test "x`cat /proc/sys/kernel/ostype 2>&-`" = "xLinux" ; then ++ ac_cv_dnet_linux_procfs=yes ++ else ++ ac_cv_dnet_linux_procfs=no ++ fi) ++ AC_MSG_RESULT($ac_cv_dnet_linux_procfs) ++ if test $ac_cv_dnet_linux_procfs = yes ; then ++ AC_DEFINE(HAVE_LINUX_PROCFS, 1, ++ [Define if you have the Linux /proc filesystem.]) ++ fi]) ++ ++dnl ++dnl Check for Linux PF_PACKET sockets ++dnl ++dnl usage: AC_DNET_LINUX_PF_PACKET ++dnl results: HAVE_LINUX_PF_PACKET ++dnl ++AC_DEFUN(AC_DNET_LINUX_PF_PACKET, ++ [AC_MSG_CHECKING(for Linux PF_PACKET sockets) ++ AC_CACHE_VAL(ac_cv_dnet_linux_pf_packet, ++ if test -f /usr/include/netpacket/packet.h ; then ++ ac_cv_dnet_linux_pf_packet=yes ++ else ++ ac_cv_dnet_linux_pf_packet=no ++ fi) ++ AC_MSG_RESULT($ac_cv_dnet_linux_pf_packet) ++ if test $ac_cv_dnet_linux_pf_packet = yes ; then ++ AC_DEFINE(HAVE_LINUX_PF_PACKET, 1, ++ [Define if you have Linux PF_PACKET sockets.]) ++ fi]) ++ ++dnl ++dnl Check for SNMP MIB2 STREAMS (Solaris only?) ++dnl ++dnl usage: AC_DNET_STREAMS_MIB2 ++dnl results: HAVE_STREAMS_MIB2 ++dnl ++AC_DEFUN(AC_DNET_STREAMS_MIB2, ++ [AC_MSG_CHECKING(for SNMP MIB2 STREAMS) ++ AC_CACHE_VAL(ac_cv_dnet_streams_mib2, ++ if test -f /usr/include/inet/mib2.h -a -c /dev/ip ; then ++ ac_cv_dnet_streams_mib2=yes ++ else ++ ac_cv_dnet_streams_mib2=no ++ fi) ++ AC_MSG_RESULT($ac_cv_dnet_streams_mib2) ++ if test $ac_cv_dnet_streams_mib2 = yes ; then ++ AC_DEFINE(HAVE_STREAMS_MIB2, 1, ++ [Define if you have SNMP MIB2 STREAMS.]) ++ fi]) ++ ++dnl ++dnl Check for route(7) STREAMS (UnixWare only?) ++dnl ++dnl usage: AC_DNET_STREAMS_ROUTE ++dnl results: HAVE_STREAMS_ROUTE ++dnl ++AC_DEFUN(AC_DNET_STREAMS_ROUTE, ++ [AC_MSG_CHECKING(for route(7) STREAMS) ++ AC_CACHE_VAL(ac_cv_dnet_streams_route, ++ if grep RTSTR_SEND /usr/include/net/route.h >/dev/null 2>&1 ; then ++ ac_cv_dnet_streams_route=yes ++ else ++ ac_cv_dnet_streams_route=no ++ fi) ++ AC_MSG_RESULT($ac_cv_dnet_streams_route) ++ if test $ac_cv_dnet_streams_route = yes ; then ++ AC_DEFINE(HAVE_STREAMS_ROUTE, 1, ++ [Define if you have route(7) STREAMS.]) ++ fi]) ++ ++dnl ++dnl Check for arp(7) ioctls ++dnl ++dnl usage: AC_DNET_IOCTL_ARP ++dnl results: HAVE_IOCTL_ARP ++dnl ++AC_DEFUN(AC_DNET_IOCTL_ARP, ++ [AC_MSG_CHECKING(for arp(7) ioctls) ++ AC_CACHE_VAL(ac_cv_dnet_ioctl_arp, ++ AC_EGREP_CPP(werd, [ ++# include ++# define BSD_COMP ++# include ++# ifdef SIOCGARP ++ werd ++# endif], ++ ac_cv_dnet_ioctl_arp=yes, ++ ac_cv_dnet_ioctl_arp=no)) ++ case "$host_os" in ++ irix*) ++ ac_cv_dnet_ioctl_arp=no ;; ++ esac ++ AC_MSG_RESULT($ac_cv_dnet_ioctl_arp) ++ if test $ac_cv_dnet_ioctl_arp = yes ; then ++ AC_DEFINE(HAVE_IOCTL_ARP, 1, ++ [Define if you have arp(7) ioctls.]) ++ fi]) ++ ++dnl ++dnl Check for raw IP sockets ip_{len,off} host byte ordering ++dnl ++dnl usage: AC_DNET_RAWIP_HOST_OFFLEN ++dnl results: HAVE_RAWIP_HOST_OFFLEN ++dnl ++AC_DEFUN(AC_DNET_RAWIP_HOST_OFFLEN, ++ [AC_MSG_CHECKING([for raw IP sockets ip_{len,off} host byte ordering]) ++ AC_CACHE_VAL(ac_cv_dnet_rawip_host_offlen, [ ++ case "$host_os" in ++ *openbsd*) ++ ac_cv_dnet_rawip_host_offlen=no ;; ++ *bsd*|*darwin*|*osf*|*unixware*) ++ ac_cv_dnet_rawip_host_offlen=yes ;; ++ *) ++ ac_cv_dnet_rawip_host_offlen=no ;; ++ esac]) ++ AC_MSG_RESULT($ac_cv_dnet_rawip_host_offlen) ++ if test $ac_cv_dnet_rawip_host_offlen = yes ; then ++ AC_DEFINE(HAVE_RAWIP_HOST_OFFLEN, 1, ++ [Define if raw IP sockets require host byte ordering for ip_off, ip_len.]) ++ fi]) ++ ++dnl ++dnl Check for cooked raw IP sockets ++dnl ++dnl usage: AC_DNET_RAWIP_COOKED ++dnl results: HAVE_RAWIP_COOKED ++dnl ++AC_DEFUN(AC_DNET_RAWIP_COOKED, ++ [AC_MSG_CHECKING(for cooked raw IP sockets) ++ AC_CACHE_VAL(ac_cv_dnet_rawip_cooked, [ ++ case "$host_os" in ++ solaris*|irix*) ++ ac_cv_dnet_rawip_cooked=yes ;; ++ *) ++ ac_cv_dnet_rawip_cooked=no ;; ++ esac]) ++ AC_MSG_RESULT($ac_cv_dnet_rawip_cooked) ++ if test $ac_cv_dnet_rawip_cooked = yes ; then ++ AC_DEFINE(HAVE_RAWIP_COOKED, 1, ++ [Define if you have cooked raw IP sockets.]) ++ fi]) ++ ++dnl ++dnl AC_LBL_LIBRARY_NET ++dnl ++dnl This test is for network applications that need socket() and ++dnl gethostbyname() -ish functions. Under Solaris, those applications ++dnl need to link with "-lsocket -lnsl". Under IRIX, they need to link ++dnl with "-lnsl" but should *not* link with "-lsocket" because ++dnl libsocket.a breaks a number of things (for instance: ++dnl gethostbyname() under IRIX 5.2, and snoop sockets under most ++dnl versions of IRIX). ++dnl ++dnl Unfortunately, many application developers are not aware of this, ++dnl and mistakenly write tests that cause -lsocket to be used under ++dnl IRIX. It is also easy to write tests that cause -lnsl to be used ++dnl under operating systems where neither are necessary (or useful), ++dnl such as SunOS 4.1.4, which uses -lnsl for TLI. ++dnl ++dnl This test exists so that every application developer does not test ++dnl this in a different, and subtly broken fashion. ++ ++dnl It has been argued that this test should be broken up into two ++dnl seperate tests, one for the resolver libraries, and one for the ++dnl libraries necessary for using Sockets API. Unfortunately, the two ++dnl are carefully intertwined and allowing the autoconf user to use ++dnl them independantly potentially results in unfortunate ordering ++dnl dependancies -- as such, such component macros would have to ++dnl carefully use indirection and be aware if the other components were ++dnl executed. Since other autoconf macros do not go to this trouble, ++dnl and almost no applications use sockets without the resolver, this ++dnl complexity has not been implemented. ++dnl ++dnl The check for libresolv is in case you are attempting to link ++dnl statically and happen to have a libresolv.a lying around (and no ++dnl libnsl.a). ++dnl ++AC_DEFUN(AC_LBL_LIBRARY_NET, [ ++ # Most operating systems have gethostbyname() in the default searched ++ # libraries (i.e. libc): ++ AC_CHECK_FUNC(gethostbyname, , ++ # Some OSes (eg. Solaris) place it in libnsl: ++ AC_CHECK_LIB(nsl, gethostbyname, , ++ # Some strange OSes (SINIX) have it in libsocket: ++ AC_CHECK_LIB(socket, gethostbyname, , ++ # Unfortunately libsocket sometimes depends on libnsl. ++ # AC_CHECK_LIB's API is essentially broken so the ++ # following ugliness is necessary: ++ AC_CHECK_LIB(socket, gethostbyname, ++ LIBS="-lsocket -lnsl $LIBS", ++ AC_CHECK_LIB(resolv, gethostbyname), ++ -lnsl)))) ++ AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket, , ++ AC_CHECK_LIB(socket, socket, LIBS="-lsocket -lnsl $LIBS", , ++ -lnsl))) ++ # DLPI needs putmsg under HPUX so test for -lstr while we're at it ++ AC_CHECK_LIB(str, putmsg) ++ ]) +-- +1.7.6 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Aug 5 07:56:35 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 05 Aug 2011 05:56:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[15259] csw/mgar/pkg/libgmp/trunk/Makefile Message-ID: Revision: 15259 http://gar.svn.sourceforge.net/gar/?rev=15259&view=rev Author: wahwah Date: 2011-08-05 05:56:35 +0000 (Fri, 05 Aug 2011) Log Message: ----------- pkg/libgmp/trunk: merge gmp.h for other ISAs Modified Paths: -------------- csw/mgar/pkg/libgmp/trunk/Makefile Modified: csw/mgar/pkg/libgmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgmp/trunk/Makefile 2011-08-04 13:33:52 UTC (rev 15258) +++ csw/mgar/pkg/libgmp/trunk/Makefile 2011-08-05 05:56:35 UTC (rev 15259) @@ -54,11 +54,8 @@ CONFIGURE_ARGS = ABI=$(ABI_$(ISA)) MPN_PATH=$(MPN_$(ISA)) $(DIRPATHS) -#EXTRA_MERGE_DIRS_isa-sparcv8plus = $(includedir) -#EXTRA_MERGE_DIRS_isa-sparcv8plus+vis = $(includedir) -#EXTRA_MERGE_DIRS_isa-sparcv9 = $(includedir) -#EXTRA_MERGE_DIRS_isa-amd64 = $(includedir) -#EXTRA_MERGE_DIRS_isa-pentium = $(includedir) +# For 64-bit compilation, we need /opt/csw/include/sparcv9/gmp.h +EXTRA_MERGE_DIRS_isa-extra = $(includedir) PACKAGES += CSWlibgmp10 CATALOGNAME_CSWlibgmp10 = libgmp10 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Aug 5 09:36:51 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 05 Aug 2011 07:36:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[15260] csw/mgar/pkg/libmpfr/trunk/Makefile Message-ID: Revision: 15260 http://gar.svn.sourceforge.net/gar/?rev=15260&view=rev Author: wahwah Date: 2011-08-05 07:36:50 +0000 (Fri, 05 Aug 2011) Log Message: ----------- pkg/libmpfr/trunk: architecture specific includes Modified Paths: -------------- csw/mgar/pkg/libmpfr/trunk/Makefile Modified: csw/mgar/pkg/libmpfr/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmpfr/trunk/Makefile 2011-08-05 05:56:35 UTC (rev 15259) +++ csw/mgar/pkg/libmpfr/trunk/Makefile 2011-08-05 07:36:50 UTC (rev 15260) @@ -26,6 +26,9 @@ CONFIGURE_ARGS = $(DIRPATHS) +# It's necessary to include architecture-specific headers from gmp. +EXTRA_INC += $(includedir)/$(ISA) + # With the default -xO3, there are failing unit tests. OPT_FLAGS_SOS = -xO2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Aug 5 10:24:46 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 05 Aug 2011 08:24:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[15261] csw/mgar/gar/v2/lib/python/checkpkg2.py Message-ID: Revision: 15261 http://gar.svn.sourceforge.net/gar/?rev=15261&view=rev Author: wahwah Date: 2011-08-05 08:24:45 +0000 (Fri, 05 Aug 2011) Log Message: ----------- checkpkg: Report if catalog release not in db https://www.opencsw.org/mantis/view.php?id=4795 Improve the error message by providing additional logging: What was the catalog release requested, and what are the available catalog releases. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg2.py Modified: csw/mgar/gar/v2/lib/python/checkpkg2.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg2.py 2011-08-05 07:36:50 UTC (rev 15260) +++ csw/mgar/gar/v2/lib/python/checkpkg2.py 2011-08-05 08:24:45 UTC (rev 15261) @@ -123,8 +123,17 @@ sqo_pkgs = list(models.Srv4FileStats.select( sqlobject.IN(models.Srv4FileStats.q.md5_sum, md5_sums))) tags_for_all_osrels = [] + try: + sqo_catrel = models.CatalogRelease.selectBy(name=options.catrel).getOne() + except sqlobject.main.SQLObjectNotFound, e: + logging.fatal("Fetching from the db has failed: catrel=%s", + repr(str(options.catrel))) + logging.fatal("Available catalog releases:") + sqo_catrels = models.CatalogRelease.select() + for sqo_catrel in sqo_catrels: + logging.fatal(" - %s", sqo_catrel.name) + raise sqo_arch = models.Architecture.selectBy(name=options.arch).getOne() - sqo_catrel = models.CatalogRelease.selectBy(name=options.catrel).getOne() for osrel in osrel_list: sqo_osrel = models.OsRelease.selectBy(short_name=osrel).getOne() dm.VerifyContents(sqo_osrel, sqo_arch) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Aug 5 10:39:22 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 05 Aug 2011 08:39:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[15262] csw/mgar/pkg/libmpfr/trunk/Makefile Message-ID: Revision: 15262 http://gar.svn.sourceforge.net/gar/?rev=15262&view=rev Author: wahwah Date: 2011-08-05 08:39:22 +0000 (Fri, 05 Aug 2011) Log Message: ----------- mpfr: splitting packages Modified Paths: -------------- csw/mgar/pkg/libmpfr/trunk/Makefile Modified: csw/mgar/pkg/libmpfr/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmpfr/trunk/Makefile 2011-08-05 08:24:45 UTC (rev 15261) +++ csw/mgar/pkg/libmpfr/trunk/Makefile 2011-08-05 08:39:22 UTC (rev 15262) @@ -3,6 +3,7 @@ NAME = mpfr VERSION = 3.0.1 CATEGORIES = lib +GARTYPE = v2 DESCRIPTION = GNU Multiple Precision floating-point arithmetic library define BLURB @@ -32,6 +33,21 @@ # With the default -xO3, there are failing unit tests. OPT_FLAGS_SOS = -xO2 +EXTRA_INC += $(includedir)/$(ISA) + +PACKAGES = CSWlibmpfr4 +SPKG_DESC_CSWlibmpfr4 = $(DESCRIPTION) +PKGFILES_CSWlibmpfr4 += .*libmpfr\.so\.4.* + +PACKAGES += CSWlibmpfr-dev +# PKGFILES_CSWlibmpfr-dev += $(PKGFILES_DEVEL) +SPKG_DESC_CSWlibmpfr-dev = MPFR development files +RUNTIME_DEP_PKGS_CSWlibmpfr-dev += CSWlibmpfr4 + +# It's only documentation. +CHECKPKG_OVERRIDES_CSWlibmpfr-dev += file-with-bad-content|/usr/local|root/opt/csw/share/info/mpfr.info +CHECKPKG_OVERRIDES_CSWlibmpfr-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/mpfr/FAQ.html + include gar/category.mk # Might be useful, not sure yet: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Aug 5 10:39:54 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 05 Aug 2011 08:39:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[15263] csw/mgar/pkg/libmpfr/trunk/Makefile Message-ID: Revision: 15263 http://gar.svn.sourceforge.net/gar/?rev=15263&view=rev Author: wahwah Date: 2011-08-05 08:39:53 +0000 (Fri, 05 Aug 2011) Log Message: ----------- mpfr: Using $(VERSION) in DISTFILES Modified Paths: -------------- csw/mgar/pkg/libmpfr/trunk/Makefile Modified: csw/mgar/pkg/libmpfr/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmpfr/trunk/Makefile 2011-08-05 08:39:22 UTC (rev 15262) +++ csw/mgar/pkg/libmpfr/trunk/Makefile 2011-08-05 08:39:53 UTC (rev 15263) @@ -11,7 +11,7 @@ computations with correct rounding. endef -MASTER_SITES = http://www.mpfr.org/mpfr-current/ +MASTER_SITES = http://www.mpfr.org/mpfr-$(VERSION)/ DISTFILES = $(NAME)-$(VERSION).tar.bz2 PACKAGES = CSWlibmpfr This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Aug 5 13:35:23 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 05 Aug 2011 11:35:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[15264] csw/mgar/pkg/bzip2/trunk/Makefile Message-ID: Revision: 15264 http://gar.svn.sourceforge.net/gar/?rev=15264&view=rev Author: wahwah Date: 2011-08-05 11:35:22 +0000 (Fri, 05 Aug 2011) Log Message: ----------- pkg/bzip2/trunk: no need to repeat the software name Modified Paths: -------------- csw/mgar/pkg/bzip2/trunk/Makefile Modified: csw/mgar/pkg/bzip2/trunk/Makefile =================================================================== --- csw/mgar/pkg/bzip2/trunk/Makefile 2011-08-05 08:39:53 UTC (rev 15263) +++ csw/mgar/pkg/bzip2/trunk/Makefile 2011-08-05 11:35:22 UTC (rev 15264) @@ -2,7 +2,7 @@ VERSION = 1.0.5 CATEGORIES = utils -DESCRIPTION = bzip2 Compression Utility +DESCRIPTION = Compression Utility define BLURB bzip2 is a freely available, patent free, high-quality data compressor. It typically compresses files to within 10% to 15% of the best available techniques (the PPM family of @@ -25,8 +25,6 @@ LICENSE = LICENSE -CHECKPKG_OVERRIDES_CSWbzip2 += pkginfo-description-not-starting-with-uppercase|bzip2|Compression|Utility - BUILD64 = 1 NOISAEXEC = 1 MERGE_DIRS_isa-extra = $(libdir) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Aug 5 13:36:10 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 05 Aug 2011 11:36:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[15265] csw/mgar/pkg/bzip2/trunk/Makefile Message-ID: Revision: 15265 http://gar.svn.sourceforge.net/gar/?rev=15265&view=rev Author: wahwah Date: 2011-08-05 11:36:10 +0000 (Fri, 05 Aug 2011) Log Message: ----------- pkg/bzip2/trunk: removing the obsolete NOISAEXEC Modified Paths: -------------- csw/mgar/pkg/bzip2/trunk/Makefile Modified: csw/mgar/pkg/bzip2/trunk/Makefile =================================================================== --- csw/mgar/pkg/bzip2/trunk/Makefile 2011-08-05 11:35:22 UTC (rev 15264) +++ csw/mgar/pkg/bzip2/trunk/Makefile 2011-08-05 11:36:10 UTC (rev 15265) @@ -26,7 +26,6 @@ LICENSE = LICENSE BUILD64 = 1 -NOISAEXEC = 1 MERGE_DIRS_isa-extra = $(libdir) EXTRA_CFLAGS += -KPIC -D_FILE_OFFSET_BITS=64 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Aug 5 13:38:30 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 05 Aug 2011 11:38:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[15266] csw/mgar/pkg/bzip2/trunk/Makefile Message-ID: Revision: 15266 http://gar.svn.sourceforge.net/gar/?rev=15266&view=rev Author: wahwah Date: 2011-08-05 11:38:30 +0000 (Fri, 05 Aug 2011) Log Message: ----------- pkg/bzip2/trunk: upstream serves it in a way that breaks uwatch anyway Modified Paths: -------------- csw/mgar/pkg/bzip2/trunk/Makefile Modified: csw/mgar/pkg/bzip2/trunk/Makefile =================================================================== --- csw/mgar/pkg/bzip2/trunk/Makefile 2011-08-05 11:36:10 UTC (rev 15265) +++ csw/mgar/pkg/bzip2/trunk/Makefile 2011-08-05 11:38:30 UTC (rev 15266) @@ -16,10 +16,6 @@ PATCHFILES += 0002-test-should-depend-on-bzip2.patch PATCHFILES += 0003-generate-bzip2recover.patch -# We define upstream file regex so we can be notifed of new upstream -# software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - PACKAGES = CSWbzip2 CATALOGNAME = bzip2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Aug 5 13:39:09 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 05 Aug 2011 11:39:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[15267] csw/mgar/pkg/bzip2/trunk/Makefile Message-ID: Revision: 15267 http://gar.svn.sourceforge.net/gar/?rev=15267&view=rev Author: wahwah Date: 2011-08-05 11:39:09 +0000 (Fri, 05 Aug 2011) Log Message: ----------- pkg/bzip2/trunk: Expanding the Id variable Modified Paths: -------------- csw/mgar/pkg/bzip2/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/bzip2/trunk/Makefile Modified: csw/mgar/pkg/bzip2/trunk/Makefile =================================================================== --- csw/mgar/pkg/bzip2/trunk/Makefile 2011-08-05 11:38:30 UTC (rev 15266) +++ csw/mgar/pkg/bzip2/trunk/Makefile 2011-08-05 11:39:09 UTC (rev 15267) @@ -1,3 +1,5 @@ +# $Id$ + NAME = bzip2 VERSION = 1.0.5 CATEGORIES = utils Property changes on: csw/mgar/pkg/bzip2/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Aug 5 15:12:39 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 05 Aug 2011 13:12:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[15268] csw/mgar/pkg/libmpfr/trunk/Makefile Message-ID: Revision: 15268 http://gar.svn.sourceforge.net/gar/?rev=15268&view=rev Author: wahwah Date: 2011-08-05 13:12:38 +0000 (Fri, 05 Aug 2011) Log Message: ----------- pkg/libmpfr/trunk: library split redone, builds fine, tests pass Modified Paths: -------------- csw/mgar/pkg/libmpfr/trunk/Makefile Modified: csw/mgar/pkg/libmpfr/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmpfr/trunk/Makefile 2011-08-05 11:39:09 UTC (rev 15267) +++ csw/mgar/pkg/libmpfr/trunk/Makefile 2011-08-05 13:12:38 UTC (rev 15268) @@ -35,20 +35,23 @@ EXTRA_INC += $(includedir)/$(ISA) -PACKAGES = CSWlibmpfr4 -SPKG_DESC_CSWlibmpfr4 = $(DESCRIPTION) -PKGFILES_CSWlibmpfr4 += .*libmpfr\.so\.4.* +PACKAGES = +PACKAGES += CSWlibmpfr4 +CATALOGNAME_CSWlibmpfr4 = libmpfr4 +PKGFILES_CSWlibmpfr4 += $(call baseisadirs,$(libdir),libmpfr\.so\.4(\.\d+)*) +SPKG_DESC_CSWlibmpfr4 += $(DESCRIPTION), libmpfr.so.4 +RUNTIME_DEP_PKGS_CSWlibmpfr4 += CSWlibgmp10 PACKAGES += CSWlibmpfr-dev -# PKGFILES_CSWlibmpfr-dev += $(PKGFILES_DEVEL) SPKG_DESC_CSWlibmpfr-dev = MPFR development files RUNTIME_DEP_PKGS_CSWlibmpfr-dev += CSWlibmpfr4 +# Obsoleting the CSWlibmpfr package +OBSOLETED_BY_CSWlibmpfr-dev = CSWlibmpfr +OBSOLETED_BY_CSWlibmpfr4 = CSWlibmpfr + # It's only documentation. CHECKPKG_OVERRIDES_CSWlibmpfr-dev += file-with-bad-content|/usr/local|root/opt/csw/share/info/mpfr.info CHECKPKG_OVERRIDES_CSWlibmpfr-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/mpfr/FAQ.html include gar/category.mk - -# Might be useful, not sure yet: -# PATH := /opt/csw/gnu:/usr/xpg4/bin:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Aug 5 15:26:11 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 05 Aug 2011 13:26:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[15269] csw/mgar/pkg/libmpfr/branches/libmpfr1/ Message-ID: Revision: 15269 http://gar.svn.sourceforge.net/gar/?rev=15269&view=rev Author: wahwah Date: 2011-08-05 13:26:11 +0000 (Fri, 05 Aug 2011) Log Message: ----------- To build the legacy libmpfr.so.1 library Added Paths: ----------- csw/mgar/pkg/libmpfr/branches/libmpfr1/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Aug 5 15:29:16 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 05 Aug 2011 13:29:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[15270] csw/mgar/pkg/libmpfr/trunk/Makefile Message-ID: Revision: 15270 http://gar.svn.sourceforge.net/gar/?rev=15270&view=rev Author: wahwah Date: 2011-08-05 13:29:16 +0000 (Fri, 05 Aug 2011) Log Message: ----------- pkg/libmpfr/trunk: No need to pull in libmpfr4 via libmpfr_stub. Modified Paths: -------------- csw/mgar/pkg/libmpfr/trunk/Makefile Modified: csw/mgar/pkg/libmpfr/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmpfr/trunk/Makefile 2011-08-05 13:26:11 UTC (rev 15269) +++ csw/mgar/pkg/libmpfr/trunk/Makefile 2011-08-05 13:29:16 UTC (rev 15270) @@ -48,7 +48,6 @@ # Obsoleting the CSWlibmpfr package OBSOLETED_BY_CSWlibmpfr-dev = CSWlibmpfr -OBSOLETED_BY_CSWlibmpfr4 = CSWlibmpfr # It's only documentation. CHECKPKG_OVERRIDES_CSWlibmpfr-dev += file-with-bad-content|/usr/local|root/opt/csw/share/info/mpfr.info This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Aug 5 15:44:30 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 05 Aug 2011 13:44:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[15271] csw/mgar/pkg/libmpfr/branches/libmpfr-2.3.1/ Message-ID: Revision: 15271 http://gar.svn.sourceforge.net/gar/?rev=15271&view=rev Author: wahwah Date: 2011-08-05 13:44:30 +0000 (Fri, 05 Aug 2011) Log Message: ----------- removing an unused branch Removed Paths: ------------- csw/mgar/pkg/libmpfr/branches/libmpfr-2.3.1/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Aug 5 15:45:43 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 05 Aug 2011 13:45:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[15272] csw/mgar/pkg/libmpfr/branches/libmpfr1/Makefile Message-ID: Revision: 15272 http://gar.svn.sourceforge.net/gar/?rev=15272&view=rev Author: wahwah Date: 2011-08-05 13:45:43 +0000 (Fri, 05 Aug 2011) Log Message: ----------- pkg/libmpfr/branches/libmpfr1: legacy library; there's a problem that it links against libgmp.so.10 Modified Paths: -------------- csw/mgar/pkg/libmpfr/branches/libmpfr1/Makefile Modified: csw/mgar/pkg/libmpfr/branches/libmpfr1/Makefile =================================================================== --- csw/mgar/pkg/libmpfr/branches/libmpfr1/Makefile 2011-08-05 13:44:30 UTC (rev 15271) +++ csw/mgar/pkg/libmpfr/branches/libmpfr1/Makefile 2011-08-05 13:45:43 UTC (rev 15272) @@ -1,7 +1,7 @@ # $Id$ NAME = mpfr -VERSION = 3.0.1 +VERSION = 2.3.1 CATEGORIES = lib GARTYPE = v2 @@ -36,22 +36,23 @@ EXTRA_INC += $(includedir)/$(ISA) PACKAGES = -PACKAGES += CSWlibmpfr4 -CATALOGNAME_CSWlibmpfr4 = libmpfr4 -PKGFILES_CSWlibmpfr4 += $(call baseisadirs,$(libdir),libmpfr\.so\.4(\.\d+)*) -SPKG_DESC_CSWlibmpfr4 += $(DESCRIPTION), libmpfr.so.4 -RUNTIME_DEP_PKGS_CSWlibmpfr4 += CSWlibgmp10 +PACKAGES += CSWlibmpfr1 +CATALOGNAME_CSWlibmpfr1 = libmpfr1 +PKGFILES_CSWlibmpfr1 += $(call baseisadirs,$(libdir),libmpfr\.so\.1(\.\d+)*) +SPKG_DESC_CSWlibmpfr1 += $(DESCRIPTION), libmpfr.so.1 +# This could be a problem, because there are binaries already linking against +# libmpfr.so.1 and libgmp.so.3 (not .so.10) at the same time. +RUNTIME_DEP_PKGS_CSWlibmpfr1 += CSWlibgmp10 PACKAGES += CSWlibmpfr-dev SPKG_DESC_CSWlibmpfr-dev = MPFR development files -RUNTIME_DEP_PKGS_CSWlibmpfr-dev += CSWlibmpfr4 +RUNTIME_DEP_PKGS_CSWlibmpfr-dev += CSWlibmpfr1 # Obsoleting the CSWlibmpfr package OBSOLETED_BY_CSWlibmpfr-dev = CSWlibmpfr -OBSOLETED_BY_CSWlibmpfr4 = CSWlibmpfr +OBSOLETED_BY_CSWlibmpfr1 = CSWlibmpfr # It's only documentation. CHECKPKG_OVERRIDES_CSWlibmpfr-dev += file-with-bad-content|/usr/local|root/opt/csw/share/info/mpfr.info -CHECKPKG_OVERRIDES_CSWlibmpfr-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/mpfr/FAQ.html include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Aug 5 18:20:12 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 05 Aug 2011 16:20:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[15273] csw/mgar/pkg/libdnet/trunk/Makefile Message-ID: Revision: 15273 http://gar.svn.sourceforge.net/gar/?rev=15273&view=rev Author: wahwah Date: 2011-08-05 16:20:12 +0000 (Fri, 05 Aug 2011) Log Message: ----------- pkg/libdnet/trunk: worked around the missing .so issue, http://code.google.com/p/libdnet/issues/detail?id=18 Modified Paths: -------------- csw/mgar/pkg/libdnet/trunk/Makefile Modified: csw/mgar/pkg/libdnet/trunk/Makefile =================================================================== --- csw/mgar/pkg/libdnet/trunk/Makefile 2011-08-05 13:45:43 UTC (rev 15272) +++ csw/mgar/pkg/libdnet/trunk/Makefile 2011-08-05 16:20:12 UTC (rev 15273) @@ -4,11 +4,6 @@ CATEGORIES = lib GARTYPE = v2 -# ! .so extension missing http://code.google.com/p/libdnet/issues/detail?id=18 -# An idea: -# http://www.v7w.com/debian/libtool-missing_so.html -# http://www.v7w.com/debian/libtool-updating.html - DESCRIPTION = A simplified, portable interface to several low-level networking routines define BLURB endef @@ -27,8 +22,33 @@ MERGE_DIRS_isa-extra = $(libdir) +PACKAGES = CSWlibdnet1 +CATALOGNAME_CSWlibdnet1 = libdnet1 +PKGFILES_CSWlibdnet1 += $(call baseisadirs,$(libdir),libdnet\.so\.1\.0\.1) +PKGFILES_CSWlibdnet1 += $(call baseisadirs,$(libdir),libdnet\.so\.1(\.\d+)*) +SPKG_DESC_CSWlibdnet1 += A simplified, portable interface to several low-level networking routines, libdnet.so.1 +RUNTIME_DEP_PKGS_CSWlibdnet += CSWlibdnet1 + +PACKAGES += CSWlibdnet-dev +SPKG_DESC_CSWlibdnet-dev += $(DESCRIPTION) +RUNTIME_DEP_PKGS_CSWlibdnet-dev += CSWlibdnet1 + +OBSOLETED_BY_CSWlibdnet-dev = CSWlibdnet +OBSOLETED_BY_CSWlibdnet1 = CSWlibdnet + include gar/category.mk +# Not sure whether it's the minimal number of steps, or whether they are in +# a correct order, but it gets the job done. +# +# Workaround based on: +# http://www.v7w.com/debian/libtool-missing_so.html +# http://www.v7w.com/debian/libtool-updating.html +# +# Additionally, removing the old aclocal.m4 seems to be necessary. pre-configure-modulated: + rm $(WORKSRC)/aclocal.m4 + (cd $(WORKSRC) && libtoolize --copy --force) + (cd $(WORKSRC) && aclocal) (cd $(WORKSRC) && autoreconf -fi) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Aug 5 23:33:34 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 05 Aug 2011 21:33:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[15274] csw/mgar/pkg/pca/trunk Message-ID: Revision: 15274 http://gar.svn.sourceforge.net/gar/?rev=15274&view=rev Author: dmichelsen Date: 2011-08-05 21:33:34 +0000 (Fri, 05 Aug 2011) Log Message: ----------- pca: Update to 20110805-02 Modified Paths: -------------- csw/mgar/pkg/pca/trunk/Makefile csw/mgar/pkg/pca/trunk/checksums Modified: csw/mgar/pkg/pca/trunk/Makefile =================================================================== --- csw/mgar/pkg/pca/trunk/Makefile 2011-08-05 16:20:12 UTC (rev 15273) +++ csw/mgar/pkg/pca/trunk/Makefile 2011-08-05 21:33:34 UTC (rev 15274) @@ -1,5 +1,5 @@ NAME = pca -VERSION = 20110329-01 +VERSION = 20110805-02 CATEGORIES = utils DESCRIPTION = Patch Check Advanced @@ -23,9 +23,6 @@ PATCHFILES = 0001-prefer-opencsw-perl.diff PATCHFILES += 0002-Add-etc-opt-csw-as-config-location.patch -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d{8}-\d{2}) - WORKSRC = $(WORKDIR) PATCHDIR = $(WORKDIR) @@ -34,7 +31,7 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = custom -SPKG_SOURCEURL = http://www.par.univie.ac.at/solaris/pca/ +VENDOR_URL = http://www.par.univie.ac.at/solaris/pca/ SPKG_VERSION = $(shell echo $(VERSION) | sed -e 's/-/./g') SAMPLECONF = /etc/opt/csw/pca.conf Modified: csw/mgar/pkg/pca/trunk/checksums =================================================================== --- csw/mgar/pkg/pca/trunk/checksums 2011-08-05 16:20:12 UTC (rev 15273) +++ csw/mgar/pkg/pca/trunk/checksums 2011-08-05 21:33:34 UTC (rev 15274) @@ -1,2 +1,2 @@ f0a009f889da56e5a0de7f322dbfa0a8 chkmin -bd964b26b3de794dc6742bac7c8ab0c6 pca-20110329-01 +7a5806de0fa1c4b6ed8973afadf4a397 pca-20110805-02 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Sat Aug 6 08:38:38 2011 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Sat, 06 Aug 2011 06:38:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[15275] csw/mgar/pkg/nginx/trunk/Makefile Message-ID: Revision: 15275 http://gar.svn.sourceforge.net/gar/?rev=15275&view=rev Author: aigoshin Date: 2011-08-06 06:38:38 +0000 (Sat, 06 Aug 2011) Log Message: ----------- nginx: debugging Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2011-08-05 21:33:34 UTC (rev 15274) +++ csw/mgar/pkg/nginx/trunk/Makefile 2011-08-06 06:38:38 UTC (rev 15275) @@ -1,5 +1,5 @@ NAME = nginx -VERSION = 1.0.5 +VERSION = 1.1.0 CATEGORIES = server GARCOMPILER = SOS11 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Sat Aug 6 08:42:43 2011 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Sat, 06 Aug 2011 06:42:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[15276] csw/mgar/pkg/nginx/trunk Message-ID: Revision: 15276 http://gar.svn.sourceforge.net/gar/?rev=15276&view=rev Author: aigoshin Date: 2011-08-06 06:42:43 +0000 (Sat, 06 Aug 2011) Log Message: ----------- nginx: debugging Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile csw/mgar/pkg/nginx/trunk/checksums Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2011-08-06 06:38:38 UTC (rev 15275) +++ csw/mgar/pkg/nginx/trunk/Makefile 2011-08-06 06:42:43 UTC (rev 15276) @@ -10,7 +10,7 @@ HTTP server and reverse proxy, as well as an IMAP/POP3 proxy server. endef -MASTER_SITES = http://sysoev.ru/nginx/ +MASTER_SITES = http://nginx.org/download/ DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += cswnginx Modified: csw/mgar/pkg/nginx/trunk/checksums =================================================================== --- csw/mgar/pkg/nginx/trunk/checksums 2011-08-06 06:38:38 UTC (rev 15275) +++ csw/mgar/pkg/nginx/trunk/checksums 2011-08-06 06:42:43 UTC (rev 15276) @@ -1 +1 @@ -373c7761a7c682b92b164c8ee3d6d243 nginx-1.0.5.tar.gz +3381f34eafc755f935a2d94148500505 nginx-1.1.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Aug 6 09:34:47 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 06 Aug 2011 07:34:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[15277] csw/mgar/pkg/libgmp/trunk/Makefile Message-ID: Revision: 15277 http://gar.svn.sourceforge.net/gar/?rev=15277&view=rev Author: wahwah Date: 2011-08-06 07:34:47 +0000 (Sat, 06 Aug 2011) Log Message: ----------- pkg/libgmp/trunk: 'check' is the default target now Modified Paths: -------------- csw/mgar/pkg/libgmp/trunk/Makefile Modified: csw/mgar/pkg/libgmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgmp/trunk/Makefile 2011-08-06 06:42:43 UTC (rev 15276) +++ csw/mgar/pkg/libgmp/trunk/Makefile 2011-08-06 07:34:47 UTC (rev 15277) @@ -32,8 +32,6 @@ BUILD_DEP_PKGS = CSWgm4 -TEST_TARGET = check - # Solaris m4 seems to fail on Solaris 10 amd64 only, use gm4 for all builds M4 = /opt/csw/bin/gm4 EXTRA_CONFIGURE_EXPORTS = M4 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Aug 6 09:35:40 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 06 Aug 2011 07:35:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[15278] csw/mgar/pkg/libmpfr/trunk/Makefile Message-ID: Revision: 15278 http://gar.svn.sourceforge.net/gar/?rev=15278&view=rev Author: wahwah Date: 2011-08-06 07:35:40 +0000 (Sat, 06 Aug 2011) Log Message: ----------- pkg/libmpfr/trunk: adding CSWlibgmp-dev as a build dep Modified Paths: -------------- csw/mgar/pkg/libmpfr/trunk/Makefile Modified: csw/mgar/pkg/libmpfr/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmpfr/trunk/Makefile 2011-08-06 07:34:47 UTC (rev 15277) +++ csw/mgar/pkg/libmpfr/trunk/Makefile 2011-08-06 07:35:40 UTC (rev 15278) @@ -14,6 +14,8 @@ MASTER_SITES = http://www.mpfr.org/mpfr-$(VERSION)/ DISTFILES = $(NAME)-$(VERSION).tar.bz2 +BUILD_DEP_PKGS = CSWlibgmp-dev + PACKAGES = CSWlibmpfr CATALOGNAME_CSWlibmpfr = libmpfr SPKG_DESC_CSWlibmpfr = $(DESCRIPTION) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Aug 6 11:36:08 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 06 Aug 2011 09:36:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[15279] csw/mgar/pkg/libgmp/trunk Message-ID: Revision: 15279 http://gar.svn.sourceforge.net/gar/?rev=15279&view=rev Author: wahwah Date: 2011-08-06 09:36:08 +0000 (Sat, 06 Aug 2011) Log Message: ----------- pkg/libgmp/trunk: a better way to handle 32-bit vs 64-bit Modified Paths: -------------- csw/mgar/pkg/libgmp/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/libgmp/trunk/files/gmp.h Modified: csw/mgar/pkg/libgmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgmp/trunk/Makefile 2011-08-06 07:35:40 UTC (rev 15278) +++ csw/mgar/pkg/libgmp/trunk/Makefile 2011-08-06 09:36:08 UTC (rev 15279) @@ -24,7 +24,6 @@ SPKG_SOURCEURL = http://gmplib.org/ -#GARCOMPILER = GCC4 BUILD64 = 1 EXTRA_BUILD_ISAS_sparc = sparcv8plus sparcv8plus+vis @@ -52,8 +51,9 @@ CONFIGURE_ARGS = ABI=$(ABI_$(ISA)) MPN_PATH=$(MPN_$(ISA)) $(DIRPATHS) -# For 64-bit compilation, we need /opt/csw/include/sparcv9/gmp.h -EXTRA_MERGE_DIRS_isa-extra = $(includedir) +EXTRA_PAX_ARGS_32 = -s ",^\.$(includedir)/gmp.h$$,.$(includedir)/gmp-32.h,p" +EXTRA_PAX_ARGS_64 = -s ",^\.$(includedir)/gmp.h$$,.$(includedir)/gmp-64.h,p" +EXTRA_PAX_ARGS = $(EXTRA_PAX_ARGS_$(MEMORYMODEL)) PACKAGES += CSWlibgmp10 CATALOGNAME_CSWlibgmp10 = libgmp10 @@ -66,17 +66,11 @@ # Catchall PKGFILES RUNTIME_DEP_PKGS_CSWlibgmp-dev = CSWlibgmp10 -#RUNTIME_DEP_PKGS = CSWgcc4corert - # It's only an .info file. CHECKPKG_OVERRIDES_CSWlibgmp-dev += file-with-bad-content|/usr/local|root/opt/csw/share/info/gmp.info-1 include gar/category.mk -#ifeq ($(ISA), sparcv8plus) -# ARCHFLAGS_$(GARCOMPILER)_$(ISA) = -mcpu=v9 -mv8plus -#endif -#ifeq ($(ISA), sparcv8plus+vis) -# ARCHFLAGS_$(GARCOMPILER)_$(ISA) = -mcpu=ultrasparc -mvis -#endif - +post-merge: + ginstall $(FILEDIR)/gmp.h $(PKGROOT)$(includedir)/gmp.h + @$(MAKECOOKIE) Added: csw/mgar/pkg/libgmp/trunk/files/gmp.h =================================================================== --- csw/mgar/pkg/libgmp/trunk/files/gmp.h (rev 0) +++ csw/mgar/pkg/libgmp/trunk/files/gmp.h 2011-08-06 09:36:08 UTC (rev 15279) @@ -0,0 +1,6 @@ +/* Allow 32 and 64 bit headers to coexist */ +#if defined __amd64 || defined __x86_64 || defined __sparcv9 +#include "gmp-64.h" +#else +#include "gmp-32.h" +#endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aigoshin at users.sourceforge.net Sat Aug 6 12:14:21 2011 From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net) Date: Sat, 06 Aug 2011 10:14:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[15280] csw/mgar/pkg/nginx/trunk/Makefile Message-ID: Revision: 15280 http://gar.svn.sourceforge.net/gar/?rev=15280&view=rev Author: aigoshin Date: 2011-08-06 10:14:21 +0000 (Sat, 06 Aug 2011) Log Message: ----------- nginx: release 20110806 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2011-08-06 09:36:08 UTC (rev 15279) +++ csw/mgar/pkg/nginx/trunk/Makefile 2011-08-06 10:14:21 UTC (rev 15280) @@ -50,7 +50,7 @@ sysconfdir=/etc/opt/csw localstatedir=/var/opt/csw -CONFIGURE_ARGS += --with-debug +#CONFIGURE_ARGS += --with-debug CONFIGURE_ARGS += --with-cpu-opt=$(NGINXCPU) CONFIGURE_ARGS += --with-cc-opt="-I$(includedir) -I$(includedir)/openssl" CONFIGURE_ARGS += --with-ld-opt="$(LDFLAGS)" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Aug 6 16:26:19 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 06 Aug 2011 14:26:19 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[504] catalog_signatures/bin/signing_daemon Message-ID: Revision: 504 http://opencsw.svn.sourceforge.net/opencsw/?rev=504&view=rev Author: bdwalton Date: 2011-08-06 14:26:19 +0000 (Sat, 06 Aug 2011) Log Message: ----------- no longer rely on original PATH, set all elements manually Signed-off-by: Ben Walton Modified Paths: -------------- catalog_signatures/bin/signing_daemon Modified: catalog_signatures/bin/signing_daemon =================================================================== --- catalog_signatures/bin/signing_daemon 2011-07-23 02:36:04 UTC (rev 503) +++ catalog_signatures/bin/signing_daemon 2011-08-06 14:26:19 UTC (rev 504) @@ -1,7 +1,7 @@ #!/opt/csw/bin/bash unset DISPLAY -PATH=/opt/csw/gnu:/opt/csw/bin:$PATH +PATH=/opt/csw/gnu:/opt/csw/bin:/usr/xpg4/bin:/usr/bin #dynamically determine where we live... MYPATH="$(readlink -f $(dirname $0))" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Aug 6 16:26:40 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 06 Aug 2011 14:26:40 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[505] catalog_signatures/bin/http_gpg_daemon Message-ID: Revision: 505 http://opencsw.svn.sourceforge.net/opencsw/?rev=505&view=rev Author: bdwalton Date: 2011-08-06 14:26:40 +0000 (Sat, 06 Aug 2011) Log Message: ----------- drop current from list of valid catalog trees that we will sign Signed-off-by: Ben Walton Modified Paths: -------------- catalog_signatures/bin/http_gpg_daemon Modified: catalog_signatures/bin/http_gpg_daemon =================================================================== --- catalog_signatures/bin/http_gpg_daemon 2011-08-06 14:26:19 UTC (rev 504) +++ catalog_signatures/bin/http_gpg_daemon 2011-08-06 14:26:40 UTC (rev 505) @@ -5,7 +5,9 @@ require 'ostruct' VALID_PREFIXES = %w(opencsw opencsw-future) -VALID_TREES = %w(unstable current dublin) +# We should make this more dynamic so no code updates are required for +# future releases...for now, simply define valid targets. +VALID_TREES = %w(unstable dublin) VALID_ARCHES = %w(i386 sparc) VALID_RELEASES = %w(5.9 5.10 5.11) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Aug 6 16:26:59 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 06 Aug 2011 14:26:59 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[506] catalog_signatures/bin/reset_passphrase Message-ID: Revision: 506 http://opencsw.svn.sourceforge.net/opencsw/?rev=506&view=rev Author: bdwalton Date: 2011-08-06 14:26:59 +0000 (Sat, 06 Aug 2011) Log Message: ----------- set a manual PATH in reset_passphrase too Signed-off-by: Ben Walton Modified Paths: -------------- catalog_signatures/bin/reset_passphrase Modified: catalog_signatures/bin/reset_passphrase =================================================================== --- catalog_signatures/bin/reset_passphrase 2011-08-06 14:26:40 UTC (rev 505) +++ catalog_signatures/bin/reset_passphrase 2011-08-06 14:26:59 UTC (rev 506) @@ -1,5 +1,7 @@ #!/opt/csw/bin/bash +PATH=/opt/csw/gnu:/opt/csw/bin:/usr/xpg4/bin:/usr/bin + #dynamically determine where we live... MYPATH="$(readlink -f $(dirname $0))" APP_HOME="${MYPATH/bin/}" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bwalton at opencsw.org Sat Aug 6 16:27:11 2011 From: bwalton at opencsw.org (Ben Walton) Date: Sat, 06 Aug 2011 10:27:11 -0400 Subject: [csw-devel] SF.net SVN: opencsw:[503] catalog_signatures/bin/http_gpg_daemon In-Reply-To: References: Message-ID: <1312640789-sup-6825@pinkfloyd.chass.utoronto.ca> Excerpts from Maciej Blizi?ski's message of Sat Jul 23 06:41:28 -0400 2011: > > > > VALID_PREFIXES = %w(opencsw opencsw-future) > > -VALID_TREES = %w(unstable current) > > +VALID_TREES = %w(unstable current dublin) > > I suggest removing current from this list. In opencsw-future it is only a > symlink to dublin. Done. As my comment notes, I'm leaning toward making this dynamic (with limits on discovery) instead of using a preset array. Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From bwalton at opencsw.org Sat Aug 6 16:27:30 2011 From: bwalton at opencsw.org (Ben Walton) Date: Sat, 06 Aug 2011 10:27:30 -0400 Subject: [csw-devel] SF.net SVN: opencsw:[483] catalog_signatures/bin/signing_daemon In-Reply-To: References: Message-ID: <1312640838-sup-2259@pinkfloyd.chass.utoronto.ca> Excerpts from Maciej Blizi?ski's message of Sun Jul 24 17:26:35 -0400 2011: > > unset DISPLAY > > +PATH=/opt/csw/gnu:/opt/csw/bin:$PATH > > Perhaps we should ignore the original PATH as a security measure? Done. Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From dmichelsen at users.sourceforge.net Sun Aug 7 22:48:07 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 07 Aug 2011 20:48:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[15281] csw/mgar/pkg/libiconv/trunk Message-ID: Revision: 15281 http://gar.svn.sourceforge.net/gar/?rev=15281&view=rev Author: dmichelsen Date: 2011-08-07 20:48:06 +0000 (Sun, 07 Aug 2011) Log Message: ----------- libiconv: Update to 1.14, remove old unused stuff Modified Paths: -------------- csw/mgar/pkg/libiconv/trunk/Makefile csw/mgar/pkg/libiconv/trunk/checksums csw/mgar/pkg/libiconv/trunk/files/changelog.CSW Removed Paths: ------------- csw/mgar/pkg/libiconv/trunk/files/CSWiconv.README csw/mgar/pkg/libiconv/trunk/files/CSWlibiconv.gspec csw/mgar/pkg/libiconv/trunk/files/patch-configure-stdbool.diff csw/mgar/pkg/libiconv/trunk/files/patch-workaround-cc-bug-6655406.diff Modified: csw/mgar/pkg/libiconv/trunk/Makefile =================================================================== --- csw/mgar/pkg/libiconv/trunk/Makefile 2011-08-06 10:14:21 UTC (rev 15280) +++ csw/mgar/pkg/libiconv/trunk/Makefile 2011-08-07 20:48:06 UTC (rev 15281) @@ -4,7 +4,7 @@ # the upstream name and split off a devel pkg. # NAME = libiconv -VERSION = 1.13.1 +VERSION = 1.14 CATEGORIES = lib DESCRIPTION = GNU iconv library @@ -19,8 +19,7 @@ endef MASTER_SITES = $(GNU_MIRROR) -DISTFILES = $(NAME)-$(VERSION).tar.gz -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +DISTFILES = $(DISTNAME).tar.gz PACKAGES += CSWlibiconv2 CATALOGNAME_CSWlibiconv2 = libiconv2 @@ -57,23 +56,13 @@ # matter in any way as this library is only used for LD_PRELOAD and is never being # linked against during compile time. CHECKPKG_OVERRIDES_CSWlibiconv-utils += soname-not-part-of-filename|soname=libiconv.so.0|filename=preloadable_libiconv.so -CHECKPKG_OVERRIDES_CSWlibiconv-utils += shared-lib-pkgname-mismatch|sonames=libiconv.so.0|pkgname=CSWlibiconv-utils|expected=CSWlibiconv0 +CHECKPKG_OVERRIDES_CSWlibiconv-utils += shared-lib-pkgname-mismatch RUNTIME_DEP_PKGS_CSWlibiconv-utils += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWlibiconv-utils += CSWlibintl8 OBSOLETED_BY_CSWlibiconv-utils += CSWiconv -NOISAEXEC = 1 BUILD64 = 1 -# Optimize. -fast causes ./configure on Sparc to hang on the stdbool.h test. -# Patch the stdbool test away, stdbool is only available in C99 anyway. -# -# See the following posts for details -# - http://lists.opencsw.org/pipermail/maintainers/2009-July/003152.html -# - http://forums.sun.com/thread.jspa?threadID=5397065&tstart=0 -OPT_FLAGS_SOS = -fast -xnolibmopt -PATCHFILES += patch-configure-stdbool.diff - # 'gmake test' shows three errors of coredumping printf's # # ./check-translitfailure . TranslitFail1 ISO-8859-1 ASCII @@ -86,15 +75,12 @@ # This is due to bug #6550204 # http://sunsolve.sun.com/search/document.do?assetkey=1-1-6550204-1 # and can safely be ignored as it is a failure in the testsuite. -TEST_TARGET = check EXTRA_CPPFLAGS = -D_REENTRANT CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-rpath -MERGE_DIRS_isa-extra = $(libdir) - include gar/category.mk post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(NAME) Modified: csw/mgar/pkg/libiconv/trunk/checksums =================================================================== --- csw/mgar/pkg/libiconv/trunk/checksums 2011-08-06 10:14:21 UTC (rev 15280) +++ csw/mgar/pkg/libiconv/trunk/checksums 2011-08-07 20:48:06 UTC (rev 15281) @@ -1 +1 @@ -7ab33ebd26687c744a37264a330bbe9a libiconv-1.13.1.tar.gz +e34509b1623cec449dfeb73d7ce9c6c6 libiconv-1.14.tar.gz Deleted: csw/mgar/pkg/libiconv/trunk/files/CSWiconv.README =================================================================== --- csw/mgar/pkg/libiconv/trunk/files/CSWiconv.README 2011-08-06 10:14:21 UTC (rev 15280) +++ csw/mgar/pkg/libiconv/trunk/files/CSWiconv.README 2011-08-07 20:48:06 UTC (rev 15281) @@ -1,3 +0,0 @@ -Note: iconv is a transitional meta-package that pulls in libiconv and -libiconvdevel. Please consider switching to one or both of these pkgs -as iconv may be dropped in the future. Deleted: csw/mgar/pkg/libiconv/trunk/files/CSWlibiconv.gspec =================================================================== --- csw/mgar/pkg/libiconv/trunk/files/CSWlibiconv.gspec 2011-08-06 10:14:21 UTC (rev 15280) +++ csw/mgar/pkg/libiconv/trunk/files/CSWlibiconv.gspec 2011-08-07 20:48:06 UTC (rev 15281) @@ -1,4 +0,0 @@ -%var bitname libiconv -%var pkgname CSWlibiconv -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYRIGHT Modified: csw/mgar/pkg/libiconv/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/libiconv/trunk/files/changelog.CSW 2011-08-06 10:14:21 UTC (rev 15280) +++ csw/mgar/pkg/libiconv/trunk/files/changelog.CSW 2011-08-07 20:48:06 UTC (rev 15281) @@ -1,5 +1,13 @@ +libiconv (1.14,REV=2011.08.07) + + * Fixed #4726 + * Update to 1.14 + + -- Dagobert Michelsen Sun, 08 Aug 2011 22:39:02 +0200 + libiconv (1.13.1,REV=2009.07.31) + * Adopted and updated to 1.13.1. (Closes #2973, #3524, #3662) -- Sebastian Kayser Fri, 31 Jul 2009 11:07:44 +0200 Deleted: csw/mgar/pkg/libiconv/trunk/files/patch-configure-stdbool.diff =================================================================== --- csw/mgar/pkg/libiconv/trunk/files/patch-configure-stdbool.diff 2011-08-06 10:14:21 UTC (rev 15280) +++ csw/mgar/pkg/libiconv/trunk/files/patch-configure-stdbool.diff 2011-08-07 20:48:06 UTC (rev 15281) @@ -1,135 +0,0 @@ -diff --speed-large-files --minimal -Nru libiconv-1.13.orig/configure libiconv-1.13/configure ---- libiconv-1.13.orig/configure 2009-03-26 13:10:59.000000000 +0100 -+++ libiconv-1.13/configure 2009-07-18 15:01:23.206092991 +0200 -@@ -20233,121 +20233,6 @@ - REPLACE_GETLINE=0; - REPLACE_PERROR=0; - --{ $as_echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5 --$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; } --if test "${ac_cv_header_stdbool_h+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- -- #include -- #ifndef bool -- "error: bool is not defined" -- #endif -- #ifndef false -- "error: false is not defined" -- #endif -- #if false -- "error: false is not 0" -- #endif -- #ifndef true -- "error: true is not defined" -- #endif -- #if true != 1 -- "error: true is not 1" -- #endif -- #ifndef __bool_true_false_are_defined -- "error: __bool_true_false_are_defined is not defined" -- #endif -- -- struct s { _Bool s: 1; _Bool t; } s; -- -- char a[true == 1 ? 1 : -1]; -- char b[false == 0 ? 1 : -1]; -- char c[__bool_true_false_are_defined == 1 ? 1 : -1]; -- char d[(bool) 0.5 == true ? 1 : -1]; -- bool e = &s; -- char f[(_Bool) 0.0 == false ? 1 : -1]; -- char g[true]; -- char h[sizeof (_Bool)]; -- char i[sizeof s.t]; -- enum { j = false, k = true, l = false * true, m = true * 256 }; -- _Bool n[m]; -- char o[sizeof n == m * sizeof n[0] ? 1 : -1]; -- char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; -- #if defined __xlc__ || defined __GNUC__ -- /* Catch a bug in IBM AIX xlc compiler version 6.0.0.0 -- reported by James Lemley on 2005-10-05; see -- http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html -- This test is not quite right, since xlc is allowed to -- reject this program, as the initializer for xlcbug is -- not one of the forms that C requires support for. -- However, doing the test right would require a run-time -- test, and that would make cross-compilation harder. -- Let us hope that IBM fixes the xlc bug, and also adds -- support for this kind of constant expression. In the -- meantime, this test will reject xlc, which is OK, since -- our stdbool.h substitute should suffice. We also test -- this with GCC, where it should work, to detect more -- quickly whether someone messes up the test in the -- future. */ -- char digs[] = "0123456789"; -- int xlcbug = 1 / (&(digs + 5)[-2 + (bool) 1] == &digs[4] ? 1 : -1); -- #endif -- /* Catch a bug in an HP-UX C compiler. See -- http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html -- http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html -- */ -- _Bool q = true; -- _Bool *pq = &q; -- --int --main () --{ -- -- *pq |= q; -- *pq |= ! q; -- /* Refer to every declared value, to avoid compiler optimizations. */ -- return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l -- + !m + !n + !o + !p + !q + !pq); -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- ac_cv_header_stdbool_h=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_header_stdbool_h=no --fi -- --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --fi - { $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5 - $as_echo "$ac_cv_header_stdbool_h" >&6; } - { $as_echo "$as_me:$LINENO: checking for _Bool" >&5 -@@ -20525,7 +20525,7 @@ - - fi - -- if test $ac_cv_header_stdbool_h = yes; then -+ if test "$ac_cv_header_stdbool_h" = yes; then - - cat >>confdefs.h <<\_ACEOF - #define HAVE_STDBOOL_H 1 - Deleted: csw/mgar/pkg/libiconv/trunk/files/patch-workaround-cc-bug-6655406.diff =================================================================== --- csw/mgar/pkg/libiconv/trunk/files/patch-workaround-cc-bug-6655406.diff 2011-08-06 10:14:21 UTC (rev 15280) +++ csw/mgar/pkg/libiconv/trunk/files/patch-workaround-cc-bug-6655406.diff 2011-08-07 20:48:06 UTC (rev 15281) @@ -1,17 +0,0 @@ -diff --speed-large-files --minimal -Nru libiconv-1.12.orig/configure libiconv-1.12/configure ---- libiconv-1.12.orig/configure 2007-11-11 17:46:26.000000000 +0100 -+++ libiconv-1.12/configure 2008-02-29 12:28:46.258785000 +0100 -@@ -25733,13 +25733,6 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --/* Test preprocessor. */ -- #if ! (-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) -- error in preprocessor; -- #endif -- #if ! (18446744073709551615ULL <= -1ull) -- error in preprocessor; -- #endif - /* Test literals. */ - long long int ll = 9223372036854775807ll; - long long int nll = -9223372036854775807LL; 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 Aug 8 03:01:43 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 08 Aug 2011 01:01:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[15282] csw/mgar/pkg/libmpfr/branches/libmpfr1 Message-ID: Revision: 15282 http://gar.svn.sourceforge.net/gar/?rev=15282&view=rev Author: wahwah Date: 2011-08-08 01:01:43 +0000 (Mon, 08 Aug 2011) Log Message: ----------- pkg/libmpfr/branches/libmpfr1: Legacy version Modified Paths: -------------- csw/mgar/pkg/libmpfr/branches/libmpfr1/Makefile csw/mgar/pkg/libmpfr/branches/libmpfr1/checksums Modified: csw/mgar/pkg/libmpfr/branches/libmpfr1/Makefile =================================================================== --- csw/mgar/pkg/libmpfr/branches/libmpfr1/Makefile 2011-08-07 20:48:06 UTC (rev 15281) +++ csw/mgar/pkg/libmpfr/branches/libmpfr1/Makefile 2011-08-08 01:01:43 UTC (rev 15282) @@ -5,54 +5,75 @@ CATEGORIES = lib GARTYPE = v2 -DESCRIPTION = GNU Multiple Precision floating-point arithmetic library +DESCRIPTION = Legacy MPFR version define BLURB The MPFR library is a C library for multiple-precision floating-point computations with correct rounding. endef MASTER_SITES = http://www.mpfr.org/mpfr-$(VERSION)/ + +# For the license file. DISTFILES = $(NAME)-$(VERSION).tar.bz2 -PACKAGES = CSWlibmpfr -CATALOGNAME_CSWlibmpfr = libmpfr -SPKG_DESC_CSWlibmpfr = $(DESCRIPTION) -SPKG_SOURCEURL_CSWlibmpfr = http://www.mpfr.org/ +VENDOR_URL = http://www.mpfr.org/ -RUNTIME_DEP_PKGS_CSWlibmpfr = -#PATCHFILES = patches - BUILD64 = 1 STRIP_LIBTOOL = 1 CONFIGURE_ARGS = $(DIRPATHS) -# It's necessary to include architecture-specific headers from gmp. -EXTRA_INC += $(includedir)/$(ISA) +PACKAGES = CSWlibmpfr +CATALOGNAME_CSWlibmpfr = libmpfr +PKGFILES_CSWlibmpfr += $(call baseisadirs,$(libdir),libmpfr\.so\.1(\.\d+)*) +SPKG_DESC_CSWlibmpfr += $(DESCRIPTION), libmpfr.so.1 +RUNTIME_DEP_PKGS_CSWlibmpfr += CSWlibgmp -# With the default -xO3, there are failing unit tests. -OPT_FLAGS_SOS = -xO2 +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = -EXTRA_INC += $(includedir)/$(ISA) +# For merging purposes +EXTRA_BUILD_ISAS_sparc = sparcv8plus sparcv8plus+vis +EXTRA_BUILD_ISAS_i386 = pentium -PACKAGES = -PACKAGES += CSWlibmpfr1 -CATALOGNAME_CSWlibmpfr1 = libmpfr1 -PKGFILES_CSWlibmpfr1 += $(call baseisadirs,$(libdir),libmpfr\.so\.1(\.\d+)*) -SPKG_DESC_CSWlibmpfr1 += $(DESCRIPTION), libmpfr.so.1 -# This could be a problem, because there are binaries already linking against -# libmpfr.so.1 and libgmp.so.3 (not .so.10) at the same time. -RUNTIME_DEP_PKGS_CSWlibmpfr1 += CSWlibgmp10 +# It's a legacy package, there's no gain in moving files to libmpfr1. +CHECKPKG_OVERRIDES_CSWlibmpfr += shared-lib-pkgname-mismatch -PACKAGES += CSWlibmpfr-dev -SPKG_DESC_CSWlibmpfr-dev = MPFR development files -RUNTIME_DEP_PKGS_CSWlibmpfr-dev += CSWlibmpfr1 +# It's a legacy library, we aren't recompiling it. +CHECKPKG_OVERRIDES_CSWlibmpfr += bad-rpath-entry|/opt/csw/lib/sparcv8plus+vis|opt/csw/lib/sparcv8plus+vis/libmpfr.so.1.1.1 -# Obsoleting the CSWlibmpfr package -OBSOLETED_BY_CSWlibmpfr-dev = CSWlibmpfr -OBSOLETED_BY_CSWlibmpfr1 = CSWlibmpfr +include gar/category.mk -# It's only documentation. -CHECKPKG_OVERRIDES_CSWlibmpfr-dev += file-with-bad-content|/usr/local|root/opt/csw/share/info/mpfr.info +# Check the binary files into subversion. -include gar/category.mk +# A oneliner to extract the files. Make sure to run it on current10x too, +# because current9x may not have the amd64 files. +# oldlib=libmpfr.so.1.1.1 +# for i in $(isalist); do f=/opt/csw/lib/$i/$oldlib; \ +# if [ -r ${f} ]; then gcp -v $f \ +# ~/src/opencsw/pkg/libmpfr/branches/libmpfr1/files/$oldlib-$i; fi; done +OLDLIB_FILE = libmpfr.so.1.1.1 +OLDLIB_SONAME = libmpfr.so.1 + +post-merge: + ginstall -m 755 -d $(PKGROOT)$(libdir) + if [ $(GARCH) = i386 ]; then \ + ginstall -m 755 $(FILEDIR)/$(OLDLIB_FILE)-i386 $(PKGROOT)$(libdir)/$(OLDLIB_FILE); \ + gln -s $(OLDLIB_FILE) $(PKGROOT)$(libdir)/$(OLDLIB_SONAME); \ + for arch in pentium amd64 ; do \ + ginstall -m 755 -d $(PKGROOT)$(libdir)/$$arch; \ + ginstall -m 755 $(FILEDIR)/$(OLDLIB_FILE)-$$arch $(PKGROOT)$(libdir)/$$arch/$(OLDLIB_FILE); \ + gln -s $(OLDLIB_FILE) $(PKGROOT)$(libdir)/$$arch/$(OLDLIB_SONAME); \ + done; \ + elif [ $(GARCH) = sparc ]; then \ + ginstall -m 755 $(FILEDIR)/$(OLDLIB_FILE)-sparc $(PKGROOT)$(libdir)/$(OLDLIB_FILE); \ + gln -s $(OLDLIB_FILE) $(PKGROOT)$(libdir)/$(OLDLIB_SONAME); \ + for arch in sparcv8 sparcv8plus sparcv8plus+vis sparcv9 ; do \ + ginstall -m 755 -d $(PKGROOT)$(libdir)/$$arch; \ + ginstall -m 755 $(FILEDIR)/$(OLDLIB_FILE)-$$arch $(PKGROOT)$(libdir)/$$arch/$(OLDLIB_FILE); \ + gln -s $(OLDLIB_FILE) $(PKGROOT)$(libdir)/$$arch/$(OLDLIB_SONAME); \ + done; \ + fi + @$(MAKECOOKIE) Modified: csw/mgar/pkg/libmpfr/branches/libmpfr1/checksums =================================================================== --- csw/mgar/pkg/libmpfr/branches/libmpfr1/checksums 2011-08-07 20:48:06 UTC (rev 15281) +++ csw/mgar/pkg/libmpfr/branches/libmpfr1/checksums 2011-08-08 01:01:43 UTC (rev 15282) @@ -1 +1 @@ -bfbecb2eacb6d48432ead5cfc3f7390a mpfr-3.0.1.tar.bz2 +8352b619e04dcc73411a38b39dd855f6 mpfr-2.3.1.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Aug 8 09:54:09 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 08 Aug 2011 07:54:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[15283] csw/mgar/pkg/libmpfr/trunk/Makefile Message-ID: Revision: 15283 http://gar.svn.sourceforge.net/gar/?rev=15283&view=rev Author: wahwah Date: 2011-08-08 07:54:09 +0000 (Mon, 08 Aug 2011) Log Message: ----------- pkg/libmpfr/trunk: recompile against updated gmp.h, for better 32-bit / 64-bit support Modified Paths: -------------- csw/mgar/pkg/libmpfr/trunk/Makefile Modified: csw/mgar/pkg/libmpfr/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmpfr/trunk/Makefile 2011-08-08 01:01:43 UTC (rev 15282) +++ csw/mgar/pkg/libmpfr/trunk/Makefile 2011-08-08 07:54:09 UTC (rev 15283) @@ -29,14 +29,9 @@ CONFIGURE_ARGS = $(DIRPATHS) -# It's necessary to include architecture-specific headers from gmp. -EXTRA_INC += $(includedir)/$(ISA) - # With the default -xO3, there are failing unit tests. OPT_FLAGS_SOS = -xO2 -EXTRA_INC += $(includedir)/$(ISA) - PACKAGES = PACKAGES += CSWlibmpfr4 CATALOGNAME_CSWlibmpfr4 = libmpfr4 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 Aug 8 10:40:24 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 08 Aug 2011 08:40:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[15284] csw/mgar/pkg/libmpfr/trunk/Makefile Message-ID: Revision: 15284 http://gar.svn.sourceforge.net/gar/?rev=15284&view=rev Author: wahwah Date: 2011-08-08 08:40:24 +0000 (Mon, 08 Aug 2011) Log Message: ----------- pkg/libmpfr/trunk: CSWlibmpfr will not be built from this recipe any more. Modified Paths: -------------- csw/mgar/pkg/libmpfr/trunk/Makefile Modified: csw/mgar/pkg/libmpfr/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmpfr/trunk/Makefile 2011-08-08 07:54:09 UTC (rev 15283) +++ csw/mgar/pkg/libmpfr/trunk/Makefile 2011-08-08 08:40:24 UTC (rev 15284) @@ -16,11 +16,6 @@ BUILD_DEP_PKGS = CSWlibgmp-dev -PACKAGES = CSWlibmpfr -CATALOGNAME_CSWlibmpfr = libmpfr -SPKG_DESC_CSWlibmpfr = $(DESCRIPTION) -SPKG_SOURCEURL_CSWlibmpfr = http://www.mpfr.org/ - RUNTIME_DEP_PKGS_CSWlibmpfr = #PATCHFILES = patches @@ -43,9 +38,6 @@ SPKG_DESC_CSWlibmpfr-dev = MPFR development files RUNTIME_DEP_PKGS_CSWlibmpfr-dev += CSWlibmpfr4 -# Obsoleting the CSWlibmpfr package -OBSOLETED_BY_CSWlibmpfr-dev = CSWlibmpfr - # It's only documentation. CHECKPKG_OVERRIDES_CSWlibmpfr-dev += file-with-bad-content|/usr/local|root/opt/csw/share/info/mpfr.info CHECKPKG_OVERRIDES_CSWlibmpfr-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/mpfr/FAQ.html This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at opencsw.org Mon Aug 8 16:37:40 2011 From: bonivart at opencsw.org (Peter Bonivart) Date: Mon, 8 Aug 2011 16:37:40 +0200 Subject: [csw-devel] SF.net SVN: gar:[15281] csw/mgar/pkg/libiconv/trunk In-Reply-To: References: Message-ID: On Sun, Aug 7, 2011 at 10:48 PM, wrote: > Revision: 15281 > ? ? ? ? ?http://gar.svn.sourceforge.net/gar/?rev=15281&view=rev > Author: ? dmichelsen > Date: ? ? 2011-08-07 20:48:06 +0000 (Sun, 07 Aug 2011) > > Log Message: > ----------- > libiconv: Update to 1.14, remove old unused stuff I think you somehow introduced a cyclic dependency: $ chkcat -e /var/opt/csw/pkgutil/catalog.mirror.opencsw.org_opencsw-future_unstable_i386_5.10 ERROR! Cyclic dependency detected in package CSWiconv. ERROR! Cyclic dependency detected in package CSWlibiconv-utils. ERROR! Cyclic dependency detected in package CSWlibintl8. CSWiconv needs CSWlibiconv-utils which needs CSWlibintl8 which needs CSWiconv: $ ./pkgutil --deptree=1 CSWiconv CSWiconv - CSWlibiconv-utils ... $ ./pkgutil --deptree=1 CSWlibiconv-utils CSWlibiconv-utils - CSWlibintl8 ... $ ./pkgutil --deptree=1 CSWlibintl8 CSWlibintl8 - CSWiconv ... I haven't looked into it but maybe it's enough to drop the dep from CSWlibintl8 to CSWiconv? /peter From maciej at opencsw.org Mon Aug 8 16:53:54 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Mon, 8 Aug 2011 15:53:54 +0100 Subject: [csw-devel] SF.net SVN: gar:[15281] csw/mgar/pkg/libiconv/trunk In-Reply-To: References: Message-ID: This could be solved by introducing a spname-versioned shared lib package, e.g. libiconv1. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bonivart at opencsw.org Mon Aug 8 17:46:52 2011 From: bonivart at opencsw.org (Peter Bonivart) Date: Mon, 8 Aug 2011 17:46:52 +0200 Subject: [csw-devel] SF.net SVN: gar:[15281] csw/mgar/pkg/libiconv/trunk In-Reply-To: References: Message-ID: 2011/8/8 Maciej Blizi?ski : > This could be solved by introducing a spname-versioned shared lib package, > e.g. libiconv1. How do we keep this from entering our public catalogs? I believe chkcat is run but probably with the --nocyclic to increase speed? It's one thing that this happens in unstable which is not intended for general consumption but it can not be propagated to current which most use. I think it's important to run automated checks where we can implement them so we don't rely only on users to file a bug. /peter From maciej at opencsw.org Mon Aug 8 19:14:26 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Mon, 8 Aug 2011 18:14:26 +0100 Subject: [csw-devel] SF.net SVN: gar:[15281] csw/mgar/pkg/libiconv/trunk In-Reply-To: References: Message-ID: 2011/8/8 Peter Bonivart : > 2011/8/8 Maciej Blizi?ski : >> This could be solved by introducing a spname-versioned shared lib package, >> e.g. libiconv1. > > How do we keep this from entering our public catalogs? I believe > chkcat is run but probably with the --nocyclic to increase speed? Yes, the invocation includes --nocyclic. We could remove it and have chkcat include the cyclic dependency test. > It's one thing that this happens in unstable which is not intended for > general consumption but it can not be propagated to current which most > use. I think it's important to run automated checks where we can > implement them so we don't rely only on users to file a bug. Can you write a cron job which downloads catalogs, checks them and notifies (e.g. by email) the maintainers of problematic packages? The RESTful interface of the buildfarm db allows you to map from package md5 sums to maintainer emails. See the other email on maintainers@ for details how to get the URLs. Maciej From wahwah at users.sourceforge.net Mon Aug 8 21:44:56 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 08 Aug 2011 19:44:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[15285] csw/mgar/pkg/libiconv/trunk/Makefile Message-ID: Revision: 15285 http://gar.svn.sourceforge.net/gar/?rev=15285&view=rev Author: wahwah Date: 2011-08-08 19:44:55 +0000 (Mon, 08 Aug 2011) Log Message: ----------- pkg/libiconv/trunk: Fixing a dependency cycle Modified Paths: -------------- csw/mgar/pkg/libiconv/trunk/Makefile Modified: csw/mgar/pkg/libiconv/trunk/Makefile =================================================================== --- csw/mgar/pkg/libiconv/trunk/Makefile 2011-08-08 08:40:24 UTC (rev 15284) +++ csw/mgar/pkg/libiconv/trunk/Makefile 2011-08-08 19:44:55 UTC (rev 15285) @@ -59,8 +59,16 @@ CHECKPKG_OVERRIDES_CSWlibiconv-utils += shared-lib-pkgname-mismatch RUNTIME_DEP_PKGS_CSWlibiconv-utils += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWlibiconv-utils += CSWlibintl8 -OBSOLETED_BY_CSWlibiconv-utils += CSWiconv +# Removing this dependency to break a dependency cycle. +# See: +# - http://lists.opencsw.org/pipermail/devel/2011-August/020098.html +# +# "CSWiconv needs CSWlibiconv-utils which needs CSWlibintl8 which needs +# CSWiconv" +# +# OBSOLETED_BY_CSWlibiconv-utils += CSWiconv + BUILD64 = 1 # 'gmake test' shows three errors of coredumping printf's This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Mon Aug 8 22:26:30 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Mon, 8 Aug 2011 21:26:30 +0100 Subject: [csw-devel] SF.net SVN: gar:[15281] csw/mgar/pkg/libiconv/trunk In-Reply-To: References: Message-ID: I removed the dependency from libiconv_utils to libiconv, I think that it should unbreak unstable. Maciej From bonivart at opencsw.org Mon Aug 8 23:15:56 2011 From: bonivart at opencsw.org (Peter Bonivart) Date: Mon, 8 Aug 2011 23:15:56 +0200 Subject: [csw-devel] SF.net SVN: gar:[15281] csw/mgar/pkg/libiconv/trunk In-Reply-To: References: Message-ID: 2011/8/8 Maciej Blizi?ski : > I removed the dependency from libiconv_utils to libiconv, I think that > it should unbreak unstable. Cool, I have scripts running every morning checking all catalogs so we'll see tomorrow. /peter From wahwah at users.sourceforge.net Tue Aug 9 02:45:13 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 09 Aug 2011 00:45:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[15286] csw/mgar/pkg/lang-python/python-graph/trunk Message-ID: Revision: 15286 http://gar.svn.sourceforge.net/gar/?rev=15286&view=rev Author: wahwah Date: 2011-08-09 00:45:13 +0000 (Tue, 09 Aug 2011) Log Message: ----------- pkg/lang-python/python-graph/trunk: upgrade to 1.8.0 Modified Paths: -------------- csw/mgar/pkg/lang-python/python-graph/trunk/Makefile csw/mgar/pkg/lang-python/python-graph/trunk/checksums Modified: csw/mgar/pkg/lang-python/python-graph/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python-graph/trunk/Makefile 2011-08-08 19:44:55 UTC (rev 15285) +++ csw/mgar/pkg/lang-python/python-graph/trunk/Makefile 2011-08-09 00:45:13 UTC (rev 15286) @@ -3,7 +3,7 @@ # $Id$ NAME = python-graph -VERSION = 1.7.0 +VERSION = 1.8.0 CATEGORIES = python DESCRIPTION = A library for working with graphs in Python define BLURB @@ -11,14 +11,13 @@ SPKG_SOURCEURL = http://pypi.python.org/pypi/python-graph MASTER_SITES = $(GOOGLE_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.bz2 -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 PACKAGES = CSWpy-graph CATALOGNAME_CSWpy-graph = py_graph BUILD_SCRIPTS = -# INSTALL_SCRIPTS = python-graph TEST_SCRIPTS = BUILD_SCRIPTS ?= $(WORKSRC)/core/setup.py INSTALL_SCRIPTS ?= $(WORKSRC)/core/setup.py +LICENSE = COPYING ARCHALL_CSWpy-graph = 1 Modified: csw/mgar/pkg/lang-python/python-graph/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/python-graph/trunk/checksums 2011-08-08 19:44:55 UTC (rev 15285) +++ csw/mgar/pkg/lang-python/python-graph/trunk/checksums 2011-08-09 00:45:13 UTC (rev 15286) @@ -1 +1 @@ -6268f6942e68c80cd2d5de6276cf4d07 python-graph-1.7.0.tar.bz2 +8c5fbf993244c39ce42506425b5f30ac python-graph-1.8.0.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Aug 9 09:55:31 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 09 Aug 2011 07:55:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[15287] csw/mgar/pkg Message-ID: Revision: 15287 http://gar.svn.sourceforge.net/gar/?rev=15287&view=rev Author: wahwah Date: 2011-08-09 07:55:31 +0000 (Tue, 09 Aug 2011) Log Message: ----------- pkg/mpc/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/mpc/ csw/mgar/pkg/mpc/Makefile csw/mgar/pkg/mpc/branches/ csw/mgar/pkg/mpc/tags/ csw/mgar/pkg/mpc/trunk/ csw/mgar/pkg/mpc/trunk/Makefile csw/mgar/pkg/mpc/trunk/checksums csw/mgar/pkg/mpc/trunk/files/ Copied: csw/mgar/pkg/mpc/Makefile (from rev 14839, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/mpc/Makefile (rev 0) +++ csw/mgar/pkg/mpc/Makefile 2011-08-09 07:55:31 UTC (rev 15287) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/mpc/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/mpc/trunk/Makefile =================================================================== --- csw/mgar/pkg/mpc/trunk/Makefile (rev 0) +++ csw/mgar/pkg/mpc/trunk/Makefile 2011-08-09 07:55:31 UTC (rev 15287) @@ -0,0 +1,21 @@ +# $Id$ + +NAME = mpc +VERSION = 0.9 +GARTYPE = v2 +CATEGORIES = lib + +DESCRIPTION = C library for the arithmetic of complex numbers with arbitrarily high precision +define BLURB +endef + +MASTER_SITES = http://www.multiprecision.org/mpc/download/ +DISTFILES = $(DISTNAME).tar.gz + +STRIP_LIBTOOL = 1 +BUILD64 = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Property changes on: csw/mgar/pkg/mpc/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/mpc/trunk/checksums =================================================================== --- csw/mgar/pkg/mpc/trunk/checksums (rev 0) +++ csw/mgar/pkg/mpc/trunk/checksums 2011-08-09 07:55:31 UTC (rev 15287) @@ -0,0 +1 @@ +0d6acab8d214bd7d1fbbc593e83dd00d mpc-0.9.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Aug 9 10:32:29 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 09 Aug 2011 08:32:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[15288] csw/mgar/pkg/mpc/trunk/Makefile Message-ID: Revision: 15288 http://gar.svn.sourceforge.net/gar/?rev=15288&view=rev Author: wahwah Date: 2011-08-09 08:32:29 +0000 (Tue, 09 Aug 2011) Log Message: ----------- pkg/mpc/trunk: package split Modified Paths: -------------- csw/mgar/pkg/mpc/trunk/Makefile Modified: csw/mgar/pkg/mpc/trunk/Makefile =================================================================== --- csw/mgar/pkg/mpc/trunk/Makefile 2011-08-09 07:55:31 UTC (rev 15287) +++ csw/mgar/pkg/mpc/trunk/Makefile 2011-08-09 08:32:29 UTC (rev 15288) @@ -17,5 +17,22 @@ CONFIGURE_ARGS = $(DIRPATHS) +LICENSE = COPYING.LIB + +PACKAGES = +PACKAGES += CSWlibmpc2 +CATALOGNAME_CSWlibmpc2 = libmpc2 +PKGFILES_CSWlibmpc2 += $(call baseisadirs,$(libdir),libmpc\.so\.2(\.\d+)*) +SPKG_DESC_CSWlibmpc2 += $(DESCRIPTION), libmpc.so.2 +RUNTIME_DEP_PKGS_CSWlibmpc2 += CSWlibmpfr4 +RUNTIME_DEP_PKGS_CSWlibmpc2 += CSWlibgmp10 + +PACKAGES += CSWlibmpc-dev +SPKG_DESC_CSWlibmpc-dev = $(DESCRIPTION), developoment files +RUNTIME_DEP_PKGS_CSWlibmpc-dev = CSWlibmpc2 + +# Documentation is OK to have /usr/local references +CHECKPKG_OVERRIDES_CSWlibmpc-dev += file-with-bad-content|/usr/local|root/opt/csw/share/info/mpc.info + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From opk at users.sourceforge.net Tue Aug 9 17:01:29 2011 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Tue, 09 Aug 2011 15:01:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[15289] csw/mgar/pkg Message-ID: Revision: 15289 http://gar.svn.sourceforge.net/gar/?rev=15289&view=rev Author: opk Date: 2011-08-09 15:01:28 +0000 (Tue, 09 Aug 2011) Log Message: ----------- initial packaging of guilt Added Paths: ----------- csw/mgar/pkg/guilt/ csw/mgar/pkg/guilt/Makefile csw/mgar/pkg/guilt/branches/ csw/mgar/pkg/guilt/tags/ csw/mgar/pkg/guilt/trunk/ csw/mgar/pkg/guilt/trunk/Makefile csw/mgar/pkg/guilt/trunk/checksums csw/mgar/pkg/guilt/trunk/files/ csw/mgar/pkg/guilt/trunk/files/0001-use-bash-for-scripts.patch csw/mgar/pkg/guilt/trunk/files/0002-don-t-rebuild-man-pages.patch Copied: csw/mgar/pkg/guilt/Makefile (from rev 15272, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/guilt/Makefile (rev 0) +++ csw/mgar/pkg/guilt/Makefile 2011-08-09 15:01:28 UTC (rev 15289) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/guilt/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/guilt/trunk/Makefile =================================================================== --- csw/mgar/pkg/guilt/trunk/Makefile (rev 0) +++ csw/mgar/pkg/guilt/trunk/Makefile 2011-08-09 15:01:28 UTC (rev 15289) @@ -0,0 +1,31 @@ +NAME = guilt +VERSION = 0.35 +CATEGORIES = utils + +DESCRIPTION = quilt on top of git +define BLURB + Guilt (Git Quilt) adds functionality similar to quilt, Mercurial + Queues or Stacked git to git. the main distinguishing feature from + other quilt-like porcelains is the format of the patches directory. + All information is stored as plain text - a series file and the + patches (one per file). This easily lends itself to versioning the + patches using git or whatever other SCM. +endef + +MASTER_SITES = http://www.kernel.org/pub/linux/kernel/people/jsipek/guilt/ +DISTFILES = $(DISTNAME).tar.bz2 +UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom +PATCHFILES += 0001-use-bash-for-scripts.patch 0002-don-t-rebuild-man-pages.patch + +LICENSE = COPYING +ARCHALL = 1 + +include gar/category.mk + +install-custom: + $(INSTALL_ENV) gmake -C $(WORKSRC) INSTALL=ginstall PREFIX=/opt/csw install install-doc Property changes on: csw/mgar/pkg/guilt/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/guilt/trunk/checksums =================================================================== --- csw/mgar/pkg/guilt/trunk/checksums (rev 0) +++ csw/mgar/pkg/guilt/trunk/checksums 2011-08-09 15:01:28 UTC (rev 15289) @@ -0,0 +1 @@ +974e863ceba36980a6b5429eb9708703 guilt-0.35.tar.bz2 Added: csw/mgar/pkg/guilt/trunk/files/0001-use-bash-for-scripts.patch =================================================================== --- csw/mgar/pkg/guilt/trunk/files/0001-use-bash-for-scripts.patch (rev 0) +++ csw/mgar/pkg/guilt/trunk/files/0001-use-bash-for-scripts.patch 2011-08-09 15:01:28 UTC (rev 15289) @@ -0,0 +1,22 @@ +From 13f7765ede23c6f4bc201d36ae80a31f9f52b57c Mon Sep 17 00:00:00 2001 +From: Oliver Kiddle +Date: Tue, 9 Aug 2011 16:54:14 +0200 +Subject: [PATCH 2/3] use bash for scripts + +--- + guilt | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/guilt b/guilt +index d1e17d4..07fc4fd 100755 +--- a/guilt ++++ b/guilt +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + # + # Copyright (c) Josef "Jeff" Sipek, 2006-2011 + # +-- +1.7.6 + Added: csw/mgar/pkg/guilt/trunk/files/0002-don-t-rebuild-man-pages.patch =================================================================== --- csw/mgar/pkg/guilt/trunk/files/0002-don-t-rebuild-man-pages.patch (rev 0) +++ csw/mgar/pkg/guilt/trunk/files/0002-don-t-rebuild-man-pages.patch 2011-08-09 15:01:28 UTC (rev 15289) @@ -0,0 +1,25 @@ +From 83c1dd03e66ca9a9cc2d178ce815283e846694cb Mon Sep 17 00:00:00 2001 +From: Oliver Kiddle +Date: Tue, 9 Aug 2011 16:54:41 +0200 +Subject: [PATCH 3/3] don't rebuild man pages + +--- + Documentation/Makefile | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Documentation/Makefile b/Documentation/Makefile +index 9fc1165..49ec4fa 100644 +--- a/Documentation/Makefile ++++ b/Documentation/Makefile +@@ -32,7 +32,7 @@ man: man1 man7 + man1: $(DOC_MAN1) + man7: $(DOC_MAN7) + +-install: man ++install: + $(INSTALL) -d -m755 $(DESTDIR)$(man1dir) $(DESTDIR)$(man7dir) + $(INSTALL) -m644 $(DOC_MAN1) $(DESTDIR)$(man1dir) + $(INSTALL) -m644 $(DOC_MAN7) $(DESTDIR)$(man7dir) +-- +1.7.6 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From opk at users.sourceforge.net Tue Aug 9 17:09:55 2011 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Tue, 09 Aug 2011 15:09:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[15290] csw/mgar/pkg/guilt/trunk/Makefile Message-ID: Revision: 15290 http://gar.svn.sourceforge.net/gar/?rev=15290&view=rev Author: opk Date: 2011-08-09 15:09:55 +0000 (Tue, 09 Aug 2011) Log Message: ----------- fix issue noted by checkpkg Modified Paths: -------------- csw/mgar/pkg/guilt/trunk/Makefile Modified: csw/mgar/pkg/guilt/trunk/Makefile =================================================================== --- csw/mgar/pkg/guilt/trunk/Makefile 2011-08-09 15:01:28 UTC (rev 15289) +++ csw/mgar/pkg/guilt/trunk/Makefile 2011-08-09 15:09:55 UTC (rev 15290) @@ -2,7 +2,7 @@ VERSION = 0.35 CATEGORIES = utils -DESCRIPTION = quilt on top of git +DESCRIPTION = Manipulate quilt like patches on top of git define BLURB Guilt (Git Quilt) adds functionality similar to quilt, Mercurial Queues or Stacked git to git. the main distinguishing feature from This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From opk at users.sourceforge.net Tue Aug 9 17:55:48 2011 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Tue, 09 Aug 2011 15:55:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[15291] csw/mgar/pkg/lang-python/pytz/trunk Message-ID: Revision: 15291 http://gar.svn.sourceforge.net/gar/?rev=15291&view=rev Author: opk Date: 2011-08-09 15:55:47 +0000 (Tue, 09 Aug 2011) Log Message: ----------- upgrade pytz to 2011h Modified Paths: -------------- csw/mgar/pkg/lang-python/pytz/trunk/Makefile csw/mgar/pkg/lang-python/pytz/trunk/checksums Modified: csw/mgar/pkg/lang-python/pytz/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pytz/trunk/Makefile 2011-08-09 15:09:55 UTC (rev 15290) +++ csw/mgar/pkg/lang-python/pytz/trunk/Makefile 2011-08-09 15:55:47 UTC (rev 15291) @@ -1,6 +1,6 @@ # $Id$ NAME = pytz -VERSION = 2010l +VERSION = 2011h CATEGORIES = python DESCRIPTION = Pytz brings the Olson timezone database into Python. Modified: csw/mgar/pkg/lang-python/pytz/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/pytz/trunk/checksums 2011-08-09 15:09:55 UTC (rev 15290) +++ csw/mgar/pkg/lang-python/pytz/trunk/checksums 2011-08-09 15:55:47 UTC (rev 15291) @@ -1 +1 @@ -8ea38ffd627f2169b597442928ea5967 pytz-2010l.tar.bz2 +8ae163533975070ed864b8d639bf096e pytz-2011h.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Tue Aug 9 18:25:01 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Tue, 9 Aug 2011 17:25:01 +0100 Subject: [csw-devel] SF.net SVN: gar:[15289] csw/mgar/pkg In-Reply-To: References: Message-ID: 2011/8/9 : > +UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 This line can be probably removed. Try 'mgar check-upstream' with this line commented out. If it works, the line can be removed. From bonivart at opencsw.org Tue Aug 9 19:02:03 2011 From: bonivart at opencsw.org (Peter Bonivart) Date: Tue, 9 Aug 2011 19:02:03 +0200 Subject: [csw-devel] SF.net SVN: gar:[15289] csw/mgar/pkg In-Reply-To: References: Message-ID: 2011/8/9 Maciej Blizi?ski : > 2011/8/9 ?: >> +UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 > > This line can be probably removed. Try 'mgar check-upstream' with this > line commented out. If it works, the line can be removed. I didn't know about that target, maybe the template could mention it? # File name regex to get notifications about upstream software releases # NOTE: Use this only if the automatic regex creation # does not work for your package # UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz /peter From maciej at opencsw.org Tue Aug 9 23:25:10 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=) Date: Tue, 9 Aug 2011 22:25:10 +0100 Subject: [csw-devel] SF.net SVN: gar:[15289] csw/mgar/pkg In-Reply-To: References: Message-ID: Em 09/08/2011 18:02, "Peter Bonivart" escreveu: > > 2011/8/9 Maciej Blizi?ski : > > 2011/8/9 : > >> +UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 > > > > This line can be probably removed. Try 'mgar check-upstream' with this > > line commented out. If it works, the line can be removed. > > I didn't know about that target, maybe the template could mention it? That would be cool. I would personally put more examples in the template. It would make it easier for beginners. -------------- next part -------------- An HTML attachment was scrubbed... URL: From opk at users.sourceforge.net Wed Aug 10 01:35:36 2011 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Tue, 09 Aug 2011 23:35:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[15292] csw/mgar/pkg Message-ID: Revision: 15292 http://gar.svn.sourceforge.net/gar/?rev=15292&view=rev Author: opk Date: 2011-08-09 23:35:36 +0000 (Tue, 09 Aug 2011) Log Message: ----------- fix uwatch configuration for my packages Modified Paths: -------------- csw/mgar/pkg/guilt/trunk/Makefile csw/mgar/pkg/lang-python/nose/trunk/Makefile csw/mgar/pkg/lang-python/pygobject/trunk/Makefile csw/mgar/pkg/lang-python/pygtk/trunk/Makefile csw/mgar/pkg/lang-python/python-dateutil/trunk/Makefile csw/mgar/pkg/lang-python/pytz/trunk/Makefile csw/mgar/pkg/tkcvs/trunk/Makefile csw/mgar/pkg/zsh/trunk/Makefile Modified: csw/mgar/pkg/guilt/trunk/Makefile =================================================================== --- csw/mgar/pkg/guilt/trunk/Makefile 2011-08-09 15:55:47 UTC (rev 15291) +++ csw/mgar/pkg/guilt/trunk/Makefile 2011-08-09 23:35:36 UTC (rev 15292) @@ -14,7 +14,6 @@ MASTER_SITES = http://www.kernel.org/pub/linux/kernel/people/jsipek/guilt/ DISTFILES = $(DISTNAME).tar.bz2 -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 CONFIGURE_SCRIPTS = BUILD_SCRIPTS = Modified: csw/mgar/pkg/lang-python/nose/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/nose/trunk/Makefile 2011-08-09 15:55:47 UTC (rev 15291) +++ csw/mgar/pkg/lang-python/nose/trunk/Makefile 2011-08-09 23:35:36 UTC (rev 15292) @@ -17,6 +17,7 @@ GOOGLE_PROJECT = python-nose MASTER_SITES = $(GOOGLE_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.gz +UPSTREAM_MASTER_SITES = http://code.google.com/p/python-nose/downloads/list PACKAGES = CSWpy-nose CATALOGNAME = py_nose Modified: csw/mgar/pkg/lang-python/pygobject/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pygobject/trunk/Makefile 2011-08-09 15:55:47 UTC (rev 15291) +++ csw/mgar/pkg/lang-python/pygobject/trunk/Makefile 2011-08-09 23:35:36 UTC (rev 15292) @@ -39,7 +39,6 @@ EXTRA_MERGE_EXCLUDE_FILES += .*\.pyo .*\.pyc -UFILES_REGEX = (\d+(?:\.\d+)*).tar.bz2 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --without-ffi Modified: csw/mgar/pkg/lang-python/pygtk/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pygtk/trunk/Makefile 2011-08-09 15:55:47 UTC (rev 15291) +++ csw/mgar/pkg/lang-python/pygtk/trunk/Makefile 2011-08-09 23:35:36 UTC (rev 15292) @@ -26,10 +26,6 @@ SPKG_CLASSES = none cswpycompile RUNTIME_DEP_PKGS += CSWcswclassutils -# We define upstream file regex so we can be notifed of -# new upstream software release -UFILES_REGEX = (\d+(?:\.\d+)*).tar.bz2 - PKG_CONFIG_PATH = /opt/csw/lib/pkgconfig:/opt/csw/X11/lib/pkgconfig EXTRA_EXPORTS = PKG_CONFIG_PATH Modified: csw/mgar/pkg/lang-python/python-dateutil/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python-dateutil/trunk/Makefile 2011-08-09 15:55:47 UTC (rev 15291) +++ csw/mgar/pkg/lang-python/python-dateutil/trunk/Makefile 2011-08-09 23:35:36 UTC (rev 15292) @@ -20,6 +20,7 @@ EXTRA_MERGE_EXCLUDE_FILES += .*\.pyo .*\.pyc +UPSTREAM_MASTER_SITES = http://labix.org/python-dateutil/ UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz TEST_SCRIPTS = dateutil Modified: csw/mgar/pkg/lang-python/pytz/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pytz/trunk/Makefile 2011-08-09 15:55:47 UTC (rev 15291) +++ csw/mgar/pkg/lang-python/pytz/trunk/Makefile 2011-08-09 23:35:36 UTC (rev 15292) @@ -20,8 +20,6 @@ EXTRA_MERGE_EXCLUDE_FILES += .*\.pyo .*\.pyc -UFILES_REGEX = $(NAME)-(\d+[a-z]).tar.bz2 - LICENSE = LICENSE.txt ARCHALL = 1 Modified: csw/mgar/pkg/tkcvs/trunk/Makefile =================================================================== --- csw/mgar/pkg/tkcvs/trunk/Makefile 2011-08-09 15:55:47 UTC (rev 15291) +++ csw/mgar/pkg/tkcvs/trunk/Makefile 2011-08-09 23:35:36 UTC (rev 15292) @@ -14,13 +14,9 @@ DISTNAME = $(NAME)_$(subst .,_,$(VERSION)) DISTFILES = $(NAME)_$(subst .,_,$(VERSION)).tar.gz -# We define upstream file regex so we can be notifed of new upstream software release +UPSTREAM_MASTER_SITES = $(MASTER_SITES)/tkcvs.html UFILES_REGEX = $(NAME)_(\d+(?:_\d+)*).tar.gz -# If the url used to check for software update is different of MASTER_SITES, then -# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES -# UPSTREAM_MASTER_SITES = - CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = Modified: csw/mgar/pkg/zsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/zsh/trunk/Makefile 2011-08-09 15:55:47 UTC (rev 15291) +++ csw/mgar/pkg/zsh/trunk/Makefile 2011-08-09 23:35:36 UTC (rev 15292) @@ -22,12 +22,8 @@ BUILD_DEP_PKGS = CSWpcre SPKG_SOURCEURL = http://www.zsh.org +UPSTREAM_MASTER_SITES = http://www.zsh.org/pub/ -# We define upstream file regex so we can be notifed of new upstream software release -UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=4068 -UPSTREAM_USE_SF = 1 -UFILES_REGEX = (\d+(?:\.\d+)*) - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-maildir-support CONFIGURE_ARGS += --enable-fndir=$(sharedstatedir)/$(NAME)/functions This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Aug 10 01:53:56 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 09 Aug 2011 23:53:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[15293] csw/mgar/pkg/libgmp/trunk Message-ID: Revision: 15293 http://gar.svn.sourceforge.net/gar/?rev=15293&view=rev Author: wahwah Date: 2011-08-09 23:53:56 +0000 (Tue, 09 Aug 2011) Log Message: ----------- pkg/libgmp/trunk: enable the C++ extension, compile with GCC Modified Paths: -------------- csw/mgar/pkg/libgmp/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/libgmp/trunk/files/gmpxx.h Modified: csw/mgar/pkg/libgmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgmp/trunk/Makefile 2011-08-09 23:35:36 UTC (rev 15292) +++ csw/mgar/pkg/libgmp/trunk/Makefile 2011-08-09 23:53:56 UTC (rev 15293) @@ -26,8 +26,17 @@ BUILD64 = 1 -EXTRA_BUILD_ISAS_sparc = sparcv8plus sparcv8plus+vis -EXTRA_BUILD_ISAS_i386 = pentium +# Disabling sparcv8plus with GCC +# /var/tmp//ccPKyHnL.s: Assembler messages: +# /var/tmp//ccPKyHnL.s:11: Error: Architecture mismatch on "return". +# /var/tmp//ccPKyHnL.s:11: (Requires v9|v9a|v9b; requested architecture is +# v8.) +# EXTRA_BUILD_ISAS_sparc = sparcv8plus +# EXTRA_BUILD_ISAS_sparc += sparcv8plus+vis +# +# If you believe that a sparcv8plus build is necessary, feel free to develop +# this recipe so that these ISAs successfully build. +EXTRA_BUILD_ISAS_i386 = pentium_pro BUILD_DEP_PKGS = CSWgm4 @@ -43,34 +52,70 @@ ABI_sparcv8 = 32 ABI_sparcv9 = 64 ABI_i386 = 32 -ABI_pentium = 32 +ABI_pentium_pro = 32 ABI_amd64 = 64 MPN_i386 = "x86 generic" -MPN_pentium = "x86/pentium x86 generic" +MPN_pentium_pro = "x86/pentium_pro x86 generic" MPN_amd64 = "x86_64 generic" -CONFIGURE_ARGS = ABI=$(ABI_$(ISA)) MPN_PATH=$(MPN_$(ISA)) $(DIRPATHS) +CONFIGURE_ARGS = ABI=$(ABI_$(ISA)) +CONFIGURE_ARGS += MPN_PATH=$(MPN_$(ISA)) +CONFIGURE_ARGS += $(DIRPATHS) +CONFIGURE_ARGS += --enable-cxx -EXTRA_PAX_ARGS_32 = -s ",^\.$(includedir)/gmp.h$$,.$(includedir)/gmp-32.h,p" -EXTRA_PAX_ARGS_64 = -s ",^\.$(includedir)/gmp.h$$,.$(includedir)/gmp-64.h,p" +EXTRA_PAX_ARGS_32 = -s ",^\.$(includedir)/gmp.h$$,.$(includedir)/gmp-32.h,p" +EXTRA_PAX_ARGS_32 += -s ",^\.$(includedir)/gmpxx.h$$,.$(includedir)/gmpxx-32.h,p" +EXTRA_PAX_ARGS_64 = -s ",^\.$(includedir)/gmp.h$$,.$(includedir)/gmp-64.h,p" +EXTRA_PAX_ARGS_64 += -s ",^\.$(includedir)/gmpxx.h$$,.$(includedir)/gmpxx-64.h,p" EXTRA_PAX_ARGS = $(EXTRA_PAX_ARGS_$(MEMORYMODEL)) PACKAGES += CSWlibgmp10 CATALOGNAME_CSWlibgmp10 = libgmp10 SPKG_DESC_CSWlibgmp10 = GNU Multiple Precision Arithmetic Library, libgmp.so.10 PKGFILES_CSWlibgmp10 = $(call baseisadirs,$(libdir),libgmp\.so\.10(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlibgmp10 += CSWgcc4corert +PACKAGES += CSWlibgmpxx4 +CATALOGNAME_CSWlibgmpxx4 = libgmpxx4 +PKGFILES_CSWlibgmpxx4 += $(call baseisadirs,$(libdir),libgmpxx\.so\.4\.2\.2) +PKGFILES_CSWlibgmpxx4 += $(call baseisadirs,$(libdir),libgmpxx\.so\.4(\.\d+)*) +SPKG_DESC_CSWlibgmpxx4 += Development Files for libgmp, libgmpxx.so.4 +RUNTIME_DEP_PKGS_CSWlibgmpxx4 += CSWlibgmp10 +RUNTIME_DEP_PKGS_CSWlibgmpxx4 += CSWgcc4g++rt +RUNTIME_DEP_PKGS_CSWlibgmpxx4 += CSWgcc4corert + PACKAGES += CSWlibgmp-dev CATALOGNAME_CSWlibgmp-dev = libgmp_dev SPKG_DESC_CSWlibgmp-dev = Development Files for libgmp # Catchall PKGFILES RUNTIME_DEP_PKGS_CSWlibgmp-dev = CSWlibgmp10 +RUNTIME_DEP_PKGS_CSWlibgmp-dev += CSWlibgmpxx4 # It's only an .info file. CHECKPKG_OVERRIDES_CSWlibgmp-dev += file-with-bad-content|/usr/local|root/opt/csw/share/info/gmp.info-1 +# To work around a problem with __attribute__((const)) being in the +# C compiler, but not the C++ compiler in Solaris Studio. +# http://gmplib.org/list-archives/gmp-discuss/2009-January/003518.html +# EXTRA_CXXFLAGS = -D__GMP_NO_ATTRIBUTE_CONST_PURE + +# We cannot compile libgmp with Solaris Studio, because we need to build the +# C++ bindings, which will be used by gcc later on. +GARCOMPILER = GNU + include gar/category.mk +# Undefined symbol __sync_fetch_and_add_4 +# http://www.mail-archive.com/maintainers at lists.opencsw.org/msg06095.html +# http://opencsw.wikidot.com/porting-faq#toc6 +ifeq ($(ISA),sparcv8) +OPT_FLAGS_GCC = +endif +ifeq ($(ISA),i386) +OPT_FLAGS_GCC = +endif + post-merge: ginstall $(FILEDIR)/gmp.h $(PKGROOT)$(includedir)/gmp.h + ginstall $(FILEDIR)/gmpxx.h $(PKGROOT)$(includedir)/gmpxx.h @$(MAKECOOKIE) Added: csw/mgar/pkg/libgmp/trunk/files/gmpxx.h =================================================================== --- csw/mgar/pkg/libgmp/trunk/files/gmpxx.h (rev 0) +++ csw/mgar/pkg/libgmp/trunk/files/gmpxx.h 2011-08-09 23:53:56 UTC (rev 15293) @@ -0,0 +1,6 @@ +/* Allow 32 and 64 bit headers to coexist */ +#if defined __amd64 || defined __x86_64 || defined __sparcv9 +#include "gmpxx-64.h" +#else +#include "gmpxx-32.h" +#endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Aug 10 03:48:55 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 10 Aug 2011 01:48:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[15294] csw/mgar/pkg Message-ID: Revision: 15294 http://gar.svn.sourceforge.net/gar/?rev=15294&view=rev Author: wahwah Date: 2011-08-10 01:48:55 +0000 (Wed, 10 Aug 2011) Log Message: ----------- pkg/llvm/trunk: At least part of it builds, but linking fails with missing symbols Added Paths: ----------- csw/mgar/pkg/llvm/ csw/mgar/pkg/llvm/Makefile csw/mgar/pkg/llvm/branches/ csw/mgar/pkg/llvm/tags/ csw/mgar/pkg/llvm/trunk/ csw/mgar/pkg/llvm/trunk/Makefile csw/mgar/pkg/llvm/trunk/checksums csw/mgar/pkg/llvm/trunk/files/ csw/mgar/pkg/llvm/trunk/files/0001-limits.h-used-for-MAX_PATH.patch Copied: csw/mgar/pkg/llvm/Makefile (from rev 14839, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/llvm/Makefile (rev 0) +++ csw/mgar/pkg/llvm/Makefile 2011-08-10 01:48:55 UTC (rev 15294) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/llvm/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/llvm/trunk/Makefile =================================================================== --- csw/mgar/pkg/llvm/trunk/Makefile (rev 0) +++ csw/mgar/pkg/llvm/trunk/Makefile 2011-08-10 01:48:55 UTC (rev 15294) @@ -0,0 +1,51 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = llvm +VERSION = 2.9 +GARTYPE = v2 +CATEGORIES = lib + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = http://llvm.org/releases/$(VERSION)/ +DISTFILES = $(DISTNAME).tgz + +# If the url used to check for software update is different of MASTER_SITES, then +# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES +# UPSTREAM_MASTER_SITES = + +GARCOMPILER = GNU + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --disable-optimized + +PATCHFILES += 0001-limits.h-used-for-MAX_PATH.patch + +ENABLE_OPTIMIZED = 1 +OPTIMIZE_OPTION = -O0 +EXTRA_CONFIGURE_EXPORTS = ENABLE_OPTIMIZED +EXTRA_CONFIGURE_EXPORTS += OPTIMIZE_OPTION +EXTRA_BUILD_EXPORTS = ENABLE_OPTIMIZED +EXTRA_BUILD_EXPORTS += OPTIMIZE_OPTION +VERBOSE = 1 +EXTRA_CONFIGURE_EXPORTS = VERBOSE +EXTRA_BUILD_EXPORTS = VERBOSE + +include gar/category.mk + +# ARCHFLAGS_GCC4_sparcv8 = -m32 + +# Undefined symbol __sync_fetch_and_add_4 +# http://www.mail-archive.com/maintainers at lists.opencsw.org/msg06095.html +# http://opencsw.wikidot.com/porting-faq#toc6 +# ifeq ($(ISA),sparcv8) +OPT_FLAGS_GCC = -O0 +# endif +# ifeq ($(ISA),i386) +# OPT_FLAGS_GCC = +# endif + Property changes on: csw/mgar/pkg/llvm/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/llvm/trunk/checksums =================================================================== --- csw/mgar/pkg/llvm/trunk/checksums (rev 0) +++ csw/mgar/pkg/llvm/trunk/checksums 2011-08-10 01:48:55 UTC (rev 15294) @@ -0,0 +1 @@ +793138412d2af2c7c7f54615f8943771 llvm-2.9.tgz Added: csw/mgar/pkg/llvm/trunk/files/0001-limits.h-used-for-MAX_PATH.patch =================================================================== --- csw/mgar/pkg/llvm/trunk/files/0001-limits.h-used-for-MAX_PATH.patch (rev 0) +++ csw/mgar/pkg/llvm/trunk/files/0001-limits.h-used-for-MAX_PATH.patch 2011-08-10 01:48:55 UTC (rev 15294) @@ -0,0 +1,24 @@ +From c9ec5b3cf09a448eb53cb19f57c9099998f2aa2d Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Wed, 10 Aug 2011 03:01:22 +0200 +Subject: [PATCH] limits.h used for MAX_PATH + +--- + lib/Support/Unix/PathV2.inc | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/lib/Support/Unix/PathV2.inc b/lib/Support/Unix/PathV2.inc +index 03ff283..6a0a3df 100644 +--- a/lib/Support/Unix/PathV2.inc ++++ b/lib/Support/Unix/PathV2.inc +@@ -42,6 +42,7 @@ + #if HAVE_STDIO_H + #include + #endif ++#include + + using namespace llvm; + +-- +1.7.6 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Aug 10 09:32:13 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 10 Aug 2011 07:32:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[15295] csw/mgar/pkg Message-ID: Revision: 15295 http://gar.svn.sourceforge.net/gar/?rev=15295&view=rev Author: wahwah Date: 2011-08-10 07:32:13 +0000 (Wed, 10 Aug 2011) Log Message: ----------- pkg/ppl/trunk: Initial commit, no idea whether it builds or not Added Paths: ----------- csw/mgar/pkg/ppl/ csw/mgar/pkg/ppl/Makefile csw/mgar/pkg/ppl/branches/ csw/mgar/pkg/ppl/tags/ csw/mgar/pkg/ppl/trunk/ csw/mgar/pkg/ppl/trunk/Makefile csw/mgar/pkg/ppl/trunk/checksums csw/mgar/pkg/ppl/trunk/files/ Copied: csw/mgar/pkg/ppl/Makefile (from rev 14839, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/ppl/Makefile (rev 0) +++ csw/mgar/pkg/ppl/Makefile 2011-08-10 07:32:13 UTC (rev 15295) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/ppl/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/ppl/trunk/Makefile =================================================================== --- csw/mgar/pkg/ppl/trunk/Makefile (rev 0) +++ csw/mgar/pkg/ppl/trunk/Makefile 2011-08-10 07:32:13 UTC (rev 15295) @@ -0,0 +1,20 @@ +# $Id$ +# +NAME = ppl +VERSION = 0.11.2 +GARTYPE = v2 +CATEGORIES = lib + +DESCRIPTION = Parma Polyhedra Library +define BLURB +endef + +MASTER_SITES = http://www.cs.unipr.it/ppl/Download/ftp/releases/$(VERSION)/ +DISTFILES = $(DISTNAME).tar.gz + +VENDOR_URL = http://www.cs.unipr.it/ppl/ + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Property changes on: csw/mgar/pkg/ppl/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/ppl/trunk/checksums =================================================================== --- csw/mgar/pkg/ppl/trunk/checksums (rev 0) +++ csw/mgar/pkg/ppl/trunk/checksums 2011-08-10 07:32:13 UTC (rev 15295) @@ -0,0 +1 @@ +ce014f153a28006009db207ca953a984 ppl-0.11.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Aug 10 09:52:31 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 10 Aug 2011 07:52:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[15296] csw/mgar/pkg/libgmp/trunk/Makefile Message-ID: Revision: 15296 http://gar.svn.sourceforge.net/gar/?rev=15296&view=rev Author: wahwah Date: 2011-08-10 07:52:31 +0000 (Wed, 10 Aug 2011) Log Message: ----------- pkg/libgmp/trunk: the -O0 flag is necessary to fix __sync_fetch_and_add_4 Modified Paths: -------------- csw/mgar/pkg/libgmp/trunk/Makefile Modified: csw/mgar/pkg/libgmp/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgmp/trunk/Makefile 2011-08-10 07:32:13 UTC (rev 15295) +++ csw/mgar/pkg/libgmp/trunk/Makefile 2011-08-10 07:52:31 UTC (rev 15296) @@ -109,10 +109,10 @@ # http://www.mail-archive.com/maintainers at lists.opencsw.org/msg06095.html # http://opencsw.wikidot.com/porting-faq#toc6 ifeq ($(ISA),sparcv8) -OPT_FLAGS_GCC = +OPT_FLAGS_GCC = -O0 endif ifeq ($(ISA),i386) -OPT_FLAGS_GCC = +OPT_FLAGS_GCC = -O0 endif post-merge: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Aug 10 10:30:47 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 10 Aug 2011 08:30:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[15297] csw/mgar/pkg/ppl/trunk/Makefile Message-ID: Revision: 15297 http://gar.svn.sourceforge.net/gar/?rev=15297&view=rev Author: wahwah Date: 2011-08-10 08:30:47 +0000 (Wed, 10 Aug 2011) Log Message: ----------- pkg/ppl/trunk: working around the __sync_fetch_and_add_4 issue Modified Paths: -------------- csw/mgar/pkg/ppl/trunk/Makefile Modified: csw/mgar/pkg/ppl/trunk/Makefile =================================================================== --- csw/mgar/pkg/ppl/trunk/Makefile 2011-08-10 07:52:31 UTC (rev 15296) +++ csw/mgar/pkg/ppl/trunk/Makefile 2011-08-10 08:30:47 UTC (rev 15297) @@ -9,12 +9,32 @@ define BLURB endef +BUILD_DEP_PKGS = CSWlibgmp-dev +BUILD_DEP_PKGS += CSWlibmpfr-dev +BUILD_DEP_PKGS += CSWlibmpc-dev +BUILD_DEP_PKGS += CSWgm4 + MASTER_SITES = http://www.cs.unipr.it/ppl/Download/ftp/releases/$(VERSION)/ DISTFILES = $(DISTNAME).tar.gz VENDOR_URL = http://www.cs.unipr.it/ppl/ +# C++ bindings require the consistency between GMP, PPL and GCC. +GARCOMPILER = GNU + +# Undefined symbol __sync_fetch_and_add_4 +# http://www.mail-archive.com/maintainers at lists.opencsw.org/msg06095.html +# http://opencsw.wikidot.com/porting-faq#toc6 +ifeq ($(ISA),sparcv8) +OPT_FLAGS_GCC = -O0 +endif +ifeq ($(ISA),i386) +OPT_FLAGS_GCC = -O0 +endif + CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk +# To help the configure script find GNU M4 +PATH := /opt/csw/gnu:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Aug 10 11:01:33 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 10 Aug 2011 09:01:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[15298] csw/mgar/pkg/ppl/trunk/Makefile Message-ID: Revision: 15298 http://gar.svn.sourceforge.net/gar/?rev=15298&view=rev Author: wahwah Date: 2011-08-10 09:01:33 +0000 (Wed, 10 Aug 2011) Log Message: ----------- pkg/ppl/trunk: 2 of 46 tests failed Modified Paths: -------------- csw/mgar/pkg/ppl/trunk/Makefile Modified: csw/mgar/pkg/ppl/trunk/Makefile =================================================================== --- csw/mgar/pkg/ppl/trunk/Makefile 2011-08-10 08:30:47 UTC (rev 15297) +++ csw/mgar/pkg/ppl/trunk/Makefile 2011-08-10 09:01:33 UTC (rev 15298) @@ -22,6 +22,8 @@ # C++ bindings require the consistency between GMP, PPL and GCC. GARCOMPILER = GNU +BUILD64 = 1 + # Undefined symbol __sync_fetch_and_add_4 # http://www.mail-archive.com/maintainers at lists.opencsw.org/msg06095.html # http://opencsw.wikidot.com/porting-faq#toc6 @@ -32,6 +34,12 @@ OPT_FLAGS_GCC = -O0 endif +# http://wiki.opencsw.org/porting-faq#toc13 +RUNTIME_DEP_PKGS = $(RUNTIME_DEP_PKGS_$(GAROSREL)) +RUNTIME_DEP_PKGS_5.9 = CSWlibgnugetopt +EXTRA_LDFLAGS = $(EXTRA_LDFLAGS_$(GAROSREL)) +EXTRA_LDFLAGS_5.9 = -lgnugetopt + CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Aug 10 15:16:38 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 10 Aug 2011 13:16:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[15299] csw/mgar/pkg/nicstat/trunk Message-ID: Revision: 15299 http://gar.svn.sourceforge.net/gar/?rev=15299&view=rev Author: bonivart Date: 2011-08-10 13:16:38 +0000 (Wed, 10 Aug 2011) Log Message: ----------- nicstat/trunk: update to 1.90 Modified Paths: -------------- csw/mgar/pkg/nicstat/trunk/Makefile csw/mgar/pkg/nicstat/trunk/checksums Modified: csw/mgar/pkg/nicstat/trunk/Makefile =================================================================== --- csw/mgar/pkg/nicstat/trunk/Makefile 2011-08-10 09:01:33 UTC (rev 15298) +++ csw/mgar/pkg/nicstat/trunk/Makefile 2011-08-10 13:16:38 UTC (rev 15299) @@ -1,22 +1,21 @@ NAME = nicstat -VERSION = 1.22 +VERSION = 1.90 CATEGORIES = net +WORKSRC = $(WORKDIR)/$(NAME)-src-$(VERSION) DESCRIPTION = Network monitoring tool define BLURB Network monitoring tool endef -MASTER_SITES = http://blogs.sun.com/roller/resources/timc/nicstat/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +MASTER_SITES = $(SF_MIRRORS) +SF_PROJ = $(NAME) +DISTFILES = $(NAME)-src-$(VERSION).tar.gz -SPKG_SOURCEURL = http://blogs.sun.com/timc/entry/nicstat_the_solaris_and_linux +VENDOR_URL = http://blogs.sun.com/timc/entry/nicstat_the_solaris_and_linux -LICENSE = LICENSE.txt +CHECKPKG_OVERRIDES_CSWnicstat += file-with-bad-content|/usr/local|root/opt/csw/share/doc/nicstat/README.txt -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_SCRIPTS = @@ -42,9 +41,10 @@ install-custom: @echo " ==> Install $(NAME) (custom)" @ginstall -d -m 755 $(DESTDIR)$(bindir) - @cp $(WORKSRC)/nicstat $(DESTDIR)$(bindir) + @ginstall -m 755 $(WORKSRC)/.nicstat* $(DESTDIR)$(bindir)/nicstat @ginstall -d -m 755 $(DESTDIR)$(mandir)/man1 - @cp $(WORKSRC)/nicstat.1 $(DESTDIR)$(mandir)/man1 + @ginstall -m 444 $(WORKSRC)/nicstat.1 $(DESTDIR)$(mandir)/man1 @ginstall -d -m 755 $(DESTDIR)$(docdir)/$(NAME) - @cp $(WORKSRC)/README.txt $(DESTDIR)$(docdir)/$(NAME) + @ginstall -m 444 $(WORKSRC)/README.txt $(WORKSRC)/ChangeLog.txt $(DESTDIR)$(docdir)/$(NAME) + @ginstall -m 444 $(WORKSRC)/LICENSE.txt $(DESTDIR)$(docdir)/$(NAME)/license @$(MAKECOOKIE) Modified: csw/mgar/pkg/nicstat/trunk/checksums =================================================================== --- csw/mgar/pkg/nicstat/trunk/checksums 2011-08-10 09:01:33 UTC (rev 15298) +++ csw/mgar/pkg/nicstat/trunk/checksums 2011-08-10 13:16:38 UTC (rev 15299) @@ -1 +1 @@ -198299a6a899c618fa97776374e43e1a nicstat-1.22.tar.gz +aebcc902fb5794c60d78b19b9e93752c nicstat-src-1.90.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Aug 10 15:37:26 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 10 Aug 2011 13:37:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[15300] csw/mgar/pkg/llvm/trunk Message-ID: Revision: 15300 http://gar.svn.sourceforge.net/gar/?rev=15300&view=rev Author: wahwah Date: 2011-08-10 13:37:26 +0000 (Wed, 10 Aug 2011) Log Message: ----------- pkg/llvm/trunk: Test runner fixes Modified Paths: -------------- csw/mgar/pkg/llvm/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/llvm/trunk/files/0002-OpenCSW-bash-for-tests.patch csw/mgar/pkg/llvm/trunk/files/0003-OpenCSW-bash-with-the-Python-test-runner.patch csw/mgar/pkg/llvm/trunk/files/0004-test-runner-adaptation-to-Solaris.patch Modified: csw/mgar/pkg/llvm/trunk/Makefile =================================================================== --- csw/mgar/pkg/llvm/trunk/Makefile 2011-08-10 13:16:38 UTC (rev 15299) +++ csw/mgar/pkg/llvm/trunk/Makefile 2011-08-10 13:37:26 UTC (rev 15300) @@ -22,21 +22,41 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-optimized +# ocaml causes a compilation failure +# http://lists.cs.uiuc.edu/pipermail/llvmbugs/2010-December/015967.html +# http://lists.cs.uiuc.edu/pipermail/llvmbugs/2010-December/015968.html +CONFIGURE_ARGS += --enable-bindings=none +# CONFIGURE_ARGS += --enable-libffi PATCHFILES += 0001-limits.h-used-for-MAX_PATH.patch +PATCHFILES += 0002-OpenCSW-bash-for-tests.patch +PATCHFILES += 0003-OpenCSW-bash-with-the-Python-test-runner.patch +PATCHFILES += 0004-test-runner-adaptation-to-Solaris.patch ENABLE_OPTIMIZED = 1 OPTIMIZE_OPTION = -O0 +SHELL = /opt/csw/bin/bash +CONFIG_SHELL = /opt/csw/bin/bash EXTRA_CONFIGURE_EXPORTS = ENABLE_OPTIMIZED EXTRA_CONFIGURE_EXPORTS += OPTIMIZE_OPTION +EXTRA_CONFIGURE_EXPORTS += CONFIG_SHELL EXTRA_BUILD_EXPORTS = ENABLE_OPTIMIZED EXTRA_BUILD_EXPORTS += OPTIMIZE_OPTION +EXTRA_TEST_EXPORTS = SHELL + +NM = /opt/csw/bin/gnm +EXTRA_CONFIGURE_EXPORTS += NM +EXTRA_BUILD_EXPORTS += NM + VERBOSE = 1 EXTRA_CONFIGURE_EXPORTS = VERBOSE EXTRA_BUILD_EXPORTS = VERBOSE include gar/category.mk +# To help the configure script find /opt/csw/gnu/nm +PATH := /opt/csw/gnu:/usr/xpg4/bin:$(PATH) + # ARCHFLAGS_GCC4_sparcv8 = -m32 # Undefined symbol __sync_fetch_and_add_4 Added: csw/mgar/pkg/llvm/trunk/files/0002-OpenCSW-bash-for-tests.patch =================================================================== --- csw/mgar/pkg/llvm/trunk/files/0002-OpenCSW-bash-for-tests.patch (rev 0) +++ csw/mgar/pkg/llvm/trunk/files/0002-OpenCSW-bash-for-tests.patch 2011-08-10 13:37:26 UTC (rev 15300) @@ -0,0 +1,22 @@ +From 0de11898c1205e814aec09a05fd74e657a4493ad Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Wed, 10 Aug 2011 11:40:18 +0200 +Subject: [PATCH] OpenCSW bash for tests + +--- + test/TestRunner.sh | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/test/TestRunner.sh b/test/TestRunner.sh +index ab50856..1686f72 100755 +--- a/test/TestRunner.sh ++++ b/test/TestRunner.sh +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/opt/csw/bin/bash + # Deprecated, use 'llvm-lit'. + + echo "warning: '$0' is deprecated, use 'llvm-lit' instead." +-- +1.7.6 + Added: csw/mgar/pkg/llvm/trunk/files/0003-OpenCSW-bash-with-the-Python-test-runner.patch =================================================================== --- csw/mgar/pkg/llvm/trunk/files/0003-OpenCSW-bash-with-the-Python-test-runner.patch (rev 0) +++ csw/mgar/pkg/llvm/trunk/files/0003-OpenCSW-bash-with-the-Python-test-runner.patch 2011-08-10 13:37:26 UTC (rev 15300) @@ -0,0 +1,25 @@ +From 3bc149078e3e003d1cb4285903df8c87ec7ea15c Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Wed, 10 Aug 2011 11:50:23 +0200 +Subject: [PATCH] OpenCSW bash with the Python test runner + +--- + utils/lit/lit/TestRunner.py | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/utils/lit/lit/TestRunner.py b/utils/lit/lit/TestRunner.py +index 80d0ba1..9b5ec43 100644 +--- a/utils/lit/lit/TestRunner.py ++++ b/utils/lit/lit/TestRunner.py +@@ -358,7 +358,7 @@ def executeScript(test, litConfig, tmpBase, commands, cwd): + if bashPath: + command = [bashPath, script] + else: +- command = ['/bin/sh', script] ++ command = ['/opt/csw/bin/bash', script] + if litConfig.useValgrind: + # FIXME: Running valgrind on sh is overkill. We probably could just + # run on clang with no real loss. +-- +1.7.6 + Added: csw/mgar/pkg/llvm/trunk/files/0004-test-runner-adaptation-to-Solaris.patch =================================================================== --- csw/mgar/pkg/llvm/trunk/files/0004-test-runner-adaptation-to-Solaris.patch (rev 0) +++ csw/mgar/pkg/llvm/trunk/files/0004-test-runner-adaptation-to-Solaris.patch 2011-08-10 13:37:26 UTC (rev 15300) @@ -0,0 +1,41 @@ +From 2f18958deeaf3be901798baea4d01dac8693e42e Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Wed, 10 Aug 2011 15:34:29 +0200 +Subject: [PATCH] test runner adaptation to Solaris + +--- + utils/lit/lit/LitConfig.py | 5 ++++- + utils/lit/lit/Util.py | 1 + + 2 files changed, 5 insertions(+), 1 deletions(-) + +diff --git a/utils/lit/lit/LitConfig.py b/utils/lit/lit/LitConfig.py +index 7ca1b9c..ad7d761 100644 +--- a/utils/lit/lit/LitConfig.py ++++ b/utils/lit/lit/LitConfig.py +@@ -74,7 +74,10 @@ class LitConfig: + self.bashPath = Util.which('bash', os.pathsep.join(self.path)) + if self.bashPath is None: + # Check some known paths. +- for path in ('/bin/bash', '/usr/bin/bash', '/usr/local/bin/bash'): ++ for path in ('/opt/csw/bin/bash', ++ '/bin/bash', ++ '/usr/bin/bash', ++ '/usr/local/bin/bash'): + if os.path.exists(path): + self.bashPath = path + break +diff --git a/utils/lit/lit/Util.py b/utils/lit/lit/Util.py +index 5635f50..1ac512c 100644 +--- a/utils/lit/lit/Util.py ++++ b/utils/lit/lit/Util.py +@@ -54,6 +54,7 @@ def which(command, paths = None): + + if paths is None: + paths = os.environ.get('PATH','') ++ paths = "/opt/csw/bin:" + paths + + # Check for absolute match first. + if os.path.exists(command): +-- +1.7.6 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at opencsw.org Wed Aug 10 17:03:48 2011 From: bonivart at opencsw.org (Peter Bonivart) Date: Wed, 10 Aug 2011 17:03:48 +0200 Subject: [csw-devel] SF.net SVN: gar:[15281] csw/mgar/pkg/libiconv/trunk In-Reply-To: References: Message-ID: On Mon, Aug 8, 2011 at 11:15 PM, Peter Bonivart wrote: > 2011/8/8 Maciej Blizi?ski : >> I removed the dependency from libiconv_utils to libiconv, I think that >> it should unbreak unstable. > > Cool, I have scripts running every morning checking all catalogs so > we'll see tomorrow. Today it seems OK again. /peter From bonivart at users.sourceforge.net Wed Aug 10 17:28:10 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 10 Aug 2011 15:28:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[15301] csw/mgar/pkg/nicstat/trunk/Makefile Message-ID: Revision: 15301 http://gar.svn.sourceforge.net/gar/?rev=15301&view=rev Author: bonivart Date: 2011-08-10 15:28:09 +0000 (Wed, 10 Aug 2011) Log Message: ----------- nicstat/trunk: add comment to override Modified Paths: -------------- csw/mgar/pkg/nicstat/trunk/Makefile Modified: csw/mgar/pkg/nicstat/trunk/Makefile =================================================================== --- csw/mgar/pkg/nicstat/trunk/Makefile 2011-08-10 13:37:26 UTC (rev 15300) +++ csw/mgar/pkg/nicstat/trunk/Makefile 2011-08-10 15:28:09 UTC (rev 15301) @@ -14,6 +14,7 @@ VENDOR_URL = http://blogs.sun.com/timc/entry/nicstat_the_solaris_and_linux +# Harmless build example not relevant to usage CHECKPKG_OVERRIDES_CSWnicstat += file-with-bad-content|/usr/local|root/opt/csw/share/doc/nicstat/README.txt CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From opk at users.sourceforge.net Wed Aug 10 17:49:18 2011 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Wed, 10 Aug 2011 15:49:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[15302] csw/mgar/pkg Message-ID: Revision: 15302 http://gar.svn.sourceforge.net/gar/?rev=15302&view=rev Author: opk Date: 2011-08-10 15:49:18 +0000 (Wed, 10 Aug 2011) Log Message: ----------- package new version of wiggle using gar Added Paths: ----------- csw/mgar/pkg/wiggle/ csw/mgar/pkg/wiggle/Makefile csw/mgar/pkg/wiggle/branches/ csw/mgar/pkg/wiggle/tags/ csw/mgar/pkg/wiggle/trunk/ csw/mgar/pkg/wiggle/trunk/Makefile csw/mgar/pkg/wiggle/trunk/checksums csw/mgar/pkg/wiggle/trunk/files/ csw/mgar/pkg/wiggle/trunk/files/0001-remove-gcc-options.patch csw/mgar/pkg/wiggle/trunk/files/0002-fix-for-building-with-solstudio.patch csw/mgar/pkg/wiggle/trunk/files/0003-fix-installation-target.patch csw/mgar/pkg/wiggle/trunk/files/0004-skip-time-in-test-script.patch Added: csw/mgar/pkg/wiggle/Makefile =================================================================== --- csw/mgar/pkg/wiggle/Makefile (rev 0) +++ csw/mgar/pkg/wiggle/Makefile 2011-08-10 15:49:18 UTC (rev 15302) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/wiggle/Makefile ___________________________________________________________________ Added: svn:keywords + URL Id Property changes on: csw/mgar/pkg/wiggle/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/wiggle/trunk/Makefile =================================================================== --- csw/mgar/pkg/wiggle/trunk/Makefile (rev 0) +++ csw/mgar/pkg/wiggle/trunk/Makefile 2011-08-10 15:49:18 UTC (rev 15302) @@ -0,0 +1,33 @@ +NAME = wiggle +VERSION = 0.8 +GARTYPE = v2 +CATEGORIES = utils + +DESCRIPTION = Apply conflicting patches +define BLURB + Wiggle is a program for applying patches that 'patch' cannot apply due + to conflicting changes in the original. + + Wiggle will always apply all changes in the patch to the original. If + it cannot find a way to cleanly apply a patch, it inserts it in the + original in a manner similar to 'merge', and reports an unresolvable + conflict. +endef + +BUILD_DEP_PKGS += CSWlibncurses-dev +RUNTIME_DEP_PKGS += CSWlibncursesw5 + +MASTER_SITES = http://neil.brown.name/wiggle/ +DISTFILES = $(DISTNAME).tar.gz + +CONFIGURE_SCRIPTS = +PATCHFILES += 0001-remove-gcc-options.patch \ + 0002-fix-for-building-with-solstudio.patch \ + 0003-fix-installation-target.patch \ + 0004-skip-time-in-test-script.patch +BUILD_ARGS = wiggle wiggle.man +TEST_TARGET = test + +include gar/category.mk + +CPPFLAGS := -I$(includedir)/ncursesw $(CPPFLAGS) Property changes on: csw/mgar/pkg/wiggle/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/wiggle/trunk/checksums =================================================================== --- csw/mgar/pkg/wiggle/trunk/checksums (rev 0) +++ csw/mgar/pkg/wiggle/trunk/checksums 2011-08-10 15:49:18 UTC (rev 15302) @@ -0,0 +1 @@ +17aae004f63791faa4ff1d0e7639131d wiggle-0.8.tar.gz Added: csw/mgar/pkg/wiggle/trunk/files/0001-remove-gcc-options.patch =================================================================== --- csw/mgar/pkg/wiggle/trunk/files/0001-remove-gcc-options.patch (rev 0) +++ csw/mgar/pkg/wiggle/trunk/files/0001-remove-gcc-options.patch 2011-08-10 15:49:18 UTC (rev 15302) @@ -0,0 +1,25 @@ +From 5a542bbaf284fa51c2c8f9a5f1e22cc2a0dccc8e Mon Sep 17 00:00:00 2001 +From: Oliver Kiddle +Date: Wed, 10 Aug 2011 16:07:03 +0200 +Subject: [PATCH] remove gcc options + +--- + Makefile | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Makefile b/Makefile +index 6725969..27924e0 100644 +--- a/Makefile ++++ b/Makefile +@@ -3,7 +3,7 @@ + #OptDbg=-O3 + #OptDbg=-O3 -march=pentium2 + OptDbg=-ggdb +-CFLAGS=$(OptDbg) -Wall -Werror ++#CFLAGS=$(OptDbg) -Wall -Werror + + # STRIP = -s + INSTALL = /usr/bin/install +-- +1.7.6 + Added: csw/mgar/pkg/wiggle/trunk/files/0002-fix-for-building-with-solstudio.patch =================================================================== --- csw/mgar/pkg/wiggle/trunk/files/0002-fix-for-building-with-solstudio.patch (rev 0) +++ csw/mgar/pkg/wiggle/trunk/files/0002-fix-for-building-with-solstudio.patch 2011-08-10 15:49:18 UTC (rev 15302) @@ -0,0 +1,25 @@ +From bbbc93dee71c5f051d2ae80b38833cd67301026c Mon Sep 17 00:00:00 2001 +From: Oliver Kiddle +Date: Wed, 10 Aug 2011 16:16:59 +0200 +Subject: [PATCH] fix for building with solstudio + +--- + merge2.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/merge2.c b/merge2.c +index 9c605ea..7f76e56 100644 +--- a/merge2.c ++++ b/merge2.c +@@ -79,7 +79,7 @@ int check_alreadyapplied(struct file af, struct file cf, + return 1; + } + +-inline int isolate_conflicts(struct file af, struct file bf, struct file cf, ++static inline int isolate_conflicts(struct file af, struct file bf, struct file cf, + struct csl *csl1, struct csl *csl2, int words, + struct merge *m) + { +-- +1.7.6 + Added: csw/mgar/pkg/wiggle/trunk/files/0003-fix-installation-target.patch =================================================================== --- csw/mgar/pkg/wiggle/trunk/files/0003-fix-installation-target.patch (rev 0) +++ csw/mgar/pkg/wiggle/trunk/files/0003-fix-installation-target.patch 2011-08-10 15:49:18 UTC (rev 15302) @@ -0,0 +1,25 @@ +From 9fe352174a969508d92d53582d6cd629bf3f09b2 Mon Sep 17 00:00:00 2001 +From: Oliver Kiddle +Date: Wed, 10 Aug 2011 16:55:06 +0200 +Subject: [PATCH] fix installation target + +--- + Makefile | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Makefile b/Makefile +index 27924e0..59482a6 100644 +--- a/Makefile ++++ b/Makefile +@@ -6,7 +6,7 @@ OptDbg=-ggdb + #CFLAGS=$(OptDbg) -Wall -Werror + + # STRIP = -s +-INSTALL = /usr/bin/install ++INSTALL = ginstall + DESTDIR = + BINDIR = /usr/bin + MANDIR = /usr/share/man +-- +1.7.6 + Added: csw/mgar/pkg/wiggle/trunk/files/0004-skip-time-in-test-script.patch =================================================================== --- csw/mgar/pkg/wiggle/trunk/files/0004-skip-time-in-test-script.patch (rev 0) +++ csw/mgar/pkg/wiggle/trunk/files/0004-skip-time-in-test-script.patch 2011-08-10 15:49:18 UTC (rev 15302) @@ -0,0 +1,88 @@ +From 10c8836418770cfe25d2cf7a2bf76cffaa98a11a Mon Sep 17 00:00:00 2001 +From: Oliver Kiddle +Date: Wed, 10 Aug 2011 17:41:08 +0200 +Subject: [PATCH] skip time in test script + +--- + Makefile | 2 +- + dotest | 30 +++++++++++++++--------------- + 2 files changed, 16 insertions(+), 16 deletions(-) + +diff --git a/Makefile b/Makefile +index 59482a6..dc3335a 100644 +--- a/Makefile ++++ b/Makefile +@@ -22,7 +22,7 @@ wiggle.o load.o split.o extract.o diff.o bestmatch.o ReadMe.o merge.o \ + merge2.o vpatch.o : wiggle.h + + test: wiggle dotest +- sh dotest ++ bash dotest + + wiggle.man : wiggle.1 + nroff -man wiggle.1 > wiggle.man +diff --git a/dotest b/dotest +index 6d3a27e..0e1b0a0 100755 +--- a/dotest ++++ b/dotest +@@ -34,42 +34,42 @@ do + case $base in + script ) ./script ;; + diff ) if [ -f new ] +- then /usr/bin/time -o .time -f '%U' $WIGGLE -dw orig new | diff -u diff - ; xit=$? +- else /usr/bin/time -o .time -f '%U' $WIGGLE -dwp1 orig patch | diff -u diff - ; xit=$? ++ then $WIGGLE -dw orig new | diff -u diff - ; xit=$? ++ else $WIGGLE -dwp1 orig patch | diff -u diff - ; xit=$? + fi + ;; + ldiff ) if [ -f new ] +- then /usr/bin/time -o .time -f '%U' $WIGGLE -dl orig new | diff -u ldiff - ; xit=$? +- else /usr/bin/time -o .time -f '%U' $WIGGLE -dlp1 orig patch | diff -u ldiff - ; xit=$? ++ then $WIGGLE -dl orig new | diff -u ldiff - ; xit=$? ++ else $WIGGLE -dlp1 orig patch | diff -u ldiff - ; xit=$? + fi + ;; +- reldiff ) /usr/bin/time -o .time -f '%U' $WIGGLE -dl patch | diff -u reldiff - ; xit=$? ++ reldiff ) $WIGGLE -dl patch | diff -u reldiff - ; xit=$? + ;; +- rediff ) /usr/bin/time -o .time -f '%U' $WIGGLE -dw patch | diff -u rediff - ; xit=$? ++ rediff ) $WIGGLE -dw patch | diff -u rediff - ; xit=$? + ;; + merge ) if [ -f patch ] +- then /usr/bin/time -o .time -f '%U' $WIGGLE -m orig patch | diff -u merge - ; xit=$? ++ then $WIGGLE -m orig patch | diff -u merge - ; xit=$? + elif [ -f new ] +- then /usr/bin/time -o .time -f '%U' $WIGGLE -m orig new new2 | diff -u merge - ; xit=$? +- else /usr/bin/time -o .time -f '%U' $WIGGLE -m orig | diff -u merge - ; xit=$? ++ then $WIGGLE -m orig new new2 | diff -u merge - ; xit=$? ++ else $WIGGLE -m orig | diff -u merge - ; xit=$? + fi + ;; + replace ) cp orig orig.tmp + if [ -f patch ] +- then /usr/bin/time -o .time -f '%U' $WIGGLE -mr orig.tmp patch +- else /usr/bin/time -o .time -f '%U' $WIGGLE -mr orig.tmp new new2 ++ then $WIGGLE -mr orig.tmp patch ++ else $WIGGLE -mr orig.tmp new new2 + fi + diff -u merge orig.tmp ; xit=$? + rm orig.tmp orig.tmp.porig + ;; + lmerge ) if [ -f patch ] +- then /usr/bin/time -o .time -f '%U' $WIGGLE -ml orig patch | diff -u lmerge - ; xit=$? +- else /usr/bin/time -o .time -f '%U' $WIGGLE -ml orig new new2 | diff -u lmerge - ; xit=$? ++ then $WIGGLE -ml orig patch | diff -u lmerge - ; xit=$? ++ else $WIGGLE -ml orig new new2 | diff -u lmerge - ; xit=$? + fi + ;; + wmerge ) if [ -f patch ] +- then /usr/bin/time -o .time -f '%U' $WIGGLE -mw orig patch | diff -u wmerge - ; xit=$? +- else /usr/bin/time -o .time -f '%U' $WIGGLE -mw orig new new2 | diff -u wmerge - ; xit=$? ++ then $WIGGLE -mw orig patch | diff -u wmerge - ; xit=$? ++ else $WIGGLE -mw orig new new2 | diff -u wmerge - ; xit=$? + fi + ;; + esac +-- +1.7.6 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Aug 10 20:38:36 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 10 Aug 2011 18:38:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[15303] csw/mgar/pkg/krb5-lib/trunk Message-ID: Revision: 15303 http://gar.svn.sourceforge.net/gar/?rev=15303&view=rev Author: wahwah Date: 2011-08-10 18:38:35 +0000 (Wed, 10 Aug 2011) Log Message: ----------- pkg/krb5-lib/trunk: update to the current naming standards Modified Paths: -------------- csw/mgar/pkg/krb5-lib/trunk/Makefile csw/mgar/pkg/krb5-lib/trunk/checksums Modified: csw/mgar/pkg/krb5-lib/trunk/Makefile =================================================================== --- csw/mgar/pkg/krb5-lib/trunk/Makefile 2011-08-10 15:49:18 UTC (rev 15302) +++ csw/mgar/pkg/krb5-lib/trunk/Makefile 2011-08-10 18:38:35 UTC (rev 15303) @@ -1,5 +1,5 @@ NAME = krb5 -VERSION = 1.9 +VERSION = 1.9.1 CATEGORIES = server DESCRIPTION = MIT Kerberos 5 @@ -14,9 +14,6 @@ MASTER_SITES = http://web.mit.edu/kerberos/dist/krb5/$(shell echo $(VERSION) | awk -F. '{print $$1"."$$2}')/ DISTFILES = $(NAME)-$(VERSION)-signed.tar -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*)-signed.tar - PATCHFILES = patch-man2html-perl.patch PATCHFILES += 0002-libintl-for-kproplog.patch # PATCHFILES += 0003-local-libraries-first-when-linking.patch @@ -25,24 +22,25 @@ BUILD_DEP_PKGS = CSWtcl -PACKAGES = CSWkrb5lib CSWkrb5libdev +PACKAGES = CSWlibkrb5-dev CATALOGNAME_CSWkrb5lib = krb5_lib -CATALOGNAME_CSWkrb5libdev = krb5_lib_dev SPKG_DESC_CSWkrb5lib = MIT Kerberos 5 core libraries -SPKG_DESC_CSWkrb5libdev = MIT Kerberos 5 developer libraries +SPKG_DESC_CSWlibkrb5-dev = MIT Kerberos 5 developer libraries PACKAGES += CSWlibcom-err3 CATALOGNAME_CSWlibcom-err3 = libcom_err3 PKGFILES_CSWlibcom-err3 += $(call baseisadirs,$(libdir),libcom_err\.so\.3(\.\d+)*) SPKG_DESC_CSWlibcom-err3 += MIT Kerberos 5 core libraries, libcom_err.so.3 +OBSOLETED_BY_CSWlibcom-err3 = CSWkrb5lib PACKAGES += CSWlibgssapi-krb5-2 CATALOGNAME_CSWlibgssapi-krb5-2 = libgssapi_krb5_2 PKGFILES_CSWlibgssapi-krb5-2 += $(call baseisadirs,$(libdir),libgssapi_krb5\.so\.2(\.\d+)*) SPKG_DESC_CSWlibgssapi-krb5-2 += MIT Kerberos 5 core libraries, libgssapi_krb5.so.2 +OBSOLETED_BY_CSWlibgssapi-krb5-2 = CSWkrb5lib # This is a private library #PACKAGES += CSWlibgssrpc4 @@ -54,6 +52,7 @@ CATALOGNAME_CSWlibk5crypto3 = libk5crypto3 PKGFILES_CSWlibk5crypto3 += $(call baseisadirs,$(libdir),libk5crypto\.so\.3(\.\d+)*) SPKG_DESC_CSWlibk5crypto3 += MIT Kerberos 5 core libraries, libk5crypto.so.3 +OBSOLETED_BY_CSWlibk5crypto3 = CSWkrb5lib # This is a private library #PACKAGES += CSWlibkadm5clnt-mit7 @@ -77,18 +76,14 @@ CATALOGNAME_CSWlibkrb5-3 = libkrb5_3 PKGFILES_CSWlibkrb5-3 += $(call baseisadirs,$(libdir),libkrb5\.so\.3(\.\d+)*) SPKG_DESC_CSWlibkrb5-3 += MIT Kerberos 5 core libraries, libkrb5.so.3 +OBSOLETED_BY_CSWlibkrb5-3 = CSWkrb5lib PACKAGES += CSWlibkrb5support0 CATALOGNAME_CSWlibkrb5support0 = libkrb5support0 PKGFILES_CSWlibkrb5support0 += $(call baseisadirs,$(libdir),libkrb5support\.so\.0(\.\d+)*) SPKG_DESC_CSWlibkrb5support0 += MIT Kerberos 5 core libraries, libkrb5support.so.0 +OBSOLETED_BY_CSWlibkrb5-3 = CSWlibkrb5lib -RUNTIME_DEP_PKGS_CSWkrb5libdev = CSWkrb5lib -RUNTIME_DEP_PKGS_CSWkrb5lib += CSWlibcom-err3 -RUNTIME_DEP_PKGS_CSWkrb5lib += CSWlibgssapi-krb5-2 -RUNTIME_DEP_PKGS_CSWkrb5lib += CSWlibk5crypto3 -RUNTIME_DEP_PKGS_CSWkrb5lib += CSWlibkrb5-3 -RUNTIME_DEP_PKGS_CSWkrb5lib += CSWlibkrb5support0 ARCHALL_CSWkrb5lib = 1 RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibkrb5-3 @@ -101,17 +96,17 @@ RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibk5crypto3 RUNTIME_DEP_PKGS_CSWlibk5crypto3 += CSWlibkrb5support0 -RUNTIME_DEP_PKGS_CSWkrb5libdev += CSWlibkrb5-3 -RUNTIME_DEP_PKGS_CSWkrb5libdev += CSWlibcom-err3 -RUNTIME_DEP_PKGS_CSWkrb5libdev += CSWlibgssapi-krb5-2 -RUNTIME_DEP_PKGS_CSWkrb5libdev += CSWlibk5crypto3 -RUNTIME_DEP_PKGS_CSWkrb5libdev += CSWlibkrb5support0 +RUNTIME_DEP_PKGS_CSWlibkrb5-dev = CSWkrb5lib +RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibkrb5-3 +RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibcom-err3 +RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibgssapi-krb5-2 +RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibk5crypto3 +RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibkrb5support0 LICENSE = doc/copyright.texinfo CONFIGURE_SCRIPTS = $(WORKSRC)/src/configure -NOISAEXEC = 1 BUILD64 = 1 # We turn off almost everything as we are just interested in the library. @@ -139,21 +134,22 @@ PKGFILES_CSWkrb5lib = NOFILES -PKGFILES_CSWkrb5libdev = $(mandir)/man8/sserver.8 -PKGFILES_CSWkrb5libdev += $(mandir)/man1/(sclient|krb5-config|compile_et)\.1 -PKGFILES_CSWkrb5libdev += $(sbindir)/(uuserver|sserver|sim_server|gss-server) -PKGFILES_CSWkrb5libdev += $(includedir)/.* -PKGFILES_CSWkrb5libdev += $(bindir)/(uuclient|sim_client|sclient|krb5-config|gss-client|compile_et) +PKGFILES_CSWlibkrb5-dev = $(mandir)/man8/sserver.8 +PKGFILES_CSWlibkrb5-dev += $(mandir)/man1/(sclient|krb5-config|compile_et)\.1 +PKGFILES_CSWlibkrb5-dev += $(sbindir)/(uuserver|sserver|sim_server|gss-server) +PKGFILES_CSWlibkrb5-dev += $(includedir)/.* +PKGFILES_CSWlibkrb5-dev += $(bindir)/(uuclient|sim_client|sclient|krb5-config|gss-client|compile_et) +OBSOLETED_BY_CSWlibkrb5-dev = CSWkrb5libdev +CATALOGNAME_CSWkrb5libdev = krb5_lib_dev_stub +# /usr/local in a manpage is OK. +CHECKPKG_OVERRIDES_CSWlibkrb5-dev += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/sserver.8 # This name is so old that there it is not recognized as devel-package -CHECKPKG_OVERRIDES_CSWkrb5libdev += surplus-dependency|CSWkrb5lib +CHECKPKG_OVERRIDES_CSWlibkrb5-dev += surplus-dependency|CSWkrb5lib -# This is the "collect all" legacy lib, no other reason for the dependencies. -CHECKPKG_OVERRIDES_CSWkrb5lib += surplus-dependency|CSWlibkrb5support0 -CHECKPKG_OVERRIDES_CSWkrb5lib += surplus-dependency|CSWlibcom-err3 -CHECKPKG_OVERRIDES_CSWkrb5lib += surplus-dependency|CSWlibgssapi-krb5-2 -CHECKPKG_OVERRIDES_CSWkrb5lib += surplus-dependency|CSWlibkrb5-3 -CHECKPKG_OVERRIDES_CSWkrb5lib += surplus-dependency|CSWlibk5crypto3 +# pkgname=CSWkrb5lib|catalogname=krb5_lib|expected-catalogname=krb5lib +CHECKPKG_OVERRIDES_CSWkrb5lib += catalogname-does-not-match-pkgname +CATALOGNAME_CSWkrb5lib = krb5_lib_stub include gar/category.mk @@ -165,6 +161,7 @@ LD_OPTIONS = EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) + post-extract-modulated: @# TODO: Check signature @cd $(WORKDIR) && (gzip -c -d $(NAME)-$(VERSION).tar.gz | tar xf -) Modified: csw/mgar/pkg/krb5-lib/trunk/checksums =================================================================== --- csw/mgar/pkg/krb5-lib/trunk/checksums 2011-08-10 15:49:18 UTC (rev 15302) +++ csw/mgar/pkg/krb5-lib/trunk/checksums 2011-08-10 18:38:35 UTC (rev 15303) @@ -1 +1 @@ -220c3dbb05a1bae1e6ad0bec4a6ac331 krb5-1.9-signed.tar +b9f237015fbb83f75d17941588b12b7d krb5-1.9.1-signed.tar This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Aug 10 20:42:19 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 10 Aug 2011 18:42:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[15304] csw/mgar/pkg/krb5-lib/trunk/Makefile Message-ID: Revision: 15304 http://gar.svn.sourceforge.net/gar/?rev=15304&view=rev Author: wahwah Date: 2011-08-10 18:42:19 +0000 (Wed, 10 Aug 2011) Log Message: ----------- pkg/krb5-lib/trunk: removed superfluous catalogname definition Modified Paths: -------------- csw/mgar/pkg/krb5-lib/trunk/Makefile Modified: csw/mgar/pkg/krb5-lib/trunk/Makefile =================================================================== --- csw/mgar/pkg/krb5-lib/trunk/Makefile 2011-08-10 18:38:35 UTC (rev 15303) +++ csw/mgar/pkg/krb5-lib/trunk/Makefile 2011-08-10 18:42:19 UTC (rev 15304) @@ -24,8 +24,6 @@ PACKAGES = CSWlibkrb5-dev -CATALOGNAME_CSWkrb5lib = krb5_lib - SPKG_DESC_CSWkrb5lib = MIT Kerberos 5 core libraries SPKG_DESC_CSWlibkrb5-dev = MIT Kerberos 5 developer libraries This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Aug 11 03:12:46 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 11 Aug 2011 01:12:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[15305] csw/mgar/pkg/krb5-lib/trunk/Makefile Message-ID: Revision: 15305 http://gar.svn.sourceforge.net/gar/?rev=15305&view=rev Author: wahwah Date: 2011-08-11 01:12:45 +0000 (Thu, 11 Aug 2011) Log Message: ----------- pkg/krb5-lib/trunk: corrected a typo Modified Paths: -------------- csw/mgar/pkg/krb5-lib/trunk/Makefile Modified: csw/mgar/pkg/krb5-lib/trunk/Makefile =================================================================== --- csw/mgar/pkg/krb5-lib/trunk/Makefile 2011-08-10 18:42:19 UTC (rev 15304) +++ csw/mgar/pkg/krb5-lib/trunk/Makefile 2011-08-11 01:12:45 UTC (rev 15305) @@ -80,7 +80,7 @@ CATALOGNAME_CSWlibkrb5support0 = libkrb5support0 PKGFILES_CSWlibkrb5support0 += $(call baseisadirs,$(libdir),libkrb5support\.so\.0(\.\d+)*) SPKG_DESC_CSWlibkrb5support0 += MIT Kerberos 5 core libraries, libkrb5support.so.0 -OBSOLETED_BY_CSWlibkrb5-3 = CSWlibkrb5lib +OBSOLETED_BY_CSWlibkrb5-3 = CSWkrb5lib ARCHALL_CSWkrb5lib = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Aug 11 04:34:07 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 11 Aug 2011 02:34:07 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[507] catalog_signatures/etc/signing_daemon.conf Message-ID: Revision: 507 http://opencsw.svn.sourceforge.net/opencsw/?rev=507&view=rev Author: bdwalton Date: 2011-08-11 02:34:07 +0000 (Thu, 11 Aug 2011) Log Message: ----------- define APP_MAILTO in the configuration Signed-off-by: Ben Walton Modified Paths: -------------- catalog_signatures/etc/signing_daemon.conf Modified: catalog_signatures/etc/signing_daemon.conf =================================================================== --- catalog_signatures/etc/signing_daemon.conf 2011-08-06 14:26:59 UTC (rev 506) +++ catalog_signatures/etc/signing_daemon.conf 2011-08-11 02:34:07 UTC (rev 507) @@ -6,6 +6,7 @@ APP_GPG_ENV="${APP_TMP}/gpg-agent-env.conf" APP_MIRROR_BASE="/export/mirror" APP_PORT=9981 +APP_MAILTO="bwalton" export APP_HOME APP_BIN APP_GPG APP_TMP APP_GPG_ENV APP_DAEMON -export APP_LOGDIR APP_MIRROR_BASE APP_PORT +export APP_LOGDIR APP_MIRROR_BASE APP_PORT APP_MAILTO This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Aug 11 04:34:27 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 11 Aug 2011 02:34:27 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[508] catalog_signatures/bin/passphrase_verify Message-ID: Revision: 508 http://opencsw.svn.sourceforge.net/opencsw/?rev=508&view=rev Author: bdwalton Date: 2011-08-11 02:34:27 +0000 (Thu, 11 Aug 2011) Log Message: ----------- generate a mail notice when the gpg passphrase expires Signed-off-by: Ben Walton Modified Paths: -------------- catalog_signatures/bin/passphrase_verify Modified: catalog_signatures/bin/passphrase_verify =================================================================== --- catalog_signatures/bin/passphrase_verify 2011-08-11 02:34:07 UTC (rev 507) +++ catalog_signatures/bin/passphrase_verify 2011-08-11 02:34:27 UTC (rev 508) @@ -13,7 +13,7 @@ else reset clear - # send mail here... + echo "The gpg passphrase has expired..." | mail -s '[CSW Notice] Catalog Signature Expiry' ${APP_MAILTO} echo "$(date +%c): AHA! The passphrase has expired...[Mail sent.]" echo "$(date +%c): Press ENTER to continue monitoring." read CONT This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From opk at users.sourceforge.net Thu Aug 11 12:18:37 2011 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Thu, 11 Aug 2011 10:18:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[15306] csw/mgar/pkg/wiggle/trunk Message-ID: Revision: 15306 http://gar.svn.sourceforge.net/gar/?rev=15306&view=rev Author: opk Date: 2011-08-11 10:18:37 +0000 (Thu, 11 Aug 2011) Log Message: ----------- further patch needed as the GCC extension to support an ellipsis in a case statement (apparently supported by ss12u2) is not supported in ss12 Modified Paths: -------------- csw/mgar/pkg/wiggle/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/wiggle/trunk/files/0005-replace-GCC-extension.patch Modified: csw/mgar/pkg/wiggle/trunk/Makefile =================================================================== --- csw/mgar/pkg/wiggle/trunk/Makefile 2011-08-11 01:12:45 UTC (rev 15305) +++ csw/mgar/pkg/wiggle/trunk/Makefile 2011-08-11 10:18:37 UTC (rev 15306) @@ -24,7 +24,8 @@ PATCHFILES += 0001-remove-gcc-options.patch \ 0002-fix-for-building-with-solstudio.patch \ 0003-fix-installation-target.patch \ - 0004-skip-time-in-test-script.patch + 0004-skip-time-in-test-script.patch \ + 0005-replace-GCC-extension.patch BUILD_ARGS = wiggle wiggle.man TEST_TARGET = test Added: csw/mgar/pkg/wiggle/trunk/files/0005-replace-GCC-extension.patch =================================================================== --- csw/mgar/pkg/wiggle/trunk/files/0005-replace-GCC-extension.patch (rev 0) +++ csw/mgar/pkg/wiggle/trunk/files/0005-replace-GCC-extension.patch 2011-08-11 10:18:37 UTC (rev 15306) @@ -0,0 +1,101 @@ +From 8627bfc7f6dca6f2ba793c843813b404281a7bd2 Mon Sep 17 00:00:00 2001 +From: Oliver Kiddle +Date: Thu, 11 Aug 2011 11:05:32 +0200 +Subject: [PATCH] replace GCC extension + +--- + vpatch.c | 64 +++++++++++++++++++++++++++++++++++-------------------------- + 1 files changed, 37 insertions(+), 27 deletions(-) + +diff --git a/vpatch.c b/vpatch.c +index 5f76ee8..1e48538 100644 +--- a/vpatch.c ++++ b/vpatch.c +@@ -1541,7 +1541,16 @@ void merge_window(struct plist *p, FILE *f, int reverse) + if (row >= rows) + row = rows; + break; +- case '0' ... '9': ++ case '0': ++ case '1': ++ case '2': ++ case '3': ++ case '4': ++ case '5': ++ case '6': ++ case '7': ++ case '8': ++ case '9': + if (tnum < 0) tnum = 0; + num = tnum*10 + (c-'0'); + break; +@@ -1600,32 +1609,6 @@ void merge_window(struct plist *p, FILE *f, int reverse) + refresh = 1; + } + break; +- case SEARCH(' ') ... SEARCH('~'): +- case SEARCH('\t'): +- meta = SEARCH(0); +- if (searchlen < sizeof(search)-1) +- search[searchlen++] = c & (0x7f); +- search[searchlen] = 0; +- tpos = pos; trow = row; +- search_again: +- search_notfound = 1; +- do { +- if (mcontains(tpos, fm,fb,fa,ci.merger,mode,search)) { +- pos = tpos; +- row = trow; +- search_notfound = 0; +- break; +- } +- if (searchdir) { +- trow--; +- prev_mline(&tpos, fm,fb,fa,ci.merger,mode); +- } else { +- trow++; +- next_mline(&tpos, fm,fb,fa,ci.merger,mode); +- } +- } while (tpos.p.m >= 0 && ci.merger[tpos.p.m].type != End); +- +- break; + case 'L'-64: + refresh = 2; + if (toprow >= 1) row -= (toprow+1); +@@ -1771,6 +1754,33 @@ void merge_window(struct plist *p, FILE *f, int reverse) + #endif + } + ++if (((c | tmeta) >= SEARCH(' ') && (c | tmeta) <= SEARCH('~')) || ++ (c | tmeta) == SEARCH('\t')) { ++ meta = SEARCH(0); ++ if (searchlen < sizeof(search)-1) ++ search[searchlen++] = c & (0x7f); ++ search[searchlen] = 0; ++ tpos = pos; trow = row; ++ search_again: ++ search_notfound = 1; ++ do { ++ if (mcontains(tpos, fm,fb,fa,ci.merger,mode,search)) { ++ pos = tpos; ++ row = trow; ++ search_notfound = 0; ++ break; ++ } ++ if (searchdir) { ++ trow--; ++ prev_mline(&tpos, fm,fb,fa,ci.merger,mode); ++ } else { ++ trow++; ++ next_mline(&tpos, fm,fb,fa,ci.merger,mode); ++ } ++ } while (tpos.p.m >= 0 && ci.merger[tpos.p.m].type != End); ++ ++} ++ + if (meta == SEARCH(0)) { + if (anchor == NULL || + !same_mpos(anchor->pos, pos) || +-- +1.7.6 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Aug 11 12:29:55 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 11 Aug 2011 10:29:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[15307] csw/mgar/pkg/gcc4/branches/gcc-4.3/ Message-ID: Revision: 15307 http://gar.svn.sourceforge.net/gar/?rev=15307&view=rev Author: wahwah Date: 2011-08-11 10:29:54 +0000 (Thu, 11 Aug 2011) Log Message: ----------- To try the 4.3 branch Added Paths: ----------- csw/mgar/pkg/gcc4/branches/gcc-4.3/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From andyclarkii at users.sourceforge.net Thu Aug 11 12:30:23 2011 From: andyclarkii at users.sourceforge.net (andyclarkii at users.sourceforge.net) Date: Thu, 11 Aug 2011 10:30:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[15308] csw/mgar/pkg Message-ID: Revision: 15308 http://gar.svn.sourceforge.net/gar/?rev=15308&view=rev Author: andyclarkii Date: 2011-08-11 10:30:23 +0000 (Thu, 11 Aug 2011) Log Message: ----------- flow-tools: Initial commit Added Paths: ----------- csw/mgar/pkg/flow-tools/ csw/mgar/pkg/flow-tools/branches/ csw/mgar/pkg/flow-tools/tags/ csw/mgar/pkg/flow-tools/trunk/ csw/mgar/pkg/flow-tools/trunk/Makefile csw/mgar/pkg/flow-tools/trunk/checksums csw/mgar/pkg/flow-tools/trunk/files/ Added: csw/mgar/pkg/flow-tools/trunk/Makefile =================================================================== --- csw/mgar/pkg/flow-tools/trunk/Makefile (rev 0) +++ csw/mgar/pkg/flow-tools/trunk/Makefile 2011-08-11 10:30:23 UTC (rev 15308) @@ -0,0 +1,38 @@ +NAME = flow-tools +VERSION = 0.68.5.1 +CATEGORIES = net +DESCRIPTION = Software for collection/processing NetFlow data from Cisco/Juniper. + +define BLURB + + flow-tools is library and a collection of programs used to collect, + send, process, and generate reports from NetFlow data. The tools + can be used together on a single server or distributed to multiple + servers for large deployments. The flow-tools library provides an + API for development of custom applications for NetFlow export + versions 1,5,6 and the 14 currently defined version 8 subversions. + +endef + +GARTYPE = v2 + +MASTER_SITES = http://flow-tools.googlecode.com/files/ +DISTFILES = $(NAME)-$(VERSION).tar.bz2 + +BUILD_DEP_PKGS = CSWmysql5devel CSWossldevel CSWzlib +BUILD_OVERRIDE_VARS = AM_CFLAGS + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-openssl=/opt/csw +CONFIGURE_ARGS += --disable-static +CONFIGURE_ARGS += --with-mysql=/opt/csw + +EXTRA_CPPFLAGS = -D_FILE_OFFSET_BITS=64 + +RUNTIME_DEP_PKGS_CSWflow-tools += CSWmysql5rt +RUNTIME_DEP_PKGS_CSWflow-tools += CSWosslrt +RUNTIME_DEP_PKGS_CSWflow-tools += CSWzlib +RUNTIME_DEP_PKGS_CSWflow-tools += CSWpostgresql + +include gar/category.mk + Added: csw/mgar/pkg/flow-tools/trunk/checksums =================================================================== --- csw/mgar/pkg/flow-tools/trunk/checksums (rev 0) +++ csw/mgar/pkg/flow-tools/trunk/checksums 2011-08-11 10:30:23 UTC (rev 15308) @@ -0,0 +1 @@ +b8f9a4be19ec22ea6d4031c40a6d5a63 flow-tools-0.68.5.1.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Aug 11 13:32:37 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 11 Aug 2011 11:32:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[15309] csw/mgar/pkg/flow-tools/trunk/Makefile Message-ID: Revision: 15309 http://gar.svn.sourceforge.net/gar/?rev=15309&view=rev Author: wahwah Date: 2011-08-11 11:32:37 +0000 (Thu, 11 Aug 2011) Log Message: ----------- package split, package rename Modified Paths: -------------- csw/mgar/pkg/flow-tools/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/flow-tools/trunk/Makefile Modified: csw/mgar/pkg/flow-tools/trunk/Makefile =================================================================== --- csw/mgar/pkg/flow-tools/trunk/Makefile 2011-08-11 10:30:23 UTC (rev 15308) +++ csw/mgar/pkg/flow-tools/trunk/Makefile 2011-08-11 11:32:37 UTC (rev 15309) @@ -1,8 +1,15 @@ +# $Id$ + NAME = flow-tools VERSION = 0.68.5.1 CATEGORIES = net -DESCRIPTION = Software for collection/processing NetFlow data from Cisco/Juniper. +DESCRIPTION = Software for collection/processing NetFlow data from Cisco/Juniper +# Issues: +# /usr/local is referenced by two binaries: +# - /opt/csw/bin/flow-rptfmt +# - /opt/csw/bin/flow-rpt2rrd + define BLURB flow-tools is library and a collection of programs used to collect, @@ -29,10 +36,27 @@ EXTRA_CPPFLAGS = -D_FILE_OFFSET_BITS=64 -RUNTIME_DEP_PKGS_CSWflow-tools += CSWmysql5rt +PACKAGES = CSWflow-tools +SPKG_DESC_CSWflow-tools = $(DESCRIPTION) +# Catch-all package, no PKGFILES. +RUNTIME_DEP_PKGS_CSWflow-tools += CSWlibft0 RUNTIME_DEP_PKGS_CSWflow-tools += CSWosslrt RUNTIME_DEP_PKGS_CSWflow-tools += CSWzlib -RUNTIME_DEP_PKGS_CSWflow-tools += CSWpostgresql +# Doesn't link against PostgreSQL libraries in practice. +# RUNTIME_DEP_PKGS_CSWflow-tools += CSWpostgresql +RUNTIME_DEP_PKGS_CSWflow-tools += CSWlibmysqlclient15 +OBSOLETED_BY_CSWflow-tools = CSWflowtools +PACKAGES += CSWlibft0 +CATALOGNAME_CSWlibft0 = libft0 +PKGFILES_CSWlibft0 += $(call baseisadirs,$(libdir),libft\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibft0 += Software for collection/processing NetFlow data from Cisco/Juniper., libft.so.0 +RUNTIME_DEP_PKGS_CSWlibft0 += CSWosslrt +RUNTIME_DEP_PKGS_CSWlibft0 += CSWzlib + +PACKAGES += CSWflow-tools-dev +SPKG_DESC_CSWflow-tools-dev = Flow-tools development files +PKGFILES_CSWflow-tools-dev = $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWflow-tools-dev += CSWlibft0 + include gar/category.mk - Property changes on: csw/mgar/pkg/flow-tools/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Aug 11 14:43:39 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 11 Aug 2011 12:43:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[15310] csw/mgar/pkg/ppl/trunk/Makefile Message-ID: Revision: 15310 http://gar.svn.sourceforge.net/gar/?rev=15310&view=rev Author: wahwah Date: 2011-08-11 12:43:38 +0000 (Thu, 11 Aug 2011) Log Message: ----------- pkg/ppl/trunk: package split Modified Paths: -------------- csw/mgar/pkg/ppl/trunk/Makefile Modified: csw/mgar/pkg/ppl/trunk/Makefile =================================================================== --- csw/mgar/pkg/ppl/trunk/Makefile 2011-08-11 11:32:37 UTC (rev 15309) +++ csw/mgar/pkg/ppl/trunk/Makefile 2011-08-11 12:43:38 UTC (rev 15310) @@ -42,6 +42,53 @@ CONFIGURE_ARGS = $(DIRPATHS) +PACKAGES = CSWlibppl-dev +SPKG_DESC_CSWlibppl-dev = $(DESCRIPTION) development files +# catch-all package +RUNTIME_DEP_PKGS_CSWlibppl-dev += CSWgcc4corert +RUNTIME_DEP_PKGS_CSWlibppl-dev += CSWgcc4g++rt +RUNTIME_DEP_PKGS_CSWlibppl-dev += CSWlibgmp10 +RUNTIME_DEP_PKGS_CSWlibppl-dev += CSWlibgmpxx4 +RUNTIME_DEP_PKGS_CSWlibppl-dev += CSWlibgnugetopt0 +RUNTIME_DEP_PKGS_CSWlibppl-dev += CSWlibppl-c4 +RUNTIME_DEP_PKGS_CSWlibppl-dev += CSWlibppl9 +RUNTIME_DEP_PKGS_CSWlibppl-dev += CSWlibpwl5 +CHECKPKG_OVERRIDES_CSWlibppl-dev += file-with-bad-content|/usr/share|root/opt/csw/share/doc/ppl/README.doc +CHECKPKG_OVERRIDES_CSWlibppl-dev += file-with-bad-content|/usr/share|root/opt/csw/share/doc/pwl/README.doc + +PACKAGES += CSWlibppl9 +CATALOGNAME_CSWlibppl9 = libppl9 +PKGFILES_CSWlibppl9 += $(call baseisadirs,$(libdir),libppl\.so\.9\.0\.0) +PKGFILES_CSWlibppl9 += $(call baseisadirs,$(libdir),libppl\.so\.9(\.\d+)*) +SPKG_DESC_CSWlibppl9 += Parma Polyhedra Library, libppl.so.9 +RUNTIME_DEP_PKGS_CSWlibppl9 += CSWgcc4corert +RUNTIME_DEP_PKGS_CSWlibppl9 += CSWgcc4g++rt +RUNTIME_DEP_PKGS_CSWlibppl9 += CSWlibgmp10 +RUNTIME_DEP_PKGS_CSWlibppl9 += CSWlibgmpxx4 +RUNTIME_DEP_PKGS_CSWlibppl9 += CSWlibgnugetopt0 + +PACKAGES += CSWlibppl-c4 +CATALOGNAME_CSWlibppl-c4 = libppl_c4 +PKGFILES_CSWlibppl-c4 += $(call baseisadirs,$(libdir),libppl_c\.so\.4\.0\.0) +PKGFILES_CSWlibppl-c4 += $(call baseisadirs,$(libdir),libppl_c\.so\.4(\.\d+)*) +SPKG_DESC_CSWlibppl-c4 += Parma Polyhedra Library, libppl_c.so.4 +RUNTIME_DEP_PKGS_CSWlibppl-c4 += CSWgcc4corert +RUNTIME_DEP_PKGS_CSWlibppl-c4 += CSWgcc4g++rt +RUNTIME_DEP_PKGS_CSWlibppl-c4 += CSWlibgmp10 +RUNTIME_DEP_PKGS_CSWlibppl-c4 += CSWlibgmpxx4 +RUNTIME_DEP_PKGS_CSWlibppl-c4 += CSWlibgnugetopt0 +RUNTIME_DEP_PKGS_CSWlibppl-c4 += CSWlibppl9 +RUNTIME_DEP_PKGS_CSWlibppl-c4 += CSWlibpwl5 + +PACKAGES += CSWlibpwl5 +CATALOGNAME_CSWlibpwl5 = libpwl5 +PKGFILES_CSWlibpwl5 += $(call baseisadirs,$(libdir),libpwl\.so\.5\.0\.0) +PKGFILES_CSWlibpwl5 += $(call baseisadirs,$(libdir),libpwl\.so\.5(\.\d+)*) +SPKG_DESC_CSWlibpwl5 += Parma Polyhedra Library, libpwl.so.5 +RUNTIME_DEP_PKGS_CSWlibpwl5 += CSWgcc3corert +RUNTIME_DEP_PKGS_CSWlibpwl5 += CSWgcc4g++rt +RUNTIME_DEP_PKGS_CSWlibpwl5 += CSWlibgnugetopt0 + include gar/category.mk # To help the configure script find GNU M4 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Aug 11 14:52:26 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 11 Aug 2011 12:52:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[15311] csw/mgar/pkg/ppl/trunk/Makefile Message-ID: Revision: 15311 http://gar.svn.sourceforge.net/gar/?rev=15311&view=rev Author: wahwah Date: 2011-08-11 12:52:26 +0000 (Thu, 11 Aug 2011) Log Message: ----------- pkg/ppl/trunk: potential GCC bug 40024 Modified Paths: -------------- csw/mgar/pkg/ppl/trunk/Makefile Modified: csw/mgar/pkg/ppl/trunk/Makefile =================================================================== --- csw/mgar/pkg/ppl/trunk/Makefile 2011-08-11 12:43:38 UTC (rev 15310) +++ csw/mgar/pkg/ppl/trunk/Makefile 2011-08-11 12:52:26 UTC (rev 15311) @@ -1,5 +1,17 @@ # $Id$ +# +# ! The library builds, but there are two failing tests. +# - http://www.cs.unipr.it/pipermail/ppl-devel/2011-August/017604.html # +# The problem could be GCC Bug 40024 which seems to be affecting our released +# version of the compiler. +# +# http://lists.opencsw.org/pipermail/users/2011-May/008908.html +# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=40024 +# +# One way to fix this, would be to build a newer version of the 4.3 line, e.g. +# 4.3.6 and see what happens. + NAME = ppl VERSION = 0.11.2 GARTYPE = v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Aug 11 18:10:14 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 11 Aug 2011 16:10:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[15312] csw/mgar/pkg/gcc4/branches/gcc-4.3 Message-ID: Revision: 15312 http://gar.svn.sourceforge.net/gar/?rev=15312&view=rev Author: wahwah Date: 2011-08-11 16:10:13 +0000 (Thu, 11 Aug 2011) Log Message: ----------- pkg/gcc4/branches/gcc-4.3: builds, throws a wonderful list checkpkg errors Modified Paths: -------------- csw/mgar/pkg/gcc4/branches/gcc-4.3/Makefile csw/mgar/pkg/gcc4/branches/gcc-4.3/checksums Modified: csw/mgar/pkg/gcc4/branches/gcc-4.3/Makefile =================================================================== --- csw/mgar/pkg/gcc4/branches/gcc-4.3/Makefile 2011-08-11 12:52:26 UTC (rev 15311) +++ csw/mgar/pkg/gcc4/branches/gcc-4.3/Makefile 2011-08-11 16:10:13 UTC (rev 15312) @@ -1,7 +1,7 @@ # $Id$ NAME = gcc -VERSION = 4.6.1 +VERSION = 4.3.6 CATEGORIES = lang GARTYPE = v2 Modified: csw/mgar/pkg/gcc4/branches/gcc-4.3/checksums =================================================================== --- csw/mgar/pkg/gcc4/branches/gcc-4.3/checksums 2011-08-11 12:52:26 UTC (rev 15311) +++ csw/mgar/pkg/gcc4/branches/gcc-4.3/checksums 2011-08-11 16:10:13 UTC (rev 15312) @@ -1 +1 @@ -c57a9170c677bf795bdc04ed796ca491 gcc-4.6.1.tar.bz2 +55ddf934bc9f8d1eaff7a77e7d598a85 gcc-4.3.6.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Aug 11 18:10:50 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 11 Aug 2011 16:10:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[15313] csw/mgar/pkg/krb5-lib/trunk/Makefile Message-ID: Revision: 15313 http://gar.svn.sourceforge.net/gar/?rev=15313&view=rev Author: wahwah Date: 2011-08-11 16:10:50 +0000 (Thu, 11 Aug 2011) Log Message: ----------- pkg/krb5-lib/trunk: exposes problems with the current build recipe Modified Paths: -------------- csw/mgar/pkg/krb5-lib/trunk/Makefile Modified: csw/mgar/pkg/krb5-lib/trunk/Makefile =================================================================== --- csw/mgar/pkg/krb5-lib/trunk/Makefile 2011-08-11 16:10:13 UTC (rev 15312) +++ csw/mgar/pkg/krb5-lib/trunk/Makefile 2011-08-11 16:10:50 UTC (rev 15313) @@ -2,7 +2,7 @@ VERSION = 1.9.1 CATEGORIES = server -DESCRIPTION = MIT Kerberos 5 +DESCRIPTION = MIT Kerberos 5 core libraries define BLURB Kerberos is a network authentication protocol. It is designed to provide strong authentication for client/server applications by @@ -23,11 +23,19 @@ BUILD_DEP_PKGS = CSWtcl PACKAGES = CSWlibkrb5-dev - -SPKG_DESC_CSWkrb5lib = MIT Kerberos 5 core libraries SPKG_DESC_CSWlibkrb5-dev = MIT Kerberos 5 developer libraries +RUNTIME_DEP_PKGS_CSWlibkrb5-dev = CSWkrb5lib +RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibkrb5-3 +RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibcom-err3 +RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibgssapi-krb5-2 +RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibk5crypto3 +RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibkrb5support0 +# Catch-all package +OBSOLETED_BY_CSWlibkrb5-dev = CSWkrb5libdev +CATALOGNAME_CSWkrb5libdev = krb5_lib_dev_stub +# /usr/local in a manpage is OK. +CHECKPKG_OVERRIDES_CSWlibkrb5-dev += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/sserver.8 - PACKAGES += CSWlibcom-err3 CATALOGNAME_CSWlibcom-err3 = libcom_err3 PKGFILES_CSWlibcom-err3 += $(call baseisadirs,$(libdir),libcom_err\.so\.3(\.\d+)*) @@ -94,13 +102,6 @@ RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibk5crypto3 RUNTIME_DEP_PKGS_CSWlibk5crypto3 += CSWlibkrb5support0 -RUNTIME_DEP_PKGS_CSWlibkrb5-dev = CSWkrb5lib -RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibkrb5-3 -RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibcom-err3 -RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibgssapi-krb5-2 -RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibk5crypto3 -RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibkrb5support0 - LICENSE = doc/copyright.texinfo CONFIGURE_SCRIPTS = $(WORKSRC)/src/configure @@ -130,18 +131,6 @@ INSTALL_SCRIPTS = $(WORKSRC)/src/Makefile -PKGFILES_CSWkrb5lib = NOFILES - -PKGFILES_CSWlibkrb5-dev = $(mandir)/man8/sserver.8 -PKGFILES_CSWlibkrb5-dev += $(mandir)/man1/(sclient|krb5-config|compile_et)\.1 -PKGFILES_CSWlibkrb5-dev += $(sbindir)/(uuserver|sserver|sim_server|gss-server) -PKGFILES_CSWlibkrb5-dev += $(includedir)/.* -PKGFILES_CSWlibkrb5-dev += $(bindir)/(uuclient|sim_client|sclient|krb5-config|gss-client|compile_et) -OBSOLETED_BY_CSWlibkrb5-dev = CSWkrb5libdev -CATALOGNAME_CSWkrb5libdev = krb5_lib_dev_stub -# /usr/local in a manpage is OK. -CHECKPKG_OVERRIDES_CSWlibkrb5-dev += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/sserver.8 - # This name is so old that there it is not recognized as devel-package CHECKPKG_OVERRIDES_CSWlibkrb5-dev += surplus-dependency|CSWkrb5lib 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 Aug 11 18:36:34 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 11 Aug 2011 16:36:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[15314] csw/mgar/pkg/dbus/trunk Message-ID: Revision: 15314 http://gar.svn.sourceforge.net/gar/?rev=15314&view=rev Author: dmichelsen Date: 2011-08-11 16:36:34 +0000 (Thu, 11 Aug 2011) Log Message: ----------- dbus: Update to 1.5.6, general rework Modified Paths: -------------- csw/mgar/pkg/dbus/trunk/Makefile csw/mgar/pkg/dbus/trunk/checksums csw/mgar/pkg/dbus/trunk/files/cswdbus Added Paths: ----------- csw/mgar/pkg/dbus/trunk/files/0001-Use-LOG_PERROR-only-when-available.patch csw/mgar/pkg/dbus/trunk/files/cswusergroup Removed Paths: ------------- csw/mgar/pkg/dbus/trunk/files/CSWdbus.preinstall Modified: csw/mgar/pkg/dbus/trunk/Makefile =================================================================== --- csw/mgar/pkg/dbus/trunk/Makefile 2011-08-11 16:10:50 UTC (rev 15313) +++ csw/mgar/pkg/dbus/trunk/Makefile 2011-08-11 16:36:34 UTC (rev 15314) @@ -1,72 +1,100 @@ +# TBD: +# - test position of pidfile in compilation and cswdbus +# - cleanup of /usr/share, /usr/local occurrences + NAME = dbus -VERSION = 1.3.1 +VERSION = 1.5.6 CATEGORIES = lib DESCRIPTION = DBus Message Bus System define BLURB -D-Bus is a message bus system, a simple way for applications to talk to one another. In addition to interprocess communication, D-Bus helps coordinate process lifecycle; it makes it simple and reliable to code a "single instance" application or daemon, and to launch applications and daemons on demand when their services are needed. + D-Bus is a message bus system, a simple way for applications to talk to one another. + In addition to interprocess communication, D-Bus helps coordinate process lifecycle; + it makes it simple and reliable to code a "single instance" application or daemon, + and to launch applications and daemons on demand when their services are needed. -D-Bus supplies both a system daemon (for events such as "new hardware device added" or "printer queue changed") and a per-user-login-session daemon (for general IPC needs among user applications). Also, the message bus is built on top of a general one-to-one message passing framework, which can be used by any two apps to communicate directly (without going through the message bus daemon). Currently the communicating applications are on one computer, or through unencrypted TCP/IP suitable for use behind a firewall with shared NFS home directories. (Help wanted with better remote transports - the transport mechanism is well-abstracted and extensible.) + D-Bus supplies both a system daemon (for events such as "new hardware device added" + or "printer queue changed") and a per-user-login-session daemon (for general IPC needs + among user applications). Also, the message bus is built on top of a general one-to-one + message passing framework, which can be used by any two apps to communicate directly + (without going through the message bus daemon). Currently the communicating applications + are on one computer, or through unencrypted TCP/IP suitable for use behind a firewall + with shared NFS home directories. (Help wanted with better remote transports - + the transport mechanism is well-abstracted and extensible.) endef MASTER_SITES = http://dbus.freedesktop.org/releases/dbus/ -DISTFILES = $(NAME)-$(VERSION).tar.gz -PKGDIST = $(DISTFILE) +DISTFILES = $(DISTNAME).tar.gz +DISTFILES += cswusergroup +DISTFILES += cswdbus -# Generate description fields -SPKG_DESC_CSWdbus = $(DESCRIPTION) -SPKG_DESC_CSWlibdbus = $(DESCRIPTION) libraries -SPKG_DESC_CSWlibdbusdev = $(DESCRIPTION) development package +PATCHFILES += dbus-sysdeps-unix.c.diff +PATCHFILES += dbus-sysdeps.h.diff +PATCHFILES += 0001-Use-LOG_PERROR-only-when-available.patch -PACKAGES = CSWdbus CSWlibdbus CSWlibdbusdev -CATALOGNAME_CSWdbus = dbus -CATALOGNAME_CSWlibdbus = libdbus -CATALOGNAME_CSWlibdbusdev = libdbusdev -DISTFILES += CSWdbus.preinstall -DISTFILES += cswdbus +PACKAGES += CSWdbus +CATALOGNAME_CSWdbus = dbus +SPKG_DESC_CSWdbus = $(DESCRIPTION) +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWdbus += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWdbus += CSWlibdbus1-3 +# These are search pathes: +# /opt/csw/share:/usr/local/share:/usr/share: +CHECKPKG_OVERRIDES_CSWdbus += file-with-bad-content|/usr/local|root/opt/csw/libexec/dbus-daemon-launch-helper +CHECKPKG_OVERRIDES_CSWdbus += file-with-bad-content|/usr/share|root/opt/csw/libexec/dbus-daemon-launch-helper +CHECKPKG_OVERRIDES_CSWdbus += file-with-bad-content|/usr/local|root/opt/csw/bin/dbus-daemon +CHECKPKG_OVERRIDES_CSWdbus += file-with-bad-content|/usr/share|root/opt/csw/bin/dbus-daemon +# This is an example +CHECKPKG_OVERRIDES_CSWdbus += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/dbus-daemon.1 -# Dynamic CSWlibdbusdev prototype -PKGFILES_CSWlibdbusdev = $(PKGFILES_DEVEL) -PKGFILES_CSWlibdbusdev += $(libdir)/dbus-1.0/.* +PACKAGES += CSWlibdbus1-3 +SPKG_DESC_CSWlibdbus1-3 = DBus message bus system, libdbus-1.so.3 +PKGFILES_CSWlibdbus1-3 += $(call pkgfiles_lib,libdbus-1.so.3) +OBSOLETED_BY_CSWlibdbus1-3 += CSWlibdbus +# These are search pathes: +# /opt/csw/share:/usr/local/share:/usr/share: +CHECKPKG_OVERRIDES_CSWlibdbus1-3 += file-with-bad-content|/usr/local|root/opt/csw/lib/libdbus-1.so.3.6.3 +CHECKPKG_OVERRIDES_CSWlibdbus1-3 += file-with-bad-content|/usr/share|root/opt/csw/lib/libdbus-1.so.3.6.3 +CHECKPKG_OVERRIDES_CSWlibdbus1-3 += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libdbus-1.so.3.6.3 +CHECKPKG_OVERRIDES_CSWlibdbus1-3 += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libdbus-1.so.3.6.3 -# Dynamic CSWlibdbus prototype -PKGFILES_CSWlibdbus = $(PKGFILES_RT) +PACKAGES += CSWlibdbus-dev +SPKG_DESC_CSWlibdbus-dev = Development files for libdbus +PKGFILES_CSWlibdbus-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWlibdbus-dev += $(call baseisadirs,$(libdir),dbus-1.0/.*) +PKGFILES_CSWlibdbus-dev += $(docdir)/.* +RUNTIME_DEP_PKGS_CSWlibdbus-dev += CSWlibdbus1-3 +OBSOLETED_BY_CSWlibdbus-dev += CSWlibdbusdev +# These are docs +CHECKPKG_OVERRIDES_CSWlibdbus-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/dbus/api/group__DBusSysdeps.html +CHECKPKG_OVERRIDES_CSWlibdbus-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/dbus/api/dbus-sysdeps-unix_8c_source.html +CHECKPKG_OVERRIDES_CSWlibdbus-dev += file-with-bad-content|/usr/share|root/opt/csw/share/doc/dbus/api/dbus-sysdeps-unix_8c_source.html +CHECKPKG_OVERRIDES_CSWlibdbus-dev += file-with-bad-content|/usr/share|root/opt/csw/share/doc/dbus/api/group__DBusSysdeps.html +CHECKPKG_OVERRIDES_CSWlibdbus-dev += file-with-bad-content|/usr/share|root/opt/csw/share/doc/dbus/system-activation.txt -# Dependencies tracking -RUNTIME_DEP_PKGS_CSWdbus = CSWexpat CSWlibdbus CSWcswclassutils -RUNTIME_DEP_PKGS_CSWlibdbusdev = CSWlibdbus +INITSMF += /etc/opt/csw/init.d/cswdbus +PRESERVECONF += /etc/opt/csw/dbus-1/system.conf +PRESERVECONF += /etc/opt/csw/dbus-1/session.conf -CHECKPKG_OVERRIDES_CSWlibdbusdev += surplus-dependency|CSWlibdbus -CHECKPKG_OVERRIDES_CSWdbus += action-class-only-in-pkginfo|cswinitsmf -CHECKPKG_OVERRIDES_CSWdbus += action-class-only-in-pkginfo|cswcpsampleconf +MIGRATECONF += dbus-1/session.conf +MIGRATECONF += dbus-1/system.conf -# SMF support -SPKG_CLASSES_CSWdbus = none cswcpsampleconf cswinitsmf -PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswdbus$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/system.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } $$$$3 ~ /\/session.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } { print }' - +USERGROUP = /etc/opt/csw/pkg/CSWdbus/cswusergroup + CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --disable-tests --with-xml=expat +CONFIGURE_ARGS += --disable-tests +CONFIGURE_ARGS += --with-xml=expat -EXTRA_CPPFLAGS = -D_XPG4_2 +# Needed for sockaddr_in6 +EXTRA_CFLAGS += -D__EXTENSIONS__ BUILD64 = 1 -PATCHFILES += dbus-sysdeps-unix.c.diff -PATCHFILES += dbus-sysdeps.h.diff - -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - include gar/category.mk -# moving configuration file & installing init script -post-install: - ( OLDDIR=`pwd` && cd $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))/opt/csw/etc/dbus-1 && \ - for i in *.conf ; do mv $$i $$i.CSW ; done && cd $$OLDDIR ; \ - ginstall -d $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))/etc/opt/csw/init.d ; \ - cp -fr $(FILEDIR)/cswdbus $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))/etc/opt/csw/init.d ; \ - ginstall -d $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))/etc/rc3.d/ ; \ - ln -s ../init.d/cswdbus $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))/etc/rc3.d/S52cswdbus ; ) - @$(MAKECOOKIE) +post-merge: + ginstall -d $(PKGROOT)/etc/opt/csw/init.d + ginstall $(WORKDIR)/cswdbus $(PKGROOT)/etc/opt/csw/init.d/cswdbus + ginstall -d $(PKGROOT)/etc/opt/csw/pkg/CSWdbus + ginstall $(WORKDIR)/cswusergroup $(PKGROOT)/etc/opt/csw/pkg/CSWdbus/cswusergroup - Modified: csw/mgar/pkg/dbus/trunk/checksums =================================================================== --- csw/mgar/pkg/dbus/trunk/checksums 2011-08-11 16:10:50 UTC (rev 15313) +++ csw/mgar/pkg/dbus/trunk/checksums 2011-08-11 16:36:34 UTC (rev 15314) @@ -1,5 +1 @@ -6e26e51243c4551ac222112edf67b5db CSWdbus.preinstall -9222a44088c837eba62822e330de713f cswdbus -1aab02bdcac4d662d3760896790f0ede dbus-1.3.1.tar.gz -862baa44c7b80476643ad76065607d92 dbus-sysdeps-unix.c.diff -5d584064f7e6a50bf54750ae56d7e29e dbus-sysdeps.h.diff +0cf9cb877a5c1508b89844050ff9f45f dbus-1.5.6.tar.gz Added: csw/mgar/pkg/dbus/trunk/files/0001-Use-LOG_PERROR-only-when-available.patch =================================================================== --- csw/mgar/pkg/dbus/trunk/files/0001-Use-LOG_PERROR-only-when-available.patch (rev 0) +++ csw/mgar/pkg/dbus/trunk/files/0001-Use-LOG_PERROR-only-when-available.patch 2011-08-11 16:36:34 UTC (rev 15314) @@ -0,0 +1,30 @@ +From 940bca742236bc7be8ff157175b43630f6bf84dd Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 11 Aug 2011 17:28:18 +0200 +Subject: [PATCH] Use LOG_PERROR only when available + +--- + dbus/dbus-sysdeps-util-unix.c | 7 ++++++- + 1 files changed, 6 insertions(+), 1 deletions(-) + +diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c +index a80f643..079a14d 100644 +--- a/dbus/dbus-sysdeps-util-unix.c ++++ b/dbus/dbus-sysdeps-util-unix.c +@@ -425,7 +425,12 @@ _dbus_request_file_descriptor_limit (unsigned int limit) + void + _dbus_init_system_log (void) + { +- openlog ("dbus", LOG_PID | LOG_PERROR, LOG_DAEMON); ++ openlog ("dbus", LOG_PID ++#ifdef LOG_PERROR ++ | LOG_PERROR ++#endif ++ , LOG_DAEMON); ++ + } + /** + * Log a message to the system log file (e.g. syslog on Unix). +-- +1.7.6 + Deleted: csw/mgar/pkg/dbus/trunk/files/CSWdbus.preinstall =================================================================== --- csw/mgar/pkg/dbus/trunk/files/CSWdbus.preinstall 2011-08-11 16:10:50 UTC (rev 15313) +++ csw/mgar/pkg/dbus/trunk/files/CSWdbus.preinstall 2011-08-11 16:36:34 UTC (rev 15314) @@ -1,32 +0,0 @@ -#!/bin/sh - -# test if the messagebus group exist, if not create it -eval getent group messagebus > /dev/null -if test $? -gt 0 -then - groupadd messagebus > /dev/null - echo group messagebus has been added - - eval getent group messagebus > /dev/null - if test $? -gt 0 - then - echo ERROR: Failed to add group messagebus - exit 1 - fi -fi - -# test if the messagebus user exist, if not create it -eval getent passwd messagebus > /dev/null -if test $? -gt 0 -then - useradd -c "DBus daemon user" -g messagebus -d /opt/csw/share -s /bin/sh messagebus > /dev/null - echo user messagebus has been added - - eval getent passwd messagebus > /dev/null - if test $? -gt 0 - then - echo ERROR: Failed to add user messagebus - exit 1 - fi -fi - Modified: csw/mgar/pkg/dbus/trunk/files/cswdbus =================================================================== --- csw/mgar/pkg/dbus/trunk/files/cswdbus 2011-08-11 16:10:50 UTC (rev 15313) +++ csw/mgar/pkg/dbus/trunk/files/cswdbus 2011-08-11 16:36:34 UTC (rev 15314) @@ -8,8 +8,8 @@ . /lib/svc/share/smf_include.sh -DBUS_VAR_DIR=/opt/csw/var/lib/dbus -DBUS_VAR_RUN_DIR=/opt/csw/var/run/dbus +DBUS_VAR_DIR=/var/opt/csw/lib/dbus +DBUS_VAR_RUN_DIR=/var/opt/csw/run/dbus DBUS_MACHINE_ID_FILE=machine-id if [ ! -d $DBUS_VAR_DIR ]; then @@ -22,7 +22,7 @@ if smf_is_nonglobalzone; then /usr/sbin/svcadm disable -t svc:/system/cswdbus - echo "dbus-daemon cannot be run in non-global zones" + echo "dbus-daemon cannot be run in non-global zones" sleep 5 & exit $SMF_EXIT_OK fi Copied: csw/mgar/pkg/dbus/trunk/files/cswusergroup (from rev 15311, csw/mgar/pkg/dbus/trunk/files/CSWdbus.preinstall) =================================================================== --- csw/mgar/pkg/dbus/trunk/files/cswusergroup (rev 0) +++ csw/mgar/pkg/dbus/trunk/files/cswusergroup 2011-08-11 16:36:34 UTC (rev 15314) @@ -0,0 +1 @@ +messagebus:messagebus:/opt/csw/share:/bin/false:::*LK* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Aug 11 21:48:26 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 11 Aug 2011 19:48:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[15315] csw/mgar/pkg/gcc4/trunk/files Message-ID: Revision: 15315 http://gar.svn.sourceforge.net/gar/?rev=15315&view=rev Author: wahwah Date: 2011-08-11 19:48:26 +0000 (Thu, 11 Aug 2011) Log Message: ----------- pkg/gcc4/trunk: package definitions grouped by package Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/files/package_def.mk csw/mgar/pkg/gcc4/trunk/files/package_files.mk Modified: csw/mgar/pkg/gcc4/trunk/files/package_def.mk =================================================================== --- csw/mgar/pkg/gcc4/trunk/files/package_def.mk 2011-08-11 16:36:34 UTC (rev 15314) +++ csw/mgar/pkg/gcc4/trunk/files/package_def.mk 2011-08-11 19:48:26 UTC (rev 15315) @@ -1,89 +1,170 @@ ### Package Section ### PACKAGES = CSWgcc4ada +CATALOGNAME_CSWgcc4ada = gcc4ada +SPKG_DESC_CSWgcc4ada = GNU C ADA Compiler +RUNTIME_DEP_PKGS_CSWgcc4ada = CSWgcc4adart CSWiconv CSWlibgmp CSWlibmpfr +PKGFILES_CSWgcc4ada = .*/gcc4/libexec/.*gnat1 +PKGFILES_CSWgcc4ada += .*/gcc4/lib/.*libgnat.*a +PKGFILES_CSWgcc4ada += .*/gcc4/lib/.*libgnarl.*a +PKGFILES_CSWgcc4ada += .*/gcc4/.*/adalib/.* +PKGFILES_CSWgcc4ada += .*/gcc4/.*/adainclude/.* +PKGFILES_CSWgcc4ada += .*/gcc4/info/.*gnat.* +PKGFILES_CSWgcc4ada += .*/gcc4/bin/gnat(?!ive).* +## gcc4adart +PKGFILES_CSWgcc4adart = .*/gcc4/lib/.*libgnat.*\.so.* +PKGFILES_CSWgcc4adart += .*/gcc4/lib/.*libgnarl.*\.so.* + PACKAGES += CSWgcc4adart +CATALOGNAME_CSWgcc4adart = gcc4adart +SPKG_DESC_CSWgcc4adart = GNU C ADA Compiler Run Time +RUNTIME_DEP_PKGS_CSWgcc4adart = CSWgcc4corert + PACKAGES += CSWgcc4core +CATALOGNAME_CSWgcc4core = gcc4core +SPKG_DESC_CSWgcc4core = GNU C Compiler +RUNTIME_DEP_PKGS_CSWgcc4core = CSWgcc4corert CSWbinutils CSWiconv +RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibgmp CSWlibmpfr +# Catch-all package + PACKAGES += CSWgcc4corert +CATALOGNAME_CSWgcc4corert = gcc4corert +SPKG_DESC_CSWgcc4corert = GNU C Compiler Run Time +## gcc4corert +PKGFILES_CSWgcc4corert = .*/gcc4/lib/.*libgcc_s.*\.so.* +PKGFILES_CSWgcc4corert += .*/gcc4/lib/.*libgomp.*\.so.* +PKGFILES_CSWgcc4corert += .*/gcc4/lib/.*libssp.*\.so.* + PACKAGES += CSWgcc4g++ +CATALOGNAME_CSWgcc4g++ = gcc4g++ +SPKG_DESC_CSWgcc4g++ = GNU C++ Compiler +RUNTIME_DEP_PKGS_CSWgcc4g++ = CSWgcc4g++rt CSWiconv CSWlibgmp CSWlibmpfr +PKGFILES_CSWgcc4g++ = .*/gcc4/bin/.*g\+\+ +PKGFILES_CSWgcc4g++ += .*/gcc4/bin/.*c\+\+ +PKGFILES_CSWgcc4g++ += .*/gcc4/libexec/.*cc1plus +PKGFILES_CSWgcc4g++ += .*/gcc4/lib/.*libstdc.*a +PKGFILES_CSWgcc4g++ += .*/gcc4/lib/.*libsupc\+\+.*a +PKGFILES_CSWgcc4g++ += .*/gcc4/man/.*g\+\+.1 +PKGFILES_CSWgcc4g++ += .*/gcc4/include/c\+\+/(\d+(?:\.\d+)*)/[a-fA-F,h-iH-I,k-nI-N,p-zP-Z,]+.* +PKGFILES_CSWgcc4g++ += .*/gcc4/include/c\+\+/(\d+(?:\.\d+)*)/ostream.* + PACKAGES += CSWgcc4g++rt +CATALOGNAME_CSWgcc4g++rt = gcc4g++rt +SPKG_DESC_CSWgcc4g++rt = GNU C++ Compiler Run Time +RUNTIME_DEP_PKGS_CSWgcc4g++rt = CSWgcc4corert +PKGFILES_CSWgcc4g++rt = .*/gcc4/lib/.*libstdc.*\.so.* +PKGFILES_CSWgcc4g++rt += .*/gcc4/lib/.*libsupc\+\+.*\.so.* + + PACKAGES += CSWgcc4gfortran +CATALOGNAME_CSWgcc4gfortran = gcc4gfortran +SPKG_DESC_CSWgcc4gfortran = GNU Fortran Compiler +RUNTIME_DEP_PKGS_CSWgcc4gfortran = CSWgcc4gfortranrt CSWiconv CSWlibgmp +RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibmpfr +PKGFILES_CSWgcc4gfortran = .*/gcc4/bin/.*gfortran +PKGFILES_CSWgcc4gfortran += .*/gcc4/lib/.*libgfortran.*a +PKGFILES_CSWgcc4gfortran += .*/gcc4/libexec/.*f951 +PKGFILES_CSWgcc4gfortran += .*/gcc4/man/.*gfortran.1 +PKGFILES_CSWgcc4gfortran += .*/gcc4/info/gfortran.* + PACKAGES += CSWgcc4gfortranrt +CATALOGNAME_CSWgcc4gfortranrt = gcc4gfortranrt +SPKG_DESC_CSWgcc4gfortranrt = GNU Fortran Compiler Run Time +RUNTIME_DEP_PKGS_CSWgcc4gfortranrt = CSWgcc4corert +PKGFILES_CSWgcc4gfortranrt = .*/gcc4/lib/.*libgfortran.*\.so.* + PACKAGES += CSWgcc4java +CATALOGNAME_CSWgcc4java = gcc4java +SPKG_DESC_CSWgcc4java = GNU Java Compiler +RUNTIME_DEP_PKGS_CSWgcc4java = CSWgcc4corert CSWgcc4javart +RUNTIME_DEP_PKGS_CSWgcc4java += CSWzlib CSWiconv CSWlibgmp CSWlibmpfr +PKGFILES_CSWgcc4java = .*/gcc4/bin/.*gcj.* +PKGFILES_CSWgcc4java += .*/gcc4/bin/.*jv-scan +PKGFILES_CSWgcc4java += .*/gcc4/bin/.*jv-convert +PKGFILES_CSWgcc4java += .*/gcc4/bin/.*jcf-dump +PKGFILES_CSWgcc4java += .*/gcc4/bin/.*grmi.* +PKGFILES_CSWgcc4java += .*/gcc4/bin/.*grepjar +PKGFILES_CSWgcc4java += .*/gcc4/bin/.*gjnih +PKGFILES_CSWgcc4java += .*/gcc4/bin/.*gij +PKGFILES_CSWgcc4java += .*/gcc4/bin/.*fastjar +PKGFILES_CSWgcc4java += .*/gcc4/bin/.*gjar.* +PKGFILES_CSWgcc4java += .*/gcc4/bin/.*gjavah +PKGFILES_CSWgcc4java += .*/gcc4/bin/.*gorbd +PKGFILES_CSWgcc4java += .*/gcc4/bin/.*addr2name.awk +PKGFILES_CSWgcc4java += .*/gcc4/bin/.*gappletviewer +PKGFILES_CSWgcc4java += .*/gcc4/bin/.*gkeytool +PKGFILES_CSWgcc4java += .*/gcc4/bin/.*gserialver +PKGFILES_CSWgcc4java += .*/gcc4/bin/.*gtnameserv +PKGFILES_CSWgcc4java += .*/gcc4/bin/.*gnative2ascii +PKGFILES_CSWgcc4java += .*/gcc4/bin/.*gc-analyze +PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gcj.* +PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gij.* +PKGFILES_CSWgcc4java += .*/gcc4/man/.*/jv.* +PKGFILES_CSWgcc4java += .*/gcc4/man/.*/jcf.* +PKGFILES_CSWgcc4java += .*/gcc4/man/.*/grmi.* +PKGFILES_CSWgcc4java += .*/gcc4/man/.*jar.* +PKGFILES_CSWgcc4java += .*/gcc4/man/.*jni.* +PKGFILES_CSWgcc4java += .*/gcc4/man/.*java.* +PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gorbd.* +PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gapplet.* +PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gkeytool.* +PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gserialver.* +PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gtnameserv.* +PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gnative2ascii.* +PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gc-analyze.* +PKGFILES_CSWgcc4java += .*/gcc4/share/java/.* +PKGFILES_CSWgcc4java += .*/gcc4/lib/.*libgij.*a +PKGFILES_CSWgcc4java += .*/gcc4/lib/.*libffi.*a +PKGFILES_CSWgcc4java += .*/gcc4/lib/.*lib-gnu-awt.*a +PKGFILES_CSWgcc4java += .*/gcc4/lib/.*security.* +PKGFILES_CSWgcc4java += .*/gcc4/lib/.*logging.properties +PKGFILES_CSWgcc4java += .*/gcc4/lib/.*pkgconfig.* +PKGFILES_CSWgcc4java += .*/gcc4/lib/.*gcj.*a +PKGFILES_CSWgcc4java += .*/gcc4/lib/.*libgcj.*a +PKGFILES_CSWgcc4java += .*/gcc4/libexec/.*collect.* +PKGFILES_CSWgcc4java += .*/gcc4/libexec/.*jvgenmain +PKGFILES_CSWgcc4java += .*/gcc4/libexec/.*jc1.* +PKGFILES_CSWgcc4java += .*/gcc4/info/gcj.* +PKGFILES_CSWgcc4java += .*/gcc4/include/.*gcj/.* +PKGFILES_CSWgcc4java += .*/gcc4/include/.*awt/.* +PKGFILES_CSWgcc4java += .*/gcc4/include/.*classpath/.* +PKGFILES_CSWgcc4java += .*/gcc4/include/.*java.* +PKGFILES_CSWgcc4java += .*/gcc4/include/.*ffi.h +PKGFILES_CSWgcc4java += .*/gcc4/include/.*org/.* + PACKAGES += CSWgcc4javart +CATALOGNAME_CSWgcc4javart = gcc4javart +SPKG_DESC_CSWgcc4javart = GNU Java Compiler Run Time +RUNTIME_DEP_PKGS_CSWgcc4javart = CSWgcc4corert CSWgcc4g++rt +PKGFILES_CSWgcc4javart = .*/gcc4/lib/.*libgij.*\.so.* +PKGFILES_CSWgcc4javart += .*/gcc4/lib/.*libffi.*\.so.* +PKGFILES_CSWgcc4javart += .*/gcc4/lib/.*lib-gnu-awt.*\.so.* +PKGFILES_CSWgcc4javart += .*/gcc4/lib/.*security/classpath.* +PKGFILES_CSWgcc4javart += .*/gcc4/lib/.*logging.properties +PKGFILES_CSWgcc4javart += .*/gcc4/lib/.*pkgconfig.* +PKGFILES_CSWgcc4javart += .*/gcc4/lib/.*gcj.*\.so.* +PKGFILES_CSWgcc4javart += .*/gcc4/lib/.*libgcj.*\.so.* + PACKAGES += CSWgcc4objc +CATALOGNAME_CSWgcc4objc = gcc4objc +SPKG_DESC_CSWgcc4objc = GNU Objective C Compiler +RUNTIME_DEP_PKGS_CSWgcc4objc = CSWgcc4objcrt CSWiconv CSWlibgmp CSWlibmpfr +PKGFILES_CSWgcc4objc = .*/gcc4/libexec/.*cc1obj +PKGFILES_CSWgcc4objc += .*/gcc4/lib/.*libobjc.*a +PKGFILES_CSWgcc4objc += .*/gcc4/include/.*objc/.* +PKGFILES_CSWgcc4objc += .*/gcc4/lib/.*/include/objc/.* + PACKAGES += CSWgcc4objcrt +CATALOGNAME_CSWgcc4objcrt = gcc4objcrt +SPKG_DESC_CSWgcc4objcrt = GNU Objective C Compiler Run Time +RUNTIME_DEP_PKGS_CSWgcc4objcrt = CSWgcc4corert +PKGFILES_CSWgcc4objcrt = .*/gcc4/lib/.*libobjc.*\.so.* -## Define Package Catalog Names -CATALOGNAME_CSWgcc4ada = gcc4ada -CATALOGNAME_CSWgcc4adart = gcc4adart -CATALOGNAME_CSWgcc4core = gcc4core -CATALOGNAME_CSWgcc4corert = gcc4corert -CATALOGNAME_CSWgcc4g++ = gcc4g++ -CATALOGNAME_CSWgcc4g++rt = gcc4g++rt -CATALOGNAME_CSWgcc4gfortran = gcc4gfortran -CATALOGNAME_CSWgcc4gfortranrt = gcc4gfortranrt -CATALOGNAME_CSWgcc4java = gcc4java -CATALOGNAME_CSWgcc4javart = gcc4javart -CATALOGNAME_CSWgcc4objc = gcc4objc -CATALOGNAME_CSWgcc4objcrt = gcc4objcrt - ## Source URLs -SPKG_SOURCEURL_CSWgcc4ada = http://gcc.gnu.org -SPKG_SOURCEURL_CSWgcc4adart = http://gcc.gnu.org -SPKG_SOURCEURL_CSWgcc4core = http://gcc.gnu.org -SPKG_SOURCEURL_CSWgcc4corert = http://gcc.gnu.org -SPKG_SOURCEURL_CSWgcc4g++ = http://gcc.gnu.org -SPKG_SOURCEURL_CSWgcc4g++rt = http://gcc.gnu.org -SPKG_SOURCEURL_CSWgcc4gfortran = http://gcc.gnu.org -SPKG_SOURCEURL_CSWgcc4gfortranrt = http://gcc.gnu.org -SPKG_SOURCEURL_CSWgcc4java = http://gcc.gnu.org -SPKG_SOURCEURL_CSWgcc4javart = http://gcc.gnu.org -SPKG_SOURCEURL_CSWgcc4objc = http://gcc.gnu.org -SPKG_SOURCEURL_CSWgcc4objcrt = http://gcc.gnu.org +VENDOR_URL = http://gcc.gnu.org ## Copyright File -LICENSE_CSWgcc4ada = COPYING3 -LICENSE_CSWgcc4adart = COPYING3 -LICENSE_CSWgcc4core = COPYING3 -LICENSE_CSWgcc4corert = COPYING3 -LICENSE_CSWgcc4g++ = COPYING3 -LICENSE_CSWgcc4g++rt = COPYING3 -LICENSE_CSWgcc4gfortran = COPYING3 -LICENSE_CSWgcc4gfortranrt = COPYING3 -LICENSE_CSWgcc4java = COPYING3 -LICENSE_CSWgcc4javart = COPYING3 -LICENSE_CSWgcc4objc = COPYING3 -LICENSE_CSWgcc4objcrt = COPYING3 +LICENSE = COPYING3 -## Define Package Descriptions -SPKG_DESC_CSWgcc4ada = GNU C ADA Compiler -SPKG_DESC_CSWgcc4adart = GNU C ADA Compiler Run Time -SPKG_DESC_CSWgcc4core = GNU C Compiler -SPKG_DESC_CSWgcc4corert = GNU C Compiler Run Time -SPKG_DESC_CSWgcc4g++ = GNU C++ Compiler -SPKG_DESC_CSWgcc4g++rt = GNU C++ Compiler Run Time -SPKG_DESC_CSWgcc4gfortran = GNU Fortran Compiler -SPKG_DESC_CSWgcc4gfortranrt = GNU Fortran Compiler Run Time -SPKG_DESC_CSWgcc4java = GNU Java Compiler -SPKG_DESC_CSWgcc4javart = GNU Java Compiler Run Time -SPKG_DESC_CSWgcc4objc = GNU Objective C Compiler -SPKG_DESC_CSWgcc4objcrt = GNU Objective C Compiler Run Time - -## Define Dependencies -RUNTIME_DEP_PKGS_CSWgcc4adart = CSWgcc4corert -RUNTIME_DEP_PKGS_CSWgcc4ada = CSWgcc4adart CSWiconv CSWlibgmp CSWlibmpfr -RUNTIME_DEP_PKGS_CSWgcc4core = CSWgcc4corert CSWbinutils CSWiconv -RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibgmp CSWlibmpfr -RUNTIME_DEP_PKGS_CSWgcc4g++rt = CSWgcc4corert -RUNTIME_DEP_PKGS_CSWgcc4g++ = CSWgcc4g++rt CSWiconv CSWlibgmp CSWlibmpfr -RUNTIME_DEP_PKGS_CSWgcc4gfortranrt = CSWgcc4corert -RUNTIME_DEP_PKGS_CSWgcc4gfortran = CSWgcc4gfortranrt CSWiconv CSWlibgmp -RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibmpfr -RUNTIME_DEP_PKGS_CSWgcc4javart = CSWgcc4corert CSWgcc4g++rt -RUNTIME_DEP_PKGS_CSWgcc4java = CSWgcc4corert CSWgcc4javart -RUNTIME_DEP_PKGS_CSWgcc4java += CSWzlib CSWiconv CSWlibgmp CSWlibmpfr -RUNTIME_DEP_PKGS_CSWgcc4objcrt = CSWgcc4corert -RUNTIME_DEP_PKGS_CSWgcc4objc = CSWgcc4objcrt CSWiconv CSWlibgmp CSWlibmpfr - DISTFILES += CSWgcc4core.space define CSWgcc4core_postinstall @@ -152,4 +233,3 @@ exit 0 endef - Modified: csw/mgar/pkg/gcc4/trunk/files/package_files.mk =================================================================== --- csw/mgar/pkg/gcc4/trunk/files/package_files.mk 2011-08-11 16:36:34 UTC (rev 15314) +++ csw/mgar/pkg/gcc4/trunk/files/package_files.mk 2011-08-11 19:48:26 UTC (rev 15315) @@ -1,118 +1 @@ -## Define the Contents of the Packages - -## gcc4ada Definitions -PKGFILES_CSWgcc4ada = .*/gcc4/libexec/.*gnat1 -PKGFILES_CSWgcc4ada += .*/gcc4/lib/.*libgnat.*a -PKGFILES_CSWgcc4ada += .*/gcc4/lib/.*libgnarl.*a -PKGFILES_CSWgcc4ada += .*/gcc4/.*/adalib/.* -PKGFILES_CSWgcc4ada += .*/gcc4/.*/adainclude/.* -PKGFILES_CSWgcc4ada += .*/gcc4/info/.*gnat.* -PKGFILES_CSWgcc4ada += .*/gcc4/bin/gnat(?!ive).* - -## gcc4gfortran Definitions -PKGFILES_CSWgcc4gfortran = .*/gcc4/bin/.*gfortran -PKGFILES_CSWgcc4gfortran += .*/gcc4/lib/.*libgfortran.*a -PKGFILES_CSWgcc4gfortran += .*/gcc4/libexec/.*f951 -PKGFILES_CSWgcc4gfortran += .*/gcc4/man/.*gfortran.1 -PKGFILES_CSWgcc4gfortran += .*/gcc4/info/gfortran.* - -## gcc4g++ Definitions -PKGFILES_CSWgcc4g++ = .*/gcc4/bin/.*g\+\+ -PKGFILES_CSWgcc4g++ += .*/gcc4/bin/.*c\+\+ -PKGFILES_CSWgcc4g++ += .*/gcc4/libexec/.*cc1plus -PKGFILES_CSWgcc4g++ += .*/gcc4/lib/.*libstdc.*a -PKGFILES_CSWgcc4g++ += .*/gcc4/lib/.*libsupc\+\+.*a -PKGFILES_CSWgcc4g++ += .*/gcc4/man/.*g\+\+.1 -PKGFILES_CSWgcc4g++ += .*/gcc4/include/c\+\+/(\d+(?:\.\d+)*)/[a-fA-F,h-iH-I,k-nI-N,p-zP-Z,]+.* -PKGFILES_CSWgcc4g++ += .*/gcc4/include/c\+\+/(\d+(?:\.\d+)*)/ostream.* - -## gcc4java Definitions -PKGFILES_CSWgcc4java = .*/gcc4/bin/.*gcj.* -PKGFILES_CSWgcc4java += .*/gcc4/bin/.*jv-scan -PKGFILES_CSWgcc4java += .*/gcc4/bin/.*jv-convert -PKGFILES_CSWgcc4java += .*/gcc4/bin/.*jcf-dump -PKGFILES_CSWgcc4java += .*/gcc4/bin/.*grmi.* -PKGFILES_CSWgcc4java += .*/gcc4/bin/.*grepjar -PKGFILES_CSWgcc4java += .*/gcc4/bin/.*gjnih -PKGFILES_CSWgcc4java += .*/gcc4/bin/.*gij -PKGFILES_CSWgcc4java += .*/gcc4/bin/.*fastjar -PKGFILES_CSWgcc4java += .*/gcc4/bin/.*gjar.* -PKGFILES_CSWgcc4java += .*/gcc4/bin/.*gjavah -PKGFILES_CSWgcc4java += .*/gcc4/bin/.*gorbd -PKGFILES_CSWgcc4java += .*/gcc4/bin/.*addr2name.awk -PKGFILES_CSWgcc4java += .*/gcc4/bin/.*gappletviewer -PKGFILES_CSWgcc4java += .*/gcc4/bin/.*gkeytool -PKGFILES_CSWgcc4java += .*/gcc4/bin/.*gserialver -PKGFILES_CSWgcc4java += .*/gcc4/bin/.*gtnameserv -PKGFILES_CSWgcc4java += .*/gcc4/bin/.*gnative2ascii -PKGFILES_CSWgcc4java += .*/gcc4/bin/.*gc-analyze -PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gcj.* -PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gij.* -PKGFILES_CSWgcc4java += .*/gcc4/man/.*/jv.* -PKGFILES_CSWgcc4java += .*/gcc4/man/.*/jcf.* -PKGFILES_CSWgcc4java += .*/gcc4/man/.*/grmi.* -PKGFILES_CSWgcc4java += .*/gcc4/man/.*jar.* -PKGFILES_CSWgcc4java += .*/gcc4/man/.*jni.* -PKGFILES_CSWgcc4java += .*/gcc4/man/.*java.* -PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gorbd.* -PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gapplet.* -PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gkeytool.* -PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gserialver.* -PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gtnameserv.* -PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gnative2ascii.* -PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gc-analyze.* -PKGFILES_CSWgcc4java += .*/gcc4/share/java/.* -PKGFILES_CSWgcc4java += .*/gcc4/lib/.*libgij.*a -PKGFILES_CSWgcc4java += .*/gcc4/lib/.*libffi.*a -PKGFILES_CSWgcc4java += .*/gcc4/lib/.*lib-gnu-awt.*a -PKGFILES_CSWgcc4java += .*/gcc4/lib/.*security.* -PKGFILES_CSWgcc4java += .*/gcc4/lib/.*logging.properties -PKGFILES_CSWgcc4java += .*/gcc4/lib/.*pkgconfig.* -PKGFILES_CSWgcc4java += .*/gcc4/lib/.*gcj.*a -PKGFILES_CSWgcc4java += .*/gcc4/lib/.*libgcj.*a -PKGFILES_CSWgcc4java += .*/gcc4/libexec/.*collect.* -PKGFILES_CSWgcc4java += .*/gcc4/libexec/.*jvgenmain -PKGFILES_CSWgcc4java += .*/gcc4/libexec/.*jc1.* -PKGFILES_CSWgcc4java += .*/gcc4/info/gcj.* -PKGFILES_CSWgcc4java += .*/gcc4/include/.*gcj/.* -PKGFILES_CSWgcc4java += .*/gcc4/include/.*awt/.* -PKGFILES_CSWgcc4java += .*/gcc4/include/.*classpath/.* -PKGFILES_CSWgcc4java += .*/gcc4/include/.*java.* -PKGFILES_CSWgcc4java += .*/gcc4/include/.*ffi.h -PKGFILES_CSWgcc4java += .*/gcc4/include/.*org/.* - -## gcc4objc Definitions -PKGFILES_CSWgcc4objc = .*/gcc4/libexec/.*cc1obj -PKGFILES_CSWgcc4objc += .*/gcc4/lib/.*libobjc.*a -PKGFILES_CSWgcc4objc += .*/gcc4/include/.*objc/.* -PKGFILES_CSWgcc4objc += .*/gcc4/lib/.*/include/objc/.* -####### RunTime Packages - -## gcc4adart -PKGFILES_CSWgcc4adart = .*/gcc4/lib/.*libgnat.*\.so.* -PKGFILES_CSWgcc4adart += .*/gcc4/lib/.*libgnarl.*\.so.* - -## gcc4corert -PKGFILES_CSWgcc4corert = .*/gcc4/lib/.*libgcc_s.*\.so.* -PKGFILES_CSWgcc4corert += .*/gcc4/lib/.*libgomp.*\.so.* -PKGFILES_CSWgcc4corert += .*/gcc4/lib/.*libssp.*\.so.* - -## gcc4gfortranrt -PKGFILES_CSWgcc4gfortranrt = .*/gcc4/lib/.*libgfortran.*\.so.* - -## gcc4g++rt -PKGFILES_CSWgcc4g++rt = .*/gcc4/lib/.*libstdc.*\.so.* -PKGFILES_CSWgcc4g++rt += .*/gcc4/lib/.*libsupc\+\+.*\.so.* - -## gcc4javart -PKGFILES_CSWgcc4javart = .*/gcc4/lib/.*libgij.*\.so.* -PKGFILES_CSWgcc4javart += .*/gcc4/lib/.*libffi.*\.so.* -PKGFILES_CSWgcc4javart += .*/gcc4/lib/.*lib-gnu-awt.*\.so.* -PKGFILES_CSWgcc4javart += .*/gcc4/lib/.*security/classpath.* -PKGFILES_CSWgcc4javart += .*/gcc4/lib/.*logging.properties -PKGFILES_CSWgcc4javart += .*/gcc4/lib/.*pkgconfig.* -PKGFILES_CSWgcc4javart += .*/gcc4/lib/.*gcj.*\.so.* -PKGFILES_CSWgcc4javart += .*/gcc4/lib/.*libgcj.*\.so.* - -## gcc4objc Runtime -PKGFILES_CSWgcc4objcrt = .*/gcc4/lib/.*libobjc.*\.so.* +# Contents moved to package_dev.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Thu Aug 11 22:25:55 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Thu, 11 Aug 2011 20:25:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[15316] csw/mgar/pkg/puppet/trunk/files Message-ID: Revision: 15316 http://gar.svn.sourceforge.net/gar/?rev=15316&view=rev Author: phipsy Date: 2011-08-11 20:25:55 +0000 (Thu, 11 Aug 2011) Log Message: ----------- puppet: fixed a typo in SMF startup file Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/files/cswpuppetd csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd Modified: csw/mgar/pkg/puppet/trunk/files/cswpuppetd =================================================================== --- csw/mgar/pkg/puppet/trunk/files/cswpuppetd 2011-08-11 19:48:26 UTC (rev 15315) +++ csw/mgar/pkg/puppet/trunk/files/cswpuppetd 2011-08-11 20:25:55 UTC (rev 15316) @@ -27,7 +27,7 @@ prefix="/opt/csw" exec_prefix="/opt/csw" -sysconfdir="/etc/csw/opt" +sysconfdir="/etc/opt/csw" sbindir="/opt/csw/sbin" localstatedir="/var/opt/csw" Modified: csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd =================================================================== --- csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd 2011-08-11 19:48:26 UTC (rev 15315) +++ csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd 2011-08-11 20:25:55 UTC (rev 15316) @@ -16,7 +16,7 @@ prefix=/opt/csw exec_prefix=/opt/csw -sysconfdir=/opt/csw/etc +sysconfdir=/etc/opt/csw sbindir=/opt/csw/sbin pidfile=`$prefix/bin/puppet master --genconf | awk '/pidfile/ { print $3 }'` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Aug 11 22:48:35 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 11 Aug 2011 20:48:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[15317] csw/mgar/pkg/gcc4/trunk/files Message-ID: Revision: 15317 http://gar.svn.sourceforge.net/gar/?rev=15317&view=rev Author: wahwah Date: 2011-08-11 20:48:35 +0000 (Thu, 11 Aug 2011) Log Message: ----------- pkg/gcc4/trunk: removing hardcoded /opt/csw in many places Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk csw/mgar/pkg/gcc4/trunk/files/gar_override.mk csw/mgar/pkg/gcc4/trunk/files/package_def.mk csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk Modified: csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk =================================================================== --- csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk 2011-08-11 20:25:55 UTC (rev 15316) +++ csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk 2011-08-11 20:48:35 UTC (rev 15317) @@ -72,45 +72,45 @@ $(_DBG)$(MAKECOOKIE) ifeq ($(shell uname -p), i386) -ISAEXEC_DIRS = /opt/csw/gcc4/bin -ISAEXEC_FILES += /opt/csw/gcc4/bin/gcc -ISAEXEC_FILES += /opt/csw/gcc4/bin/gcov -ISAEXEC_FILES += /opt/csw/gcc4/bin/gccbug -ISAEXEC_FILES += /opt/csw/gcc4/bin/gfortran -ISAEXEC_FILES += /opt/csw/gcc4/bin/c++ -ISAEXEC_FILES += /opt/csw/gcc4/bin/g++ -ISAEXEC_FILES += /opt/csw/gcc4/bin/cpp -ISAEXEC_FILES += /opt/csw/gcc4/bin/addr2name.awk -ISAEXEC_FILES += /opt/csw/gcc4/bin/gc-analyze -ISAEXEC_FILES += /opt/csw/gcc4/bin/gcjh -ISAEXEC_FILES += /opt/csw/gcc4/bin/gjarsigner -ISAEXEC_FILES += /opt/csw/gcc4/bin/grmic -ISAEXEC_FILES += /opt/csw/gcc4/bin/gjavah -ISAEXEC_FILES += /opt/csw/gcc4/bin/grmid -ISAEXEC_FILES += /opt/csw/gcc4/bin/jcf-dump -ISAEXEC_FILES += /opt/csw/gcc4/bin/gkeytool -ISAEXEC_FILES += /opt/csw/gcc4/bin/grmiregistry -ISAEXEC_FILES += /opt/csw/gcc4/bin/jv-convert -ISAEXEC_FILES += /opt/csw/gcc4/bin/gcj -ISAEXEC_FILES += /opt/csw/gcc4/bin/gij -ISAEXEC_FILES += /opt/csw/gcc4/bin/gserialver -ISAEXEC_FILES += /opt/csw/gcc4/bin/gappletviewer -ISAEXEC_FILES += /opt/csw/gcc4/bin/gcj-dbtool -ISAEXEC_FILES += /opt/csw/gcc4/bin/gjar -ISAEXEC_FILES += /opt/csw/gcc4/bin/gorbd -ISAEXEC_FILES += /opt/csw/gcc4/bin/gtnameserv -ISAEXEC_FILES += /opt/csw/gcc4/bin/gnative2ascii -ISAEXEC_FILES += /opt/csw/gcc4/bin/gnat -ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatls -ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatname -ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatmake -ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatclean -ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatkr -ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatbind -ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatbl -ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatchop -ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatfind -ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatxref -ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatprep -ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatlink +ISAEXEC_DIRS = $(bindir) +ISAEXEC_FILES += $(bindir)/gcc +ISAEXEC_FILES += $(bindir)/gcov +ISAEXEC_FILES += $(bindir)/gccbug +ISAEXEC_FILES += $(bindir)/gfortran +ISAEXEC_FILES += $(bindir)/c++ +ISAEXEC_FILES += $(bindir)/g++ +ISAEXEC_FILES += $(bindir)/cpp +ISAEXEC_FILES += $(bindir)/addr2name.awk +ISAEXEC_FILES += $(bindir)/gc-analyze +ISAEXEC_FILES += $(bindir)/gcjh +ISAEXEC_FILES += $(bindir)/gjarsigner +ISAEXEC_FILES += $(bindir)/grmic +ISAEXEC_FILES += $(bindir)/gjavah +ISAEXEC_FILES += $(bindir)/grmid +ISAEXEC_FILES += $(bindir)/jcf-dump +ISAEXEC_FILES += $(bindir)/gkeytool +ISAEXEC_FILES += $(bindir)/grmiregistry +ISAEXEC_FILES += $(bindir)/jv-convert +ISAEXEC_FILES += $(bindir)/gcj +ISAEXEC_FILES += $(bindir)/gij +ISAEXEC_FILES += $(bindir)/gserialver +ISAEXEC_FILES += $(bindir)/gappletviewer +ISAEXEC_FILES += $(bindir)/gcj-dbtool +ISAEXEC_FILES += $(bindir)/gjar +ISAEXEC_FILES += $(bindir)/gorbd +ISAEXEC_FILES += $(bindir)/gtnameserv +ISAEXEC_FILES += $(bindir)/gnative2ascii +ISAEXEC_FILES += $(bindir)/gnat +ISAEXEC_FILES += $(bindir)/gnatls +ISAEXEC_FILES += $(bindir)/gnatname +ISAEXEC_FILES += $(bindir)/gnatmake +ISAEXEC_FILES += $(bindir)/gnatclean +ISAEXEC_FILES += $(bindir)/gnatkr +ISAEXEC_FILES += $(bindir)/gnatbind +ISAEXEC_FILES += $(bindir)/gnatbl +ISAEXEC_FILES += $(bindir)/gnatchop +ISAEXEC_FILES += $(bindir)/gnatfind +ISAEXEC_FILES += $(bindir)/gnatxref +ISAEXEC_FILES += $(bindir)/gnatprep +ISAEXEC_FILES += $(bindir)/gnatlink endif Modified: csw/mgar/pkg/gcc4/trunk/files/gar_override.mk =================================================================== --- csw/mgar/pkg/gcc4/trunk/files/gar_override.mk 2011-08-11 20:25:55 UTC (rev 15316) +++ csw/mgar/pkg/gcc4/trunk/files/gar_override.mk 2011-08-11 20:48:35 UTC (rev 15317) @@ -8,7 +8,7 @@ WORKSRC = $(OBJECT_DIR) DIRPATHS = OPTFLAGS = -CONFIG_SHELL = /bin/bash +CONFIG_SHELL = /opt/csw/bin/bash GARCOMPILER = GCC3 GCC3_CC = /opt/csw/gcc3/bin/gcc -g -O2 -mcpu=v8 -pipe CFLAGS = -I/opt/csw/include Modified: csw/mgar/pkg/gcc4/trunk/files/package_def.mk =================================================================== --- csw/mgar/pkg/gcc4/trunk/files/package_def.mk 2011-08-11 20:25:55 UTC (rev 15316) +++ csw/mgar/pkg/gcc4/trunk/files/package_def.mk 2011-08-11 20:48:35 UTC (rev 15317) @@ -2,67 +2,74 @@ PACKAGES = CSWgcc4ada CATALOGNAME_CSWgcc4ada = gcc4ada SPKG_DESC_CSWgcc4ada = GNU C ADA Compiler -RUNTIME_DEP_PKGS_CSWgcc4ada = CSWgcc4adart CSWiconv CSWlibgmp CSWlibmpfr -PKGFILES_CSWgcc4ada = .*/gcc4/libexec/.*gnat1 -PKGFILES_CSWgcc4ada += .*/gcc4/lib/.*libgnat.*a -PKGFILES_CSWgcc4ada += .*/gcc4/lib/.*libgnarl.*a +PKGFILES_CSWgcc4ada = $(libexecdir)/.*gnat1 +PKGFILES_CSWgcc4ada += $(libdir)/.*libgnat.*a +PKGFILES_CSWgcc4ada += $(libdir)/.*libgnarl.*a PKGFILES_CSWgcc4ada += .*/gcc4/.*/adalib/.* PKGFILES_CSWgcc4ada += .*/gcc4/.*/adainclude/.* PKGFILES_CSWgcc4ada += .*/gcc4/info/.*gnat.* -PKGFILES_CSWgcc4ada += .*/gcc4/bin/gnat(?!ive).* -## gcc4adart -PKGFILES_CSWgcc4adart = .*/gcc4/lib/.*libgnat.*\.so.* -PKGFILES_CSWgcc4adart += .*/gcc4/lib/.*libgnarl.*\.so.* +PKGFILES_CSWgcc4ada += $(bindir)/gnat(?!ive).* +RUNTIME_DEP_PKGS_CSWgcc4ada = CSWgcc4adart +RUNTIME_DEP_PKGS_CSWgcc4ada += CSWlibmpfr4 +RUNTIME_DEP_PKGS_CSWgcc4ada += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWgcc4ada += CSWlibgmp10 PACKAGES += CSWgcc4adart CATALOGNAME_CSWgcc4adart = gcc4adart SPKG_DESC_CSWgcc4adart = GNU C ADA Compiler Run Time +PKGFILES_CSWgcc4adart = $(libdir)/.*libgnat.*\.so.* +PKGFILES_CSWgcc4adart += $(libdir)/.*libgnarl.*\.so.* RUNTIME_DEP_PKGS_CSWgcc4adart = CSWgcc4corert PACKAGES += CSWgcc4core CATALOGNAME_CSWgcc4core = gcc4core SPKG_DESC_CSWgcc4core = GNU C Compiler -RUNTIME_DEP_PKGS_CSWgcc4core = CSWgcc4corert CSWbinutils CSWiconv -RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibgmp CSWlibmpfr -# Catch-all package +RUNTIME_DEP_PKGS_CSWgcc4core = CSWgcc4corert CSWbinutils +RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibmpfr4 +RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibgmp10 PACKAGES += CSWgcc4corert CATALOGNAME_CSWgcc4corert = gcc4corert SPKG_DESC_CSWgcc4corert = GNU C Compiler Run Time -## gcc4corert -PKGFILES_CSWgcc4corert = .*/gcc4/lib/.*libgcc_s.*\.so.* -PKGFILES_CSWgcc4corert += .*/gcc4/lib/.*libgomp.*\.so.* -PKGFILES_CSWgcc4corert += .*/gcc4/lib/.*libssp.*\.so.* +PKGFILES_CSWgcc4corert = $(libdir)/.*libgcc_s.*\.so.* +PKGFILES_CSWgcc4corert += $(libdir)/.*libgomp.*\.so.* +PKGFILES_CSWgcc4corert += $(libdir)/.*libssp.*\.so.* PACKAGES += CSWgcc4g++ -CATALOGNAME_CSWgcc4g++ = gcc4g++ -SPKG_DESC_CSWgcc4g++ = GNU C++ Compiler -RUNTIME_DEP_PKGS_CSWgcc4g++ = CSWgcc4g++rt CSWiconv CSWlibgmp CSWlibmpfr -PKGFILES_CSWgcc4g++ = .*/gcc4/bin/.*g\+\+ -PKGFILES_CSWgcc4g++ += .*/gcc4/bin/.*c\+\+ -PKGFILES_CSWgcc4g++ += .*/gcc4/libexec/.*cc1plus -PKGFILES_CSWgcc4g++ += .*/gcc4/lib/.*libstdc.*a -PKGFILES_CSWgcc4g++ += .*/gcc4/lib/.*libsupc\+\+.*a +CATALOGNAME_CSWgcc4g++ = gcc4g++ +SPKG_DESC_CSWgcc4g++ = GNU C++ Compiler +PKGFILES_CSWgcc4g++ = $(bindir)/.*g\+\+ +PKGFILES_CSWgcc4g++ += $(bindir)/.*c\+\+ +PKGFILES_CSWgcc4g++ += $(libexecdir)/.*cc1plus +PKGFILES_CSWgcc4g++ += $(libdir)/.*libstdc.*a +PKGFILES_CSWgcc4g++ += $(libdir)/.*libsupc\+\+.*a PKGFILES_CSWgcc4g++ += .*/gcc4/man/.*g\+\+.1 -PKGFILES_CSWgcc4g++ += .*/gcc4/include/c\+\+/(\d+(?:\.\d+)*)/[a-fA-F,h-iH-I,k-nI-N,p-zP-Z,]+.* -PKGFILES_CSWgcc4g++ += .*/gcc4/include/c\+\+/(\d+(?:\.\d+)*)/ostream.* +PKGFILES_CSWgcc4g++ += $(includedir)/c\+\+/(\d+(?:\.\d+)*)/[a-fA-F,h-iH-I,k-nI-N,p-zP-Z,]+.* +PKGFILES_CSWgcc4g++ += $(includedir)/c\+\+/(\d+(?:\.\d+)*)/ostream.* +RUNTIME_DEP_PKGS_CSWgcc4g++ = CSWgcc4g++rt +RUNTIME_DEP_PKGS_CSWgcc4g++ += CSWlibmpfr4 +RUNTIME_DEP_PKGS_CSWgcc4g++ += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWgcc4g++ += CSWlibgmp10 PACKAGES += CSWgcc4g++rt -CATALOGNAME_CSWgcc4g++rt = gcc4g++rt -SPKG_DESC_CSWgcc4g++rt = GNU C++ Compiler Run Time -RUNTIME_DEP_PKGS_CSWgcc4g++rt = CSWgcc4corert -PKGFILES_CSWgcc4g++rt = .*/gcc4/lib/.*libstdc.*\.so.* -PKGFILES_CSWgcc4g++rt += .*/gcc4/lib/.*libsupc\+\+.*\.so.* +CATALOGNAME_CSWgcc4g++rt = gcc4g++rt +SPKG_DESC_CSWgcc4g++rt = GNU C++ Compiler Run Time +RUNTIME_DEP_PKGS_CSWgcc4g++rt = CSWgcc4corert +PKGFILES_CSWgcc4g++rt = $(libdir)/.*libstdc.*\.so.* +PKGFILES_CSWgcc4g++rt += $(libdir)/.*libsupc\+\+.*\.so.* PACKAGES += CSWgcc4gfortran CATALOGNAME_CSWgcc4gfortran = gcc4gfortran SPKG_DESC_CSWgcc4gfortran = GNU Fortran Compiler -RUNTIME_DEP_PKGS_CSWgcc4gfortran = CSWgcc4gfortranrt CSWiconv CSWlibgmp -RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibmpfr -PKGFILES_CSWgcc4gfortran = .*/gcc4/bin/.*gfortran -PKGFILES_CSWgcc4gfortran += .*/gcc4/lib/.*libgfortran.*a -PKGFILES_CSWgcc4gfortran += .*/gcc4/libexec/.*f951 +RUNTIME_DEP_PKGS_CSWgcc4gfortran = CSWgcc4gfortranrt +RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibmpfr4 +RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibgmp10 +PKGFILES_CSWgcc4gfortran = $(bindir)/.*gfortran +PKGFILES_CSWgcc4gfortran += $(libdir)/.*libgfortran.*a +PKGFILES_CSWgcc4gfortran += $(libexecdir)/.*f951 PKGFILES_CSWgcc4gfortran += .*/gcc4/man/.*gfortran.1 PKGFILES_CSWgcc4gfortran += .*/gcc4/info/gfortran.* @@ -70,32 +77,36 @@ CATALOGNAME_CSWgcc4gfortranrt = gcc4gfortranrt SPKG_DESC_CSWgcc4gfortranrt = GNU Fortran Compiler Run Time RUNTIME_DEP_PKGS_CSWgcc4gfortranrt = CSWgcc4corert -PKGFILES_CSWgcc4gfortranrt = .*/gcc4/lib/.*libgfortran.*\.so.* +PKGFILES_CSWgcc4gfortranrt = $(libdir)/.*libgfortran.*\.so.* PACKAGES += CSWgcc4java CATALOGNAME_CSWgcc4java = gcc4java SPKG_DESC_CSWgcc4java = GNU Java Compiler RUNTIME_DEP_PKGS_CSWgcc4java = CSWgcc4corert CSWgcc4javart -RUNTIME_DEP_PKGS_CSWgcc4java += CSWzlib CSWiconv CSWlibgmp CSWlibmpfr -PKGFILES_CSWgcc4java = .*/gcc4/bin/.*gcj.* -PKGFILES_CSWgcc4java += .*/gcc4/bin/.*jv-scan -PKGFILES_CSWgcc4java += .*/gcc4/bin/.*jv-convert -PKGFILES_CSWgcc4java += .*/gcc4/bin/.*jcf-dump -PKGFILES_CSWgcc4java += .*/gcc4/bin/.*grmi.* -PKGFILES_CSWgcc4java += .*/gcc4/bin/.*grepjar -PKGFILES_CSWgcc4java += .*/gcc4/bin/.*gjnih -PKGFILES_CSWgcc4java += .*/gcc4/bin/.*gij -PKGFILES_CSWgcc4java += .*/gcc4/bin/.*fastjar -PKGFILES_CSWgcc4java += .*/gcc4/bin/.*gjar.* -PKGFILES_CSWgcc4java += .*/gcc4/bin/.*gjavah -PKGFILES_CSWgcc4java += .*/gcc4/bin/.*gorbd -PKGFILES_CSWgcc4java += .*/gcc4/bin/.*addr2name.awk -PKGFILES_CSWgcc4java += .*/gcc4/bin/.*gappletviewer -PKGFILES_CSWgcc4java += .*/gcc4/bin/.*gkeytool -PKGFILES_CSWgcc4java += .*/gcc4/bin/.*gserialver -PKGFILES_CSWgcc4java += .*/gcc4/bin/.*gtnameserv -PKGFILES_CSWgcc4java += .*/gcc4/bin/.*gnative2ascii -PKGFILES_CSWgcc4java += .*/gcc4/bin/.*gc-analyze +RUNTIME_DEP_PKGS_CSWgcc4java += CSWzlib +RUNTIME_DEP_PKGS_CSWgcc4java += CSWlibmpfr4 +RUNTIME_DEP_PKGS_CSWgcc4java += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWgcc4java += CSWlibgmp10 + +PKGFILES_CSWgcc4java = $(bindir)/.*gcj.* +PKGFILES_CSWgcc4java += $(bindir)/.*jv-scan +PKGFILES_CSWgcc4java += $(bindir)/.*jv-convert +PKGFILES_CSWgcc4java += $(bindir)/.*jcf-dump +PKGFILES_CSWgcc4java += $(bindir)/.*grmi.* +PKGFILES_CSWgcc4java += $(bindir)/.*grepjar +PKGFILES_CSWgcc4java += $(bindir)/.*gjnih +PKGFILES_CSWgcc4java += $(bindir)/.*gij +PKGFILES_CSWgcc4java += $(bindir)/.*fastjar +PKGFILES_CSWgcc4java += $(bindir)/.*gjar.* +PKGFILES_CSWgcc4java += $(bindir)/.*gjavah +PKGFILES_CSWgcc4java += $(bindir)/.*gorbd +PKGFILES_CSWgcc4java += $(bindir)/.*addr2name.awk +PKGFILES_CSWgcc4java += $(bindir)/.*gappletviewer +PKGFILES_CSWgcc4java += $(bindir)/.*gkeytool +PKGFILES_CSWgcc4java += $(bindir)/.*gserialver +PKGFILES_CSWgcc4java += $(bindir)/.*gtnameserv +PKGFILES_CSWgcc4java += $(bindir)/.*gnative2ascii +PKGFILES_CSWgcc4java += $(bindir)/.*gc-analyze PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gcj.* PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gij.* PKGFILES_CSWgcc4java += .*/gcc4/man/.*/jv.* @@ -112,52 +123,56 @@ PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gnative2ascii.* PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gc-analyze.* PKGFILES_CSWgcc4java += .*/gcc4/share/java/.* -PKGFILES_CSWgcc4java += .*/gcc4/lib/.*libgij.*a -PKGFILES_CSWgcc4java += .*/gcc4/lib/.*libffi.*a -PKGFILES_CSWgcc4java += .*/gcc4/lib/.*lib-gnu-awt.*a -PKGFILES_CSWgcc4java += .*/gcc4/lib/.*security.* -PKGFILES_CSWgcc4java += .*/gcc4/lib/.*logging.properties -PKGFILES_CSWgcc4java += .*/gcc4/lib/.*pkgconfig.* -PKGFILES_CSWgcc4java += .*/gcc4/lib/.*gcj.*a -PKGFILES_CSWgcc4java += .*/gcc4/lib/.*libgcj.*a -PKGFILES_CSWgcc4java += .*/gcc4/libexec/.*collect.* -PKGFILES_CSWgcc4java += .*/gcc4/libexec/.*jvgenmain -PKGFILES_CSWgcc4java += .*/gcc4/libexec/.*jc1.* +PKGFILES_CSWgcc4java += $(libdir)/.*libgij.*a +PKGFILES_CSWgcc4java += $(libdir)/.*libffi.*a +PKGFILES_CSWgcc4java += $(libdir)/.*lib-gnu-awt.*a +PKGFILES_CSWgcc4java += $(libdir)/.*security.* +PKGFILES_CSWgcc4java += $(libdir)/.*logging.properties +PKGFILES_CSWgcc4java += $(libdir)/.*pkgconfig.* +PKGFILES_CSWgcc4java += $(libdir)/.*gcj.*a +PKGFILES_CSWgcc4java += $(libdir)/.*libgcj.*a +PKGFILES_CSWgcc4java += $(libexecdir)/.*collect.* +PKGFILES_CSWgcc4java += $(libexecdir)/.*jvgenmain +PKGFILES_CSWgcc4java += $(libexecdir)/.*jc1.* PKGFILES_CSWgcc4java += .*/gcc4/info/gcj.* -PKGFILES_CSWgcc4java += .*/gcc4/include/.*gcj/.* -PKGFILES_CSWgcc4java += .*/gcc4/include/.*awt/.* -PKGFILES_CSWgcc4java += .*/gcc4/include/.*classpath/.* -PKGFILES_CSWgcc4java += .*/gcc4/include/.*java.* -PKGFILES_CSWgcc4java += .*/gcc4/include/.*ffi.h -PKGFILES_CSWgcc4java += .*/gcc4/include/.*org/.* +PKGFILES_CSWgcc4java += $(includedir)/.*gcj/.* +PKGFILES_CSWgcc4java += $(includedir)/.*awt/.* +PKGFILES_CSWgcc4java += $(includedir)/.*classpath/.* +PKGFILES_CSWgcc4java += $(includedir)/.*java.* +PKGFILES_CSWgcc4java += $(includedir)/.*ffi.h +PKGFILES_CSWgcc4java += $(includedir)/.*org/.* PACKAGES += CSWgcc4javart CATALOGNAME_CSWgcc4javart = gcc4javart SPKG_DESC_CSWgcc4javart = GNU Java Compiler Run Time RUNTIME_DEP_PKGS_CSWgcc4javart = CSWgcc4corert CSWgcc4g++rt -PKGFILES_CSWgcc4javart = .*/gcc4/lib/.*libgij.*\.so.* -PKGFILES_CSWgcc4javart += .*/gcc4/lib/.*libffi.*\.so.* -PKGFILES_CSWgcc4javart += .*/gcc4/lib/.*lib-gnu-awt.*\.so.* -PKGFILES_CSWgcc4javart += .*/gcc4/lib/.*security/classpath.* -PKGFILES_CSWgcc4javart += .*/gcc4/lib/.*logging.properties -PKGFILES_CSWgcc4javart += .*/gcc4/lib/.*pkgconfig.* -PKGFILES_CSWgcc4javart += .*/gcc4/lib/.*gcj.*\.so.* -PKGFILES_CSWgcc4javart += .*/gcc4/lib/.*libgcj.*\.so.* +PKGFILES_CSWgcc4javart = $(libdir)/.*libgij.*\.so.* +PKGFILES_CSWgcc4javart += $(libdir)/.*libffi.*\.so.* +PKGFILES_CSWgcc4javart += $(libdir)/.*lib-gnu-awt.*\.so.* +PKGFILES_CSWgcc4javart += $(libdir)/.*security/classpath.* +PKGFILES_CSWgcc4javart += $(libdir)/.*logging.properties +PKGFILES_CSWgcc4javart += $(libdir)/.*pkgconfig.* +PKGFILES_CSWgcc4javart += $(libdir)/.*gcj.*\.so.* +PKGFILES_CSWgcc4javart += $(libdir)/.*libgcj.*\.so.* PACKAGES += CSWgcc4objc CATALOGNAME_CSWgcc4objc = gcc4objc SPKG_DESC_CSWgcc4objc = GNU Objective C Compiler -RUNTIME_DEP_PKGS_CSWgcc4objc = CSWgcc4objcrt CSWiconv CSWlibgmp CSWlibmpfr -PKGFILES_CSWgcc4objc = .*/gcc4/libexec/.*cc1obj -PKGFILES_CSWgcc4objc += .*/gcc4/lib/.*libobjc.*a -PKGFILES_CSWgcc4objc += .*/gcc4/include/.*objc/.* -PKGFILES_CSWgcc4objc += .*/gcc4/lib/.*/include/objc/.* +PKGFILES_CSWgcc4objc = $(libexecdir)/.*cc1obj +PKGFILES_CSWgcc4objc += $(libdir)/.*libobjc.*a +PKGFILES_CSWgcc4objc += $(includedir)/.*objc/.* +PKGFILES_CSWgcc4objc += $(libdir)/.*/include/objc/.* +RUNTIME_DEP_PKGS_CSWgcc4objc += CSWgcc4objcrt +RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibmpfr4 +RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibgmp10 + PACKAGES += CSWgcc4objcrt CATALOGNAME_CSWgcc4objcrt = gcc4objcrt SPKG_DESC_CSWgcc4objcrt = GNU Objective C Compiler Run Time RUNTIME_DEP_PKGS_CSWgcc4objcrt = CSWgcc4corert -PKGFILES_CSWgcc4objcrt = .*/gcc4/lib/.*libobjc.*\.so.* +PKGFILES_CSWgcc4objcrt = $(libdir)/.*libobjc.*\.so.* ## Source URLs VENDOR_URL = http://gcc.gnu.org Modified: csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk =================================================================== --- csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk 2011-08-11 20:25:55 UTC (rev 15316) +++ csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk 2011-08-11 20:48:35 UTC (rev 15317) @@ -28,14 +28,14 @@ $(_DBG)$(MAKECOOKIE) post-merge-modulated: - $(_DBG)( gmv $(PKGROOT)/opt/csw/gcc4/lib/gcc/*/*/adalib/*.so* \ - $(PKGROOT)/opt/csw/gcc4/lib/ ) + $(_DBG)( gmv $(PKGROOT)$(libdir)/gcc/*/*/adalib/*.so* \ + $(PKGROOT)$(libdir)/ ) $(_DBG)( gfind $(PKGROOT) -name \*~ -exec grm -f {} \; ) - $(_DBG)( cd $(PKGROOT)/opt/csw/gcc4/lib; gln -s . 32 ) + $(_DBG)( cd $(PKGROOT)$(libdir); gln -s . 32 ) $(_DBG)(if [ "`uname -p`" = "sparc" ]; then \ - cd $(PKGROOT)/opt/csw/gcc4/lib; gln -s sparcv9 64; \ + cd $(PKGROOT)$(libdir); gln -s sparcv9 64; \ else \ - cd $(PKGROOT)/opt/csw/gcc4/lib; gln -s amd64 64; \ + cd $(PKGROOT)$(libdir); gln -s amd64 64; \ fi ) $(_DBG)$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Aug 12 11:44:41 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 12 Aug 2011 09:44:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[15318] csw/mgar/pkg/gcc4/trunk Message-ID: Revision: 15318 http://gar.svn.sourceforge.net/gar/?rev=15318&view=rev Author: dmichelsen Date: 2011-08-12 09:44:41 +0000 (Fri, 12 Aug 2011) Log Message: ----------- gcc4: Rip out unnecessary definitions Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile csw/mgar/pkg/gcc4/trunk/files/gar_override.mk csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2011-08-11 20:48:35 UTC (rev 15317) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2011-08-12 09:44:41 UTC (rev 15318) @@ -18,6 +18,9 @@ PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 +# GIT init takes a long time, disable for now, reenable if build works +NOGITPATCH ?= 1 + ## build options CONFIGURE_ARGS = --prefix=$(BUILD_PREFIX)/gcc4 CONFIGURE_ARGS += --exec-prefix=$(BUILD_PREFIX)/gcc4 Modified: csw/mgar/pkg/gcc4/trunk/files/gar_override.mk =================================================================== --- csw/mgar/pkg/gcc4/trunk/files/gar_override.mk 2011-08-11 20:48:35 UTC (rev 15317) +++ csw/mgar/pkg/gcc4/trunk/files/gar_override.mk 2011-08-12 09:44:41 UTC (rev 15318) @@ -1,43 +1,47 @@ -COOKIEDIR = $(COOKIEROOTDIR)/$(MODULATION)-$(GAROSREL)-$(GARCH) -WORKDIR = $(WORKROOTDIR)/build-$(MODULATION)-$(GAROSREL)-$(GARCH) -PATCHDIR = $(WORKDIR)/$(NAME)-$(VERSION) -INSTALLISADIR = $(WORKROOTDIR)/install-$(MODULATION)-$(GAROSREL)-$(GARCH) -PKGROOT = $(abspath $(WORKROOTDIR)/pkgroot-$(GAROSREL)-$(GARCH)) -OBJECT_DIR = $(WORKDIR)/objdir -WORKSRC = $(OBJECT_DIR) +#COOKIEDIR = $(COOKIEROOTDIR)/$(MODULATION)-$(GAROSREL)-$(GARCH) +#WORKDIR = $(WORKROOTDIR)/build-$(MODULATION)-$(GAROSREL)-$(GARCH) +#PATCHDIR = $(WORKDIR)/$(NAME)-$(VERSION) +#INSTALLISADIR = $(WORKROOTDIR)/install-$(MODULATION)-$(GAROSREL)-$(GARCH) +#PKGROOT = $(abspath $(WORKROOTDIR)/pkgroot-$(GAROSREL)-$(GARCH)) +#OBJECT_DIR = $(WORKDIR)/objdir +#WORKSRC = $(OBJECT_DIR) DIRPATHS = OPTFLAGS = CONFIG_SHELL = /opt/csw/bin/bash GARCOMPILER = GCC3 -GCC3_CC = /opt/csw/gcc3/bin/gcc -g -O2 -mcpu=v8 -pipe -CFLAGS = -I/opt/csw/include -CPPFLAGS = -I/opt/csw/include -CXXFLAGS = -I/opt/csw/include -LDFLAGS = -L/opt/csw/lib -R/opt/csw/lib -BOOT_CFLAGS = -I/opt/csw/include -mcpu=v8 -g -O2 -pipe -BOOT_LDFLAGS = -L/opt/csw/lib -R/opt/csw/lib +#GCC3_CC = /opt/csw/gcc3/bin/gcc -g -O2 -mcpu=v8 -pipe +#CFLAGS = -I/opt/csw/include +#CPPFLAGS = -I/opt/csw/include +#CXXFLAGS = -I/opt/csw/include +#LDFLAGS = -L/opt/csw/lib -R/opt/csw/lib +#BOOT_CFLAGS = -I/opt/csw/include -mcpu=v8 -g -O2 -pipe +#BOOT_LDFLAGS = -L/opt/csw/lib -R/opt/csw/lib -ifeq ($(shell uname -p),i386) -ifeq ($(shell uname -r),5.10) - GCC3_CC = /opt/csw/gcc3/bin/gcc -g -O2 -pipe - BOOT_CFLAGS = -I/opt/csw/include -g -O2 -pipe - BOOT_LDFLAGS = -L/opt/csw/lib -R/opt/csw/lib -else - GCC3_CC = /opt/csw/gcc3/bin/gcc -march=i386 -g -O2 -pipe - BOOT_CFLAGS = -I/opt/csw/include -m32 -march=i386 -g -O2 -pipe - BOOT_LDFLAGS = -L/opt/csw/lib -R/opt/csw/lib -endif -endif +#ifeq ($(shell uname -p),i386) +#ifeq ($(shell uname -r),5.10) +# GCC3_CC = /opt/csw/gcc3/bin/gcc -g -O2 -pipe +# BOOT_CFLAGS = -I/opt/csw/include -g -O2 -pipe +# BOOT_LDFLAGS = -L/opt/csw/lib -R/opt/csw/lib +#else +# GCC3_CC = /opt/csw/gcc3/bin/gcc -march=i386 -g -O2 -pipe +# BOOT_CFLAGS = -I/opt/csw/include -m32 -march=i386 -g -O2 -pipe +# BOOT_LDFLAGS = -L/opt/csw/lib -R/opt/csw/lib +#endif +#endif -export CONFIG_SHELL CFLAGS CPPFLAGS CXXFLAGS -export LDFLAGS BOOT_CFLAGS BOOT_LDFLAGS +export CONFIG_SHELL +#export CFLAGS CPPFLAGS CXXFLAGS +#export LDFLAGS +#export BOOT_CFLAGS BOOT_LDFLAGS -FIXCONFIG_DIRS += $(DESTDIR)$(BUILD_PREFIX)/gcc4/lib -STRIP_DIRS += $(DESTDIR)$(BUILD_PREFIX)/gcc4/bin -CONFIGURE_SCRIPTS = objdir -TEST_SCRIPTS = skip -post-configure-modulated: fix-bootflags +# FIXCONFIG_DIRS += $(DESTDIR)$(BUILD_PREFIX)/gcc4/lib +#STRIP_DIRS += $(DESTDIR)$(BUILD_PREFIX)/gcc4/bin +# CONFIGURE_SCRIPTS = objdir + +SKIPTEST ?= 1 + +# post-configure-modulated: fix-bootflags MERGE_SCRIPTS_isa-i386 = amd # This should not be necessary any more thanks to checkpkg overrides. Modified: csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk =================================================================== --- csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk 2011-08-11 20:48:35 UTC (rev 15317) +++ csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk 2011-08-12 09:44:41 UTC (rev 15318) @@ -6,26 +6,26 @@ ## Create $(OBJECT_DIR) to build in -post-extract-$(addprefix post-extract-,$(MODULATIONS)): - $(_DBG)(echo "==> Creating Object Dir for Building") - $(_DBG)(mkdir $(OBJECT_DIR)) - $(_DBG)$(MAKECOOKIE) +#post-extract-$(addprefix post-extract-,$(MODULATIONS)): +# $(_DBG)(echo "==> Creating Object Dir for Building") +# $(_DBG)(mkdir $(OBJECT_DIR)) +# $(_DBG)$(MAKECOOKIE) ## instead of changing to $(WORKSRC) and running configure ## Run it from the $(OBJECT_DIR) -configure-objdir: - $(_DBG)(echo "==> Running Configure from $(OBJECT_DIR)") - $(_DBG)(cd $(OBJECT_DIR) && $(CONFIGURE_ENV) \ - ../$(DISTNAME)/configure $(CONFIGURE_ARGS)) - $(_DBG)$(MAKECOOKIE) +#configure-objdir: +# $(_DBG)(echo "==> Running Configure from $(OBJECT_DIR)") +# $(_DBG)(cd $(OBJECT_DIR) && $(CONFIGURE_ENV) \ +# ../$(DISTNAME)/configure $(CONFIGURE_ARGS)) +# $(_DBG)$(MAKECOOKIE) ## Set the CFLAGS so the correct architecture is used -fix-bootflags: - $(_DBG)(perl -i -plne "s|^BOOT_CFLAGS.*|BOOT_CFLAGS= $(BOOT_CFLAGS)|" \ - $(WORKSRC)/Makefile) - $(_DBG)(perl -i -plne "s|^BOOT_LDFLAGS.*|BOOT_LDFLAGS= $(BOOT_LDFLAGS)|" \ - $(WORKSRC)/Makefile) - $(_DBG)$(MAKECOOKIE) +#fix-bootflags: +# $(_DBG)(perl -i -plne "s|^BOOT_CFLAGS.*|BOOT_CFLAGS= $(BOOT_CFLAGS)|" \ +# $(WORKSRC)/Makefile) +# $(_DBG)(perl -i -plne "s|^BOOT_LDFLAGS.*|BOOT_LDFLAGS= $(BOOT_LDFLAGS)|" \ +# $(WORKSRC)/Makefile) +# $(_DBG)$(MAKECOOKIE) post-merge-modulated: $(_DBG)( gmv $(PKGROOT)$(libdir)/gcc/*/*/adalib/*.so* \ @@ -39,6 +39,3 @@ fi ) $(_DBG)$(MAKECOOKIE) -test-skip: - $(_DBG)$(MAKECOOKIE) - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Aug 12 11:48:10 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 12 Aug 2011 09:48:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[15319] csw/mgar/pkg/dbus/trunk/Makefile Message-ID: Revision: 15319 http://gar.svn.sourceforge.net/gar/?rev=15319&view=rev Author: dmichelsen Date: 2011-08-12 09:48:09 +0000 (Fri, 12 Aug 2011) Log Message: ----------- dbus: Add missing override Modified Paths: -------------- csw/mgar/pkg/dbus/trunk/Makefile Modified: csw/mgar/pkg/dbus/trunk/Makefile =================================================================== --- csw/mgar/pkg/dbus/trunk/Makefile 2011-08-12 09:44:41 UTC (rev 15318) +++ csw/mgar/pkg/dbus/trunk/Makefile 2011-08-12 09:48:09 UTC (rev 15319) @@ -57,6 +57,8 @@ CHECKPKG_OVERRIDES_CSWlibdbus1-3 += file-with-bad-content|/usr/share|root/opt/csw/lib/libdbus-1.so.3.6.3 CHECKPKG_OVERRIDES_CSWlibdbus1-3 += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libdbus-1.so.3.6.3 CHECKPKG_OVERRIDES_CSWlibdbus1-3 += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libdbus-1.so.3.6.3 +CHECKPKG_OVERRIDES_CSWlibdbus1-3 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libdbus-1.so.3.6.3 +CHECKPKG_OVERRIDES_CSWlibdbus1-3 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libdbus-1.so.3.6.3 PACKAGES += CSWlibdbus-dev SPKG_DESC_CSWlibdbus-dev = Development files for libdbus 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 Aug 12 12:19:02 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 12 Aug 2011 10:19:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[15320] csw/mgar/pkg/dbus/trunk/files/cswdbus Message-ID: Revision: 15320 http://gar.svn.sourceforge.net/gar/?rev=15320&view=rev Author: dmichelsen Date: 2011-08-12 10:19:02 +0000 (Fri, 12 Aug 2011) Log Message: ----------- dbus: Fix init script Modified Paths: -------------- csw/mgar/pkg/dbus/trunk/files/cswdbus Modified: csw/mgar/pkg/dbus/trunk/files/cswdbus =================================================================== --- csw/mgar/pkg/dbus/trunk/files/cswdbus 2011-08-12 09:48:09 UTC (rev 15319) +++ csw/mgar/pkg/dbus/trunk/files/cswdbus 2011-08-12 10:19:02 UTC (rev 15320) @@ -6,7 +6,9 @@ #RC_SLEV 3 # Run levels that should have a start script symlink #FMRI system # FMRI path for service (S10+), default is /network. -. /lib/svc/share/smf_include.sh +if [ -f /lib/svc/share/smf_include.sh ]; then + . /lib/svc/share/smf_include.sh +fi DBUS_VAR_DIR=/var/opt/csw/lib/dbus DBUS_VAR_RUN_DIR=/var/opt/csw/run/dbus @@ -16,23 +18,29 @@ mkdir -p $DBUS_VAR_DIR fi -if [ ! -f $DBUS_VAR_DIR/$DBUS_MACHINE_ID_FILE ]; then - /opt/csw/bin/dbus-uuidgen --ensure -fi - -if smf_is_nonglobalzone; then +if test "`uname -r`" = "5.10" && smf_is_nonglobalzone; then /usr/sbin/svcadm disable -t svc:/system/cswdbus echo "dbus-daemon cannot be run in non-global zones" sleep 5 & exit $SMF_EXIT_OK fi +if [ ! -f $DBUS_VAR_DIR/$DBUS_MACHINE_ID_FILE ]; then + /opt/csw/bin/dbus-uuidgen --ensure +fi + case $1 in 'start') if [ ! -d $DBUS_VAR_RUN_DIR ]; then mkdir -p $DBUS_VAR_RUN_DIR fi + if [ -f $DBUS_VAR_RUN_DIR/pid ]; then + kill -0 `cat $DBUS_VAR_RUN_DIR/pid` + if [ $? -eq 0 ]; then + echo "dbus already running" + exit 1 + fi rm -f $DBUS_VAR_RUN_DIR/pid fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Aug 12 12:53:12 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 12 Aug 2011 10:53:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[15321] csw/mgar/pkg/gcc4/branches/bootstrap-4.6/ Message-ID: Revision: 15321 http://gar.svn.sourceforge.net/gar/?rev=15321&view=rev Author: wahwah Date: 2011-08-12 10:53:12 +0000 (Fri, 12 Aug 2011) Log Message: ----------- gcc: Let's try to bootstrap it with Sun Studio Added Paths: ----------- csw/mgar/pkg/gcc4/branches/bootstrap-4.6/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From andyclarkii at users.sourceforge.net Fri Aug 12 13:41:39 2011 From: andyclarkii at users.sourceforge.net (andyclarkii at users.sourceforge.net) Date: Fri, 12 Aug 2011 11:41:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[15322] csw/mgar/pkg/flow-tools/trunk/Makefile Message-ID: Revision: 15322 http://gar.svn.sourceforge.net/gar/?rev=15322&view=rev Author: andyclarkii Date: 2011-08-12 11:41:38 +0000 (Fri, 12 Aug 2011) Log Message: ----------- flow-tools: Wrong path has been fixed in python scripts Modified Paths: -------------- csw/mgar/pkg/flow-tools/trunk/Makefile Modified: csw/mgar/pkg/flow-tools/trunk/Makefile =================================================================== --- csw/mgar/pkg/flow-tools/trunk/Makefile 2011-08-12 10:53:12 UTC (rev 15321) +++ csw/mgar/pkg/flow-tools/trunk/Makefile 2011-08-12 11:41:38 UTC (rev 15322) @@ -60,3 +60,8 @@ RUNTIME_DEP_PKGS_CSWflow-tools-dev += CSWlibft0 include gar/category.mk + +post-install-modulated: + /opt/csw/gnu/sed -in 's#/usr/local/netflow/var/#/etc/opt/csw/#g' $(DESTDIR)/opt/csw/bin/flow-rpt2rrd + /opt/csw/gnu/sed -in 's#/usr/local/netflow/var/#/etc/opt/csw/#g' $(DESTDIR)/opt/csw/bin/flow-rptfmt + 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 Aug 12 14:17:03 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 12 Aug 2011 12:17:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[15323] csw/mgar/pkg/pca/trunk Message-ID: Revision: 15323 http://gar.svn.sourceforge.net/gar/?rev=15323&view=rev Author: dmichelsen Date: 2011-08-12 12:17:03 +0000 (Fri, 12 Aug 2011) Log Message: ----------- pca: Update to 20110812-01 Modified Paths: -------------- csw/mgar/pkg/pca/trunk/Makefile csw/mgar/pkg/pca/trunk/checksums Modified: csw/mgar/pkg/pca/trunk/Makefile =================================================================== --- csw/mgar/pkg/pca/trunk/Makefile 2011-08-12 11:41:38 UTC (rev 15322) +++ csw/mgar/pkg/pca/trunk/Makefile 2011-08-12 12:17:03 UTC (rev 15323) @@ -1,5 +1,5 @@ NAME = pca -VERSION = 20110805-02 +VERSION = 20110812-01 CATEGORIES = utils DESCRIPTION = Patch Check Advanced Modified: csw/mgar/pkg/pca/trunk/checksums =================================================================== --- csw/mgar/pkg/pca/trunk/checksums 2011-08-12 11:41:38 UTC (rev 15322) +++ csw/mgar/pkg/pca/trunk/checksums 2011-08-12 12:17:03 UTC (rev 15323) @@ -1,2 +1,2 @@ f0a009f889da56e5a0de7f322dbfa0a8 chkmin -7a5806de0fa1c4b6ed8973afadf4a397 pca-20110805-02 +c9fff1a8be19209aae7d435ea888afd7 pca-20110812-01 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 Aug 12 14:39:06 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 12 Aug 2011 12:39:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[15324] csw/mgar/gar/v2/lib/python/sharedlib_utils.py Message-ID: Revision: 15324 http://gar.svn.sourceforge.net/gar/?rev=15324&view=rev Author: dmichelsen Date: 2011-08-12 12:39:06 +0000 (Fri, 12 Aug 2011) Log Message: ----------- mGAR v2: Add special case for libz Modified Paths: -------------- csw/mgar/gar/v2/lib/python/sharedlib_utils.py Modified: csw/mgar/gar/v2/lib/python/sharedlib_utils.py =================================================================== --- csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2011-08-12 12:17:03 UTC (rev 15323) +++ csw/mgar/gar/v2/lib/python/sharedlib_utils.py 2011-08-12 12:39:06 UTC (rev 15324) @@ -173,6 +173,8 @@ def ValidateCollectionName(l): letters = "".join(re.findall(r"[a-zA-Z]", l)) + # Special case for libz + if len(letters) == 1 and letters[0] == 'z': return True if len(letters) <= 1: return False return True 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 Aug 12 17:04:23 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 12 Aug 2011 15:04:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[15325] csw/mgar/pkg/xorriso/trunk Message-ID: Revision: 15325 http://gar.svn.sourceforge.net/gar/?rev=15325&view=rev Author: dmichelsen Date: 2011-08-12 15:04:23 +0000 (Fri, 12 Aug 2011) Log Message: ----------- xorriso: Update to 1.1.4 Modified Paths: -------------- csw/mgar/pkg/xorriso/trunk/Makefile csw/mgar/pkg/xorriso/trunk/checksums Modified: csw/mgar/pkg/xorriso/trunk/Makefile =================================================================== --- csw/mgar/pkg/xorriso/trunk/Makefile 2011-08-12 12:39:06 UTC (rev 15324) +++ csw/mgar/pkg/xorriso/trunk/Makefile 2011-08-12 15:04:23 UTC (rev 15325) @@ -1,6 +1,6 @@ # $Id$ NAME = xorriso -VERSION = 1.1.2 +VERSION = 1.1.4 CATEGORIES = utils DESCRIPTION = ISO 9660 Rock Ridge Filesystem Manipulator @@ -17,9 +17,9 @@ BUILD_DEP_PKGS += CSWlibreadline-dev -RUNTIME_DEP_PKGS_CSWxorriso += CSWiconv RUNTIME_DEP_PKGS_CSWxorriso += CSWlibreadline6 RUNTIME_DEP_PKGS_CSWxorriso += CSWbzip2 -RUNTIME_DEP_PKGS_CSWxorriso += CSWzlib +RUNTIME_DEP_PKGS_CSWxorriso += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWxorriso += CSWlibz1 include gar/category.mk Modified: csw/mgar/pkg/xorriso/trunk/checksums =================================================================== --- csw/mgar/pkg/xorriso/trunk/checksums 2011-08-12 12:39:06 UTC (rev 15324) +++ csw/mgar/pkg/xorriso/trunk/checksums 2011-08-12 15:04:23 UTC (rev 15325) @@ -1 +1 @@ -312d1a8a39cd894165a37ec3dfc5dad8 xorriso-1.1.2.tar.gz +c1ea356caa397fb7ff29a7159b342f9c xorriso-1.1.4.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 Aug 12 17:34:58 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 12 Aug 2011 15:34:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[15326] csw/mgar/gar/v2 Message-ID: Revision: 15326 http://gar.svn.sourceforge.net/gar/?rev=15326&view=rev Author: dmichelsen Date: 2011-08-12 15:34:58 +0000 (Fri, 12 Aug 2011) Log Message: ----------- mGAR: Honour OBJDIR Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2011-08-12 15:04:23 UTC (rev 15325) +++ csw/mgar/gar/v2/gar.conf.mk 2011-08-12 15:34:58 UTC (rev 15326) @@ -39,6 +39,7 @@ EXTRACTDIR ?= $(WORKDIR) WORKSRC ?= $(WORKDIR)/$(DISTNAME) WORKSRC_FIRSTMOD ?= $(WORKDIR_FIRSTMOD)/$(DISTNAME) +OBJDIR ?= . INSTALLISADIR ?= $(WORKROOTDIR)/install-$(MODULATION) PKGDIR ?= $(WORKROOTDIR)/package SCRATCHDIR ?= tmp Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2011-08-12 15:04:23 UTC (rev 15325) +++ csw/mgar/gar/v2/gar.lib.mk 2011-08-12 15:34:58 UTC (rev 15326) @@ -813,12 +813,12 @@ # script. configure-%/configure: @echo " ==> Running configure in $*" - cd $* && $(CONFIGURE_ENV) ./configure $(CONFIGURE_ARGS) + cd $* && mkdir -p $(OBJDIR) && cd $(OBJDIR) && $(CONFIGURE_ENV) $(abspath $*)/configure $(CONFIGURE_ARGS) @$(MAKECOOKIE) configure-%/autogen.sh: @echo " ==> Running autogen.sh in $*" - @cd $* && $(CONFIGURE_ENV) ./autogen.sh $(CONFIGURE_ARGS) + cd $* && mkdir -p $(OBJDIR) && cd $(OBJDIR) && $(CONFIGURE_ENV) $(abspath $*)/autogen.sh $(CONFIGURE_ARGS) @$(MAKECOOKIE) # configure a package that uses imake @@ -845,17 +845,17 @@ # build from a standard gnu-style makefile's default rule. build-%/Makefile: @echo " ==> Running make in $*" - $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(BUILD_ARGS) + cd $* && $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(BUILD_ARGS) @$(MAKECOOKIE) build-%/makefile: @echo " ==> Running make in $*" - @$(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(BUILD_ARGS) + cd $* && @$(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(BUILD_ARGS) @$(MAKECOOKIE) build-%/GNUmakefile: @echo " ==> Running make in $*" - @$(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(BUILD_ARGS) + cd $* && @$(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(BUILD_ARGS) @$(MAKECOOKIE) build-%/Jamfile: @@ -900,17 +900,17 @@ # build from a standard gnu-style makefile's default rule. clean-%/Makefile: @echo " ==> Running clean in $*" - @$(BUILD_ENV) $(MAKE) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(CLEAN_ARGS) + @cd $* && $(BUILD_ENV) $(MAKE) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(CLEAN_ARGS) @rm -f $(COOKIEDIR)/build-$* clean-%/makefile: @echo " ==> Running clean in $*" - @$(BUILD_ENV) $(MAKE) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(CLEAN_ARGS) + @cd $* && $(BUILD_ENV) $(MAKE) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(CLEAN_ARGS) @rm -f $(COOKIEDIR)/build-$* clean-%/GNUmakefile: @echo " ==> Running clean in $*" - @$(BUILD_ENV) $(MAKE) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(CLEAN_ARGS) + @cd $* && $(BUILD_ENV) $(MAKE) $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(CLEAN_ARGS) @rm -f $(COOKIEDIR)/build-$* clean-%/Jamfile: @@ -935,33 +935,33 @@ # Run tests on pre-built sources test-%/Makefile: @echo " ==> Running make $(TEST_TARGET) in $*" - $(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) + cd $* && $(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(TEST_ARGS) $(TEST_TARGET) @$(MAKECOOKIE) test-%/makefile: @echo " ==> Running make $(TEST_TARGET) in $*" - @$(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) + @cd $* && $(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(TEST_ARGS) $(TEST_TARGET) @$(MAKECOOKIE) test-%/GNUmakefile: @echo " ==> Running make $(TEST_TARGET) in $*" - @$(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $* $(TEST_ARGS) $(TEST_TARGET) + @cd $* && $(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(TEST_ARGS) $(TEST_TARGET) @$(MAKECOOKIE) # Ruby makefiles test-%/Rakefile: @echo " ==> Running rake $(TEST_TARGET) in $*" - @( cd $* ; $(TEST_ENV) rake $(RAKEFLAGS) $(TEST_ARGS) $(TEST_TARGET) ) + @( cd $* ; cd $(OBJDIR) ; $(TEST_ENV) rake $(RAKEFLAGS) $(TEST_ARGS) $(TEST_TARGET) ) @$(MAKECOOKIE) test-%/rakefile: @echo " ==> Running rake $(TEST_TARGET) in $*" - @( cd $* ; $(TEST_ENV) rake $(RAKEFLAGS) $(TEST_ARGS) $(TEST_TARGET) ) + @( cd $* ; cd $(OBJDIR) ; $(TEST_ENV) rake $(RAKEFLAGS) $(TEST_ARGS) $(TEST_TARGET) ) @$(MAKECOOKIE) test-%/setup.py: @echo " ==> Running setup.py test in $*" - @( cd $* ; $(TEST_ENV) python ./setup.py test $(TEST_ARGS) ) + @( cd $* ; cd $(OBJDIR) ; $(TEST_ENV) python ./setup.py test $(TEST_ARGS) ) @$(MAKECOOKIE) ################# INSTALL RULES #################### @@ -969,17 +969,17 @@ # just run make install and hope for the best. install-%/Makefile: @echo " ==> Running make install in $*" - @$(INSTALL_ENV) $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $* $(INSTALL_ARGS) install + @cd $* && $(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) install @$(MAKECOOKIE) install-%/makefile: @echo " ==> Running make install in $*" - @$(INSTALL_ENV) $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $* $(INSTALL_ARGS) install + @cd $* && $(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) install @$(MAKECOOKIE) install-%/GNUmakefile: @echo " ==> Running make install in $*" - @$(INSTALL_ENV) $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $* $(INSTALL_ARGS) install + @cd $* && $(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) install @$(MAKECOOKIE) # Ruby makefiles 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 Aug 12 23:35:23 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 12 Aug 2011 21:35:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[15327] csw/mgar/pkg/libexplain/trunk Message-ID: Revision: 15327 http://gar.svn.sourceforge.net/gar/?rev=15327&view=rev Author: dmichelsen Date: 2011-08-12 21:35:23 +0000 (Fri, 12 Aug 2011) Log Message: ----------- libexplain: Update to 0.45.D002, builds now, *phew*, some tests fail Modified Paths: -------------- csw/mgar/pkg/libexplain/trunk/Makefile csw/mgar/pkg/libexplain/trunk/checksums csw/mgar/pkg/libexplain/trunk/files/0002-Include-stdarg.h-for-va_list.patch Added Paths: ----------- csw/mgar/pkg/libexplain/trunk/files/0011-Make-sure-to-use-GCC-before-testing-GCC-specific-var.patch csw/mgar/pkg/libexplain/trunk/files/0012-Shield-functions-not-available-on-Solaris-9-autoconf.patch csw/mgar/pkg/libexplain/trunk/files/0013-Add-inttypes.h-to-binary-header.patch Modified: csw/mgar/pkg/libexplain/trunk/Makefile =================================================================== --- csw/mgar/pkg/libexplain/trunk/Makefile 2011-08-12 15:34:58 UTC (rev 15326) +++ csw/mgar/pkg/libexplain/trunk/Makefile 2011-08-12 21:35:23 UTC (rev 15327) @@ -1,8 +1,11 @@ # $Id$ # TODO (release-critical prefixed with !, non release-critical with *) # +# * use linkage against libgnugetopt.so only on bin/explain and not the shared library +# * inspect failed tests from the testsuite + NAME = libexplain -VERSION = 0.44.D001 +VERSION = 0.45.D002 GARTYPE = v2 CATEGORIES = lib @@ -10,21 +13,57 @@ define BLURB endef -PATCHFILES += 0001-Shield-ptrace-defines.patch -PATCHFILES += 0002-Include-stdarg.h-for-va_list.patch -PATCHFILES += 0003-Do-not-return-anything-in-void-functions.patch +MASTER_SITES = $(SF_MIRROR) +DISTFILES = $(DISTNAME).tar.gz + +#PATCHFILES += 0001-Shield-ptrace-defines.patch +#PATCHFILES += 0002-Include-stdarg.h-for-va_list.patch +#PATCHFILES += 0003-Do-not-return-anything-in-void-functions.patch PATCHFILES += 0004-Use-fallback-for-AI_NUMERICSERV.patch -PATCHFILES += 0005-Solaris-does-not-have-O_NOFOLLOW.patch -PATCHFILES += 0006-Fix-typo-of-stat-struct-member.patch -PATCHFILES += 0007-Need-headers-for-major-minor.patch +#PATCHFILES += 0005-Solaris-does-not-have-O_NOFOLLOW.patch +#PATCHFILES += 0006-Fix-typo-of-stat-struct-member.patch +#PATCHFILES += 0007-Need-headers-for-major-minor.patch PATCHFILES += 0008-inttypes.h-is-needed-for-int-_t.patch -PATCHFILES += 0009-Use-necessary-mnttab.h.patch +#PATCHFILES += 0009-Use-necessary-mnttab.h.patch PATCHFILES += 0010-Include-sys-types.h-for-size_t.patch +PATCHFILES += 0011-Make-sure-to-use-GCC-before-testing-GCC-specific-var.patch +PATCHFILES += 0012-Shield-functions-not-available-on-Solaris-9-autoconf.patch +PATCHFILES += 0013-Add-inttypes.h-to-binary-header.patch -MASTER_SITES = $(SF_MIRROR) -DISTFILES = $(DISTNAME).tar.gz +LICENSE = LICENSE +BUILD_DEP_PKGS += CSWlibgnugetopt-dev + +PACKAGES += CSWexplain +SPKG_DESC_CSWexplain = Explains unix system call errors +PKGFILES_CSWexplain += $(bindir)/.* +PKGFILES_CSWexplain += $(mandir)/man1/.* +RUNTIME_DEP_PKGS_CSWexplain += CSWlibexplain30 +RUNTIME_DEP_PKGS_CSWexplain += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWexplain += CSWlibgnugetopt0 +RUNTIME_DEP_PKGS_CSWexplain += CSWlibiconv2 + +PACKAGES += CSWlibexplain30 +SPKG_DESC_CSWlibexplain30 = Explains unix system call errors, libexplain.so.30 +PKGFILES_CSWlibexplain30 += $(call pkgfiles_lib,libexplain.so.30) +RUNTIME_DEP_PKGS_CSWlibexplain30 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibexplain30 += CSWlibgnugetopt0 +RUNTIME_DEP_PKGS_CSWlibexplain30 += CSWlibiconv2 + +PACKAGES += CSWlibexplain-dev +SPKG_DESC_CSWlibexplain-dev = Development files for libexplain.so.30 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibexplain-dev += CSWlibexplain30 + +EXTRA_LINKER_FLAGS = -lgnugetopt + BUILD64 = 1 +# Several tests failing, skip for now +SKIPTEST ?= 1 + +TEST_OVERRIDE_VARS = SH +TEST_OVERRIDE_VAR_SH = /bin/bash + include gar/category.mk Modified: csw/mgar/pkg/libexplain/trunk/checksums =================================================================== --- csw/mgar/pkg/libexplain/trunk/checksums 2011-08-12 15:34:58 UTC (rev 15326) +++ csw/mgar/pkg/libexplain/trunk/checksums 2011-08-12 21:35:23 UTC (rev 15327) @@ -1 +1 @@ -c85827069698600c0052397c9d6165eb libexplain-0.44.D001.tar.gz +21616e801abe365218ea245579c8ff56 libexplain-0.45.D002.tar.gz Modified: csw/mgar/pkg/libexplain/trunk/files/0002-Include-stdarg.h-for-va_list.patch =================================================================== --- csw/mgar/pkg/libexplain/trunk/files/0002-Include-stdarg.h-for-va_list.patch 2011-08-12 15:34:58 UTC (rev 15326) +++ csw/mgar/pkg/libexplain/trunk/files/0002-Include-stdarg.h-for-va_list.patch 2011-08-12 21:35:23 UTC (rev 15327) @@ -1,12 +1,14 @@ -From adf28f82a857d088282db1f86bf5efd6e3827ef6 Mon Sep 17 00:00:00 2001 +From 06979b1ad037ca3bbb2af89f2861347e783c8da1 Mon Sep 17 00:00:00 2001 From: Dagobert Michelsen -Date: Tue, 12 Jul 2011 15:37:41 +0200 -Subject: [PATCH 02/10] Include stdarg.h for va_list +Date: Tue, 12 Jul 2011 16:38:22 +0200 +Subject: [PATCH 2/2] Include stdarg.h for va_list --- - libexplain/vfprintf.h | 1 + - libexplain/vprintf.h | 1 + - 2 files changed, 2 insertions(+), 0 deletions(-) + libexplain/vfprintf.h | 1 + + libexplain/vprintf.h | 1 + + libexplain/vsnprintf.h | 1 + + libexplain/vsprintf.h | 1 + + 4 files changed, 4 insertions(+), 0 deletions(-) diff --git a/libexplain/vfprintf.h b/libexplain/vfprintf.h index d16fc49..9367b8c 100644 @@ -32,6 +34,30 @@ #ifdef __cplusplus extern "C" { +diff --git a/libexplain/vsnprintf.h b/libexplain/vsnprintf.h +index 845a370..9616ec8 100644 +--- a/libexplain/vsnprintf.h ++++ b/libexplain/vsnprintf.h +@@ -32,6 +32,7 @@ + #include + + #include ++#include + + #ifdef __cplusplus + extern "C" { +diff --git a/libexplain/vsprintf.h b/libexplain/vsprintf.h +index cd3acde..6a94a0e 100644 +--- a/libexplain/vsprintf.h ++++ b/libexplain/vsprintf.h +@@ -32,6 +32,7 @@ + #include + + #include ++#include + + #ifdef __cplusplus + extern "C" { -- 1.7.6 Added: csw/mgar/pkg/libexplain/trunk/files/0011-Make-sure-to-use-GCC-before-testing-GCC-specific-var.patch =================================================================== --- csw/mgar/pkg/libexplain/trunk/files/0011-Make-sure-to-use-GCC-before-testing-GCC-specific-var.patch (rev 0) +++ csw/mgar/pkg/libexplain/trunk/files/0011-Make-sure-to-use-GCC-before-testing-GCC-specific-var.patch 2011-08-12 21:35:23 UTC (rev 15327) @@ -0,0 +1,39 @@ +From 9c6c093a91998043cad2e34b793e54b469438fa2 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 12 Aug 2011 17:19:37 +0200 +Subject: [PATCH] Make sure to use GCC before testing GCC specific variables + +--- + libexplain/putc_on_error.c | 2 +- + libexplain/putchar_on_error.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libexplain/putc_on_error.c b/libexplain/putc_on_error.c +index 0661965..72d75b9 100644 +--- a/libexplain/putc_on_error.c ++++ b/libexplain/putc_on_error.c +@@ -24,7 +24,7 @@ + #include + + +-#if __GNUC__ < 3 ++#if defined(__GNUC__) && __GNUC__ < 3 + static + #endif + +diff --git a/libexplain/putchar_on_error.c b/libexplain/putchar_on_error.c +index ba46424..1f34319 100644 +--- a/libexplain/putchar_on_error.c ++++ b/libexplain/putchar_on_error.c +@@ -24,7 +24,7 @@ + #include + + +-#if __GNUC__ < 3 ++#if defined(__GNUC__) && __GNUC__ < 3 + static + #endif + +-- +1.7.6 + Added: csw/mgar/pkg/libexplain/trunk/files/0012-Shield-functions-not-available-on-Solaris-9-autoconf.patch =================================================================== --- csw/mgar/pkg/libexplain/trunk/files/0012-Shield-functions-not-available-on-Solaris-9-autoconf.patch (rev 0) +++ csw/mgar/pkg/libexplain/trunk/files/0012-Shield-functions-not-available-on-Solaris-9-autoconf.patch 2011-08-12 21:35:23 UTC (rev 15327) @@ -0,0 +1,132 @@ +From 8ed03d015459dbffa371f3a11e348e680ce99d74 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 12 Aug 2011 18:27:01 +0200 +Subject: [PATCH] Shield functions not available on Solaris 9, autoconf + detection still missing + +--- + libexplain/buffer/errno/strtof.c | 2 ++ + libexplain/buffer/errno/strtold.c | 2 ++ + libexplain/mkdtemp_on_error.c | 5 +++++ + libexplain/setenv_on_error.c | 5 +++++ + libexplain/strtof_on_error.c | 5 +++++ + libexplain/strtold_on_error.c | 5 +++++ + libexplain/unsetenv_on_error.c | 5 +++++ + 7 files changed, 29 insertions(+), 0 deletions(-) + +diff --git a/libexplain/buffer/errno/strtof.c b/libexplain/buffer/errno/strtof.c +index 004a1cc..bab13ad 100644 +--- a/libexplain/buffer/errno/strtof.c ++++ b/libexplain/buffer/errno/strtof.c +@@ -73,7 +73,9 @@ explain_buffer_errno_strtof_explanation(explain_string_buffer_t *sb, int errnum, + */ + ep = 0; + err = errno; ++#ifdef HAVE_STRTOF + n = strtof(nptr, &ep); ++#endif + errno = err; + if (ep == nptr) + { +diff --git a/libexplain/buffer/errno/strtold.c b/libexplain/buffer/errno/strtold.c +index e252f4d..36deb41 100644 +--- a/libexplain/buffer/errno/strtold.c ++++ b/libexplain/buffer/errno/strtold.c +@@ -73,7 +73,9 @@ explain_buffer_errno_strtold_explanation(explain_string_buffer_t *sb, + */ + ep = 0; + err = errno; ++#ifdef HAVE_STRTOLD + n = strtold(nptr, &ep); ++#endif + errno = err; + if (ep == nptr) + { +diff --git a/libexplain/mkdtemp_on_error.c b/libexplain/mkdtemp_on_error.c +index 1ce05ac..81dc2ff 100644 +--- a/libexplain/mkdtemp_on_error.c ++++ b/libexplain/mkdtemp_on_error.c +@@ -29,7 +29,12 @@ explain_mkdtemp_on_error(char *pathname) + { + char *result; + ++#ifdef HAVE_MKDTEMP + result = mkdtemp(pathname); ++#else ++ errno = ENOSYS; ++ result = -1; ++#endif + if (!result) + { + int hold_errno; +diff --git a/libexplain/setenv_on_error.c b/libexplain/setenv_on_error.c +index c1d3fb9..a367364 100644 +--- a/libexplain/setenv_on_error.c ++++ b/libexplain/setenv_on_error.c +@@ -29,7 +29,12 @@ explain_setenv_on_error(const char *name, const char *value, int overwrite) + { + int result; + ++#ifdef HAVE_SETENV + result = setenv(name, value, overwrite); ++#else ++ errno = ENOSYS; ++ result = -1; ++#endif + if (result < 0) + { + int hold_errno; +diff --git a/libexplain/strtof_on_error.c b/libexplain/strtof_on_error.c +index e2c35f9..e7d2eaf 100644 +--- a/libexplain/strtof_on_error.c ++++ b/libexplain/strtof_on_error.c +@@ -34,7 +34,12 @@ explain_strtof_on_error(const char *nptr, char **endptr) + hold_errno = errno; + dummy = 0; + errno = 0; ++#ifdef HAVE_STRTOF + result = strtof(nptr, endptr ? endptr : &dummy); ++#else ++ errno = ENOSYS; ++ result = -1; ++#endif + if (errno == 0 && (endptr ? *endptr : dummy) == nptr) + { + /* +diff --git a/libexplain/strtold_on_error.c b/libexplain/strtold_on_error.c +index 3a5ce0f..7debe2a 100644 +--- a/libexplain/strtold_on_error.c ++++ b/libexplain/strtold_on_error.c +@@ -34,7 +34,12 @@ explain_strtold_on_error(const char *nptr, char **endptr) + hold_errno = errno; + dummy = 0; + errno = 0; ++#ifdef HAVE_STRTOLD + result = strtold(nptr, endptr ? endptr : &dummy); ++#else ++ errno = ENOSYS; ++ result = -1; ++#endif + if (errno == 0 && (endptr ? *endptr : dummy) == nptr) + { + /* +diff --git a/libexplain/unsetenv_on_error.c b/libexplain/unsetenv_on_error.c +index d0258ed..77adbbc 100644 +--- a/libexplain/unsetenv_on_error.c ++++ b/libexplain/unsetenv_on_error.c +@@ -29,7 +29,12 @@ explain_unsetenv_on_error(const char *name) + { + int result; + ++#ifdef HAVE_UNSETENV + result = unsetenv(name); ++#else ++ errno = ENOSYS; ++ result = -1; ++#endif + if (result < 0) + { + int hold_errno; +-- +1.7.5.4 + Added: csw/mgar/pkg/libexplain/trunk/files/0013-Add-inttypes.h-to-binary-header.patch =================================================================== --- csw/mgar/pkg/libexplain/trunk/files/0013-Add-inttypes.h-to-binary-header.patch (rev 0) +++ csw/mgar/pkg/libexplain/trunk/files/0013-Add-inttypes.h-to-binary-header.patch 2011-08-12 21:35:23 UTC (rev 15327) @@ -0,0 +1,25 @@ +From 971268294bccedb69147a08587a47e50d32e48a6 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 12 Aug 2011 22:31:17 +0200 +Subject: [PATCH] Add inttypes.h to binary header + +--- + ioctl-scan/report.h | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/ioctl-scan/report.h b/ioctl-scan/report.h +index fe2f2e4..a26c257 100644 +--- a/ioctl-scan/report.h ++++ b/ioctl-scan/report.h +@@ -22,6 +22,8 @@ + + #include + ++#include ++ + /** + * The report_int function may be used to print a line of results for + * an ioctl request. +-- +1.7.6 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Aug 13 18:59:52 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 13 Aug 2011 16:59:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[15328] csw/mgar/pkg/mercurial/trunk Message-ID: Revision: 15328 http://gar.svn.sourceforge.net/gar/?rev=15328&view=rev Author: rthurner Date: 2011-08-13 16:59:51 +0000 (Sat, 13 Aug 2011) Log Message: ----------- mercurial: upgrade to hg-1.9.1 Modified Paths: -------------- csw/mgar/pkg/mercurial/trunk/Makefile csw/mgar/pkg/mercurial/trunk/checksums Modified: csw/mgar/pkg/mercurial/trunk/Makefile =================================================================== --- csw/mgar/pkg/mercurial/trunk/Makefile 2011-08-12 21:35:23 UTC (rev 15327) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2011-08-13 16:59:51 UTC (rev 15328) @@ -1,5 +1,5 @@ NAME = mercurial -VERSION = 1.9 +VERSION = 1.9.1 CATEGORIES = python DESCRIPTION = Fast, lightweight Source Control Management system Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2011-08-12 21:35:23 UTC (rev 15327) +++ csw/mgar/pkg/mercurial/trunk/checksums 2011-08-13 16:59:51 UTC (rev 15328) @@ -1 +1 @@ -d4842129fa2732eb6ed1180467bc32e2 mercurial-1.9.tar.gz +601990cc58af8316af4e1ea63e19d1be mercurial-1.9.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Aug 14 02:54:01 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 14 Aug 2011 00:54:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[15329] csw/mgar/pkg/rbgems Message-ID: Revision: 15329 http://gar.svn.sourceforge.net/gar/?rev=15329&view=rev Author: bdwalton Date: 2011-08-14 00:54:01 +0000 (Sun, 14 Aug 2011) Log Message: ----------- rbgems/mysql/trunk: add initial mysql gem recipe (does not build) Added Paths: ----------- csw/mgar/pkg/rbgems/mysql/ csw/mgar/pkg/rbgems/mysql/Makefile csw/mgar/pkg/rbgems/mysql/branches/ csw/mgar/pkg/rbgems/mysql/tags/ csw/mgar/pkg/rbgems/mysql/trunk/ csw/mgar/pkg/rbgems/mysql/trunk/Makefile csw/mgar/pkg/rbgems/mysql/trunk/checksums csw/mgar/pkg/rbgems/mysql/trunk/files/ Copied: csw/mgar/pkg/rbgems/mysql/Makefile (from rev 15145, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/rbgems/mysql/Makefile (rev 0) +++ csw/mgar/pkg/rbgems/mysql/Makefile 2011-08-14 00:54:01 UTC (rev 15329) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/rbgems/mysql/trunk ___________________________________________________________________ Added: svn:ignore + work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/rbgems/mysql/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/mysql/trunk/Makefile (rev 0) +++ csw/mgar/pkg/rbgems/mysql/trunk/Makefile 2011-08-14 00:54:01 UTC (rev 15329) @@ -0,0 +1,14 @@ +NAME = mysql +VERSION = 2.8.1 +CATEGORIES = rbgems + +DESCRIPTION = This is the MySQL API module for Ruby + +define BLURB + This is the MySQL API module for Ruby. It provides the same functionsfor Ruby programs that the MySQL C API provides for C programs. Thisis a conversion of tmtm's original extension into a proper RubyGems. +endef + +RUNTIME_DEP_PKGS += CSWgem-rake-compiler +RUNTIME_DEP_PKGS += CSWgem-hoe + +include gar/category.mk Added: csw/mgar/pkg/rbgems/mysql/trunk/checksums =================================================================== --- csw/mgar/pkg/rbgems/mysql/trunk/checksums (rev 0) +++ csw/mgar/pkg/rbgems/mysql/trunk/checksums 2011-08-14 00:54:01 UTC (rev 15329) @@ -0,0 +1 @@ +81f2b50b1135e53a526e07bb21e16a4e mysql-2.8.1.gem This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Aug 14 04:07:06 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 14 Aug 2011 02:07:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[15330] csw/mgar/pkg/rbgems/mysql/trunk Message-ID: Revision: 15330 http://gar.svn.sourceforge.net/gar/?rev=15330&view=rev Author: bdwalton Date: 2011-08-14 02:07:06 +0000 (Sun, 14 Aug 2011) Log Message: ----------- rbgems/mysql/trunk: use a custom mysql_config wrapper to filter output of --libs Modified Paths: -------------- csw/mgar/pkg/rbgems/mysql/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/rbgems/mysql/trunk/mysql_config_wrapper Modified: csw/mgar/pkg/rbgems/mysql/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/mysql/trunk/Makefile 2011-08-14 00:54:01 UTC (rev 15329) +++ csw/mgar/pkg/rbgems/mysql/trunk/Makefile 2011-08-14 02:07:06 UTC (rev 15330) @@ -11,4 +11,6 @@ RUNTIME_DEP_PKGS += CSWgem-rake-compiler RUNTIME_DEP_PKGS += CSWgem-hoe +GEM_BUILD_FLAGS = --with-mysql-config=$(abspath $(CURDIR))/mysql_config_wrapper + include gar/category.mk Added: csw/mgar/pkg/rbgems/mysql/trunk/mysql_config_wrapper =================================================================== --- csw/mgar/pkg/rbgems/mysql/trunk/mysql_config_wrapper (rev 0) +++ csw/mgar/pkg/rbgems/mysql/trunk/mysql_config_wrapper 2011-08-14 02:07:06 UTC (rev 15330) @@ -0,0 +1,28 @@ +#!/opt/csw/bin/bash + +# Due to the way the gem command works, patching the source doesn't +# help. We need a way to filter the output of mysql_config directly. +# This is ugly, but mysql_config --libs passes values like -m32, +# -xarch= and -norunpath that make ld barf. This is likely a mysql +# bug but I need to do further investigation before filing it and want +# to proceed with other tasks first + +case "$(uname -p)" in + sparc) MC=/opt/csw/mysql5/bin/sparcv8/mysql_config;; + *) MC=/opt/csw/mysql5/bin/i386/mysql_config;; +esac + +case "$1" in + --libs) + _l=$(${MC} --libs) + LIBS= + for l in ${_l}; do + case "${l}" in + -m*|*norunpath|*xarch*) ;; + *) LIBS="${LIBS} ${l}";; + esac + done + echo ${LIBS} + ;; + *) "${MC}" $@;; +esac Property changes on: csw/mgar/pkg/rbgems/mysql/trunk/mysql_config_wrapper ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Aug 14 04:36:07 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 14 Aug 2011 02:36:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[15331] csw/mgar/pkg/rbgems/mysql/trunk/Makefile Message-ID: Revision: 15331 http://gar.svn.sourceforge.net/gar/?rev=15331&view=rev Author: bdwalton Date: 2011-08-14 02:36:07 +0000 (Sun, 14 Aug 2011) Log Message: ----------- rbgems/mysql/trunk: override default gem license Modified Paths: -------------- csw/mgar/pkg/rbgems/mysql/trunk/Makefile Modified: csw/mgar/pkg/rbgems/mysql/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/mysql/trunk/Makefile 2011-08-14 02:07:06 UTC (rev 15330) +++ csw/mgar/pkg/rbgems/mysql/trunk/Makefile 2011-08-14 02:36:07 UTC (rev 15331) @@ -13,4 +13,7 @@ GEM_BUILD_FLAGS = --with-mysql-config=$(abspath $(CURDIR))/mysql_config_wrapper +# the default license for ruby gems is MIT-LICENSE +LICENSE = COPYING + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Aug 14 04:38:03 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 14 Aug 2011 02:38:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[15332] csw/mgar/pkg/rbgems/mysql/trunk/Makefile Message-ID: Revision: 15332 http://gar.svn.sourceforge.net/gar/?rev=15332&view=rev Author: bdwalton Date: 2011-08-14 02:38:03 +0000 (Sun, 14 Aug 2011) Log Message: ----------- rbgems/mysql/trunk: update runtime deps Modified Paths: -------------- csw/mgar/pkg/rbgems/mysql/trunk/Makefile Modified: csw/mgar/pkg/rbgems/mysql/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/mysql/trunk/Makefile 2011-08-14 02:36:07 UTC (rev 15331) +++ csw/mgar/pkg/rbgems/mysql/trunk/Makefile 2011-08-14 02:38:03 UTC (rev 15332) @@ -8,8 +8,9 @@ This is the MySQL API module for Ruby. It provides the same functionsfor Ruby programs that the MySQL C API provides for C programs. Thisis a conversion of tmtm's original extension into a proper RubyGems. endef -RUNTIME_DEP_PKGS += CSWgem-rake-compiler -RUNTIME_DEP_PKGS += CSWgem-hoe +RUNTIME_DEP_PKGS_CSWrb18-mysql-2-8-1 += CSWlibruby18-1 +RUNTIME_DEP_PKGS_CSWrb18-mysql-2-8-1 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWrb18-mysql-2-8-1 += CSWlibmysqlclient15 GEM_BUILD_FLAGS = --with-mysql-config=$(abspath $(CURDIR))/mysql_config_wrapper This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Aug 14 06:22:05 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 14 Aug 2011 04:22:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[15333] csw/mgar/pkg/rbgems/mysql/trunk/Makefile Message-ID: Revision: 15333 http://gar.svn.sourceforge.net/gar/?rev=15333&view=rev Author: bdwalton Date: 2011-08-14 04:22:05 +0000 (Sun, 14 Aug 2011) Log Message: ----------- rbgems/mysql/trunk: override usr/local references. they are all ok. Modified Paths: -------------- csw/mgar/pkg/rbgems/mysql/trunk/Makefile Modified: csw/mgar/pkg/rbgems/mysql/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/mysql/trunk/Makefile 2011-08-14 02:38:03 UTC (rev 15332) +++ csw/mgar/pkg/rbgems/mysql/trunk/Makefile 2011-08-14 04:22:05 UTC (rev 15333) @@ -17,4 +17,12 @@ # the default license for ruby gems is MIT-LICENSE LICENSE = COPYING +# this is build-time detection +CHECKPKG_OVERRIDES_CSWrb18-mysql-2-8-1 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/gems/1.8/gems/mysql-2.8.1/ext/mysql_api/extconf.rb +# the hashbang isn't updated in the test file +CHECKPKG_OVERRIDES_CSWrb18-mysql-2-8-1 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/gems/1.8/gems/mysql-2.8.1/test/test_mysql.rb +# don't worry about the readme files +CHECKPKG_OVERRIDES_CSWrb18-mysql-2-8-1 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/gems/1.8/gems/mysql-2.8.1/extra/README.html +CHECKPKG_OVERRIDES_CSWrb18-mysql-2-8-1 += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/gems/1.8/gems/mysql-2.8.1/extra/README_ja.html + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jesser at users.sourceforge.net Sun Aug 14 16:05:39 2011 From: jesser at users.sourceforge.net (jesser at users.sourceforge.net) Date: Sun, 14 Aug 2011 14:05:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[15334] csw/mgar/pkg/rbgems/mysql/trunk/Makefile Message-ID: Revision: 15334 http://gar.svn.sourceforge.net/gar/?rev=15334&view=rev Author: jesser Date: 2011-08-14 14:05:39 +0000 (Sun, 14 Aug 2011) Log Message: ----------- fix some missing spaces in the BLURB text Modified Paths: -------------- csw/mgar/pkg/rbgems/mysql/trunk/Makefile Modified: csw/mgar/pkg/rbgems/mysql/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/mysql/trunk/Makefile 2011-08-14 04:22:05 UTC (rev 15333) +++ csw/mgar/pkg/rbgems/mysql/trunk/Makefile 2011-08-14 14:05:39 UTC (rev 15334) @@ -5,7 +5,7 @@ DESCRIPTION = This is the MySQL API module for Ruby define BLURB - This is the MySQL API module for Ruby. It provides the same functionsfor Ruby programs that the MySQL C API provides for C programs. Thisis a conversion of tmtm's original extension into a proper RubyGems. + This is the MySQL API module for Ruby. It provides the same functions for Ruby programs that the MySQL C API provides for C programs. This is a conversion of tmtm's original extension into a proper RubyGem. endef RUNTIME_DEP_PKGS_CSWrb18-mysql-2-8-1 += CSWlibruby18-1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Aug 14 19:57:55 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 14 Aug 2011 17:57:55 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[509] gar-wrapper Message-ID: Revision: 509 http://opencsw.svn.sourceforge.net/opencsw/?rev=509&view=rev Author: skayser Date: 2011-08-14 17:57:54 +0000 (Sun, 14 Aug 2011) Log Message: ----------- mgar: changed error message for pwd \!= build directory when running pkg specific commands Modified Paths: -------------- gar-wrapper/CHANGES gar-wrapper/mgar Modified: gar-wrapper/CHANGES =================================================================== --- gar-wrapper/CHANGES 2011-08-11 02:34:27 UTC (rev 508) +++ gar-wrapper/CHANGES 2011-08-14 17:57:54 UTC (rev 509) @@ -1,12 +1,17 @@ +Changes since 0.92 (r380): +* Improved error message when running a package specific command in + a non-package directory + Changes since 0.91 (r360): * mgar will now warn and exit on legacy gar/ directories or symlinks -* add new command "list-categories" to list the supported CATEGORIES -* add new command "newpkg " to create package recipe skeletons +* Added new command "list-categories" to list the supported CATEGORIES +* Added new command "newpkg " to create package recipe skeletons * commit: will now only work from within package directories * commit: automatically commits parent directory when needed (new packages) * find-file: exclude .git directories -* find-file: default to list all files if no argument given +* find-file: list all files if no argument given * init: fix bug when calling with a relative path (Oliver Kiddle) +* newpkg: fix double slash in svn:externals * show-buildsys: fall back to "unknown" when GAR is not in subversion * ~/.garrc: add variable OVERRIDE_BUILDSYS to globally override the path to GAR. Can be used to test new GAR branches Modified: gar-wrapper/mgar =================================================================== --- gar-wrapper/mgar 2011-08-11 02:34:27 UTC (rev 508) +++ gar-wrapper/mgar 2011-08-14 17:57:54 UTC (rev 509) @@ -32,15 +32,17 @@ # ---------------------------------------------------------------------------- # # Todos: +# * Improve error messages when buildsys can't be found +# * Enable mgar newpkg from anywhere (relative path to $BUILDTREE) # * Enable checkout of a specific revision for build recipe + GAR # (~/opencsw/.buildsys/vX at YYYY, ~/opencsw/foo/trunk at YYYY) # * Add template for ~/.garrc (think new users) # * When packaging mgar, shield mgar up --self so that it won't override # the package binary, but place it somewhere else. # * Recipes: Move from svn:externals to GARTYPE -# * Improve error messages when buildsys can't be found -# * Improve error messages when pwd != build dir (refer to miss./wrong Makefile) # * In commit mode: verify that checksums is up to date (DISTFILES listed?) +# * Tune locate a: so that you can also search substrings (e.g. sed +# will also find recipes with gsed) # # Bugs: # @@ -146,7 +148,9 @@ } function die_not_in_pkg_dir { - echo "ERROR: This command needs to be run from within a package directory." >&2 + echo "This command is supposed to be run from within a package build" >&2 + echo "directory (i.e. one with a build recipe). Please change to one" >&2 + echo "and re-run this command." >&2 exit 2 } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Aug 14 20:05:25 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 14 Aug 2011 18:05:25 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[510] gar-wrapper Message-ID: Revision: 510 http://opencsw.svn.sourceforge.net/opencsw/?rev=510&view=rev Author: skayser Date: 2011-08-14 18:05:25 +0000 (Sun, 14 Aug 2011) Log Message: ----------- mgar: include package version in version output Modified Paths: -------------- gar-wrapper/CHANGES gar-wrapper/mgar Modified: gar-wrapper/CHANGES =================================================================== --- gar-wrapper/CHANGES 2011-08-14 17:57:54 UTC (rev 509) +++ gar-wrapper/CHANGES 2011-08-14 18:05:25 UTC (rev 510) @@ -1,6 +1,7 @@ Changes since 0.92 (r380): * Improved error message when running a package specific command in a non-package directory +* Added package version to "version" command Changes since 0.91 (r360): * mgar will now warn and exit on legacy gar/ directories or symlinks Modified: gar-wrapper/mgar =================================================================== --- gar-wrapper/mgar 2011-08-14 17:57:54 UTC (rev 509) +++ gar-wrapper/mgar 2011-08-14 18:05:25 UTC (rev 510) @@ -55,6 +55,7 @@ set -u set -e +VERSION=0.92-dev EDITOR=${EDITOR:-vi} PATH=$PATH:/opt/csw/bin DEF_BUILDTREE=~/opencsw @@ -554,7 +555,8 @@ "$BUILDTREE" svn up "$BUILDTREE/.buildsys" ;; - version) grep '^# $Id:' $0 | cut -d" " -f4;; + version) printf "%s (r%s)\n" \ + $VERSION `grep '^# $Id:' $0 | cut -d" " -f4`;; # /global-cmds # per-pkg-cmds This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Aug 14 20:12:34 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 14 Aug 2011 18:12:34 +0000 Subject: [csw-devel] SF.net SVN: opencsw:[511] gar-wrapper Message-ID: Revision: 511 http://opencsw.svn.sourceforge.net/opencsw/?rev=511&view=rev Author: skayser Date: 2011-08-14 18:12:33 +0000 (Sun, 14 Aug 2011) Log Message: ----------- mgar: changed newpkg to always operate relative to $BUILDTREE Modified Paths: -------------- gar-wrapper/CHANGES gar-wrapper/mgar Modified: gar-wrapper/CHANGES =================================================================== --- gar-wrapper/CHANGES 2011-08-14 18:05:25 UTC (rev 510) +++ gar-wrapper/CHANGES 2011-08-14 18:12:33 UTC (rev 511) @@ -1,4 +1,6 @@ Changes since 0.92 (r380): +* Changed "newpkg" command to run relative to the build tree (not $PWD) + so that it can be run from anywhere * Improved error message when running a package specific command in a non-package directory * Added package version to "version" command Modified: gar-wrapper/mgar =================================================================== --- gar-wrapper/mgar 2011-08-14 18:05:25 UTC (rev 510) +++ gar-wrapper/mgar 2011-08-14 18:12:33 UTC (rev 511) @@ -534,7 +534,7 @@ # global-cmds index) build_index "$BUILDTREE";; locate) shift; search_index "$BUILDTREE" "${1-}";; - newpkg) shift; newpkg ${1:-} ${2:-};; + newpkg) shift; cd "$BUILDTREE" && newpkg ${1:-} ${2:-};; show-pkgtree) echo "$BUILDTREE";; scm) shift; svn $@;; up) if [ "${2:-}" == "--all" ]; then 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 Aug 14 22:33:24 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 14 Aug 2011 20:33:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[15335] csw/mgar/pkg/gcc4/branches/bootstrap-4.6 Message-ID: Revision: 15335 http://gar.svn.sourceforge.net/gar/?rev=15335&view=rev Author: wahwah Date: 2011-08-14 20:33:23 +0000 (Sun, 14 Aug 2011) Log Message: ----------- pkg/gcc4/branches/bootstrap-4.6: build recipe remake, step 1 Modified Paths: -------------- csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile Added Paths: ----------- csw/mgar/pkg/gcc4/branches/bootstrap-4.6/files/0001-clear-AM_CFLAGS-in-lto-plugin.patch Modified: csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile =================================================================== --- csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile 2011-08-14 14:05:39 UTC (rev 15334) +++ csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile 2011-08-14 20:33:23 UTC (rev 15335) @@ -12,14 +12,14 @@ for these languages (libstdc++, libgcj,...). endef -DISTFILES = $(NAME)-$(VERSION).tar.bz2 +DISTFILES = $(DISTNAME).tar.bz2 MASTER_SITES = $(GNU_MIRROR)/$(NAME)-$(VERSION)/ PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 # GIT init takes a long time, disable for now, reenable if build works -NOGITPATCH ?= 1 +# NOGITPATCH ?= 1 ## build options CONFIGURE_ARGS = --prefix=$(BUILD_PREFIX)/gcc4 @@ -34,20 +34,40 @@ CONFIGURE_ARGS += --with-x CONFIGURE_ARGS += --with-mpfr=$(BUILD_PREFIX) CONFIGURE_ARGS += --with-gmp=$(BUILD_PREFIX) -CONFIGURE_ARGS += --enable-java-awt=xlib -CONFIGURE_ARGS += --enable-libada +# CONFIGURE_ARGS += --enable-java-awt=xlib +# CONFIGURE_ARGS += --enable-libada CONFIGURE_ARGS += --enable-libssp CONFIGURE_ARGS += --enable-objc-gc CONFIGURE_ARGS += --enable-threads=posix CONFIGURE_ARGS += --enable-stage1-languages=c -CONFIGURE_ARGS += --enable-languages=ada,c,c++,fortran,java,objc +# We'll build ada later. +# CONFIGURE_ARGS += --enable-languages=ada,c,c++,fortran,java,objc +CONFIGURE_ARGS += --enable-languages=c,c++,fortran,java,objc +CONFIGURE_ARGS += --enable-bootstrap -## For cleanliness I split the Configuration into separate files -include files/gar_override.mk -include files/package_def.mk -include files/pkg_scripts.mk -include files/package_files.mk -include files/amd_merge.mk +# Different objdir +OBJDIR = objdir + +# These flags are passed when gcc is built with gcc. +# Needed to remove FLAVOR_FLAGS, because they were Sun Studio specific. +CFLAGS_FOR_TARGET = -O2 $(ARCHFLAGS_GCC4_$(ISA)) $(EXTRA_GCC4_CC_FLAGS) $(EXTRA_GCC_CC_FLAGS) $(EXTRA_CC_FLAGS) +CXXFLAGS_FOR_TARGET = -O2 $(ARCHFLAGS_GCC4_$(ISA)) $(EXTRA_GCC4_CXX_FLAGS) $(EXTRA_GCC_CXX_FLAGS) $(EXTRA_CXX_FLAGS) +EXTRA_EXPORTS += CFLAGS_FOR_TARGET +EXTRA_EXPORTS += CXXFLAGS_FOR_TARGET + +# bash must be used, otherwise: +# http://fixunix.com/solaris/490396-gcc-build-fails-cannot-compute-suffix-object-files.html +CONFIG_SHELL = /opt/csw/bin/bash +EXTRA_EXPORTS += CONFIG_SHELL + +EXTRA_CONFIGURE_EXPORTS += CFLAGS_FOR_TARGET +EXTRA_CONFIGURE_EXPORTS += CXXFLAGS_FOR_TARGET + +OBJDUMP=/opt/csw/bin/gobjdump +EXTRA_EXPORTS += OBJDUMP + +PATCHFILES += 0001-clear-AM_CFLAGS-in-lto-plugin.patch + include gar/category.mk # We need GNU find as find Added: csw/mgar/pkg/gcc4/branches/bootstrap-4.6/files/0001-clear-AM_CFLAGS-in-lto-plugin.patch =================================================================== --- csw/mgar/pkg/gcc4/branches/bootstrap-4.6/files/0001-clear-AM_CFLAGS-in-lto-plugin.patch (rev 0) +++ csw/mgar/pkg/gcc4/branches/bootstrap-4.6/files/0001-clear-AM_CFLAGS-in-lto-plugin.patch 2011-08-14 20:33:23 UTC (rev 15335) @@ -0,0 +1,29 @@ +From b648830934c1b709ee5b02a41c5a579ef4306c0d Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Sun, 14 Aug 2011 21:23:14 +0200 +Subject: [PATCH] clear AM_CFLAGS in lto-plugin + +--- + lto-plugin/Makefile.in | 6 +++++- + 1 files changed, 5 insertions(+), 1 deletions(-) + +diff --git a/lto-plugin/Makefile.in b/lto-plugin/Makefile.in +index 86edb99..704d182 100644 +--- a/lto-plugin/Makefile.in ++++ b/lto-plugin/Makefile.in +@@ -227,7 +227,11 @@ AUTOMAKE_OPTIONS = no-dependencies + gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) + libexecsubdir := $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version) + AM_CPPFLAGS = -I$(top_srcdir)/../include $(DEFS) +-AM_CFLAGS = -Wall -Werror ++# AM_CFLAGS = -Wall -Werror ++# The above AM_CFLAGS were breaking the bootstrap with Sun Studio, because ++# they were passed unconditionally to the compiler, which doesn't support ++# -Wall nor -Werror. ++AM_CFLAGS = + AM_LIBTOOLFLAGS = --tag=disable-static + libexecsub_LTLIBRARIES = liblto_plugin.la + gcc_build_dir = ../$(host_subdir)/gcc +-- +1.7.6 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From skayser at users.sourceforge.net Sun Aug 14 23:12:56 2011 From: skayser at users.sourceforge.net (skayser at users.sourceforge.net) Date: Sun, 14 Aug 2011 21:12:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[15336] csw/mgar/pkg/multitail/trunk Message-ID: Revision: 15336 http://gar.svn.sourceforge.net/gar/?rev=15336&view=rev Author: skayser Date: 2011-08-14 21:12:55 +0000 (Sun, 14 Aug 2011) Log Message: ----------- multitail: update to 5.2.8 Modified Paths: -------------- csw/mgar/pkg/multitail/trunk/Makefile csw/mgar/pkg/multitail/trunk/checksums csw/mgar/pkg/multitail/trunk/files/changelog.CSW Modified: csw/mgar/pkg/multitail/trunk/Makefile =================================================================== --- csw/mgar/pkg/multitail/trunk/Makefile 2011-08-14 20:33:23 UTC (rev 15335) +++ csw/mgar/pkg/multitail/trunk/Makefile 2011-08-14 21:12:55 UTC (rev 15336) @@ -1,5 +1,5 @@ NAME = multitail -VERSION = 5.2.6 +VERSION = 5.2.8 CATEGORIES = utils DESCRIPTION = View one or multiple files like the original tail program @@ -19,7 +19,8 @@ DISTFILES = $(NAME)-$(VERSION).tgz LICENSE = license.txt -RUNTIME_DEP_PKGS = CSWncurses +RUNTIME_DEP_PKGS_CSWmultitail += CSWlibncurses5 +RUNTIME_DEP_PKGS_CSWmultitail += CSWlibpanel5 CONFIGURE_SCRIPTS = TEST_SCRIPTS = @@ -36,6 +37,7 @@ PRESERVECONF = .*/multitail\.conf MIGRATE_FILES = multitail.conf +# perl is optional, needed for colorscript examples in $(sharedir) CHECKPKG_OVERRIDES_CSWmultitail += missing-dependency|CSWperl include gar/category.mk Modified: csw/mgar/pkg/multitail/trunk/checksums =================================================================== --- csw/mgar/pkg/multitail/trunk/checksums 2011-08-14 20:33:23 UTC (rev 15335) +++ csw/mgar/pkg/multitail/trunk/checksums 2011-08-14 21:12:55 UTC (rev 15336) @@ -1,2 +1 @@ -6496b3d78660ff8d11c743a0d03cca34 multitail-5.2.6.tgz -b9c523f87ec50251e0737f2ce870fb48 patch-CSW.diff +aaa3691b0ea66ef02ffefd628c7dee8b multitail-5.2.8.tgz Modified: csw/mgar/pkg/multitail/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/multitail/trunk/files/changelog.CSW 2011-08-14 20:33:23 UTC (rev 15335) +++ csw/mgar/pkg/multitail/trunk/files/changelog.CSW 2011-08-14 21:12:55 UTC (rev 15336) @@ -1,3 +1,9 @@ +multitail (5.2.8,REV=2011.08.14) + + * Upgrade to 5.2.8. + + -- Sebastian Kayser Sun, 14 Aug 2011 23:10:54 +0200 + multitail (5.2.6,REV=2010.08.03) * Version bump to 5.2.6. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Aug 15 02:24:58 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 15 Aug 2011 00:24:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[15337] csw/mgar/pkg/rbgems Message-ID: Revision: 15337 http://gar.svn.sourceforge.net/gar/?rev=15337&view=rev Author: bdwalton Date: 2011-08-15 00:24:58 +0000 (Mon, 15 Aug 2011) Log Message: ----------- rbgems/json/trunk: add ruby json gem Added Paths: ----------- csw/mgar/pkg/rbgems/json/ csw/mgar/pkg/rbgems/json/Makefile csw/mgar/pkg/rbgems/json/branches/ csw/mgar/pkg/rbgems/json/tags/ csw/mgar/pkg/rbgems/json/trunk/ csw/mgar/pkg/rbgems/json/trunk/Makefile csw/mgar/pkg/rbgems/json/trunk/checksums csw/mgar/pkg/rbgems/json/trunk/files/ Copied: csw/mgar/pkg/rbgems/json/Makefile (from rev 15145, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/rbgems/json/Makefile (rev 0) +++ csw/mgar/pkg/rbgems/json/Makefile 2011-08-15 00:24:58 UTC (rev 15337) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Property changes on: csw/mgar/pkg/rbgems/json/trunk ___________________________________________________________________ Added: svn:ignore + work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/rbgems/json/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/json/trunk/Makefile (rev 0) +++ csw/mgar/pkg/rbgems/json/trunk/Makefile 2011-08-15 00:24:58 UTC (rev 15337) @@ -0,0 +1,11 @@ +NAME = json +VERSION = 1.5.3 +CATEGORIES = rbgems + +DESCRIPTION = JSON Implementation for Ruby + +define BLURB + This is a JSON implementation as a Ruby extension in C. +endef + +include gar/category.mk Added: csw/mgar/pkg/rbgems/json/trunk/checksums =================================================================== --- csw/mgar/pkg/rbgems/json/trunk/checksums (rev 0) +++ csw/mgar/pkg/rbgems/json/trunk/checksums 2011-08-15 00:24:58 UTC (rev 15337) @@ -0,0 +1 @@ +88dcea4d1317ad0e7be6ebf3a9b07d59 json-1.5.3.gem This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Aug 15 02:28:32 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 15 Aug 2011 00:28:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[15338] csw/mgar/pkg/rbgems/json/trunk/Makefile Message-ID: Revision: 15338 http://gar.svn.sourceforge.net/gar/?rev=15338&view=rev Author: bdwalton Date: 2011-08-15 00:28:32 +0000 (Mon, 15 Aug 2011) Log Message: ----------- rbgems/json/trunk: this is GPL, not MIT, so set the LICSENSE appropriately Modified Paths: -------------- csw/mgar/pkg/rbgems/json/trunk/Makefile Modified: csw/mgar/pkg/rbgems/json/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/json/trunk/Makefile 2011-08-15 00:24:58 UTC (rev 15337) +++ csw/mgar/pkg/rbgems/json/trunk/Makefile 2011-08-15 00:28:32 UTC (rev 15338) @@ -8,4 +8,6 @@ This is a JSON implementation as a Ruby extension in C. endef +LICENSE = COPYING + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Aug 15 02:32:58 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 15 Aug 2011 00:32:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[15339] csw/mgar/pkg/rbgems/json/trunk/Makefile Message-ID: Revision: 15339 http://gar.svn.sourceforge.net/gar/?rev=15339&view=rev Author: bdwalton Date: 2011-08-15 00:32:58 +0000 (Mon, 15 Aug 2011) Log Message: ----------- rbgems/json/trunk: this is a binary gem, depend on libruby Modified Paths: -------------- csw/mgar/pkg/rbgems/json/trunk/Makefile Modified: csw/mgar/pkg/rbgems/json/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/json/trunk/Makefile 2011-08-15 00:28:32 UTC (rev 15338) +++ csw/mgar/pkg/rbgems/json/trunk/Makefile 2011-08-15 00:32:58 UTC (rev 15339) @@ -10,4 +10,6 @@ LICENSE = COPYING +RUNTIME_DEP_PKGS_CSWrb18-json-1-5-3 += CSWlibruby18-1 + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Mon Aug 15 08:16:01 2011 From: maciej at opencsw.org (Maciej Blizinski) Date: Mon, 15 Aug 2011 08:16:01 +0200 Subject: [csw-devel] [PATCH] mGAR v2: Add an option to run pigz Message-ID: <1313388961-24600-1-git-send-email-maciej@opencsw.org> --- gar/v2/bin/mkpackage | 12 +++++++++--- gar/v2/gar.conf.mk | 3 +++ gar/v2/gar.pkg.mk | 1 + 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/gar/v2/bin/mkpackage b/gar/v2/bin/mkpackage index 8e10918..b077b4f 100755 --- a/gar/v2/bin/mkpackage +++ b/gar/v2/bin/mkpackage @@ -318,6 +318,7 @@ sub process_arguments { 'overwrite!' => \$config{overwrite}, 'compress!' => \$config{compress}, 'usebzip' => \$config{usebzip}, + 'usepigz' => \$config{usepigz}, 'quiet|q' => \$config{quiet}, 'help' => \$args{help}, 'manual' => \$args{man}, @@ -397,6 +398,7 @@ sub process_arguments { $config{transfer} = 1 unless defined $config{transfer}; $config{overwrite} = 0 unless defined $config{overwrite}; $config{usebzip} = 0 unless defined $config{usebzip}; + $config{usepigz} = 0 unless defined $config{usepigz}; # Export variables to the spec $ENV{$_} = $config{$_} foreach qw/ @@ -911,7 +913,7 @@ sub transfer_package { my $compress = $config{usebzip} ? 'bzip2 -9 -f %s' - : 'gzip -9 -f %s'; + : ($config{usepigz} ? 'pigz -9 -f %s' : 'gzip -9 -f %s'); vexec( sprintf( $compress, $tmppkg ), "Failed to compress $tmppkg" ); $tmppkg .= $config{usebzip} ? ".bz2" : ".gz"; @@ -953,8 +955,8 @@ mkpackage - Create one or more Solaris packages from a 'spec' file. mkpackage --spec [--destdir ] [--workdir ] [--spooldir ] [--pkgroot ] [--tmpdir ] [--[no]transfer] [--[no]overwrite] [--[no]compress] - [--usebzip] [-v var=value...] [--dump |-dumpall] [--quiet] - [--help] [--manual] [--version] + [--usebzip] [--usepigz] [-v var=value...] [--dump |-dumpall] + [--quiet] [--help] [--manual] [--version] =head1 DESCRIPTION @@ -1032,6 +1034,10 @@ Enable bzip2 compression. Unless --nocompress and/or --notransfer options are specified, mkpackage will compress bitstream packages using gzip. Specifying --usebzip will use bzip2 instead, producing smaller archives in most cases. +=head2 --usepigz + +Use pigz, a parallel implementation of gzip. + =head2 -v var=value Build time variables. Specify one or more variable replacements for pkgmk diff --git a/gar/v2/gar.conf.mk b/gar/v2/gar.conf.mk index 82f31a5..d26b006 100644 --- a/gar/v2/gar.conf.mk +++ b/gar/v2/gar.conf.mk @@ -735,6 +735,9 @@ export PATH PKG_CONFIG_PATH # prepend the local file listing FILE_SITES = $(foreach DIR,$(FILEDIR) $(GARCHIVEPATH),file://$(DIR)/) +# For example, --usepigz +EXTRA_MKPACKAGE_OPTS ?= + # Extra libraries EXTRA_LIBS = gar.pkg.mk gar.common.mk gar.svn.mk ccenv: diff --git a/gar/v2/gar.pkg.mk b/gar/v2/gar.pkg.mk index 6419b54..73020ba 100644 --- a/gar/v2/gar.pkg.mk +++ b/gar/v2/gar.pkg.mk @@ -941,6 +941,7 @@ package-%: $(WORKDIR)/%.gspec $(WORKDIR)/%.prototype-$(GARCH) $(WORKDIR)/%.depen --workdir $(SPKG_WORKDIR) \ --pkgbase $(SPKG_PKGBASE) \ --pkgroot $(SPKG_PKGROOT) \ + $(EXTRA_MKPACKAGE_OPTS) \ -v WORKDIR_FIRSTMOD=../build-$(firstword $(MODULATIONS)) \ $(if $(_DIRPACKAGE),--notransfer --nocompress,--compress) \ $(MKPACKAGE_ARGS) ) || exit 2 -- 1.7.5.4 From wahwah at users.sourceforge.net Mon Aug 15 09:13:00 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 15 Aug 2011 07:13:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[15340] csw/mgar/gar/v2/gar.lib.mk Message-ID: Revision: 15340 http://gar.svn.sourceforge.net/gar/?rev=15340&view=rev Author: wahwah Date: 2011-08-15 07:13:00 +0000 (Mon, 15 Aug 2011) Log Message: ----------- mGAR v2: Compile tests in parallel Note that it doesn't mean parallel execution of test binaries. It only means their parallel compilation. It can open up a couple of compilation bottlenecks, e.g. with the mpfr library. Modified Paths: -------------- csw/mgar/gar/v2/gar.lib.mk Modified: csw/mgar/gar/v2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2/gar.lib.mk 2011-08-15 00:32:58 UTC (rev 15339) +++ csw/mgar/gar/v2/gar.lib.mk 2011-08-15 07:13:00 UTC (rev 15340) @@ -935,17 +935,17 @@ # Run tests on pre-built sources test-%/Makefile: @echo " ==> Running make $(TEST_TARGET) in $*" - cd $* && $(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(TEST_ARGS) $(TEST_TARGET) + cd $* && $(TEST_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(TEST_ARGS) $(TEST_TARGET) @$(MAKECOOKIE) test-%/makefile: @echo " ==> Running make $(TEST_TARGET) in $*" - @cd $* && $(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(TEST_ARGS) $(TEST_TARGET) + @cd $* && $(TEST_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(TEST_ARGS) $(TEST_TARGET) @$(MAKECOOKIE) test-%/GNUmakefile: @echo " ==> Running make $(TEST_TARGET) in $*" - @cd $* && $(TEST_ENV) $(MAKE) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(TEST_ARGS) $(TEST_TARGET) + @cd $* && $(TEST_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(TEST_ARGS) $(TEST_TARGET) @$(MAKECOOKIE) # Ruby makefiles 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 Aug 15 09:13:23 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 15 Aug 2011 07:13:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[15341] csw/mgar/gar/v2/lib/python Message-ID: Revision: 15341 http://gar.svn.sourceforge.net/gar/?rev=15341&view=rev Author: wahwah Date: 2011-08-15 07:13:23 +0000 (Mon, 15 Aug 2011) Log Message: ----------- pkgdb: Export more data via REST http://lists.opencsw.org/pipermail/maintainers/2011-August/015175.html Modified Paths: -------------- csw/mgar/gar/v2/lib/python/models.py csw/mgar/gar/v2/lib/python/pkgdb.py Modified: csw/mgar/gar/v2/lib/python/models.py =================================================================== --- csw/mgar/gar/v2/lib/python/models.py 2011-08-15 07:13:00 UTC (rev 15340) +++ csw/mgar/gar/v2/lib/python/models.py 2011-08-15 07:13:23 UTC (rev 15341) @@ -3,6 +3,7 @@ # Defines models for package database. import logging +import re import sqlobject import os.path from sqlobject import sqlbuilder @@ -143,6 +144,10 @@ files = sqlobject.MultipleJoin('CswFile', joinColumn='id') + def __init__(self, *args, **kwargs): + super(Srv4FileStats, self).__init__(*args, **kwargs) + self._cached_pkgstats = None + def DeleteAllDependentObjects(self): data_obj = self.data_obj self.data_obj = None @@ -207,8 +212,41 @@ % (self.catalogname, self.version_string, self.arch.name)) def GetStatsStruct(self): - return cPickle.loads(str(self.data_obj.pickle)) + if not self._cached_pkgstats: + self._cached_pkgstats = cPickle.loads(str(self.data_obj.pickle)) + return self._cached_pkgstats + def _GetBuildSource(self): + data = self.GetStatsStruct() + build_src = None + if "OPENCSW_REPOSITORY" in data["pkginfo"]: + build_src = data["pkginfo"]["OPENCSW_REPOSITORY"] + return build_src + + def GetSvnUrl(self): + build_src = self._GetBuildSource() + svn_url = None + if build_src: + svn_url = re.sub(r'([^@]*).*', r'\1/Makefile', build_src) + return svn_url + + def GetTracUrl(self): + build_src = self._GetBuildSource() + trac_url = None + if build_src: + trac_url = re.sub( + r'https://gar.svn.(sf|sourceforge).net/svnroot/gar/([^@]+)@(.*)', + r'http://sourceforge.net/apps/trac/gar/browser/\2/Makefile?rev=\3', + build_src) + return trac_url + + def GetVendorUrl(self): + data = self.GetStatsStruct() + vendor_url = None + if "VENDOR" in data["pkginfo"]: + vendor_url = re.split(r"\s+", data["pkginfo"]["VENDOR"])[0] + return vendor_url + def GetRestRepr(self): mimetype = "application/x-vnd.opencsw.pkg;type=srv4-detail" data = { @@ -230,6 +268,8 @@ # For compatibility with the catalog parser from catalog.py 'version': self.version_string, # 'in_catalogs': unicode([unicode(x) for x in self.in_catalogs]), + 'vendor_url': self.GetVendorUrl(), + 'repository_url': self.GetSvnUrl(), } return mimetype, data Modified: csw/mgar/gar/v2/lib/python/pkgdb.py =================================================================== --- csw/mgar/gar/v2/lib/python/pkgdb.py 2011-08-15 07:13:00 UTC (rev 15340) +++ csw/mgar/gar/v2/lib/python/pkgdb.py 2011-08-15 07:13:23 UTC (rev 15341) @@ -126,18 +126,9 @@ for identifier in self.identifiers: srv4 = GetPkg(identifier) data = srv4.GetStatsStruct() - if "OPENCSW_REPOSITORY" in data["pkginfo"]: - build_src = data["pkginfo"]["OPENCSW_REPOSITORY"] - build_src_url_svn = re.sub(r'([^@]*).*', r'\1/Makefile', build_src) - build_src_url_trac = re.sub( - r'https://gar.svn.(sf|sourceforge).net/svnroot/gar/([^@]+)@(.*)', - r'http://sourceforge.net/apps/trac/gar/browser/\2/Makefile?rev=\3', - build_src) - else: - build_src = None - build_src_url_svn = None - build_src_url_trac = None - data["build_src"] = build_src + build_src_url_svn = srv4.GetSvnUrl() + build_src_url_trac = srv4.GetTracUrl() + data["build_src"] = data["pkginfo"]["OPENCSW_REPOSITORY"] data["build_src_url_svn"] = build_src_url_svn data["build_src_url_trac"] = build_src_url_trac data["error_tags"] = list(self.GetErrorTagsResult(srv4)) 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 Aug 15 10:01:30 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 15 Aug 2011 08:01:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[15342] csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile Message-ID: Revision: 15342 http://gar.svn.sourceforge.net/gar/?rev=15342&view=rev Author: wahwah Date: 2011-08-15 08:01:30 +0000 (Mon, 15 Aug 2011) Log Message: ----------- pkg/gcc4/branches/bootstrap-4.6: saved progress Modified Paths: -------------- csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile Modified: csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile =================================================================== --- csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile 2011-08-15 07:13:23 UTC (rev 15341) +++ csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile 2011-08-15 08:01:30 UTC (rev 15342) @@ -34,7 +34,7 @@ CONFIGURE_ARGS += --with-x CONFIGURE_ARGS += --with-mpfr=$(BUILD_PREFIX) CONFIGURE_ARGS += --with-gmp=$(BUILD_PREFIX) -# CONFIGURE_ARGS += --enable-java-awt=xlib +CONFIGURE_ARGS += --enable-java-awt=xlib # CONFIGURE_ARGS += --enable-libada CONFIGURE_ARGS += --enable-libssp CONFIGURE_ARGS += --enable-objc-gc @@ -45,7 +45,7 @@ CONFIGURE_ARGS += --enable-languages=c,c++,fortran,java,objc CONFIGURE_ARGS += --enable-bootstrap -# Different objdir +# GCC can't be built in the same directory with the sources. OBJDIR = objdir # These flags are passed when gcc is built with gcc. @@ -63,8 +63,8 @@ EXTRA_CONFIGURE_EXPORTS += CFLAGS_FOR_TARGET EXTRA_CONFIGURE_EXPORTS += CXXFLAGS_FOR_TARGET -OBJDUMP=/opt/csw/bin/gobjdump -EXTRA_EXPORTS += OBJDUMP +# OBJDUMP=/opt/csw/bin/gobjdump +# EXTRA_EXPORTS += OBJDUMP PATCHFILES += 0001-clear-AM_CFLAGS-in-lto-plugin.patch 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 Aug 15 16:10:11 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 15 Aug 2011 14:10:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[15343] csw/mgar/pkg/gcc4/branches/bootstrap-4.6-suncc/ Message-ID: Revision: 15343 http://gar.svn.sourceforge.net/gar/?rev=15343&view=rev Author: wahwah Date: 2011-08-15 14:10:10 +0000 (Mon, 15 Aug 2011) Log Message: ----------- gcc: Separate branch for suncc bootstrap Added Paths: ----------- csw/mgar/pkg/gcc4/branches/bootstrap-4.6-suncc/ 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 Aug 15 16:17:47 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 15 Aug 2011 14:17:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[15344] csw/mgar/pkg/gcc4/branches/bootstrap-4.6-suncc/ files/test-results/ Message-ID: Revision: 15344 http://gar.svn.sourceforge.net/gar/?rev=15344&view=rev Author: wahwah Date: 2011-08-15 14:17:47 +0000 (Mon, 15 Aug 2011) Log Message: ----------- pkg/gcc4/branches/bootstrap-4.6-suncc: removing test results Removed Paths: ------------- csw/mgar/pkg/gcc4/branches/bootstrap-4.6-suncc/files/test-results/ 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 Aug 15 18:03:57 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 15 Aug 2011 16:03:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[15345] csw/mgar/pkg/gcc4/branches/bootstrap-4.6-suncc Message-ID: Revision: 15345 http://gar.svn.sourceforge.net/gar/?rev=15345&view=rev Author: wahwah Date: 2011-08-15 16:03:57 +0000 (Mon, 15 Aug 2011) Log Message: ----------- pkg/gcc4/branches/bootstrap-4.6-suncc: work around a libtool issue Modified Paths: -------------- csw/mgar/pkg/gcc4/branches/bootstrap-4.6-suncc/Makefile Added Paths: ----------- csw/mgar/pkg/gcc4/branches/bootstrap-4.6-suncc/files/0002-use-system-libtool.patch Modified: csw/mgar/pkg/gcc4/branches/bootstrap-4.6-suncc/Makefile =================================================================== --- csw/mgar/pkg/gcc4/branches/bootstrap-4.6-suncc/Makefile 2011-08-15 14:17:47 UTC (rev 15344) +++ csw/mgar/pkg/gcc4/branches/bootstrap-4.6-suncc/Makefile 2011-08-15 16:03:57 UTC (rev 15345) @@ -44,6 +44,8 @@ # CONFIGURE_ARGS += --enable-languages=ada,c,c++,fortran,java,objc CONFIGURE_ARGS += --enable-languages=c,c++,fortran,java,objc CONFIGURE_ARGS += --enable-bootstrap +# CONFIGURE_ARGS += --with-arch=v8 +# CONFIGURE_ARGS += --with-arch-32=v8 # GCC can't be built in the same directory with the sources. OBJDIR = objdir @@ -60,6 +62,9 @@ CONFIG_SHELL = /opt/csw/bin/bash EXTRA_EXPORTS += CONFIG_SHELL +# work/solaris9-sparc/build-isa-sparcv8/gcc-4.6.1/objdir/lto-plugin/libtool +# LIBTOOL = $(WORKSRC)/$(OBJDIR)/lto-plugin/libtool + EXTRA_CONFIGURE_EXPORTS += CFLAGS_FOR_TARGET EXTRA_CONFIGURE_EXPORTS += CXXFLAGS_FOR_TARGET @@ -67,6 +72,7 @@ # EXTRA_EXPORTS += OBJDUMP PATCHFILES += 0001-clear-AM_CFLAGS-in-lto-plugin.patch +PATCHFILES += 0002-use-system-libtool.patch include gar/category.mk Added: csw/mgar/pkg/gcc4/branches/bootstrap-4.6-suncc/files/0002-use-system-libtool.patch =================================================================== --- csw/mgar/pkg/gcc4/branches/bootstrap-4.6-suncc/files/0002-use-system-libtool.patch (rev 0) +++ csw/mgar/pkg/gcc4/branches/bootstrap-4.6-suncc/files/0002-use-system-libtool.patch 2011-08-15 16:03:57 UTC (rev 15345) @@ -0,0 +1,30 @@ +From 652fb0024f50d2c2d3096337cff5c66152daf6e6 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Mon, 15 Aug 2011 17:59:19 +0200 +Subject: [PATCH] use system libtool + +Works around a compilation breakage: +http://gcc.gnu.org/ml/gcc-help/2011-08/msg00191.html + +It looks like there are 2 ways to compile it: + - to not have /opt/csw/bin/libtool + - or to have /opt/csw/bin/libtool and force the use with lto-plugin +--- + Makefile.in | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 660f813..f878c76 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -45247,6 +45247,7 @@ configure-lto-plugin: + srcdiroption="--srcdir=$${topdir}/lto-plugin"; \ + libsrcdir="$$s/lto-plugin"; \ + $(SHELL) $${libsrcdir}/configure \ ++ LIBTOOL=/opt/csw/bin/libtool \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} $${srcdiroption} --enable-shared \ + || exit 1 +-- +1.7.6 + 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 Aug 15 19:13:35 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 15 Aug 2011 17:13:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[15346] csw/mgar/pkg/gcc4/branches/bootstrap-3.4/ Message-ID: Revision: 15346 http://gar.svn.sourceforge.net/gar/?rev=15346&view=rev Author: wahwah Date: 2011-08-15 17:13:35 +0000 (Mon, 15 Aug 2011) Log Message: ----------- gcc: An experiment with gcc 3 Added Paths: ----------- csw/mgar/pkg/gcc4/branches/bootstrap-3.4/ 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 Aug 15 21:57:40 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 15 Aug 2011 19:57:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[15347] csw/mgar/gar/v2/lib/web/templates/Srv4Detail.html Message-ID: Revision: 15347 http://gar.svn.sourceforge.net/gar/?rev=15347&view=rev Author: wahwah Date: 2011-08-15 19:57:40 +0000 (Mon, 15 Aug 2011) Log Message: ----------- pkgdb-web: Show pkgmap on the svr4 detail page Modified Paths: -------------- csw/mgar/gar/v2/lib/web/templates/Srv4Detail.html Modified: csw/mgar/gar/v2/lib/web/templates/Srv4Detail.html =================================================================== --- csw/mgar/gar/v2/lib/web/templates/Srv4Detail.html 2011-08-15 17:13:35 UTC (rev 15346) +++ csw/mgar/gar/v2/lib/web/templates/Srv4Detail.html 2011-08-15 19:57:40 UTC (rev 15347) @@ -84,6 +84,14 @@ +

pkgmap

+ +
+
+$for entry in pkg.GetStatsStruct()["pkgmap"]: $entry["line"]
+
+
+

Raw dump of the Python data structure

 $pkgstats_raw


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

From andyclarkii at users.sourceforge.net  Tue Aug 16 07:01:18 2011
From: andyclarkii at users.sourceforge.net (andyclarkii at users.sourceforge.net)
Date: Tue, 16 Aug 2011 05:01:18 +0000
Subject: [csw-devel] SF.net SVN: gar:[15348]
	csw/mgar/pkg/flow-tools/trunk/Makefile
Message-ID: 

Revision: 15348
          http://gar.svn.sourceforge.net/gar/?rev=15348&view=rev
Author:   andyclarkii
Date:     2011-08-16 05:01:18 +0000 (Tue, 16 Aug 2011)

Log Message:
-----------
clean up backup files

Modified Paths:
--------------
    csw/mgar/pkg/flow-tools/trunk/Makefile

Modified: csw/mgar/pkg/flow-tools/trunk/Makefile
===================================================================
--- csw/mgar/pkg/flow-tools/trunk/Makefile	2011-08-15 19:57:40 UTC (rev 15347)
+++ csw/mgar/pkg/flow-tools/trunk/Makefile	2011-08-16 05:01:18 UTC (rev 15348)
@@ -64,4 +64,7 @@
 post-install-modulated:
 	/opt/csw/gnu/sed -in 's#/usr/local/netflow/var/#/etc/opt/csw/#g' $(DESTDIR)/opt/csw/bin/flow-rpt2rrd
 	/opt/csw/gnu/sed -in 's#/usr/local/netflow/var/#/etc/opt/csw/#g' $(DESTDIR)/opt/csw/bin/flow-rptfmt
+	rm -f $(DESTDIR)/opt/csw/bin/flow-rpt2rrdn
+	rm -f $(DESTDIR)/opt/csw/bin/flow-rptfmtn
 
+


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 Aug 16 14:20:13 2011
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 16 Aug 2011 12:20:13 +0000
Subject: [csw-devel] SF.net SVN: gar:[15349] csw/mgar/pkg/ppl/trunk
Message-ID: 

Revision: 15349
          http://gar.svn.sourceforge.net/gar/?rev=15349&view=rev
Author:   dmichelsen
Date:     2011-08-16 12:20:13 +0000 (Tue, 16 Aug 2011)

Log Message:
-----------
ppl: Add patch for failed compilaation on i386

Modified Paths:
--------------
    csw/mgar/pkg/ppl/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/ppl/trunk/files/0001-R1-is-defined-in-usr-include-ia32-sys-reg.h-disturbi.patch

Modified: csw/mgar/pkg/ppl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ppl/trunk/Makefile	2011-08-16 05:01:18 UTC (rev 15348)
+++ csw/mgar/pkg/ppl/trunk/Makefile	2011-08-16 12:20:13 UTC (rev 15349)
@@ -29,6 +29,8 @@
 MASTER_SITES = http://www.cs.unipr.it/ppl/Download/ftp/releases/$(VERSION)/
 DISTFILES  = $(DISTNAME).tar.gz
 
+PATCHFILES += 0001-R1-is-defined-in-usr-include-ia32-sys-reg.h-disturbi.patch
+
 VENDOR_URL = http://www.cs.unipr.it/ppl/
 
 # C++ bindings require the consistency between GMP, PPL and GCC.

Added: csw/mgar/pkg/ppl/trunk/files/0001-R1-is-defined-in-usr-include-ia32-sys-reg.h-disturbi.patch
===================================================================
--- csw/mgar/pkg/ppl/trunk/files/0001-R1-is-defined-in-usr-include-ia32-sys-reg.h-disturbi.patch	                        (rev 0)
+++ csw/mgar/pkg/ppl/trunk/files/0001-R1-is-defined-in-usr-include-ia32-sys-reg.h-disturbi.patch	2011-08-16 12:20:13 UTC (rev 15349)
@@ -0,0 +1,26 @@
+From 22af798915437c4e0f6a39fe372baf5082ef67fd Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen 
+Date: Tue, 16 Aug 2011 14:10:03 +0200
+Subject: [PATCH] R1 is defined in /usr/include/ia32/sys/reg.h disturbing the
+ test
+
+---
+ tests/Box/refinewithconstraints1.cc |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/tests/Box/refinewithconstraints1.cc b/tests/Box/refinewithconstraints1.cc
+index ac4c91f..179da0d 100644
+--- a/tests/Box/refinewithconstraints1.cc
++++ b/tests/Box/refinewithconstraints1.cc
+@@ -23,6 +23,8 @@ site: http://www.cs.unipr.it/ppl/ . */
+ 
+ #include "ppl_test.hh"
+ 
++#undef R1
++
+ namespace {
+ 
+ bool
+-- 
+1.7.6
+


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

From bonivart at users.sourceforge.net  Tue Aug 16 18:01:07 2011
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Tue, 16 Aug 2011 16:01:07 +0000
Subject: [csw-devel] SF.net SVN: gar:[15350] csw/mgar/pkg/pkgutil/trunk
Message-ID: 

Revision: 15350
          http://gar.svn.sourceforge.net/gar/?rev=15350&view=rev
Author:   bonivart
Date:     2011-08-16 16:01:06 +0000 (Tue, 16 Aug 2011)

Log Message:
-----------
pkgutil: version 2.5 beta 2

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

Modified: csw/mgar/pkg/pkgutil/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pkgutil/trunk/Makefile	2011-08-16 12:20:13 UTC (rev 15349)
+++ csw/mgar/pkg/pkgutil/trunk/Makefile	2011-08-16 16:01:06 UTC (rev 15350)
@@ -1,5 +1,5 @@
 NAME = pkgutil
-VERSION = 2.5b1
+VERSION = 2.5b2
 CATEGORIES = utils
 
 DESCRIPTION = Installs Solaris packages easily

Modified: csw/mgar/pkg/pkgutil/trunk/checksums
===================================================================
--- csw/mgar/pkg/pkgutil/trunk/checksums	2011-08-16 12:20:13 UTC (rev 15349)
+++ csw/mgar/pkg/pkgutil/trunk/checksums	2011-08-16 16:01:06 UTC (rev 15350)
@@ -1 +1 @@
-e69620e109e75ade9f1c7ea83b302786  pkgutil-2.5b1.zip
+b95c14c3ab39f518d59d919a76bcb904  pkgutil-2.5b2.zip


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 Aug 16 18:18:27 2011
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 16 Aug 2011 16:18:27 +0000
Subject: [csw-devel] SF.net SVN: gar:[15351] csw/mgar/pkg/ppl/trunk
Message-ID: 

Revision: 15351
          http://gar.svn.sourceforge.net/gar/?rev=15351&view=rev
Author:   dmichelsen
Date:     2011-08-16 16:18:26 +0000 (Tue, 16 Aug 2011)

Log Message:
-----------
ppl: Add another patch

Modified Paths:
--------------
    csw/mgar/pkg/ppl/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/ppl/trunk/files/0002-Make-call-to-version-explicit-to-avoid-clash-with-ma.patch

Modified: csw/mgar/pkg/ppl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ppl/trunk/Makefile	2011-08-16 16:01:06 UTC (rev 15350)
+++ csw/mgar/pkg/ppl/trunk/Makefile	2011-08-16 16:18:26 UTC (rev 15351)
@@ -30,6 +30,7 @@
 DISTFILES  = $(DISTNAME).tar.gz
 
 PATCHFILES += 0001-R1-is-defined-in-usr-include-ia32-sys-reg.h-disturbi.patch
+PATCHFILES += 0002-Make-call-to-version-explicit-to-avoid-clash-with-ma.patch
 
 VENDOR_URL = http://www.cs.unipr.it/ppl/
 

Added: csw/mgar/pkg/ppl/trunk/files/0002-Make-call-to-version-explicit-to-avoid-clash-with-ma.patch
===================================================================
--- csw/mgar/pkg/ppl/trunk/files/0002-Make-call-to-version-explicit-to-avoid-clash-with-ma.patch	                        (rev 0)
+++ csw/mgar/pkg/ppl/trunk/files/0002-Make-call-to-version-explicit-to-avoid-clash-with-ma.patch	2011-08-16 16:18:26 UTC (rev 15351)
@@ -0,0 +1,26 @@
+From 8386fb5b4d4557eaf78f62409780c4fb6df6e55b Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen 
+Date: Tue, 16 Aug 2011 17:51:24 +0200
+Subject: [PATCH] Make call to version explicit to avoid clash with math.h
+ from gcc
+
+---
+ interfaces/Java/jni/ppl_java_globals.cc |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/interfaces/Java/jni/ppl_java_globals.cc b/interfaces/Java/jni/ppl_java_globals.cc
+index 019d02f..c17e439 100644
+--- a/interfaces/Java/jni/ppl_java_globals.cc
++++ b/interfaces/Java/jni/ppl_java_globals.cc
+@@ -735,7 +735,7 @@ Java_parma_1polyhedra_1library_Parma_1Polyhedra_1Library_version_1beta
+ JNIEXPORT jstring JNICALL
+ Java_parma_1polyhedra_1library_Parma_1Polyhedra_1Library_version
+ (JNIEnv* env, jclass) {
+-  return env->NewStringUTF(version());
++  return env->NewStringUTF(Parma_Polyhedra_Library::version());
+ }
+ 
+ JNIEXPORT jstring JNICALL
+-- 
+1.7.6
+


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

From skayser at users.sourceforge.net  Wed Aug 17 00:24:35 2011
From: skayser at users.sourceforge.net (skayser at users.sourceforge.net)
Date: Tue, 16 Aug 2011 22:24:35 +0000
Subject: [csw-devel] SF.net SVN: gar:[15352] csw/mgar/pkg/stunnel/trunk
Message-ID: 

Revision: 15352
          http://gar.svn.sourceforge.net/gar/?rev=15352&view=rev
Author:   skayser
Date:     2011-08-16 22:24:35 +0000 (Tue, 16 Aug 2011)

Log Message:
-----------
stunnel/trunk: update to 4.41 (not yet finished)

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

Modified: csw/mgar/pkg/stunnel/trunk/Makefile
===================================================================
--- csw/mgar/pkg/stunnel/trunk/Makefile	2011-08-16 16:18:26 UTC (rev 15351)
+++ csw/mgar/pkg/stunnel/trunk/Makefile	2011-08-16 22:24:35 UTC (rev 15352)
@@ -1,11 +1,12 @@
-# Todo:
+# TODO (release-critical prefixed with !, non release-critical with *)
+# ! config file patch currently doesn't apply cleanly
 # * postinstall mknod not possible within zone (mknod fails with "not owner")
 #   Work around this or provide README.CSW with instructions for chroot
 #   --> Why should /dev/zero be required at all? google suggests relation
 #       to pthreads .. truss doesn't show /dev/zero usage on Solaris 10
 #       Test on Solaris 8 / 9 for comparison
 NAME = stunnel
-VERSION = 4.33
+VERSION = 4.41
 CATEGORIES = net
 
 DESCRIPTION = Universal SSL Wrapper
@@ -18,13 +19,17 @@
 endef
 
 VENDOR_URL   = http://www.stunnel.org
-MASTER_SITES = http://www.stunnel.org/download/stunnel/src/
+MASTER_SITES = ftp://ftp.stunnel.org/stunnel/
 DISTFILES    = $(NAME)-$(VERSION).tar.gz
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
+# Note that upstream moves versions to an obsolete/ subdir over time
+MAJOR_VER = $(firstword $(subst ., ,$(VERSION)))
+MASTER_SITES += ftp://ftp.stunnel.org/stunnel/obsolete/$(MAJOR_VER).x/
+
 RUNTIME_DEP_PKGS = CSWzlib CSWosslrt CSWtcpwrap
 
 # Make stunnel.conf-sample.in honor $localstatedir adjustments
+# c.f. http://marc.info/?l=stunnel-users&m=128035848632004&w=2
 PATCHFILES = 0001-Make-stunnel.conf-sample.in-honor-sysconfdir-localst.patch
 
 CONFIGURE_ARGS = $(DIRPATHS)

Modified: csw/mgar/pkg/stunnel/trunk/checksums
===================================================================
--- csw/mgar/pkg/stunnel/trunk/checksums	2011-08-16 16:18:26 UTC (rev 15351)
+++ csw/mgar/pkg/stunnel/trunk/checksums	2011-08-16 22:24:35 UTC (rev 15352)
@@ -1,2 +1 @@
-0915b192dcbe816490ed88770bb771d0  0001-Make-stunnel.conf-sample.in-honor-sysconfdir-localst.patch
-559a864066d8cc4afd8a97682c90d41c  stunnel-4.33.tar.gz
+1ce3c7c491cabbda713af6ed6caf13f0  stunnel-4.41.tar.gz


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

From jesser at users.sourceforge.net  Wed Aug 17 00:26:30 2011
From: jesser at users.sourceforge.net (jesser at users.sourceforge.net)
Date: Tue, 16 Aug 2011 22:26:30 +0000
Subject: [csw-devel] SF.net SVN: gar:[15353]
	csw/mgar/pkg/rbgems/passenger/branches/3.0.8/
Message-ID: 

Revision: 15353
          http://gar.svn.sourceforge.net/gar/?rev=15353&view=rev
Author:   jesser
Date:     2011-08-16 22:26:30 +0000 (Tue, 16 Aug 2011)

Log Message:
-----------
rbgems/passenger: Make branch for version 3.0.8

Added Paths:
-----------
    csw/mgar/pkg/rbgems/passenger/branches/3.0.8/


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

From jesser at users.sourceforge.net  Wed Aug 17 05:43:06 2011
From: jesser at users.sourceforge.net (jesser at users.sourceforge.net)
Date: Wed, 17 Aug 2011 03:43:06 +0000
Subject: [csw-devel] SF.net SVN: gar:[15354]
	csw/mgar/pkg/rbgems/fastthread/trunk/Makefile
Message-ID: 

Revision: 15354
          http://gar.svn.sourceforge.net/gar/?rev=15354&view=rev
Author:   jesser
Date:     2011-08-17 03:43:06 +0000 (Wed, 17 Aug 2011)

Log Message:
-----------
rbgems/fastthread/trunk: add CSWlibruby18-1 as a runtime dependency

Modified Paths:
--------------
    csw/mgar/pkg/rbgems/fastthread/trunk/Makefile

Modified: csw/mgar/pkg/rbgems/fastthread/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rbgems/fastthread/trunk/Makefile	2011-08-16 22:26:30 UTC (rev 15353)
+++ csw/mgar/pkg/rbgems/fastthread/trunk/Makefile	2011-08-17 03:43:06 UTC (rev 15354)
@@ -14,4 +14,6 @@
 
 LICENSE = COPYING
 
+RUNTIME_DEP_PKGS = CSWlibruby18-1
+
 include gar/category.mk


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

From jesser at users.sourceforge.net  Wed Aug 17 07:22:17 2011
From: jesser at users.sourceforge.net (jesser at users.sourceforge.net)
Date: Wed, 17 Aug 2011 05:22:17 +0000
Subject: [csw-devel] SF.net SVN: gar:[15355]
	csw/mgar/pkg/rbgems/rake/branches/rb18/
Message-ID: 

Revision: 15355
          http://gar.svn.sourceforge.net/gar/?rev=15355&view=rev
Author:   jesser
Date:     2011-08-17 05:22:17 +0000 (Wed, 17 Aug 2011)

Log Message:
-----------
rbgems/rake: create branch for new package naming convention CSWrb18-rake

Added Paths:
-----------
    csw/mgar/pkg/rbgems/rake/branches/rb18/


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

From wahwah at users.sourceforge.net  Wed Aug 17 08:13:21 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 17 Aug 2011 06:13:21 +0000
Subject: [csw-devel] SF.net SVN: gar:[15356]
	csw/mgar/pkg/gcc4/branches/gcc3libs/
Message-ID: 

Revision: 15356
          http://gar.svn.sourceforge.net/gar/?rev=15356&view=rev
Author:   wahwah
Date:     2011-08-17 06:13:21 +0000 (Wed, 17 Aug 2011)

Log Message:
-----------
gcc4: A branch to repackage some gcc3 stuff that gets in the way.

Added Paths:
-----------
    csw/mgar/pkg/gcc4/branches/gcc3libs/


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

From wahwah at users.sourceforge.net  Wed Aug 17 08:17:55 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 17 Aug 2011 06:17:55 +0000
Subject: [csw-devel] SF.net SVN: gar:[15357]
	csw/mgar/pkg/gcc4/branches/gcc3libs
Message-ID: 

Revision: 15357
          http://gar.svn.sourceforge.net/gar/?rev=15357&view=rev
Author:   wahwah
Date:     2011-08-17 06:17:55 +0000 (Wed, 17 Aug 2011)

Log Message:
-----------
pkg/gcc4/branches/gcc3libs: resetting the build recipe

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/gcc3libs/Makefile

Removed Paths:
-------------
    csw/mgar/pkg/gcc4/branches/gcc3libs/files/CSWgcc4core.space
    csw/mgar/pkg/gcc4/branches/gcc3libs/files/amd_merge.mk
    csw/mgar/pkg/gcc4/branches/gcc3libs/files/gar_override.mk
    csw/mgar/pkg/gcc4/branches/gcc3libs/files/package_def.mk
    csw/mgar/pkg/gcc4/branches/gcc3libs/files/package_files.mk
    csw/mgar/pkg/gcc4/branches/gcc3libs/files/pkg_scripts.mk
    csw/mgar/pkg/gcc4/branches/gcc3libs/files/test-results/

Modified: csw/mgar/pkg/gcc4/branches/gcc3libs/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/gcc3libs/Makefile	2011-08-17 06:13:21 UTC (rev 15356)
+++ csw/mgar/pkg/gcc4/branches/gcc3libs/Makefile	2011-08-17 06:17:55 UTC (rev 15357)
@@ -1,54 +1,16 @@
 # $Id$
 
 NAME      = gcc
-VERSION   = 4.6.1
+VERSION   = 3.4.6
 CATEGORIES   = lang
 GARTYPE = v2
 
 DESCRIPTION  = The GNU Compiler Collection
 define BLURB
-	The GNU Compiler Collection includes front ends for C, C++, 
-	Objective-C, Fortran, Java, and Ada, as well as libraries 
-	for these languages (libstdc++, libgcj,...).
+  Repackaging of legacy gcc3 libraries.
 endef
 
-DISTFILES    = $(NAME)-$(VERSION).tar.bz2
-MASTER_SITES = $(GNU_MIRROR)/$(NAME)-$(VERSION)/
+DISTFILES    =
+MASTER_SITES =
 
-PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386
-PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
-
-# GIT init takes a long time, disable for now, reenable if build works
-NOGITPATCH ?= 1
-
-## build options
-CONFIGURE_ARGS  = --prefix=$(BUILD_PREFIX)/gcc4
-CONFIGURE_ARGS += --exec-prefix=$(BUILD_PREFIX)/gcc4
-CONFIGURE_ARGS += --with-gnu-as
-CONFIGURE_ARGS += --with-as=/opt/csw/bin/gas
-CONFIGURE_ARGS += --without-gnu-ld
-CONFIGURE_ARGS += --with-ld=/usr/ccs/bin/ld
-CONFIGURE_ARGS += --enable-nls
-CONFIGURE_ARGS += --with-included-gettext
-CONFIGURE_ARGS += --with-libiconv-prefix=$(BUILD_PREFIX)
-CONFIGURE_ARGS += --with-x
-CONFIGURE_ARGS += --with-mpfr=$(BUILD_PREFIX)
-CONFIGURE_ARGS += --with-gmp=$(BUILD_PREFIX)
-CONFIGURE_ARGS += --enable-java-awt=xlib
-CONFIGURE_ARGS += --enable-libada
-CONFIGURE_ARGS += --enable-libssp
-CONFIGURE_ARGS += --enable-objc-gc
-CONFIGURE_ARGS += --enable-threads=posix 
-CONFIGURE_ARGS += --enable-stage1-languages=c
-CONFIGURE_ARGS += --enable-languages=ada,c,c++,fortran,java,objc
-
-## For cleanliness I split the Configuration into separate files
-include files/gar_override.mk
-include files/package_def.mk
-include files/pkg_scripts.mk
-include files/package_files.mk
-include files/amd_merge.mk
 include gar/category.mk
-
-# We need GNU find as find
-PATH := /opt/csw/gnu:$(PATH)

Deleted: csw/mgar/pkg/gcc4/branches/gcc3libs/files/CSWgcc4core.space
===================================================================
--- csw/mgar/pkg/gcc4/branches/gcc3libs/files/CSWgcc4core.space	2011-08-17 06:13:21 UTC (rev 15356)
+++ csw/mgar/pkg/gcc4/branches/gcc3libs/files/CSWgcc4core.space	2011-08-17 06:17:55 UTC (rev 15357)
@@ -1 +0,0 @@
-/opt 1340 200

Deleted: csw/mgar/pkg/gcc4/branches/gcc3libs/files/amd_merge.mk
===================================================================
--- csw/mgar/pkg/gcc4/branches/gcc3libs/files/amd_merge.mk	2011-08-17 06:13:21 UTC (rev 15356)
+++ csw/mgar/pkg/gcc4/branches/gcc3libs/files/amd_merge.mk	2011-08-17 06:17:55 UTC (rev 15357)
@@ -1,116 +0,0 @@
-ifeq ($(AMD_DEBUG),)
-	_DBG=@
-else
-	_DBG=
-endif   
-
-AMD_BASE  = $(WORKROOTDIR)/install-isa-i386-5.10-i386/
-I386_BASE = $(WORKROOTDIR)/install-isa-i386-5.8-i386/
-MPREFIX   = opt/csw/gcc4
-APREFIX   = $(AMD_BASE)/$(MPREFIX)
-IPREFIX   = $(I386_BASE)/$(MPREFIX)
-PPREFIX   = $(PKGROOT)/$(MPREFIX)
-
-AMD_MERGE_TARGETS  = merge-dirs-amd
-AMD_MERGE_TARGETS += merge-fix-links
-AMD_MERGE_TARGETS += merge-i386-files
-AMD_MERGE_TARGETS += merge-amd64-files
-
-merge-amd: $(AMD_MERGE_TARGETS)
-	$(_DBG)$(MAKECOOKIE)
-
-merge-dirs-amd:
-	$(_DBG)(ginstall -d $(PKGROOT))
-	$(_DBG)(ginstall -d $(PPREFIX)/bin/amd64)
-	$(_DBG)(ginstall -d $(PPREFIX)/bin/i386)
-	$(_DBG)$(MAKECOOKIE)
-
-## Remove the Hard Links and re-create as files
-merge-fix-links:
-	@echo "[===== Merging Fixing Hard Links =====]"
-	$(_DBG)(cd $(IPREFIX)/bin; grm -f *gcc *c++ g++ gcj gfortran)
-	$(_DBG)(cd $(IPREFIX)/bin; \
-		gcp i386-pc-solaris2.8-gcc-4.4.3 i386-pc-solaris2.8-gcc)
-	$(_DBG)(cd $(IPREFIX)/bin; gcp i386-pc-solaris2.8-gcc-4.4.3 gcc)
-	$(_DBG)(cd $(IPREFIX)/bin; \
-		gcp i386-pc-solaris2.8-g++ i386-pc-solaris2.8-c++)
-	$(_DBG)(cd $(IPREFIX)/bin; gcp i386-pc-solaris2.8-g++ g++)
-	$(_DBG)(cd $(IPREFIX)/bin; gcp i386-pc-solaris2.8-g++ c++)
-	$(_DBG)(cd $(IPREFIX)/bin; gcp i386-pc-solaris2.8-gcj gcj)
-	$(_DBG)(cd $(IPREFIX)/bin; gcp i386-pc-solaris2.8-gfortran gfortran)
-	$(_DBG)(cd $(APREFIX)/bin; grm -f *gcc *c++ g++ gcj gfortran)
-	$(_DBG)(cd $(APREFIX)/bin; \
-		gcp i386-pc-solaris2.10-gcc-4.4.3 i386-pc-solaris2.10-gcc)
-	$(_DBG)(cd $(APREFIX)/bin; gcp i386-pc-solaris2.10-gcc-4.4.3 gcc)
-	$(_DBG)(cd $(APREFIX)/bin; \
-		gcp i386-pc-solaris2.10-g++ i386-pc-solaris2.10-c++)
-	$(_DBG)(cd $(APREFIX)/bin; gcp i386-pc-solaris2.10-g++ g++)
-	$(_DBG)(cd $(APREFIX)/bin; gcp i386-pc-solaris2.10-g++ c++)
-	$(_DBG)(cd $(APREFIX)/bin; gcp i386-pc-solaris2.10-gcj gcj)
-	$(_DBG)(cd $(APREFIX)/bin; gcp i386-pc-solaris2.10-gfortran gfortran)
-	$(_DBG)$(MAKECOOKIE)
-
-merge-i386-files:
-	@echo "[===== Merging isa-i386 =====]"
-	$(_DBG)(cd $(I386_BASE); /usr/bin/pax -rw -v $(MPREFIX)/bin $(PKGROOT))
-	$(_DBG)(cd $(PPREFIX)/bin; gmv *solaris2* $(PPREFIX)/bin/i386)
-	$(_DBG)(cd $(I386_BASE); /usr/bin/pax -rw -v $(MPREFIX)/include $(PKGROOT))
-	$(_DBG)(cd $(I386_BASE); /usr/bin/pax -rw -v $(MPREFIX)/info $(PKGROOT))
-	$(_DBG)(cd $(I386_BASE); /usr/bin/pax -rw -v $(MPREFIX)/man $(PKGROOT))
-	$(_DBG)(cd $(I386_BASE); /usr/bin/pax -rw -v $(MPREFIX)/share $(PKGROOT))
-	$(_DBG)(cd $(I386_BASE); /usr/bin/pax -rw -v $(MPREFIX)/lib $(PKGROOT))
-	$(_DBG)(cd $(I386_BASE); /usr/bin/pax -rw -v $(MPREFIX)/libexec $(PKGROOT))
-	$(_DBG)$(MAKECOOKIE)
-
-merge-amd64-files:
-	@echo "[===== Merging isa-amd64 =====]"
-	$(_DBG)(cd $(AMD_BASE); \
-		for dir in `gfind . -name "*solaris2\.10*" -type d` ; do \
-		/usr/bin/pax -rw -v $$dir $(PKGROOT); done )
-	$(_DBG)(cd $(AMD_BASE); /usr/bin/pax -rw -v $(MPREFIX)/lib/amd64 $(PKGROOT))
-	$(_DBG)(cd $(APREFIX)/bin; /usr/bin/pax -rw -v * $(PPREFIX)/bin/amd64)
-	$(_DBG)$(MAKECOOKIE)
-
-ifeq ($(shell uname -p), i386)
-ISAEXEC_DIRS   = $(bindir)
-ISAEXEC_FILES += $(bindir)/gcc
-ISAEXEC_FILES += $(bindir)/gcov
-ISAEXEC_FILES += $(bindir)/gccbug
-ISAEXEC_FILES += $(bindir)/gfortran
-ISAEXEC_FILES += $(bindir)/c++
-ISAEXEC_FILES += $(bindir)/g++
-ISAEXEC_FILES += $(bindir)/cpp
-ISAEXEC_FILES += $(bindir)/addr2name.awk
-ISAEXEC_FILES += $(bindir)/gc-analyze
-ISAEXEC_FILES += $(bindir)/gcjh
-ISAEXEC_FILES += $(bindir)/gjarsigner
-ISAEXEC_FILES += $(bindir)/grmic
-ISAEXEC_FILES += $(bindir)/gjavah
-ISAEXEC_FILES += $(bindir)/grmid
-ISAEXEC_FILES += $(bindir)/jcf-dump
-ISAEXEC_FILES += $(bindir)/gkeytool
-ISAEXEC_FILES += $(bindir)/grmiregistry
-ISAEXEC_FILES += $(bindir)/jv-convert
-ISAEXEC_FILES += $(bindir)/gcj
-ISAEXEC_FILES += $(bindir)/gij
-ISAEXEC_FILES += $(bindir)/gserialver
-ISAEXEC_FILES += $(bindir)/gappletviewer
-ISAEXEC_FILES += $(bindir)/gcj-dbtool
-ISAEXEC_FILES += $(bindir)/gjar
-ISAEXEC_FILES += $(bindir)/gorbd
-ISAEXEC_FILES += $(bindir)/gtnameserv
-ISAEXEC_FILES += $(bindir)/gnative2ascii
-ISAEXEC_FILES += $(bindir)/gnat
-ISAEXEC_FILES += $(bindir)/gnatls
-ISAEXEC_FILES += $(bindir)/gnatname
-ISAEXEC_FILES += $(bindir)/gnatmake
-ISAEXEC_FILES += $(bindir)/gnatclean
-ISAEXEC_FILES += $(bindir)/gnatkr
-ISAEXEC_FILES += $(bindir)/gnatbind
-ISAEXEC_FILES += $(bindir)/gnatbl
-ISAEXEC_FILES += $(bindir)/gnatchop
-ISAEXEC_FILES += $(bindir)/gnatfind
-ISAEXEC_FILES += $(bindir)/gnatxref
-ISAEXEC_FILES += $(bindir)/gnatprep
-ISAEXEC_FILES += $(bindir)/gnatlink
-endif

Deleted: csw/mgar/pkg/gcc4/branches/gcc3libs/files/gar_override.mk
===================================================================
--- csw/mgar/pkg/gcc4/branches/gcc3libs/files/gar_override.mk	2011-08-17 06:13:21 UTC (rev 15356)
+++ csw/mgar/pkg/gcc4/branches/gcc3libs/files/gar_override.mk	2011-08-17 06:17:55 UTC (rev 15357)
@@ -1,49 +0,0 @@
-
-#COOKIEDIR     = $(COOKIEROOTDIR)/$(MODULATION)-$(GAROSREL)-$(GARCH)
-#WORKDIR       = $(WORKROOTDIR)/build-$(MODULATION)-$(GAROSREL)-$(GARCH)
-#PATCHDIR      = $(WORKDIR)/$(NAME)-$(VERSION)
-#INSTALLISADIR = $(WORKROOTDIR)/install-$(MODULATION)-$(GAROSREL)-$(GARCH)
-#PKGROOT       = $(abspath $(WORKROOTDIR)/pkgroot-$(GAROSREL)-$(GARCH))
-#OBJECT_DIR    = $(WORKDIR)/objdir
-#WORKSRC       = $(OBJECT_DIR)
-DIRPATHS      = 
-OPTFLAGS      =
-CONFIG_SHELL  = /opt/csw/bin/bash
-GARCOMPILER   = GCC3
-#GCC3_CC       = /opt/csw/gcc3/bin/gcc -g -O2 -mcpu=v8 -pipe
-#CFLAGS        = -I/opt/csw/include
-#CPPFLAGS      = -I/opt/csw/include
-#CXXFLAGS      = -I/opt/csw/include
-#LDFLAGS       = -L/opt/csw/lib -R/opt/csw/lib
-#BOOT_CFLAGS   = -I/opt/csw/include -mcpu=v8 -g -O2 -pipe
-#BOOT_LDFLAGS  = -L/opt/csw/lib -R/opt/csw/lib
-
-#ifeq ($(shell uname -p),i386)
-#ifeq ($(shell uname -r),5.10)
-#    GCC3_CC       = /opt/csw/gcc3/bin/gcc -g -O2 -pipe
-#    BOOT_CFLAGS   = -I/opt/csw/include -g -O2 -pipe
-#    BOOT_LDFLAGS  = -L/opt/csw/lib -R/opt/csw/lib
-#else
-#    GCC3_CC       = /opt/csw/gcc3/bin/gcc -march=i386 -g -O2 -pipe
-#    BOOT_CFLAGS   = -I/opt/csw/include -m32 -march=i386 -g -O2 -pipe
-#    BOOT_LDFLAGS  = -L/opt/csw/lib -R/opt/csw/lib
-#endif
-#endif
-
-export CONFIG_SHELL
-#export CFLAGS CPPFLAGS CXXFLAGS
-#export LDFLAGS
-#export BOOT_CFLAGS BOOT_LDFLAGS
-
-# FIXCONFIG_DIRS         += $(DESTDIR)$(BUILD_PREFIX)/gcc4/lib
-#STRIP_DIRS             += $(DESTDIR)$(BUILD_PREFIX)/gcc4/bin
-# CONFIGURE_SCRIPTS       = objdir
-
-SKIPTEST ?= 1
-
-# post-configure-modulated: fix-bootflags
-MERGE_SCRIPTS_isa-i386  = amd
-
-#  This should not be necessary any more thanks to checkpkg overrides.
-# ## Run checkpkg Manually
-# ENABLE_CHECK            = 0

Deleted: csw/mgar/pkg/gcc4/branches/gcc3libs/files/package_def.mk
===================================================================
--- csw/mgar/pkg/gcc4/branches/gcc3libs/files/package_def.mk	2011-08-17 06:13:21 UTC (rev 15356)
+++ csw/mgar/pkg/gcc4/branches/gcc3libs/files/package_def.mk	2011-08-17 06:17:55 UTC (rev 15357)
@@ -1,250 +0,0 @@
-###  Package Section  ###
-PACKAGES  = CSWgcc4ada
-CATALOGNAME_CSWgcc4ada        = gcc4ada
-SPKG_DESC_CSWgcc4ada        = GNU C ADA Compiler
-PKGFILES_CSWgcc4ada  = $(libexecdir)/.*gnat1
-PKGFILES_CSWgcc4ada += $(libdir)/.*libgnat.*a
-PKGFILES_CSWgcc4ada += $(libdir)/.*libgnarl.*a
-PKGFILES_CSWgcc4ada += .*/gcc4/.*/adalib/.*
-PKGFILES_CSWgcc4ada += .*/gcc4/.*/adainclude/.*
-PKGFILES_CSWgcc4ada += .*/gcc4/info/.*gnat.*
-PKGFILES_CSWgcc4ada += $(bindir)/gnat(?!ive).*
-RUNTIME_DEP_PKGS_CSWgcc4ada = CSWgcc4adart
-RUNTIME_DEP_PKGS_CSWgcc4ada += CSWlibmpfr4
-RUNTIME_DEP_PKGS_CSWgcc4ada += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWgcc4ada += CSWlibgmp10
-
-PACKAGES += CSWgcc4adart
-CATALOGNAME_CSWgcc4adart      = gcc4adart
-SPKG_DESC_CSWgcc4adart      = GNU C ADA Compiler Run Time
-PKGFILES_CSWgcc4adart  = $(libdir)/.*libgnat.*\.so.*
-PKGFILES_CSWgcc4adart += $(libdir)/.*libgnarl.*\.so.*
-RUNTIME_DEP_PKGS_CSWgcc4adart       = CSWgcc4corert
-
-PACKAGES += CSWgcc4core
-CATALOGNAME_CSWgcc4core       = gcc4core
-SPKG_DESC_CSWgcc4core       = GNU C Compiler
-RUNTIME_DEP_PKGS_CSWgcc4core = CSWgcc4corert CSWbinutils
-RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibmpfr4
-RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibgmp10
-
-PACKAGES += CSWgcc4corert
-CATALOGNAME_CSWgcc4corert     = gcc4corert
-SPKG_DESC_CSWgcc4corert     = GNU C Compiler Run Time
-PKGFILES_CSWgcc4corert  = $(libdir)/.*libgcc_s.*\.so.*
-PKGFILES_CSWgcc4corert += $(libdir)/.*libgomp.*\.so.*
-PKGFILES_CSWgcc4corert += $(libdir)/.*libssp.*\.so.*
-
-PACKAGES += CSWgcc4g++
-CATALOGNAME_CSWgcc4g++ = gcc4g++
-SPKG_DESC_CSWgcc4g++ = GNU C++ Compiler
-PKGFILES_CSWgcc4g++  = $(bindir)/.*g\+\+
-PKGFILES_CSWgcc4g++ += $(bindir)/.*c\+\+
-PKGFILES_CSWgcc4g++ += $(libexecdir)/.*cc1plus
-PKGFILES_CSWgcc4g++ += $(libdir)/.*libstdc.*a
-PKGFILES_CSWgcc4g++ += $(libdir)/.*libsupc\+\+.*a
-PKGFILES_CSWgcc4g++ += .*/gcc4/man/.*g\+\+.1
-PKGFILES_CSWgcc4g++ += $(includedir)/c\+\+/(\d+(?:\.\d+)*)/[a-fA-F,h-iH-I,k-nI-N,p-zP-Z,]+.*
-PKGFILES_CSWgcc4g++ += $(includedir)/c\+\+/(\d+(?:\.\d+)*)/ostream.*
-RUNTIME_DEP_PKGS_CSWgcc4g++  = CSWgcc4g++rt
-RUNTIME_DEP_PKGS_CSWgcc4g++ += CSWlibmpfr4
-RUNTIME_DEP_PKGS_CSWgcc4g++ += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWgcc4g++ += CSWlibgmp10
-
-PACKAGES += CSWgcc4g++rt
-CATALOGNAME_CSWgcc4g++rt = gcc4g++rt
-SPKG_DESC_CSWgcc4g++rt = GNU C++ Compiler Run Time
-RUNTIME_DEP_PKGS_CSWgcc4g++rt = CSWgcc4corert
-PKGFILES_CSWgcc4g++rt  = $(libdir)/.*libstdc.*\.so.*
-PKGFILES_CSWgcc4g++rt += $(libdir)/.*libsupc\+\+.*\.so.*
-
-
-PACKAGES += CSWgcc4gfortran
-CATALOGNAME_CSWgcc4gfortran   = gcc4gfortran
-SPKG_DESC_CSWgcc4gfortran   = GNU Fortran Compiler
-RUNTIME_DEP_PKGS_CSWgcc4gfortran    = CSWgcc4gfortranrt
-RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibmpfr4
-RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibgmp10
-PKGFILES_CSWgcc4gfortran  = $(bindir)/.*gfortran
-PKGFILES_CSWgcc4gfortran += $(libdir)/.*libgfortran.*a
-PKGFILES_CSWgcc4gfortran += $(libexecdir)/.*f951
-PKGFILES_CSWgcc4gfortran += .*/gcc4/man/.*gfortran.1
-PKGFILES_CSWgcc4gfortran += .*/gcc4/info/gfortran.*
-
-PACKAGES += CSWgcc4gfortranrt
-CATALOGNAME_CSWgcc4gfortranrt = gcc4gfortranrt
-SPKG_DESC_CSWgcc4gfortranrt = GNU Fortran Compiler Run Time
-RUNTIME_DEP_PKGS_CSWgcc4gfortranrt  = CSWgcc4corert
-PKGFILES_CSWgcc4gfortranrt  = $(libdir)/.*libgfortran.*\.so.*
-
-PACKAGES += CSWgcc4java
-CATALOGNAME_CSWgcc4java       = gcc4java
-SPKG_DESC_CSWgcc4java       = GNU Java Compiler
-RUNTIME_DEP_PKGS_CSWgcc4java        = CSWgcc4corert CSWgcc4javart
-RUNTIME_DEP_PKGS_CSWgcc4java += CSWzlib
-RUNTIME_DEP_PKGS_CSWgcc4java += CSWlibmpfr4
-RUNTIME_DEP_PKGS_CSWgcc4java += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWgcc4java += CSWlibgmp10
-
-PKGFILES_CSWgcc4java  = $(bindir)/.*gcj.*
-PKGFILES_CSWgcc4java += $(bindir)/.*jv-scan
-PKGFILES_CSWgcc4java += $(bindir)/.*jv-convert
-PKGFILES_CSWgcc4java += $(bindir)/.*jcf-dump
-PKGFILES_CSWgcc4java += $(bindir)/.*grmi.*
-PKGFILES_CSWgcc4java += $(bindir)/.*grepjar
-PKGFILES_CSWgcc4java += $(bindir)/.*gjnih
-PKGFILES_CSWgcc4java += $(bindir)/.*gij
-PKGFILES_CSWgcc4java += $(bindir)/.*fastjar
-PKGFILES_CSWgcc4java += $(bindir)/.*gjar.*
-PKGFILES_CSWgcc4java += $(bindir)/.*gjavah
-PKGFILES_CSWgcc4java += $(bindir)/.*gorbd
-PKGFILES_CSWgcc4java += $(bindir)/.*addr2name.awk
-PKGFILES_CSWgcc4java += $(bindir)/.*gappletviewer
-PKGFILES_CSWgcc4java += $(bindir)/.*gkeytool
-PKGFILES_CSWgcc4java += $(bindir)/.*gserialver
-PKGFILES_CSWgcc4java += $(bindir)/.*gtnameserv
-PKGFILES_CSWgcc4java += $(bindir)/.*gnative2ascii
-PKGFILES_CSWgcc4java += $(bindir)/.*gc-analyze
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gcj.*
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gij.*
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*/jv.*
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*/jcf.*
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*/grmi.*
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*jar.*
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*jni.*
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*java.*
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gorbd.*
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gapplet.*
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gkeytool.*
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gserialver.*
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gtnameserv.*
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gnative2ascii.*
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gc-analyze.*
-PKGFILES_CSWgcc4java += .*/gcc4/share/java/.*
-PKGFILES_CSWgcc4java += $(libdir)/.*libgij.*a
-PKGFILES_CSWgcc4java += $(libdir)/.*libffi.*a
-PKGFILES_CSWgcc4java += $(libdir)/.*lib-gnu-awt.*a
-PKGFILES_CSWgcc4java += $(libdir)/.*security.*
-PKGFILES_CSWgcc4java += $(libdir)/.*logging.properties
-PKGFILES_CSWgcc4java += $(libdir)/.*pkgconfig.*
-PKGFILES_CSWgcc4java += $(libdir)/.*gcj.*a
-PKGFILES_CSWgcc4java += $(libdir)/.*libgcj.*a
-PKGFILES_CSWgcc4java += $(libexecdir)/.*collect.*
-PKGFILES_CSWgcc4java += $(libexecdir)/.*jvgenmain
-PKGFILES_CSWgcc4java += $(libexecdir)/.*jc1.*
-PKGFILES_CSWgcc4java += .*/gcc4/info/gcj.*
-PKGFILES_CSWgcc4java += $(includedir)/.*gcj/.*
-PKGFILES_CSWgcc4java += $(includedir)/.*awt/.*
-PKGFILES_CSWgcc4java += $(includedir)/.*classpath/.*
-PKGFILES_CSWgcc4java += $(includedir)/.*java.*
-PKGFILES_CSWgcc4java += $(includedir)/.*ffi.h
-PKGFILES_CSWgcc4java += $(includedir)/.*org/.*
-
-PACKAGES += CSWgcc4javart
-CATALOGNAME_CSWgcc4javart     = gcc4javart
-SPKG_DESC_CSWgcc4javart     = GNU Java Compiler Run Time
-RUNTIME_DEP_PKGS_CSWgcc4javart      = CSWgcc4corert CSWgcc4g++rt
-PKGFILES_CSWgcc4javart  = $(libdir)/.*libgij.*\.so.*
-PKGFILES_CSWgcc4javart += $(libdir)/.*libffi.*\.so.*
-PKGFILES_CSWgcc4javart += $(libdir)/.*lib-gnu-awt.*\.so.*
-PKGFILES_CSWgcc4javart += $(libdir)/.*security/classpath.*
-PKGFILES_CSWgcc4javart += $(libdir)/.*logging.properties
-PKGFILES_CSWgcc4javart += $(libdir)/.*pkgconfig.*
-PKGFILES_CSWgcc4javart += $(libdir)/.*gcj.*\.so.*
-PKGFILES_CSWgcc4javart += $(libdir)/.*libgcj.*\.so.*
-
-PACKAGES += CSWgcc4objc
-CATALOGNAME_CSWgcc4objc       = gcc4objc
-SPKG_DESC_CSWgcc4objc       = GNU Objective C Compiler
-PKGFILES_CSWgcc4objc  = $(libexecdir)/.*cc1obj
-PKGFILES_CSWgcc4objc += $(libdir)/.*libobjc.*a
-PKGFILES_CSWgcc4objc += $(includedir)/.*objc/.*
-PKGFILES_CSWgcc4objc += $(libdir)/.*/include/objc/.*
-RUNTIME_DEP_PKGS_CSWgcc4objc += CSWgcc4objcrt
-RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibmpfr4
-RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibgmp10
-
-
-PACKAGES += CSWgcc4objcrt
-CATALOGNAME_CSWgcc4objcrt     = gcc4objcrt
-SPKG_DESC_CSWgcc4objcrt     = GNU Objective C Compiler Run Time
-RUNTIME_DEP_PKGS_CSWgcc4objcrt      = CSWgcc4corert
-PKGFILES_CSWgcc4objcrt = $(libdir)/.*libobjc.*\.so.*
- 
-## Source URLs
-VENDOR_URL = http://gcc.gnu.org
-
-## Copyright File
-LICENSE = COPYING3
-
-DISTFILES += CSWgcc4core.space
-
-define CSWgcc4core_postinstall
-#!/bin/sh
-
-Error()
-{
-	echo "=====> postinstall Error: $$1" >&2
-	exit 1
-}
-
-OS_REV="`/usr/bin/uname -r | sed -e 's/[^.]*//'`"
-case `/usr/bin/uname -p` in
-	"sparc") OS_TARGET="sparc-sun-solaris2.8" ;;
-	 "i386") OS_TARGET="i386-pc-solaris2$${OS_REV}" ;;
-esac
-
-TOOLS_DIR="$${PKG_INSTALL_ROOT}/opt/csw/gcc4/libexec/gcc"
-TOOLS_DIR="$${TOOLS_DIR}/$${OS_TARGET}/$(VERSION)/install-tools"
-MKHEADERS_CMD="$${PKG_INSTALL_ROOT}/opt/csw/gcc4/bin/mkheaders"
-INCLUDE_DIR="$${PKG_INSTALL_ROOT}/opt/csw/gcc4/lib/gcc"
-INCLUDE_DIR="$${INCLUDE_DIR}/$${OS_TARGET}/$(VERSION)/include"
-
-cat << _EOF_
-******************************************************************************
-* NOTICE: Fixing the system headers
-*
-* Do not forget: whenever your system headers change 
-* Run the $${MKHEADERS_CMD} script!
-******************************************************************************
-_EOF_
-
-if [ -f $${TOOLS_DIR}/mkheaders ]; then
-	cp $${TOOLS_DIR}/mkheaders $${MKHEADERS_CMD}
-	installf $${PKGINST} "$${MKHEADERS_CMD}"
-else
-	Error "$${TOOLS_DIR}/mkheaders Not Found"
-fi
-
-if [ -f $${MKHEADERS_CMD} ];then
-	chmod 0755 $${MKHEADERS_CMD} 2>/dev/null
-	chown root:bin $${MKHEADERS_CMD} 2>/dev/null
-	"$${MKHEADERS_CMD}" || Error "$${MKHEADERS_CMD} Failed."
-else
-	Error "Could not find $${MKHEADERS_CMD}"
-fi
-
-if [ -d $${INCLUDE_DIR} ]; then
-	chmod 0755 $${INCLUDE_DIR} || Error "Failed to chmod $${INCLUDE_DIR}"
-	chown -R root:bin $${INCLUDE_DIR} || 
-			Error "Failed to change ownership for $${INCLUDE_DIR}"
-	find $${INCLUDE_DIR} -print | installf $${PKGINST} -
-fi
-
-
-cat << _EOF_
-******************************************************************************
-* NOTICE: Successfully fixed system headers
-*
-* Do not forget: whenever your system headers change 
-* Run the $${MKHEADERS_CMD} script!
-******************************************************************************
-_EOF_
-	
-installf -f $${PKGINST}
-
-exit 0
-endef

Deleted: csw/mgar/pkg/gcc4/branches/gcc3libs/files/package_files.mk
===================================================================
--- csw/mgar/pkg/gcc4/branches/gcc3libs/files/package_files.mk	2011-08-17 06:13:21 UTC (rev 15356)
+++ csw/mgar/pkg/gcc4/branches/gcc3libs/files/package_files.mk	2011-08-17 06:17:55 UTC (rev 15357)
@@ -1 +0,0 @@
-# Contents moved to package_dev.mk

Deleted: csw/mgar/pkg/gcc4/branches/gcc3libs/files/pkg_scripts.mk
===================================================================
--- csw/mgar/pkg/gcc4/branches/gcc3libs/files/pkg_scripts.mk	2011-08-17 06:13:21 UTC (rev 15356)
+++ csw/mgar/pkg/gcc4/branches/gcc3libs/files/pkg_scripts.mk	2011-08-17 06:17:55 UTC (rev 15357)
@@ -1,41 +0,0 @@
-ifeq ($(PKG_DEBUG),)
-	_DBG=@
-else
-	_DBG=
-endif
-
-
-## Create $(OBJECT_DIR) to build in
-#post-extract-$(addprefix post-extract-,$(MODULATIONS)):
-#	$(_DBG)(echo "==> Creating Object Dir for Building")
-#	$(_DBG)(mkdir $(OBJECT_DIR))
-#	$(_DBG)$(MAKECOOKIE)
-
-## instead of changing to $(WORKSRC) and running configure
-## Run it from the $(OBJECT_DIR)
-#configure-objdir:
-#	$(_DBG)(echo "==> Running Configure from $(OBJECT_DIR)")
-#	$(_DBG)(cd $(OBJECT_DIR) && $(CONFIGURE_ENV) \
-#		../$(DISTNAME)/configure $(CONFIGURE_ARGS))
-#	$(_DBG)$(MAKECOOKIE)
-
-## Set the CFLAGS so the correct architecture is used
-#fix-bootflags:
-#	$(_DBG)(perl -i -plne "s|^BOOT_CFLAGS.*|BOOT_CFLAGS= $(BOOT_CFLAGS)|" \
-#		$(WORKSRC)/Makefile)
-#	$(_DBG)(perl -i -plne "s|^BOOT_LDFLAGS.*|BOOT_LDFLAGS= $(BOOT_LDFLAGS)|" \
-#		$(WORKSRC)/Makefile)
-#	$(_DBG)$(MAKECOOKIE)
-
-post-merge-modulated:
-	$(_DBG)( gmv $(PKGROOT)$(libdir)/gcc/*/*/adalib/*.so* \
-			$(PKGROOT)$(libdir)/ )
-	$(_DBG)( gfind $(PKGROOT) -name \*~ -exec grm -f {} \; )
-	$(_DBG)( cd $(PKGROOT)$(libdir); gln -s . 32 )
-	$(_DBG)(if [ "`uname -p`" = "sparc" ]; then \
-				cd $(PKGROOT)$(libdir); gln -s sparcv9 64; \
-			else \
-				cd $(PKGROOT)$(libdir); gln -s amd64 64; \
-			fi )
-	$(_DBG)$(MAKECOOKIE)
-


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

From jesser at users.sourceforge.net  Wed Aug 17 08:26:38 2011
From: jesser at users.sourceforge.net (jesser at users.sourceforge.net)
Date: Wed, 17 Aug 2011 06:26:38 +0000
Subject: [csw-devel] SF.net SVN: gar:[15358]
	csw/mgar/pkg/rbgems/rake/branches/rb18/Makefile
Message-ID: 

Revision: 15358
          http://gar.svn.sourceforge.net/gar/?rev=15358&view=rev
Author:   jesser
Date:     2011-08-17 06:26:38 +0000 (Wed, 17 Aug 2011)

Log Message:
-----------
rbgems/rake/branches/rb18: switch name to CSWrb18-rake naming standard

Modified Paths:
--------------
    csw/mgar/pkg/rbgems/rake/branches/rb18/Makefile

Modified: csw/mgar/pkg/rbgems/rake/branches/rb18/Makefile
===================================================================
--- csw/mgar/pkg/rbgems/rake/branches/rb18/Makefile	2011-08-17 06:17:55 UTC (rev 15357)
+++ csw/mgar/pkg/rbgems/rake/branches/rb18/Makefile	2011-08-17 06:26:38 UTC (rev 15358)
@@ -7,8 +7,8 @@
   Rake is a Make-like program implemented in Ruby. Tasks and dependencies are specified in standard Ruby syntax.
 endef
 
-PACKAGES = CSWgem-rake
-CATALOGNAME = gem_rake
+#PACKAGES = CSWgem-rake
+#CATALOGNAME = gem_rake
 
 LICENSE = MIT-LICENSE
 


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

From wahwah at users.sourceforge.net  Wed Aug 17 09:52:59 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 17 Aug 2011 07:52:59 +0000
Subject: [csw-devel] SF.net SVN: gar:[15359]
	csw/mgar/pkg/gcc4/branches/bootstrap-4.6
Message-ID: 

Revision: 15359
          http://gar.svn.sourceforge.net/gar/?rev=15359&view=rev
Author:   wahwah
Date:     2011-08-17 07:52:58 +0000 (Wed, 17 Aug 2011)

Log Message:
-----------
pkg/gcc4/branches/bootstrap-4.6: progress save

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
    csw/mgar/pkg/gcc4/branches/bootstrap-4.6/files/package_def.mk

Modified: csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-17 06:26:38 UTC (rev 15358)
+++ csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-17 07:52:58 UTC (rev 15359)
@@ -19,10 +19,20 @@
 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
 
 # GIT init takes a long time, disable for now, reenable if build works
-# NOGITPATCH ?= 1
+NOGITPATCH ?= 1
 
+prefix = $(BUILD_PREFIX)/gcc4
+libdir_install = $(BUILD_PREFIX)/lib
+libdir = $(abspath $(BUILD_PREFIX)/lib/$(MM_LIBDIR))
+
 ## build options
-CONFIGURE_ARGS  = --prefix=$(BUILD_PREFIX)/gcc4
+# http://gcc.gnu.org/install/configure.html
+
+# Could be used to break out of the /opt/csw/gcc4 prefix
+# CONFIGURE_ARGS += --program-prefix=gcc4-
+
+CONFIGURE_ARGS += --with-pkgversion=OpenCSW
+CONFIGURE_ARGS += $(DIRPATHS)
 CONFIGURE_ARGS += --exec-prefix=$(BUILD_PREFIX)/gcc4
 CONFIGURE_ARGS += --with-gnu-as
 CONFIGURE_ARGS += --with-as=/opt/csw/bin/gas
@@ -34,17 +44,28 @@
 CONFIGURE_ARGS += --with-x
 CONFIGURE_ARGS += --with-mpfr=$(BUILD_PREFIX)
 CONFIGURE_ARGS += --with-gmp=$(BUILD_PREFIX)
+# To be enabled when PPL is built
+# CONFIGURE_ARGS += --with-ppl=$(BUILD_PREFIX)
 CONFIGURE_ARGS += --enable-java-awt=xlib
 # CONFIGURE_ARGS += --enable-libada
 CONFIGURE_ARGS += --enable-libssp
 CONFIGURE_ARGS += --enable-objc-gc
 CONFIGURE_ARGS += --enable-threads=posix 
 CONFIGURE_ARGS += --enable-stage1-languages=c
-# We'll build ada later.
+# We'll build ada later. It requires the PPL library.
 # CONFIGURE_ARGS += --enable-languages=ada,c,c++,fortran,java,objc
 CONFIGURE_ARGS += --enable-languages=c,c++,fortran,java,objc
 CONFIGURE_ARGS += --enable-bootstrap
+CONFIGURE_ARGS += --with-system-zlib
 
+# there could be some abstractions in gar.conf.mk, but at the moment there
+# aren't so let's specify architectures by hand.
+CPU_sparc_32 = v8
+CPU_sparc_64 = v9
+
+CONFIGURE_ARGS += --with-arch-32=$(CPU_$(GARCH)_32)
+CONFIGURE_ARGS += --with-arch-64=$(CPU_$(GARCH)_64)
+
 # GCC can't be built in the same directory with the sources.
 OBJDIR          = objdir
 
@@ -55,6 +76,10 @@
 EXTRA_EXPORTS += CFLAGS_FOR_TARGET
 EXTRA_EXPORTS += CXXFLAGS_FOR_TARGET
 
+# Might be necessary, but CFLAGS_FOR_TARGET seem to be enough for now.
+# BOOT_CFLAGS = $(CFLAGS_FOR_TARGET)
+# EXTRA_EXPORTS += BOOT_FLAGS
+
 # bash must be used, otherwise:
 # http://fixunix.com/solaris/490396-gcc-build-fails-cannot-compute-suffix-object-files.html
 CONFIG_SHELL = /opt/csw/bin/bash
@@ -63,11 +88,201 @@
 EXTRA_CONFIGURE_EXPORTS += CFLAGS_FOR_TARGET
 EXTRA_CONFIGURE_EXPORTS += CXXFLAGS_FOR_TARGET
 
-# OBJDUMP=/opt/csw/bin/gobjdump
-# EXTRA_EXPORTS += OBJDUMP
+# Only required for Sun Studio bootstrapping
+# PATCHFILES += 0001-clear-AM_CFLAGS-in-lto-plugin.patch
 
-PATCHFILES += 0001-clear-AM_CFLAGS-in-lto-plugin.patch
+# Bootstrapping with Sun Studio has issues
+# http://gcc.gnu.org/ml/gcc-help/2011-08/msg00191.html
+GARCOMPILER = GNU
 
+# There's a lot of failing checks. Probably a lot of porting work.
+SKIPTEST = 1
+
+PACKAGES = CSWgcc4core
+SPKG_DESC_CSWgcc4core = GNU C compiler
+RUNTIME_DEP_PKGS_CSWgcc4core = CSWbinutils
+# Catch-all package
+
+PACKAGES += CSWlib-gnu-awt-xlib12
+CATALOGNAME_CSWlib-gnu-awt-xlib12 = lib_gnu_awt_xlib12
+PKGFILES_CSWlib-gnu-awt-xlib12 += $(call baseisadirs,$(libdir),lib-gnu-awt-xlib\.so\.12(\.\d+)*)
+SPKG_DESC_CSWlib-gnu-awt-xlib12 += The GNU Compiler Collection, lib-gnu-awt-xlib.so.12
+RUNTIME_DEP_PKGS_CSWgcc4 += CSWlib-gnu-awt-xlib12
+RUNTIME_DEP_PKGS_CSWlib-gnu-awt-xlib12 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlib-gnu-awt-xlib12 += CSWlibgcc-s1
+
+PACKAGES += CSWlibffi4
+CATALOGNAME_CSWlibffi4 = libffi4
+PKGFILES_CSWlibffi4 += $(call baseisadirs,$(libdir),libffi\.so\.4(\.\d+)*)
+SPKG_DESC_CSWlibffi4 += The GNU Compiler Collection, libffi.so.4
+RUNTIME_DEP_PKGS_CSWgcc4 += CSWlibffi4
+RUNTIME_DEP_PKGS_CSWlibffi4 += CSWlibgcc-s1
+
+PACKAGES += CSWlibgcc-s1
+CATALOGNAME_CSWlibgcc-s1 = libgcc_s1
+PKGFILES_CSWlibgcc-s1 += $(call baseisadirs,$(libdir),libgcc_s\.so\.1(\.\d+)*)
+SPKG_DESC_CSWlibgcc-s1 += The GNU Compiler Collection, libgcc_s.so.1
+RUNTIME_DEP_PKGS_CSWgcc4 += CSWlibgcc-s1
+# For reference, the old CSWgcc3corert:
+# http://buildfarm.opencsw.org/pkgdb/srv4/1991387f2cb9f545b2a1b254b50638ef/
+OBSOLETED_BY_CSWlibgcc-s1 = CSWgcc3corert
+
+PACKAGES += CSWlibgcj-tools12
+CATALOGNAME_CSWlibgcj-tools12 = libgcj_tools12
+PKGFILES_CSWlibgcj-tools12 += $(call baseisadirs,$(libdir),libgcj-tools\.so\.12(\.\d+)*)
+SPKG_DESC_CSWlibgcj-tools12 += The GNU Compiler Collection, libgcj-tools.so.12
+RUNTIME_DEP_PKGS_CSWgcc4 += CSWlibgcj-tools12
+RUNTIME_DEP_PKGS_CSWlibgcj-tools12 += CSWlibgcj12
+RUNTIME_DEP_PKGS_CSWlibgcj-tools12 += CSWlibgcc-s1
+
+PACKAGES += CSWlibgcj12
+CATALOGNAME_CSWlibgcj12 = libgcj12
+PKGFILES_CSWlibgcj12 += $(call baseisadirs,$(libdir),libgcj\.so\.12(\.\d+)*)
+SPKG_DESC_CSWlibgcj12 += The GNU Compiler Collection, libgcj.so.12
+RUNTIME_DEP_PKGS_CSWlibgcj12 += CSWlibgcc-s1
+
+PACKAGES += CSWlibgfortran3
+CATALOGNAME_CSWlibgfortran3 = libgfortran3
+PKGFILES_CSWlibgfortran3 += $(call baseisadirs,$(libdir),libgfortran\.so\.3(\.\d+)*)
+SPKG_DESC_CSWlibgfortran3 += The GNU Compiler Collection, libgfortran.so.3
+RUNTIME_DEP_PKGS_CSWgcc4 += CSWlibgfortran3
+RUNTIME_DEP_PKGS_CSWlibgfortran3 += CSWlibgcc-s1
+OBSOLETED_BY_CSWlibgfortran3 = CSWgcc4gfortranrt
+
+PACKAGES += CSWlibgij12
+CATALOGNAME_CSWlibgij12 = libgij12
+PKGFILES_CSWlibgij12 += $(call baseisadirs,$(libdir),libgij\.so\.12(\.\d+)*)
+SPKG_DESC_CSWlibgij12 += The GNU Compiler Collection, libgij.so.12
+
+PACKAGES += CSWlibgomp1
+CATALOGNAME_CSWlibgomp1 = libgomp1
+PKGFILES_CSWlibgomp1 += $(call baseisadirs,$(libdir),libgomp\.so\.1(\.\d+)*)
+SPKG_DESC_CSWlibgomp1 += The GNU Compiler Collection, libgomp.so.1
+RUNTIME_DEP_PKGS_CSWlibgomp1 += CSWlibgcc-s1
+OBSOLETED_BY_CSWlibgomp1 += CSWgcc4corert
+
+PACKAGES += CSWlibobjc3
+CATALOGNAME_CSWlibobjc3 = libobjc3
+PKGFILES_CSWlibobjc3 += $(call baseisadirs,$(libdir),libobjc\.so\.3(\.\d+)*)
+SPKG_DESC_CSWlibobjc3 += The GNU Compiler Collection, libobjc.so.3
+RUNTIME_DEP_PKGS_CSWlibobjc3 += CSWlibgcc-s1
+
+PACKAGES += CSWlibobjc-gc3
+CATALOGNAME_CSWlibobjc-gc3 = libobjc_gc3
+PKGFILES_CSWlibobjc-gc3 += $(call baseisadirs,$(libdir),libobjc_gc\.so\.3(\.\d+)*)
+SPKG_DESC_CSWlibobjc-gc3 += The GNU Compiler Collection, libobjc_gc.so.3
+RUNTIME_DEP_PKGS_CSWlibobjc-gc3 += CSWlibgcc-s1
+
+PACKAGES += CSWlibssp0
+CATALOGNAME_CSWlibssp0 = libssp0
+PKGFILES_CSWlibssp0 += $(call baseisadirs,$(libdir),libssp\.so\.0(\.\d+)*)
+SPKG_DESC_CSWlibssp0 += The GNU Compiler Collection, libssp.so.0
+RUNTIME_DEP_PKGS_CSWlibssp0 += CSWlibgcc-s1
+OBSOLETED_BY_CSWlibssp0 += CSWgcc4corert
+
+PACKAGES += CSWlibstdc++6
+CATALOGNAME_CSWlibstdc++6 = libstdc++6
+PKGFILES_CSWlibstdc++6 += $(call baseisadirs,$(libdir),libstdc\+\+\.so\.6(\.\d+)*)
+SPKG_DESC_CSWlibstdc++6 += The GNU Compiler Collection, libstdc++.so.6
+RUNTIME_DEP_PKGS_CSWlibstdc++6 += CSWlibgcc-s1
+OBSOLETED_BY_CSWlibstdc++6 = CSWgcc4g++rt
+
+PACKAGES += CSWgcc4g++
+CATALOGNAME_CSWgcc4g++ = gcc4g++
+SPKG_DESC_CSWgcc4g++ = GNU C++ Compiler
+PKGFILES_CSWgcc4g++  = $(bindir)/g\+\+
+PKGFILES_CSWgcc4g++ += $(bindir)/c\+\+
+PKGFILES_CSWgcc4g++ += $(libexecdir)/.*cc1plus
+PKGFILES_CSWgcc4g++ += $(libdir)/.*libstdc.*a
+PKGFILES_CSWgcc4g++ += $(mandir)/.*g\+\+.1
+PKGFILES_CSWgcc4g++ += $(includedir)/c\+\+/(\d+(?:\.\d+)*)/[a-fA-F,h-iH-I,k-nI-N,p-zP-Z,]+.*
+PKGFILES_CSWgcc4g++ += $(includedir)/c\+\+/(\d+(?:\.\d+)*)/ostream.*
+RUNTIME_DEP_PKGS_CSWgcc4g++ += CSWlibmpfr4
+RUNTIME_DEP_PKGS_CSWgcc4g++ += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWgcc4g++ += CSWlibgmp10
+RUNTIME_DEP_PKGS_CSWgcc4g++ += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWgcc4g++ += CSWlibmpc2
+
+OBSOLETED_BY_CSWlibgcc-s1 += CSWgcc4corert
+RUNTIME_DEP_PKGS_CSWlibgij12 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibgij12 += CSWlibgcj12
+
+PACKAGES += CSWgcc4gfortran
+CATALOGNAME_CSWgcc4gfortran   = gcc4gfortran
+SPKG_DESC_CSWgcc4gfortran   = GNU Fortran Compiler
+RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibmpfr4
+RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibgmp10
+PKGFILES_CSWgcc4gfortran  = $(bindir)/gfortran
+PKGFILES_CSWgcc4gfortran += $(libdir)/.*libgfortran.*a
+PKGFILES_CSWgcc4gfortran += $(libexecdir)/.*f951
+PKGFILES_CSWgcc4gfortran += $(mandir)/.*gfortran.1
+PKGFILES_CSWgcc4gfortran += .*/gcc4/info/gfortran.*
+
+PACKAGES += CSWgcc4java
+CATALOGNAME_CSWgcc4java       = gcc4java
+SPKG_DESC_CSWgcc4java       = GNU Java Compiler
+RUNTIME_DEP_PKGS_CSWgcc4java        = CSWgcc4corert CSWgcc4javart
+RUNTIME_DEP_PKGS_CSWgcc4java += CSWzlib
+RUNTIME_DEP_PKGS_CSWgcc4java += CSWlibmpfr4
+RUNTIME_DEP_PKGS_CSWgcc4java += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWgcc4java += CSWlibgmp10
+
+PKGFILES_CSWgcc4java  = $(bindir)/.*gcj.*
+PKGFILES_CSWgcc4java += $(bindir)/.*jv-scan
+PKGFILES_CSWgcc4java += $(bindir)/.*jv-convert
+PKGFILES_CSWgcc4java += $(bindir)/.*jcf-dump
+PKGFILES_CSWgcc4java += $(bindir)/.*grmi.*
+PKGFILES_CSWgcc4java += $(bindir)/.*grepjar
+PKGFILES_CSWgcc4java += $(bindir)/.*gjnih
+PKGFILES_CSWgcc4java += $(bindir)/.*gij
+PKGFILES_CSWgcc4java += $(bindir)/.*fastjar
+PKGFILES_CSWgcc4java += $(bindir)/.*gjar.*
+PKGFILES_CSWgcc4java += $(bindir)/.*gjavah
+PKGFILES_CSWgcc4java += $(bindir)/.*gorbd
+PKGFILES_CSWgcc4java += $(bindir)/.*addr2name.awk
+PKGFILES_CSWgcc4java += $(bindir)/.*gappletviewer
+PKGFILES_CSWgcc4java += $(bindir)/.*gkeytool
+PKGFILES_CSWgcc4java += $(bindir)/.*gserialver
+PKGFILES_CSWgcc4java += $(bindir)/.*gtnameserv
+PKGFILES_CSWgcc4java += $(bindir)/.*gnative2ascii
+PKGFILES_CSWgcc4java += $(bindir)/.*gc-analyze
+PKGFILES_CSWgcc4java += $(mandir)/.*/gcj.*
+PKGFILES_CSWgcc4java += $(mandir)/.*/gij.*
+PKGFILES_CSWgcc4java += $(mandir)/.*/jv.*
+PKGFILES_CSWgcc4java += $(mandir)/.*/jcf.*
+PKGFILES_CSWgcc4java += $(mandir)/.*/grmi.*
+PKGFILES_CSWgcc4java += $(mandir)/.*jar.*
+PKGFILES_CSWgcc4java += $(mandir)/.*jni.*
+PKGFILES_CSWgcc4java += $(mandir)/.*java.*
+PKGFILES_CSWgcc4java += $(mandir)/.*/gorbd.*
+PKGFILES_CSWgcc4java += $(mandir)/.*/gapplet.*
+PKGFILES_CSWgcc4java += $(mandir)/.*/gkeytool.*
+PKGFILES_CSWgcc4java += $(mandir)/.*/gserialver.*
+PKGFILES_CSWgcc4java += $(mandir)/.*/gtnameserv.*
+PKGFILES_CSWgcc4java += $(mandir)/.*/gnative2ascii.*
+PKGFILES_CSWgcc4java += $(mandir)/.*/gc-analyze.*
+PKGFILES_CSWgcc4java += .*/gcc4/share/java/.*
+PKGFILES_CSWgcc4java += $(libdir)/.*libgij.*a
+PKGFILES_CSWgcc4java += $(libdir)/.*libffi.*a
+PKGFILES_CSWgcc4java += $(libdir)/.*lib-gnu-awt.*a
+PKGFILES_CSWgcc4java += $(libdir)/.*security.*
+PKGFILES_CSWgcc4java += $(libdir)/.*logging.properties
+PKGFILES_CSWgcc4java += $(libdir)/.*pkgconfig.*
+PKGFILES_CSWgcc4java += $(libdir)/.*gcj.*a
+PKGFILES_CSWgcc4java += $(libdir)/.*libgcj.*a
+PKGFILES_CSWgcc4java += $(libexecdir)/.*collect.*
+PKGFILES_CSWgcc4java += $(libexecdir)/.*jvgenmain
+PKGFILES_CSWgcc4java += $(libexecdir)/.*jc1.*
+PKGFILES_CSWgcc4java += .*/gcc4/info/gcj.*
+PKGFILES_CSWgcc4java += $(includedir)/.*gcj/.*
+PKGFILES_CSWgcc4java += $(includedir)/.*awt/.*
+PKGFILES_CSWgcc4java += $(includedir)/.*classpath/.*
+PKGFILES_CSWgcc4java += $(includedir)/.*java.*
+PKGFILES_CSWgcc4java += $(includedir)/.*ffi.h
+PKGFILES_CSWgcc4java += $(includedir)/.*org/.*
+
+
 include gar/category.mk
 
 # We need GNU find as find

Modified: csw/mgar/pkg/gcc4/branches/bootstrap-4.6/files/package_def.mk
===================================================================
--- csw/mgar/pkg/gcc4/branches/bootstrap-4.6/files/package_def.mk	2011-08-17 06:26:38 UTC (rev 15358)
+++ csw/mgar/pkg/gcc4/branches/bootstrap-4.6/files/package_def.mk	2011-08-17 07:52:58 UTC (rev 15359)
@@ -21,127 +21,35 @@
 PKGFILES_CSWgcc4adart += $(libdir)/.*libgnarl.*\.so.*
 RUNTIME_DEP_PKGS_CSWgcc4adart       = CSWgcc4corert
 
-PACKAGES += CSWgcc4core
-CATALOGNAME_CSWgcc4core       = gcc4core
-SPKG_DESC_CSWgcc4core       = GNU C Compiler
-RUNTIME_DEP_PKGS_CSWgcc4core = CSWgcc4corert CSWbinutils
-RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibmpfr4
-RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibgmp10
+# PACKAGES += CSWgcc4core
+# CATALOGNAME_CSWgcc4core       = gcc4core
+# SPKG_DESC_CSWgcc4core       = GNU C Compiler
+# RUNTIME_DEP_PKGS_CSWgcc4core = CSWgcc4corert CSWbinutils
+# RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibmpfr4
+# RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibiconv2
+# RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibgmp10
 
-PACKAGES += CSWgcc4corert
-CATALOGNAME_CSWgcc4corert     = gcc4corert
-SPKG_DESC_CSWgcc4corert     = GNU C Compiler Run Time
-PKGFILES_CSWgcc4corert  = $(libdir)/.*libgcc_s.*\.so.*
-PKGFILES_CSWgcc4corert += $(libdir)/.*libgomp.*\.so.*
-PKGFILES_CSWgcc4corert += $(libdir)/.*libssp.*\.so.*
+# PACKAGES += CSWgcc4corert
+# CATALOGNAME_CSWgcc4corert     = gcc4corert
+# SPKG_DESC_CSWgcc4corert     = GNU C Compiler Run Time
+# PKGFILES_CSWgcc4corert  = $(libdir)/.*libgcc_s.*\.so.*
+# PKGFILES_CSWgcc4corert += $(libdir)/.*libgomp.*\.so.*
+# PKGFILES_CSWgcc4corert += $(libdir)/.*libssp.*\.so.*
 
-PACKAGES += CSWgcc4g++
-CATALOGNAME_CSWgcc4g++ = gcc4g++
-SPKG_DESC_CSWgcc4g++ = GNU C++ Compiler
-PKGFILES_CSWgcc4g++  = $(bindir)/.*g\+\+
-PKGFILES_CSWgcc4g++ += $(bindir)/.*c\+\+
-PKGFILES_CSWgcc4g++ += $(libexecdir)/.*cc1plus
-PKGFILES_CSWgcc4g++ += $(libdir)/.*libstdc.*a
-PKGFILES_CSWgcc4g++ += $(libdir)/.*libsupc\+\+.*a
-PKGFILES_CSWgcc4g++ += .*/gcc4/man/.*g\+\+.1
-PKGFILES_CSWgcc4g++ += $(includedir)/c\+\+/(\d+(?:\.\d+)*)/[a-fA-F,h-iH-I,k-nI-N,p-zP-Z,]+.*
-PKGFILES_CSWgcc4g++ += $(includedir)/c\+\+/(\d+(?:\.\d+)*)/ostream.*
-RUNTIME_DEP_PKGS_CSWgcc4g++  = CSWgcc4g++rt
-RUNTIME_DEP_PKGS_CSWgcc4g++ += CSWlibmpfr4
-RUNTIME_DEP_PKGS_CSWgcc4g++ += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWgcc4g++ += CSWlibgmp10
+# PACKAGES += CSWgcc4g++rt
+# CATALOGNAME_CSWgcc4g++rt = gcc4g++rt
+# SPKG_DESC_CSWgcc4g++rt = GNU C++ Compiler Run Time
+# RUNTIME_DEP_PKGS_CSWgcc4g++rt = CSWgcc4corert
+# PKGFILES_CSWgcc4g++rt  = $(libdir)/.*libstdc.*\.so.*
+# supc was not found anywhere
+# PKGFILES_CSWgcc4g++rt += $(libdir)/.*libsupc\+\+.*\.so.*
 
-PACKAGES += CSWgcc4g++rt
-CATALOGNAME_CSWgcc4g++rt = gcc4g++rt
-SPKG_DESC_CSWgcc4g++rt = GNU C++ Compiler Run Time
-RUNTIME_DEP_PKGS_CSWgcc4g++rt = CSWgcc4corert
-PKGFILES_CSWgcc4g++rt  = $(libdir)/.*libstdc.*\.so.*
-PKGFILES_CSWgcc4g++rt += $(libdir)/.*libsupc\+\+.*\.so.*
+# PACKAGES += CSWgcc4gfortranrt
+# CATALOGNAME_CSWgcc4gfortranrt = gcc4gfortranrt
+# SPKG_DESC_CSWgcc4gfortranrt = GNU Fortran Compiler Run Time
+# RUNTIME_DEP_PKGS_CSWgcc4gfortranrt  = CSWgcc4corert
+# PKGFILES_CSWgcc4gfortranrt  = $(libdir)/.*libgfortran.*\.so.*
 
-
-PACKAGES += CSWgcc4gfortran
-CATALOGNAME_CSWgcc4gfortran   = gcc4gfortran
-SPKG_DESC_CSWgcc4gfortran   = GNU Fortran Compiler
-RUNTIME_DEP_PKGS_CSWgcc4gfortran    = CSWgcc4gfortranrt
-RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibmpfr4
-RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibgmp10
-PKGFILES_CSWgcc4gfortran  = $(bindir)/.*gfortran
-PKGFILES_CSWgcc4gfortran += $(libdir)/.*libgfortran.*a
-PKGFILES_CSWgcc4gfortran += $(libexecdir)/.*f951
-PKGFILES_CSWgcc4gfortran += .*/gcc4/man/.*gfortran.1
-PKGFILES_CSWgcc4gfortran += .*/gcc4/info/gfortran.*
-
-PACKAGES += CSWgcc4gfortranrt
-CATALOGNAME_CSWgcc4gfortranrt = gcc4gfortranrt
-SPKG_DESC_CSWgcc4gfortranrt = GNU Fortran Compiler Run Time
-RUNTIME_DEP_PKGS_CSWgcc4gfortranrt  = CSWgcc4corert
-PKGFILES_CSWgcc4gfortranrt  = $(libdir)/.*libgfortran.*\.so.*
-
-PACKAGES += CSWgcc4java
-CATALOGNAME_CSWgcc4java       = gcc4java
-SPKG_DESC_CSWgcc4java       = GNU Java Compiler
-RUNTIME_DEP_PKGS_CSWgcc4java        = CSWgcc4corert CSWgcc4javart
-RUNTIME_DEP_PKGS_CSWgcc4java += CSWzlib
-RUNTIME_DEP_PKGS_CSWgcc4java += CSWlibmpfr4
-RUNTIME_DEP_PKGS_CSWgcc4java += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWgcc4java += CSWlibgmp10
-
-PKGFILES_CSWgcc4java  = $(bindir)/.*gcj.*
-PKGFILES_CSWgcc4java += $(bindir)/.*jv-scan
-PKGFILES_CSWgcc4java += $(bindir)/.*jv-convert
-PKGFILES_CSWgcc4java += $(bindir)/.*jcf-dump
-PKGFILES_CSWgcc4java += $(bindir)/.*grmi.*
-PKGFILES_CSWgcc4java += $(bindir)/.*grepjar
-PKGFILES_CSWgcc4java += $(bindir)/.*gjnih
-PKGFILES_CSWgcc4java += $(bindir)/.*gij
-PKGFILES_CSWgcc4java += $(bindir)/.*fastjar
-PKGFILES_CSWgcc4java += $(bindir)/.*gjar.*
-PKGFILES_CSWgcc4java += $(bindir)/.*gjavah
-PKGFILES_CSWgcc4java += $(bindir)/.*gorbd
-PKGFILES_CSWgcc4java += $(bindir)/.*addr2name.awk
-PKGFILES_CSWgcc4java += $(bindir)/.*gappletviewer
-PKGFILES_CSWgcc4java += $(bindir)/.*gkeytool
-PKGFILES_CSWgcc4java += $(bindir)/.*gserialver
-PKGFILES_CSWgcc4java += $(bindir)/.*gtnameserv
-PKGFILES_CSWgcc4java += $(bindir)/.*gnative2ascii
-PKGFILES_CSWgcc4java += $(bindir)/.*gc-analyze
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gcj.*
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gij.*
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*/jv.*
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*/jcf.*
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*/grmi.*
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*jar.*
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*jni.*
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*java.*
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gorbd.*
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gapplet.*
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gkeytool.*
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gserialver.*
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gtnameserv.*
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gnative2ascii.*
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gc-analyze.*
-PKGFILES_CSWgcc4java += .*/gcc4/share/java/.*
-PKGFILES_CSWgcc4java += $(libdir)/.*libgij.*a
-PKGFILES_CSWgcc4java += $(libdir)/.*libffi.*a
-PKGFILES_CSWgcc4java += $(libdir)/.*lib-gnu-awt.*a
-PKGFILES_CSWgcc4java += $(libdir)/.*security.*
-PKGFILES_CSWgcc4java += $(libdir)/.*logging.properties
-PKGFILES_CSWgcc4java += $(libdir)/.*pkgconfig.*
-PKGFILES_CSWgcc4java += $(libdir)/.*gcj.*a
-PKGFILES_CSWgcc4java += $(libdir)/.*libgcj.*a
-PKGFILES_CSWgcc4java += $(libexecdir)/.*collect.*
-PKGFILES_CSWgcc4java += $(libexecdir)/.*jvgenmain
-PKGFILES_CSWgcc4java += $(libexecdir)/.*jc1.*
-PKGFILES_CSWgcc4java += .*/gcc4/info/gcj.*
-PKGFILES_CSWgcc4java += $(includedir)/.*gcj/.*
-PKGFILES_CSWgcc4java += $(includedir)/.*awt/.*
-PKGFILES_CSWgcc4java += $(includedir)/.*classpath/.*
-PKGFILES_CSWgcc4java += $(includedir)/.*java.*
-PKGFILES_CSWgcc4java += $(includedir)/.*ffi.h
-PKGFILES_CSWgcc4java += $(includedir)/.*org/.*
-
 PACKAGES += CSWgcc4javart
 CATALOGNAME_CSWgcc4javart     = gcc4javart
 SPKG_DESC_CSWgcc4javart     = GNU Java Compiler Run Time


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

From jesse at opencsw.org  Wed Aug 17 15:49:45 2011
From: jesse at opencsw.org (Jesse Reynolds)
Date: Wed, 17 Aug 2011 23:19:45 +0930
Subject: [csw-devel] basic ruby gem recipe (rake) - doesn't create
	executable in /opt/csw/bin/
Message-ID: 

Hi

I wonder if anyone knows why a very basic gem recipe for rake (at
rbgems/rake/branches/rb18) doesn't create a link / executable at
/opt/csw/bin/rake ? This would be created if you ran 'gem install rake'.

It is created with the older recipe 'rake' which doesn't use the 'rbgems'
category but just 'devel' and has it's own install-ruby step.

Is it a limitation in the rbgems category stuff? Do I need to handle this
manually (eg create a symlink).

Thank you
Jesse

On 17 August 2011 15:56,  wrote:

> Revision: 15358
>          http://gar.svn.sourceforge.net/gar/?rev=15358&view=rev
> Author:   jesser
> Date:     2011-08-17 06:26:38 +0000 (Wed, 17 Aug 2011)
>
> Log Message:
> -----------
> rbgems/rake/branches/rb18: switch name to CSWrb18-rake naming standard
>
> Modified Paths:
> --------------
>    csw/mgar/pkg/rbgems/rake/branches/rb18/Makefile
>
> Modified: csw/mgar/pkg/rbgems/rake/branches/rb18/Makefile
> ===================================================================
> --- csw/mgar/pkg/rbgems/rake/branches/rb18/Makefile     2011-08-17 06:17:55
> UTC (rev 15357)
> +++ csw/mgar/pkg/rbgems/rake/branches/rb18/Makefile     2011-08-17 06:26:38
> UTC (rev 15358)
> @@ -7,8 +7,8 @@
>   Rake is a Make-like program implemented in Ruby. Tasks and dependencies
> are specified in standard Ruby syntax.
>  endef
>
> -PACKAGES = CSWgem-rake
> -CATALOGNAME = gem_rake
> +#PACKAGES = CSWgem-rake
> +#CATALOGNAME = gem_rake
>
>  LICENSE = MIT-LICENSE
>
>
>
> This was sent by the SourceForge.net collaborative development platform,
> the world's largest Open Source development site.
> _______________________________________________
> devel mailing list
> devel at lists.opencsw.org
> https://lists.opencsw.org/mailman/listinfo/devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: 

From wahwah at users.sourceforge.net  Wed Aug 17 16:11:58 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 17 Aug 2011 14:11:58 +0000
Subject: [csw-devel] SF.net SVN: gar:[15360]
	csw/mgar/pkg/gcc4/branches/gcc3libs
Message-ID: 

Revision: 15360
          http://gar.svn.sourceforge.net/gar/?rev=15360&view=rev
Author:   wahwah
Date:     2011-08-17 14:11:58 +0000 (Wed, 17 Aug 2011)

Log Message:
-----------
pkg/gcc4/branches/gcc3libs: refactoring gcc3 shared libraries

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/gcc3libs/Makefile

Added Paths:
-----------
    csw/mgar/pkg/gcc4/branches/gcc3libs/files/COPYING
    csw/mgar/pkg/gcc4/branches/gcc3libs/files/libstdc++.so.5.0.5-i386
    csw/mgar/pkg/gcc4/branches/gcc3libs/files/libstdc++.so.5.0.5-sparcv8
    csw/mgar/pkg/gcc4/branches/gcc3libs/files/libstdc++.so.5.0.5-sparcv9
    csw/mgar/pkg/gcc4/branches/gcc3libs/files/libstdc++.so.6.0.3-i386
    csw/mgar/pkg/gcc4/branches/gcc3libs/files/libstdc++.so.6.0.3-sparcv8
    csw/mgar/pkg/gcc4/branches/gcc3libs/files/libstdc++.so.6.0.3-sparcv9

Modified: csw/mgar/pkg/gcc4/branches/gcc3libs/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/gcc3libs/Makefile	2011-08-17 07:52:58 UTC (rev 15359)
+++ csw/mgar/pkg/gcc4/branches/gcc3libs/Makefile	2011-08-17 14:11:58 UTC (rev 15360)
@@ -10,7 +10,76 @@
   Repackaging of legacy gcc3 libraries.
 endef
 
-DISTFILES    =
+DISTFILES    += COPYING
+DISTFILES    += libstdc++.so.5.0.5-i386
+DISTFILES    += libstdc++.so.5.0.5-sparcv8
+DISTFILES    += libstdc++.so.5.0.5-sparcv9
+DISTFILES    += libstdc++.so.6.0.3-i386
+DISTFILES    += libstdc++.so.6.0.3-sparcv8
+DISTFILES    += libstdc++.so.6.0.3-sparcv9
+# There is no amd64 file libstdc++ from gcc3. There will be one from gcc4
+
 MASTER_SITES =
 
+CONFIGURE_SCRIPTS =
+BUILD_SCRIPTS =
+INSTALL_SCRIPTS =
+TEST_SCRIPTS = 
+
+LICENSE = COPYING
+VENDOR_URL = http://gcc.gnu.org
+
+PACKAGES += CSWlibstdc++5
+CATALOGNAME_CSWlibstdc++5 = libstdc++5
+PKGFILES_CSWlibstdc++5 += $(call baseisadirs,$(libdir),libstdc\+\+\.so\.5(\.\d+)*)
+SPKG_DESC_CSWlibstdc++5 += GCC shared library, libstdc++.so.5
+OBSOLETED_BY_CSWlibstdc++5  += CSWgcc3g++rt
+RUNTIME_DEP_PKGS_CSWlibstdc++5 += CSWgcc3corert
+
+PACKAGES += CSWlibstdc++6
+SPKG_DESC_CSWlibstdc++6 = GCC shared library libstdc++.so.6
+PKGFILES_CSWlibstdc++6 = $(call baseisadirs,$(libdir),libstdc\+\+\.so\.6(\.\d+)*)
+OBSOLETED_BY_CSWlibstdc++6 += CSWgcc3g++rt
+RUNTIME_DEP_PKGS_CSWlibstdc++6 += CSWgcc3corert
+
+# It's a legacy shared library which we will not rebuild.
+CHECKPKG_OVERRIDES_CSWlibstdc++5 += soname-not-found|libgcc_s.so.1|is|needed|by|opt/csw/lib/sparcv9/libstdc++.so.5.0.5
+CHECKPKG_OVERRIDES_CSWlibstdc++5 += soname-not-found|libgcc_s.so.1|is|needed|by|opt/csw/lib/libstdc++.so.5.0.5
+
+STDC5_FILE = libstdc++.so.5.0.5
+STDC6_FILE = libstdc++.so.6.0.3
+
+ARCH_32_sparc = sparcv8
+ARCH_64_sparc = sparcv9
+ARCH_32_i386 = i386
+ARCH_64_i386 = amd64
+
+ARCH_32 = $(ARCH_32_$(GARCH))
+ARCH_64 = $(ARCH_64_$(GARCH))
+
 include gar/category.mk
+
+post-merge:
+	ginstall -m 755 -d $(PKGROOT)$(libdir)
+	ginstall -m 755 -d $(PKGROOT)$(libdir)/$(ARCH_64)
+	ginstall -m 755 \
+		$(FILEDIR)/$(STDC5_FILE)-$(ARCH_32) \
+		$(PKGROOT)$(libdir)/$(STDC5_FILE)
+	gln -s $(STDC5_FILE) $(PKGROOT)$(libdir)/libstdc++.so.5
+	if [ -r $(FILEDIR)/$(STDC5_FILE)-$(ARCH_64) ]; then \
+		ginstall -m 755 \
+			$(FILEDIR)/$(STDC5_FILE)-$(ARCH_64) \
+			$(PKGROOT)$(libdir)/$(ARCH_64)/$(STDC5_FILE); \
+		gln -s $(STDC5_FILE) $(PKGROOT)$(libdir)/$(ARCH_64)/libstdc++.so.5; \
+	fi
+	ginstall -m 755 \
+		$(FILEDIR)/$(STDC6_FILE)-$(ARCH_32) \
+		$(PKGROOT)$(libdir)/$(STDC6_FILE)
+	gln -s $(STDC6_FILE) $(PKGROOT)$(libdir)/libstdc++.so.6
+	if [ -r $(FILEDIR)/$(STDC6_FILE)-$(ARCH_64) ]; then \
+		ginstall -m 755 \
+			$(FILEDIR)/$(STDC6_FILE)-$(ARCH_64) \
+			$(PKGROOT)$(libdir)/$(ARCH_64)/$(STDC6_FILE); \
+		gln -s $(STDC6_FILE) $(PKGROOT)$(libdir)/$(ARCH_64)/libstdc++.so.6; \
+	fi
+	@$(MAKECOOKIE)

Added: csw/mgar/pkg/gcc4/branches/gcc3libs/files/COPYING
===================================================================
--- csw/mgar/pkg/gcc4/branches/gcc3libs/files/COPYING	                        (rev 0)
+++ csw/mgar/pkg/gcc4/branches/gcc3libs/files/COPYING	2011-08-17 14:11:58 UTC (rev 15360)
@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    
+    Copyright (C)   
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  , 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

Added: csw/mgar/pkg/gcc4/branches/gcc3libs/files/libstdc++.so.5.0.5-i386
===================================================================
(Binary files differ)


Property changes on: csw/mgar/pkg/gcc4/branches/gcc3libs/files/libstdc++.so.5.0.5-i386
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: csw/mgar/pkg/gcc4/branches/gcc3libs/files/libstdc++.so.5.0.5-sparcv8
===================================================================
(Binary files differ)


Property changes on: csw/mgar/pkg/gcc4/branches/gcc3libs/files/libstdc++.so.5.0.5-sparcv8
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: csw/mgar/pkg/gcc4/branches/gcc3libs/files/libstdc++.so.5.0.5-sparcv9
===================================================================
(Binary files differ)


Property changes on: csw/mgar/pkg/gcc4/branches/gcc3libs/files/libstdc++.so.5.0.5-sparcv9
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: csw/mgar/pkg/gcc4/branches/gcc3libs/files/libstdc++.so.6.0.3-i386
===================================================================
(Binary files differ)


Property changes on: csw/mgar/pkg/gcc4/branches/gcc3libs/files/libstdc++.so.6.0.3-i386
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: csw/mgar/pkg/gcc4/branches/gcc3libs/files/libstdc++.so.6.0.3-sparcv8
===================================================================
(Binary files differ)


Property changes on: csw/mgar/pkg/gcc4/branches/gcc3libs/files/libstdc++.so.6.0.3-sparcv8
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: csw/mgar/pkg/gcc4/branches/gcc3libs/files/libstdc++.so.6.0.3-sparcv9
===================================================================
(Binary files differ)


Property changes on: csw/mgar/pkg/gcc4/branches/gcc3libs/files/libstdc++.so.6.0.3-sparcv9
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream


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

From maciej at opencsw.org  Wed Aug 17 16:33:04 2011
From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=)
Date: Wed, 17 Aug 2011 15:33:04 +0100
Subject: [csw-devel] basic ruby gem recipe (rake) - doesn't create
 executable in /opt/csw/bin/
In-Reply-To: 
References: 
Message-ID: 

2011/8/17 Jesse Reynolds :
> Is it a limitation in the rbgems category stuff? Do I need to handle this
> manually (eg create a symlink).

Have you looked at the category file?  It could shed some light on the problem.

From bwalton at opencsw.org  Wed Aug 17 16:35:07 2011
From: bwalton at opencsw.org (Ben Walton)
Date: Wed, 17 Aug 2011 10:35:07 -0400
Subject: [csw-devel] basic ruby gem recipe (rake) - doesn't create
	executable in /opt/csw/bin/
In-Reply-To: 
References: 
Message-ID: <1313591599-sup-2136@pinkfloyd.chass.utoronto.ca>

Excerpts from Jesse Reynolds's message of Wed Aug 17 09:49:45 -0400 2011:

Hi Jesse,

> I wonder if anyone knows why a very basic gem recipe for rake (at
> rbgems/rake/branches/rb18) doesn't create a link / executable at
> /opt/csw/bin/rake ? This would be created if you ran 'gem install
> rake'.

Does it create the symlink anywhere else in the tree?  If not, you can
use:

post-install-modulated:
	(cd $(DESTDIR); mkdir -p opt/csw/bin; ln -s /path/to/rake.rb
	opt/csw/bin/rake)

or some such.  If the symlink should be delivered normally but isn't,
maybe we're not calling gem properly?

Thanks
-Ben
--
Ben Walton
Systems Programmer - CHASS
University of Toronto
C:416.407.5610 | W:416.978.4302


From wahwah at users.sourceforge.net  Wed Aug 17 21:55:55 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 17 Aug 2011 19:55:55 +0000
Subject: [csw-devel] SF.net SVN: gar:[15361]
	csw/mgar/pkg/gcc4/branches/bootstrap-4.6
Message-ID: 

Revision: 15361
          http://gar.svn.sourceforge.net/gar/?rev=15361&view=rev
Author:   wahwah
Date:     2011-08-17 19:55:55 +0000 (Wed, 17 Aug 2011)

Log Message:
-----------
gcc4/branches/bootstrap-4.6: Resolved checkpkg issues

Some of them are fixed, and some are overridden. There is a whole section
'from the hopeless department', dealing especially with files that are
conflicting with gcc3 packages.

Maybe it's time to consider retiring the older gcc versions?

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
    csw/mgar/pkg/gcc4/branches/bootstrap-4.6/files/package_def.mk

Modified: csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-17 14:11:58 UTC (rev 15360)
+++ csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-17 19:55:55 UTC (rev 15361)
@@ -62,10 +62,14 @@
 # aren't so let's specify architectures by hand.
 CPU_sparc_32 = v8
 CPU_sparc_64 = v9
+CPU_i386_32 = i386
+CPU_i386_64 = amd64
 
-CONFIGURE_ARGS += --with-arch-32=$(CPU_$(GARCH)_32)
-CONFIGURE_ARGS += --with-arch-64=$(CPU_$(GARCH)_64)
+# CONFIGURE_ARGS += --with-cpu-32=$(CPU_$(GARCH)_32)
+# CONFIGURE_ARGS += --with-cpu-64=$(CPU_$(GARCH)_64)
 
+CONFIGURE_ARGS += --with-cpu=$(CPU_$(GARCH)_32)
+
 # GCC can't be built in the same directory with the sources.
 OBJDIR          = objdir
 
@@ -100,7 +104,54 @@
 
 PACKAGES = CSWgcc4core
 SPKG_DESC_CSWgcc4core = GNU C compiler
-RUNTIME_DEP_PKGS_CSWgcc4core = CSWbinutils
+RUNTIME_DEP_PKGS_CSWgcc4core += CSWlib-gnu-awt-xlib12
+RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibffi4
+RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibgcj-tools12
+RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibgcj12
+RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibgij12
+RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibgmp10
+RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibgomp1
+RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibmpc2
+RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibmpfr4
+RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibssp0
+RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibz1
+RUNTIME_DEP_PKGS_CSWgcc4core += CSWpython
+RUNTIME_DEP_PKGS_CSWgcc4core += CSWbinutils
+RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibmpc2
+RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibobjc-gc3
+RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibobjc3
+RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibgcj-tools12 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibgcj12 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibgij12 += CSWlibz1
+
+# Because I can.
+CHECKPKG_OVERRIDES_CSWgcc4core += file-with-bad-content
+CHECKPKG_OVERRIDES_CSWgcc4g++ += file-with-bad-content
+CHECKPKG_OVERRIDES_CSWgcc4java += file-with-bad-content
+CHECKPKG_OVERRIDES_CSWlibgcj12 += file-with-bad-content
+CHECKPKG_OVERRIDES_CSWgcc4core += discouraged-path-in-pkgmap|/opt/csw/gcc4/libexec/gcc/sparc-sun-solaris2.9/4.6.1/liblto_plugin.la
+CHECKPKG_OVERRIDES_CSWgcc4objc += file-with-bad-content
+CHECKPKG_OVERRIDES_CSWgcc4gfortran += file-with-bad-content
+# Due to complex regular expressions
+CHECKPKG_OVERRIDES_CSWgcc4java += file-collision|/opt/csw/gcc4/include/c++/4.6.1/sun/awt/CausedFocusEvent.h|CSWgcc4g++|CSWgcc4java
+CHECKPKG_OVERRIDES_CSWgcc4g++ += file-collision|/opt/csw/gcc4/include/c++/4.6.1/sun/awt/CausedFocusEvent.h|CSWgcc4g++|CSWgcc4java
+
+# From the 'hopeless errors' department:
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/libffi.so|CSWgcc3javart|CSWgcc4core
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/libgcc_s.so|CSWgcc3core|CSWgcc4core
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/libgcj.so|CSWgcc3javart|CSWgcc4core
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/libobjc.so|CSWgcc3objcrt|CSWgcc4core
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/sparcv9/lib-gnu-awt-xlib.so|CSWgcc3javart|CSWgcc4core
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/sparcv9/libffi.so|CSWgcc3javart|CSWgcc4core
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/sparcv9/libgcj.so|CSWgcc3javart|CSWgcc4core
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/sparcv9/libobjc.so|CSWgcc3objcrt|CSWgcc4core
+CHECKPKG_OVERRIDES_CSWgcc4objc += file-collision|/opt/csw/lib/libobjc.so|CSWgcc3objcrt|CSWgcc4objc
+CHECKPKG_OVERRIDES_CSWgcc4objc += file-collision|/opt/csw/lib/sparcv9/libobjc.so|CSWgcc3objcrt|CSWgcc4objc
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/lib-gnu-awt-xlib.so|CSWgcc3javart|CSWgcc4core
+
+
 # Catch-all package
 
 PACKAGES += CSWlib-gnu-awt-xlib12
@@ -194,14 +245,16 @@
 PKGFILES_CSWgcc4g++ += $(bindir)/c\+\+
 PKGFILES_CSWgcc4g++ += $(libexecdir)/.*cc1plus
 PKGFILES_CSWgcc4g++ += $(libdir)/.*libstdc.*a
+PKGFILES_CSWgcc4g++ += $(call baseisadirs,$(libdir),libstdc\+\+\.so)
 PKGFILES_CSWgcc4g++ += $(mandir)/.*g\+\+.1
+# I do not understand this regular expression.
 PKGFILES_CSWgcc4g++ += $(includedir)/c\+\+/(\d+(?:\.\d+)*)/[a-fA-F,h-iH-I,k-nI-N,p-zP-Z,]+.*
 PKGFILES_CSWgcc4g++ += $(includedir)/c\+\+/(\d+(?:\.\d+)*)/ostream.*
+RUNTIME_DEP_PKGS_CSWgcc4g++ += CSWlibgmp10
+RUNTIME_DEP_PKGS_CSWgcc4g++ += CSWlibmpc2
 RUNTIME_DEP_PKGS_CSWgcc4g++ += CSWlibmpfr4
-RUNTIME_DEP_PKGS_CSWgcc4g++ += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWgcc4g++ += CSWlibgmp10
 RUNTIME_DEP_PKGS_CSWgcc4g++ += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWgcc4g++ += CSWlibmpc2
+RUNTIME_DEP_PKGS_CSWgcc4g++ += CSWlibz1
 
 OBSOLETED_BY_CSWlibgcc-s1 += CSWgcc4corert
 RUNTIME_DEP_PKGS_CSWlibgij12 += CSWlibgcc-s1
@@ -211,22 +264,30 @@
 CATALOGNAME_CSWgcc4gfortran   = gcc4gfortran
 SPKG_DESC_CSWgcc4gfortran   = GNU Fortran Compiler
 RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibmpfr4
-RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibgmp10
+RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibgfortran3
+RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibmpc2
+RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibz1
 PKGFILES_CSWgcc4gfortran  = $(bindir)/gfortran
 PKGFILES_CSWgcc4gfortran += $(libdir)/.*libgfortran.*a
 PKGFILES_CSWgcc4gfortran += $(libexecdir)/.*f951
 PKGFILES_CSWgcc4gfortran += $(mandir)/.*gfortran.1
 PKGFILES_CSWgcc4gfortran += .*/gcc4/info/gfortran.*
+PKGFILES_CSWgcc4gfortran += $(call baseisadirs,$(libdir),libgfortran\.so)
+OBSOLETED_BY_CSWgcc4gfortran  = CSWgcc4g95
+OBSOLETED_BY_CSWgcc4gfortran += CSWgcc4g95rt
 
 PACKAGES += CSWgcc4java
 CATALOGNAME_CSWgcc4java       = gcc4java
 SPKG_DESC_CSWgcc4java       = GNU Java Compiler
-RUNTIME_DEP_PKGS_CSWgcc4java        = CSWgcc4corert CSWgcc4javart
-RUNTIME_DEP_PKGS_CSWgcc4java += CSWzlib
 RUNTIME_DEP_PKGS_CSWgcc4java += CSWlibmpfr4
-RUNTIME_DEP_PKGS_CSWgcc4java += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWgcc4java += CSWlibgmp10
+RUNTIME_DEP_PKGS_CSWgcc4java += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWgcc4java += CSWlibgcj-tools12
+RUNTIME_DEP_PKGS_CSWgcc4java += CSWlibgcj12
+RUNTIME_DEP_PKGS_CSWgcc4java += CSWlibgij12
+RUNTIME_DEP_PKGS_CSWgcc4java += CSWlibmpc2
+RUNTIME_DEP_PKGS_CSWgcc4java += CSWlibz1
 
 PKGFILES_CSWgcc4java  = $(bindir)/.*gcj.*
 PKGFILES_CSWgcc4java += $(bindir)/.*jv-scan
@@ -282,6 +343,17 @@
 PKGFILES_CSWgcc4java += $(includedir)/.*ffi.h
 PKGFILES_CSWgcc4java += $(includedir)/.*org/.*
 
+PACKAGES += CSWgcc4objc
+CATALOGNAME_CSWgcc4objc       = gcc4objc
+SPKG_DESC_CSWgcc4objc       = GNU Objective C Compiler
+PKGFILES_CSWgcc4objc  = $(libexecdir)/.*cc1obj
+PKGFILES_CSWgcc4objc += $(libdir)/.*libobjc.*a
+PKGFILES_CSWgcc4objc += $(includedir)/.*objc/.*
+PKGFILES_CSWgcc4objc += $(libdir)/.*/include/objc/.*
+PKGFILES_CSWgcc4objc += $(call baseisadirs,$(libdir),libobjc.so)
+PKGFILES_CSWgcc4objc += $(call baseisadirs,$(libdir),libobjc_gc.so)
+RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibmpfr4
+RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibgmp10
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/gcc4/branches/bootstrap-4.6/files/package_def.mk
===================================================================
--- csw/mgar/pkg/gcc4/branches/bootstrap-4.6/files/package_def.mk	2011-08-17 14:11:58 UTC (rev 15360)
+++ csw/mgar/pkg/gcc4/branches/bootstrap-4.6/files/package_def.mk	2011-08-17 19:55:55 UTC (rev 15361)
@@ -50,37 +50,24 @@
 # RUNTIME_DEP_PKGS_CSWgcc4gfortranrt  = CSWgcc4corert
 # PKGFILES_CSWgcc4gfortranrt  = $(libdir)/.*libgfortran.*\.so.*
 
-PACKAGES += CSWgcc4javart
-CATALOGNAME_CSWgcc4javart     = gcc4javart
-SPKG_DESC_CSWgcc4javart     = GNU Java Compiler Run Time
-RUNTIME_DEP_PKGS_CSWgcc4javart      = CSWgcc4corert CSWgcc4g++rt
-PKGFILES_CSWgcc4javart  = $(libdir)/.*libgij.*\.so.*
-PKGFILES_CSWgcc4javart += $(libdir)/.*libffi.*\.so.*
-PKGFILES_CSWgcc4javart += $(libdir)/.*lib-gnu-awt.*\.so.*
-PKGFILES_CSWgcc4javart += $(libdir)/.*security/classpath.*
-PKGFILES_CSWgcc4javart += $(libdir)/.*logging.properties
-PKGFILES_CSWgcc4javart += $(libdir)/.*pkgconfig.*
-PKGFILES_CSWgcc4javart += $(libdir)/.*gcj.*\.so.*
-PKGFILES_CSWgcc4javart += $(libdir)/.*libgcj.*\.so.*
+# PACKAGES += CSWgcc4javart
+# CATALOGNAME_CSWgcc4javart     = gcc4javart
+# SPKG_DESC_CSWgcc4javart     = GNU Java Compiler Run Time
+# RUNTIME_DEP_PKGS_CSWgcc4javart      = CSWgcc4corert CSWgcc4g++rt
+# PKGFILES_CSWgcc4javart  = $(libdir)/.*libgij.*\.so.*
+# PKGFILES_CSWgcc4javart += $(libdir)/.*libffi.*\.so.*
+# PKGFILES_CSWgcc4javart += $(libdir)/.*lib-gnu-awt.*\.so.*
+# PKGFILES_CSWgcc4javart += $(libdir)/.*security/classpath.*
+# PKGFILES_CSWgcc4javart += $(libdir)/.*logging.properties
+# PKGFILES_CSWgcc4javart += $(libdir)/.*pkgconfig.*
+# PKGFILES_CSWgcc4javart += $(libdir)/.*gcj.*\.so.*
+# PKGFILES_CSWgcc4javart += $(libdir)/.*libgcj.*\.so.*
 
-PACKAGES += CSWgcc4objc
-CATALOGNAME_CSWgcc4objc       = gcc4objc
-SPKG_DESC_CSWgcc4objc       = GNU Objective C Compiler
-PKGFILES_CSWgcc4objc  = $(libexecdir)/.*cc1obj
-PKGFILES_CSWgcc4objc += $(libdir)/.*libobjc.*a
-PKGFILES_CSWgcc4objc += $(includedir)/.*objc/.*
-PKGFILES_CSWgcc4objc += $(libdir)/.*/include/objc/.*
-RUNTIME_DEP_PKGS_CSWgcc4objc += CSWgcc4objcrt
-RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibmpfr4
-RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibgmp10
-
-
-PACKAGES += CSWgcc4objcrt
-CATALOGNAME_CSWgcc4objcrt     = gcc4objcrt
-SPKG_DESC_CSWgcc4objcrt     = GNU Objective C Compiler Run Time
-RUNTIME_DEP_PKGS_CSWgcc4objcrt      = CSWgcc4corert
-PKGFILES_CSWgcc4objcrt = $(libdir)/.*libobjc.*\.so.*
+# PACKAGES += CSWgcc4objcrt
+# CATALOGNAME_CSWgcc4objcrt     = gcc4objcrt
+# SPKG_DESC_CSWgcc4objcrt     = GNU Objective C Compiler Run Time
+# RUNTIME_DEP_PKGS_CSWgcc4objcrt      = CSWgcc4corert
+# PKGFILES_CSWgcc4objcrt = $(libdir)/.*libobjc.*\.so.*
  
 ## Source URLs
 VENDOR_URL = http://gcc.gnu.org


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

From wahwah at users.sourceforge.net  Wed Aug 17 22:03:39 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 17 Aug 2011 20:03:39 +0000
Subject: [csw-devel] SF.net SVN: gar:[15362]
	csw/mgar/pkg/gcc4/branches/bootstrap-4.6
Message-ID: 

Revision: 15362
          http://gar.svn.sourceforge.net/gar/?rev=15362&view=rev
Author:   wahwah
Date:     2011-08-17 20:03:39 +0000 (Wed, 17 Aug 2011)

Log Message:
-----------
pkg/gcc4/branches/bootstrap-4.6: separating out scripts.mk

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
    csw/mgar/pkg/gcc4/branches/bootstrap-4.6/files/package_def.mk

Added Paths:
-----------
    csw/mgar/pkg/gcc4/branches/bootstrap-4.6/files/scripts.mk

Modified: csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-17 19:55:55 UTC (rev 15361)
+++ csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-17 20:03:39 UTC (rev 15362)
@@ -1,4 +1,6 @@
 # $Id$
+#
+# ! Ada is not built yet, it requires PPL which isn't built yet.
 
 NAME      = gcc
 VERSION   = 4.6.1
@@ -21,6 +23,12 @@
 # GIT init takes a long time, disable for now, reenable if build works
 NOGITPATCH ?= 1
 
+## Source URLs
+VENDOR_URL = http://gcc.gnu.org
+
+## Copyright File
+LICENSE = COPYING3
+
 prefix = $(BUILD_PREFIX)/gcc4
 libdir_install = $(BUILD_PREFIX)/lib
 libdir = $(abspath $(BUILD_PREFIX)/lib/$(MM_LIBDIR))
@@ -60,6 +68,8 @@
 
 # there could be some abstractions in gar.conf.mk, but at the moment there
 # aren't so let's specify architectures by hand.
+#
+# This avoids the sparcv8+ binaries.
 CPU_sparc_32 = v8
 CPU_sparc_64 = v9
 CPU_i386_32 = i386
@@ -355,6 +365,7 @@
 RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibmpfr4
 RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibgmp10
 
+include files/scripts.mk
 include gar/category.mk
 
 # We need GNU find as find

Modified: csw/mgar/pkg/gcc4/branches/bootstrap-4.6/files/package_def.mk
===================================================================
--- csw/mgar/pkg/gcc4/branches/bootstrap-4.6/files/package_def.mk	2011-08-17 19:55:55 UTC (rev 15361)
+++ csw/mgar/pkg/gcc4/branches/bootstrap-4.6/files/package_def.mk	2011-08-17 20:03:39 UTC (rev 15362)
@@ -1,4 +1,7 @@
 ###  Package Section  ###
+
+# Ada awaits being built.
+
 PACKAGES  = CSWgcc4ada
 CATALOGNAME_CSWgcc4ada        = gcc4ada
 SPKG_DESC_CSWgcc4ada        = GNU C ADA Compiler
@@ -14,12 +17,12 @@
 RUNTIME_DEP_PKGS_CSWgcc4ada += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWgcc4ada += CSWlibgmp10
 
-PACKAGES += CSWgcc4adart
-CATALOGNAME_CSWgcc4adart      = gcc4adart
-SPKG_DESC_CSWgcc4adart      = GNU C ADA Compiler Run Time
-PKGFILES_CSWgcc4adart  = $(libdir)/.*libgnat.*\.so.*
-PKGFILES_CSWgcc4adart += $(libdir)/.*libgnarl.*\.so.*
-RUNTIME_DEP_PKGS_CSWgcc4adart       = CSWgcc4corert
+# PACKAGES += CSWgcc4adart
+# CATALOGNAME_CSWgcc4adart      = gcc4adart
+# SPKG_DESC_CSWgcc4adart      = GNU C ADA Compiler Run Time
+# PKGFILES_CSWgcc4adart  = $(libdir)/.*libgnat.*\.so.*
+# PKGFILES_CSWgcc4adart += $(libdir)/.*libgnarl.*\.so.*
+# RUNTIME_DEP_PKGS_CSWgcc4adart       = CSWgcc4corert
 
 # PACKAGES += CSWgcc4core
 # CATALOGNAME_CSWgcc4core       = gcc4core
@@ -69,77 +72,6 @@
 # RUNTIME_DEP_PKGS_CSWgcc4objcrt      = CSWgcc4corert
 # PKGFILES_CSWgcc4objcrt = $(libdir)/.*libobjc.*\.so.*
  
-## Source URLs
-VENDOR_URL = http://gcc.gnu.org
-
-## Copyright File
-LICENSE = COPYING3
-
+# No idea what was that for.
 DISTFILES += CSWgcc4core.space
 
-define CSWgcc4core_postinstall
-#!/bin/sh
-
-Error()
-{
-	echo "=====> postinstall Error: $$1" >&2
-	exit 1
-}
-
-OS_REV="`/usr/bin/uname -r | sed -e 's/[^.]*//'`"
-case `/usr/bin/uname -p` in
-	"sparc") OS_TARGET="sparc-sun-solaris2.8" ;;
-	 "i386") OS_TARGET="i386-pc-solaris2$${OS_REV}" ;;
-esac
-
-TOOLS_DIR="$${PKG_INSTALL_ROOT}/opt/csw/gcc4/libexec/gcc"
-TOOLS_DIR="$${TOOLS_DIR}/$${OS_TARGET}/$(VERSION)/install-tools"
-MKHEADERS_CMD="$${PKG_INSTALL_ROOT}/opt/csw/gcc4/bin/mkheaders"
-INCLUDE_DIR="$${PKG_INSTALL_ROOT}/opt/csw/gcc4/lib/gcc"
-INCLUDE_DIR="$${INCLUDE_DIR}/$${OS_TARGET}/$(VERSION)/include"
-
-cat << _EOF_
-******************************************************************************
-* NOTICE: Fixing the system headers
-*
-* Do not forget: whenever your system headers change 
-* Run the $${MKHEADERS_CMD} script!
-******************************************************************************
-_EOF_
-
-if [ -f $${TOOLS_DIR}/mkheaders ]; then
-	cp $${TOOLS_DIR}/mkheaders $${MKHEADERS_CMD}
-	installf $${PKGINST} "$${MKHEADERS_CMD}"
-else
-	Error "$${TOOLS_DIR}/mkheaders Not Found"
-fi
-
-if [ -f $${MKHEADERS_CMD} ];then
-	chmod 0755 $${MKHEADERS_CMD} 2>/dev/null
-	chown root:bin $${MKHEADERS_CMD} 2>/dev/null
-	"$${MKHEADERS_CMD}" || Error "$${MKHEADERS_CMD} Failed."
-else
-	Error "Could not find $${MKHEADERS_CMD}"
-fi
-
-if [ -d $${INCLUDE_DIR} ]; then
-	chmod 0755 $${INCLUDE_DIR} || Error "Failed to chmod $${INCLUDE_DIR}"
-	chown -R root:bin $${INCLUDE_DIR} || 
-			Error "Failed to change ownership for $${INCLUDE_DIR}"
-	find $${INCLUDE_DIR} -print | installf $${PKGINST} -
-fi
-
-
-cat << _EOF_
-******************************************************************************
-* NOTICE: Successfully fixed system headers
-*
-* Do not forget: whenever your system headers change 
-* Run the $${MKHEADERS_CMD} script!
-******************************************************************************
-_EOF_
-	
-installf -f $${PKGINST}
-
-exit 0
-endef

Added: csw/mgar/pkg/gcc4/branches/bootstrap-4.6/files/scripts.mk
===================================================================
--- csw/mgar/pkg/gcc4/branches/bootstrap-4.6/files/scripts.mk	                        (rev 0)
+++ csw/mgar/pkg/gcc4/branches/bootstrap-4.6/files/scripts.mk	2011-08-17 20:03:39 UTC (rev 15362)
@@ -0,0 +1,66 @@
+define CSWgcc4core_postinstall
+#!/bin/sh
+
+Error()
+{
+	echo "=====> postinstall Error: $$1" >&2
+	exit 1
+}
+
+OS_REV="`/usr/bin/uname -r | sed -e 's/[^.]*//'`"
+case `/usr/bin/uname -p` in
+	"sparc") OS_TARGET="sparc-sun-solaris2.8" ;;
+	 "i386") OS_TARGET="i386-pc-solaris2$${OS_REV}" ;;
+esac
+
+TOOLS_DIR="$${PKG_INSTALL_ROOT}/opt/csw/gcc4/libexec/gcc"
+TOOLS_DIR="$${TOOLS_DIR}/$${OS_TARGET}/$(VERSION)/install-tools"
+MKHEADERS_CMD="$${PKG_INSTALL_ROOT}/opt/csw/gcc4/bin/mkheaders"
+INCLUDE_DIR="$${PKG_INSTALL_ROOT}/opt/csw/gcc4/lib/gcc"
+INCLUDE_DIR="$${INCLUDE_DIR}/$${OS_TARGET}/$(VERSION)/include"
+
+cat << _EOF_
+******************************************************************************
+* NOTICE: Fixing the system headers
+*
+* Do not forget: whenever your system headers change 
+* Run the $${MKHEADERS_CMD} script!
+******************************************************************************
+_EOF_
+
+if [ -f $${TOOLS_DIR}/mkheaders ]; then
+	cp $${TOOLS_DIR}/mkheaders $${MKHEADERS_CMD}
+	installf $${PKGINST} "$${MKHEADERS_CMD}"
+else
+	Error "$${TOOLS_DIR}/mkheaders Not Found"
+fi
+
+if [ -f $${MKHEADERS_CMD} ];then
+	chmod 0755 $${MKHEADERS_CMD} 2>/dev/null
+	chown root:bin $${MKHEADERS_CMD} 2>/dev/null
+	"$${MKHEADERS_CMD}" || Error "$${MKHEADERS_CMD} Failed."
+else
+	Error "Could not find $${MKHEADERS_CMD}"
+fi
+
+if [ -d $${INCLUDE_DIR} ]; then
+	chmod 0755 $${INCLUDE_DIR} || Error "Failed to chmod $${INCLUDE_DIR}"
+	chown -R root:bin $${INCLUDE_DIR} || 
+			Error "Failed to change ownership for $${INCLUDE_DIR}"
+	find $${INCLUDE_DIR} -print | installf $${PKGINST} -
+fi
+
+
+cat << _EOF_
+******************************************************************************
+* NOTICE: Successfully fixed system headers
+*
+* Do not forget: whenever your system headers change 
+* Run the $${MKHEADERS_CMD} script!
+******************************************************************************
+_EOF_
+	
+installf -f $${PKGINST}
+
+exit 0
+endef


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

From skayser at users.sourceforge.net  Thu Aug 18 00:21:21 2011
From: skayser at users.sourceforge.net (skayser at users.sourceforge.net)
Date: Wed, 17 Aug 2011 22:21:21 +0000
Subject: [csw-devel] SF.net SVN: gar:[15363] csw/mgar/pkg/stunnel/trunk
Message-ID: 

Revision: 15363
          http://gar.svn.sourceforge.net/gar/?rev=15363&view=rev
Author:   skayser
Date:     2011-08-17 22:21:21 +0000 (Wed, 17 Aug 2011)

Log Message:
-----------
stunnel: adjust sample config patch for 4.41

Modified Paths:
--------------
    csw/mgar/pkg/stunnel/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/stunnel/trunk/files/0001-Make-stunnel.conf-sample.in-honor-sysconfdir-localst.patch

Removed Paths:
-------------
    csw/mgar/pkg/stunnel/trunk/files/0001-Make-stunnel.conf-sample.in-honor-sysconfdir-localst.patch

Modified: csw/mgar/pkg/stunnel/trunk/Makefile
===================================================================
--- csw/mgar/pkg/stunnel/trunk/Makefile	2011-08-17 20:03:39 UTC (rev 15362)
+++ csw/mgar/pkg/stunnel/trunk/Makefile	2011-08-17 22:21:21 UTC (rev 15363)
@@ -29,7 +29,10 @@
 RUNTIME_DEP_PKGS = CSWzlib CSWosslrt CSWtcpwrap
 
 # Make stunnel.conf-sample.in honor $localstatedir adjustments
-# c.f. http://marc.info/?l=stunnel-users&m=128035848632004&w=2
+# cf. http://marc.info/?l=stunnel-users&m=128035848632004&w=2
+# Not merged upstream as ./configure without arguments leads to
+# expansions that the config file doesn't understand, e.g.
+# sysconfdir='${prefix}/etc' (cf. config.log)
 PATCHFILES = 0001-Make-stunnel.conf-sample.in-honor-sysconfdir-localst.patch
 
 CONFIGURE_ARGS = $(DIRPATHS)

Deleted: csw/mgar/pkg/stunnel/trunk/files/0001-Make-stunnel.conf-sample.in-honor-sysconfdir-localst.patch
===================================================================
--- csw/mgar/pkg/stunnel/trunk/files/0001-Make-stunnel.conf-sample.in-honor-sysconfdir-localst.patch	2011-08-17 20:03:39 UTC (rev 15362)
+++ csw/mgar/pkg/stunnel/trunk/files/0001-Make-stunnel.conf-sample.in-honor-sysconfdir-localst.patch	2011-08-17 22:21:21 UTC (rev 15363)
@@ -1,54 +0,0 @@
-From 9873796410fa51fdb686bd5ce72e906bc60280e2 Mon Sep 17 00:00:00 2001
-From: Sebastian Kayser 
-Date: Thu, 29 Jul 2010 00:37:23 +0200
-Subject: [PATCH] Make stunnel.conf-sample.in honor --sysconfdir, --localstatedir
-
-In case someone ./configured with a --sysconfdir or --localstatedir
-rooted elsewhere than prefix, stunnel.conf-sample.in would have
-disregarded it, because it only honors --prefix. This patch
-introduces handling for the more specific --sysconfdir/--localstatedir.
----
- tools/stunnel.conf-sample.in |   10 +++++-----
- 1 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/tools/stunnel.conf-sample.in b/tools/stunnel.conf-sample.in
-index c231eec..201c60f 100644
---- a/tools/stunnel.conf-sample.in
-+++ b/tools/stunnel.conf-sample.in
-@@ -4,15 +4,15 @@
- ; please read the manual and make sure you understand them
- 
- ; certificate/key is needed in server mode and optional in client mode
--cert = @prefix@/etc/stunnel/mail.pem
--;key = @prefix@/etc/stunnel/mail.pem
-+cert = @sysconfdir@/stunnel/mail.pem
-+;key = @sysconfdir@/stunnel/mail.pem
- 
- ; protocol version (all, SSLv2, SSLv3, TLSv1)
- sslVersion = SSLv3
- 
- ; security enhancements for UNIX systems - comment them out on Win32
- ; for chroot a copy of some devices and files is needed within the jail
--chroot = @prefix@/var/lib/stunnel/
-+chroot = @localstatedir@/lib/stunnel/
- setuid = nobody
- setgid = @DEFAULT_GROUP@
- ; PID is created inside the chroot jail
-@@ -33,12 +33,12 @@ socket = r:TCP_NODELAY=1
- ; CApath is located inside chroot jail
- ;CApath = /certs
- ; it's often easier to use CAfile
--;CAfile = @prefix@/etc/stunnel/certs.pem
-+;CAfile = @sysconfdir@/stunnel/certs.pem
- ; don't forget to c_rehash CRLpath
- ; CRLpath is located inside chroot jail
- ;CRLpath = /crls
- ; alternatively CRLfile can be used
--;CRLfile = @prefix@/etc/stunnel/crls.pem
-+;CRLfile = @sysconfdir@/stunnel/crls.pem
- 
- ; debugging stuff (may useful for troubleshooting)
- ;debug = 7
--- 
-1.7.1
-

Added: csw/mgar/pkg/stunnel/trunk/files/0001-Make-stunnel.conf-sample.in-honor-sysconfdir-localst.patch
===================================================================
--- csw/mgar/pkg/stunnel/trunk/files/0001-Make-stunnel.conf-sample.in-honor-sysconfdir-localst.patch	                        (rev 0)
+++ csw/mgar/pkg/stunnel/trunk/files/0001-Make-stunnel.conf-sample.in-honor-sysconfdir-localst.patch	2011-08-17 22:21:21 UTC (rev 15363)
@@ -0,0 +1,56 @@
+From ded2818b78150049e0cf5934eb4a752e1972e291 Mon Sep 17 00:00:00 2001
+From: Sebastian Kayser 
+Date: Thu, 18 Aug 2011 00:02:54 +0200
+Subject: [PATCH] Make stunnel.conf-sample.in honor --sysconfdir,
+ --localstatedir
+
+In case someone ./configured with a --sysconfdir or --localstatedir
+rooted elsewhere than prefix, stunnel.conf-sample.in would have
+disregarded it, because it only honors --prefix. This patch
+introduces handling for the more specific --sysconfdir/--localstatedir.
+---
+ tools/stunnel.conf-sample.in |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/tools/stunnel.conf-sample.in b/tools/stunnel.conf-sample.in
+index 37fea53..6a4ccc6 100644
+--- a/tools/stunnel.conf-sample.in
++++ b/tools/stunnel.conf-sample.in
+@@ -8,7 +8,7 @@
+ 
+ ; A copy of some devices and system files is needed within the chroot jail
+ ; Chroot conflicts with configuration file reload and many other features
+-chroot = @prefix@/var/lib/stunnel/
++chroot = @localstatedir@/lib/stunnel/
+ ; Chroot jail can be escaped if setuid option is not used
+ setuid = nobody
+ setgid = @DEFAULT_GROUP@
+@@ -25,8 +25,8 @@ pid = /stunnel.pid
+ ; *****************************************************************************
+ 
+ ; Certificate/key is needed in server mode and optional in client mode
+-cert = @prefix@/etc/stunnel/mail.pem
+-;key = @prefix@/etc/stunnel/mail.pem
++cert = @sysconfdir@/stunnel/mail.pem
++;key = @sysconfdir@/stunnel/mail.pem
+ 
+ ; Authentication stuff needs to be configured to prevent MITM attacks
+ ; It is not enabled by default!
+@@ -35,12 +35,12 @@ cert = @prefix@/etc/stunnel/mail.pem
+ ; CApath is located inside chroot jail
+ ;CApath = /certs
+ ; It's often easier to use CAfile
+-;CAfile = @prefix@/etc/stunnel/certs.pem
++;CAfile = @sysconfdir@/stunnel/certs.pem
+ ; Don't forget to c_rehash CRLpath
+ ; CRLpath is located inside chroot jail
+ ;CRLpath = /crls
+ ; Alternatively CRLfile can be used
+-;CRLfile = @prefix@/etc/stunnel/crls.pem
++;CRLfile = @sysconfdir@/stunnel/crls.pem
+ 
+ ; Disable support for insecure SSLv2 protocol
+ options = NO_SSLv2
+-- 
+1.7.6
+


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

From skayser at users.sourceforge.net  Thu Aug 18 00:32:04 2011
From: skayser at users.sourceforge.net (skayser at users.sourceforge.net)
Date: Wed, 17 Aug 2011 22:32:04 +0000
Subject: [csw-devel] SF.net SVN: gar:[15364]
	csw/mgar/pkg/stunnel/trunk/Makefile
Message-ID: 

Revision: 15364
          http://gar.svn.sourceforge.net/gar/?rev=15364&view=rev
Author:   skayser
Date:     2011-08-17 22:32:04 +0000 (Wed, 17 Aug 2011)

Log Message:
-----------
stunnel/trunk: adjust EXTRA_PAX_ARGS to make it compatible with pcopy

Modified Paths:
--------------
    csw/mgar/pkg/stunnel/trunk/Makefile

Modified: csw/mgar/pkg/stunnel/trunk/Makefile
===================================================================
--- csw/mgar/pkg/stunnel/trunk/Makefile	2011-08-17 22:21:21 UTC (rev 15363)
+++ csw/mgar/pkg/stunnel/trunk/Makefile	2011-08-17 22:32:04 UTC (rev 15364)
@@ -1,5 +1,4 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
-# ! config file patch currently doesn't apply cleanly
 # * postinstall mknod not possible within zone (mknod fails with "not owner")
 #   Work around this or provide README.CSW with instructions for chroot
 #   --> Why should /dev/zero be required at all? google suggests relation
@@ -55,7 +54,7 @@
 PROTOTYPE_USER_restrict  = nobody
 PROTOTYPE_GROUP_restrict = nobody
 
-EXTRA_PAX_ARGS = '-s,ChangeLog$$,changelog,p'
+EXTRA_PAX_ARGS = -s ',ChangeLog$$,changelog,p'
 
 include gar/category.mk
 


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

From jesse at opencsw.org  Thu Aug 18 00:55:06 2011
From: jesse at opencsw.org (Jesse Reynolds)
Date: Thu, 18 Aug 2011 08:25:06 +0930
Subject: [csw-devel] basic ruby gem recipe (rake) - doesn't create
 executable in /opt/csw/bin/
In-Reply-To: <1313591599-sup-2136@pinkfloyd.chass.utoronto.ca>
References: 
	<1313591599-sup-2136@pinkfloyd.chass.utoronto.ca>
Message-ID: 

On 18 August 2011 00:05, Ben Walton  wrote:

> Excerpts from Jesse Reynolds's message of Wed Aug 17 09:49:45 -0400 2011:
>
> Hi Jesse,
>
> > I wonder if anyone knows why a very basic gem recipe for rake (at
> > rbgems/rake/branches/rb18) doesn't create a link / executable at
> > /opt/csw/bin/rake ? This would be created if you ran 'gem install
> > rake'.
>
> Does it create the symlink anywhere else in the tree?  If not, you can
> use:
>
> post-install-modulated:
>        (cd $(DESTDIR); mkdir -p opt/csw/bin; ln -s /path/to/rake.rb
>        opt/csw/bin/rake)
>

OK ta.


>
> or some such.  If the symlink should be delivered normally but isn't,
> maybe we're not calling gem properly?
>

I suspect this is the case. Usually when you install a gem that has a
command line interface, like rake, rubygems installs a wrapper script for
it. It doesn't use a symlink actually (which was my assumption until now),
the wrapper script looks like this on my mac:

jesse at ren $ cat /opt/local/bin/rake
#!/opt/local/bin/ruby
#
# This file was generated by RubyGems.
#
# The application 'rake' is installed as part of a gem, and
# this file is here to facilitate running it.
#

require 'rubygems'

version = ">= 0"

if ARGV.first =~ /^_(.*)_$/ and Gem::Version.correct? $1 then
  version = $1
  ARGV.shift
end

gem 'rake', version
load Gem.bin_path('rake', 'rake', version)



Whereas the 'rake' command line executable installed within the ruby gems
heirarchy is entirely different:


jesse at ren $ cat /opt/local/lib/ruby/gems/1.8/gems/rake-0.8.7/bin/rake
#!/usr/bin/env ruby

#--
# Copyright (c) 2003, 2004, 2005, 2006, 2007  Jim Weirich
#
# Permission is hereby granted, free of charge, to any person obtaining a
copy
# of this software and associated documentation files (the "Software"), to
# deal in the Software without restriction, including without limitation the
# rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or
# sell copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS
# IN THE SOFTWARE.
#++

begin
  require 'rake'
rescue LoadError
  require 'rubygems'
  require 'rake'
end
Rake.application.run


I'm not sure how rubygems knows to create these wrapper scripts. I imagine
there is some kind of installation recipe embedded within the gemfile. I'll
take a look.

Jesse
-------------- next part --------------
An HTML attachment was scrubbed...
URL: 

From wahwah at users.sourceforge.net  Thu Aug 18 09:35:41 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Thu, 18 Aug 2011 07:35:41 +0000
Subject: [csw-devel] SF.net SVN: gar:[15365]
	csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
Message-ID: 

Revision: 15365
          http://gar.svn.sourceforge.net/gar/?rev=15365&view=rev
Author:   wahwah
Date:     2011-08-18 07:35:41 +0000 (Thu, 18 Aug 2011)

Log Message:
-----------
pkg/gcc4/branches/bootstrap-4.6: libquadmath on Intel - but the conditional doesn't work

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile

Modified: csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-17 22:32:04 UTC (rev 15364)
+++ csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-18 07:35:41 UTC (rev 15365)
@@ -142,6 +142,7 @@
 CHECKPKG_OVERRIDES_CSWgcc4java += file-with-bad-content
 CHECKPKG_OVERRIDES_CSWlibgcj12 += file-with-bad-content
 CHECKPKG_OVERRIDES_CSWgcc4core += discouraged-path-in-pkgmap|/opt/csw/gcc4/libexec/gcc/sparc-sun-solaris2.9/4.6.1/liblto_plugin.la
+CHECKPKG_OVERRIDES_CSWgcc4core += discouraged-path-in-pkgmap|/opt/csw/gcc4/libexec/gcc/i386-pc-solaris2.9/4.6.1/liblto_plugin.la
 CHECKPKG_OVERRIDES_CSWgcc4objc += file-with-bad-content
 CHECKPKG_OVERRIDES_CSWgcc4gfortran += file-with-bad-content
 # Due to complex regular expressions
@@ -248,6 +249,15 @@
 RUNTIME_DEP_PKGS_CSWlibstdc++6 += CSWlibgcc-s1
 OBSOLETED_BY_CSWlibstdc++6 = CSWgcc4g++rt
 
+# The libquadmath.so.0 library is only build on Intel
+ifeq ($(GARCH),i386)
+PACKAGES += CSWlibquadmath0
+CATALOGNAME_CSWlibquadmath0 = libquadmath0
+PKGFILES_CSWlibquadmath0 += $(call baseisadirs,$(libdir),libquadmath\.so\.0(\.\d+)*)
+SPKG_DESC_CSWlibquadmath0 += GNU C compiler, libquadmath.so.0
+RUNTIME_DEP_PKGS_CSWgfortran3 += CSWlibquadmath0
+endif
+
 PACKAGES += CSWgcc4g++
 CATALOGNAME_CSWgcc4g++ = gcc4g++
 SPKG_DESC_CSWgcc4g++ = GNU C++ Compiler


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

From wahwah at users.sourceforge.net  Thu Aug 18 09:43:17 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Thu, 18 Aug 2011 07:43:17 +0000
Subject: [csw-devel] SF.net SVN: gar:[15366]
	csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
Message-ID: 

Revision: 15366
          http://gar.svn.sourceforge.net/gar/?rev=15366&view=rev
Author:   wahwah
Date:     2011-08-18 07:43:17 +0000 (Thu, 18 Aug 2011)

Log Message:
-----------
pkg/gcc4/branches/bootstrap-4.6: a better way to build an intel-only package

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile

Modified: csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-18 07:35:41 UTC (rev 15365)
+++ csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-18 07:43:17 UTC (rev 15366)
@@ -250,14 +250,13 @@
 OBSOLETED_BY_CSWlibstdc++6 = CSWgcc4g++rt
 
 # The libquadmath.so.0 library is only build on Intel
-ifeq ($(GARCH),i386)
-PACKAGES += CSWlibquadmath0
+PACKAGES_i386 += CSWlibquadmath0
 CATALOGNAME_CSWlibquadmath0 = libquadmath0
 PKGFILES_CSWlibquadmath0 += $(call baseisadirs,$(libdir),libquadmath\.so\.0(\.\d+)*)
 SPKG_DESC_CSWlibquadmath0 += GNU C compiler, libquadmath.so.0
 RUNTIME_DEP_PKGS_CSWgfortran3 += CSWlibquadmath0
-endif
 
+
 PACKAGES += CSWgcc4g++
 CATALOGNAME_CSWgcc4g++ = gcc4g++
 SPKG_DESC_CSWgcc4g++ = GNU C++ Compiler
@@ -375,6 +374,8 @@
 RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibmpfr4
 RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibgmp10
 
+PACKAGES += $(PACKAGES_$(GARCH))
+
 include files/scripts.mk
 include gar/category.mk
 


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

From wahwah at users.sourceforge.net  Thu Aug 18 10:32:40 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Thu, 18 Aug 2011 08:32:40 +0000
Subject: [csw-devel] SF.net SVN: gar:[15367]
	csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
Message-ID: 

Revision: 15367
          http://gar.svn.sourceforge.net/gar/?rev=15367&view=rev
Author:   wahwah
Date:     2011-08-18 08:32:39 +0000 (Thu, 18 Aug 2011)

Log Message:
-----------
pkg/gcc4/branches/bootstrap-4.6: dependencies of libquadmath

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile

Modified: csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-18 07:43:17 UTC (rev 15366)
+++ csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-18 08:32:39 UTC (rev 15367)
@@ -254,8 +254,13 @@
 CATALOGNAME_CSWlibquadmath0 = libquadmath0
 PKGFILES_CSWlibquadmath0 += $(call baseisadirs,$(libdir),libquadmath\.so\.0(\.\d+)*)
 SPKG_DESC_CSWlibquadmath0 += GNU C compiler, libquadmath.so.0
-RUNTIME_DEP_PKGS_CSWgfortran3 += CSWlibquadmath0
+RUNTIME_DEP_PKGS_CSWlibquadmath0 += CSWlibgcc-s1
 
+# Dependencies only on Intel
+RUNTIME_DEP_PKGS_CSWgcc4core_i386 += CSWlibquadmath0
+RUNTIME_DEP_PKGS_CSWlibgfortran3_i386 += CSWlibquadmath0
+RUNTIME_DEP_PKGS_CSWgcc4core += $(RUNTIME_DEP_PKGS_CSWgcc4core_$(GARCH))
+RUNTIME_DEP_PKGS_CSWgcc4libgfortran3 += $(RUNTIME_DEP_PKGS_CSWgcc4libgfortran3_$(GARCH))
 
 PACKAGES += CSWgcc4g++
 CATALOGNAME_CSWgcc4g++ = gcc4g++


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

From wahwah at users.sourceforge.net  Thu Aug 18 11:46:38 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Thu, 18 Aug 2011 09:46:38 +0000
Subject: [csw-devel] SF.net SVN: gar:[15368]
	csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
Message-ID: 

Revision: 15368
          http://gar.svn.sourceforge.net/gar/?rev=15368&view=rev
Author:   wahwah
Date:     2011-08-18 09:46:37 +0000 (Thu, 18 Aug 2011)

Log Message:
-----------
pkg/gcc4/branches/bootstrap-4.6: architecture-dependent cpu settings

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile

Modified: csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-18 08:32:39 UTC (rev 15367)
+++ csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-18 09:46:37 UTC (rev 15368)
@@ -75,11 +75,11 @@
 CPU_i386_32 = i386
 CPU_i386_64 = amd64
 
-# CONFIGURE_ARGS += --with-cpu-32=$(CPU_$(GARCH)_32)
-# CONFIGURE_ARGS += --with-cpu-64=$(CPU_$(GARCH)_64)
+CONFIGURE_ARGS_sparc += --with-cpu=$(CPU_$(GARCH)_32)
+CONFIGURE_ARGS_i386 += --with-cpu-32=$(CPU_$(GARCH)_32)
+CONFIGURE_ARGS_i386 += --with-cpu-64=$(CPU_$(GARCH)_64)
+CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARCH))
 
-CONFIGURE_ARGS += --with-cpu=$(CPU_$(GARCH)_32)
-
 # GCC can't be built in the same directory with the sources.
 OBJDIR          = objdir
 


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

From wahwah at users.sourceforge.net  Thu Aug 18 16:49:15 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Thu, 18 Aug 2011 14:49:15 +0000
Subject: [csw-devel] SF.net SVN: gar:[15369]
	csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
Message-ID: 

Revision: 15369
          http://gar.svn.sourceforge.net/gar/?rev=15369&view=rev
Author:   wahwah
Date:     2011-08-18 14:49:14 +0000 (Thu, 18 Aug 2011)

Log Message:
-----------
pkg/gcc4/branches/bootstrap-4.6: gcc can't be built in a subdirectory of the sources

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile

Modified: csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-18 09:46:37 UTC (rev 15368)
+++ csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-18 14:49:14 UTC (rev 15369)
@@ -73,15 +73,16 @@
 CPU_sparc_32 = v8
 CPU_sparc_64 = v9
 CPU_i386_32 = i386
-CPU_i386_64 = amd64
+CPU_i386_64 = x86-64
 
 CONFIGURE_ARGS_sparc += --with-cpu=$(CPU_$(GARCH)_32)
 CONFIGURE_ARGS_i386 += --with-cpu-32=$(CPU_$(GARCH)_32)
-CONFIGURE_ARGS_i386 += --with-cpu-64=$(CPU_$(GARCH)_64)
+# CONFIGURE_ARGS_i386 += --with-cpu-64=$(CPU_$(GARCH)_64)
 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARCH))
 
 # GCC can't be built in the same directory with the sources.
-OBJDIR          = objdir
+# It also can't be built in a subdirectory of the sources.
+OBJDIR          = $(abspath $(WORKDIR)/objdir)
 
 # These flags are passed when gcc is built with gcc.
 # Needed to remove FLAVOR_FLAGS, because they were Sun Studio specific.


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 Aug 18 17:10:47 2011
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 18 Aug 2011 15:10:47 +0000
Subject: [csw-devel] SF.net SVN: gar:[15370] csw/mgar/pkg/bzip2/trunk
Message-ID: 

Revision: 15370
          http://gar.svn.sourceforge.net/gar/?rev=15370&view=rev
Author:   dmichelsen
Date:     2011-08-18 15:10:47 +0000 (Thu, 18 Aug 2011)

Log Message:
-----------
bzip2: Update to 1.0.6 and general rework

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

Added Paths:
-----------
    csw/mgar/pkg/bzip2/trunk/files/0001-Fix-build-for-shared-lib-for-Solaris-linker.patch

Removed Paths:
-------------
    csw/mgar/pkg/bzip2/trunk/files/0001-CFLAGS-LDFLAGS-for-SOS12-shared-lib.patch
    csw/mgar/pkg/bzip2/trunk/files/0002-test-should-depend-on-bzip2.patch
    csw/mgar/pkg/bzip2/trunk/files/0003-generate-bzip2recover.patch

Modified: csw/mgar/pkg/bzip2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bzip2/trunk/Makefile	2011-08-18 14:49:14 UTC (rev 15369)
+++ csw/mgar/pkg/bzip2/trunk/Makefile	2011-08-18 15:10:47 UTC (rev 15370)
@@ -1,90 +1,91 @@
 # $Id$
 
 NAME = bzip2
-VERSION = 1.0.5
+VERSION = 1.0.6
 CATEGORIES = utils
 
 DESCRIPTION = Compression Utility
 define BLURB
-bzip2 is a freely available, patent free, high-quality data compressor. It typically
-compresses files to within 10% to 15% of the best available techniques (the PPM family of
-statistical compressors), whilst being around twice as fast at compression and six
-times faster at decompression.
+  bzip2 is a freely available, patent free, high-quality data compressor. It typically
+  compresses files to within 10% to 15% of the best available techniques (the PPM family of
+  statistical compressors), whilst being around twice as fast at compression and six
+  times faster at decompression.
 endef
 
 MASTER_SITES = http://www.bzip.org/$(VERSION)/
-DISTFILES    = $(NAME)-$(VERSION).tar.gz
-PATCHFILES   = 0001-CFLAGS-LDFLAGS-for-SOS12-shared-lib.patch
-PATCHFILES  += 0002-test-should-depend-on-bzip2.patch
-PATCHFILES  += 0003-generate-bzip2recover.patch
+DISTFILES = $(DISTNAME).tar.gz
 
-PACKAGES    = CSWbzip2
-CATALOGNAME = bzip2
+PATCHFILES += 0001-Fix-build-for-shared-lib-for-Solaris-linker.patch
 
+PACKAGES += CSWbzip2
+SPKG_DESC_CSWbzip2 += Compression utility for bzip2 compression algorithm
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWbzip2 += CSWlibbz2-1-0
+
+PACKAGES += CSWlibbz2-1-0
+SPKG_DESC_CSWlibbz2-1-0 = Compression library, libbz2.so.1.0
+PKGFILES_CSWlibbz2-1-0 += $(call pkgfiles_lib,libbz2.so.1.0)
+
+PACKAGES += CSWlibbz2-dev
+SPKG_DESC_CSWlibbz2-dev = Development files for libbz2.so.1.0
+PKGFILES_CSWlibbz2-dev += $(PKGFILES_DEVEL)
+PKGFILES_CSWlibbz2-dev += $(docdir)/.*
+RUNTIME_DEP_PKGS_CSWlibbz2-dev += CSWlibbz2-1-0
+CHECKPKG_OVERRIDES_CSWlibbz2-dev += surplus-dependency|CSWlibbz2-1-0
+# These are default install locations
+CHECKPKG_OVERRIDES_CSWlibbz2-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/bzip2/CHANGES
+CHECKPKG_OVERRIDES_CSWlibbz2-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/bzip2/README
+
 LICENSE = LICENSE
 
-BUILD64              = 1
-MERGE_DIRS_isa-extra = $(libdir)
+BUILD64 = 1
 
-EXTRA_CFLAGS  += -KPIC -D_FILE_OFFSET_BITS=64
-LDFLAGS += $(LD_OPTIONS)
+EXTRA_CFLAGS += -KPIC
+EXTRA_CFLAGS += -D_FILE_OFFSET_BITS=64
 
-BUILD_ARGS = CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
-
-BUILD_SCRIPTS     = custom
-TEST_SCRIPTS      = custom
+BUILD_ARGS += -f Makefile-libbz2_so
 CONFIGURE_SCRIPTS =
-INSTALL_SCRIPTS   = custom
+TEST_ARGS += -f Makefile-libbz2_so
+INSTALL_SCRIPTS = custom
 
-# The tests will fail if CSWbzip2 isn't already installed, since the runpath for
-# bzip2 goes through /opt/csw/lib/... instead of . - just help it out here.
-LD_LIBRARY_PATH=.
-export LD_LIBRARY_PATH
-EXTRA_TEST_EXPORTS = LD_LIBRARY_PATH
+DOCFILES += CHANGES
+DOCFILES += README
+DOCFILES += manual.html
+DOCFILES += manual.pdf
+DOCFILES += manual.xml
+BINFILES += bzip2
+BINFILES += bzdiff
+BINFILES += bzgrep
+BINFILES += bzip2recover
+BINFILES += bzmore
+LIBFILES += libbz2.so.$(VERSION)
+INCFILES += bzlib.h
 
 include gar/category.mk
 
-DOCFILES  = CHANGES README manual.html manual.pdf manual.xml
-BINFILES  = bzip2 bzdiff bzgrep bzip2recover bzmore
-LIBFILES  = libbz2.so.1.0.5
-INCFILES  = bzlib.h
-
-build-custom:
-	$(MAKE) -C $(WORKSRC) -f Makefile-libbz2_so $(BUILD_ARGS)
-	@$(MAKECOOKIE)
-
-test-custom:
-	$(MAKE) -C $(WORKSRC) -f Makefile-libbz2_so test
-	@$(MAKECOOKIE)
-
 install-custom:
 	@echo " => Installing $(CATALOGNAME)"
-	@ginstall -d $(DESTDIR)$(includedir)
-	@ginstall -d $(DESTDIR)$(libdir)
-	@ginstall -d $(DESTDIR)$(bindir)
-	@ginstall -d $(DESTDIR)$(docdir)/$(NAME)
-	@# install the libraries
-	@( for file in $(LIBFILES) ; do \
-	     ginstall -c -m 755 $(WORKSRC)/$$file $(DESTDIR)$(libdir) ; \
-	   done )
-	@ln -s -f $(DESTDIR)$(libdir)/libbz2.so.1.0.5 $(DESTDIR)$(libdir)/libbz2.so
-	@ln -s -f $(DESTDIR)$(libdir)/libbz2.so.1.0.5 $(DESTDIR)$(libdir)/libbz2.so.1.0
-	@# install the binaries
-	@( for file in $(BINFILES) ; do \
-	     ginstall -m 755 $(WORKSRC)/$$file $(DESTDIR)$(bindir) ; \
-	   done )
-	@ginstall -m 755 $(WORKSRC)/bzip2 $(DESTDIR)$(bindir)/bunzip2
-	@ginstall -m 755 $(WORKSRC)/bzip2 $(DESTDIR)$(bindir)/bzcat
-	@ln -f $(DESTDIR)$(bindir)/bzgrep $(DESTDIR)$(bindir)/bzegrep
-	@ln -f $(DESTDIR)$(bindir)/bzgrep $(DESTDIR)$(bindir)/bzfgrep
-	@ln -f $(DESTDIR)$(bindir)/bzmore $(DESTDIR)$(bindir)/bzless
-	@ln -f $(DESTDIR)$(bindir)/bzdiff $(DESTDIR)$(bindir)/bzcmp
-	@# install the include files
-	@( for file in $(INCFILES) ; do \
-	     ginstall -m 644 $(WORKSRC)/$$file $(DESTDIR)$(includedir) ; \
-	   done )
-	@# install the doc files
-	@( for file in $(DOCFILES) ; do \
-	     ginstall -m 644 $(WORKSRC)/$$file $(DESTDIR)$(docdir)/$(NAME) ; \
-	   done )
+	ginstall -d $(DESTDIR)$(libdir)
+	cd $(WORKSRC) && ginstall -c -m 755 $(LIBFILES) $(DESTDIR)$(libdir)
+	ln -s libbz2.so.$(VERSION) $(DESTDIR)$(libdir)/libbz2.so
+	ln -s libbz2.so.$(VERSION) $(DESTDIR)$(libdir)/libbz2.so.1.0
+	ginstall -d $(DESTDIR)$(bindir)
+	cd $(WORKSRC) && ginstall -m 755 $(BINFILES) $(DESTDIR)$(bindir)/
+	cd $(DESTDIR)$(bindir) && \
+		ln bzip2 bunzip2 && \
+		ln bzip2 bzcat && \
+		ln bzgrep bzegrep && \
+		ln bzgrep bzfgrep && \
+		ln bzmore bzless && \
+		ln bzdiff bzcmp
+	ginstall -d $(DESTDIR)$(mandir)/man1
+	cd $(WORKSRC) && ginstall -m 644 bzip2.1 bzdiff.1 bzgrep bzip2recover $(DESTDIR)$(mandir)/man1/
+	echo ".so man1/bzgrep.1" > $(DESTDIR)$(mandir)/man1/bzegrep.1
+	echo ".so man1/bzgrep.1" > $(DESTDIR)$(mandir)/man1/bzfgrep.1
+	echo ".so man1/bzmore.1" > $(DESTDIR)$(mandir)/man1/bzless.1
+	echo ".so man1/bzdiff.1" > $(DESTDIR)$(mandir)/man1/bzcmp.1
+	ginstall -d $(DESTDIR)$(includedir)
+	cd $(WORKSRC) && ginstall -m 644 $(INCFILES) $(DESTDIR)$(includedir)/
+	ginstall -d $(DESTDIR)$(docdir)/$(NAME)
+	cd $(WORKSRC) && ginstall -m 644 $(DOCFILES) $(DESTDIR)$(docdir)/$(NAME)/
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/bzip2/trunk/checksums
===================================================================
--- csw/mgar/pkg/bzip2/trunk/checksums	2011-08-18 14:49:14 UTC (rev 15369)
+++ csw/mgar/pkg/bzip2/trunk/checksums	2011-08-18 15:10:47 UTC (rev 15370)
@@ -1,4 +1 @@
-e75c460d8ff1a91bd295277824b4f080  0001-CFLAGS-LDFLAGS-for-SOS12-shared-lib.patch
-989947c7661176ad26174bf5b65f4ee0  0002-test-should-depend-on-bzip2.patch
-f76155cd90d532f21ea33d5e681ba3a9  0003-generate-bzip2recover.patch
-3c15a0c8d1d3ee1c46a1634d00617b1a  bzip2-1.0.5.tar.gz
+00b516f4704d4a7cb50a1d97e6e8e15b  bzip2-1.0.6.tar.gz

Deleted: csw/mgar/pkg/bzip2/trunk/files/0001-CFLAGS-LDFLAGS-for-SOS12-shared-lib.patch
===================================================================
--- csw/mgar/pkg/bzip2/trunk/files/0001-CFLAGS-LDFLAGS-for-SOS12-shared-lib.patch	2011-08-18 14:49:14 UTC (rev 15369)
+++ csw/mgar/pkg/bzip2/trunk/files/0001-CFLAGS-LDFLAGS-for-SOS12-shared-lib.patch	2011-08-18 15:10:47 UTC (rev 15370)
@@ -1,77 +0,0 @@
-From 35021e8f149f06a789417a41bbc784182910ec18 Mon Sep 17 00:00:00 2001
-From: Gordon Marler 
-Date: Fri, 20 Aug 2010 05:19:08 +0200
-Subject: [PATCH] CFLAGS LDFLAGS for SOS12 shared lib
-
----
- Makefile-libbz2_so |   34 ++++++++++++++++++++++++++--------
- 1 files changed, 26 insertions(+), 8 deletions(-)
-
-diff --git a/Makefile-libbz2_so b/Makefile-libbz2_so
-index 9a13c77..23c1a12 100644
---- a/Makefile-libbz2_so
-+++ b/Makefile-libbz2_so
-@@ -1,6 +1,6 @@
- 
- # This Makefile builds a shared version of the library, 
--# libbz2.so.1.0.4, with soname libbz2.so.1.0,
-+# libbz2.so.1.0.5, with soname libbz2.so.1.0,
- # at least on x86-Linux (RedHat 7.2), 
- # with gcc-2.96 20000731 (Red Hat Linux 7.1 2.96-98).  
- # Please see the README file for some important info 
-@@ -22,9 +22,8 @@
- 
- 
- SHELL=/bin/sh
--CC=gcc
--BIGFILES=-D_FILE_OFFSET_BITS=64
--CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES)
-+
-+
- 
- OBJS= blocksort.o  \
-       huffman.o    \
-@@ -35,13 +34,13 @@ OBJS= blocksort.o  \
-       bzlib.o
- 
- all: $(OBJS)
--	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.4 $(OBJS)
--	$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.4
-+	$(CC) -G $(CFLAGS) $(LDFLAGS) -o libbz2.so.1.0.5 $(OBJS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.c libbz2.so.1.0.5
- 	rm -f libbz2.so.1.0
--	ln -s libbz2.so.1.0.4 libbz2.so.1.0
-+	ln -s libbz2.so.1.0.5 libbz2.so.1.0
- 
- clean: 
--	rm -f $(OBJS) bzip2.o libbz2.so.1.0.4 libbz2.so.1.0 bzip2-shared
-+	rm -f $(OBJS) bzip2.o libbz2.so.1.0.5 libbz2.so.1.0 bzip2
- 
- blocksort.o: blocksort.c
- 	$(CC) $(CFLAGS) -c blocksort.c
-@@ -57,3 +56,22 @@ decompress.o: decompress.c
- 	$(CC) $(CFLAGS) -c decompress.c
- bzlib.o: bzlib.c
- 	$(CC) $(CFLAGS) -c bzlib.c
-+
-+check:  test
-+
-+test: all
-+	@cat words1
-+	./bzip2 -1 < sample1.ref > sample1.rb2
-+	./bzip2 -2  < sample2.ref > sample2.rb2
-+	./bzip2 -3  < sample3.ref > sample3.rb2
-+	./bzip2 -d  < sample1.bz2 > sample1.tst
-+	./bzip2 -d  < sample2.bz2 > sample2.tst
-+	./bzip2 -ds < sample3.bz2 > sample3.tst
-+	cmp sample1.bz2 sample1.rb2
-+	cmp sample2.bz2 sample2.rb2
-+	cmp sample3.bz2 sample3.rb2
-+	cmp sample1.tst sample1.ref
-+	cmp sample2.tst sample2.ref
-+	cmp sample3.tst sample3.ref
-+	@cat words3
-+
--- 
-1.7.1
-

Added: csw/mgar/pkg/bzip2/trunk/files/0001-Fix-build-for-shared-lib-for-Solaris-linker.patch
===================================================================
--- csw/mgar/pkg/bzip2/trunk/files/0001-Fix-build-for-shared-lib-for-Solaris-linker.patch	                        (rev 0)
+++ csw/mgar/pkg/bzip2/trunk/files/0001-Fix-build-for-shared-lib-for-Solaris-linker.patch	2011-08-18 15:10:47 UTC (rev 15370)
@@ -0,0 +1,75 @@
+From 3d6ba563435533b4093a409bcd27db652239cd81 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen 
+Date: Thu, 18 Aug 2011 14:35:35 +0200
+Subject: [PATCH] Fix build for shared lib for Solaris linker
+
+---
+ Makefile-libbz2_so |   39 ++++++++++++++++++++++++++++++---------
+ 1 files changed, 30 insertions(+), 9 deletions(-)
+
+diff --git a/Makefile-libbz2_so b/Makefile-libbz2_so
+index e58791b..a492706 100644
+--- a/Makefile-libbz2_so
++++ b/Makefile-libbz2_so
+@@ -22,9 +22,6 @@
+ 
+ 
+ SHELL=/bin/sh
+-CC=gcc
+-BIGFILES=-D_FILE_OFFSET_BITS=64
+-CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES)
+ 
+ OBJS= blocksort.o  \
+       huffman.o    \
+@@ -34,14 +31,19 @@ OBJS= blocksort.o  \
+       decompress.o \
+       bzlib.o
+ 
+-all: $(OBJS)
+-	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS)
+-	$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6
+-	rm -f libbz2.so.1.0
+-	ln -s libbz2.so.1.0.6 libbz2.so.1.0
++all: libbz2.so.1.0.6 bzip2 bzip2recover
++
++bzip2: libbz2.so.1.0.6
++	$(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.c libbz2.so.1.0.6
++
++bzip2recover: bzip2recover.o
++	$(CC) $(CFLAGS) -o bzip2recover bzip2recover.o
++
++libbz2.so.1.0.6:  $(OBJS)
++	$(CC) -G $(CFLAGS) -h libbz2.so.1.0 $(LDFLAGS) -o libbz2.so.1.0.6 $(OBJS)
+ 
+ clean: 
+-	rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared
++	rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2
+ 
+ blocksort.o: blocksort.c
+ 	$(CC) $(CFLAGS) -c blocksort.c
+@@ -57,3 +59,22 @@ decompress.o: decompress.c
+ 	$(CC) $(CFLAGS) -c decompress.c
+ bzlib.o: bzlib.c
+ 	$(CC) $(CFLAGS) -c bzlib.c
++
++check: test
++
++test: bzip2
++	@cat words1
++	./bzip2 -1 < sample1.ref > sample1.rb2
++	./bzip2 -2  < sample2.ref > sample2.rb2
++	./bzip2 -3  < sample3.ref > sample3.rb2
++	./bzip2 -d  < sample1.bz2 > sample1.tst
++	./bzip2 -d  < sample2.bz2 > sample2.tst
++	./bzip2 -ds < sample3.bz2 > sample3.tst
++	cmp sample1.bz2 sample1.rb2
++	cmp sample2.bz2 sample2.rb2
++	cmp sample3.bz2 sample3.rb2
++	cmp sample1.tst sample1.ref
++	cmp sample2.tst sample2.ref
++	cmp sample3.tst sample3.ref
++	@cat words3
++
+-- 
+1.7.6
+

Deleted: csw/mgar/pkg/bzip2/trunk/files/0002-test-should-depend-on-bzip2.patch
===================================================================
--- csw/mgar/pkg/bzip2/trunk/files/0002-test-should-depend-on-bzip2.patch	2011-08-18 14:49:14 UTC (rev 15369)
+++ csw/mgar/pkg/bzip2/trunk/files/0002-test-should-depend-on-bzip2.patch	2011-08-18 15:10:47 UTC (rev 15370)
@@ -1,25 +0,0 @@
-From 9ee98dbae36b812549127094a4140f1278d67ecf Mon Sep 17 00:00:00 2001
-From: Gordon Marler 
-Date: Fri, 20 Aug 2010 05:47:48 +0200
-Subject: [PATCH] test should depend on bzip2
-
----
- Makefile-libbz2_so |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile-libbz2_so b/Makefile-libbz2_so
-index 1494abd..b980404 100644
---- a/Makefile-libbz2_so
-+++ b/Makefile-libbz2_so
-@@ -59,7 +59,7 @@ bzlib.o: bzlib.c
- 
- check:  test
- 
--test: all
-+test: bzip2
- 	@cat words1
- 	./bzip2 -1 < sample1.ref > sample1.rb2
- 	./bzip2 -2  < sample2.ref > sample2.rb2
--- 
-1.7.1
-

Deleted: csw/mgar/pkg/bzip2/trunk/files/0003-generate-bzip2recover.patch
===================================================================
--- csw/mgar/pkg/bzip2/trunk/files/0003-generate-bzip2recover.patch	2011-08-18 14:49:14 UTC (rev 15369)
+++ csw/mgar/pkg/bzip2/trunk/files/0003-generate-bzip2recover.patch	2011-08-18 15:10:47 UTC (rev 15370)
@@ -1,35 +0,0 @@
-From 8c2999a502b88621e39ec11e9cc60106236b5bd6 Mon Sep 17 00:00:00 2001
-From: Gordon Marler 
-Date: Fri, 20 Aug 2010 06:55:05 +0200
-Subject: [PATCH] generate bzip2recover
-
----
- Makefile-libbz2_so |   11 +++++++++--
- 1 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile-libbz2_so b/Makefile-libbz2_so
-index b980404..2eeea45 100644
---- a/Makefile-libbz2_so
-+++ b/Makefile-libbz2_so
-@@ -33,9 +33,16 @@ OBJS= blocksort.o  \
-       decompress.o \
-       bzlib.o
- 
--all: $(OBJS)
--	$(CC) -G $(CFLAGS) $(LDFLAGS) -o libbz2.so.1.0.5 $(OBJS)
-+all: libbz2.so.1.0.5 bzip2 bzip2recover
-+
-+bzip2: libbz2.so.1.0.5
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.c libbz2.so.1.0.5
-+
-+bzip2recover: bzip2recover.o
-+	$(CC) $(CFLAGS) -o bzip2recover bzip2recover.o
-+
-+libbz2.so.1.0.5:  $(OBJS)
-+	$(CC) -G $(CFLAGS) $(LDFLAGS) -o libbz2.so.1.0.5 $(OBJS)
- 	rm -f libbz2.so.1.0
- 	ln -s libbz2.so.1.0.5 libbz2.so.1.0
- 
--- 
-1.7.1
-


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

From dmichelsen at users.sourceforge.net  Thu Aug 18 17:54:57 2011
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 18 Aug 2011 15:54:57 +0000
Subject: [csw-devel] SF.net SVN: gar:[15371]
	csw/mgar/pkg/bzip2/trunk/Makefile
Message-ID: 

Revision: 15371
          http://gar.svn.sourceforge.net/gar/?rev=15371&view=rev
Author:   dmichelsen
Date:     2011-08-18 15:54:57 +0000 (Thu, 18 Aug 2011)

Log Message:
-----------
bzip2: Fix manpages

Modified Paths:
--------------
    csw/mgar/pkg/bzip2/trunk/Makefile

Modified: csw/mgar/pkg/bzip2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bzip2/trunk/Makefile	2011-08-18 15:10:47 UTC (rev 15370)
+++ csw/mgar/pkg/bzip2/trunk/Makefile	2011-08-18 15:54:57 UTC (rev 15371)
@@ -31,7 +31,6 @@
 PKGFILES_CSWlibbz2-dev += $(PKGFILES_DEVEL)
 PKGFILES_CSWlibbz2-dev += $(docdir)/.*
 RUNTIME_DEP_PKGS_CSWlibbz2-dev += CSWlibbz2-1-0
-CHECKPKG_OVERRIDES_CSWlibbz2-dev += surplus-dependency|CSWlibbz2-1-0
 # These are default install locations
 CHECKPKG_OVERRIDES_CSWlibbz2-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/bzip2/CHANGES
 CHECKPKG_OVERRIDES_CSWlibbz2-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/bzip2/README
@@ -79,7 +78,7 @@
 		ln bzmore bzless && \
 		ln bzdiff bzcmp
 	ginstall -d $(DESTDIR)$(mandir)/man1
-	cd $(WORKSRC) && ginstall -m 644 bzip2.1 bzdiff.1 bzgrep bzip2recover $(DESTDIR)$(mandir)/man1/
+	cd $(WORKSRC) && ginstall -m 644 bzip2.1 bzdiff.1 bzgrep.1 bzmore.1 $(DESTDIR)$(mandir)/man1/
 	echo ".so man1/bzgrep.1" > $(DESTDIR)$(mandir)/man1/bzegrep.1
 	echo ".so man1/bzgrep.1" > $(DESTDIR)$(mandir)/man1/bzfgrep.1
 	echo ".so man1/bzmore.1" > $(DESTDIR)$(mandir)/man1/bzless.1


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

From dmichelsen at users.sourceforge.net  Thu Aug 18 20:02:44 2011
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 18 Aug 2011 18:02:44 +0000
Subject: [csw-devel] SF.net SVN: gar:[15372]
	csw/mgar/pkg/libexplain/trunk/Makefile
Message-ID: 

Revision: 15372
          http://gar.svn.sourceforge.net/gar/?rev=15372&view=rev
Author:   dmichelsen
Date:     2011-08-18 18:02:43 +0000 (Thu, 18 Aug 2011)

Log Message:
-----------
libexplain: Add path to /opt/csw/gnu first

Modified Paths:
--------------
    csw/mgar/pkg/libexplain/trunk/Makefile

Modified: csw/mgar/pkg/libexplain/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libexplain/trunk/Makefile	2011-08-18 15:54:57 UTC (rev 15371)
+++ csw/mgar/pkg/libexplain/trunk/Makefile	2011-08-18 18:02:43 UTC (rev 15372)
@@ -67,3 +67,6 @@
 
 include gar/category.mk
 
+# Needed for GNU fmt as discussed here:
+#   http://sourceforge.net/mailarchive/message.php?msg_id=27942063
+PATH := /opt/csw/gnu:$(PATH)


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

From bonivart at users.sourceforge.net  Thu Aug 18 21:57:11 2011
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Thu, 18 Aug 2011 19:57:11 +0000
Subject: [csw-devel] SF.net SVN: gar:[15373] csw/mgar/pkg/dhcp/trunk
Message-ID: 

Revision: 15373
          http://gar.svn.sourceforge.net/gar/?rev=15373&view=rev
Author:   bonivart
Date:     2011-08-18 19:57:11 +0000 (Thu, 18 Aug 2011)

Log Message:
-----------
dhcp/trunk: update to 4.2.2

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

Modified: csw/mgar/pkg/dhcp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dhcp/trunk/Makefile	2011-08-18 18:02:43 UTC (rev 15372)
+++ csw/mgar/pkg/dhcp/trunk/Makefile	2011-08-18 19:57:11 UTC (rev 15373)
@@ -1,10 +1,10 @@
 NAME = dhcp
-VERSION = 4.2.1
-RELEASE = P1
-DISTVERSION = $(VERSION)-$(RELEASE)
-SPKG_VERSION = $(VERSION)$(RELEASE)
-DISTNAME = $(NAME)-$(VERSION)-$(RELEASE)
-WORKSRC = $(WORKDIR)/$(DISTNAME)
+VERSION = 4.2.2
+#RELEASE = P1
+#DISTVERSION = $(VERSION)-$(RELEASE)
+#SPKG_VERSION = $(VERSION)$(RELEASE)
+#DISTNAME = $(NAME)-$(VERSION)-$(RELEASE)
+#WORKSRC = $(WORKDIR)/$(DISTNAME)
 CATEGORIES = net
 
 DESCRIPTION = ISC DHCP reference implementation

Modified: csw/mgar/pkg/dhcp/trunk/checksums
===================================================================
--- csw/mgar/pkg/dhcp/trunk/checksums	2011-08-18 18:02:43 UTC (rev 15372)
+++ csw/mgar/pkg/dhcp/trunk/checksums	2011-08-18 19:57:11 UTC (rev 15373)
@@ -1 +1 @@
-22e6f1eff6d5cfe2621a06cc62ba5b70  dhcp-4.2.1-P1.tar.gz
+bb0f0434cd796f76aa7cead391d71f31  dhcp-4.2.2.tar.gz


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

From maciej at opencsw.org  Thu Aug 18 23:06:29 2011
From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=)
Date: Thu, 18 Aug 2011 22:06:29 +0100
Subject: [csw-devel] SF.net SVN: gar:[15373] csw/mgar/pkg/dhcp/trunk
In-Reply-To: 
References: 
Message-ID: 

Hi Peter,

> CHECKPKG_OVERRIDES_CSWdhcp += surplus-dependency|CSWosslrt

I was curious about this CSWosslrt dependency, I don't see any
binaries from the dhcp package linking against the ssl libraries - is
this dependency actually necessary? If it is, can you document it in
the Makefile?

From wahwah at users.sourceforge.net  Thu Aug 18 23:24:30 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Thu, 18 Aug 2011 21:24:30 +0000
Subject: [csw-devel] SF.net SVN: gar:[15374]
	csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
Message-ID: 

Revision: 15374
          http://gar.svn.sourceforge.net/gar/?rev=15374&view=rev
Author:   wahwah
Date:     2011-08-18 21:24:30 +0000 (Thu, 18 Aug 2011)

Log Message:
-----------
pkg/gcc4/branches/bootstrap-4.6: include static libs, turns out they are required.

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile

Modified: csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-18 19:57:11 UTC (rev 15373)
+++ csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-18 21:24:30 UTC (rev 15374)
@@ -1,6 +1,10 @@
 # $Id$
 #
 # ! Ada is not built yet, it requires PPL which isn't built yet.
+#
+# amd64 compilation fails
+# potentially related bug:
+# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39048
 
 NAME      = gcc
 VERSION   = 4.6.1
@@ -142,13 +146,14 @@
 CHECKPKG_OVERRIDES_CSWgcc4g++ += file-with-bad-content
 CHECKPKG_OVERRIDES_CSWgcc4java += file-with-bad-content
 CHECKPKG_OVERRIDES_CSWlibgcj12 += file-with-bad-content
-CHECKPKG_OVERRIDES_CSWgcc4core += discouraged-path-in-pkgmap|/opt/csw/gcc4/libexec/gcc/sparc-sun-solaris2.9/4.6.1/liblto_plugin.la
-CHECKPKG_OVERRIDES_CSWgcc4core += discouraged-path-in-pkgmap|/opt/csw/gcc4/libexec/gcc/i386-pc-solaris2.9/4.6.1/liblto_plugin.la
+CHECKPKG_OVERRIDES_CSWgcc4core += discouraged-path-in-pkgmap|/opt/csw/gcc4/libexec/gcc/i386-pc-solaris2.9/$(VERSION)/liblto_plugin.la
+CHECKPKG_OVERRIDES_CSWgcc4core += discouraged-path-in-pkgmap|/opt/csw/gcc4/libexec/gcc/sparc-sun-solaris2.9/$(VERSION)/liblto_plugin.la
+CHECKPKG_OVERRIDES_CSWgcc4core += discouraged-path-in-pkgmap|/opt/csw/gcc4/libexec/gcc/sparc-sun-solaris2.10/$(VERSION)/liblto_plugin.la
 CHECKPKG_OVERRIDES_CSWgcc4objc += file-with-bad-content
 CHECKPKG_OVERRIDES_CSWgcc4gfortran += file-with-bad-content
 # Due to complex regular expressions
-CHECKPKG_OVERRIDES_CSWgcc4java += file-collision|/opt/csw/gcc4/include/c++/4.6.1/sun/awt/CausedFocusEvent.h|CSWgcc4g++|CSWgcc4java
-CHECKPKG_OVERRIDES_CSWgcc4g++ += file-collision|/opt/csw/gcc4/include/c++/4.6.1/sun/awt/CausedFocusEvent.h|CSWgcc4g++|CSWgcc4java
+CHECKPKG_OVERRIDES_CSWgcc4java += file-collision|/opt/csw/gcc4/include/c++/$(VERSION)/sun/awt/CausedFocusEvent.h|CSWgcc4g++|CSWgcc4java
+CHECKPKG_OVERRIDES_CSWgcc4g++ += file-collision|/opt/csw/gcc4/include/c++/$(VERSION)/sun/awt/CausedFocusEvent.h|CSWgcc4g++|CSWgcc4java
 
 # From the 'hopeless errors' department:
 CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/libffi.so|CSWgcc3javart|CSWgcc4core
@@ -163,6 +168,10 @@
 CHECKPKG_OVERRIDES_CSWgcc4objc += file-collision|/opt/csw/lib/sparcv9/libobjc.so|CSWgcc3objcrt|CSWgcc4objc
 CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/lib-gnu-awt-xlib.so|CSWgcc3javart|CSWgcc4core
 
+# Some static libraries are required to build binaries with gcc, for example
+# libgcc.a and libgcc_eh.a. Otherwise: ld: fatal: library -lgcc: not found
+MERGE_EXCLUDE_LIBTOOL =
+MERGE_EXCLUDE_STATICLIBS =
 
 # Catch-all package
 


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

From skayser at users.sourceforge.net  Thu Aug 18 23:37:35 2011
From: skayser at users.sourceforge.net (skayser at users.sourceforge.net)
Date: Thu, 18 Aug 2011 21:37:35 +0000
Subject: [csw-devel] SF.net SVN: gar:[15375] csw/mgar/pkg/stunnel/trunk
Message-ID: 

Revision: 15375
          http://gar.svn.sourceforge.net/gar/?rev=15375&view=rev
Author:   skayser
Date:     2011-08-18 21:37:35 +0000 (Thu, 18 Aug 2011)

Log Message:
-----------
stunnel/trunk: add MIGRATE_FILES, update changelog.CSW

Modified Paths:
--------------
    csw/mgar/pkg/stunnel/trunk/Makefile
    csw/mgar/pkg/stunnel/trunk/files/changelog.CSW

Modified: csw/mgar/pkg/stunnel/trunk/Makefile
===================================================================
--- csw/mgar/pkg/stunnel/trunk/Makefile	2011-08-18 21:24:30 UTC (rev 15374)
+++ csw/mgar/pkg/stunnel/trunk/Makefile	2011-08-18 21:37:35 UTC (rev 15375)
@@ -48,6 +48,7 @@
 
 INITSMF = $(sysconfdir)/init.d/cswstunnel
 SAMPLECONF = $(sysconfdir)/stunnel.pem
+MIGRATE_FILES = stunnel # migrate the /opt/csw/etc/stunnel sub directory
 
 PROTOTYPE_MODIFIERS = restrict
 PROTOTYPE_FILES_restrict = $(localstatedir)/lib/stunnel.*

Modified: csw/mgar/pkg/stunnel/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/stunnel/trunk/files/changelog.CSW	2011-08-18 21:24:30 UTC (rev 15374)
+++ csw/mgar/pkg/stunnel/trunk/files/changelog.CSW	2011-08-18 21:37:35 UTC (rev 15375)
@@ -1,3 +1,10 @@
+stunnel (4.41,REV=2011.08.18)
+
+  * Updated to 4.41. (Closes: #4817, #4606)
+  * Changed $(sysconfdir) from /opt/csw/etc/stunnel to /etc/opt/csw/stunnel.
+
+ -- Sebastian Kayser   Thu, 18 Aug 2011 16:50:31 +0200
+
 stunnel (4,27,REV=2009.06.18)
 
   * Package adopted and updated to 4.27.


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

From wahwah at users.sourceforge.net  Fri Aug 19 00:19:51 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Thu, 18 Aug 2011 22:19:51 +0000
Subject: [csw-devel] SF.net SVN: gar:[15376]
	csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
Message-ID: 

Revision: 15376
          http://gar.svn.sourceforge.net/gar/?rev=15376&view=rev
Author:   wahwah
Date:     2011-08-18 22:19:50 +0000 (Thu, 18 Aug 2011)

Log Message:
-----------
pkg/gcc4/branches/bootstrap-4.6: overriding the .a related error tags

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile

Modified: csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-18 21:37:35 UTC (rev 15375)
+++ csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-18 22:19:50 UTC (rev 15376)
@@ -80,7 +80,7 @@
 CPU_i386_64 = x86-64
 
 CONFIGURE_ARGS_sparc += --with-cpu=$(CPU_$(GARCH)_32)
-CONFIGURE_ARGS_i386 += --with-cpu-32=$(CPU_$(GARCH)_32)
+# CONFIGURE_ARGS_i386 += --with-cpu-32=$(CPU_$(GARCH)_32)
 # CONFIGURE_ARGS_i386 += --with-cpu-64=$(CPU_$(GARCH)_64)
 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARCH))
 
@@ -155,6 +155,12 @@
 CHECKPKG_OVERRIDES_CSWgcc4java += file-collision|/opt/csw/gcc4/include/c++/$(VERSION)/sun/awt/CausedFocusEvent.h|CSWgcc4g++|CSWgcc4java
 CHECKPKG_OVERRIDES_CSWgcc4g++ += file-collision|/opt/csw/gcc4/include/c++/$(VERSION)/sun/awt/CausedFocusEvent.h|CSWgcc4g++|CSWgcc4java
 
+# The .a files are necessary
+CHECKPKG_OVERRIDES_CSWgcc4core += discouraged-path-in-pkgmap
+CHECKPKG_OVERRIDES_CSWgcc4objc += discouraged-path-in-pkgmap
+CHECKPKG_OVERRIDES_CSWgcc4java += discouraged-path-in-pkgmap
+CHECKPKG_OVERRIDES_CSWgcc4gfortran += discouraged-path-in-pkgmap
+
 # From the 'hopeless errors' department:
 CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/libffi.so|CSWgcc3javart|CSWgcc4core
 CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/libgcc_s.so|CSWgcc3core|CSWgcc4core


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

From skayser at users.sourceforge.net  Fri Aug 19 00:29:22 2011
From: skayser at users.sourceforge.net (skayser at users.sourceforge.net)
Date: Thu, 18 Aug 2011 22:29:22 +0000
Subject: [csw-devel] SF.net SVN: opencsw:[512] gar-wrapper
Message-ID: 

Revision: 512
          http://opencsw.svn.sourceforge.net/opencsw/?rev=512&view=rev
Author:   skayser
Date:     2011-08-18 22:29:22 +0000 (Thu, 18 Aug 2011)

Log Message:
-----------
mgar: added show-var command

Modified Paths:
--------------
    gar-wrapper/CHANGES
    gar-wrapper/mgar

Modified: gar-wrapper/CHANGES
===================================================================
--- gar-wrapper/CHANGES	2011-08-14 18:12:33 UTC (rev 511)
+++ gar-wrapper/CHANGES	2011-08-18 22:29:22 UTC (rev 512)
@@ -1,9 +1,11 @@
 Changes since 0.92 (r380):
+* Added package version to "version" command output
+* Added new command "show-var" to display the runtime value of build
+  recipe variables (Maciej Blizinski)
 * Changed "newpkg" command to run relative to the build tree (not $PWD)
   so that it can be run from anywhere
 * Improved error message when running a package specific command in
   a non-package directory
-* Added package version to "version" command
 
 Changes since 0.91 (r360):
 * mgar will now warn and exit on legacy gar/ directories or symlinks

Modified: gar-wrapper/mgar
===================================================================
--- gar-wrapper/mgar	2011-08-14 18:12:33 UTC (rev 511)
+++ gar-wrapper/mgar	2011-08-18 22:29:22 UTC (rev 512)
@@ -33,7 +33,6 @@
 #
 # Todos:
 # * Improve error messages when buildsys can't be found
-# * Enable mgar newpkg from anywhere (relative path to $BUILDTREE)
 # * Enable checkout of a specific revision for build recipe + GAR
 #   (~/opencsw/.buildsys/vX at YYYY, ~/opencsw/foo/trunk at YYYY)
 # * Add template for ~/.garrc (think new users)
@@ -461,6 +460,31 @@
   echo ""
 }
 
+function show_makefile_var() {
+  local __varname=${1:-}
+
+  if [ -z "${__varname}" ]; then
+    echo "ERROR: You need to provide a build recipe variable name" >&2
+    exit 1
+  fi
+
+  local __acked=`read_config_value ACK_SHOWVAR`
+  echo -n "${__varname}: "
+  gmake -I "$BUILDSYS" \
+    -f <( cat Makefile; echo -e "\nshow-var:\n\t at echo \$(${1:-})" ) \
+    show-var
+
+  if [ -z "${__acked}" ]; then
+    echo
+    echo "Beware: show-var doesn't evaluate modulations. So if you make use of"
+    echo "complex recipes, the displayed value might not be the actual value"
+    echo "that will be used during the build. To suppress this warning:"
+    echo
+    echo "  echo ACK_SHOWVAR=1 >> ~/.garrc"
+    echo
+  fi
+}
+
 function usage() {
   cat < [options]
@@ -486,6 +510,7 @@
   commit -m      Commit build recipe (prefixes msg with package path)
   show-srcdir         Show the location of the extracted package source
   show-stagedir       Show the location of the package staging directory
+  show-var   Show the runtime value of a build recipe variable
   find-file     Find a file within the extracted package source
   edit-file     Edit a file within the extracted package source
 
@@ -571,6 +596,7 @@
                    ;;
       show-srcdir) echo `get_srcdir`;;
     show-stagedir) echo `get_stagedir`;;
+         show-var) shift; show_makefile_var ${1:-};;
            up-pkg) echo "Updating current package directory + build system"
                    svn up --ignore-externals; svn up $BUILDSYS;;
                 *) gmake -I "$BUILDSYS" "$@"


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

From skayser at users.sourceforge.net  Fri Aug 19 00:31:10 2011
From: skayser at users.sourceforge.net (skayser at users.sourceforge.net)
Date: Thu, 18 Aug 2011 22:31:10 +0000
Subject: [csw-devel] SF.net SVN: opencsw:[513]
	gar-wrapper/bash_completion.mgar
Message-ID: 

Revision: 513
          http://opencsw.svn.sourceforge.net/opencsw/?rev=513&view=rev
Author:   skayser
Date:     2011-08-18 22:31:09 +0000 (Thu, 18 Aug 2011)

Log Message:
-----------
mgar: update bash completion with show-var command

Modified Paths:
--------------
    gar-wrapper/bash_completion.mgar

Modified: gar-wrapper/bash_completion.mgar
===================================================================
--- gar-wrapper/bash_completion.mgar	2011-08-18 22:29:22 UTC (rev 512)
+++ gar-wrapper/bash_completion.mgar	2011-08-18 22:31:09 UTC (rev 513)
@@ -23,7 +23,7 @@
   misctgts="modenv ccenv"
   mgarcmds="help init index locate up commit show-srcdir show-stagedir"
   mgarcmds="${mgarcmds} find-file edit-file show-buildsys show-pkgtree version"
-  mgarcmds="${mgarcmds} list-categories newpkg"
+  mgarcmds="${mgarcmds} list-categories newpkg show-var"
   ustreamcmds="check-upstream get-uwatch-configuration"
 
   opts="${buildtgts} ${misctgts} ${mgarcmds} ${ustreamcmds}"


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

From skayser at users.sourceforge.net  Fri Aug 19 00:43:20 2011
From: skayser at users.sourceforge.net (skayser at users.sourceforge.net)
Date: Thu, 18 Aug 2011 22:43:20 +0000
Subject: [csw-devel] SF.net SVN: opencsw:[514] gar-wrapper/mgar
Message-ID: 

Revision: 514
          http://opencsw.svn.sourceforge.net/opencsw/?rev=514&view=rev
Author:   skayser
Date:     2011-08-18 22:43:20 +0000 (Thu, 18 Aug 2011)

Log Message:
-----------
mgar: correct the ACK_SHOWVAR configuration value handling

Modified Paths:
--------------
    gar-wrapper/mgar

Modified: gar-wrapper/mgar
===================================================================
--- gar-wrapper/mgar	2011-08-18 22:31:09 UTC (rev 513)
+++ gar-wrapper/mgar	2011-08-18 22:43:20 UTC (rev 514)
@@ -474,7 +474,7 @@
     -f <( cat Makefile; echo -e "\nshow-var:\n\t at echo \$(${1:-})" ) \
     show-var
 
-  if [ -z "${__acked}" ]; then
+  if [ "${__acked}" != "1" ]; then
     echo
     echo "Beware: show-var doesn't evaluate modulations. So if you make use of"
     echo "complex recipes, the displayed value might not be the actual value"


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

From bwalton at opencsw.org  Fri Aug 19 03:40:32 2011
From: bwalton at opencsw.org (Ben Walton)
Date: Thu, 18 Aug 2011 21:40:32 -0400
Subject: [csw-devel] psuedo sketch of web and mantis automation
Message-ID: <1313717595-sup-109@pinkfloyd.chass.utoronto.ca>


Hi All,

I've not started coding this yet as I'm still getting the environment
setup, but here is the rough outline (pseudo code) of the overall flow
for this.  A few things of note:

Must of the mantis stuff relies on info from the web database thus
'add' operations should be web then mantis while 'delete' operations
should be mantis then web.

I'm envisioning a code pattern that allows for listener plugins.  A
general call to remove_pkgs(pkgset) would be called.  That would then
iterate over the listeners that are plugged in calling their remove
methods.  I'll register a mantis listener and a web db listener.

Listeners will have priorities to facilitate ordering although I'm not
sure the best way (yet) to handle this.

This design should allow swapping out mantis code for $new_bugtracker
later without too much work.

Detecting renames is important in the _stub case.  I'll likely need to
catch it in the general case too.  Things would have been _much_
simpler if the package name instead of the software name was set as
the key for everything...

Anyway, pseudo code.  Any obvious issues?

oldcat = load_old_catalog()
newcat = fetch_new_catalog()
[new, update, remove] = new_compared_to_old(oldcat, newcat)

stubs = find_stubs(new, update)

renames = []
for p in stubs
    # determine based on package name what the old software name was
    # (this does not rely on stub naming convention of $oldname ->
    # $oldname + '_stub') as we'll actually look it up
    stub_oldname = lookup_softname_by_pkgname(p)

    # scan all packages about to be dropped
    for q in remove
    	# if a dropped package software name is the stub's old name,
	# handle a renaming case.
    	if q.softname = stub_oldname
	   # save the rename pair
	   renames << [p, q]
	   # no longer treat this package as a pure removal
	   remove = remove - q
	   # no longer treat the stub as a pure add or update
	   new = new - p
	   update = update -p

for [p,q] in renames
    rename_pkg_in_mantis(p, q)
    rename_pkg_in_webdb(p, q)
    
for p in remove
    remove_pkg_from_mantis(p)
    remove_pkg_from_webdb(p)

for p in new
    add_pkg_to_webdb(p)
    add_pkg_to_mantis(p)

for p in update
    update_pkg_in_mantis(p)
    update_pkg_in_webdb(p)
    
function rename_pkg_in_webdb(p, q)
    # rough sql idea
    update packages set pkgname = p.pkgname, maintainer =
    p.maintainer, ... where q.softname = packages.softname
    
function rename_pkg_in_mantis(p, q)
    # rough sql idea
    update mantis_project_table ...

function delete_pkg_in_webdb(p)
    delete from packages()
    delete from dependencies () ...
    delete from dependlibs () ...
    delete from pathnames () ...
    delete from uniquepaths () ...

function delete_pkg_in_mantis(p)
    delete from mantis_project_user_table () ...
    delete from mantis_project_table () ...

function add_pkg_to_webdb(p)
    insert into packages ()...
    insert into dependencies () ...
    insert into dependlibs () ...
    insert into pathnames () ...
    insert into uniquepaths () ...

function add_pkg_to_mantis(p)
    insert into mantis_project_table ()...
    insert into mantis_project_user_table () ...

function update_pkg_in_webdb(p)
    delete_pkg_in_webdb(p)
    add_pkg_to_webdb(p)

function update_pkg_in_mantis()
    update mantis_project_user_table () ...



Thanks
-Ben

--
Ben Walton
Systems Programmer - CHASS
University of Toronto
C:416.407.5610 | W:416.978.4302


From dmichelsen at users.sourceforge.net  Fri Aug 19 09:53:36 2011
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 19 Aug 2011 07:53:36 +0000
Subject: [csw-devel] SF.net SVN: gar:[15377] csw/mgar/pkg/mtwrite/trunk
Message-ID: 

Revision: 15377
          http://gar.svn.sourceforge.net/gar/?rev=15377&view=rev
Author:   dmichelsen
Date:     2011-08-19 07:53:35 +0000 (Fri, 19 Aug 2011)

Log Message:
-----------
mtwrite: Update to r100528

Modified Paths:
--------------
    csw/mgar/pkg/mtwrite/trunk/Makefile
    csw/mgar/pkg/mtwrite/trunk/checksums
    csw/mgar/pkg/mtwrite/trunk/files/0002-Hardcode-library-position.patch

Removed Paths:
-------------
    csw/mgar/pkg/mtwrite/trunk/files/0001-Use-man3-and-skip-intermediate-lib-dir.patch
    csw/mgar/pkg/mtwrite/trunk/files/0003-Fix-path-in-manpage.patch

Modified: csw/mgar/pkg/mtwrite/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mtwrite/trunk/Makefile	2011-08-18 22:19:50 UTC (rev 15376)
+++ csw/mgar/pkg/mtwrite/trunk/Makefile	2011-08-19 07:53:35 UTC (rev 15377)
@@ -1,6 +1,6 @@
 # : Makefile 9089 2010-03-11 08:34:46Z wahwah $
 NAME = mtwrite
-VERSION = r90214
+VERSION = r100528
 CATEGORIES = lib
 
 DESCRIPTION = Library to enable tar and unzip to write multiple files in parallel
@@ -9,23 +9,34 @@
 
 MASTER_SITES = http://www.maier-komor.de/mtwrite/
 DISTFILES  = $(NAME)-$(VERSION).tgz
-PATCHFILES  = 0001-Use-man3-and-skip-intermediate-lib-dir.patch
-PATCHFILES += 0002-Hardcode-library-position.patch
-PATCHFILES += 0003-Fix-path-in-manpage.patch
 
-# File name regex to get notifications about upstream software releases
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tgz
+#PATCHFILES += 0002-Hardcode-library-position.patch
 
+VENDOR_URL = http://www.maier-komor.de/mtwrite.html
+
 LICENSE = lgpl.txt
 
 CONFIGURE_SCRIPTS =
 
-BUILD_OVERRIDE_VARS = CC
+EXTRA_CFLAGS = -G -g -mt
+EXTRA_LDFLAGS = -zinitarray=init -lthread -ldl -lrt -lumem
+
+BUILD_OVERRIDE_VARS = CC CFLAGS LDFLAGS
 BUILD_OVERRIDE_VAR_CC = $(CC)
+BUILD_OVERRIDE_VAR_CFLAGS = $(CFLAGS)
+BUILD_OVERRIDE_VAR_LDFLAGS = $(LDFLAGS)
 
 TEST_SCRIPTS =
 
 INSTALL_OVERRIDE_DIRS = PREFIX
 PREFIX=$(prefix)
 
+# This is the intended shared library name. As it is not meant for use with
+# LD_LIBRARY_PATH only this is ok.
+CHECKPKG_OVERRIDES_CSWmtwrite += soname-equals-filename|file=/opt/csw/lib/mtwrite.so
+
 include gar/category.mk
+
+post-install-modulated:
+	perl -pi -e 's,/usr/local/lib,$(libdir),' \
+		$(DESTDIR)$(mandir)/man3/mtwrite.3

Modified: csw/mgar/pkg/mtwrite/trunk/checksums
===================================================================
--- csw/mgar/pkg/mtwrite/trunk/checksums	2011-08-18 22:19:50 UTC (rev 15376)
+++ csw/mgar/pkg/mtwrite/trunk/checksums	2011-08-19 07:53:35 UTC (rev 15377)
@@ -1,4 +1 @@
-38d741f25b39df66bc3a76ad9ca3a564  0001-Use-man3-and-skip-intermediate-lib-dir.patch
-acf7c038a96e406fae02714e721fbeb1  0002-Hardcode-library-position.patch
-62a7d62f1a70e72686dcd6c84cb48717  0003-Fix-path-in-manpage.patch
-d1bf9be5af47ac77f9308e9849453057  mtwrite-r90214.tgz
+1eadb3e36f0b10b8616b56be1c3c2112  mtwrite-r100528.tgz

Deleted: csw/mgar/pkg/mtwrite/trunk/files/0001-Use-man3-and-skip-intermediate-lib-dir.patch
===================================================================
--- csw/mgar/pkg/mtwrite/trunk/files/0001-Use-man3-and-skip-intermediate-lib-dir.patch	2011-08-18 22:19:50 UTC (rev 15376)
+++ csw/mgar/pkg/mtwrite/trunk/files/0001-Use-man3-and-skip-intermediate-lib-dir.patch	2011-08-19 07:53:35 UTC (rev 15377)
@@ -1,28 +0,0 @@
-From 754fc5773a38db0d2a2196c378fbe4a125628ee5 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen 
-Date: Wed, 5 May 2010 12:33:48 +0200
-Subject: [PATCH 1/2] Use man3 and skip intermediate lib dir
-
----
- Makefile |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 822d63d..d62261d 100644
---- a/Makefile
-+++ b/Makefile
-@@ -31,8 +31,8 @@ clean:
- 
- install: mtwrite.so
- 	-$(MKDIR) $(PREFIX)/bin
--	-$(MKDIR) $(PREFIX)/lib/$(OS)-$(MACH)
--	-$(MKDIR) $(PREFIX)/share/man/man1
--	$(CP) mtwrite.so $(PREFIX)/lib/$(OS)-$(MACH)
-+	-$(MKDIR) $(PREFIX)/lib
-+	-$(MKDIR) $(PREFIX)/share/man/man3
-+	$(CP) mtwrite.so $(PREFIX)/lib
- 	$(CP) mttar mtcp mtgtar mtstar mtunzip $(PREFIX)/bin
- 	$(CP) mtwrite.3 $(PREFIX)/share/man/man3
--- 
-1.7.0
-

Modified: csw/mgar/pkg/mtwrite/trunk/files/0002-Hardcode-library-position.patch
===================================================================
--- csw/mgar/pkg/mtwrite/trunk/files/0002-Hardcode-library-position.patch	2011-08-18 22:19:50 UTC (rev 15376)
+++ csw/mgar/pkg/mtwrite/trunk/files/0002-Hardcode-library-position.patch	2011-08-19 07:53:35 UTC (rev 15377)
@@ -1,22 +1,21 @@
-From 252a4e3086661f851e90ea32690ca734548a015b Mon Sep 17 00:00:00 2001
+From c3cecb517aad9f2d69df2b4c9898ec0306b4ff76 Mon Sep 17 00:00:00 2001
 From: Dagobert Michelsen 
-Date: Wed, 5 May 2010 12:34:13 +0200
-Subject: [PATCH 2/2] Hardcode library position
+Date: Sat, 22 May 2010 22:16:52 +0200
+Subject: [PATCH] Hardcode library position
 
 ---
  mtcp    |    3 +--
  mtgtar  |    3 +--
  mtstar  |    3 +--
- mttar   |    3 +--
  mtunzip |    3 +--
- 5 files changed, 5 insertions(+), 10 deletions(-)
+ 4 files changed, 4 insertions(+), 8 deletions(-)
 
 diff --git a/mtcp b/mtcp
-index 5e9a373..a6d7aa6 100755
+index 456ef54..431fe6d 100755
 --- a/mtcp
 +++ b/mtcp
 @@ -1,6 +1,5 @@
- #!/bin/ksh
+ #!/bin/sh
 -INSTALLDIR=`dirname $0`/../lib
 -LD_PRELOAD=$INSTALLDIR/`uname -s`-`uname -m`/mtwrite.so
 +LD_PRELOAD=/opt/csw/lib/mtwrite.so
@@ -24,11 +23,11 @@
  MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=32}		# default
  MTWRITE_MEMPERTHREAD=${MTWRITE_MEMPERTHREAD:=16M}	# default
 diff --git a/mtgtar b/mtgtar
-index b56399c..f697ebc 100755
+index 0e6e129..5a0fe40 100755
 --- a/mtgtar
 +++ b/mtgtar
 @@ -1,6 +1,5 @@
- #!/bin/ksh
+ #!/bin/sh
 -INSTALLDIR=`dirname $0`/../lib
 -LD_PRELOAD=$INSTALLDIR/`uname -s`-`uname -m`/mtwrite.so
 +LD_PRELOAD=/opt/csw/lib/mtwrite.so
@@ -36,35 +35,23 @@
  MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=32}		# default
  MTWRITE_MEMPERTHREAD=${MTWRITE_MEMPERTHREAD:=16M}	# default
 diff --git a/mtstar b/mtstar
-index ed37a89..ab40828 100755
+index 63d5002..64de85a 100755
 --- a/mtstar
 +++ b/mtstar
 @@ -1,6 +1,5 @@
- #!/bin/ksh
+ #!/bin/sh
 -INSTALLDIR=`dirname $0`/../lib
 -LD_PRELOAD=$INSTALLDIR/`uname -s`-`uname -m`/mtwrite.so
 +LD_PRELOAD=/opt/csw/lib/mtwrite.so
  MTWRITE_VERBOSE=${MTWRITE_VERBOSE:=1}			# default
  MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=32}		# default
  MTWRITE_MEMPERTHREAD=${MTWRITE_MEMPERTHREAD:=16M}	# default
-diff --git a/mttar b/mttar
-index ec45cec..90c85ee 100755
---- a/mttar
-+++ b/mttar
-@@ -1,6 +1,5 @@
- #!/bin/ksh
--INSTALLDIR=`dirname $0`/../lib
--LD_PRELOAD=${LD_PRELOAD:-}:$INSTALLDIR/`uname -s`-`uname -m`/mtwrite.so
-+LD_PRELOAD=/opt/csw/lib/mtwrite.so
- MTWRITE_VERBOSE=${MTWRITE_VERBOSE:=1}			# default
- MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=32}		# default
- MTWRITE_MEMPERTHREAD=${MTWRITE_MEMPERTHREAD:=16M}	# default
 diff --git a/mtunzip b/mtunzip
-index 1763686..a2f6b62 100755
+index db4e93f..8e4ead4 100755
 --- a/mtunzip
 +++ b/mtunzip
 @@ -1,6 +1,5 @@
- #!/bin/ksh
+ #!/bin/sh
 -INSTALLDIR=`dirname $0`/../lib
 -LD_PRELOAD=$INSTALLDIR/`uname -s`-`uname -m`/mtwrite.so
 +LD_PRELOAD=/opt/csw/lib/mtwrite.so
@@ -72,5 +59,5 @@
  MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=32}		# default
  MTWRITE_MEMPERTHREAD=${MTWRITE_MEMPERTHREAD:=16M}	# default
 -- 
-1.7.0
+1.7.1
 

Deleted: csw/mgar/pkg/mtwrite/trunk/files/0003-Fix-path-in-manpage.patch
===================================================================
--- csw/mgar/pkg/mtwrite/trunk/files/0003-Fix-path-in-manpage.patch	2011-08-18 22:19:50 UTC (rev 15376)
+++ csw/mgar/pkg/mtwrite/trunk/files/0003-Fix-path-in-manpage.patch	2011-08-19 07:53:35 UTC (rev 15377)
@@ -1,25 +0,0 @@
-From ee74ce1c6c6833f2599dbf57f4ba51ab2610fd14 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen 
-Date: Wed, 5 May 2010 12:56:17 +0200
-Subject: [PATCH 3/3] Fix path in manpage
-
----
- mtwrite.3 |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/mtwrite.3 b/mtwrite.3
-index da61094..9fd8282 100644
---- a/mtwrite.3
-+++ b/mtwrite.3
-@@ -45,7 +45,7 @@ to include
- for use with a program of your choice. You may want to take a look at
- the supplied wrapper scripts to learn how to write your own.
- .SH EXAMPLE
--env LD_PRELOAD=/usr/local/lib/mtwrite.so cp -r /home/me/mystuff /backup
-+env LD_PRELOAD=/opt/csw/lib/mtwrite.so cp -r /home/me/mystuff /backup
- .SH "ENVIRONMENT VARIABLES"
- .TP
- .B MTWRITE_VERBOSE
--- 
-1.7.0
-


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 Aug 19 10:18:38 2011
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 19 Aug 2011 08:18:38 +0000
Subject: [csw-devel] SF.net SVN: gar:[15378] csw/mgar/pkg/pcre/trunk
Message-ID: 

Revision: 15378
          http://gar.svn.sourceforge.net/gar/?rev=15378&view=rev
Author:   dmichelsen
Date:     2011-08-19 08:18:38 +0000 (Fri, 19 Aug 2011)

Log Message:
-----------
pcre: Update to 8.13

Modified Paths:
--------------
    csw/mgar/pkg/pcre/trunk/Makefile
    csw/mgar/pkg/pcre/trunk/checksums
    csw/mgar/pkg/pcre/trunk/files/0001-Allow-norunpath-for-libtool.patch

Modified: csw/mgar/pkg/pcre/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pcre/trunk/Makefile	2011-08-19 07:53:35 UTC (rev 15377)
+++ csw/mgar/pkg/pcre/trunk/Makefile	2011-08-19 08:18:38 UTC (rev 15378)
@@ -1,5 +1,5 @@
 NAME = pcre
-VERSION = 8.12
+VERSION = 8.13
 CATEGORIES = lib
 
 DESCRIPTION = Perl-compatible regular expression tools
@@ -11,77 +11,74 @@
 endef
 
 MASTER_SITES = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
-DISTFILES  = $(NAME)-$(VERSION).tar.bz2
+DISTFILES  = $(DISTNAME).tar.bz2
 PATCHFILES = 0001-Allow-norunpath-for-libtool.patch
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
-
 VENDOR_URL = http://www.pcre.org
 
-BUILD_DEP_PKGS = CSWgnulinks
-
 PACKAGES = CSWpcre
 CATALOGNAME_CSWpcre = pcre
 SPKG_DESC_CSWpcre = Perl-compatible regular expression tools
-RUNTIME_DEP_PKGS_CSWpcre += CSWreadline
+RUNTIME_DEP_PKGS_CSWpcre += CSWlibreadline6
 RUNTIME_DEP_PKGS_CSWpcre += CSWlibpcre0
-RUNTIME_DEP_PKGS_CSWpcre += CSWbzip2
-RUNTIME_DEP_PKGS_CSWpcre += CSWzlib
+RUNTIME_DEP_PKGS_CSWpcre += CSWlibbz2-1-0
+RUNTIME_DEP_PKGS_CSWpcre += CSWlibz1
 RUNTIME_DEP_PKGS_CSWpcre += CSWlibpcreposix0
 
-PACKAGES += CSWpcrert
-CATALOGNAME_CSWpcrert = pcre_rt
-SPKG_DESC_CSWpcrert = Legacy stub as contents was moved to libpcre0, libpcrecpp0 and libpcreposix0
-PKGFILES_CSWpcrert = NOFILES
-RUNTIME_DEP_PKGS_CSWpcrert = CSWlibpcre0 CSWlibpcrecpp0 CSWlibpcreposix0
-# This is a legacy lib, force dependencies to new libraries
-CHECKPKG_OVERRIDES_CSWpcrert += surplus-dependency|CSWlibpcrecpp0
-CHECKPKG_OVERRIDES_CSWpcrert += surplus-dependency|CSWlibpcreposix0
-CHECKPKG_OVERRIDES_CSWpcrert += surplus-dependency|CSWlibpcre0
-ARCHALL_CSWpcrert = 1
+PACKAGES += CSWlibpcre-dev
+SPKG_DESC_CSWlibpcre-dev = Development files for libpcre.so.0, libpcrecpp.so.0 and libpcreposix.so.0
+RUNTIME_DEP_PKGS_CSWlibpcre-dev += CSWlibpcre0
+RUNTIME_DEP_PKGS_CSWlibpcre-dev += CSWlibpcreposix0
+RUNTIME_DEP_PKGS_CSWlibpcre-dev += CSWlibpcrecpp0
+PKGFILES_CSWlibpcre-dev += $(PKGFILES_DEVEL)
+PKGFILES_CSWlibpcre-dev += $(docdir)/.*
+OBSOLETED_BY_CSWlibpcre-dev += CSWpcre-devel
+# Leave these in the docs for now
+CHECKPKG_OVERRIDES_CSWlibpcre-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/pcre/pcre-config.txt
+CHECKPKG_OVERRIDES_CSWlibpcre-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/pcre/pcre.txt
+CHECKPKG_OVERRIDES_CSWlibpcre-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/pcre/README
+CHECKPKG_OVERRIDES_CSWlibpcre-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/pcre/html/pcre-config.html
+CHECKPKG_OVERRIDES_CSWlibpcre-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/pcre/html/pcresample.html
+CHECKPKG_OVERRIDES_CSWlibpcre-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/pcre/html/pcredemo.html
 
-PACKAGES += CSWpcre-devel
-CATALOGNAME_CSWpcre-devel = pcre_devel
-SPKG_DESC_CSWpcre-devel = Development files for PCRE
-RUNTIME_DEP_PKGS_CSWpcre-devel += CSWlibpcre0
-RUNTIME_DEP_PKGS_CSWpcre-devel += CSWlibpcreposix0
-RUNTIME_DEP_PKGS_CSWpcre-devel += CSWlibpcrecpp0
-PKGFILES_CSWpcre-devel = $(PKGFILES_DEVEL)
-
 PACKAGES += CSWlibpcre0
 CATALOGNAME_CSWlibpcre0 = libpcre0
 SPKG_DESC_CSWlibpcre0 = Perl-compatible regular expression tools, libpcre.so.0
-PKGFILES_CSWlibpcre0 = $(call baseisadirs,$(libdir),libpcre\.so\.0(\.\d+)*)
+PKGFILES_CSWlibpcre0 = $(call pkgfiles_lib,libpcre.so.0)
+OBSOLETED_BY_CSWlibpcre0 += CSWpcrert
+CATALOGNAME_CSWpcrert = pcre_rt_stub
 
 PACKAGES += CSWlibpcrecpp0
 CATALOGNAME_CSWlibpcrecpp0 = libpcrecpp0
 SPKG_DESC_CSWlibpcrecpp0 += Perl-compatible regular expression tools, libpcrecpp.so.0
-PKGFILES_CSWlibpcrecpp0 += $(call baseisadirs,$(libdir),libpcrecpp\.so\.0(\.\d+)*)
+PKGFILES_CSWlibpcrecpp0 += $(call pkgfiles_lib,libpcrecpp.so.0)
 RUNTIME_DEP_PKGS_CSWlibpcrecpp0 += CSWlibpcre0
+OBSOLETED_BY_CSWlibpcrecpp0 += CSWpcrert
 
 PACKAGES += CSWlibpcreposix0
 CATALOGNAME_CSWlibpcreposix0 = libpcreposix0
 SPKG_DESC_CSWlibpcreposix0 += Perl-compatible regular expression tools, libpcreposix.so.0
-PKGFILES_CSWlibpcreposix0 += $(call baseisadirs,$(libdir),libpcreposix\.so\.0(\.\d+)*)
+PKGFILES_CSWlibpcreposix0 += $(call pkgfiles_lib,libpcreposix.so.0)
 RUNTIME_DEP_PKGS_CSWlibpcreposix0 += CSWlibpcre0
+OBSOLETED_BY_CSWlibpcreposix0 += CSWpcrert
 
 BUILD64 = 1
-NOISAEXEC = 1
 
+EXTRA_LINKER_FLAGS = -norunpath
+
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-unicode-properties
 CONFIGURE_ARGS += --enable-pcregrep-libz
 CONFIGURE_ARGS += --enable-pcregrep-libbz2
 CONFIGURE_ARGS += --enable-pcretest-libreadline
 
-TEST_TARGET = check
-
-MERGE_SCRIPTS_isa-extra = copy-relocated-only copy-config-only
-MERGE_DIRS_isa-extra = $(libdir)
-
 include gar/category.mk
 
 # The testcases need 'diff -u' which Solaris 8 diff does not have,
 # but we need Solaris strip, otherwise pcregrep is broken and 200m in size...
 PATH := /usr/ccs/bin:/opt/csw/gnu:$(PATH)
+
+post-install-modulated:
+	perl -pi -e 's,/usr/local,$(prefix),g' \
+		$(DESTDIR)$(mandir)/man3/pcresample.3 \
+		$(DESTDIR)$(mandir)/man1/pcre-config.1

Modified: csw/mgar/pkg/pcre/trunk/checksums
===================================================================
--- csw/mgar/pkg/pcre/trunk/checksums	2011-08-19 07:53:35 UTC (rev 15377)
+++ csw/mgar/pkg/pcre/trunk/checksums	2011-08-19 08:18:38 UTC (rev 15378)
@@ -1 +1 @@
-f14a9fef3c92f3fc6c5ac92d7a2c7eb3  pcre-8.12.tar.bz2
+5e595edbcded141813fa1a10dbce05cb  pcre-8.13.tar.bz2

Modified: csw/mgar/pkg/pcre/trunk/files/0001-Allow-norunpath-for-libtool.patch
===================================================================
--- csw/mgar/pkg/pcre/trunk/files/0001-Allow-norunpath-for-libtool.patch	2011-08-19 07:53:35 UTC (rev 15377)
+++ csw/mgar/pkg/pcre/trunk/files/0001-Allow-norunpath-for-libtool.patch	2011-08-19 08:18:38 UTC (rev 15378)
@@ -1,6 +1,6 @@
-From a023da4c69da0ad9f922764b0701762c7e6c53d6 Mon Sep 17 00:00:00 2001
+From af449151a800845da508097fb85bae299b2e15ab Mon Sep 17 00:00:00 2001
 From: Dagobert Michelsen 
-Date: Mon, 3 Jan 2011 15:04:02 +0100
+Date: Tue, 16 Aug 2011 17:12:43 +0200
 Subject: [PATCH] Allow -norunpath for libtool
 
 ---
@@ -8,18 +8,18 @@
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/ltmain.sh b/ltmain.sh
-index 04eaea4..fd4ac68 100755
+index 3061e3c..5817d54 100755
 --- a/ltmain.sh
 +++ b/ltmain.sh
-@@ -5091,7 +5091,7 @@ func_mode_link ()
-       # @file                GCC response files
-       # -tp=*                Portland pgcc target processor selection
+@@ -5840,7 +5840,7 @@ func_mode_link ()
+       # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
        -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|-norunpath)
+       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+-      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
++      -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-norunpath)
          func_quote_for_eval "$arg"
  	arg="$func_quote_for_eval_result"
          func_append compile_command " $arg"
 -- 
-1.7.3.2
+1.7.6
 


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

From wahwah at users.sourceforge.net  Fri Aug 19 10:32:03 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Fri, 19 Aug 2011 08:32:03 +0000
Subject: [csw-devel] SF.net SVN: gar:[15379]
	csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
Message-ID: 

Revision: 15379
          http://gar.svn.sourceforge.net/gar/?rev=15379&view=rev
Author:   wahwah
Date:     2011-08-19 08:32:03 +0000 (Fri, 19 Aug 2011)

Log Message:
-----------
pkg/gcc4/branches/bootstrap-4.6: a conflict with CSWbinutils

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile

Modified: csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-19 08:18:38 UTC (rev 15378)
+++ csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-19 08:32:03 UTC (rev 15379)
@@ -174,6 +174,9 @@
 CHECKPKG_OVERRIDES_CSWgcc4objc += file-collision|/opt/csw/lib/sparcv9/libobjc.so|CSWgcc3objcrt|CSWgcc4objc
 CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/lib-gnu-awt-xlib.so|CSWgcc3javart|CSWgcc4core
 
+# CSWbinutils could be rebuilt
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/libiberty.a|CSWbinutils|CSWgcc4core
+
 # Some static libraries are required to build binaries with gcc, for example
 # libgcc.a and libgcc_eh.a. Otherwise: ld: fatal: library -lgcc: not found
 MERGE_EXCLUDE_LIBTOOL =


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

From wahwah at users.sourceforge.net  Fri Aug 19 10:57:47 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Fri, 19 Aug 2011 08:57:47 +0000
Subject: [csw-devel] SF.net SVN: gar:[15380]
	csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
Message-ID: 

Revision: 15380
          http://gar.svn.sourceforge.net/gar/?rev=15380&view=rev
Author:   wahwah
Date:     2011-08-19 08:57:47 +0000 (Fri, 19 Aug 2011)

Log Message:
-----------
pkg/gcc4/branches/bootstrap-4.6: let binutils provide libiberty.a

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile

Modified: csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-19 08:32:03 UTC (rev 15379)
+++ csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-19 08:57:47 UTC (rev 15380)
@@ -174,13 +174,11 @@
 CHECKPKG_OVERRIDES_CSWgcc4objc += file-collision|/opt/csw/lib/sparcv9/libobjc.so|CSWgcc3objcrt|CSWgcc4objc
 CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/lib-gnu-awt-xlib.so|CSWgcc3javart|CSWgcc4core
 
-# CSWbinutils could be rebuilt
-CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/libiberty.a|CSWbinutils|CSWgcc4core
-
 # Some static libraries are required to build binaries with gcc, for example
 # libgcc.a and libgcc_eh.a. Otherwise: ld: fatal: library -lgcc: not found
 MERGE_EXCLUDE_LIBTOOL =
 MERGE_EXCLUDE_STATICLIBS =
+EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/libiberty\.a
 
 # Catch-all package
 


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

From maciej at opencsw.org  Fri Aug 19 13:34:55 2011
From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=)
Date: Fri, 19 Aug 2011 12:34:55 +0100
Subject: [csw-devel] psuedo sketch of web and mantis automation
In-Reply-To: <1313717595-sup-109@pinkfloyd.chass.utoronto.ca>
References: <1313717595-sup-109@pinkfloyd.chass.utoronto.ca>
Message-ID: 

2011/8/19 Ben Walton :
> Anyway, pseudo code. ?Any obvious issues?

Looks good overall, but I haven't tried hard to think about corner cases yet.

On a general note, there are 3 kinds of renames:

1. Both pkgname and catalogname change, e.g. CSWfoodev/foodev ?
CSWfoo-dev/foo_dev
2. Only the catalogname changes (CSWfoo-dev/foodev ? CSWfoo-dev/foo_dev)
3. Only the pkgname changes (CSWfoodev/foo_dev ? CSWfoo-dev/foo_dev)

I understand that the rename scenario outlined in your code takes care
of the scenario #1. What about the other two?

Maciej

From dmichelsen at users.sourceforge.net  Fri Aug 19 13:59:57 2011
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 19 Aug 2011 11:59:57 +0000
Subject: [csw-devel] SF.net SVN: gar:[15381] csw/mgar/pkg/zlib/trunk/Makefile
Message-ID: 

Revision: 15381
          http://gar.svn.sourceforge.net/gar/?rev=15381&view=rev
Author:   dmichelsen
Date:     2011-08-19 11:59:57 +0000 (Fri, 19 Aug 2011)

Log Message:
-----------
zlib: Adjust name of devel package

Modified Paths:
--------------
    csw/mgar/pkg/zlib/trunk/Makefile

Modified: csw/mgar/pkg/zlib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/zlib/trunk/Makefile	2011-08-19 08:57:47 UTC (rev 15380)
+++ csw/mgar/pkg/zlib/trunk/Makefile	2011-08-19 11:59:57 UTC (rev 15381)
@@ -27,7 +27,7 @@
 PKGFILES_CSWlibz1 = $(call pkgfiles_lib,libz.so.1)
 OBSOLETED_BY_CSWlibz1 = CSWzlib
 
-PACKAGES += CSWzlib-dev
+PACKAGES += CSWlibz-dev
 SPKG_DESC_CSWzlib-dev = Development files for libz.so.1
 # PKGFILES is catchall
 RUNTIME_DEP_PKGS_CSWzlib-dev = CSWlibz1


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 Aug 19 14:01:12 2011
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 19 Aug 2011 12:01:12 +0000
Subject: [csw-devel] SF.net SVN: gar:[15382] csw/mgar/pkg/zlib/trunk/Makefile
Message-ID: 

Revision: 15382
          http://gar.svn.sourceforge.net/gar/?rev=15382&view=rev
Author:   dmichelsen
Date:     2011-08-19 12:01:12 +0000 (Fri, 19 Aug 2011)

Log Message:
-----------
zlib: Adjust name of devel package

Modified Paths:
--------------
    csw/mgar/pkg/zlib/trunk/Makefile

Modified: csw/mgar/pkg/zlib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/zlib/trunk/Makefile	2011-08-19 11:59:57 UTC (rev 15381)
+++ csw/mgar/pkg/zlib/trunk/Makefile	2011-08-19 12:01:12 UTC (rev 15382)
@@ -28,9 +28,9 @@
 OBSOLETED_BY_CSWlibz1 = CSWzlib
 
 PACKAGES += CSWlibz-dev
-SPKG_DESC_CSWzlib-dev = Development files for libz.so.1
+SPKG_DESC_CSWlibz-dev = Development files for libz.so.1
 # PKGFILES is catchall
-RUNTIME_DEP_PKGS_CSWzlib-dev = CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibz-dev = CSWlibz1
 
 BUILD64 = 1
 


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

From bonivart at users.sourceforge.net  Fri Aug 19 15:56:52 2011
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Fri, 19 Aug 2011 13:56:52 +0000
Subject: [csw-devel] SF.net SVN: gar:[15383] csw/mgar/pkg/dhcp/trunk/Makefile
Message-ID: 

Revision: 15383
          http://gar.svn.sourceforge.net/gar/?rev=15383&view=rev
Author:   bonivart
Date:     2011-08-19 13:56:52 +0000 (Fri, 19 Aug 2011)

Log Message:
-----------
dhcp/trunk: remove dep to ssl

Modified Paths:
--------------
    csw/mgar/pkg/dhcp/trunk/Makefile

Modified: csw/mgar/pkg/dhcp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dhcp/trunk/Makefile	2011-08-19 12:01:12 UTC (rev 15382)
+++ csw/mgar/pkg/dhcp/trunk/Makefile	2011-08-19 13:56:52 UTC (rev 15383)
@@ -22,7 +22,6 @@
 LICENSE = LICENSE
 
 PACKAGES += CSWdhcp
-RUNTIME_DEP_PKGS_CSWdhcp = CSWosslrt
 SPKG_DESC_CSWdhcp = ISC DHCP reference implementation
 
 PACKAGES += CSWdhcp-dev


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

From bonivart at users.sourceforge.net  Fri Aug 19 16:14:33 2011
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Fri, 19 Aug 2011 14:14:33 +0000
Subject: [csw-devel] SF.net SVN: gar:[15384] csw/mgar/pkg/dhcp/trunk/Makefile
Message-ID: 

Revision: 15384
          http://gar.svn.sourceforge.net/gar/?rev=15384&view=rev
Author:   bonivart
Date:     2011-08-19 14:14:33 +0000 (Fri, 19 Aug 2011)

Log Message:
-----------
dhcp/trunk: remove override

Modified Paths:
--------------
    csw/mgar/pkg/dhcp/trunk/Makefile

Modified: csw/mgar/pkg/dhcp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dhcp/trunk/Makefile	2011-08-19 13:56:52 UTC (rev 15383)
+++ csw/mgar/pkg/dhcp/trunk/Makefile	2011-08-19 14:14:33 UTC (rev 15384)
@@ -51,8 +51,6 @@
 
 SPKG_SOURCEURL = https://www.isc.org/software/dhcp
 
-CHECKPKG_OVERRIDES_CSWdhcp += surplus-dependency|CSWosslrt
-
 include gar/category.mk
 
 install-custom:


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

From bwalton at opencsw.org  Sat Aug 20 03:30:46 2011
From: bwalton at opencsw.org (Ben Walton)
Date: Fri, 19 Aug 2011 21:30:46 -0400
Subject: [csw-devel] psuedo sketch of web and mantis automation
In-Reply-To: 
References: <1313717595-sup-109@pinkfloyd.chass.utoronto.ca>
	
Message-ID: <1313802712-sup-5904@pinkfloyd.chass.utoronto.ca>

Excerpts from Maciej Blizi?ski's message of Fri Aug 19 07:34:55 -0400 2011:

> 1. Both pkgname and catalogname change, e.g. CSWfoodev/foodev ?
> CSWfoo-dev/foo_dev
> 2. Only the catalogname changes (CSWfoo-dev/foodev ? >
> CSWfoo-dev/foo_dev)

As far as the catalog diff engine is concerned, both of these are the
same.  They'll appear as the drop of one package and the addition of a
new one.  The special case of _stub packages is handled in the pseudo
code.  The general case would require doing a reverse index of package
names.  The _stub handling rename detection could be extended to:

* Build a package to catalog map, based on previous catalog, of every
  package we're going to alter.
* Do the same for the new catalog.
* Iterate through new packages and see if the package name exists in
  the old catalog.
* If we 'hit' in the index, add [p, q] to the rename list and remove
  them from the new and remove lists.

We'd still want to filter stubs to a separate list first as those
packages shouldn't be displayed in the web db or mantis.

> 3. Only the pkgname changes (CSWfoodev/foo_dev ? CSWfoo-dev/foo_dev)

This should be handled by an update operation.  As things are keyed on
the catalog name, a change (based on version comparison) will trigger
a refresh of file list, maintainer name, etc.  Mantis cares not about
package name so that won't be a problem.

Reasonable?

Thanks
-Ben
--
Ben Walton
Systems Programmer - CHASS
University of Toronto
C:416.407.5610 | W:416.978.4302


From wahwah at users.sourceforge.net  Sat Aug 20 10:31:15 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sat, 20 Aug 2011 08:31:15 +0000
Subject: [csw-devel] SF.net SVN: gar:[15385]
	csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
Message-ID: 

Revision: 15385
          http://gar.svn.sourceforge.net/gar/?rev=15385&view=rev
Author:   wahwah
Date:     2011-08-20 08:31:14 +0000 (Sat, 20 Aug 2011)

Log Message:
-----------
pkg/gcc4/branches/bootstrap-4.6: a fix for libgfortran3 deps, CFLAGS_FOR_TARGET only for sparc

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile

Modified: csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-19 14:14:33 UTC (rev 15384)
+++ csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-20 08:31:14 UTC (rev 15385)
@@ -90,8 +90,10 @@
 
 # These flags are passed when gcc is built with gcc.
 # Needed to remove FLAVOR_FLAGS, because they were Sun Studio specific.
-CFLAGS_FOR_TARGET = -O2 $(ARCHFLAGS_GCC4_$(ISA)) $(EXTRA_GCC4_CC_FLAGS) $(EXTRA_GCC_CC_FLAGS) $(EXTRA_CC_FLAGS)
-CXXFLAGS_FOR_TARGET = -O2 $(ARCHFLAGS_GCC4_$(ISA)) $(EXTRA_GCC4_CXX_FLAGS) $(EXTRA_GCC_CXX_FLAGS) $(EXTRA_CXX_FLAGS)
+CFLAGS_FOR_TARGET_sparc = -O2 $(ARCHFLAGS_GCC4_$(ISA)) $(EXTRA_GCC4_CC_FLAGS) $(EXTRA_GCC_CC_FLAGS) $(EXTRA_CC_FLAGS)
+CXXFLAGS_FOR_TARGET_sparc = -O2 $(ARCHFLAGS_GCC4_$(ISA)) $(EXTRA_GCC4_CXX_FLAGS) $(EXTRA_GCC_CXX_FLAGS) $(EXTRA_CXX_FLAGS)
+CFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET_$(GARCH))
+CXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET_$(GARCH))
 EXTRA_EXPORTS += CFLAGS_FOR_TARGET
 EXTRA_EXPORTS += CXXFLAGS_FOR_TARGET
 
@@ -277,7 +279,7 @@
 RUNTIME_DEP_PKGS_CSWgcc4core_i386 += CSWlibquadmath0
 RUNTIME_DEP_PKGS_CSWlibgfortran3_i386 += CSWlibquadmath0
 RUNTIME_DEP_PKGS_CSWgcc4core += $(RUNTIME_DEP_PKGS_CSWgcc4core_$(GARCH))
-RUNTIME_DEP_PKGS_CSWgcc4libgfortran3 += $(RUNTIME_DEP_PKGS_CSWgcc4libgfortran3_$(GARCH))
+RUNTIME_DEP_PKGS_CSWlibgfortran3 += $(RUNTIME_DEP_PKGS_CSWlibgfortran3_$(GARCH))
 
 PACKAGES += CSWgcc4g++
 CATALOGNAME_CSWgcc4g++ = gcc4g++


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

From wahwah at users.sourceforge.net  Sat Aug 20 22:42:53 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sat, 20 Aug 2011 20:42:53 +0000
Subject: [csw-devel] SF.net SVN: gar:[15386]
	csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
Message-ID: 

Revision: 15386
          http://gar.svn.sourceforge.net/gar/?rev=15386&view=rev
Author:   wahwah
Date:     2011-08-20 20:42:52 +0000 (Sat, 20 Aug 2011)

Log Message:
-----------
pkg/gcc4/branches/bootstrap-4.6: add a file to the fortran package, remove CFLAGS for i386

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile

Modified: csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-20 08:31:14 UTC (rev 15385)
+++ csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-20 20:42:52 UTC (rev 15386)
@@ -97,6 +97,11 @@
 EXTRA_EXPORTS += CFLAGS_FOR_TARGET
 EXTRA_EXPORTS += CXXFLAGS_FOR_TARGET
 
+ifeq ($(MODULATION),isa-i386)
+CFLAGS =
+CXXFLAGS =
+endif
+
 # Might be necessary, but CFLAGS_FOR_TARGET seem to be enough for now.
 # BOOT_CFLAGS = $(CFLAGS_FOR_TARGET)
 # EXTRA_EXPORTS += BOOT_FLAGS
@@ -312,6 +317,7 @@
 RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibmpc2
 RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibz1
 PKGFILES_CSWgcc4gfortran  = $(bindir)/gfortran
+PKGFILES_CSWgcc4gfortran += $(bindir)/sparc-sun-solaris2.10-gfortran
 PKGFILES_CSWgcc4gfortran += $(libdir)/.*libgfortran.*a
 PKGFILES_CSWgcc4gfortran += $(libexecdir)/.*f951
 PKGFILES_CSWgcc4gfortran += $(mandir)/.*gfortran.1


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 Aug 21 00:52:13 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sat, 20 Aug 2011 22:52:13 +0000
Subject: [csw-devel] SF.net SVN: gar:[15387] csw/mgar/gar/v2/lib/python
Message-ID: 

Revision: 15387
          http://gar.svn.sourceforge.net/gar/?rev=15387&view=rev
Author:   wahwah
Date:     2011-08-20 22:52:13 +0000 (Sat, 20 Aug 2011)

Log Message:
-----------
checkpkg: Check dangling hardlinks as well

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/python/package_checks.py
    csw/mgar/gar/v2/lib/python/package_checks_test.py

Modified: csw/mgar/gar/v2/lib/python/package_checks.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks.py	2011-08-20 20:42:52 UTC (rev 15386)
+++ csw/mgar/gar/v2/lib/python/package_checks.py	2011-08-20 22:52:13 UTC (rev 15387)
@@ -1203,11 +1203,14 @@
   for pkgmap_entry in pkg_data["pkgmap"]:
     if "path" not in pkgmap_entry: continue
     if not pkgmap_entry["path"]: continue
-    if pkgmap_entry["type"] == "s":
+    if pkgmap_entry["type"] in ("s", "l"):
+      link_type = "symlink"
+      if pkgmap_entry["type"] == "l":
+        link_type = "hardling"
       error_mgr.NeedFile(
           pkgmap_entry["target"],
-          "%s contains a symlink (%s) which needs the target file: %s."
-          % (pkgname, repr(pkgmap_entry["path"]), repr(pkgmap_entry["target"])))
+          "%s contains a %s (%s) which needs the target file: %s."
+          % (link_type, pkgname, repr(pkgmap_entry["path"]), repr(pkgmap_entry["target"])))
 
 
 def CheckPrefixDirs(pkg_data, error_mgr, logger, messenger):

Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks_test.py	2011-08-20 20:42:52 UTC (rev 15386)
+++ csw/mgar/gar/v2/lib/python/package_checks_test.py	2011-08-20 22:52:13 UTC (rev 15387)
@@ -1649,7 +1649,24 @@
          'target': '/opt/csw/lib/libpq.so.5'})
     self.error_mgr_mock.NeedFile('/opt/csw/lib/libpq.so.5', mox.IsA(str))
 
+  # Hardlinks work the same way.
+  def CheckpkgTest2(self):
+    self.pkg_data = copy.deepcopy(tree_stats[0])
+    self.pkg_data["pkgmap"].append(
+        {'class': 'none',
+         'group': None,
+         'line': None,
+         'mode': None,
+         'path': '/opt/csw/lib/postgresql/9.0/lib/libpq.so.5',
+         'type': 'l',
+         'user': None,
+         'target': '/opt/csw/lib/libpq.so.5'})
+    self.error_mgr_mock.NeedFile('/opt/csw/lib/libpq.so.5', mox.IsA(str))
 
+  def testTwo(self):
+    self.RunCheckpkgTest(self.CheckpkgTest2)
+
+
 class TestCheckPrefixDirs(CheckpkgUnitTestHelper,
                           unittest.TestCase):
   FUNCTION_NAME = 'CheckPrefixDirs'


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 Aug 21 07:05:51 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 21 Aug 2011 05:05:51 +0000
Subject: [csw-devel] SF.net SVN: gar:[15388]
	csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
Message-ID: 

Revision: 15388
          http://gar.svn.sourceforge.net/gar/?rev=15388&view=rev
Author:   wahwah
Date:     2011-08-21 05:05:51 +0000 (Sun, 21 Aug 2011)

Log Message:
-----------
pkg/gcc4/branches/bootstrap-4.6: unset fortran flags too

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile

Modified: csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-20 22:52:13 UTC (rev 15387)
+++ csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-21 05:05:51 UTC (rev 15388)
@@ -97,9 +97,17 @@
 EXTRA_EXPORTS += CFLAGS_FOR_TARGET
 EXTRA_EXPORTS += CXXFLAGS_FOR_TARGET
 
+# The theory goes that the CFLAGS and others cause problems with the multilib
+# builds where 64-bit binaries are built.  This is triggered by the gcc build;
+# the compiler binaries are 32-bit only, but since the compiler can generate
+# 32-bit and 64-bit binaries, the libraries have to be built for both
+# architectures.
 ifeq ($(MODULATION),isa-i386)
 CFLAGS =
 CXXFLAGS =
+FFLAGS =
+FCFLAGS =
+OPTFLAGS =
 endif
 
 # Might be necessary, but CFLAGS_FOR_TARGET seem to be enough for now.


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 Aug 21 07:35:17 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 21 Aug 2011 05:35:17 +0000
Subject: [csw-devel] SF.net SVN: gar:[15389]
	csw/mgar/gar/v2/lib/python/package_checks.py
Message-ID: 

Revision: 15389
          http://gar.svn.sourceforge.net/gar/?rev=15389&view=rev
Author:   wahwah
Date:     2011-08-21 05:35:17 +0000 (Sun, 21 Aug 2011)

Log Message:
-----------
checkpkg: Correcting a typo

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/python/package_checks.py

Modified: csw/mgar/gar/v2/lib/python/package_checks.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks.py	2011-08-21 05:05:51 UTC (rev 15388)
+++ csw/mgar/gar/v2/lib/python/package_checks.py	2011-08-21 05:35:17 UTC (rev 15389)
@@ -1206,7 +1206,7 @@
     if pkgmap_entry["type"] in ("s", "l"):
       link_type = "symlink"
       if pkgmap_entry["type"] == "l":
-        link_type = "hardling"
+        link_type = "hardlink"
       error_mgr.NeedFile(
           pkgmap_entry["target"],
           "%s contains a %s (%s) which needs the target file: %s."


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 Aug 21 07:45:44 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 21 Aug 2011 05:45:44 +0000
Subject: [csw-devel] SF.net SVN: gar:[15390]
	csw/mgar/pkg/lang-python/twisted/trunk
Message-ID: 

Revision: 15390
          http://gar.svn.sourceforge.net/gar/?rev=15390&view=rev
Author:   wahwah
Date:     2011-08-21 05:45:44 +0000 (Sun, 21 Aug 2011)

Log Message:
-----------
pkg/lang-python/twisted/trunk: update to 10.2

Modified Paths:
--------------
    csw/mgar/pkg/lang-python/twisted/trunk/Makefile
    csw/mgar/pkg/lang-python/twisted/trunk/checksums

Modified: csw/mgar/pkg/lang-python/twisted/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/twisted/trunk/Makefile	2011-08-21 05:35:17 UTC (rev 15389)
+++ csw/mgar/pkg/lang-python/twisted/trunk/Makefile	2011-08-21 05:45:44 UTC (rev 15390)
@@ -3,7 +3,7 @@
 # $Id$
 
 NAME = twisted
-MAJ_VERSION = 10.1
+MAJ_VERSION = 10.2
 PATCHLEVEL = 0
 VERSION = $(MAJ_VERSION).$(PATCHLEVEL)
 CATEGORIES = python
@@ -14,24 +14,32 @@
   mail servers, and more.
 endef
 
-PACKAGES      = CSWpy-twisted CSWtwisted
 UPSTREAM_NAME = Twisted
 DISTNAME      = $(UPSTREAM_NAME)-$(VERSION)
 MASTER_SITES  = http://tmrc.mit.edu/mirror/$(NAME)/$(UPSTREAM_NAME)/$(MAJ_VERSION)/
 DISTFILES     = $(DISTNAME).tar.bz2
-UFILES_REGEX  = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
 TEST_SCRIPTS  = 
 LICENSE       = LICENSE
-PKGFILES_CSWtwisted = NONE
-RUNTIME_DEP_PKGS_CSWtwisted = CSWpy-twisted
+
+PACKAGES       = CSWpy-twisted
 RUNTIME_DEP_PKGS_CSWpy-twisted += CSWlibpython2-6-1-0
-SPKG_DESC_CSWtwisted = An event-driven networking engine
-SPKG_DESC_CSWpy-twisted = An empty transitional package
-CATALOGNAME_CSWtwisted = twisted
+RUNTIME_DEP_PKGS_CSWpy-twisted += CSWpy-zope-interface
+SPKG_DESC_CSWpy-twisted = An event-driven networking engine
 CATALOGNAME_CSWpy-twisted = py_twisted
+
+OBSOLETED_BY_CSWpy-twisted = CSWtwisted
+
+ARCHALL_CSWtwisted = 1
+
 # CSWtwisted is now empty, so we need to tell checkpkg that it really needs to
 # depend on these two packages.
-ARCHALL_CSWtwisted = 1
 CHECKPKG_OVERRIDES_CSWtwisted += surplus-dependency|CSWpy-twisted
 CHECKPKG_OVERRIDES_CSWtwisted += surplus-dependency|CSWpython
+CHECKPKG_OVERRIDES_CSWpy-twisted += surplus-dependency|CSWpy-zope-interface
+CHECKPKG_OVERRIDES_CSWpy-twisted += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/twisted/python/_twisted_zsh_stub
+CHECKPKG_OVERRIDES_CSWpy-twisted += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/twisted/tap/ftp.py
+CHECKPKG_OVERRIDES_CSWpy-twisted += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/twisted/conch/unix.py
+CHECKPKG_OVERRIDES_CSWpy-twisted += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/twisted/conch/openssh_compat/factory.py
+CHECKPKG_OVERRIDES_CSWpy-twisted += file-with-bad-content|/usr/share|root/opt/csw/lib/python/site-packages/twisted/scripts/tap2deb.py
+
 include gar/category.mk

Modified: csw/mgar/pkg/lang-python/twisted/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-python/twisted/trunk/checksums	2011-08-21 05:35:17 UTC (rev 15389)
+++ csw/mgar/pkg/lang-python/twisted/trunk/checksums	2011-08-21 05:45:44 UTC (rev 15390)
@@ -1 +1 @@
-04cca97506e830074cffc1965297da3f  Twisted-10.1.0.tar.bz2
+73da62c793269eade8121da336b01ba5  Twisted-10.2.0.tar.bz2


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

From wahwah at users.sourceforge.net  Sun Aug 21 08:14:57 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 21 Aug 2011 06:14:57 +0000
Subject: [csw-devel] SF.net SVN: gar:[15391] csw/mgar/pkg/binutils/trunk
Message-ID: 

Revision: 15391
          http://gar.svn.sourceforge.net/gar/?rev=15391&view=rev
Author:   wahwah
Date:     2011-08-21 06:14:57 +0000 (Sun, 21 Aug 2011)

Log Message:
-----------
pkg/binutils/trunk: it builds with gcc

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

Modified: csw/mgar/pkg/binutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/binutils/trunk/Makefile	2011-08-21 05:45:44 UTC (rev 15390)
+++ csw/mgar/pkg/binutils/trunk/Makefile	2011-08-21 06:14:57 UTC (rev 15391)
@@ -1,5 +1,5 @@
 NAME = binutils
-VERSION = 2.20
+VERSION = 2.21.1
 CATEGORIES = utils
 
 DESCRIPTION = GNU binary utilities: gas, gld, gprof, and others
@@ -11,26 +11,29 @@
 
 # These have been reported as
 #   
-PATCHFILES  = 0001-Remove-gcc-specific-warning-no-error.patch
-PATCHFILES += 0002-Use-func-instead-of-FUNCTION.patch
+# PATCHFILES  = 0001-Remove-gcc-specific-warning-no-error.patch
+# PATCHFILES += 0002-Use-func-instead-of-FUNCTION.patch
 
 RUNTIME_DEP_PKGS = CSWzlib CSWiconv CSWggettextrt
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
-
 BUILD64 = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --program-prefix=g
+# http://sourceware.org/bugzilla/show_bug.cgi?id=12265
+CONFIGURE_ARGS += --disable-werror
+CONFIGURE_ARGS_i386 += --enable-targets=i386-pc-solaris2.10,i686-pc-mingw32
+CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARCH))
 
-ifeq ($(GARCH),i386)
-CONFIGURE_ARGS += --enable-targets=i386-pc-solaris2.10,i686-pc-mingw32
-endif
-
 TEST_TARGET = check
 
 # Do not run tests until this is fixed:
 #   
 SKIPTEST ?= 1
 
+GARCOMPILER = GNU
+
+RUNTIME_DEP_PKGS_CSWbinutils += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWbinutils += CSWlibz1
+CHECKPKG_OVERRIDES_CSWbinutils += file-with-bad-content
+
 include gar/category.mk

Modified: csw/mgar/pkg/binutils/trunk/checksums
===================================================================
--- csw/mgar/pkg/binutils/trunk/checksums	2011-08-21 05:45:44 UTC (rev 15390)
+++ csw/mgar/pkg/binutils/trunk/checksums	2011-08-21 06:14:57 UTC (rev 15391)
@@ -1,3 +1 @@
-da13e88df454002f329e47f26cc51018  0001-Remove-gcc-specific-warning-no-error.patch
-52296e0f180d98a9857913a5d9050907  0002-Use-func-instead-of-FUNCTION.patch
-ee2d3e996e9a2d669808713360fa96f8  binutils-2.20.tar.bz2
+a22801a9cad45c85e9ff6afc10537d72  binutils-2.21.1.tar.bz2


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

From wahwah at users.sourceforge.net  Sun Aug 21 09:03:54 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 21 Aug 2011 07:03:54 +0000
Subject: [csw-devel] SF.net SVN: gar:[15392]
	csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
Message-ID: 

Revision: 15392
          http://gar.svn.sourceforge.net/gar/?rev=15392&view=rev
Author:   wahwah
Date:     2011-08-21 07:03:53 +0000 (Sun, 21 Aug 2011)

Log Message:
-----------
pkg/gcc4/branches/bootstrap-4.6: iconv is needed for i386 5.10, hardlink targets adjusted too

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile

Modified: csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-21 06:14:57 UTC (rev 15391)
+++ csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-21 07:03:53 UTC (rev 15392)
@@ -297,8 +297,8 @@
 PACKAGES += CSWgcc4g++
 CATALOGNAME_CSWgcc4g++ = gcc4g++
 SPKG_DESC_CSWgcc4g++ = GNU C++ Compiler
-PKGFILES_CSWgcc4g++  = $(bindir)/g\+\+
-PKGFILES_CSWgcc4g++ += $(bindir)/c\+\+
+PKGFILES_CSWgcc4g++  = $(bindir)/[cg]\+\+
+PKGFILES_CSWgcc4g++ += $(bindir)/\w+-pc-solaris[\d\.]+-[cg]\+\+
 PKGFILES_CSWgcc4g++ += $(libexecdir)/.*cc1plus
 PKGFILES_CSWgcc4g++ += $(libdir)/.*libstdc.*a
 PKGFILES_CSWgcc4g++ += $(call baseisadirs,$(libdir),libstdc\+\+\.so)
@@ -326,6 +326,7 @@
 RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibz1
 PKGFILES_CSWgcc4gfortran  = $(bindir)/gfortran
 PKGFILES_CSWgcc4gfortran += $(bindir)/sparc-sun-solaris2.10-gfortran
+PKGFILES_CSWgcc4gfortran += $(bindir)/i386-pc-solaris2.10-gfortran
 PKGFILES_CSWgcc4gfortran += $(libdir)/.*libgfortran.*a
 PKGFILES_CSWgcc4gfortran += $(libexecdir)/.*f951
 PKGFILES_CSWgcc4gfortran += $(mandir)/.*gfortran.1
@@ -412,6 +413,18 @@
 RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibmpfr4
 RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibgmp10
 
+# Solaris 10 on i386 specific:
+RUNTIME_DEP_PKGS_CSWgcc4core_i386_5.10 += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWgcc4g++_i386_5.10 += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWgcc4gfortran_i386_5.10 += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWgcc4objc_i386_5.10 += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWgcc4java_i386_5.10 += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWgcc4core += $(RUNTIME_DEP_PKGS_CSWgcc4core_$(GARCH)_$(GAROSREL))
+RUNTIME_DEP_PKGS_CSWgcc4g++ += $(RUNTIME_DEP_PKGS_CSWgcc4g++_$(GARCH)_$(GAROSREL))
+RUNTIME_DEP_PKGS_CSWgcc4gfortran += $(RUNTIME_DEP_PKGS_CSWgcc4gfortran_$(GARCH)_$(GAROSREL))
+RUNTIME_DEP_PKGS_CSWgcc4objc += $(RUNTIME_DEP_PKGS_CSWgcc4objc_$(GARCH)_$(GAROSREL))
+RUNTIME_DEP_PKGS_CSWgcc4java += $(RUNTIME_DEP_PKGS_CSWgcc4java_$(GARCH)_$(GAROSREL))
+
 PACKAGES += $(PACKAGES_$(GARCH))
 
 include files/scripts.mk


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

From maciej at opencsw.org  Sun Aug 21 09:27:08 2011
From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=)
Date: Sun, 21 Aug 2011 08:27:08 +0100
Subject: [csw-devel] psuedo sketch of web and mantis automation
In-Reply-To: <1313802712-sup-5904@pinkfloyd.chass.utoronto.ca>
References: <1313717595-sup-109@pinkfloyd.chass.utoronto.ca>
	
	<1313802712-sup-5904@pinkfloyd.chass.utoronto.ca>
Message-ID: 

2011/8/20 Ben Walton :
> Excerpts from Maciej Blizi?ski's message of Fri Aug 19 07:34:55 -0400 2011:
>
>> 1. Both pkgname and catalogname change, e.g. CSWfoodev/foodev ?
>> CSWfoo-dev/foo_dev
>> 2. Only the catalogname changes (CSWfoo-dev/foodev ? >
>> CSWfoo-dev/foo_dev)
>
> As far as the catalog diff engine is concerned, both of these are the
> same. ?They'll appear as the drop of one package and the addition of a
> new one. ?The special case of _stub packages is handled in the pseudo
> code. ?The general case would require doing a reverse index of package
> names. ?The _stub handling rename detection could be extended to:
>
> * Build a package to catalog map, based on previous catalog, of every
> ?package we're going to alter.

What's the definition of a package that can be altered?

> * Do the same for the new catalog.
> * Iterate through new packages and see if the package name exists in
> ?the old catalog.
> * If we 'hit' in the index, add [p, q] to the rename list and remove
> ?them from the new and remove lists.

I think that at this point, we know the area in which we can look for
corner cases.  It'll be best to talk in code: if you have a unit test
with test cases, we can define the test cases and see what does the
diff engine output.

> We'd still want to filter stubs to a separate list first as those
> packages shouldn't be displayed in the web db or mantis.

I'm thinking that mantis should not contain the packages (whatever the
word 'package' means), but something that Dagobert calls bundles. They
are roughly equivalent to upstream projects.

>> 3. Only the pkgname changes (CSWfoodev/foo_dev ? CSWfoo-dev/foo_dev)
>
> This should be handled by an update operation. ?As things are keyed on
> the catalog name, a change (based on version comparison) will trigger
> a refresh of file list, maintainer name, etc. ?Mantis cares not about
> package name so that won't be a problem.
>
> Reasonable?

I expected that you'll say that this scenario is invalid / forbidden.
If the pkgname changes, you need to provide a _stub for the
catalogname.  We need some kind of detection of invalid scenarios,
too.

Let's continue by reviewing test cases, how does that sound?

Maciej

From wahwah at users.sourceforge.net  Sun Aug 21 10:39:27 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 21 Aug 2011 08:39:27 +0000
Subject: [csw-devel] SF.net SVN: gar:[15393] csw/mgar/gar/v2/lib
Message-ID: 

Revision: 15393
          http://gar.svn.sourceforge.net/gar/?rev=15393&view=rev
Author:   wahwah
Date:     2011-08-21 08:39:27 +0000 (Sun, 21 Aug 2011)

Log Message:
-----------
csw-upload-pkg: During updates remove by pkgname

Fixes an annoying case when renaming packages:
http://lists.opencsw.org/pipermail/maintainers/2011-July/015023.html

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/python/checkpkg_lib.py
    csw/mgar/gar/v2/lib/web/releases_web.py

Modified: csw/mgar/gar/v2/lib/python/checkpkg_lib.py
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg_lib.py	2011-08-21 07:03:53 UTC (rev 15392)
+++ csw/mgar/gar/v2/lib/python/checkpkg_lib.py	2011-08-21 08:39:27 UTC (rev 15393)
@@ -991,6 +991,27 @@
                   m.Srv4FileInCatalog.q.srv4file!=sqo_srv4))
     return res
 
+  def GetConflictingSrv4ByPkgnameResult(self,
+      sqo_srv4, pkgname,
+      sqo_osrel, sqo_arch, sqo_catrel):
+    join = [
+          m.Srv4FileStats,
+          m.Pkginst.q.id==m.Srv4FileStats.q.pkginst,
+        sqlbuilder.INNERJOINOn(None,
+          m.Srv4FileInCatalog,
+          m.Srv4FileStats.q.id==m.Srv4FileInCatalog.q.srv4file),
+    ]
+    res = m.Srv4FileStats.select(
+            m.Pkginst.q.pkgname==pkgname
+            ).throughTo.in_catalogs.filter(
+                sqlobject.AND(
+                  m.Srv4FileInCatalog.q.osrel==sqo_osrel,
+                  m.Srv4FileInCatalog.q.arch==sqo_arch,
+                  m.Srv4FileInCatalog.q.catrel==sqo_catrel,
+                  m.Srv4FileInCatalog.q.srv4file!=sqo_srv4),
+            join=join)
+    return res
+
   def AddSrv4ToCatalog(self, sqo_srv4, osrel, arch, catrel):
     """Registers a srv4 file in a catalog."""
     logging.debug("AddSrv4ToCatalog(%s, %s, %s, %s)",

Modified: csw/mgar/gar/v2/lib/web/releases_web.py
===================================================================
--- csw/mgar/gar/v2/lib/web/releases_web.py	2011-08-21 07:03:53 UTC (rev 15392)
+++ csw/mgar/gar/v2/lib/web/releases_web.py	2011-08-21 08:39:27 UTC (rev 15393)
@@ -164,9 +164,9 @@
         package_stats.PackageStats.ImportPkg(stats, True)
         srv4 = models.Srv4FileStats.selectBy(md5_sum=md5_sum).getOne()
       c = checkpkg_lib.Catalog()
-      # See if there already is a package with that catalogname.
       sqo_osrel, sqo_arch, sqo_catrel = pkgdb.GetSqoTriad(
           osrel_name, arch_name, catrel_name)
+      # See if there already is a package with that catalogname.
       res = c.GetConflictingSrv4ByCatalognameResult(
           srv4, srv4.catalogname,
           sqo_osrel, sqo_arch, sqo_catrel)
@@ -175,6 +175,15 @@
         for pkg_in_catalog in res:
           srv4_to_remove = pkg_in_catalog.srv4file
           c.RemoveSrv4(srv4_to_remove, osrel_name, arch_name, catrel_name)
+      # See if there already is a package with that pkgname.
+      res = c.GetConflictingSrv4ByPkgnameResult(
+          srv4, srv4.pkginst.pkgname,
+          sqo_osrel, sqo_arch, sqo_catrel)
+      if res.count() == 1:
+        # Removing old version of the package from the catalog
+        for pkg_in_catalog in res:
+          srv4_to_remove = pkg_in_catalog.srv4file
+          c.RemoveSrv4(srv4_to_remove, osrel_name, arch_name, catrel_name)
       c.AddSrv4ToCatalog(srv4, osrel_name, arch_name, catrel_name)
       web.header(
           'Content-type',


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 Aug 21 10:47:56 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 21 Aug 2011 08:47:56 +0000
Subject: [csw-devel] SF.net SVN: gar:[15394]
	csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
Message-ID: 

Revision: 15394
          http://gar.svn.sourceforge.net/gar/?rev=15394&view=rev
Author:   wahwah
Date:     2011-08-21 08:47:56 +0000 (Sun, 21 Aug 2011)

Log Message:
-----------
pkg/gcc4/branches/bootstrap-4.6: hardlink fixes

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile

Modified: csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-21 08:39:27 UTC (rev 15393)
+++ csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-21 08:47:56 UTC (rev 15394)
@@ -298,7 +298,7 @@
 CATALOGNAME_CSWgcc4g++ = gcc4g++
 SPKG_DESC_CSWgcc4g++ = GNU C++ Compiler
 PKGFILES_CSWgcc4g++  = $(bindir)/[cg]\+\+
-PKGFILES_CSWgcc4g++ += $(bindir)/\w+-pc-solaris[\d\.]+-[cg]\+\+
+PKGFILES_CSWgcc4g++ += $(bindir)/\w+-\w+-solaris[\d\.]+-[cg]\+\+
 PKGFILES_CSWgcc4g++ += $(libexecdir)/.*cc1plus
 PKGFILES_CSWgcc4g++ += $(libdir)/.*libstdc.*a
 PKGFILES_CSWgcc4g++ += $(call baseisadirs,$(libdir),libstdc\+\+\.so)
@@ -325,8 +325,7 @@
 RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibmpc2
 RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibz1
 PKGFILES_CSWgcc4gfortran  = $(bindir)/gfortran
-PKGFILES_CSWgcc4gfortran += $(bindir)/sparc-sun-solaris2.10-gfortran
-PKGFILES_CSWgcc4gfortran += $(bindir)/i386-pc-solaris2.10-gfortran
+PKGFILES_CSWgcc4gfortran += $(bindir)/\w+-\w+-solaris[\d\.]+-gfortran
 PKGFILES_CSWgcc4gfortran += $(libdir)/.*libgfortran.*a
 PKGFILES_CSWgcc4gfortran += $(libexecdir)/.*f951
 PKGFILES_CSWgcc4gfortran += $(mandir)/.*gfortran.1


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 Aug 21 10:55:16 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 21 Aug 2011 08:55:16 +0000
Subject: [csw-devel] SF.net SVN: gar:[15395]
	csw/mgar/pkg/gcc4/branches/gccgo/
Message-ID: 

Revision: 15395
          http://gar.svn.sourceforge.net/gar/?rev=15395&view=rev
Author:   wahwah
Date:     2011-08-21 08:55:16 +0000 (Sun, 21 Aug 2011)

Log Message:
-----------
An experimental branch

Added Paths:
-----------
    csw/mgar/pkg/gcc4/branches/gccgo/


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 Aug 21 10:57:58 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 21 Aug 2011 08:57:58 +0000
Subject: [csw-devel] SF.net SVN: gar:[15396]
 csw/mgar/pkg/gcc4/branches/bootstrap-4.6/files/ test-results/
Message-ID: 

Revision: 15396
          http://gar.svn.sourceforge.net/gar/?rev=15396&view=rev
Author:   wahwah
Date:     2011-08-21 08:57:57 +0000 (Sun, 21 Aug 2011)

Log Message:
-----------
pkg/gcc4/branches/bootstrap-4.6: removing test results

Removed Paths:
-------------
    csw/mgar/pkg/gcc4/branches/bootstrap-4.6/files/test-results/


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 Aug 21 10:58:44 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 21 Aug 2011 08:58:44 +0000
Subject: [csw-devel] SF.net SVN: gar:[15397]
	csw/mgar/pkg/gcc4/branches/gccgo/Makefile
Message-ID: 

Revision: 15397
          http://gar.svn.sourceforge.net/gar/?rev=15397&view=rev
Author:   wahwah
Date:     2011-08-21 08:58:44 +0000 (Sun, 21 Aug 2011)

Log Message:
-----------
pkg/gcc4/branches/gccgo: enabling the go frontend

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/gccgo/Makefile

Modified: csw/mgar/pkg/gcc4/branches/gccgo/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/gccgo/Makefile	2011-08-21 08:57:57 UTC (rev 15396)
+++ csw/mgar/pkg/gcc4/branches/gccgo/Makefile	2011-08-21 08:58:44 UTC (rev 15397)
@@ -66,7 +66,7 @@
 CONFIGURE_ARGS += --enable-stage1-languages=c
 # We'll build ada later. It requires the PPL library.
 # CONFIGURE_ARGS += --enable-languages=ada,c,c++,fortran,java,objc
-CONFIGURE_ARGS += --enable-languages=c,c++,fortran,java,objc
+CONFIGURE_ARGS += --enable-languages=c,c++,fortran,java,objc,go
 CONFIGURE_ARGS += --enable-bootstrap
 CONFIGURE_ARGS += --with-system-zlib
 


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 Aug 21 14:55:24 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 21 Aug 2011 12:55:24 +0000
Subject: [csw-devel] SF.net SVN: gar:[15398]
	csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
Message-ID: 

Revision: 15398
          http://gar.svn.sourceforge.net/gar/?rev=15398&view=rev
Author:   wahwah
Date:     2011-08-21 12:55:24 +0000 (Sun, 21 Aug 2011)

Log Message:
-----------
pkg/gcc4/branches/bootstrap-4.6: removing includedir

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile

Modified: csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-21 08:58:44 UTC (rev 15397)
+++ csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-21 12:55:24 UTC (rev 15398)
@@ -43,8 +43,22 @@
 # Could be used to break out of the /opt/csw/gcc4 prefix
 # CONFIGURE_ARGS += --program-prefix=gcc4-
 
-CONFIGURE_ARGS += --with-pkgversion=OpenCSW
 CONFIGURE_ARGS += $(DIRPATHS)
+CONFIGURE_ARGS += --prefix=$(prefix)
+# The theory is that this confuses the installer
+# CONFIGURE_ARGS += --includedir=$(prefix)/include
+CONFIGURE_ARGS += --exec_prefix=$(prefix)
+CONFIGURE_ARGS += --bindir=$(bindir)
+CONFIGURE_ARGS += --sbindir=$(sbindir)
+CONFIGURE_ARGS += --libexecdir=$(libexecdir)
+CONFIGURE_ARGS += --datadir=$(datadir)
+CONFIGURE_ARGS += --sysconfdir=/etc$(prefix)
+CONFIGURE_ARGS += --sharedstatedir=$(prefix)/share
+CONFIGURE_ARGS += --localstatedir=/var$(prefix)
+CONFIGURE_ARGS += --libdir=$(libdir)
+CONFIGURE_ARGS += --infodir=$(datadir)/info
+CONFIGURE_ARGS += --mandir=$(mandir)
+
 CONFIGURE_ARGS += --exec-prefix=$(BUILD_PREFIX)/gcc4
 CONFIGURE_ARGS += --with-gnu-as
 CONFIGURE_ARGS += --with-as=/opt/csw/bin/gas


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

From bwalton at opencsw.org  Mon Aug 22 00:12:19 2011
From: bwalton at opencsw.org (Ben Walton)
Date: Sun, 21 Aug 2011 18:12:19 -0400
Subject: [csw-devel] psuedo sketch of web and mantis automation
In-Reply-To: 
References: <1313717595-sup-109@pinkfloyd.chass.utoronto.ca>
	
	<1313802712-sup-5904@pinkfloyd.chass.utoronto.ca>
	
Message-ID: <1313964131-sup-4749@pinkfloyd.chass.utoronto.ca>

Excerpts from Maciej Blizi?ski's message of Sun Aug 21 03:27:08 -0400 2011:

> > As far as the catalog diff engine is concerned, both of these are
> > the same. ?They'll appear as the drop of one package and the
> > addition of a new one. ?The special case of _stub packages is
> > handled in the pseudo code. ?The general case would require doing
> > a reverse index of package names. ?The _stub handling rename
> > detection could be extended to:
> >
> > * Build a package to catalog map, based on previous catalog, of
> > every ?package we're going to alter.
> 
> What's the definition of a package that can be altered?

This is just an object that we thing needs database changes to reflect
current state.  The results of the catalog diff will determine this.

> > * Do the same for the new catalog.
> > * Iterate through new packages and see if the package name exists in
> > ?the old catalog.
> > * If we 'hit' in the index, add [p, q] to the rename list and remove
> > ?them from the new and remove lists.
> 
> I think that at this point, we know the area in which we can look
> for corner cases.  It'll be best to talk in code: if you have a unit
> test with test cases, we can define the test cases and see what does
> the diff engine output.

Yes, that's the way to approach it.

> > We'd still want to filter stubs to a separate list first as those
> > packages shouldn't be displayed in the web db or mantis.
> 
> I'm thinking that mantis should not contain the packages (whatever
> the word 'package' means), but something that Dagobert calls
> bundles. They are roughly equivalent to upstream projects.

This is ideally what should happen.  This could be grouped based on
the SVN url that we embed.  It's a massive change from what we have
now though.  If we want to go this route, we should simply mark the
current stuff as legacy and start fresh with a) a normalized and sane
db for the web and b) a bug tracker that is better able to meet our
current (and hopefully future) needs.

> >> 3. Only the pkgname changes (CSWfoodev/foo_dev ? CSWfoo-dev/foo_dev)
> >
> > This should be handled by an update operation. ?As things are keyed on
> > the catalog name, a change (based on version comparison) will trigger
> > a refresh of file list, maintainer name, etc. ?Mantis cares not about
> > package name so that won't be a problem.
> >
> > Reasonable?
> 
> I expected that you'll say that this scenario is invalid /
> forbidden.  If the pkgname changes, you need to provide a _stub for
> the catalogname.  We need some kind of detection of invalid
> scenarios, too.

Yes, the high level code that I've written can detect several things.
I'm starting to think that instead of an asynchronous job running
independently that we should instead place this in serial right after
generating a new catalog, but before mirror push.

> Let's continue by reviewing test cases, how does that sound?

Sounds good.  I need to refactor my code such that it's a testable
module.  The catalog diff part is already, but the actionable items is
not presently.  I'll work on that tonight.  The code is now capable of
spitting out a list of high level action items though.  I still need
to get a test environment running, but the logic and unit testing of
the high level part can proceed without that.

Given the catalog in current (5.9/sparc) and the catalog in
future/unstable (5.9/sparc), the following is the list that my code
generates:

Rename py_libxslt/CSWpylibxslt -> py_libxslt/CSWpy-libxslt
Rename berkeleydb3_doc/CSWbdb3doc -> berkeleydb3_doc/CSWbdb3-doc
Rename libserf_devel/CSWlibserf-devel -> libserf_dev/CSWlibserf-dev
Rename pcre_devel/CSWpcre-devel -> libpcre_dev/CSWlibpcre-dev
Rename zlib/CSWzlib -> libz1/CSWlibz1
Rename pm_x11protocol/CSWpmx11protocol -> pm_x11_protocol/CSWpm-x11-protocol
Rename libxslt_devel/CSWlibxsltdevel -> libxslt_dev/CSWlibxslt-dev
Rename libdbusdev/CSWlibdbusdev -> libdbus_dev/CSWlibdbus-dev
Rename apr/CSWapr -> libapr1_0/CSWlibapr1-0
Rename libgnugetopt/CSWlibgnugetopt -> libgnugetopt0/CSWlibgnugetopt0
Rename id3lib/CSWid3lib -> libid3_utils/CSWlibid3-utils
Rename libdnet/CSWlibdnet -> libdnet1/CSWlibdnet1
Rename screen/CSWscrn -> screen/CSWscreen
Rename lzma/CSWlzma -> xz/CSWxz
Rename eventlog/CSWeventlog -> eventlog_dev/CSWeventlog-dev
Rename pm_version/CSWpmversion -> pm_version/CSWpm-version
Rename cadaver/CSWcadav -> cadaver/CSWcadaver
Rename apr_util/CSWapr-util -> libaprutil1_ldap/CSWlibaprutil1-ldap
Rename pcre_rt/CSWpcrert -> libpcreposix0/CSWlibpcreposix0
Rename libiconv/CSWiconv -> libiconv2/CSWlibiconv2
Rename libevent_devel/CSWlibevent-devel -> libevent_dev/CSWlibevent-dev
Rename sqlite3rt_stub/CSWsqlite3rt -> libsqlite3_0/CSWlibsqlite3-0
Rename libfbopenssl/CSWlibfbopenssl -> libfbopenssl0/CSWlibfbopenssl0
Rename glew/CSWglew -> libglew_dev/CSWlibglew-dev
Rename python_devel/CSWpython-devel -> python_dev/CSWpython-dev
Rename libdbus/CSWlibdbus -> libdbus1_3/CSWlibdbus1-3
Rename libffi/CSWlibffi -> libffi5/CSWlibffi5
Rename sqlite3devel_stub/CSWsqlite3devel -> libsqlite3_dev/CSWlibsqlite3-dev
Rename libdatrie/CSWlibdatrie -> libdatrie1/CSWlibdatrie1
Register py_mysql/CSWpy-mysql
Register idle_27/CSWidle27
Register libexpat0/CSWlibexpat0
Register libexpat1/CSWlibexpat1
Register libz_dev/CSWlibz-dev
Register pm_test_object/CSWpm-test-object
Register libaprutil1_dbd_freetds/CSWlibaprutil1-dbd-freetds
Register pm_ppix_regexp/CSWpm-ppix-regexp
Register python_27_tk/CSWpython27-tk
Register python_27_dev/CSWpython27-dev
Register berkeleydb3_dev/CSWbdb3-dev
Register python_31_devel/CSWpython31-devel
Register libdatrie_dev/CSWlibdatrie-dev
Register opencsw_policy/CSWopencsw-policy
Register libslp1/CSWlibslp1
Register libbz2_dev/CSWlibbz2-dev
Register libpython3_1_1_0/CSWlibpython3-1-1-0
Register rb18_activerecord_3_0_7/CSWrb18-activerecord-3-0-7
Register libbz2_1_0/CSWlibbz2-1-0
Register py_xapian/CSWpy-xapian
Register libglew1_6/CSWlibglew1-6
Register rb18_mysql_2_8_1/CSWrb18-mysql-2-8-1
Register rtmpdump/CSWrtmpdump
Register libexpat_dev/CSWlibexpat-dev
Register rb18_i18n_0_5_0/CSWrb18-i18n-0-5-0
Register pm_string_format/CSWpm-string-format
Register libmp4v2_dev/CSWlibmp4v2-dev
Register libpython2_7_1_0/CSWlibpython2-7-1-0
Register libiconv_dev/CSWlibiconv-dev
Register rb18_activemodel_3_0_7/CSWrb18-activemodel-3-0-7
Register libwsutil0/CSWlibwsutil0
Register py_virtualenv/CSWpy-virtualenv
Register libxslt1/CSWlibxslt1
Register xmms_faad2/CSWxmms-faad2
Register libapr_dev/CSWlibapr-dev
Register py_docutils/CSWpy-docutils
Register py_jinja2/CSWpy-jinja2
Register pm_ppix_utilities/CSWpm-ppix-utilities
Register pm_ppi/CSWpm-ppi
Register libaprutil_dev/CSWlibaprutil-dev
Register libfaad2/CSWlibfaad2
Register libmp4v2_0/CSWlibmp4v2-0
Register libmp4v2_utils/CSWlibmp4v2-utils
Register openslp_devel/CSWopenslp-devel
Register libwireshark0/CSWlibwireshark0
Register rb_xapian/CSWrb-xapian
Register proj_data/CSWproj-data
Register libmpc2/CSWlibmpc2
Register libmpfr_dev/CSWlibmpfr-dev
Register libfbopenssl_dev/CSWlibfbopenssl-dev
Register libidn/CSWlibidn
Register python_27/CSWpython27
Register libmysqlclient_r15/CSWlibmysqlclient-r15
Register libcharset1/CSWlibcharset1
Register libffi_dev/CSWlibffi-dev
Register libclam6_dev/CSWlibclam6-dev
Register libexslt0/CSWlibexslt0
Register pinentry_gtk2/CSWpinentry-gtk2
Register pcp/CSWpcp
Register rb18_ratom_0_6_7/CSWrb18-ratom-0-6-7
Register libaprutil1_dbd_sqlite3/CSWlibaprutil1-dbd-sqlite3
Register libdnet_dev/CSWlibdnet-dev
Register py_dbutils/CSWpy-dbutils
Register pm_netaddr_ip/CSWpm-netaddr-ip
Register libevtlog0/CSWlibevtlog0
Register idle_31/CSWidle31
Register pm_test_subcalls/CSWpm-test-subcalls
Register libserf1_0/CSWlibserf1-0
Register xapian/CSWxapian
Register rb18_activesupport_3_0_7/CSWrb18-activesupport-3-0-7
Register py_openssl/CSWpy-openssl
Register libaprutil1_dbd_odbc/CSWlibaprutil1-dbd-odbc
Register libproj0/CSWlibproj0
Register libtre5/CSWlibtre5
Register libgmpxx4/CSWlibgmpxx4
Register libmpfr4/CSWlibmpfr4
Register libgmp_dev/CSWlibgmp-dev
Register py_pygments/CSWpy-pygments
Register libxapian22/CSWlibxapian22
Register libiconv_utils/CSWlibiconv-utils
Register libgmp10/CSWlibgmp10
Register rb18_builder_3_0_0/CSWrb18-builder-3-0-0
Register libmpc_dev/CSWlibmpc-dev
Register py_subvertpy/CSWpy-subvertpy
Register libid3_3_8_3/CSWlibid3-3-8-3
Register libwiretap0/CSWlibwiretap0
Register libfaad_dev/CSWlibfaad-dev
Register libmysqlclient15/CSWlibmysqlclient15
Register libxapian_dev/CSWlibxapian-dev
Register pm_email_address/CSWpm-email-address
Register py_bridge/CSWpy-bridge
Register python_31_tk/CSWpython31-tk
Register tcllib/CSWtcllib
Register rb18_json_1_5_3/CSWrb18-json-1-5-3
Register librtmp_dev/CSWlibrtmp-dev
Register librtmp0/CSWlibrtmp0
Register pm_perl_ostype/CSWpm-perl-ostype
Register proj_dev/CSWproj-dev
Register libaprutil1_0/CSWlibaprutil1-0
Register python_31/CSWpython31
Register libdatrie_utils/CSWlibdatrie-utils
Register pm_perl_critic/CSWpm-perl-critic
Register cas_etcshells/CSWcas-etcshells
Register py_sphinx/CSWpy-sphinx
Register libgnugetopt_dev/CSWlibgnugetopt-dev
Register tre_dev/CSWtre-dev
Register libaprutil1_dbm_db/CSWlibaprutil1-dbm-db
Register pm_pod_spell/CSWpm-pod-spell
Register pm_dbi2/CSWpmdbi
Register guilt/CSWguilt
Register libid3_dev/CSWlibid3-dev
Register rb18_libxml_1_1_4/CSWrb18-libxml-1-1-4
Update easytag/CSWeasytag
Update enscript/CSWenscript
Update asciidoc/CSWasciidoc
Update lftp/CSWlftp
Update xorriso/CSWxorriso
Update expat/CSWexpat
Update libmagic_data/CSWlibmagic-data
Update libclam6/CSWlibclam6
Update git_completion/CSWgit-completion
Update xjobs/CSWxjobs
Update unrar/CSWunrar
Update mysql5/CSWmysql5
Update memconf/CSWmemconf
Update py_nose/CSWpy-nose
Update gawk/CSWgawk
Update dhcp/CSWdhcp
Update cswclassutils/CSWcswclassutils
Update imapproxy/CSWimapproxy
Update proj/CSWproj
Update ruby_augeas/CSWrubyaugeas
Update mercurial/CSWmercurial
Update py_tz/CSWpy-tz
Update py_libmagic/CSWpy-libmagic
Update geoip/CSWgeoip
Update openssh_client/CSWosshclient
Update gxmessage/CSWgxmessage
Update lsof/CSWlsof
Update gfile/CSWgfile
Update sqlite3/CSWsqlite3
Update git_cvs/CSWgit-cvs
Update python_test/CSWpython-test
Update libgd_dev/CSWlibgd-dev
Update py_xcbproto/CSWpyxcbproto
Update clusterssh/CSWclusterssh
Update pinentry/CSWpinentry
Update libflac8/CSWlibflac8
Update clamav/CSWclamav
Update bind_utils/CSWbindutils
Update libgd2/CSWlibgd2
Update python/CSWpython
Update wgetpaste/CSWwgetpaste
Update mysql5devel/CSWmysql5devel
Update idle/CSWidle
Update mailscanner/CSWmailscanner
Update dcc/CSWdcc
Update elinks/CSWelinks
Update bash/CSWbash
Update zsh/CSWzsh
Update bar/CSWbar
Update gd/CSWgd
Update vsftpd/CSWvsftpd
Update git_svn/CSWgit-svn
Update netcat/CSWnetcat
Update py_hachoir_parser/CSWpy-hachoir-parser
Update rlwrap/CSWrlwrap
Update bind_chroot/CSWbindchroot
Update xmlstarlet/CSWxmlstarlet
Update gcal/CSWgcal
Update libpcrecpp0/CSWlibpcrecpp0
Update pca/CSWpca
Update libmagic_dev/CSWlibmagic-dev
Update liblzma5/CSWliblzma5
Update bind_dev/CSWbind-dev
Update mysql5client/CSWmysql5client
Update mysql5rt/CSWmysql5rt
Update liblzma_dev/CSWliblzma-dev
Update git_doc/CSWgit-doc
Update tnef/CSWtnef
Update libflac_dev/CSWlibflac-dev
Update openssl_rt/CSWosslrt
Update ttcp/CSWttcp
Update geoip_dev/CSWgeoip-dev
Update lighttpd/CSWlighttpd
Update flac/CSWflac
Update py_graph/CSWpy-graph
Update cas_initsmf/CSWcas-initsmf
Update git_dev/CSWgit-dev
Update python_tk/CSWpython-tk
Update libpython2_6_1_0/CSWlibpython2-6-1-0
Update pymysql/CSWpymysql
Update berkeleydb3/CSWbdb3
Update pm_netaddrip/CSWpmnetaddrip
Update xmms_flac/CSWxmms-flac
Update libmagic1/CSWlibmagic1
Update clamavsigs/CSWclamavsigs
Update openssl_devel/CSWossldevel
Update namebench/CSWnamebench
Update tcsh/CSWtcsh
Update bzip2/CSWbzip2
Update facter/CSWfacter
Update pbzip2/CSWpbzip2
Update libbind/CSWlibbind
Update miltergreylist/CSWmiltergreylist
Update gitk/CSWgitk
Update libgmp/CSWlibgmp
Update git_emacs/CSWgit-emacs
Update libevent2_0_5/CSWlibevent2-0-5
Update nicstat/CSWnicstat
Update dhcp_dev/CSWdhcp-dev
Update bind/CSWbind
Update tmux/CSWtmux
Update py_sqlobject/CSWpy-sqlobject
Update faad2/CSWfaad2
Update git/CSWgit
Update libxslt/CSWlibxslt
Update dbus/CSWdbus
Update openssl_utils/CSWosslutils
Update libmpfr/CSWlibmpfr
Update openssh/CSWossh
Update openssl/CSWossl
Update cmake/CSWcmake
Update jpegoptim/CSWjpegoptim
Update spamassassin/CSWspamassassin
Update mgar/CSWmgar
Update nginx/CSWnginx
Update git_gui/CSWgit-gui
Update xcbproto/CSWxcbproto
Update pydocutils/CSWpydocutils
Update pm_html_parser/CSWpm-html-parser
Update cas_migrateconf/CSWcas-migrateconf
Update phpmyadmin/CSWphpmyadmin
Update pcre/CSWpcre
Update pm_htmlparser/CSWpmhtmlparser
Update libpcre0/CSWlibpcre0
Update unzoo/CSWunzoo
Removing drupal/CSWdrupal
Removing libclam6_devel/CSWlibclam6-devel
Removing libsmi_mibs_stub/CSWlibsmimibs
Removing mediawiki/CSWmediawiki
Removing pm_dbi_stub/CSWpmdbi
Removing buildbot/CSWbuildbot
Removing zope/CSWzope
Removing libidn_stub/CSWlibidn
Removing py_atomixlib/CSWpy-atomixlib
Removing mysql5bench/CSWmysql5bench
Removing squirrelmail/CSWsquirrelmail

Thanks
-Ben
--
Ben Walton
Systems Programmer - CHASS
University of Toronto
C:416.407.5610 | W:416.978.4302


From wahwah at users.sourceforge.net  Mon Aug 22 09:46:08 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Mon, 22 Aug 2011 07:46:08 +0000
Subject: [csw-devel] SF.net SVN: gar:[15399] csw/mgar/gar/v2/lib/python
Message-ID: 

Revision: 15399
          http://gar.svn.sourceforge.net/gar/?rev=15399&view=rev
Author:   wahwah
Date:     2011-08-22 07:46:07 +0000 (Mon, 22 Aug 2011)

Log Message:
-----------
csw-upload-pkg: a bugfix for package uploads

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/python/checkpkg_lib.py
    csw/mgar/gar/v2/lib/python/csw_upload_pkg.py

Modified: csw/mgar/gar/v2/lib/python/checkpkg_lib.py
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg_lib.py	2011-08-21 12:55:24 UTC (rev 15398)
+++ csw/mgar/gar/v2/lib/python/checkpkg_lib.py	2011-08-22 07:46:07 UTC (rev 15399)
@@ -995,21 +995,19 @@
       sqo_srv4, pkgname,
       sqo_osrel, sqo_arch, sqo_catrel):
     join = [
-          m.Srv4FileStats,
-          m.Pkginst.q.id==m.Srv4FileStats.q.pkginst,
         sqlbuilder.INNERJOINOn(None,
-          m.Srv4FileInCatalog,
-          m.Srv4FileStats.q.id==m.Srv4FileInCatalog.q.srv4file),
+          m.Pkginst,
+          m.Srv4FileStats.q.pkginst==m.Pkginst.q.id),
     ]
     res = m.Srv4FileStats.select(
-            m.Pkginst.q.pkgname==pkgname
+            m.Pkginst.q.pkgname==pkgname,
+            join=join
             ).throughTo.in_catalogs.filter(
                 sqlobject.AND(
                   m.Srv4FileInCatalog.q.osrel==sqo_osrel,
                   m.Srv4FileInCatalog.q.arch==sqo_arch,
                   m.Srv4FileInCatalog.q.catrel==sqo_catrel,
-                  m.Srv4FileInCatalog.q.srv4file!=sqo_srv4),
-            join=join)
+                  m.Srv4FileInCatalog.q.srv4file!=sqo_srv4))
     return res
 
   def AddSrv4ToCatalog(self, sqo_srv4, osrel, arch, catrel):

Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg.py
===================================================================
--- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py	2011-08-21 12:55:24 UTC (rev 15398)
+++ csw/mgar/gar/v2/lib/python/csw_upload_pkg.py	2011-08-22 07:46:07 UTC (rev 15399)
@@ -367,7 +367,7 @@
     #   logging.debug("*** Headers")
     #   logging.debug(h.getvalue())
     #   logging.debug("*** Data")
-    if http_code >= 400 and http_code <= 499:
+    if http_code >= 400 and http_code <= 599:
       if not self.debug:
         # In debug mode, all headers are printed to screen, and we aren't
         # interested in the response body.


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 Aug 22 13:58:19 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Mon, 22 Aug 2011 11:58:19 +0000
Subject: [csw-devel] SF.net SVN: gar:[15400]
	csw/mgar/pkg/binutils/trunk/Makefile
Message-ID: 

Revision: 15400
          http://gar.svn.sourceforge.net/gar/?rev=15400&view=rev
Author:   wahwah
Date:     2011-08-22 11:58:19 +0000 (Mon, 22 Aug 2011)

Log Message:
-----------
--enable-targets=all --enable-64-bit-bfd

Modified Paths:
--------------
    csw/mgar/pkg/binutils/trunk/Makefile

Modified: csw/mgar/pkg/binutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/binutils/trunk/Makefile	2011-08-22 07:46:07 UTC (rev 15399)
+++ csw/mgar/pkg/binutils/trunk/Makefile	2011-08-22 11:58:19 UTC (rev 15400)
@@ -21,8 +21,10 @@
 CONFIGURE_ARGS += --program-prefix=g
 # http://sourceware.org/bugzilla/show_bug.cgi?id=12265
 CONFIGURE_ARGS += --disable-werror
-CONFIGURE_ARGS_i386 += --enable-targets=i386-pc-solaris2.10,i686-pc-mingw32
-CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARCH))
+# CONFIGURE_ARGS_i386 += --enable-targets=i386-pc-solaris2.10,i686-pc-mingw32
+# CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARCH))
+CONFIGURE_ARGS += --enable-targets=all
+CONFIGURE_ARGS += --enable-64-bit-bfd
 
 TEST_TARGET = check
 


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

From dmichelsen at users.sourceforge.net  Mon Aug 22 13:58:26 2011
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 22 Aug 2011 11:58:26 +0000
Subject: [csw-devel] SF.net SVN: gar:[15401]
	csw/mgar/pkg/libarchive/trunk/Makefile
Message-ID: 

Revision: 15401
          http://gar.svn.sourceforge.net/gar/?rev=15401&view=rev
Author:   dmichelsen
Date:     2011-08-22 11:58:26 +0000 (Mon, 22 Aug 2011)

Log Message:
-----------
libarchive: Update to latest standards and new library package names

Modified Paths:
--------------
    csw/mgar/pkg/libarchive/trunk/Makefile

Modified: csw/mgar/pkg/libarchive/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libarchive/trunk/Makefile	2011-08-22 11:58:19 UTC (rev 15400)
+++ csw/mgar/pkg/libarchive/trunk/Makefile	2011-08-22 11:58:26 UTC (rev 15401)
@@ -10,50 +10,47 @@
 MASTER_SITES = $(GOOGLE_MIRROR)
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 
-# File name regex to get notifications about upstream software releases
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
-
 VENDOR_URL = http://code.google.com/p/libarchive/
 
 PACKAGES += CSWlibarchive2
-CATALOGNAME_CSWlibarchive2 = libarchive2
-SPKG_DESC_CSWlibarchive2 = $(DESCRIPTION), libarchive.so.2
-PKGFILES_CSWlibarchive2 = $(call baseisadirs,$(libdir),libarchive\.so\.2(\.\d+)*)
-RUNTIME_DEP_PKGS_CSWlibarchive2 += CSWiconv
-RUNTIME_DEP_PKGS_CSWlibarchive2 += CSWxz
-RUNTIME_DEP_PKGS_CSWlibarchive2 += CSWzlib
-RUNTIME_DEP_PKGS_CSWlibarchive2 += CSWlibxml2
-RUNTIME_DEP_PKGS_CSWlibarchive2 += CSWbzip2
+SPKG_DESC_CSWlibarchive2 = C library for reading and writing various archive formats, libarchive.so.2
+PKGFILES_CSWlibarchive2 = $(call pkgfiles_lib,libarchive.so.2)
+RUNTIME_DEP_PKGS_CSWlibarchive2 += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWlibarchive2 += CSWliblzma5
+RUNTIME_DEP_PKGS_CSWlibarchive2 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibarchive2 += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWlibarchive2 += CSWlibbz2-1-0
 RUNTIME_DEP_PKGS_CSWlibarchive2 += CSWosslrt
 
-PACKAGES += CSWlibarchive-devel
-CATALOGNAME_CSWlibarchive-devel = libarchive_devel
-SPKG_DESC_CSWlibarchive-devel = Development files for libarchive
-RUNTIME_DEP_PKGS_CSWlibarchive-devel = CSWlibarchive2
-PKGFILES_CSWlibarchive-devel = $(PKGFILES_DEVEL)
-PKGFILES_CSWlibarchive-devel += $(mandir)/man5/.*
+PACKAGES += CSWlibarchive-dev
+SPKG_DESC_CSWlibarchive-dev = Development files for libarchive.so.2
+RUNTIME_DEP_PKGS_CSWlibarchive-dev = CSWlibarchive2
+PKGFILES_CSWlibarchive-dev = $(PKGFILES_DEVEL)
+PKGFILES_CSWlibarchive-dev += $(mandir)/man5/.*
+OBSOLETED_BY_CSWlibarchive-dev += CSWlibarchive-devel
 
 PACKAGES += CSWlibarchive-utils
-CATALOGNAME_CSWlibarchive-utils = libarchive_utils
 SPKG_DESC_CSWlibarchive-utils = Tools for reading and writing various archive formats
-RUNTIME_DEP_PKGS_CSWlibarchive-utils += CSWiconv
-RUNTIME_DEP_PKGS_CSWlibarchive-utils += CSWxz
-RUNTIME_DEP_PKGS_CSWlibarchive-utils += CSWzlib
-RUNTIME_DEP_PKGS_CSWlibarchive-utils += CSWlibxml2
-RUNTIME_DEP_PKGS_CSWlibarchive-utils += CSWbzip2
+RUNTIME_DEP_PKGS_CSWlibarchive-utils += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWlibarchive-utils += CSWliblzma5
+RUNTIME_DEP_PKGS_CSWlibarchive-utils += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibarchive-utils += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWlibarchive-utils += CSWlibbz2-1-0
 RUNTIME_DEP_PKGS_CSWlibarchive-utils += CSWosslrt
 
-BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWlibarchive42)
-BUILD_DEP_PKGS += CSWlibxml2devel CSWossldevel 
+BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWlibarchive2)
+BUILD_DEP_PKGS += CSWliblzma-dev
+BUILD_DEP_PKGS += CSWlibz-dev
+BUILD_DEP_PKGS += CSWlibbz2-dev
+BUILD_DEP_PKGS += CSWlibxml2devel
+BUILD_DEP_PKGS += CSWossldevel 
 
 EXTRA_INC = $(includedir)/cryptopp
 
 BUILD64 = 1
-NOISAEXEC = 1
-CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
+# There is currently one test failing. Skip until this is fixed:
+#   http://code.google.com/p/libarchive/issues/detail?id=171
+SKIPTEST ?= 1
 
-MERGE_DIRS_isa-extra = $(libdir)
-
 include gar/category.mk


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

From wahwah at users.sourceforge.net  Mon Aug 22 14:04:27 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Mon, 22 Aug 2011 12:04:27 +0000
Subject: [csw-devel] SF.net SVN: gar:[15402]
	csw/mgar/pkg/krb5-lib/trunk/Makefile
Message-ID: 

Revision: 15402
          http://gar.svn.sourceforge.net/gar/?rev=15402&view=rev
Author:   wahwah
Date:     2011-08-22 12:04:27 +0000 (Mon, 22 Aug 2011)

Log Message:
-----------
pkg/krb5-lib/trunk: needs fixing: linking against libkdb5

Modified Paths:
--------------
    csw/mgar/pkg/krb5-lib/trunk/Makefile

Property Changed:
----------------
    csw/mgar/pkg/krb5-lib/trunk/Makefile

Modified: csw/mgar/pkg/krb5-lib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/krb5-lib/trunk/Makefile	2011-08-22 11:58:26 UTC (rev 15401)
+++ csw/mgar/pkg/krb5-lib/trunk/Makefile	2011-08-22 12:04:27 UTC (rev 15402)
@@ -1,3 +1,9 @@
+# $Id$
+#
+# ! The build links against the version of libkdb5 installed in the system,
+# instead of the one built.
+#
+
 NAME = krb5
 VERSION = 1.9.1
 CATEGORIES = server
@@ -22,7 +28,24 @@
 
 BUILD_DEP_PKGS = CSWtcl
 
-PACKAGES = CSWlibkrb5-dev
+# Uncomment for a better view of file-package allocations.
+PACKAGES = CSWdo-not-use
+SPKG_DESC_CSWdo-not-use = Do not use this catch all package
+
+PACKAGES += CSWkrb5doc
+PKGFILES_CSWkrb5doc = NOFILES
+SPKG_DESC_CSWkrb5doc = Unused package 1
+PACKAGES += CSWkrb5user
+PKGFILES_CSWkrb5user = NOFILES
+SPKG_DESC_CSWkrb5user = Unused package 2
+PACKAGES += CSWkrb5kdc
+PKGFILES_CSWkrb5kdc = NOFILES
+SPKG_DESC_CSWkrb5kdc = Unused package 3
+PACKAGES += CSWkrb5adminserver
+PKGFILES_CSWkrb5adminserver = NOFILES
+SPKG_DESC_CSWkrb5adminserver = Unused package 4
+
+PACKAGES += CSWlibkrb5-dev
 SPKG_DESC_CSWlibkrb5-dev      = MIT Kerberos 5 developer libraries
 RUNTIME_DEP_PKGS_CSWlibkrb5-dev = CSWkrb5lib
 RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibkrb5-3
@@ -30,7 +53,12 @@
 RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibgssapi-krb5-2
 RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibk5crypto3
 RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibkrb5support0
-# Catch-all package
+RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibkrb5-priv
+PKGFILES_CSWlibkrb5-dev  = $(mandir)/man8/sserver.8
+PKGFILES_CSWlibkrb5-dev += $(mandir)/man1/(sclient|krb5-config|compile_et)\.1
+PKGFILES_CSWlibkrb5-dev += $(sbindir)/(uuserver|sserver|sim_server|gss-server)
+PKGFILES_CSWlibkrb5-dev += $(PKGFILES_DEVEL)
+PKGFILES_CSWlibkrb5-dev += $(bindir)/(uuclient|sim_client|sclient|krb5-config|gss-client|compile_et)
 OBSOLETED_BY_CSWlibkrb5-dev = CSWkrb5libdev
 CATALOGNAME_CSWkrb5libdev = krb5_lib_dev_stub
 # /usr/local in a manpage is OK.
@@ -41,48 +69,47 @@
 PKGFILES_CSWlibcom-err3 +=  $(call baseisadirs,$(libdir),libcom_err\.so\.3(\.\d+)*)
 SPKG_DESC_CSWlibcom-err3 += MIT Kerberos 5 core libraries, libcom_err.so.3
 OBSOLETED_BY_CSWlibcom-err3 = CSWkrb5lib
+RUNTIME_DEP_PKGS_CSWlibcom-err3 += CSWlibkrb5support0
 
 PACKAGES += CSWlibgssapi-krb5-2
 CATALOGNAME_CSWlibgssapi-krb5-2 = libgssapi_krb5_2
 PKGFILES_CSWlibgssapi-krb5-2 +=  $(call baseisadirs,$(libdir),libgssapi_krb5\.so\.2(\.\d+)*)
 SPKG_DESC_CSWlibgssapi-krb5-2 += MIT Kerberos 5 core libraries, libgssapi_krb5.so.2
 OBSOLETED_BY_CSWlibgssapi-krb5-2 = CSWkrb5lib
+RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibkrb5-3
+RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibcom-err3
+RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibk5crypto3
+RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibkrb5support0
 
-# This is a private library
-#PACKAGES += CSWlibgssrpc4
-#CATALOGNAME_CSWlibgssrpc4 = libgssrpc4
-#PKGFILES_CSWlibgssrpc4 += $(call baseisadirs,$(libdir),libgssrpc\.so\.4(\.\d+)*)
-#SPKG_DESC_CSWlibgssrpc4 += MIT Kerberos 5 core libraries, libgssrpc.so.4
-
 PACKAGES += CSWlibk5crypto3
 CATALOGNAME_CSWlibk5crypto3 = libk5crypto3
 PKGFILES_CSWlibk5crypto3 += $(call baseisadirs,$(libdir),libk5crypto\.so\.3(\.\d+)*)
 SPKG_DESC_CSWlibk5crypto3 += MIT Kerberos 5 core libraries, libk5crypto.so.3
+RUNTIME_DEP_PKGS_CSWlibk5crypto3 += CSWlibkrb5support0
 OBSOLETED_BY_CSWlibk5crypto3 = CSWkrb5lib
 
-# This is a private library
-#PACKAGES += CSWlibkadm5clnt-mit7
-#CATALOGNAME_CSWlibkadm5clnt-mit7 = libkadm5clnt_mit7
-#PKGFILES_CSWlibkadm5clnt-mit7 += $(call baseisadirs,$(libdir),libkadm5clnt_mit\.so\.7(\.\d+)*)
-#SPKG_DESC_CSWlibkadm5clnt-mit7 += MIT Kerberos 5 core libraries, libkadm5clnt_mit.so.7
+PACKAGES += CSWlibkrb5-priv
+SPKG_DESC_CSWlibkrb5-priv = Kerberos private shared libraries, do not link against this package
+PKGFILES_CSWlibkrb5-priv += $(call baseisadirs,$(libdir),libgssrpc\.so\.\d+(\.\d+)*)
+PKGFILES_CSWlibkrb5-priv += $(call baseisadirs,$(libdir),libkadm5clnt_mit\.so\.\d+(\.\d+)*)
+PKGFILES_CSWlibkrb5-priv += $(call baseisadirs,$(libdir),libkadm5srv_mit\.so\.\d+(\.\d+)*)
+PKGFILES_CSWlibkrb5-priv += $(call baseisadirs,$(libdir),libkdb5\.so\.\d+(\.\d+)*)
+# Private libraries in one common package.
+CHECKPKG_OVERRIDES_CSWlibkrb5-priv += shared-lib-pkgname-mismatch
+RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibgssapi-krb5-2
+RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibkrb5-3
+RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibkrb5support0
+RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibcom-err3
+RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibk5crypto3
 
-# This is a private library
-#PACKAGES += CSWlibkadm5srv-mit7
-#CATALOGNAME_CSWlibkadm5srv-mit7 = libkadm5srv_mit7
-#PKGFILES_CSWlibkadm5srv-mit7 += $(call baseisadirs,$(libdir),libkadm5srv_mit\.so\.7(\.\d+)*)
-#SPKG_DESC_CSWlibkadm5srv-mit7 += MIT Kerberos 5 core libraries, libkadm5srv_mit.so.7
-
-# This is a private library
-#PACKAGES += CSWlibkdb5-4
-#CATALOGNAME_CSWlibkdb5-4 = libkdb5_4
-#PKGFILES_CSWlibkdb5-4 += $(call baseisadirs,$(libdir),libkdb5\.so\.4(\.\d+)*)
-#SPKG_DESC_CSWlibkdb5-4 += MIT Kerberos 5 core libraries, libkdb5.so.4
-
 PACKAGES += CSWlibkrb5-3
 CATALOGNAME_CSWlibkrb5-3 = libkrb5_3
 PKGFILES_CSWlibkrb5-3 += $(call baseisadirs,$(libdir),libkrb5\.so\.3(\.\d+)*)
 SPKG_DESC_CSWlibkrb5-3 += MIT Kerberos 5 core libraries, libkrb5.so.3
 OBSOLETED_BY_CSWlibkrb5-3 = CSWkrb5lib
+RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibkrb5support0
+RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibcom-err3
+RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibk5crypto3
 
 PACKAGES += CSWlibkrb5support0
 CATALOGNAME_CSWlibkrb5support0 = libkrb5support0
@@ -90,18 +117,6 @@
 SPKG_DESC_CSWlibkrb5support0 += MIT Kerberos 5 core libraries, libkrb5support.so.0
 OBSOLETED_BY_CSWlibkrb5-3 = CSWkrb5lib
 
-
-ARCHALL_CSWkrb5lib = 1
-RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibkrb5-3
-RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibcom-err3
-RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibk5crypto3
-RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibkrb5support0
-RUNTIME_DEP_PKGS_CSWlibcom-err3 += CSWlibkrb5support0
-RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibkrb5support0
-RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibcom-err3
-RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibk5crypto3
-RUNTIME_DEP_PKGS_CSWlibk5crypto3 += CSWlibkrb5support0
-
 LICENSE = doc/copyright.texinfo
 
 CONFIGURE_SCRIPTS = $(WORKSRC)/src/configure


Property changes on: csw/mgar/pkg/krb5-lib/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
   + Id


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

From wahwah at users.sourceforge.net  Mon Aug 22 14:17:48 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Mon, 22 Aug 2011 12:17:48 +0000
Subject: [csw-devel] SF.net SVN: gar:[15403]
	csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
Message-ID: 

Revision: 15403
          http://gar.svn.sourceforge.net/gar/?rev=15403&view=rev
Author:   wahwah
Date:     2011-08-22 12:17:48 +0000 (Mon, 22 Aug 2011)

Log Message:
-----------
pkg/gcc4/branches/bootstrap-4.6: removing DIRPATHS

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile

Modified: csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-22 12:04:27 UTC (rev 15402)
+++ csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-22 12:17:48 UTC (rev 15403)
@@ -43,22 +43,9 @@
 # Could be used to break out of the /opt/csw/gcc4 prefix
 # CONFIGURE_ARGS += --program-prefix=gcc4-
 
-CONFIGURE_ARGS += $(DIRPATHS)
 CONFIGURE_ARGS += --prefix=$(prefix)
-# The theory is that this confuses the installer
+# The theory is that DIRPATHS confuse the installer, e.g. includedir
 # CONFIGURE_ARGS += --includedir=$(prefix)/include
-CONFIGURE_ARGS += --exec_prefix=$(prefix)
-CONFIGURE_ARGS += --bindir=$(bindir)
-CONFIGURE_ARGS += --sbindir=$(sbindir)
-CONFIGURE_ARGS += --libexecdir=$(libexecdir)
-CONFIGURE_ARGS += --datadir=$(datadir)
-CONFIGURE_ARGS += --sysconfdir=/etc$(prefix)
-CONFIGURE_ARGS += --sharedstatedir=$(prefix)/share
-CONFIGURE_ARGS += --localstatedir=/var$(prefix)
-CONFIGURE_ARGS += --libdir=$(libdir)
-CONFIGURE_ARGS += --infodir=$(datadir)/info
-CONFIGURE_ARGS += --mandir=$(mandir)
-
 CONFIGURE_ARGS += --exec-prefix=$(BUILD_PREFIX)/gcc4
 CONFIGURE_ARGS += --with-gnu-as
 CONFIGURE_ARGS += --with-as=/opt/csw/bin/gas


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 Aug 22 15:15:45 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Mon, 22 Aug 2011 13:15:45 +0000
Subject: [csw-devel] SF.net SVN: gar:[15404] csw/mgar/pkg/llvm/trunk/Makefile
Message-ID: 

Revision: 15404
          http://gar.svn.sourceforge.net/gar/?rev=15404&view=rev
Author:   wahwah
Date:     2011-08-22 13:15:44 +0000 (Mon, 22 Aug 2011)

Log Message:
-----------
pkg/llvm/trunk: add deps, use a subdirectory for shared libraries

Modified Paths:
--------------
    csw/mgar/pkg/llvm/trunk/Makefile

Modified: csw/mgar/pkg/llvm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/llvm/trunk/Makefile	2011-08-22 12:17:48 UTC (rev 15403)
+++ csw/mgar/pkg/llvm/trunk/Makefile	2011-08-22 13:15:44 UTC (rev 15404)
@@ -6,7 +6,7 @@
 GARTYPE = v2
 CATEGORIES = lib
 
-DESCRIPTION = Brief description
+DESCRIPTION = Collection of modular and reusable compiler and toolchain technologies
 define BLURB
   Long description
 endef
@@ -20,6 +20,8 @@
 
 GARCOMPILER = GNU
 
+libdir = $(prefix)/lib/llvm
+
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --disable-optimized
 # ocaml causes a compilation failure
@@ -33,6 +35,9 @@
 PATCHFILES += 0003-OpenCSW-bash-with-the-Python-test-runner.patch
 PATCHFILES += 0004-test-runner-adaptation-to-Solaris.patch
 
+RUNTIME_DEP_PKGS_CSWllvm += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWllvm += CSWgcc4corert
+
 ENABLE_OPTIMIZED = 1
 OPTIMIZE_OPTION = -O0
 SHELL = /opt/csw/bin/bash


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

From aigoshin at users.sourceforge.net  Mon Aug 22 16:32:34 2011
From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net)
Date: Mon, 22 Aug 2011 14:32:34 +0000
Subject: [csw-devel] SF.net SVN: gar:[15405] csw/mgar/pkg/nginx/trunk
Message-ID: 

Revision: 15405
          http://gar.svn.sourceforge.net/gar/?rev=15405&view=rev
Author:   aigoshin
Date:     2011-08-22 14:32:34 +0000 (Mon, 22 Aug 2011)

Log Message:
-----------
nginx: release 20110822

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

Modified: csw/mgar/pkg/nginx/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nginx/trunk/Makefile	2011-08-22 13:15:44 UTC (rev 15404)
+++ csw/mgar/pkg/nginx/trunk/Makefile	2011-08-22 14:32:34 UTC (rev 15405)
@@ -1,5 +1,5 @@
 NAME       = nginx
-VERSION    = 1.1.0
+VERSION    = 1.1.1
 CATEGORIES = server
 
 GARCOMPILER = SOS11

Modified: csw/mgar/pkg/nginx/trunk/checksums
===================================================================
--- csw/mgar/pkg/nginx/trunk/checksums	2011-08-22 13:15:44 UTC (rev 15404)
+++ csw/mgar/pkg/nginx/trunk/checksums	2011-08-22 14:32:34 UTC (rev 15405)
@@ -1 +1 @@
-3381f34eafc755f935a2d94148500505  nginx-1.1.0.tar.gz
+5afe88508dfca83db2cb991dceceb3a3  nginx-1.1.1.tar.gz


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

From dmichelsen at users.sourceforge.net  Mon Aug 22 16:36:42 2011
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 22 Aug 2011 14:36:42 +0000
Subject: [csw-devel] SF.net SVN: gar:[15406] csw/mgar/pkg/libfpx/trunk
Message-ID: 

Revision: 15406
          http://gar.svn.sourceforge.net/gar/?rev=15406&view=rev
Author:   dmichelsen
Date:     2011-08-22 14:36:42 +0000 (Mon, 22 Aug 2011)

Log Message:
-----------
libfpx: General cleanup, adjust package names to latest standard

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

Modified: csw/mgar/pkg/libfpx/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libfpx/trunk/Makefile	2011-08-22 14:32:34 UTC (rev 15405)
+++ csw/mgar/pkg/libfpx/trunk/Makefile	2011-08-22 14:36:42 UTC (rev 15406)
@@ -1,6 +1,5 @@
 NAME = libfpx
 VERSION = 1.3.0
-GARSUBREV = 1
 CATEGORIES = lib
 
 DESCRIPTION = FlashPIX library
@@ -8,40 +7,41 @@
 endef
 
 MASTER_SITES = ftp://ftp.imagemagick.org/pub/ImageMagick/delegates/
-DISTFILES  = $(NAME)-$(VERSION)-$(GARSUBREV).tar.bz2
+DISTFILES  = $(DISTNAME).tar.xz
 
-PACKAGES = CSWlibfpx CSWlibfpxdevel
-CATALOGNAME_CSWlibfpx = libfpx
-CATALOGNAME_CSWlibfpxdevel = libfpx_devel
-
-SPKG_DESC_CSWlibfpx += FlashPIX library
-SPKG_DESC_CSWlibfpxdevel += FlashPIX library - developer package
-
-RUNTIME_DEP_PKGS_CSWlibfpx +=
-RUNTIME_DEP_PKGS_CSWlibfpxdevel += CSWlibfpx
-
-PKGFILES_CSWlibfpxdevel = $(PKGFILES_DEVEL)
-
-SPKG_SOURCEURL = http://www.imagemagick.org
-
-PATCHFILES = olecomm.h.patch
+PATCHFILES += olecomm.h.patch
 PATCHFILES += tchar.patch
 
+VENDOR_URL = http://www.imagemagick.org
 LICENSE = flashpix.h
 
-DOCFILES = AUTHORS ChangeLog NEWS README
+PACKAGES += CSWlibfpx1
+SPKG_DESC_CSWlibfpx1 = FlashPIX library, libfpx.so.1
+PKGFILES_CSWlibfpx1 += $(call pkgfiles_lib,libfpx.so.1)
+OBSOLETED_BY_CSWlibfpx1 += CSWlibfpx
 
-UFILES_REGEX = $(NAME)-((\d+(?:\.\d+)*)-(\d+)?).tar.bz2
+PACKAGES += CSWlibfpx-dev
+SPKG_DESC_CSWlibfpx-dev = Development files for libfpx.so.1
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWlibfpx-dev += CSWlibfpx1
+OBSOLETED_BY_CSWlibfpx-dev += CSWlibfpxdevel
+CATALOGNAME_CSWlibfpxdevel = libfpx_devel_stub
 
+DOCFILES += AUTHORS
+DOCFILES += ChangeLog
+DOCFILES += NEWS
+DOCFILES += README
+
 # Fix for problem introduced between 12101[7-8]-17 and 12101[7-8]-20
 CXXFLAGS += -D_RWSTD_NO_WSTR=1
 
-CONFIGURE_ARGS  = $(DIRPATHS)
+BUILD64 = 1
 
-STRIP_LIBTOOL=1
+STRIP_LIBTOOL = 1
 
-TEST_TARGET = check
+include gar/category.mk
 
-BUILD64 = 1
-
-include gar/category.mk
+post-install-modulated:
+	ginstall -d $(DESTDIR)$(docdir)/libfpx_dev
+	cd $(WORKSRC) && ginstall -m 0644 $(DOCFILES) $(DESTDIR)$(docdir)/libfpx_dev
+	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/libfpx/trunk/checksums
===================================================================
--- csw/mgar/pkg/libfpx/trunk/checksums	2011-08-22 14:32:34 UTC (rev 15405)
+++ csw/mgar/pkg/libfpx/trunk/checksums	2011-08-22 14:36:42 UTC (rev 15406)
@@ -1,3 +1 @@
-d65c555aa68a296d6eba384929434d70  libfpx-1.3.0-1.tar.bz2
-d921300d89983df26f66f45b391bdc60  olecomm.h.patch
-0e4672051619c7da13f643b8c42560cd  tchar.patch
+cee1256ac7ab0d78ab6e11daad78db06  libfpx-1.3.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  Mon Aug 22 19:59:15 2011
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 22 Aug 2011 17:59:15 +0000
Subject: [csw-devel] SF.net SVN: gar:[15407]
	csw/mgar/pkg/libfpx/trunk/Makefile
Message-ID: 

Revision: 15407
          http://gar.svn.sourceforge.net/gar/?rev=15407&view=rev
Author:   dmichelsen
Date:     2011-08-22 17:59:14 +0000 (Mon, 22 Aug 2011)

Log Message:
-----------
libfpx: Fix flag setting

Modified Paths:
--------------
    csw/mgar/pkg/libfpx/trunk/Makefile

Modified: csw/mgar/pkg/libfpx/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libfpx/trunk/Makefile	2011-08-22 14:36:42 UTC (rev 15406)
+++ csw/mgar/pkg/libfpx/trunk/Makefile	2011-08-22 17:59:14 UTC (rev 15407)
@@ -33,7 +33,7 @@
 DOCFILES += README
 
 # Fix for problem introduced between 12101[7-8]-17 and 12101[7-8]-20
-CXXFLAGS += -D_RWSTD_NO_WSTR=1
+EXTRA_CPPFLAGS += -D_RWSTD_NO_WSTR=1
 
 BUILD64 = 1
 


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 Aug 22 22:29:36 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Mon, 22 Aug 2011 20:29:36 +0000
Subject: [csw-devel] SF.net SVN: gar:[15408]
	csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
Message-ID: 

Revision: 15408
          http://gar.svn.sourceforge.net/gar/?rev=15408&view=rev
Author:   wahwah
Date:     2011-08-22 20:29:36 +0000 (Mon, 22 Aug 2011)

Log Message:
-----------
pkg/gcc4/branches/bootstrap-4.6: add the libdir settings

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile

Modified: csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-22 17:59:14 UTC (rev 15407)
+++ csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-22 20:29:36 UTC (rev 15408)
@@ -44,6 +44,7 @@
 # CONFIGURE_ARGS += --program-prefix=gcc4-
 
 CONFIGURE_ARGS += --prefix=$(prefix)
+CONFIGURE_ARGS += --libdir=$(libdir)
 # The theory is that DIRPATHS confuse the installer, e.g. includedir
 # CONFIGURE_ARGS += --includedir=$(prefix)/include
 CONFIGURE_ARGS += --exec-prefix=$(BUILD_PREFIX)/gcc4


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

From wahwah at users.sourceforge.net  Tue Aug 23 11:05:13 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 23 Aug 2011 09:05:13 +0000
Subject: [csw-devel] SF.net SVN: gar:[15409]
	csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
Message-ID: 

Revision: 15409
          http://gar.svn.sourceforge.net/gar/?rev=15409&view=rev
Author:   wahwah
Date:     2011-08-23 09:05:12 +0000 (Tue, 23 Aug 2011)

Log Message:
-----------
pkg/gcc4/branches/bootstrap-4.6: libiconv2 dep for all

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile

Modified: csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-22 20:29:36 UTC (rev 15408)
+++ csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-23 09:05:12 UTC (rev 15409)
@@ -414,18 +414,27 @@
 RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibmpfr4
 RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibgmp10
 
-# Solaris 10 on i386 specific:
-RUNTIME_DEP_PKGS_CSWgcc4core_i386_5.10 += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWgcc4g++_i386_5.10 += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWgcc4gfortran_i386_5.10 += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWgcc4objc_i386_5.10 += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWgcc4java_i386_5.10 += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWgcc4core += $(RUNTIME_DEP_PKGS_CSWgcc4core_$(GARCH)_$(GAROSREL))
-RUNTIME_DEP_PKGS_CSWgcc4g++ += $(RUNTIME_DEP_PKGS_CSWgcc4g++_$(GARCH)_$(GAROSREL))
-RUNTIME_DEP_PKGS_CSWgcc4gfortran += $(RUNTIME_DEP_PKGS_CSWgcc4gfortran_$(GARCH)_$(GAROSREL))
-RUNTIME_DEP_PKGS_CSWgcc4objc += $(RUNTIME_DEP_PKGS_CSWgcc4objc_$(GARCH)_$(GAROSREL))
-RUNTIME_DEP_PKGS_CSWgcc4java += $(RUNTIME_DEP_PKGS_CSWgcc4java_$(GARCH)_$(GAROSREL))
+# libiconv deps cropped up relatively late in the porting process. Perhaps
+# they apply to all arch/OS combinations.
+RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWgcc4g++ += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWgcc4java += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibiconv2
 
+# Maybe it's unnecessary.
+# # Solaris 10 on i386 specific:
+# RUNTIME_DEP_PKGS_CSWgcc4core_i386_5.10 += CSWlibiconv2
+# RUNTIME_DEP_PKGS_CSWgcc4g++_i386_5.10 += CSWlibiconv2
+# RUNTIME_DEP_PKGS_CSWgcc4gfortran_i386_5.10 += CSWlibiconv2
+# RUNTIME_DEP_PKGS_CSWgcc4objc_i386_5.10 += CSWlibiconv2
+# RUNTIME_DEP_PKGS_CSWgcc4java_i386_5.10 += CSWlibiconv2
+# RUNTIME_DEP_PKGS_CSWgcc4core += $(RUNTIME_DEP_PKGS_CSWgcc4core_$(GARCH)_$(GAROSREL))
+# RUNTIME_DEP_PKGS_CSWgcc4g++ += $(RUNTIME_DEP_PKGS_CSWgcc4g++_$(GARCH)_$(GAROSREL))
+# RUNTIME_DEP_PKGS_CSWgcc4gfortran += $(RUNTIME_DEP_PKGS_CSWgcc4gfortran_$(GARCH)_$(GAROSREL))
+# RUNTIME_DEP_PKGS_CSWgcc4objc += $(RUNTIME_DEP_PKGS_CSWgcc4objc_$(GARCH)_$(GAROSREL))
+# RUNTIME_DEP_PKGS_CSWgcc4java += $(RUNTIME_DEP_PKGS_CSWgcc4java_$(GARCH)_$(GAROSREL))
+
 PACKAGES += $(PACKAGES_$(GARCH))
 
 include files/scripts.mk


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

From dmichelsen at users.sourceforge.net  Tue Aug 23 15:25:56 2011
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 23 Aug 2011 13:25:56 +0000
Subject: [csw-devel] SF.net SVN: gar:[15410]
	csw/mgar/pkg/krb5-lib/trunk/Makefile
Message-ID: 

Revision: 15410
          http://gar.svn.sourceforge.net/gar/?rev=15410&view=rev
Author:   dmichelsen
Date:     2011-08-23 13:25:55 +0000 (Tue, 23 Aug 2011)
Log Message:
-----------
krb5-lib: Fix flags

Modified Paths:
--------------
    csw/mgar/pkg/krb5-lib/trunk/Makefile

Modified: csw/mgar/pkg/krb5-lib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/krb5-lib/trunk/Makefile	2011-08-23 09:05:12 UTC (rev 15409)
+++ csw/mgar/pkg/krb5-lib/trunk/Makefile	2011-08-23 13:25:55 UTC (rev 15410)
@@ -119,6 +119,13 @@
 
 LICENSE = doc/copyright.texinfo
 
+# Wrong quoting, either fix $ISALIST or disable for now
+#NOISALIST = 1
+#LD_OPTIONS =
+#EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS)
+
+EXTRA_CPPFLAGS += -D__EXTENSIONS__
+
 CONFIGURE_SCRIPTS = $(WORKSRC)/src/configure
 
 BUILD64 = 1
@@ -140,7 +147,6 @@
 BUILD_SCRIPTS  = $(WORKSRC)/src/Makefile
 
 TEST_SCRIPTS = $(WORKSRC)/src/Makefile
-TEST_TARGET = check
 
 SKIPTEST ?= 1
 
@@ -155,16 +161,10 @@
 
 include gar/category.mk
 
-# The flags must not contain additional spaces or the build freaks out
-CFLAGS := $(strip $(CFLAGS) -L$(libdir) -D__EXTENSIONS__)
-CXXFLAGS := $(strip $(CXXFLAGS) -D__EXTENSIONS__)
-#LDFLAGS := $(strip $(LDFLAGS))
-
-LD_OPTIONS =
-EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS)
-
-
 post-extract-modulated:
 	@# TODO: Check signature
-	@cd $(WORKDIR) && (gzip -c -d $(NAME)-$(VERSION).tar.gz | tar xf -)
+	cd $(WORKDIR) && (gzip -c -d $(NAME)-$(VERSION).tar.gz | tar xf -)
+	@# libcrypto.so is part of openssl and expected to be linkable without setting a linker search path
+	perl -pi -e 's,-lcrypto,-L$(libdir) -lcrypto,' \
+		$(WORKSRC)/src/plugins/preauth/pkinit/Makefile.in
 	@$(MAKECOOKIE)

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


From dmichelsen at users.sourceforge.net  Tue Aug 23 15:27:02 2011
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 23 Aug 2011 13:27:02 +0000
Subject: [csw-devel] SF.net SVN: gar:[15411]
	csw/mgar/pkg/krb5-lib/trunk/Makefile
Message-ID: 

Revision: 15411
          http://gar.svn.sourceforge.net/gar/?rev=15411&view=rev
Author:   dmichelsen
Date:     2011-08-23 13:27:02 +0000 (Tue, 23 Aug 2011)
Log Message:
-----------
krb5-lib: Remove extra comments

Modified Paths:
--------------
    csw/mgar/pkg/krb5-lib/trunk/Makefile

Modified: csw/mgar/pkg/krb5-lib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/krb5-lib/trunk/Makefile	2011-08-23 13:25:55 UTC (rev 15410)
+++ csw/mgar/pkg/krb5-lib/trunk/Makefile	2011-08-23 13:27:02 UTC (rev 15411)
@@ -119,11 +119,6 @@
 
 LICENSE = doc/copyright.texinfo
 
-# Wrong quoting, either fix $ISALIST or disable for now
-#NOISALIST = 1
-#LD_OPTIONS =
-#EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS)
-
 EXTRA_CPPFLAGS += -D__EXTENSIONS__
 
 CONFIGURE_SCRIPTS = $(WORKSRC)/src/configure

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


From aigoshin at users.sourceforge.net  Tue Aug 23 15:29:19 2011
From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net)
Date: Tue, 23 Aug 2011 13:29:19 +0000
Subject: [csw-devel] SF.net SVN: gar:[15412]
	csw/mgar/pkg/nginx/trunk/Makefile
Message-ID: 

Revision: 15412
          http://gar.svn.sourceforge.net/gar/?rev=15412&view=rev
Author:   aigoshin
Date:     2011-08-23 13:29:19 +0000 (Tue, 23 Aug 2011)
Log Message:
-----------
nginx: release 20110823

Modified Paths:
--------------
    csw/mgar/pkg/nginx/trunk/Makefile

Modified: csw/mgar/pkg/nginx/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nginx/trunk/Makefile	2011-08-23 13:27:02 UTC (rev 15411)
+++ csw/mgar/pkg/nginx/trunk/Makefile	2011-08-23 13:29:19 UTC (rev 15412)
@@ -19,7 +19,7 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz
 
-RUNTIME_DEP_PKGS = CSWosslrt CSWlibpcre0 CSWzlib CSWperl
+RUNTIME_DEP_PKGS = CSWosslrt CSWlibpcre0 CSWzlib1 CSWperl
 
 PACKAGING_PLATFORMS  = solaris9-sparc  solaris9-i386
 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386

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


From wahwah at users.sourceforge.net  Tue Aug 23 16:55:43 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 23 Aug 2011 14:55:43 +0000
Subject: [csw-devel] SF.net SVN: gar:[15413]
	csw/mgar/pkg/krb5-lib/trunk/Makefile
Message-ID: 

Revision: 15413
          http://gar.svn.sourceforge.net/gar/?rev=15413&view=rev
Author:   wahwah
Date:     2011-08-23 14:55:43 +0000 (Tue, 23 Aug 2011)
Log Message:
-----------
pkg/krb5-lib/trunk: commenting out two debugging related lines

Modified Paths:
--------------
    csw/mgar/pkg/krb5-lib/trunk/Makefile

Modified: csw/mgar/pkg/krb5-lib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/krb5-lib/trunk/Makefile	2011-08-23 13:29:19 UTC (rev 15412)
+++ csw/mgar/pkg/krb5-lib/trunk/Makefile	2011-08-23 14:55:43 UTC (rev 15413)
@@ -29,8 +29,8 @@
 BUILD_DEP_PKGS = CSWtcl
 
 # Uncomment for a better view of file-package allocations.
-PACKAGES = CSWdo-not-use
-SPKG_DESC_CSWdo-not-use = Do not use this catch all package
+# PACKAGES = CSWdo-not-use
+# SPKG_DESC_CSWdo-not-use = Do not use this catch all package
 
 PACKAGES += CSWkrb5doc
 PKGFILES_CSWkrb5doc = NOFILES

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 Aug 23 17:35:33 2011
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 23 Aug 2011 15:35:33 +0000
Subject: [csw-devel] SF.net SVN: gar:[15414] csw/mgar/pkg/dbus/trunk
Message-ID: 

Revision: 15414
          http://gar.svn.sourceforge.net/gar/?rev=15414&view=rev
Author:   dmichelsen
Date:     2011-08-23 15:35:33 +0000 (Tue, 23 Aug 2011)

Log Message:
-----------
dbus: Intermediate commit, working on bringing patches upstream

Modified Paths:
--------------
    csw/mgar/pkg/dbus/trunk/Makefile
    csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c.diff

Added Paths:
-----------
    csw/mgar/pkg/dbus/trunk/files/0002-Add-missing-inclusion-of-inttypes.h.patch
    csw/mgar/pkg/dbus/trunk/files/attachment-50480.patch
    csw/mgar/pkg/dbus/trunk/files/attachment.cgi?id=50498

Modified: csw/mgar/pkg/dbus/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dbus/trunk/Makefile	2011-08-23 14:55:43 UTC (rev 15413)
+++ csw/mgar/pkg/dbus/trunk/Makefile	2011-08-23 15:35:33 UTC (rev 15414)
@@ -1,10 +1,12 @@
-# TBD:
-# - test position of pidfile in compilation and cswdbus
-# - cleanup of /usr/share, /usr/local occurrences
+# $Id: Makefile 15327 2011-08-12 21:35:23Z dmichelsen $
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+# ! test position of pidfile in compilation and cswdbus
+# ! cleanup of /usr/share, /usr/local occurrences
 
-NAME      = dbus
-VERSION   = 1.5.6
-CATEGORIES   = lib
+NAME = dbus
+VERSION = 1.5.6
+CATEGORIES = lib
 
 DESCRIPTION  = DBus Message Bus System
 define BLURB
@@ -28,10 +30,22 @@
 DISTFILES += cswusergroup
 DISTFILES += cswdbus
 
-PATCHFILES += dbus-sysdeps-unix.c.diff
-PATCHFILES += dbus-sysdeps.h.diff
+# Use this patch until this issue is fixed:
+#   http://bugs.freedesktop.org/show_bug.cgi?id=40235
+#PATCHFILES += dbus-sysdeps-unix.c.diff
+
+#PATCHFILES += dbus-sysdeps.h.diff
+
+# Use patch until this is fixed:
+#   http://bugs.freedesktop.org/show_bug.cgi?id=40313
+PATCHFILES += 0002-Add-missing-inclusion-of-inttypes.h.patch
+
+# Use this custom-patch unless this is fixed:
+#   http://bugs.freedesktop.org/show_bug.cgi?id=39987
 PATCHFILES += 0001-Use-LOG_PERROR-only-when-available.patch
 
+PATCHFILES += attachment-50480.patch
+
 PACKAGES += CSWdbus
 CATALOGNAME_CSWdbus = dbus
 SPKG_DESC_CSWdbus = $(DESCRIPTION)

Added: csw/mgar/pkg/dbus/trunk/files/0002-Add-missing-inclusion-of-inttypes.h.patch
===================================================================
--- csw/mgar/pkg/dbus/trunk/files/0002-Add-missing-inclusion-of-inttypes.h.patch	                        (rev 0)
+++ csw/mgar/pkg/dbus/trunk/files/0002-Add-missing-inclusion-of-inttypes.h.patch	2011-08-23 15:35:33 UTC (rev 15414)
@@ -0,0 +1,27 @@
+From e54601c6645a7e6041c808866029866990d27f69 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen 
+Date: Tue, 23 Aug 2011 16:52:46 +0200
+Subject: [PATCH] Add missing inclusion of inttypes.h
+
+---
+ dbus/dbus-sysdeps.h |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/dbus/dbus-sysdeps.h b/dbus/dbus-sysdeps.h
+index f66efaa..f8438f4 100644
+--- a/dbus/dbus-sysdeps.h
++++ b/dbus/dbus-sysdeps.h
+@@ -31,6 +31,10 @@
+ #include 
+ #endif
+ 
++#ifdef HAVE_INTTYPES_H
++#include 
++#endif
++
+ #include 
+ #include 
+ #include 
+-- 
+1.7.6
+

Added: csw/mgar/pkg/dbus/trunk/files/attachment-50480.patch
===================================================================
--- csw/mgar/pkg/dbus/trunk/files/attachment-50480.patch	                        (rev 0)
+++ csw/mgar/pkg/dbus/trunk/files/attachment-50480.patch	2011-08-23 15:35:33 UTC (rev 15414)
@@ -0,0 +1,57 @@
+From 66e0c1525bca0830ea8e9f420927d18f4676e46f Mon Sep 17 00:00:00 2001
+From: Simon McVittie 
+Date: Tue, 23 Aug 2011 12:05:00 +0100
+Subject: [PATCH] On Solaris, define CMSG_ALIGN, CMSG_LEN, CMSG_SPACE if
+ undefined
+
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40235
+---
+ dbus/dbus-sysdeps-unix.c |   32 ++++++++++++++++++++++++++++++++
+ 1 files changed, 32 insertions(+), 0 deletions(-)
+
+diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
+index e69f3b5..171977d 100644
+--- a/dbus/dbus-sysdeps-unix.c
++++ b/dbus/dbus-sysdeps-unix.c
+@@ -90,6 +90,38 @@
+ #define socklen_t int
+ #endif
+ 
++#if defined (__sun) || defined (__sun__)
++/*
++ * CMS_SPACE etc. definitions for Solaris < 10, based on
++ *   http://mailman.videolan.org/pipermail/vlc-devel/2006-May/024402.html
++ * via
++ *   http://wiki.opencsw.org/porting-faq#toc10
++ *
++ * These are only redefined for Solaris, for now: if your OS needs these too,
++ * please file a bug. (Or preferably, improve your OS so they're not needed.)
++ */
++
++# ifndef CMSG_ALIGN
++#   ifdef __sun__
++#     define CMSG_ALIGN(len) _CMSG_DATA_ALIGN (len)
++#   else
++      /* aligning to sizeof (long) is assumed to be portable (fd.o#40235) */
++#     define CMSG_ALIGN(len) (((len) + sizeof (long) - 1) & \
++                              ~(sizeof (long) - 1))
++#   endif
++# endif
++
++# ifndef CMSG_SPACE
++#   define CMSG_SPACE(len) (CMSG_ALIGN (sizeof (struct cmsghdr)) + \
++                            CMSG_ALIGN (len))
++# endif
++
++# ifndef CMSG_LEN
++#   define CMSG_LEN(len) (CMSG_ALIGN (sizeof (struct cmsghdr)) + (len))
++# endif
++
++#endif /* Solaris */
++
+ static dbus_bool_t
+ _dbus_open_socket (int              *fd_p,
+                    int               domain,
+-- 
+1.7.5.4
+

Added: csw/mgar/pkg/dbus/trunk/files/attachment.cgi?id=50498
===================================================================
--- csw/mgar/pkg/dbus/trunk/files/attachment.cgi?id=50498	                        (rev 0)
+++ csw/mgar/pkg/dbus/trunk/files/attachment.cgi?id=50498	2011-08-23 15:35:33 UTC (rev 15414)
@@ -0,0 +1,143 @@
+From bf6bd403c7d74b2bc9e7bef53bce3d69d47870ac Mon Sep 17 00:00:00 2001
+From: Simon McVittie 
+Date: Tue, 23 Aug 2011 16:14:21 +0100
+Subject: [PATCH 2/2] Add a semi-automatic test for _dbus_system_log
+
+---
+ test/Makefile.am        |    5 ++
+ test/internals/syslog.c |  100 +++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 105 insertions(+), 0 deletions(-)
+ create mode 100644 test/internals/syslog.c
+
+diff --git a/test/Makefile.am b/test/Makefile.am
+index e5fd756..54ba823 100644
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -101,6 +101,10 @@ test_refs_SOURCES = internals/refs.c
+ test_refs_CPPFLAGS = -DDBUS_STATIC_BUILD $(GLIB_CFLAGS)
+ test_refs_LDADD = libdbus-testutils.la $(GLIB_LIBS) $(TEST_LIBS)
+ 
++test_syslog_SOURCES = internals/syslog.c
++test_syslog_CPPFLAGS = -DDBUS_STATIC_BUILD $(GLIB_CFLAGS)
++test_syslog_LDADD = libdbus-testutils.la $(GLIB_LIBS) $(TEST_LIBS)
++
+ EXTRA_DIST = dbus-test-runner
+ 
+ testexecdir = $(libdir)/dbus-1.0/test
+@@ -114,6 +118,7 @@ installable_tests = \
+ 	test-marshal \
+ 	test-refs \
+ 	test-relay \
++	test-syslog \
+ 	$(NULL)
+ 
+ installcheck_tests =
+diff --git a/test/internals/syslog.c b/test/internals/syslog.c
+new file mode 100644
+index 0000000..4f6b7c2
+--- /dev/null
++++ b/test/internals/syslog.c
+@@ -0,0 +1,100 @@
++/* Manual regression test for syslog support
++ *
++ * Author: Simon McVittie 
++ * Copyright ? 2011 Nokia Corporation
++ *
++ * Permission is hereby granted, free of charge, to any person
++ * obtaining a copy of this software and associated documentation files
++ * (the "Software"), to deal in the Software without restriction,
++ * including without limitation the rights to use, copy, modify, merge,
++ * publish, distribute, sublicense, and/or sell copies of the Software,
++ * and to permit persons to whom the Software is furnished to do so,
++ * subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be
++ * included in all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
++ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
++ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
++ * SOFTWARE.
++ */
++
++#include 
++
++#include 
++
++#include 
++
++#define DBUS_COMPILATION    /* this test uses libdbus-internal */
++#include 
++#include 
++
++typedef struct {
++    int dummy;
++} Fixture;
++
++static void
++setup (Fixture *f,
++    gconstpointer data)
++{
++}
++
++/* hopefully clear enough that people don't think these messages in syslog
++ * are a bug */
++#define MESSAGE "regression test for _dbus_system_log(): "
++
++static void
++test_syslog (Fixture *f,
++    gconstpointer data)
++{
++  if (g_test_trap_fork (0, 0))
++    {
++      _dbus_init_system_log ();
++      _dbus_system_log (DBUS_SYSTEM_LOG_FATAL, MESSAGE "%d", 23);
++      /* should not be reached: exit 0 so the assertion in the main process
++       * will fail */
++      exit (0);
++    }
++
++  g_test_trap_assert_failed ();
++  g_test_trap_assert_stderr ("*" MESSAGE "23\n*");
++
++  if (g_test_trap_fork (0, 0))
++    {
++      _dbus_init_system_log ();
++      _dbus_system_log (DBUS_SYSTEM_LOG_INFO, MESSAGE "%d", 42);
++      _dbus_system_log (DBUS_SYSTEM_LOG_SECURITY, MESSAGE "%d", 666);
++      exit (0);
++    }
++
++  g_test_trap_assert_passed ();
++  g_test_trap_assert_stderr ("*" MESSAGE "42\n*" MESSAGE "666\n*");
++
++  /* manual test (this is the best we can do on Windows) */
++  _dbus_init_system_log ();
++  _dbus_system_log (DBUS_SYSTEM_LOG_INFO, MESSAGE "%d", 42);
++  _dbus_system_log (DBUS_SYSTEM_LOG_SECURITY, MESSAGE "%d", 666);
++}
++
++static void
++teardown (Fixture *f,
++    gconstpointer data)
++{
++}
++
++int
++main (int argc,
++    char **argv)
++{
++  g_test_init (&argc, &argv, NULL);
++  g_test_bug_base ("https://bugs.freedesktop.org/show_bug.cgi?id=");
++
++  g_test_add ("/syslog", Fixture, NULL, setup, test_syslog, teardown);
++
++  return g_test_run ();
++}
+-- 
+1.7.5.4
+

Modified: csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c.diff
===================================================================
--- csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c.diff	2011-08-23 14:55:43 UTC (rev 15413)
+++ csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c.diff	2011-08-23 15:35:33 UTC (rev 15414)
@@ -5,8 +5,8 @@
  #include 
  #include 
 +#include 
-+#define CMSG_SPACE(l) ((size_t)_CMSG_HDR_ALIGN(sizeof (struct cmsghdr) + (l)))
-+#define CMSG_LEN(l) ((size_t)_CMSG_DATA_ALIGN(sizeof (struct cmsghdr)) + (l))
++#define XXXCMSG_SPACE(l) ((size_t)_CMSG_HDR_ALIGN(sizeof (struct cmsghdr) + (l)))
++#define XXXCMSG_LEN(l) ((size_t)_CMSG_DATA_ALIGN(sizeof (struct cmsghdr)) + (l))
 
  #ifdef HAVE_ERRNO_H
  #include 


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

From wahwah at users.sourceforge.net  Tue Aug 23 18:44:32 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 23 Aug 2011 16:44:32 +0000
Subject: [csw-devel] SF.net SVN: gar:[15415]
	csw/mgar/pkg/krb5-lib/branches/krb5-1.4.4/
Message-ID: 

Revision: 15415
          http://gar.svn.sourceforge.net/gar/?rev=15415&view=rev
Author:   wahwah
Date:     2011-08-23 16:44:32 +0000 (Tue, 23 Aug 2011)

Log Message:
-----------
Branching to potentially build the 1.4.4 code (currently released)

Added Paths:
-----------
    csw/mgar/pkg/krb5-lib/branches/krb5-1.4.4/


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

From wahwah at users.sourceforge.net  Tue Aug 23 22:24:48 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 23 Aug 2011 20:24:48 +0000
Subject: [csw-devel] SF.net SVN: gar:[15416]
	csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
Message-ID: 

Revision: 15416
          http://gar.svn.sourceforge.net/gar/?rev=15416&view=rev
Author:   wahwah
Date:     2011-08-23 20:24:48 +0000 (Tue, 23 Aug 2011)
Log Message:
-----------
pkg/gcc4/branches/bootstrap-4.6: we know of no reason for gcc4 to depend on binutils in the general case

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile

Modified: csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-23 16:44:32 UTC (rev 15415)
+++ csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-23 20:24:48 UTC (rev 15416)
@@ -149,7 +149,6 @@
 RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibssp0
 RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibz1
 RUNTIME_DEP_PKGS_CSWgcc4core += CSWpython
-RUNTIME_DEP_PKGS_CSWgcc4core += CSWbinutils
 RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibmpc2
 RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibobjc-gc3
 RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibobjc3

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


From wahwah at users.sourceforge.net  Wed Aug 24 02:31:16 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 24 Aug 2011 00:31:16 +0000
Subject: [csw-devel] SF.net SVN: gar:[15417]
	csw/mgar/pkg/krb5-lib/trunk/Makefile
Message-ID: 

Revision: 15417
          http://gar.svn.sourceforge.net/gar/?rev=15417&view=rev
Author:   wahwah
Date:     2011-08-24 00:31:15 +0000 (Wed, 24 Aug 2011)
Log Message:
-----------
pkg/krb5-lib/trunk: information about failing tests

Modified Paths:
--------------
    csw/mgar/pkg/krb5-lib/trunk/Makefile

Modified: csw/mgar/pkg/krb5-lib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/krb5-lib/trunk/Makefile	2011-08-23 20:24:48 UTC (rev 15416)
+++ csw/mgar/pkg/krb5-lib/trunk/Makefile	2011-08-24 00:31:15 UTC (rev 15417)
@@ -143,6 +143,13 @@
 
 TEST_SCRIPTS = $(WORKSRC)/src/Makefile
 
+# Some tests are failing:
+# TOP=/home/maciej/src/opencsw/pkg/krb5-lib/trunk/work/solaris9-sparc/build-isa-sparcv8/krb5-1.9.1/src/kadmin
+# Running pass `tcp' ...
+# server didn't start in 30 secondscan't read "expect_out(buffer)": no such
+# variable
+#     while executing
+#     "verbose $expect_out(buffer) 1"
 SKIPTEST ?= 1
 
 INSTALL_SCRIPTS = $(WORKSRC)/src/Makefile

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


From wahwah at users.sourceforge.net  Wed Aug 24 08:57:51 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 24 Aug 2011 06:57:51 +0000
Subject: [csw-devel] SF.net SVN: gar:[15418]
	csw/mgar/pkg/tcpwrappers/trunk/Makefile
Message-ID: 

Revision: 15418
          http://gar.svn.sourceforge.net/gar/?rev=15418&view=rev
Author:   wahwah
Date:     2011-08-24 06:57:51 +0000 (Wed, 24 Aug 2011)
Log Message:
-----------
pkg/tcpwrappers/trunk: removing the ufiles regex

Modified Paths:
--------------
    csw/mgar/pkg/tcpwrappers/trunk/Makefile

Property Changed:
----------------
    csw/mgar/pkg/tcpwrappers/trunk/Makefile

Modified: csw/mgar/pkg/tcpwrappers/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tcpwrappers/trunk/Makefile	2011-08-24 00:31:15 UTC (rev 15417)
+++ csw/mgar/pkg/tcpwrappers/trunk/Makefile	2011-08-24 06:57:51 UTC (rev 15418)
@@ -1,3 +1,5 @@
+# $Id$
+
 NAME = tcp_wrappers
 BASEVERSION = 7.6
 RELEASE = ipv6.4
@@ -27,9 +29,6 @@
 
 SPKG_VERSION = $(BASEVERSION)
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)_(\d+(?:\.\d+)*).tar.gz
-
 EXTRA_MODULATORS = EXTENDED
 MODULATIONS_EXTENDED = on off
 


Property changes on: csw/mgar/pkg/tcpwrappers/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
   + Id

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


From wahwah at users.sourceforge.net  Wed Aug 24 09:31:50 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 24 Aug 2011 07:31:50 +0000
Subject: [csw-devel] SF.net SVN: gar:[15419]
 csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib. patch
Message-ID: 

Revision: 15419
          http://gar.svn.sourceforge.net/gar/?rev=15419&view=rev
Author:   wahwah
Date:     2011-08-24 07:31:49 +0000 (Wed, 24 Aug 2011)
Log Message:
-----------
pkg/tcpwrappers/trunk: Using libwrap.so.0 (after Debian)

Modified Paths:
--------------
    csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch

Modified: csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch
===================================================================
--- csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch	2011-08-24 06:57:51 UTC (rev 15418)
+++ csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch	2011-08-24 07:31:49 UTC (rev 15419)
@@ -8,8 +8,8 @@
 +sunos5-shared:
 +	@$(MAKE) REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
 +	LIBS="-lsocket -lnsl" RANLIB=/bin/true \
-+	AR=ld ARFLAGS="-G -h libwrap.so.1 -lsocket -lnsl -o " \
-+	LIB=libwrap.so.1 VSYSLOG= \
++	AR=ld ARFLAGS="-G -h libwrap.so.0 -lsocket -lnsl -o " \
++	LIB=libwrap.so.0 VSYSLOG= \
 +	NETGROUP=-DNETGROUP AUX_OBJ="setenv.o sharedhack.o" TLI=-DTLI \
 +	BUGS="$(BUGS) -DSOLARIS_24_GETHOSTBYNAME_BUG" IPV6="$(IPV6)" \
 +	EXTRA_CFLAGS="-DUSE_STRERROR -Kpic" all
@@ -17,8 +17,8 @@
 +sunos5-sharedext:
 +	@$(MAKE) REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
 +	LIBS="-lsocket -lnsl" RANLIB=/bin/true \
-+	AR=ld ARFLAGS="-G -h libwrap.so.1 -lsocket -lnsl -o " \
-+	LIB=libwrap.so.1 VSYSLOG= STYLE=-DPROCESS_OPTIONS \
++	AR=ld ARFLAGS="-G -h libwrap.so.0 -lsocket -lnsl -o " \
++	LIB=libwrap.so.0 VSYSLOG= STYLE=-DPROCESS_OPTIONS \
 +	NETGROUP=-DNETGROUP AUX_OBJ="setenv.o sharedhack.o" TLI=-DTLI \
 +	BUGS="$(BUGS) -DSOLARIS_24_GETHOSTBYNAME_BUG" IPV6="$(IPV6)" \
 +	EXTRA_CFLAGS="-DUSE_STRERROR -Kpic" all

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


From wahwah at users.sourceforge.net  Wed Aug 24 09:39:31 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 24 Aug 2011 07:39:31 +0000
Subject: [csw-devel] SF.net SVN: gar:[15420]
	csw/mgar/pkg/tcpwrappers/trunk/Makefile
Message-ID: 

Revision: 15420
          http://gar.svn.sourceforge.net/gar/?rev=15420&view=rev
Author:   wahwah
Date:     2011-08-24 07:39:31 +0000 (Wed, 24 Aug 2011)

Log Message:
-----------
pkg/tcpwrappers/trunk: pkg split, using libwrap.so.0

Modified Paths:
--------------
    csw/mgar/pkg/tcpwrappers/trunk/Makefile

Modified: csw/mgar/pkg/tcpwrappers/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tcpwrappers/trunk/Makefile	2011-08-24 07:31:49 UTC (rev 15419)
+++ csw/mgar/pkg/tcpwrappers/trunk/Makefile	2011-08-24 07:39:31 UTC (rev 15420)
@@ -1,4 +1,7 @@
 # $Id$
+#
+# files/README describes that there are two versions of hosts.{allow,deny}
+# syntaxes.
 
 NAME = tcp_wrappers
 BASEVERSION = 7.6
@@ -26,6 +29,7 @@
 
 PACKAGES = CSWtcpwrap
 CATALOGNAME = tcpwrappers
+SPKG_DESC_CSWtcpwrap = $(DESCRIPTION)
 
 SPKG_VERSION = $(BASEVERSION)
 
@@ -49,8 +53,8 @@
 # No test suite
 TEST_SCRIPTS =
 
-LIBNAME_EXTENDED-off = libwrap-std.so.1
-LIBNAME_EXTENDED-on  = libwrap-ext.so.1
+LIBNAME_EXTENDED-off = libwrap-std.so.0
+LIBNAME_EXTENDED-on  = libwrap-ext.so.0
 
 INSTALL_SCRIPTS = custom
 
@@ -66,13 +70,24 @@
 MIGRATE_FILES = hosts.allow hosts.deny
 
 ALTERNATIVES = std ext
-ALTERNATIVE_std  = $(libdir)/libwrap.so.1 tcpwrappers $(libdir)/libwrap-std.so.1 200
-ALTERNATIVE_std += $(libdir)/$(ISA_DEFAULT64)/libwrap.so.1 tcpwrappers64 $(libdir)/$(ISA_DEFAULT64)/libwrap-std.so.1
-ALTERNATIVE_ext  = $(libdir)/libwrap.so.1 tcpwrappers $(libdir)/libwrap-ext.so.1 100
-ALTERNATIVE_ext += $(libdir)/$(ISA_DEFAULT64)/libwrap.so.1 tcpwrappers64 $(libdir)/$(ISA_DEFAULT64)/libwrap-ext.so.1
+ALTERNATIVE_std  = $(libdir)/libwrap.so.0 tcpwrappers $(libdir)/libwrap-std.so.0 200
+ALTERNATIVE_std += $(libdir)/$(ISA_DEFAULT64)/libwrap.so.0 tcpwrappers64 $(libdir)/$(ISA_DEFAULT64)/libwrap-std.so.0
+ALTERNATIVE_ext  = $(libdir)/libwrap.so.0 tcpwrappers $(libdir)/libwrap-ext.so.0 100
+ALTERNATIVE_ext += $(libdir)/$(ISA_DEFAULT64)/libwrap.so.0 tcpwrappers64 $(libdir)/$(ISA_DEFAULT64)/libwrap-ext.so.0
 
 POSTMSG = $(docdir)/$(CATALOGNAME)/CSWtcpwrap.postmsg
 
+PACKAGES += CSWlibwrap0
+CATALOGNAME_CSWlibwrap0 = libwrap0
+PKGFILES_CSWlibwrap0 += $(call baseisadirs,$(libdir),libwrap\.so\.0(\.\d+)*)
+SPKG_DESC_CSWlibwrap0 += $(DESCRIPTION), libwrap.so.0
+RUNTIME_DEP_PKGS_CSWtcpwrap += CSWlibwrap0
+
+PACKAGES += CSWtcpwrap-dev
+SPKG_DESC_CSWtcpwrap-dev = $(DESCRIPTION) development package
+PKGFILES_CSWtcpwrap-dev += $(PKGFILES_DEVEL)
+CATALOGNAME_CSWtcpwrap-dev = tcpwrappers_dev
+
 # These binaries link against libwrap.so which will be linked by alternatives
 # after package install. Until then they can obviously not link properly.
 CHECKPKG_OVERRIDES  = symbol-not-found|tcpdmatch
@@ -95,7 +110,7 @@
 	ginstall -d $(DESTDIR)$(includedir)
 	cd $(WORKSRC) && ginstall -v -m 644 tcpd.h $(DESTDIR)$(includedir)
 	ginstall -d $(DESTDIR)$(libdir)
-	cd $(WORKSRC) && ginstall -v -m 644 libwrap.so.1 $(DESTDIR)$(libdir)/$(LIBNAME_EXTENDED-$(EXTENDED))
+	cd $(WORKSRC) && ginstall -v -m 644 libwrap.so.0 $(DESTDIR)$(libdir)/$(LIBNAME_EXTENDED-$(EXTENDED))
 	ginstall -d $(DESTDIR)$(mandir)/man3
 	cd $(WORKSRC) && ginstall -v -m 644 *.3 $(DESTDIR)$(mandir)/man3
 	ginstall -d $(DESTDIR)$(mandir)/man5
@@ -107,13 +122,13 @@
 post-merge:
 	ginstall -d $(PKGROOT)$(dir $(POSTMSG))
 	ginstall $(WORKDIR)/$(notdir $(POSTMSG)) $(PKGROOT)$(POSTMSG)
-	ln -s libwrap.so.1 $(PKGROOT)$(libdir)/libwrap.so
-	ln -s libwrap.so.1 $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libwrap.so
-	@# As libwrap.so.1 is the SONAME to be bound against we must register it with the package
+	ln -s libwrap.so.0 $(PKGROOT)$(libdir)/libwrap.so
+	ln -s libwrap.so.0 $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libwrap.so
+	@# As libwrap.so.0 is the SONAME to be bound against we must register it with the package
 	@# to allow chkpkg to look up the pkgname for the library. This is rewritten by alternatives
 	@# on installation and is solely to register the link path, the destination doesn't matter.
-	ln -s /etc/opt/csw/alternatives/tcpwrappers $(PKGROOT)$(libdir)/libwrap.so.1
-	ln -s /etc/opt/csw/alternatives/tcpwrappers64 $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libwrap.so.1
+	ln -s /etc/opt/csw/alternatives/tcpwrappers $(PKGROOT)$(libdir)/libwrap.so.0
+	ln -s /etc/opt/csw/alternatives/tcpwrappers64 $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libwrap.so.0
 	@$(MAKECOOKIE)
 
 SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE)


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

From wahwah at users.sourceforge.net  Wed Aug 24 09:58:07 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 24 Aug 2011 07:58:07 +0000
Subject: [csw-devel] SF.net SVN: gar:[15421]
	csw/mgar/pkg/gcc4/branches/gccgo/Makefile
Message-ID: 

Revision: 15421
          http://gar.svn.sourceforge.net/gar/?rev=15421&view=rev
Author:   wahwah
Date:     2011-08-24 07:58:07 +0000 (Wed, 24 Aug 2011)
Log Message:
-----------
pkg/gcc4/branches/gccgo: using the 20110820 snapshot

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/gccgo/Makefile

Modified: csw/mgar/pkg/gcc4/branches/gccgo/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/gccgo/Makefile	2011-08-24 07:39:31 UTC (rev 15420)
+++ csw/mgar/pkg/gcc4/branches/gccgo/Makefile	2011-08-24 07:58:07 UTC (rev 15421)
@@ -7,7 +7,7 @@
 # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39048
 
 NAME      = gcc
-VERSION   = 4.6.1
+VERSION   = 4.7-20110820
 CATEGORIES   = lang
 GARTYPE = v2
 
@@ -19,7 +19,8 @@
 endef
 
 DISTFILES    = $(DISTNAME).tar.bz2
-MASTER_SITES = $(GNU_MIRROR)/$(NAME)-$(VERSION)/
+# MASTER_SITES = $(GNU_MIRROR)/$(NAME)-$(VERSION)/
+MASTER_SITES = ftp://ftp.fu-berlin.de/unix/languages/gcc/snapshots/$(VERSION)/
 
 PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386
 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386

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


From wahwah at users.sourceforge.net  Wed Aug 24 10:10:14 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 24 Aug 2011 08:10:14 +0000
Subject: [csw-devel] SF.net SVN: gar:[15422] csw/mgar/pkg/gcc4/branches/gccgo
Message-ID: 

Revision: 15422
          http://gar.svn.sourceforge.net/gar/?rev=15422&view=rev
Author:   wahwah
Date:     2011-08-24 08:10:14 +0000 (Wed, 24 Aug 2011)
Log Message:
-----------
pkg/gcc4/branches/gccgo: merging bootstrap-4.6

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/gccgo/Makefile

Removed Paths:
-------------
    csw/mgar/pkg/gcc4/branches/gccgo/files/test-results/

Property Changed:
----------------
    csw/mgar/pkg/gcc4/branches/gccgo/


Property changes on: csw/mgar/pkg/gcc4/branches/gccgo
___________________________________________________________________
Added: svn:mergeinfo
   + /csw/mgar/pkg/gcc4/branches/bootstrap-4.6:15395-15421

Modified: csw/mgar/pkg/gcc4/branches/gccgo/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/gccgo/Makefile	2011-08-24 07:58:07 UTC (rev 15421)
+++ csw/mgar/pkg/gcc4/branches/gccgo/Makefile	2011-08-24 08:10:14 UTC (rev 15422)
@@ -44,8 +44,10 @@
 # Could be used to break out of the /opt/csw/gcc4 prefix
 # CONFIGURE_ARGS += --program-prefix=gcc4-
 
-CONFIGURE_ARGS += --with-pkgversion=OpenCSW
-CONFIGURE_ARGS += $(DIRPATHS)
+CONFIGURE_ARGS += --prefix=$(prefix)
+CONFIGURE_ARGS += --libdir=$(libdir)
+# The theory is that DIRPATHS confuse the installer, e.g. includedir
+# CONFIGURE_ARGS += --includedir=$(prefix)/include
 CONFIGURE_ARGS += --exec-prefix=$(BUILD_PREFIX)/gcc4
 CONFIGURE_ARGS += --with-gnu-as
 CONFIGURE_ARGS += --with-as=/opt/csw/bin/gas
@@ -148,7 +150,6 @@
 RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibssp0
 RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibz1
 RUNTIME_DEP_PKGS_CSWgcc4core += CSWpython
-RUNTIME_DEP_PKGS_CSWgcc4core += CSWbinutils
 RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibmpc2
 RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibobjc-gc3
 RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibobjc3
@@ -413,18 +414,27 @@
 RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibmpfr4
 RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibgmp10
 
-# Solaris 10 on i386 specific:
-RUNTIME_DEP_PKGS_CSWgcc4core_i386_5.10 += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWgcc4g++_i386_5.10 += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWgcc4gfortran_i386_5.10 += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWgcc4objc_i386_5.10 += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWgcc4java_i386_5.10 += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWgcc4core += $(RUNTIME_DEP_PKGS_CSWgcc4core_$(GARCH)_$(GAROSREL))
-RUNTIME_DEP_PKGS_CSWgcc4g++ += $(RUNTIME_DEP_PKGS_CSWgcc4g++_$(GARCH)_$(GAROSREL))
-RUNTIME_DEP_PKGS_CSWgcc4gfortran += $(RUNTIME_DEP_PKGS_CSWgcc4gfortran_$(GARCH)_$(GAROSREL))
-RUNTIME_DEP_PKGS_CSWgcc4objc += $(RUNTIME_DEP_PKGS_CSWgcc4objc_$(GARCH)_$(GAROSREL))
-RUNTIME_DEP_PKGS_CSWgcc4java += $(RUNTIME_DEP_PKGS_CSWgcc4java_$(GARCH)_$(GAROSREL))
+# libiconv deps cropped up relatively late in the porting process. Perhaps
+# they apply to all arch/OS combinations.
+RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWgcc4g++ += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWgcc4java += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibiconv2
 
+# Maybe it's unnecessary.
+# # Solaris 10 on i386 specific:
+# RUNTIME_DEP_PKGS_CSWgcc4core_i386_5.10 += CSWlibiconv2
+# RUNTIME_DEP_PKGS_CSWgcc4g++_i386_5.10 += CSWlibiconv2
+# RUNTIME_DEP_PKGS_CSWgcc4gfortran_i386_5.10 += CSWlibiconv2
+# RUNTIME_DEP_PKGS_CSWgcc4objc_i386_5.10 += CSWlibiconv2
+# RUNTIME_DEP_PKGS_CSWgcc4java_i386_5.10 += CSWlibiconv2
+# RUNTIME_DEP_PKGS_CSWgcc4core += $(RUNTIME_DEP_PKGS_CSWgcc4core_$(GARCH)_$(GAROSREL))
+# RUNTIME_DEP_PKGS_CSWgcc4g++ += $(RUNTIME_DEP_PKGS_CSWgcc4g++_$(GARCH)_$(GAROSREL))
+# RUNTIME_DEP_PKGS_CSWgcc4gfortran += $(RUNTIME_DEP_PKGS_CSWgcc4gfortran_$(GARCH)_$(GAROSREL))
+# RUNTIME_DEP_PKGS_CSWgcc4objc += $(RUNTIME_DEP_PKGS_CSWgcc4objc_$(GARCH)_$(GAROSREL))
+# RUNTIME_DEP_PKGS_CSWgcc4java += $(RUNTIME_DEP_PKGS_CSWgcc4java_$(GARCH)_$(GAROSREL))
+
 PACKAGES += $(PACKAGES_$(GARCH))
 
 include files/scripts.mk

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


From aigoshin at users.sourceforge.net  Wed Aug 24 11:53:36 2011
From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net)
Date: Wed, 24 Aug 2011 09:53:36 +0000
Subject: [csw-devel] SF.net SVN: gar:[15423]
	csw/mgar/pkg/nginx/trunk/Makefile
Message-ID: 

Revision: 15423
          http://gar.svn.sourceforge.net/gar/?rev=15423&view=rev
Author:   aigoshin
Date:     2011-08-24 09:53:35 +0000 (Wed, 24 Aug 2011)
Log Message:
-----------
nginx: release 20110824

Modified Paths:
--------------
    csw/mgar/pkg/nginx/trunk/Makefile

Modified: csw/mgar/pkg/nginx/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nginx/trunk/Makefile	2011-08-24 08:10:14 UTC (rev 15422)
+++ csw/mgar/pkg/nginx/trunk/Makefile	2011-08-24 09:53:35 UTC (rev 15423)
@@ -19,7 +19,7 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz
 
-RUNTIME_DEP_PKGS = CSWosslrt CSWlibpcre0 CSWzlib1 CSWperl
+RUNTIME_DEP_PKGS = CSWosslrt CSWlibpcre0 CSWzlib CSWperl
 
 PACKAGING_PLATFORMS  = solaris9-sparc  solaris9-i386
 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386

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


From wahwah at users.sourceforge.net  Wed Aug 24 12:49:53 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 24 Aug 2011 10:49:53 +0000
Subject: [csw-devel] SF.net SVN: gar:[15424] csw/mgar/pkg/ppl/trunk/Makefile
Message-ID: 

Revision: 15424
          http://gar.svn.sourceforge.net/gar/?rev=15424&view=rev
Author:   wahwah
Date:     2011-08-24 10:49:53 +0000 (Wed, 24 Aug 2011)

Log Message:
-----------
pkg/ppl/trunk: Use $(DESCRIPTION)

Modified Paths:
--------------
    csw/mgar/pkg/ppl/trunk/Makefile

Modified: csw/mgar/pkg/ppl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ppl/trunk/Makefile	2011-08-24 09:53:35 UTC (rev 15423)
+++ csw/mgar/pkg/ppl/trunk/Makefile	2011-08-24 10:49:53 UTC (rev 15424)
@@ -58,7 +58,7 @@
 CONFIGURE_ARGS = $(DIRPATHS)
 
 PACKAGES = CSWlibppl-dev
-SPKG_DESC_CSWlibppl-dev = $(DESCRIPTION) development files
+SPKG_DESC_CSWlibppl-dev = $(DESCRIPTION), development files
 # catch-all package
 RUNTIME_DEP_PKGS_CSWlibppl-dev += CSWgcc4corert
 RUNTIME_DEP_PKGS_CSWlibppl-dev += CSWgcc4g++rt
@@ -75,7 +75,7 @@
 CATALOGNAME_CSWlibppl9 = libppl9
 PKGFILES_CSWlibppl9 += $(call baseisadirs,$(libdir),libppl\.so\.9\.0\.0)
 PKGFILES_CSWlibppl9 += $(call baseisadirs,$(libdir),libppl\.so\.9(\.\d+)*)
-SPKG_DESC_CSWlibppl9 += Parma Polyhedra Library, libppl.so.9
+SPKG_DESC_CSWlibppl9 += $(DESCRIPTION), libppl.so.9
 RUNTIME_DEP_PKGS_CSWlibppl9 += CSWgcc4corert
 RUNTIME_DEP_PKGS_CSWlibppl9 += CSWgcc4g++rt
 RUNTIME_DEP_PKGS_CSWlibppl9 += CSWlibgmp10
@@ -86,7 +86,7 @@
 CATALOGNAME_CSWlibppl-c4 = libppl_c4
 PKGFILES_CSWlibppl-c4 += $(call baseisadirs,$(libdir),libppl_c\.so\.4\.0\.0)
 PKGFILES_CSWlibppl-c4 += $(call baseisadirs,$(libdir),libppl_c\.so\.4(\.\d+)*)
-SPKG_DESC_CSWlibppl-c4 += Parma Polyhedra Library, libppl_c.so.4
+SPKG_DESC_CSWlibppl-c4 += $(DESCRIPTION), libppl_c.so.4
 RUNTIME_DEP_PKGS_CSWlibppl-c4 += CSWgcc4corert
 RUNTIME_DEP_PKGS_CSWlibppl-c4 += CSWgcc4g++rt
 RUNTIME_DEP_PKGS_CSWlibppl-c4 += CSWlibgmp10
@@ -99,7 +99,7 @@
 CATALOGNAME_CSWlibpwl5 = libpwl5
 PKGFILES_CSWlibpwl5 += $(call baseisadirs,$(libdir),libpwl\.so\.5\.0\.0)
 PKGFILES_CSWlibpwl5 += $(call baseisadirs,$(libdir),libpwl\.so\.5(\.\d+)*)
-SPKG_DESC_CSWlibpwl5 += Parma Polyhedra Library, libpwl.so.5
+SPKG_DESC_CSWlibpwl5 += $(DESCRIPTION), libpwl.so.5
 RUNTIME_DEP_PKGS_CSWlibpwl5 += CSWgcc3corert
 RUNTIME_DEP_PKGS_CSWlibpwl5 += CSWgcc4g++rt
 RUNTIME_DEP_PKGS_CSWlibpwl5 += CSWlibgnugetopt0


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 Aug 24 13:52:00 2011
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 24 Aug 2011 11:52:00 +0000
Subject: [csw-devel] SF.net SVN: gar:[15425] csw/mgar/pkg/tcpwrappers
Message-ID: 

Revision: 15425
          http://gar.svn.sourceforge.net/gar/?rev=15425&view=rev
Author:   dmichelsen
Date:     2011-08-24 11:52:00 +0000 (Wed, 24 Aug 2011)
Log Message:
-----------
tcpwrappers: Tag alternatives release and make unified packages with just extended

Modified Paths:
--------------
    csw/mgar/pkg/tcpwrappers/trunk/Makefile
    csw/mgar/pkg/tcpwrappers/trunk/files/README
    csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch

Added Paths:
-----------
    csw/mgar/pkg/tcpwrappers/tags/tcpwrappers-7.6-alternatives-std-ext/

Removed Paths:
-------------
    csw/mgar/pkg/tcpwrappers/trunk/files/CSWtcpwrap.postmsg
    csw/mgar/pkg/tcpwrappers/trunk/files/man.patch

Modified: csw/mgar/pkg/tcpwrappers/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tcpwrappers/trunk/Makefile	2011-08-24 10:49:53 UTC (rev 15424)
+++ csw/mgar/pkg/tcpwrappers/trunk/Makefile	2011-08-24 11:52:00 UTC (rev 15425)
@@ -19,29 +19,38 @@
 DISTFILES = $(DISTNAME).tar.gz
 DISTFILES += COPYING
 DISTFILES += README
-DISTFILES += CSWtcpwrap.postmsg
 
 PATCHFILES = patch-cflags.diff
-PATCHFILES += man.patch
 PATCHFILES += sharedlib.patch
 
-WORKSRC = $(WORKDIR)/$(DISTNAME)
+PACKAGES += CSWtcpwrapper
+SPKG_DESC_CSWtcpwrapper = Wrapper around common tools using libwrap.so.1
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWtcpwrapper += CSWlibwrap1
+OBSOLETED_BY_CSWtcpwrapper += CSWtcpwrap
+CATALOGNAME_CSWtcpwrap = tcpwrappers_stub
 
-PACKAGES = CSWtcpwrap
-CATALOGNAME = tcpwrappers
+PACKAGES += CSWlibwrap1
+SPKG_DESC_CSWlibwrap1 = Socket wrappers for pre-screening tcp connections (ipv6.4 patched), libwrap.so.1
+PKGFILES_CSWlibwrap1 += $(call pkgfiles_lib,libwrap.so.1)
+PKGFILES_CSWlibwrap1 += $(mandir)/man5/.*
 SPKG_DESC_CSWtcpwrap = $(DESCRIPTION)
 
-SPKG_VERSION = $(BASEVERSION)
+PACKAGES += CSWlibwrap-dev
+SPKG_DESC_CSWlibwrap-dev = Development files for libwrap.so.1
+PKGFILES_CSWlibwrap-dev += $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWlibwrap-dev += CSWlibwrap1
 
-EXTRA_MODULATORS = EXTENDED
-MODULATIONS_EXTENDED = on off
-
 BUILD_ARGS = REAL_DAEMON_DIR=/usr/sbin
 BUILD_ARGS += STYLE=-DPROCESS_OPTIONS
 BUILD_ARGS += USER_CFLAGS="$(CFLAGS)"
 BUILD_ARGS += LIBS="-lsocket -lnsl"
 
+# EXTENDED = off
+EXTENDED = on
+
 BUILD64 = 1
+NOISALIST = 1
 
 CONFIGURE_SCRIPTS =
 
@@ -53,64 +62,41 @@
 # No test suite
 TEST_SCRIPTS =
 
-LIBNAME_EXTENDED-off = libwrap-std.so.0
-LIBNAME_EXTENDED-on  = libwrap-ext.so.0
-
 INSTALL_SCRIPTS = custom
 
-MERGE_SCRIPTS_isa-default-extended-off = copy-all
- MERGE_SCRIPTS_isa-default-extended-on = copy-only
-    MERGE_DIRS_isa-default-extended-on = $(libdir)
+MIGRATE_FILES_CSWlibwrap1 = hosts.allow hosts.deny
 
-MERGE_SCRIPTS_isa-default64-extended-off = copy-relocated-only
-   MERGE_DIRS_isa-default64-extended-off = $(libdir)
- MERGE_SCRIPTS_isa-default64-extended-on = copy-relocated-only
-    MERGE_DIRS_isa-default64-extended-on = $(libdir)
+# This is an example to /usr/local/lib/ntalkd
+CHECKPKG_OVERRIDES_CSWtcpwrapper += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/tcpd.8
 
-MIGRATE_FILES = hosts.allow hosts.deny
+include gar/category.mk
 
-ALTERNATIVES = std ext
-ALTERNATIVE_std  = $(libdir)/libwrap.so.0 tcpwrappers $(libdir)/libwrap-std.so.0 200
-ALTERNATIVE_std += $(libdir)/$(ISA_DEFAULT64)/libwrap.so.0 tcpwrappers64 $(libdir)/$(ISA_DEFAULT64)/libwrap-std.so.0
-ALTERNATIVE_ext  = $(libdir)/libwrap.so.0 tcpwrappers $(libdir)/libwrap-ext.so.0 100
-ALTERNATIVE_ext += $(libdir)/$(ISA_DEFAULT64)/libwrap.so.0 tcpwrappers64 $(libdir)/$(ISA_DEFAULT64)/libwrap-ext.so.0
+SPKG_VERSION = $(subst -,_,$(VERSION))
 
-POSTMSG = $(docdir)/$(CATALOGNAME)/CSWtcpwrap.postmsg
+post-extract-modulated:
+	-cd $(WORKSRC) && perl -pi -e 's,/etc/hosts\.,$(sysconfdir)/hosts.,g' \
+		hosts_access.3 \
+		hosts_access.5 \
+		tcpd.8 \
+		tcpdchk.8 \
+		tcpdmatch.8
+	@$(MAKECOOKIE)
 
-PACKAGES += CSWlibwrap0
-CATALOGNAME_CSWlibwrap0 = libwrap0
-PKGFILES_CSWlibwrap0 += $(call baseisadirs,$(libdir),libwrap\.so\.0(\.\d+)*)
-SPKG_DESC_CSWlibwrap0 += $(DESCRIPTION), libwrap.so.0
-RUNTIME_DEP_PKGS_CSWtcpwrap += CSWlibwrap0
-
-PACKAGES += CSWtcpwrap-dev
-SPKG_DESC_CSWtcpwrap-dev = $(DESCRIPTION) development package
-PKGFILES_CSWtcpwrap-dev += $(PKGFILES_DEVEL)
-CATALOGNAME_CSWtcpwrap-dev = tcpwrappers_dev
-
-# These binaries link against libwrap.so which will be linked by alternatives
-# after package install. Until then they can obviously not link properly.
-CHECKPKG_OVERRIDES  = symbol-not-found|tcpdmatch
-CHECKPKG_OVERRIDES += symbol-not-found|tcpd
-CHECKPKG_OVERRIDES += symbol-not-found|try-from
-CHECKPKG_OVERRIDES += symbol-not-found|tcpdchk
-
-include gar/category.mk
-
 build-custom:
-	$(MAKE) -C $(WORKSRC) $(BUILD_ARGS) $(BUILD_TARGET_EXTENDED_$(EXTENDED))
+	$(BUILD_ENV) $(MAKE) -C $(WORKSRC) $(BUILD_ARGS) $(BUILD_TARGET_EXTENDED_$(EXTENDED))
 	@$(MAKECOOKIE)
 
 install-custom:
-	@echo " => Installing $(CATALOGNAME)"
-	ginstall -d $(DESTDIR)$(docdir)/$(CATALOGNAME)
-	cd $(WORKDIR) && ginstall -v -m 644 README $(DESTDIR)$(docdir)/$(CATALOGNAME)
+	@echo " => Installing tcpwrapper"
+	ginstall -d $(DESTDIR)$(docdir)/tcpwrapper"
+	cd $(WORKDIR) && ginstall -v -m 644 README $(DESTDIR)$(docdir)/tcpwrapper/README
 	ginstall -d $(DESTDIR)$(libexecdir)
 	cd $(WORKSRC) && ginstall -v -m 755 safe_finger tcpd tcpdchk tcpdmatch try-from $(DESTDIR)$(libexecdir)
 	ginstall -d $(DESTDIR)$(includedir)
 	cd $(WORKSRC) && ginstall -v -m 644 tcpd.h $(DESTDIR)$(includedir)
 	ginstall -d $(DESTDIR)$(libdir)
-	cd $(WORKSRC) && ginstall -v -m 644 libwrap.so.0 $(DESTDIR)$(libdir)/$(LIBNAME_EXTENDED-$(EXTENDED))
+	cd $(WORKSRC) && ginstall -v -m 644 libwrap.so.1 $(DESTDIR)$(libdir)/libwrap.so.1
+	gln -s libwrap.so.1 $(DESTDIR)$(libdir)/libwrap.so
 	ginstall -d $(DESTDIR)$(mandir)/man3
 	cd $(WORKSRC) && ginstall -v -m 644 *.3 $(DESTDIR)$(mandir)/man3
 	ginstall -d $(DESTDIR)$(mandir)/man5
@@ -119,17 +105,3 @@
 	cd $(WORKSRC) && ginstall -v -m 644 *.8 $(DESTDIR)$(mandir)/man8
 	@$(MAKECOOKIE)
 
-post-merge:
-	ginstall -d $(PKGROOT)$(dir $(POSTMSG))
-	ginstall $(WORKDIR)/$(notdir $(POSTMSG)) $(PKGROOT)$(POSTMSG)
-	ln -s libwrap.so.0 $(PKGROOT)$(libdir)/libwrap.so
-	ln -s libwrap.so.0 $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libwrap.so
-	@# As libwrap.so.0 is the SONAME to be bound against we must register it with the package
-	@# to allow chkpkg to look up the pkgname for the library. This is rewritten by alternatives
-	@# on installation and is solely to register the link path, the destination doesn't matter.
-	ln -s /etc/opt/csw/alternatives/tcpwrappers $(PKGROOT)$(libdir)/libwrap.so.0
-	ln -s /etc/opt/csw/alternatives/tcpwrappers64 $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libwrap.so.0
-	@$(MAKECOOKIE)
-
-SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE)
-

Deleted: csw/mgar/pkg/tcpwrappers/trunk/files/CSWtcpwrap.postmsg
===================================================================
--- csw/mgar/pkg/tcpwrappers/trunk/files/CSWtcpwrap.postmsg	2011-08-24 10:49:53 UTC (rev 15424)
+++ csw/mgar/pkg/tcpwrappers/trunk/files/CSWtcpwrap.postmsg	2011-08-24 11:52:00 UTC (rev 15425)
@@ -1,12 +0,0 @@
-There are now two versions of tcpwrappers on the system installed:
-
-  * libwrap-std.so.1  The "standard" tcp wrapper library
-  * libwrap-ext.so.1  The "extended" tcp wrapper library
-
-You can easily select between the versions with the alternatives(8)
-system by executing
-
-  /opt/csw/sbin/alternatives --config tcpwrappers
-
-See http://wiki.opencsw.org/package-alternatives for details.
-

Modified: csw/mgar/pkg/tcpwrappers/trunk/files/README
===================================================================
--- csw/mgar/pkg/tcpwrappers/trunk/files/README	2011-08-24 10:49:53 UTC (rev 15424)
+++ csw/mgar/pkg/tcpwrappers/trunk/files/README	2011-08-24 11:52:00 UTC (rev 15425)
@@ -15,14 +15,5 @@
 This is to allow for ./configure style tests, that break in the transition
 from lib.a to lib.so
 
-
-Note also that there are TWO versions of libwrap.so: 
-libwrap-std.so.1      The "standard" tcp wrapper library
-libwrap-ext.so.1      The "extended" tcp wrapper library
-
-By default, /opt/csw/lib/libwrap.so.1 is linked to the std version.
-To use the extended syntax in hosts_options(5), you need to change
-the link to point to libwrap-ext.so.1
-Unfortunately, the syntax for the two versions, is slightly incompatible,
-which is why there are two versions.
-
+libwrap has been compiled to use the "extended" syntax as described in
+hosts_options(5).

Deleted: csw/mgar/pkg/tcpwrappers/trunk/files/man.patch
===================================================================
--- csw/mgar/pkg/tcpwrappers/trunk/files/man.patch	2011-08-24 10:49:53 UTC (rev 15424)
+++ csw/mgar/pkg/tcpwrappers/trunk/files/man.patch	2011-08-24 11:52:00 UTC (rev 15425)
@@ -1,154 +0,0 @@
-diff -Naur tcp_wrappers_7.6-ipv6.4.orig/hosts_access.3 tcp_wrappers_7.6-ipv6.4.patched/hosts_access.3
---- tcp_wrappers_7.6-ipv6.4.orig/hosts_access.3	1996-02-11 17:01:27.000000000 +0100
-+++ tcp_wrappers_7.6-ipv6.4.patched/hosts_access.3	2009-09-11 18:54:28.630235290 +0200
-@@ -78,7 +78,7 @@
- hosts_access(5), format of the access control tables.
- hosts_options(5), optional extensions to the base language.
- .SH FILES
--/etc/hosts.allow, /etc/hosts.deny, access control tables.
-+/etc/opt/csw/hosts.allow, /etc//opt/csw/hosts.deny, access control tables.
- .SH BUGS
- hosts_access() uses the strtok() library function. This may interfere
- with other code that relies on strtok().
-diff -Naur tcp_wrappers_7.6-ipv6.4.orig/hosts_access.5 tcp_wrappers_7.6-ipv6.4.patched/hosts_access.5
---- tcp_wrappers_7.6-ipv6.4.orig/hosts_access.5	1995-01-30 19:51:47.000000000 +0100
-+++ tcp_wrappers_7.6-ipv6.4.patched/hosts_access.5	2009-09-11 18:54:28.633332432 +0200
-@@ -21,10 +21,10 @@
- at the first match:
- .IP \(bu
- Access will be granted when a (daemon,client) pair matches an entry in
--the \fI/etc/hosts.allow\fR file.
-+the \fI/etc/opt/csw/hosts.allow\fR file.
- .IP \(bu
- Otherwise, access will be denied when a (daemon,client) pair matches an
--entry in the \fI/etc/hosts.deny\fR file.
-+entry in the \fI/etc/opt/csw/hosts.deny\fR file.
- .IP \(bu
- Otherwise, access will be granted.
- .PP
-@@ -268,7 +268,7 @@
- file:
- .PP
- .ne 2
--/etc/hosts.deny: 
-+/etc/opt/csw/hosts.deny: 
- .in +3
- ALL: ALL
- .PP
-@@ -279,7 +279,7 @@
- For example:
- .PP
- .ne 2
--/etc/hosts.allow: 
-+/etc/opt/csw/hosts.allow: 
- .in +3
- ALL: LOCAL @some_netgroup
- .br
-@@ -298,7 +298,7 @@
- that it can be omitted.  The explicitly non-authorized hosts are listed
- in the deny file. For example:
- .PP
--/etc/hosts.deny:
-+/etc/opt/csw/hosts.deny:
- .in +3
- ALL: some.host.name, .some.domain
- .br
-@@ -313,13 +313,13 @@
- host. The result is mailed to the superuser.
- .PP
- .ne 2
--/etc/hosts.allow:
-+/etc/opt/csw/hosts.allow:
- .in +3
- .nf
- in.tftpd: LOCAL, .my.domain
- .PP
- .ne 2
--/etc/hosts.deny:
-+/etc/opt/csw/hosts.deny:
- .in +3
- .nf
- in.tftpd: ALL: (/some/where/safe_finger -l @%h | \\
-@@ -353,8 +353,8 @@
- .SH FILES
- .na
- .nf
--/etc/hosts.allow, (daemon,client) pairs that are granted access.
--/etc/hosts.deny, (daemon,client) pairs that are denied access.
-+/etc/opt/csw/hosts.allow, (daemon,client) pairs that are granted access.
-+/etc/opt/csw/hosts.deny, (daemon,client) pairs that are denied access.
- .ad
- .fi
- .SH SEE ALSO
-diff -Naur tcp_wrappers_7.6-ipv6.4.orig/tcpd.8 tcp_wrappers_7.6-ipv6.4.patched/tcpd.8
---- tcp_wrappers_7.6-ipv6.4.orig/tcpd.8	1996-02-21 16:39:16.000000000 +0100
-+++ tcp_wrappers_7.6-ipv6.4.patched/tcpd.8	2009-09-11 18:54:28.635231817 +0200
-@@ -146,7 +146,7 @@
- only non-trivial service that is affected by this limitation is
- \fIrexd\fR, which is used by the \fIon(1)\fR command. This is no great
- loss.  On most systems, \fIrexd\fR is less secure than a wildcard in
--/etc/hosts.equiv.
-+/etc/opt/csw/hosts.equiv.
- .PP
- RPC broadcast requests (for example: \fIrwall, rup, rusers\fR) always
- appear to come from the responding host. What happens is that the
-@@ -158,9 +158,9 @@
- .PP
- The default locations of the host access control tables are:
- .PP
--/etc/hosts.allow
-+/etc/opt/csw/hosts.allow
- .br
--/etc/hosts.deny
-+/etc/opt/csw/hosts.deny
- .SH SEE ALSO
- .na
- .nf
-diff -Naur tcp_wrappers_7.6-ipv6.4.orig/tcpdchk.8 tcp_wrappers_7.6-ipv6.4.patched/tcpdchk.8
---- tcp_wrappers_7.6-ipv6.4.orig/tcpdchk.8	1995-01-08 17:00:31.000000000 +0100
-+++ tcp_wrappers_7.6-ipv6.4.patched/tcpdchk.8	2009-09-11 18:54:28.636911201 +0200
-@@ -8,7 +8,7 @@
- \fItcpdchk\fR examines your tcp wrapper configuration and reports all
- potential and real problems it can find. The program examines the
- \fItcpd\fR access control files (by default, these are
--\fI/etc/hosts.allow\fR and \fI/etc/hosts.deny\fR), and compares the
-+\fI/etc/opt/csw/hosts.allow\fR and \fI/etc/opt/csw/hosts.deny\fR), and compares the
- entries in these files against entries in the \fIinetd\fR or \fItlid\fR
- network configuration files.
- .PP
-@@ -44,9 +44,9 @@
- .PP
- The default locations of the \fItcpd\fR access control tables are:
- .PP
--/etc/hosts.allow
-+/etc/opt/csw/hosts.allow
- .br
--/etc/hosts.deny
-+/etc/opt/csw/hosts.deny
- .SH SEE ALSO
- .na
- .nf
-diff -Naur tcp_wrappers_7.6-ipv6.4.orig/tcpdmatch.8 tcp_wrappers_7.6-ipv6.4.patched/tcpdmatch.8
---- tcp_wrappers_7.6-ipv6.4.orig/tcpdmatch.8	1996-02-11 17:01:36.000000000 +0100
-+++ tcp_wrappers_7.6-ipv6.4.patched/tcpdmatch.8	2009-09-11 18:54:28.638584325 +0200
-@@ -11,7 +11,7 @@
- request for service.  Examples are given below.
- .PP
- The program examines the \fItcpd\fR access control tables (default
--\fI/etc/hosts.allow\fR and \fI/etc/hosts.deny\fR) and prints its
-+\fI/etc/opt/csw/hosts.allow\fR and \fI/etc/opt/csw/hosts.deny\fR) and prints its
- conclusion.  For maximal accuracy, it extracts additional information
- from your \fIinetd\fR or \fItlid\fR network configuration file.
- .PP
-@@ -76,9 +76,9 @@
- .PP
- The default locations of the \fItcpd\fR access control tables are:
- .PP
--/etc/hosts.allow
-+/etc/opt/csw/hosts.allow
- .br
--/etc/hosts.deny
-+/etc/opt/csw/hosts.deny
- .SH SEE ALSO
- .na
- .nf

Modified: csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch
===================================================================
--- csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch	2011-08-24 10:49:53 UTC (rev 15424)
+++ csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch	2011-08-24 11:52:00 UTC (rev 15425)
@@ -8,8 +8,8 @@
 +sunos5-shared:
 +	@$(MAKE) REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
 +	LIBS="-lsocket -lnsl" RANLIB=/bin/true \
-+	AR=ld ARFLAGS="-G -h libwrap.so.0 -lsocket -lnsl -o " \
-+	LIB=libwrap.so.0 VSYSLOG= \
++	AR=ld ARFLAGS="-G -h libwrap.so.1 -lsocket -lnsl -o " \
++	LIB=libwrap.so.1 VSYSLOG= \
 +	NETGROUP=-DNETGROUP AUX_OBJ="setenv.o sharedhack.o" TLI=-DTLI \
 +	BUGS="$(BUGS) -DSOLARIS_24_GETHOSTBYNAME_BUG" IPV6="$(IPV6)" \
 +	EXTRA_CFLAGS="-DUSE_STRERROR -Kpic" all
@@ -17,8 +17,8 @@
 +sunos5-sharedext:
 +	@$(MAKE) REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
 +	LIBS="-lsocket -lnsl" RANLIB=/bin/true \
-+	AR=ld ARFLAGS="-G -h libwrap.so.0 -lsocket -lnsl -o " \
-+	LIB=libwrap.so.0 VSYSLOG= STYLE=-DPROCESS_OPTIONS \
++	AR=ld ARFLAGS="-G -h libwrap.so.1 -lsocket -lnsl -o " \
++	LIB=libwrap.so.1 VSYSLOG= STYLE=-DPROCESS_OPTIONS \
 +	NETGROUP=-DNETGROUP AUX_OBJ="setenv.o sharedhack.o" TLI=-DTLI \
 +	BUGS="$(BUGS) -DSOLARIS_24_GETHOSTBYNAME_BUG" IPV6="$(IPV6)" \
 +	EXTRA_CFLAGS="-DUSE_STRERROR -Kpic" all

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 Aug 24 16:20:24 2011
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 24 Aug 2011 14:20:24 +0000
Subject: [csw-devel] SF.net SVN: gar:[15426] csw/mgar/pkg/tcpwrappers/trunk
Message-ID: 

Revision: 15426
          http://gar.svn.sourceforge.net/gar/?rev=15426&view=rev
Author:   dmichelsen
Date:     2011-08-24 14:20:24 +0000 (Wed, 24 Aug 2011)
Log Message:
-----------
tcpwrappers: Change SONAME from libwrap.so.1 to libwrap.so.0

Modified Paths:
--------------
    csw/mgar/pkg/tcpwrappers/trunk/Makefile
    csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch

Modified: csw/mgar/pkg/tcpwrappers/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tcpwrappers/trunk/Makefile	2011-08-24 11:52:00 UTC (rev 15425)
+++ csw/mgar/pkg/tcpwrappers/trunk/Makefile	2011-08-24 14:20:24 UTC (rev 15426)
@@ -24,22 +24,21 @@
 PATCHFILES += sharedlib.patch
 
 PACKAGES += CSWtcpwrapper
-SPKG_DESC_CSWtcpwrapper = Wrapper around common tools using libwrap.so.1
+SPKG_DESC_CSWtcpwrapper = Wrapper around common tools using libwrap.so.0
 # PKGFILES is catchall
-RUNTIME_DEP_PKGS_CSWtcpwrapper += CSWlibwrap1
+RUNTIME_DEP_PKGS_CSWtcpwrapper += CSWlibwrap0
 OBSOLETED_BY_CSWtcpwrapper += CSWtcpwrap
 CATALOGNAME_CSWtcpwrap = tcpwrappers_stub
 
-PACKAGES += CSWlibwrap1
-SPKG_DESC_CSWlibwrap1 = Socket wrappers for pre-screening tcp connections (ipv6.4 patched), libwrap.so.1
-PKGFILES_CSWlibwrap1 += $(call pkgfiles_lib,libwrap.so.1)
-PKGFILES_CSWlibwrap1 += $(mandir)/man5/.*
-SPKG_DESC_CSWtcpwrap = $(DESCRIPTION)
+PACKAGES += CSWlibwrap0
+SPKG_DESC_CSWlibwrap0 = Socket wrappers for pre-screening tcp connections (ipv6.4 patched), libwrap.so.0
+PKGFILES_CSWlibwrap0 += $(call pkgfiles_lib,libwrap.so.0)
+PKGFILES_CSWlibwrap0 += $(mandir)/man5/.*
 
 PACKAGES += CSWlibwrap-dev
-SPKG_DESC_CSWlibwrap-dev = Development files for libwrap.so.1
+SPKG_DESC_CSWlibwrap-dev = Development files for libwrap.so.0
 PKGFILES_CSWlibwrap-dev += $(PKGFILES_DEVEL)
-RUNTIME_DEP_PKGS_CSWlibwrap-dev += CSWlibwrap1
+RUNTIME_DEP_PKGS_CSWlibwrap-dev += CSWlibwrap0
 
 BUILD_ARGS = REAL_DAEMON_DIR=/usr/sbin
 BUILD_ARGS += STYLE=-DPROCESS_OPTIONS
@@ -64,7 +63,7 @@
 
 INSTALL_SCRIPTS = custom
 
-MIGRATE_FILES_CSWlibwrap1 = hosts.allow hosts.deny
+MIGRATE_FILES_CSWlibwrap0 = hosts.allow hosts.deny
 
 # This is an example to /usr/local/lib/ntalkd
 CHECKPKG_OVERRIDES_CSWtcpwrapper += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/tcpd.8
@@ -95,8 +94,8 @@
 	ginstall -d $(DESTDIR)$(includedir)
 	cd $(WORKSRC) && ginstall -v -m 644 tcpd.h $(DESTDIR)$(includedir)
 	ginstall -d $(DESTDIR)$(libdir)
-	cd $(WORKSRC) && ginstall -v -m 644 libwrap.so.1 $(DESTDIR)$(libdir)/libwrap.so.1
-	gln -s libwrap.so.1 $(DESTDIR)$(libdir)/libwrap.so
+	cd $(WORKSRC) && ginstall -v -m 644 libwrap.so.0 $(DESTDIR)$(libdir)/libwrap.so.0
+	gln -s libwrap.so.0 $(DESTDIR)$(libdir)/libwrap.so
 	ginstall -d $(DESTDIR)$(mandir)/man3
 	cd $(WORKSRC) && ginstall -v -m 644 *.3 $(DESTDIR)$(mandir)/man3
 	ginstall -d $(DESTDIR)$(mandir)/man5

Modified: csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch
===================================================================
--- csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch	2011-08-24 11:52:00 UTC (rev 15425)
+++ csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch	2011-08-24 14:20:24 UTC (rev 15426)
@@ -8,8 +8,8 @@
 +sunos5-shared:
 +	@$(MAKE) REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
 +	LIBS="-lsocket -lnsl" RANLIB=/bin/true \
-+	AR=ld ARFLAGS="-G -h libwrap.so.1 -lsocket -lnsl -o " \
-+	LIB=libwrap.so.1 VSYSLOG= \
++	AR=ld ARFLAGS="-G -h libwrap.so.0 -lsocket -lnsl -o " \
++	LIB=libwrap.so.0 VSYSLOG= \
 +	NETGROUP=-DNETGROUP AUX_OBJ="setenv.o sharedhack.o" TLI=-DTLI \
 +	BUGS="$(BUGS) -DSOLARIS_24_GETHOSTBYNAME_BUG" IPV6="$(IPV6)" \
 +	EXTRA_CFLAGS="-DUSE_STRERROR -Kpic" all
@@ -17,8 +17,8 @@
 +sunos5-sharedext:
 +	@$(MAKE) REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
 +	LIBS="-lsocket -lnsl" RANLIB=/bin/true \
-+	AR=ld ARFLAGS="-G -h libwrap.so.1 -lsocket -lnsl -o " \
-+	LIB=libwrap.so.1 VSYSLOG= STYLE=-DPROCESS_OPTIONS \
++	AR=ld ARFLAGS="-G -h libwrap.so.0 -lsocket -lnsl -o " \
++	LIB=libwrap.so.0 VSYSLOG= STYLE=-DPROCESS_OPTIONS \
 +	NETGROUP=-DNETGROUP AUX_OBJ="setenv.o sharedhack.o" TLI=-DTLI \
 +	BUGS="$(BUGS) -DSOLARIS_24_GETHOSTBYNAME_BUG" IPV6="$(IPV6)" \
 +	EXTRA_CFLAGS="-DUSE_STRERROR -Kpic" all

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


From aigoshin at users.sourceforge.net  Wed Aug 24 16:36:07 2011
From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net)
Date: Wed, 24 Aug 2011 14:36:07 +0000
Subject: [csw-devel] SF.net SVN: gar:[15427]
	csw/mgar/pkg/nginx/trunk/Makefile
Message-ID: 

Revision: 15427
          http://gar.svn.sourceforge.net/gar/?rev=15427&view=rev
Author:   aigoshin
Date:     2011-08-24 14:36:06 +0000 (Wed, 24 Aug 2011)
Log Message:
-----------
nginx: release 20110824

Modified Paths:
--------------
    csw/mgar/pkg/nginx/trunk/Makefile

Modified: csw/mgar/pkg/nginx/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nginx/trunk/Makefile	2011-08-24 14:20:24 UTC (rev 15426)
+++ csw/mgar/pkg/nginx/trunk/Makefile	2011-08-24 14:36:06 UTC (rev 15427)
@@ -19,7 +19,7 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz
 
-RUNTIME_DEP_PKGS = CSWosslrt CSWlibpcre0 CSWzlib CSWperl
+RUNTIME_DEP_PKGS = CSWosslrt CSWlibpcre0 CSWzlib1 CSWperl
 
 PACKAGING_PLATFORMS  = solaris9-sparc  solaris9-i386
 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386

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 Aug 24 17:02:17 2011
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 24 Aug 2011 15:02:17 +0000
Subject: [csw-devel] SF.net SVN: gar:[15428] csw/mgar/pkg/tcpwrappers/trunk
Message-ID: 

Revision: 15428
          http://gar.svn.sourceforge.net/gar/?rev=15428&view=rev
Author:   dmichelsen
Date:     2011-08-24 15:02:17 +0000 (Wed, 24 Aug 2011)
Log Message:
-----------
tcpwrappers: back out r15426 to reenable libwrap.so.1 as lots of packages already bind to that SONAME

Revision Links:
--------------
    http://gar.svn.sourceforge.net/gar/?rev=15426&view=rev

Modified Paths:
--------------
    csw/mgar/pkg/tcpwrappers/trunk/Makefile
    csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch

Modified: csw/mgar/pkg/tcpwrappers/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tcpwrappers/trunk/Makefile	2011-08-24 14:36:06 UTC (rev 15427)
+++ csw/mgar/pkg/tcpwrappers/trunk/Makefile	2011-08-24 15:02:17 UTC (rev 15428)
@@ -24,21 +24,22 @@
 PATCHFILES += sharedlib.patch
 
 PACKAGES += CSWtcpwrapper
-SPKG_DESC_CSWtcpwrapper = Wrapper around common tools using libwrap.so.0
+SPKG_DESC_CSWtcpwrapper = Wrapper around common tools using libwrap.so.1
 # PKGFILES is catchall
-RUNTIME_DEP_PKGS_CSWtcpwrapper += CSWlibwrap0
+RUNTIME_DEP_PKGS_CSWtcpwrapper += CSWlibwrap1
 OBSOLETED_BY_CSWtcpwrapper += CSWtcpwrap
 CATALOGNAME_CSWtcpwrap = tcpwrappers_stub
 
-PACKAGES += CSWlibwrap0
-SPKG_DESC_CSWlibwrap0 = Socket wrappers for pre-screening tcp connections (ipv6.4 patched), libwrap.so.0
-PKGFILES_CSWlibwrap0 += $(call pkgfiles_lib,libwrap.so.0)
-PKGFILES_CSWlibwrap0 += $(mandir)/man5/.*
+PACKAGES += CSWlibwrap1
+SPKG_DESC_CSWlibwrap1 = Socket wrappers for pre-screening tcp connections (ipv6.4 patched), libwrap.so.1
+PKGFILES_CSWlibwrap1 += $(call pkgfiles_lib,libwrap.so.1)
+PKGFILES_CSWlibwrap1 += $(mandir)/man5/.*
+SPKG_DESC_CSWtcpwrap = $(DESCRIPTION)
 
 PACKAGES += CSWlibwrap-dev
-SPKG_DESC_CSWlibwrap-dev = Development files for libwrap.so.0
+SPKG_DESC_CSWlibwrap-dev = Development files for libwrap.so.1
 PKGFILES_CSWlibwrap-dev += $(PKGFILES_DEVEL)
-RUNTIME_DEP_PKGS_CSWlibwrap-dev += CSWlibwrap0
+RUNTIME_DEP_PKGS_CSWlibwrap-dev += CSWlibwrap1
 
 BUILD_ARGS = REAL_DAEMON_DIR=/usr/sbin
 BUILD_ARGS += STYLE=-DPROCESS_OPTIONS
@@ -63,7 +64,7 @@
 
 INSTALL_SCRIPTS = custom
 
-MIGRATE_FILES_CSWlibwrap0 = hosts.allow hosts.deny
+MIGRATE_FILES_CSWlibwrap1 = hosts.allow hosts.deny
 
 # This is an example to /usr/local/lib/ntalkd
 CHECKPKG_OVERRIDES_CSWtcpwrapper += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/tcpd.8
@@ -94,8 +95,8 @@
 	ginstall -d $(DESTDIR)$(includedir)
 	cd $(WORKSRC) && ginstall -v -m 644 tcpd.h $(DESTDIR)$(includedir)
 	ginstall -d $(DESTDIR)$(libdir)
-	cd $(WORKSRC) && ginstall -v -m 644 libwrap.so.0 $(DESTDIR)$(libdir)/libwrap.so.0
-	gln -s libwrap.so.0 $(DESTDIR)$(libdir)/libwrap.so
+	cd $(WORKSRC) && ginstall -v -m 644 libwrap.so.1 $(DESTDIR)$(libdir)/libwrap.so.1
+	gln -s libwrap.so.1 $(DESTDIR)$(libdir)/libwrap.so
 	ginstall -d $(DESTDIR)$(mandir)/man3
 	cd $(WORKSRC) && ginstall -v -m 644 *.3 $(DESTDIR)$(mandir)/man3
 	ginstall -d $(DESTDIR)$(mandir)/man5

Modified: csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch
===================================================================
--- csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch	2011-08-24 14:36:06 UTC (rev 15427)
+++ csw/mgar/pkg/tcpwrappers/trunk/files/sharedlib.patch	2011-08-24 15:02:17 UTC (rev 15428)
@@ -8,8 +8,8 @@
 +sunos5-shared:
 +	@$(MAKE) REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
 +	LIBS="-lsocket -lnsl" RANLIB=/bin/true \
-+	AR=ld ARFLAGS="-G -h libwrap.so.0 -lsocket -lnsl -o " \
-+	LIB=libwrap.so.0 VSYSLOG= \
++	AR=ld ARFLAGS="-G -h libwrap.so.1 -lsocket -lnsl -o " \
++	LIB=libwrap.so.1 VSYSLOG= \
 +	NETGROUP=-DNETGROUP AUX_OBJ="setenv.o sharedhack.o" TLI=-DTLI \
 +	BUGS="$(BUGS) -DSOLARIS_24_GETHOSTBYNAME_BUG" IPV6="$(IPV6)" \
 +	EXTRA_CFLAGS="-DUSE_STRERROR -Kpic" all
@@ -17,8 +17,8 @@
 +sunos5-sharedext:
 +	@$(MAKE) REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
 +	LIBS="-lsocket -lnsl" RANLIB=/bin/true \
-+	AR=ld ARFLAGS="-G -h libwrap.so.0 -lsocket -lnsl -o " \
-+	LIB=libwrap.so.0 VSYSLOG= STYLE=-DPROCESS_OPTIONS \
++	AR=ld ARFLAGS="-G -h libwrap.so.1 -lsocket -lnsl -o " \
++	LIB=libwrap.so.1 VSYSLOG= STYLE=-DPROCESS_OPTIONS \
 +	NETGROUP=-DNETGROUP AUX_OBJ="setenv.o sharedhack.o" TLI=-DTLI \
 +	BUGS="$(BUGS) -DSOLARIS_24_GETHOSTBYNAME_BUG" IPV6="$(IPV6)" \
 +	EXTRA_CFLAGS="-DUSE_STRERROR -Kpic" all

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 Aug 24 18:17:38 2011
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 24 Aug 2011 16:17:38 +0000
Subject: [csw-devel] SF.net SVN: gar:[15429] csw/mgar/pkg/nmap/trunk
Message-ID: 

Revision: 15429
          http://gar.svn.sourceforge.net/gar/?rev=15429&view=rev
Author:   dmichelsen
Date:     2011-08-24 16:17:37 +0000 (Wed, 24 Aug 2011)

Log Message:
-----------
nmap: Update to 5.59BETA1 and lots of patching and adjusting

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

Added Paths:
-----------
    csw/mgar/pkg/nmap/trunk/files/0001-Add-definition-for-INT_MAX.patch
    csw/mgar/pkg/nmap/trunk/files/0002-Add-definitions-for-CMSG_ALIGN-CMSG_SPACE-and-CMSG_L.patch
    csw/mgar/pkg/nmap/trunk/files/0003-Do-not-use-__attribute__.patch
    csw/mgar/pkg/nmap/trunk/files/0004-Make-lt_sockaddr_storage-operator-const-or-compiler-.patch
    csw/mgar/pkg/nmap/trunk/files/0005-Fix-const-definition-of-route_dst-or-c-linkage-fails.patch

Removed Paths:
-------------
    csw/mgar/pkg/nmap/trunk/files/gtk20.diff

Modified: csw/mgar/pkg/nmap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nmap/trunk/Makefile	2011-08-24 15:02:17 UTC (rev 15428)
+++ csw/mgar/pkg/nmap/trunk/Makefile	2011-08-24 16:17:37 UTC (rev 15429)
@@ -1,5 +1,5 @@
 NAME = nmap
-VERSION = 5.21
+VERSION = 5.59BETA1
 CATEGORIES = net
 
 DESCRIPTION = A network exploration tool and security/port scanner
@@ -17,28 +17,60 @@
 MASTER_SITES = http://nmap.org/dist/
 DISTFILES = $(NAME)-$(VERSION).tar.bz2
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
+PATCHFILES += 0001-Add-definition-for-INT_MAX.patch
+PATCHFILES += 0002-Add-definitions-for-CMSG_ALIGN-CMSG_SPACE-and-CMSG_L.patch
+PATCHFILES += 0003-Do-not-use-__attribute__.patch
+PATCHFILES += 0004-Make-lt_sockaddr_storage-operator-const-or-compiler-.patch
+PATCHFILES += 0005-Fix-const-definition-of-route_dst-or-c-linkage-fails.patch
 
-# Compile against gtk+-2.0 (2.4.0)
-# PATCHFILES = gtk20.diff
+BUILD_DEP_PKGS += CSWlibpcre-dev
+BUILD_DEP_PKGS += CSWlibpcap-dev
+BUILD_DEP_PKGS += CSWossldevel
 
+PACKAGES += CSWnmap
+SPKG_DESC_CSWnmap = A network exploration tool and security/port scanner
+RUNTIME_DEP_PKGS_CSWnmap += CSWstlport
+RUNTIME_DEP_PKGS_CSWnmap += CSWlibpcre0
+RUNTIME_DEP_PKGS_CSWnmap += CSWlua
+RUNTIME_DEP_PKGS_CSWnmap += CSWosslrt
+RUNTIME_DEP_PKGS_CSWnmap += CSWlibpcap1
+
+# See standards(5) for details
+EXTRA_CPPFLAGS += -features=extensions -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D__EXTENSIONS__
+EXTRA_CXXFLAGS += -features=extensions -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D__EXTENSIONS__
+EXTRA_CXXFLAGS += -library=stlport4
+
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-libpcre=$(prefix)
 CONFIGURE_ARGS += --with-libpcap=$(prefix)
 CONFIGURE_ARGS += --with-openssl=$(prefix)
 
-#nmapdatadir=$(datadir)/nmap
+# Use included libdnet as it contains many important fixes as described at
+#   http://nmap.org/svn/libdnet-stripped/NMAP_MODIFICATIONS
+CONFIGURE_ARGS += --with-libdnet=included
 
-#INSTALL_OVERRIDE_DIRS  = prefix exec_prefix bindir sbindir mandir
-#INSTALL_OVERRIDE_DIRS += nmapdatadir deskdir
+#
+CONFIGURE_ARGS += --with-liblua=$(prefix)
+# CONFIGURE_ARGS += --with-libnbase=
+#CONFIGURE_ARGS += --with-libnsock=
 
-# No test suite for nmap
+# Disable most of the tools for now, enable later one by one
+CONFIGURE_ARGS += --without-ndiff
+CONFIGURE_ARGS += --without-zenmap
+CONFIGURE_ARGS += --without-nping
+CONFIGURE_ARGS += --without-ncat
+
+# We can't put this in EXTRA_LINKER_FLAGS as LDFLAGS is used for cc too and -library=stlport4 breaks cc
+BUILD_OVERRIDE_VARS = STATIC
+BUILD_OVERRIDE_VAR_STATIC = -library=stlport4 -norunpath
+
+# There is no testsuite
 TEST_SCRIPTS =
 
+# Tons of docs and identification of programs installed there
+CHECKPKG_OVERRIDES_CSWnmap += file-with-bad-content
+
 include gar/category.mk
 
-#pre-configure:
-#	@( cd $(WORKSRC) ; autoconf )
-#	@( cd $(WORKSRC)/nmapfe ; autoconf )
-#	@$(MAKECOOKIE)
+post-extract-modulated:
+	-cd $(WORKSRC) && find . -type d | while read d; do touch $$d/makefile.dep; done

Modified: csw/mgar/pkg/nmap/trunk/checksums
===================================================================
--- csw/mgar/pkg/nmap/trunk/checksums	2011-08-24 15:02:17 UTC (rev 15428)
+++ csw/mgar/pkg/nmap/trunk/checksums	2011-08-24 16:17:37 UTC (rev 15429)
@@ -1 +1 @@
-f77fa51d89ab27d35e5cd87bb086b858  nmap-5.21.tar.bz2
+3494499e6fd4716088017bbab8af1dbf  nmap-5.59BETA1.tar.bz2

Added: csw/mgar/pkg/nmap/trunk/files/0001-Add-definition-for-INT_MAX.patch
===================================================================
--- csw/mgar/pkg/nmap/trunk/files/0001-Add-definition-for-INT_MAX.patch	                        (rev 0)
+++ csw/mgar/pkg/nmap/trunk/files/0001-Add-definition-for-INT_MAX.patch	2011-08-24 16:17:37 UTC (rev 15429)
@@ -0,0 +1,24 @@
+From a93f6c299e460dd381c3459aa4dad61d9e2b213b Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen 
+Date: Tue, 23 Aug 2011 13:35:57 +0200
+Subject: [PATCH 1/2] Add definition for INT_MAX
+
+---
+ ncat/ncat_listen.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/ncat/ncat_listen.c b/ncat/ncat_listen.c
+index 82d7d67..d0fe6f6 100644
+--- a/ncat/ncat_listen.c
++++ b/ncat/ncat_listen.c
+@@ -96,6 +96,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #ifndef WIN32
+ #include 
+ #include 
+-- 
+1.7.6
+

Added: csw/mgar/pkg/nmap/trunk/files/0002-Add-definitions-for-CMSG_ALIGN-CMSG_SPACE-and-CMSG_L.patch
===================================================================
--- csw/mgar/pkg/nmap/trunk/files/0002-Add-definitions-for-CMSG_ALIGN-CMSG_SPACE-and-CMSG_L.patch	                        (rev 0)
+++ csw/mgar/pkg/nmap/trunk/files/0002-Add-definitions-for-CMSG_ALIGN-CMSG_SPACE-and-CMSG_L.patch	2011-08-24 16:17:37 UTC (rev 15429)
@@ -0,0 +1,40 @@
+From aa4410cb0368057455629d0e1adfa73e25662eb5 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen 
+Date: Tue, 23 Aug 2011 13:36:17 +0200
+Subject: [PATCH 2/2] Add definitions for CMSG_ALIGN, CMSG_SPACE and CMSG_LEN
+
+---
+ libnetutil/netutil.cc |   17 +++++++++++++++++
+ 1 files changed, 17 insertions(+), 0 deletions(-)
+
+diff --git a/libnetutil/netutil.cc b/libnetutil/netutil.cc
+index ded7550..56ed36d 100644
+--- a/libnetutil/netutil.cc
++++ b/libnetutil/netutil.cc
+@@ -111,6 +111,23 @@
+ #endif
+ #include 
+ 
++#ifndef CMSG_ALIGN
++#   if defined(__sun) || defined(__sun__)
++#       define CMSG_ALIGN _CMSG_DATA_ALIGN
++#   else
++#       define CMSG_ALIGN(len) (((len)+sizeof(long)-1) & ~(sizeof(long)-1))
++#   endif
++#endif
++
++#ifndef CMSG_SPACE
++#   define CMSG_SPACE(len) (CMSG_ALIGN(sizeof(struct cmsghdr))+CMSG_ALIGN(len))
++#endif
++
++#ifndef CMSG_LEN
++#   define CMSG_LEN(len) (CMSG_ALIGN(sizeof(struct cmsghdr))+(len))
++#endif
++
++
+ #if HAVE_NETINET_IN_H
+ #include 
+ #endif
+-- 
+1.7.6
+

Added: csw/mgar/pkg/nmap/trunk/files/0003-Do-not-use-__attribute__.patch
===================================================================
--- csw/mgar/pkg/nmap/trunk/files/0003-Do-not-use-__attribute__.patch	                        (rev 0)
+++ csw/mgar/pkg/nmap/trunk/files/0003-Do-not-use-__attribute__.patch	2011-08-24 16:17:37 UTC (rev 15429)
@@ -0,0 +1,24 @@
+From ef6e71ddbd2a264500c997c3bd64a3e6d92bdd3e Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen 
+Date: Tue, 23 Aug 2011 17:32:18 +0200
+Subject: [PATCH] Do not use __attribute__
+
+---
+ nmap_error.h |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/nmap_error.h b/nmap_error.h
+index 356dd8c..9313f5e 100644
+--- a/nmap_error.h
++++ b/nmap_error.h
+@@ -124,6 +124,7 @@ extern "C" {
+ #ifdef WIN32
+ __declspec(noreturn)
+ #endif  
++#define __attribute__(x)
+ void fatal(const char *fmt, ...)
+      __attribute__ ((noreturn))
+      __attribute__ ((format (printf, 1, 2)));
+-- 
+1.7.6
+

Added: csw/mgar/pkg/nmap/trunk/files/0004-Make-lt_sockaddr_storage-operator-const-or-compiler-.patch
===================================================================
--- csw/mgar/pkg/nmap/trunk/files/0004-Make-lt_sockaddr_storage-operator-const-or-compiler-.patch	                        (rev 0)
+++ csw/mgar/pkg/nmap/trunk/files/0004-Make-lt_sockaddr_storage-operator-const-or-compiler-.patch	2011-08-24 16:17:37 UTC (rev 15429)
@@ -0,0 +1,26 @@
+From bd9b0814c81cda23e49293e9471417753e97fa1c Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen 
+Date: Wed, 24 Aug 2011 15:32:51 +0200
+Subject: [PATCH] Make lt_sockaddr_storage::operator const or compiler bails
+ out
+
+---
+ traceroute.cc |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/traceroute.cc b/traceroute.cc
+index b972828..dec5353 100644
+--- a/traceroute.cc
++++ b/traceroute.cc
+@@ -1338,7 +1338,7 @@ void TracerouteState::remove_finished_hosts() {
+ 
+ /* Dummy class to use sockaddr_storage as a map key. */
+ struct lt_sockaddr_storage {
+-  bool operator()(const struct sockaddr_storage& a, const struct sockaddr_storage& b) {
++  bool operator()(const struct sockaddr_storage& a, const struct sockaddr_storage& b) const {
+     return sockaddr_storage_cmp(&a, &b) < 0;
+   }
+ };
+-- 
+1.7.5.4
+

Added: csw/mgar/pkg/nmap/trunk/files/0005-Fix-const-definition-of-route_dst-or-c-linkage-fails.patch
===================================================================
--- csw/mgar/pkg/nmap/trunk/files/0005-Fix-const-definition-of-route_dst-or-c-linkage-fails.patch	                        (rev 0)
+++ csw/mgar/pkg/nmap/trunk/files/0005-Fix-const-definition-of-route_dst-or-c-linkage-fails.patch	2011-08-24 16:17:37 UTC (rev 15429)
@@ -0,0 +1,25 @@
+From f5d0f3a8fc5376b0fe0aedb7863ec77b0d6173b0 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen 
+Date: Wed, 24 Aug 2011 17:04:41 +0200
+Subject: [PATCH] Fix const definition of route_dst or c++ linkage fails
+
+---
+ libnetutil/netutil.cc |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/libnetutil/netutil.cc b/libnetutil/netutil.cc
+index 56ed36d..211d275 100644
+--- a/libnetutil/netutil.cc
++++ b/libnetutil/netutil.cc
+@@ -3217,7 +3217,7 @@ static int route_dst_generic(const struct sockaddr_storage *dst,
+  * Even if spoofss is NULL, if user specified a network device with -e, 
+  * it should still be passed. Note that it's OK to pass either NULL or 
+  * an empty string as the "device", as long as spoofss==NULL. */
+-int route_dst(const struct sockaddr_storage *dst, struct route_nfo *rnfo,
++int route_dst(const struct sockaddr_storage *const dst, struct route_nfo *rnfo,
+               const char *device, const struct sockaddr_storage *spoofss) {
+ #ifdef HAVE_LINUX_RTNETLINK_H
+   return route_dst_netlink(dst, rnfo, device, spoofss);
+-- 
+1.7.5.4
+

Deleted: csw/mgar/pkg/nmap/trunk/files/gtk20.diff
===================================================================
--- csw/mgar/pkg/nmap/trunk/files/gtk20.diff	2011-08-24 15:02:17 UTC (rev 15428)
+++ csw/mgar/pkg/nmap/trunk/files/gtk20.diff	2011-08-24 16:17:37 UTC (rev 15429)
@@ -1,494 +0,0 @@
-diff --speed-large-files --minimal -Nru nmap-3.50.orig/config.h.in nmap-3.50/config.h.in
---- nmap-3.50.orig/config.h.in	2003-09-12 21:19:54.000000000 -0700
-+++ nmap-3.50/config.h.in	2004-04-16 12:39:38.762507315 -0700
-@@ -128,6 +128,8 @@
- 
- #undef HAVE_SYS_SOCKIO_H
- 
-+#undef HAVE_SYS_WAIT_H
-+
- #undef HAVE_PCRE_H
- 
- #undef HAVE_PCRE_PCRE_H
-diff --speed-large-files --minimal -Nru nmap-3.50.orig/configure.ac nmap-3.50/configure.ac
---- nmap-3.50.orig/configure.ac	2003-10-06 12:54:46.000000000 -0700
-+++ nmap-3.50/configure.ac	2004-04-16 12:39:38.765146475 -0700
-@@ -150,7 +150,7 @@
- 
- dnl Checks for header files.
- AC_HEADER_STDC
--AC_CHECK_HEADERS(string.h getopt.h strings.h memory.h sys/param.h sys/sockio.h bstring.h sys/time.h pwd.h unistd.h )
-+AC_CHECK_HEADERS(string.h getopt.h strings.h memory.h sys/param.h sys/sockio.h bstring.h sys/time.h pwd.h unistd.h sys/wait.h)
- AC_CHECK_HEADERS(netinet/in.h)
- AC_CHECK_HEADERS(sys/socket.h)
- AC_CHECK_HEADERS([net/if.h],[],[],
-@@ -654,40 +654,8 @@
-         subdirs="$NBASEDIR $libpcapdir $subdirs"
- fi
- 
--
- if test "${with_nmapfe}" = "yes"; then
--dnl Check for GTK+
--AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
--AC_MSG_CHECKING(If you have GTK+ installed)
--if test "$GTK_CONFIG" = "no" ; then
--  AC_MSG_RESULT([no])
--  AC_MSG_WARN([Gtk+ has not been installed -> nmapfe will not be made])
--else
--  GTK_NEEDED_MAJOR=1
--  GTK_NEEDED_MINOR=2
--  GTK_NEEDED_MICRO=7
--  GTK_MINVERSION=$GTK_NEEDED_MAJOR.$GTK_NEEDED_MINOR.$GTK_NEEDED_MICRO
--  ver=`gtk-config --version`
--  dnl Extract the information.
--  major=`echo $ver|sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
--  minor=`echo $ver|sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
--  micro=`echo $ver|sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
--  AC_MSG_RESULT($ver)
--  if test $major -lt $GTK_NEEDED_MAJOR -o $major -eq $GTK_NEEDED_MAJOR \
--    -a $minor -lt $GTK_NEEDED_MINOR -o $minor -eq $GTK_NEEDED_MINOR \
--    -a $micro -lt $GTK_NEEDED_MICRO; then
--    AC_MSG_WARN([An old version of GTK+ ($major.$minor.$micro) was found.\n \
--                 You need at least version $GTK_MINVERSION.\n Subdir X-windows \
--                 will not be made])
--  else
-     subdirs="$subdirs nmapfe"
--    dnl Maybe also define the flags to compile and link GTK+
--    dnl GTK_CXXFLAGS=`gtk-config --cflags`
--    dnl GTK_LIBS=`gtk-config --libs`
--    dnl AC_SUBST(GTK_CXXFLAGS)
--    dnl AC_SUBST(GTK_LIBS)
--  fi
--fi
- fi
- 
- AC_CONFIG_SUBDIRS( $subdirs )
-diff --speed-large-files --minimal -Nru nmap-3.50.orig/nmapfe/Makefile.in nmap-3.50/nmapfe/Makefile.in
---- nmap-3.50.orig/nmapfe/Makefile.in	2003-09-19 17:36:26.000000000 -0700
-+++ nmap-3.50/nmapfe/Makefile.in	2004-04-16 12:40:11.065049352 -0700
-@@ -72,7 +72,7 @@
- CONFIG_CLEAN_FILES = 
- PROGRAMS =  $(bin_PROGRAMS)
- 
--DEFS = @DEFS@ -DVERSION=\"$(VERSION)\" -DHAVE_CONFIG_H=1 -I$(srcdir) 
-+DEFS = @DEFS@ -DVERSION=\"$(VERSION)\" -DHAVE_CONFIG_H=1 -I$(srcdir) -I..
- CPPFLAGS = @CPPFLAGS@
- STATIC =
- LDFLAGS = @LDFLAGS@ $(STATIC)
-diff --speed-large-files --minimal -Nru nmap-3.50.orig/nmapfe/aclocal.m4 nmap-3.50/nmapfe/aclocal.m4
---- nmap-3.50.orig/nmapfe/aclocal.m4	2002-07-20 00:10:48.000000000 -0700
-+++ nmap-3.50/nmapfe/aclocal.m4	2004-04-16 12:39:38.768779192 -0700
-@@ -1,208 +1,57 @@
--# aclocal.m4 generated automatically by aclocal 1.6.2 -*- Autoconf -*-
--
--# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
--# Free Software Foundation, Inc.
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
--# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
--# PARTICULAR PURPOSE.
--
--# Configure paths for GTK+
--# Owen Taylor     97-11-3
--
--dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
--dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
--dnl
--AC_DEFUN(AM_PATH_GTK,
--[dnl 
--dnl Get the cflags and libraries from the gtk-config script
--dnl
--AC_ARG_WITH(gtk-prefix,[  --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)],
--            gtk_config_prefix="$withval", gtk_config_prefix="")
--AC_ARG_WITH(gtk-exec-prefix,[  --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)],
--            gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
--AC_ARG_ENABLE(gtktest, [  --disable-gtktest       Do not try to compile and run a test GTK program],
--		    , enable_gtktest=yes)
-+dnl This is some Glib/Gtk+ checking code pulled from the gftp project
- 
--  for module in . $4
--  do
--      case "$module" in
--         gthread) 
--             gtk_config_args="$gtk_config_args gthread"
--         ;;
--      esac
--  done
-+dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
-+dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
-+dnl also defines GSTUFF_PKG_ERRORS on error
-+AC_DEFUN(PKG_CHECK_MODULES, [
-+  succeeded=no
- 
--  if test x$gtk_config_exec_prefix != x ; then
--     gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
--     if test x${GTK_CONFIG+set} != xset ; then
--        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
--     fi
--  fi
--  if test x$gtk_config_prefix != x ; then
--     gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
--     if test x${GTK_CONFIG+set} != xset ; then
--        GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
--     fi
-+  if test -z "$PKG_CONFIG"; then
-+    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-   fi
- 
--  AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
--  min_gtk_version=ifelse([$1], ,0.99.7,$1)
--  AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
--  no_gtk=""
--  if test "$GTK_CONFIG" = "no" ; then
--    no_gtk=yes
-+  if test "$PKG_CONFIG" = "no" ; then
-+     echo "*** The pkg-config script could not be found. Make sure it is"
-+     echo "*** in your path, or set the PKG_CONFIG environment variable"
-+     echo "*** to the full path to pkg-config."
-+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-   else
--    GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
--    GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
--    gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
--           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
--    gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
--           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
--    gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
--           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
--    if test "x$enable_gtktest" = "xyes" ; then
--      ac_save_CFLAGS="$CFLAGS"
--      ac_save_LIBS="$LIBS"
--      CFLAGS="$CFLAGS $GTK_CFLAGS"
--      LIBS="$GTK_LIBS $LIBS"
--dnl
--dnl Now check if the installed GTK is sufficiently new. (Also sanity
--dnl checks the results of gtk-config to some extent
--dnl
--      rm -f conf.gtktest
--      AC_TRY_RUN([
--#include 
--#include 
--#include 
-+     PKG_CONFIG_MIN_VERSION=0.9.0
-+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-+        AC_MSG_CHECKING(for $2)
- 
--int 
--main ()
--{
--  int major, minor, micro;
--  char *tmp_version;
-+        if $PKG_CONFIG --exists "$2" ; then
-+            AC_MSG_RESULT(yes)
-+            succeeded=yes
- 
--  system ("touch conf.gtktest");
-+            AC_MSG_CHECKING($1_CFLAGS)
-+            $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
-+            AC_MSG_RESULT($$1_CFLAGS)
- 
--  /* HP/UX 9 (%@#!) writes to sscanf strings */
--  tmp_version = g_strdup("$min_gtk_version");
--  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
--     printf("%s, bad version string\n", "$min_gtk_version");
--     exit(1);
--   }
-+            AC_MSG_CHECKING($1_LIBS)
-+            $1_LIBS=`$PKG_CONFIG --libs "$2"`
-+            AC_MSG_RESULT($$1_LIBS)
-+        else
-+            $1_CFLAGS=""
-+            $1_LIBS=""
-+            ## If we have a custom action on failure, don't print errors, but 
-+            ## do set a variable so people can do so.
-+            $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-+            ifelse([$4], ,echo $$1_PKG_ERRORS,)
-+        fi
- 
--  if ((gtk_major_version != $gtk_config_major_version) ||
--      (gtk_minor_version != $gtk_config_minor_version) ||
--      (gtk_micro_version != $gtk_config_micro_version))
--    {
--      printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
--             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
--             gtk_major_version, gtk_minor_version, gtk_micro_version);
--      printf ("*** was found! If gtk-config was correct, then it is best\n");
--      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
--      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
--      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
--      printf("*** required on your system.\n");
--      printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
--      printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
--      printf("*** before re-running configure\n");
--    } 
--#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
--  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
--	   (gtk_minor_version != GTK_MINOR_VERSION) ||
--           (gtk_micro_version != GTK_MICRO_VERSION))
--    {
--      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
--	     GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
--      printf("*** library (version %d.%d.%d)\n",
--	     gtk_major_version, gtk_minor_version, gtk_micro_version);
--    }
--#endif /* defined (GTK_MAJOR_VERSION) ... */
--  else
--    {
--      if ((gtk_major_version > major) ||
--        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
--        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
--      {
--        return 0;
--       }
-+        AC_SUBST($1_CFLAGS)
-+        AC_SUBST($1_LIBS)
-      else
--      {
--        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
--               gtk_major_version, gtk_minor_version, gtk_micro_version);
--        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
--	       major, minor, micro);
--        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
--        printf("***\n");
--        printf("*** If you have already installed a sufficiently new version, this error\n");
--        printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
--        printf("*** being found. The easiest way to fix this is to remove the old version\n");
--        printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
--        printf("*** correct copy of gtk-config. (In this case, you will have to\n");
--        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
--        printf("*** so that the correct libraries are found at run-time))\n");
--      }
--    }
--  return 1;
--}
--],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
--       CFLAGS="$ac_save_CFLAGS"
--       LIBS="$ac_save_LIBS"
-+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-      fi
-   fi
--  if test "x$no_gtk" = x ; then
--     AC_MSG_RESULT(yes)
--     ifelse([$2], , :, [$2])     
--  else
--     AC_MSG_RESULT(no)
--     if test "$GTK_CONFIG" = "no" ; then
--       echo "*** The gtk-config script installed by GTK could not be found"
--       echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
--       echo "*** your path, or set the GTK_CONFIG environment variable to the"
--       echo "*** full path to gtk-config."
--     else
--       if test -f conf.gtktest ; then
--        :
--       else
--          echo "*** Could not run GTK test program, checking why..."
--          CFLAGS="$CFLAGS $GTK_CFLAGS"
--          LIBS="$LIBS $GTK_LIBS"
--          AC_TRY_LINK([
--#include 
--#include 
--],      [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
--        [ echo "*** The test program compiled, but did not run. This usually means"
--          echo "*** that the run-time linker is not finding GTK or finding the wrong"
--          echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
--          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
--          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
--          echo "*** is required on your system"
--	  echo "***"
--          echo "*** If you have an old version installed, it is best to remove it, although"
--          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
--          echo "***"
--          echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
--          echo "*** came with the system with the command"
--          echo "***"
--          echo "***    rpm --erase --nodeps gtk gtk-devel" ],
--        [ echo "*** The test program failed to compile or link. See the file config.log for the"
--          echo "*** exact error that occured. This usually means GTK was incorrectly installed"
--          echo "*** or that you have moved GTK since it was installed. In the latter case, you"
--          echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ])
--          CFLAGS="$ac_save_CFLAGS"
--          LIBS="$ac_save_LIBS"
--       fi
--     fi
--     GTK_CFLAGS=""
--     GTK_LIBS=""
-+
-+  if test $succeeded = yes; then
-      ifelse([$3], , :, [$3])
-+  else
-+     ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
-   fi
--  AC_SUBST(GTK_CFLAGS)
--  AC_SUBST(GTK_LIBS)
--  rm -f conf.gtktest
- ])
- 
-diff --speed-large-files --minimal -Nru nmap-3.50.orig/nmapfe/configure.ac nmap-3.50/nmapfe/configure.ac
---- nmap-3.50.orig/nmapfe/configure.ac	2002-07-20 00:00:54.000000000 -0700
-+++ nmap-3.50/nmapfe/configure.ac	2004-04-16 12:39:38.769811826 -0700
-@@ -6,18 +6,20 @@
- 
- AC_PROG_CC
- 
--#AM_PATH_GTK(1.0.0,
--#            [LIBS="$LIBS $GTK_LIBS" CFLAGS="$CFLAGS $GTK_CFLAGS"],
--#            AC_MSG_ERROR(Cannot find GTK: Is gtk-config in path?))
--AM_PATH_GTK(1.0.0,
--            [LIBS="$LIBS $GTK_LIBS" CFLAGS="$CFLAGS $GTK_CFLAGS"],
--            AC_DEFINE(MISSING_GTK) \
--	    AC_MSG_WARN(NMAPFE WILL NOT BE BUILT -- BUT NMAP SHOULD STILL WORK ))
-+if test x$GTK_LIBS = x ; then
-+    PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.0.0, have_gtk20="yes", have_gtk20="no")
-+
-+    if test $have_gtk20 = "yes" ; then
-+        LIBS="$LIBS $GTK_LIBS" CFLAGS="$CFLAGS $GTK_CFLAGS"
-+    else
-+        AC_DEFINE(MISSING_GTK)
-+        AC_MSG_WARN("NMAPFE WILL NOT BE BUILT -- BUT NMAP SHOULD STILL WORK")
-+    fi
-+fi
- 
- dnl Host specific hacks
- AC_CANONICAL_HOST
- 
--
- linux=no
- macosx=no
- needs_cpp_precomp=no
-diff --speed-large-files --minimal -Nru nmap-3.50.orig/nmapfe/nmapfe.c nmap-3.50/nmapfe/nmapfe.c
---- nmap-3.50.orig/nmapfe/nmapfe.c	2003-09-20 02:03:01.000000000 -0700
-+++ nmap-3.50/nmapfe/nmapfe.c	2004-04-16 12:39:38.774924124 -0700
-@@ -95,22 +95,15 @@
-  * Long live Aol and pr: Phreak. 
-  */
- 
--#if MISSING_GTK
--#error "Your system does not appear to have GTK (www.gtk.org) installed.  Thus the Nmap X Front End will not compile.  You should still be able to use Nmap the normal way (via text console).  GUIs are for wimps anyway :)"
--#else
--
--
--
--#include 
--#include 
-+#if HAVE_CONFIG_H
-+#include "config.h"
-+#endif
- 
- #if HAVE_UNISTD_H
- #include 
- #endif
- #include 
- 
--#include 
--
- #include "nmapfe.h"
- #include "nmapfe_sig.h"
- 
-@@ -1291,7 +1284,7 @@
- GtkWidget *hbox;
- GtkWidget *button;
- 
--  helpDialog = gtk_window_new(GTK_WINDOW_DIALOG);
-+  helpDialog = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-   gtk_widget_set_usize(helpDialog, 400, 300);
-   gtk_window_set_title(GTK_WINDOW(helpDialog), "Help With NmapFE");
-   gtk_window_set_policy(GTK_WINDOW(helpDialog), FALSE, FALSE, FALSE);
-@@ -1377,6 +1370,3 @@
- 
-   return(helpDialog);
- }
--
--
--#endif /* MISSING_GTK */
-diff --speed-large-files --minimal -Nru nmap-3.50.orig/nmapfe/nmapfe.h nmap-3.50/nmapfe/nmapfe.h
---- nmap-3.50.orig/nmapfe/nmapfe.h	2003-09-20 02:03:01.000000000 -0700
-+++ nmap-3.50/nmapfe/nmapfe.h	2004-04-16 12:39:38.776375624 -0700
-@@ -101,8 +101,11 @@
- #error "Your system does not appear to have GTK (www.gtk.org) installed.  Thus the Nmap X Front End will not compile.  You should still be able to use Nmap the normal way (via text console).  GUIs are for wimps anyway :)"
- #endif
- 
--#include 
-+#define GTK_ENABLE_BROKEN
- #include 
-+#include 
-+
-+#include 
- 
- /* #define DEBUG(str) { fprintf(stderr, str); fflush(stderr); } */
- 
-diff --speed-large-files --minimal -Nru nmap-3.50.orig/nmapfe/nmapfe_error.h nmap-3.50/nmapfe/nmapfe_error.h
---- nmap-3.50.orig/nmapfe/nmapfe_error.h	2003-09-10 19:12:58.000000000 -0700
-+++ nmap-3.50/nmapfe/nmapfe_error.h	2004-04-16 12:39:38.777388391 -0700
-@@ -84,9 +84,13 @@
- 
- /* $Id: gtk20.diff,v 1.1.1.1 2004/08/17 17:07:34 comand Exp $ */
- 
--
- #ifndef NMAPFE_ERROR_H
- #define NMAPFE_ERROR_H
-+
-+#if HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include 
- 
- #include 
-diff --speed-large-files --minimal -Nru nmap-3.50.orig/nmapfe/nmapfe_sig.c nmap-3.50/nmapfe/nmapfe_sig.c
---- nmap-3.50.orig/nmapfe/nmapfe_sig.c	2003-09-20 02:03:01.000000000 -0700
-+++ nmap-3.50/nmapfe/nmapfe_sig.c	2004-04-16 12:39:38.780910880 -0700
-@@ -98,13 +98,10 @@
- #define MAX_PARSE_ARGS 512
- #endif
- 
--#if MISSING_GTK
--/* Do nothing, nmapfe.c will spit out an error */
--#else
--
--#include 
-+#if HAVE_CONFIG_H
-+#include "config.h"
-+#endif
- 
--#include 
- #include 
- #include 
- #include 
-@@ -126,7 +123,6 @@
- #include 
- #include 
- 
--
- #ifdef WIN32
- #include 
- #endif
-@@ -1359,5 +1355,3 @@
-   free(argv);
- }
- 
--
--#endif /* MISSING_GTK */
-diff --speed-large-files --minimal -Nru nmap-3.50.orig/nmapfe/nmapfe_sig.h nmap-3.50/nmapfe/nmapfe_sig.h
---- nmap-3.50.orig/nmapfe/nmapfe_sig.h	2003-09-10 19:12:58.000000000 -0700
-+++ nmap-3.50/nmapfe/nmapfe_sig.h	2004-04-16 12:39:38.782098632 -0700
-@@ -96,14 +96,7 @@
- #ifndef NMAPFE_SIG_H
- #define NMAPFE_SIG_H
- 
--#if MISSING_GTK
--#error "Your system does not appear to have GTK (www.gtk.org) installed.  Thus the Nmap X Front End will not compile.  You should still be able to use Nmap the normal way (via text console).  GUIs are for wimps anyway :)"
--#endif
--
--
--#include 
--#include 
--
-+#include "nmapfe.h"
- #include "nmapfe_error.h"
- 
- gboolean stop_scan();


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

From aigoshin at users.sourceforge.net  Wed Aug 24 18:31:36 2011
From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net)
Date: Wed, 24 Aug 2011 16:31:36 +0000
Subject: [csw-devel] SF.net SVN: gar:[15430]
	csw/mgar/pkg/nginx/trunk/Makefile
Message-ID: 

Revision: 15430
          http://gar.svn.sourceforge.net/gar/?rev=15430&view=rev
Author:   aigoshin
Date:     2011-08-24 16:31:36 +0000 (Wed, 24 Aug 2011)

Log Message:
-----------
nginx: release 20110824

Modified Paths:
--------------
    csw/mgar/pkg/nginx/trunk/Makefile

Modified: csw/mgar/pkg/nginx/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nginx/trunk/Makefile	2011-08-24 16:17:37 UTC (rev 15429)
+++ csw/mgar/pkg/nginx/trunk/Makefile	2011-08-24 16:31:36 UTC (rev 15430)
@@ -19,7 +19,7 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz
 
-RUNTIME_DEP_PKGS = CSWosslrt CSWlibpcre0 CSWzlib1 CSWperl
+RUNTIME_DEP_PKGS = CSWosslrt CSWlibpcre0 CSWlibz1 CSWperl
 
 PACKAGING_PLATFORMS  = solaris9-sparc  solaris9-i386
 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386


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

From aigoshin at users.sourceforge.net  Wed Aug 24 18:34:56 2011
From: aigoshin at users.sourceforge.net (aigoshin at users.sourceforge.net)
Date: Wed, 24 Aug 2011 16:34:56 +0000
Subject: [csw-devel] SF.net SVN: gar:[15431]
	csw/mgar/pkg/nginx/trunk/Makefile
Message-ID: 

Revision: 15431
          http://gar.svn.sourceforge.net/gar/?rev=15431&view=rev
Author:   aigoshin
Date:     2011-08-24 16:34:56 +0000 (Wed, 24 Aug 2011)

Log Message:
-----------
nginx: release 20110824

Modified Paths:
--------------
    csw/mgar/pkg/nginx/trunk/Makefile

Modified: csw/mgar/pkg/nginx/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nginx/trunk/Makefile	2011-08-24 16:31:36 UTC (rev 15430)
+++ csw/mgar/pkg/nginx/trunk/Makefile	2011-08-24 16:34:56 UTC (rev 15431)
@@ -19,6 +19,7 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz
 
+BUILD_DEP_PKGS = CSWlibz-dev
 RUNTIME_DEP_PKGS = CSWosslrt CSWlibpcre0 CSWlibz1 CSWperl
 
 PACKAGING_PLATFORMS  = solaris9-sparc  solaris9-i386


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

From wahwah at users.sourceforge.net  Thu Aug 25 00:35:03 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 24 Aug 2011 22:35:03 +0000
Subject: [csw-devel] SF.net SVN: gar:[15432]
	csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
Message-ID: 

Revision: 15432
          http://gar.svn.sourceforge.net/gar/?rev=15432&view=rev
Author:   wahwah
Date:     2011-08-24 22:35:02 +0000 (Wed, 24 Aug 2011)
Log Message:
-----------
pkg/gcc4/branches/bootstrap-4.6: trying out a different prefix / bindir setting

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile

Modified: csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-24 16:34:56 UTC (rev 15431)
+++ csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-24 22:35:02 UTC (rev 15432)
@@ -33,21 +33,27 @@
 ## Copyright File
 LICENSE = COPYING3
 
-prefix = $(BUILD_PREFIX)/gcc4
-libdir_install = $(BUILD_PREFIX)/lib
-libdir = $(abspath $(BUILD_PREFIX)/lib/$(MM_LIBDIR))
+# prefix = $(BUILD_PREFIX)/gcc4
+# libdir_install = $(BUILD_PREFIX)/lib
+# libdir = $(abspath $(BUILD_PREFIX)/lib/$(MM_LIBDIR))
+# CONFIGURE_ARGS += --prefix=$(prefix)
+# CONFIGURE_ARGS += --libdir=$(libdir)
+# CONFIGURE_ARGS += --exec-prefix=$(BUILD_PREFIX)/gcc4
 
+# Trying to fix the include problem.
+# http://gcc.gnu.org/ml/gcc-help/2011-08/msg00247.html
+CONFIGURE_ARGS += --bindir=$(prefix)/gcc4/bin
+CONFIGURE_ARGS += --libexecdir=$(prefix)/gcc4/libexec
+CONFIGURE_ARGS += --exec-prefix=$(prefix)/gcc4
+
 ## build options
 # http://gcc.gnu.org/install/configure.html
 
 # Could be used to break out of the /opt/csw/gcc4 prefix
 # CONFIGURE_ARGS += --program-prefix=gcc4-
 
-CONFIGURE_ARGS += --prefix=$(prefix)
-CONFIGURE_ARGS += --libdir=$(libdir)
 # The theory is that DIRPATHS confuse the installer, e.g. includedir
 # CONFIGURE_ARGS += --includedir=$(prefix)/include
-CONFIGURE_ARGS += --exec-prefix=$(BUILD_PREFIX)/gcc4
 CONFIGURE_ARGS += --with-gnu-as
 CONFIGURE_ARGS += --with-as=/opt/csw/bin/gas
 CONFIGURE_ARGS += --without-gnu-ld

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


From bwalton at opencsw.org  Thu Aug 25 01:30:15 2011
From: bwalton at opencsw.org (Ben Walton)
Date: Wed, 24 Aug 2011 19:30:15 -0400
Subject: [csw-devel] psuedo sketch of web and mantis automation
In-Reply-To: <1313802712-sup-5904@pinkfloyd.chass.utoronto.ca>
References: <1313717595-sup-109@pinkfloyd.chass.utoronto.ca>
	
	<1313802712-sup-5904@pinkfloyd.chass.utoronto.ca>
Message-ID: <1314228352-sup-1482@pinkfloyd.chass.utoronto.ca>

Excerpts from Ben Walton's message of Fri Aug 19 21:30:46 -0400 2011:

> > 3. Only the pkgname changes (CSWfoodev/foo_dev ? CSWfoo-dev/foo_dev)
> 
> This should be handled by an update operation.  As things are keyed on
> the catalog name, a change (based on version comparison) will trigger
> a refresh of file list, maintainer name, etc.  Mantis cares not about
> package name so that won't be a problem.

Coding tests against this, I think that this should actually be an
error.  I'm labelling it SilentNameChange.

In a situation like above, there is no transition of the old package
to the new one.  We would normally expect:

foo_dev/CSWfoodev -> (foo_dev_stub/CSWfoodev, foo_dev/CSWfoo-dev).

The current routine is to scan the catalog diff for /_stub$/ and then
process those first.  We'd find foo_dev_stub, see it delivering
CSWfoodev and find CSWfoodev in the old catalog, see that it's called
foo_dev and remove foo_dev from the catalog diff, storing it as a
rename.

Does anyone think that case three should _not_ be an error?

Thanks
-Ben
--
Ben Walton
Systems Programmer - CHASS
University of Toronto
C:416.407.5610 | W:416.978.4302


From wahwah at users.sourceforge.net  Thu Aug 25 08:40:51 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Thu, 25 Aug 2011 06:40:51 +0000
Subject: [csw-devel] SF.net SVN: gar:[15433]
	csw/mgar/pkg/gcc4/branches/gccgo/checksums
Message-ID: 

Revision: 15433
          http://gar.svn.sourceforge.net/gar/?rev=15433&view=rev
Author:   wahwah
Date:     2011-08-25 06:40:51 +0000 (Thu, 25 Aug 2011)
Log Message:
-----------
pkg/gcc4/branches/gccgo: updating the checksum

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/gccgo/checksums

Modified: csw/mgar/pkg/gcc4/branches/gccgo/checksums
===================================================================
--- csw/mgar/pkg/gcc4/branches/gccgo/checksums	2011-08-24 22:35:02 UTC (rev 15432)
+++ csw/mgar/pkg/gcc4/branches/gccgo/checksums	2011-08-25 06:40:51 UTC (rev 15433)
@@ -1 +1 @@
-c57a9170c677bf795bdc04ed796ca491  gcc-4.6.1.tar.bz2
+a5e0f84e78774646f10507b82d60ef7c  gcc-4.7-20110820.tar.bz2

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


From maciej at opencsw.org  Thu Aug 25 08:47:04 2011
From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=)
Date: Thu, 25 Aug 2011 07:47:04 +0100
Subject: [csw-devel] psuedo sketch of web and mantis automation
In-Reply-To: <1314228352-sup-1482@pinkfloyd.chass.utoronto.ca>
References: <1313717595-sup-109@pinkfloyd.chass.utoronto.ca>
	
	<1313802712-sup-5904@pinkfloyd.chass.utoronto.ca>
	<1314228352-sup-1482@pinkfloyd.chass.utoronto.ca>
Message-ID: 

2011/8/25 Ben Walton :
> Does anyone think that case three should _not_ be an error?

I say it's an error.

From dmichelsen at users.sourceforge.net  Thu Aug 25 09:44:47 2011
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 25 Aug 2011 07:44:47 +0000
Subject: [csw-devel] SF.net SVN: gar:[15434] csw/mgar/pkg/perl/trunk
Message-ID: 

Revision: 15434
          http://gar.svn.sourceforge.net/gar/?rev=15434&view=rev
Author:   dmichelsen
Date:     2011-08-25 07:44:47 +0000 (Thu, 25 Aug 2011)
Log Message:
-----------
perl: Intermediate commit, 5.12.4 compilation works and all tests pass

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

Modified: csw/mgar/pkg/perl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/perl/trunk/Makefile	2011-08-25 06:40:51 UTC (rev 15433)
+++ csw/mgar/pkg/perl/trunk/Makefile	2011-08-25 07:44:47 UTC (rev 15434)
@@ -1,5 +1,5 @@
 NAME = perl
-VERSION = 5.12.3
+VERSION = 5.12.4
 CATEGORIES = lang
 
 DESCRIPTION = A high-level, general-purpose programming language
@@ -57,7 +57,8 @@
 
 # Force use of db-4.8
 # TBD: Reinsert libperl.so, see below.
-PERL_LIBS-32 += -lsocket -lnsl -lgdbm -ldb-4.8 -ldl -lm -lpthread -lc -lperl 
+#PERL_LIBS-32 += -lsocket -lnsl -lgdbm -ldb-4.8 -ldl -lm -lpthread -lc -lperl 
+PERL_LIBS-32 += -lsocket -lnsl -lgdbm -ldb-4.8 -ldl -lm -lpthread -lc
 PERL_LIBS-64 += -lsocket -lnsl -lgdbm -ldb-4.8 -ldl -lm -lpthread -lc 
 PERL_LIBS = $(PERL_LIBS-$(MEMORYMODEL)) 
 
@@ -123,7 +124,8 @@
 # the case on bootstrapping. However, we require explicit libperl linkage or programs 
 # embedding perl will have problems with duplicated static variables. 
 # XXX Investigate further after 64 bit has built 
-EXTRA_LDFLAGS-32 = -L$(libdir) -lperl 
+#EXTRA_LDFLAGS-32 = -L$(libdir) -lperl 
+EXTRA_LDFLAGS-32 = -L$(libdir)
 EXTRA_LDFLAGS += $(EXTRA_LDFLAGS-$(MEMORYMODEL)) 
 
 # We want 64 bit binaries
@@ -140,6 +142,10 @@
 # Tests take a long time, run once for every release
 #TEST_SCRIPTS =
 
+BUILD_SCRIPTS = perl
+
+TEST_SCRIPTS = perl
+
 # Make sure we don't include the path to the newly built perl as the
 # library is not in place yet.
 IGNORE_DESTDIR = 1
@@ -164,7 +170,7 @@
 # TBD: Investigate
 post-extract-modulated:
 	mkdir -p $(WORKSRC)
-	gln -s libperl.so.5.12.3 $(WORKSRC)/libperl.so
+	gln -s libperl.so.$(VERSION) $(WORKSRC)/libperl.so
 	@$(MAKECOOKIE)
 
 ifneq ($(CORE_UPDATES),)
@@ -173,10 +179,27 @@
 endif
 
 # How to configure Perl
+#configure-perl: CONFIGURE_EXPORTS = PATH LD_OPTIONS
+configure-perl: ARGS-64 = -dusedtrace
 configure-perl:
-	@(cd $(WORKSRC) ; $(CONFIGURE_ENV) ./Configure $(CONFIGURE_ARGS) -des)
+	(cd $(WORKSRC) ; $(CONFIGURE_ENV) ./Configure $(CONFIGURE_ARGS) -des)
+	#cd $(WORKSRC) && ./Configure -ders -Dusethreads -Duselongdouble -Dinc_version_list=none $(ARGS-$(GAROSREL)) -Dprefix=$(prefix) -Dsed=/usr/bin/sed -Duseshrplib -Dcf_by='Claudio_Ramirez' -Dcf_email=claudio.ramirez at smals.be
+	@# 64 bit: -Duse64bitall 
 	@$(MAKECOOKIE)
 
+build-perl: BUILD_EXPORTS = LD_OPTIONS
+build-perl:
+	@echo " ==> Running make in $*"
+	@#cd $* && $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(BUILD_ARGS)
+	cd $(WORKSRC) && $(BUILD_ENV) gmake
+	@$(MAKECOOKIE)
+
+test-perl:
+	@echo " ==> Running make $(TEST_TARGET) in $*"
+	@#cd $* && $(TEST_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(TEST_OVERRIDE_VARS),$(TTT)="$(TEST_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(TEST_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(OBJDIR) $(TEST_ARGS) $(TEST_TARGET)
+	cd $(WORKSRC) && gmake check
+	@$(MAKECOOKIE)
+
 # Make links to libperl
 POST_TARGETS += libperl
 LIB_MINOR = $(shell echo $(VERSION) | cut -f1-2 -d.)

Modified: csw/mgar/pkg/perl/trunk/checksums
===================================================================
--- csw/mgar/pkg/perl/trunk/checksums	2011-08-25 06:40:51 UTC (rev 15433)
+++ csw/mgar/pkg/perl/trunk/checksums	2011-08-25 07:44:47 UTC (rev 15434)
@@ -1 +1 @@
-29975a69dce54e47fcd6331c085c6c99  perl-5.12.3.tar.gz
+fd22aba88e4e27ab879f142eec6452a0  perl-5.12.4.tar.gz

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


From dmichelsen at users.sourceforge.net  Thu Aug 25 10:29:15 2011
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 25 Aug 2011 08:29:15 +0000
Subject: [csw-devel] SF.net SVN: gar:[15435] csw/mgar/pkg/nmap/trunk/Makefile
Message-ID: 

Revision: 15435
          http://gar.svn.sourceforge.net/gar/?rev=15435&view=rev
Author:   dmichelsen
Date:     2011-08-25 08:29:14 +0000 (Thu, 25 Aug 2011)
Log Message:
-----------
nmap: Enable all binaries, enhance packaging

Modified Paths:
--------------
    csw/mgar/pkg/nmap/trunk/Makefile

Modified: csw/mgar/pkg/nmap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nmap/trunk/Makefile	2011-08-25 07:44:47 UTC (rev 15434)
+++ csw/mgar/pkg/nmap/trunk/Makefile	2011-08-25 08:29:14 UTC (rev 15435)
@@ -31,10 +31,25 @@
 SPKG_DESC_CSWnmap = A network exploration tool and security/port scanner
 RUNTIME_DEP_PKGS_CSWnmap += CSWstlport
 RUNTIME_DEP_PKGS_CSWnmap += CSWlibpcre0
-RUNTIME_DEP_PKGS_CSWnmap += CSWlua
 RUNTIME_DEP_PKGS_CSWnmap += CSWosslrt
 RUNTIME_DEP_PKGS_CSWnmap += CSWlibpcap1
+RUNTIME_DEP_PKGS_CSWnmap += CSWlua
+RUNTIME_DEP_PKGS_CSWnmap += CSWpython
 
+# Tons of docs and identification of programs installed there
+CHECKPKG_OVERRIDES_CSWnmap += file-with-bad-content
+
+# The Python module is really embedded here, that is ok
+CHECKPKG_OVERRIDES_CSWnmap += pkgname-does-not-start-with-CSWpy-
+CHECKPKG_OVERRIDES_CSWnmap += catalogname-does-not-start-with-py_
+
+#PACKAGES += CSWzenmap
+SPKG_DESC_CSWzenmap = zenmap
+PKGFILES_CSWzenmap += $(bindir)/zenmap
+PKGFILES_CSWzenmap += $(libdir)/python/.*
+PKGFILES_CSWzenmap += $(mandir)/.*/zenmap\.1
+PKGFILES_CSWzenmap += $(sharedstatedir)/zenmap/.*
+
 # See standards(5) for details
 EXTRA_CPPFLAGS += -features=extensions -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D__EXTENSIONS__
 EXTRA_CXXFLAGS += -features=extensions -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D__EXTENSIONS__
@@ -49,17 +64,12 @@
 #   http://nmap.org/svn/libdnet-stripped/NMAP_MODIFICATIONS
 CONFIGURE_ARGS += --with-libdnet=included
 
-#
 CONFIGURE_ARGS += --with-liblua=$(prefix)
+
+# Not necessary
 # CONFIGURE_ARGS += --with-libnbase=
-#CONFIGURE_ARGS += --with-libnsock=
+# CONFIGURE_ARGS += --with-libnsock=
 
-# Disable most of the tools for now, enable later one by one
-CONFIGURE_ARGS += --without-ndiff
-CONFIGURE_ARGS += --without-zenmap
-CONFIGURE_ARGS += --without-nping
-CONFIGURE_ARGS += --without-ncat
-
 # We can't put this in EXTRA_LINKER_FLAGS as LDFLAGS is used for cc too and -library=stlport4 breaks cc
 BUILD_OVERRIDE_VARS = STATIC
 BUILD_OVERRIDE_VAR_STATIC = -library=stlport4 -norunpath
@@ -67,9 +77,11 @@
 # There is no testsuite
 TEST_SCRIPTS =
 
-# Tons of docs and identification of programs installed there
-CHECKPKG_OVERRIDES_CSWnmap += file-with-bad-content
+PYCOMPILE = 1
 
+EXTRA_MERGE_EXCLUDE_FILES += $(bindir)/uninstall_zenmap
+EXTRA_PAX_ARGS += -s ',/ndiff,/nmap-ndiff,'
+
 include gar/category.mk
 
 post-extract-modulated:

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


From wahwah at users.sourceforge.net  Thu Aug 25 13:09:26 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Thu, 25 Aug 2011 11:09:26 +0000
Subject: [csw-devel] SF.net SVN: gar:[15436]
	csw/mgar/pkg/gcc4/branches/opt-csw-prefix/
Message-ID: 

Revision: 15436
          http://gar.svn.sourceforge.net/gar/?rev=15436&view=rev
Author:   wahwah
Date:     2011-08-25 11:09:25 +0000 (Thu, 25 Aug 2011)
Log Message:
-----------
gcc: Trying out the /opt/csw prefix

Added Paths:
-----------
    csw/mgar/pkg/gcc4/branches/opt-csw-prefix/

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


From wahwah at users.sourceforge.net  Thu Aug 25 13:19:45 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Thu, 25 Aug 2011 11:19:45 +0000
Subject: [csw-devel] SF.net SVN: gar:[15437]
	csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile
Message-ID: 

Revision: 15437
          http://gar.svn.sourceforge.net/gar/?rev=15437&view=rev
Author:   wahwah
Date:     2011-08-25 11:19:44 +0000 (Thu, 25 Aug 2011)
Log Message:
-----------
pkg/gcc4/branches/opt-csw-prefix: let's see what happens with prefix=/opt/csw

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile

Modified: csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile	2011-08-25 11:09:25 UTC (rev 15436)
+++ csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile	2011-08-25 11:19:44 UTC (rev 15437)
@@ -40,20 +40,13 @@
 # CONFIGURE_ARGS += --libdir=$(libdir)
 # CONFIGURE_ARGS += --exec-prefix=$(BUILD_PREFIX)/gcc4
 
-# Trying to fix the include problem.
-# http://gcc.gnu.org/ml/gcc-help/2011-08/msg00247.html
-CONFIGURE_ARGS += --bindir=$(prefix)/gcc4/bin
-CONFIGURE_ARGS += --libexecdir=$(prefix)/gcc4/libexec
-CONFIGURE_ARGS += --exec-prefix=$(prefix)/gcc4
-
 ## build options
 # http://gcc.gnu.org/install/configure.html
 
 # Could be used to break out of the /opt/csw/gcc4 prefix
 # CONFIGURE_ARGS += --program-prefix=gcc4-
 
-# The theory is that DIRPATHS confuse the installer, e.g. includedir
-# CONFIGURE_ARGS += --includedir=$(prefix)/include
+CONFIGURE_ARGS += $(DIRPATHS)
 CONFIGURE_ARGS += --with-gnu-as
 CONFIGURE_ARGS += --with-as=/opt/csw/bin/gas
 CONFIGURE_ARGS += --without-gnu-ld

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 Aug 25 16:40:34 2011
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 25 Aug 2011 14:40:34 +0000
Subject: [csw-devel] SF.net SVN: gar:[15438] csw/mgar/pkg/nmap/trunk
Message-ID: 

Revision: 15438
          http://gar.svn.sourceforge.net/gar/?rev=15438&view=rev
Author:   dmichelsen
Date:     2011-08-25 14:40:34 +0000 (Thu, 25 Aug 2011)
Log Message:
-----------
nmap: Add patch for problems with pcre 8.13

Modified Paths:
--------------
    csw/mgar/pkg/nmap/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/nmap/trunk/files/0006-Forward-port-of-collatingsvn.patch.patch
    csw/mgar/pkg/nmap/trunk/files/collatingsvn.patch

Modified: csw/mgar/pkg/nmap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nmap/trunk/Makefile	2011-08-25 11:19:44 UTC (rev 15437)
+++ csw/mgar/pkg/nmap/trunk/Makefile	2011-08-25 14:40:34 UTC (rev 15438)
@@ -23,6 +23,12 @@
 PATCHFILES += 0004-Make-lt_sockaddr_storage-operator-const-or-compiler-.patch
 PATCHFILES += 0005-Fix-const-definition-of-route_dst-or-c-linkage-fails.patch
 
+# From http://seclists.org/nmap-dev/2011/q3/640
+# This is needed for pcre 8.13
+#PATCHFILES += collatingsvn.patch
+# The above doesn't apply, this is the forward-port:
+PATCHFILES += 0006-Forward-port-of-collatingsvn.patch.patch
+
 BUILD_DEP_PKGS += CSWlibpcre-dev
 BUILD_DEP_PKGS += CSWlibpcap-dev
 BUILD_DEP_PKGS += CSWossldevel

Added: csw/mgar/pkg/nmap/trunk/files/0006-Forward-port-of-collatingsvn.patch.patch
===================================================================
--- csw/mgar/pkg/nmap/trunk/files/0006-Forward-port-of-collatingsvn.patch.patch	                        (rev 0)
+++ csw/mgar/pkg/nmap/trunk/files/0006-Forward-port-of-collatingsvn.patch.patch	2011-08-25 14:40:34 UTC (rev 15438)
@@ -0,0 +1,285 @@
+From 5bccd8398c9e9467eb759af4c723b03c36123113 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen 
+Date: Thu, 25 Aug 2011 15:39:28 +0200
+Subject: [PATCH] Forward-port of collatingsvn.patch
+
+---
+ nmap-service-probes |   94 +++++++++++++++++++++++++-------------------------
+ 1 files changed, 47 insertions(+), 47 deletions(-)
+
+diff --git a/nmap-service-probes b/nmap-service-probes
+index 4fe8b9e..2a30f30 100644
+--- a/nmap-service-probes
++++ b/nmap-service-probes
+@@ -115,7 +115,7 @@ match backdoor m|^220 SSL Connection Established - Loading Protocol\.\.\.\.\r\n|
+ match backdoor m|^A-311 Death welcome\x001| p/Haxdoor trojan/ i/**BACKDOOR**/ o/Windows/
+ match backdoor m|^220 CAFEiNi [-\w_.]+ FTP server\r\n$| p/CAFEiNi trojan/ i/**BACKDOOR**/ o/Windows/
+ match backdoor m/^220 (Stny|fuck)Ftpd 0wns j0\r?\n/ p/Kibuv.b worm/ i/**BACKDOOR**/ o/Windows/
+-match backdoor m|^220 [Sf.][tu.][nc.][yk.][.F][t.][p.][d.] [0.][w.][n.][s.] [j.][0.]\r?\n|i p/Generic Kibuv worm/ i/**BACKDOOR**/ o/Windows/
++match backdoor m|^220 [Sf.][tu.][nc.][yk.][F.][t.][p.][d.] [0.][w.][n.][s.] [j.][0.]\r?\n|i p/Generic Kibuv worm/ i/**BACKDOOR**/ o/Windows/
+ match backdoor m=^(?:ba|)sh-([\d.]+)\$ = p/Bourne shell/ i/**BACKDOOR**/ v/$1/
+ match backdoor m=^exec .* failed : No such file or directory\n$= p/netcat -e/ i/misconfigured/
+ match backdoor m=220-Welcome!\r\n220-\x1b\[30m/\x1b\[31m#\xa4#\xa4#\xa4#\xa4#\xa4#\xa4#\xa4#\xa4#\xa4#\xa4#\xa4#\xa4#\xa4#\xa4#\xa4#\xa4#\xa4#\xa4#\xa4#\xa4#\xa4#\xa4#\xa4#\xa4#\xa4#                                                         \r\n220-\x1b\[30m\|          Current Time:  \x1b\[35m[^\r\n]*\r\n220-\x1b\[30m\|          Current Date:  \x1b\[35m[^\r\n]*\r\n220-\x1b\[30m\\\r\n= p/Windows trojan/ i/**BACKDOOR**/ o/Windows/
+@@ -518,7 +518,7 @@ match ftp m|^220 ([-.\w]+) FTP server \(Version ([-.\w]+)/OpenBSD\) ready\.\r\n$
+ match ftp m|^220 ([-.\w]+) FTP server \(Version (6.0\w+)\) ready.\r\n| p/FreeBSD ftpd/ h/$1/ v/$2/ o/FreeBSD/
+ match ftp m|^220  FTP server \(Version ([\w.]+)\) ready\.\r\n| p/FreeBSD ftpd/ v/$1/ o/FreeBSD/
+ # Trolltech Troll-FTPD 1.28 (Only runs on Linux)
+-match ftp m|^220-Setting memory limit to 1024\+1024kbytes\r\n220-Local time is now \d+:\d+ and the load is [.\d]+\.\r\n220 You will be disconnected after \d+ seconds of inactivity.\r\n$| p/Trolltech Troll-FTPd/ o/Linux/
++match ftp m|^220-Setting memory limit to 1024\+1024kbytes\r\n220-Local time is now \d+:\d+ and the load is [\d.]+\.\r\n220 You will be disconnected after \d+ seconds of inactivity.\r\n$| p/Trolltech Troll-FTPd/ o/Linux/
+ 
+ match ftp m|^220  FTP server \(Hummingbird Ltd\. \(HCLFTPD\) Version (7.1.0.0)\) ready\.\r\n$| p/Hummingbird FTP server/ v/$1/
+ match ftp m|^220  FTP server \(Hummingbird Communications Ltd\. \(HCLFTPD\) Version ([\d.]+)\) ready\.\r\n| p/Hummingbird FTP server/ v/$1/
+@@ -538,7 +538,7 @@ match ftp m|^220-\r\n220 ([-.\w]+) FTP server \(NetBSD-ftpd ([-.\w]+)\) ready.\r
+ match ftp m|^220 ([-.\w]+) Network Management Card AOS v([-.\w]+) FTP server ready.\r\n$| p/APC AOS ftpd/ v/$2/ i/on APC $1 network management card/ d/power-device/ o/AOS/
+ match ftp m|^220 FTP Server \(Version 1.0\) ready.\r\n$| p/GlobespanVirata ftpd/ v/1.0/ d/broadband router/
+ # HP-UX B.11.00
+-match ftp m|^220 ([-.\w ]+) FTP server \(Version (1.1.2[.\d]+) [A-Z][a-z]{2} [A-Z][a-z]{2} .*\) ready.\r\n| p/HP-UX ftpd/ h/$1/ v/$2/ o/HP-UX/
++match ftp m|^220 ([-.\w ]+) FTP server \(Version (1.1.2[\d.]+) [A-Z][a-z]{2} [A-Z][a-z]{2} .*\) ready.\r\n| p/HP-UX ftpd/ h/$1/ v/$2/ o/HP-UX/
+ # 220 mirrors.midco.net FTP server ready.
+ # WarFTP Daemon 1.70 on Win2K
+ match ftp m=^220-.*\r\n(220-|)    WarFTPd (\d[-.\w]+) \([\w ]+\) Ready\r\n=s p/WarFTPd/ v/$2/
+@@ -703,7 +703,7 @@ match ftp m|^220 Golden FTP Server ready v([\d.]+)\r\n| p/Golden ftpd/ v/$1/ o/W
+ match ftp m|^220 Golden FTP Server PRO ready v([\d.]+)\r\n| p/Golden PRO ftpd/ v/$1/ o/Windows/
+ match ftp m|^220 ITC Version  ([\d.]+) of [-\d]+  X Kyocera UIO UMC 10base OK \r\n| p/X Kyocera UIO UMC 10base print server ftpd/ v/$1/ d/print server/
+ match ftp m|^220 ActiveFax Version ([\d.]+) \(Build (\d+)\) - .*\r\n| p/ActiveFax ftpd/ v/$1 build $2/
+-match ftp m|^220-Welcome to CrushFTP!\r\n220 CrushFTP Server Ready[.!]\r\n| p/CrushFTPd/
++match ftp m|^220-Welcome to CrushFTP!\r\n220 CrushFTP Server Ready[!.]\r\n| p/CrushFTPd/
+ match ftp m|^220-Welcome to CrushFTP([\w._-]+)!\r\n220 CrushFTP Server Ready\.\r\n| p/CrushFTP/ v/$1/
+ match ftp m|^220 DPO-7300 FTP Server ([\d.]+) ready\.\n| p/NetSilicon DPO-7300 ftpd/ v/$1/
+ match ftp m|^220 Welcome to WinFtp Server\.\r\n| p/WinFtpd/ o/Windows/
+@@ -1048,7 +1048,7 @@ match http m|^HTTP/1\.0 400 Bad Request\r\nServer: OfficeScan Client\r\nContent-
+ 
+ match http-proxy m=^HTTP/1\.[01] \d\d\d .*\r\n(Server|Proxy-agent): iPlanet-Web-Proxy-Server/([\d.]+)\r\n=s p/iPlanet web proxy/ v/$2/
+ 
+-match hp-gsg m|^220 JetDirect GGW server \(version (\d[.\d]+)\) ready\r\n| p/HP JetDirect Generic Scan Gateway/ v/$1/ d/printer/
++match hp-gsg m|^220 JetDirect GGW server \(version (\d[\d.]+)\) ready\r\n| p/HP JetDirect Generic Scan Gateway/ v/$1/ d/printer/
+ match hp-gsg m|^220 HP GGW server \(version ([\w._-]+)\) ready\r\n\0| p/HP Generic Scan Gateway/ v/$1/ d/printer/
+ 
+ # http://h20000.www2.hp.com/bizsupport/TechSupport/Document.jsp?objectID=bpj01014
+@@ -1546,7 +1546,7 @@ match nntp m|^200 NNTP Service 5\.00\.0984 Version: (5\.0\.2159.1) Posting Allow
+ match nntp m|^200 NNTP Service Microsoft\xae Internet Services (\d[-.\w]+) Version: (\d[-.\w]+) Posting Allowed \r\n| p/Microsoft NNTP Service $1/ v/$2/ i/posting OK/ o/Windows/
+ match nntp m|^502 Connection refused\r\n| p/Microsoft NNTP Service/ i/refused/ o/Windows/
+ # Windows NT 4.0 SP5-SP6 
+-match nntp m|^20[01] Microsoft Exchange Internet News Service Version (\d\.\d\.[.\d]+) \((.*)\)\r\n| p/Microsoft Exchange Internet News Service/ v/$1/ i/$2/ o/Windows/
++match nntp m|^20[01] Microsoft Exchange Internet News Service Version (\d\.\d\.[\d.]+) \((.*)\)\r\n| p/Microsoft Exchange Internet News Service/ v/$1/ i/$2/ o/Windows/
+ match nntp m|^20. ([-.\w]+) InterNetNews NNRP server INN (\d[-.\w ]+) ready \(posting ok\)\.\r\n| p/InterNetNews (INN)/ h/$1/ v/$2/ i/posting ok/
+ match nntp m|^20. ([-.\w]+) InterNetNews NNRP server INN (\d[-.\w ]+) ready \(no posting\)\.\r\n| p/InterNetNews (INN)/ h/$1/ v/$2/ i/no posting/
+ match nntp m|^200 ArGoSoft News Server for WinNT/2000/XP v ([\d.]+) ready\r\n| p/ArGoSoft nntpd/ v/$1/ o/Windows/
+@@ -2151,7 +2151,7 @@ match smtp m/^220[- ].*\r\n220[- ]([^\r\n]+) ESMTP Exim /s p/Exim smtpd/ h/$1/
+ match smtp m/^220 CheckPoint FireWall-1 secure ESMTP server\r\n$/ p/Checkpoint FireWall-1 smtpd/ d/firewall/
+ match smtp m/^220 CheckPoint FireWall-1 secure SMTP server\r\n$/ p/Checkpoint FireWall-1 smtpd/ d/firewall/
+ match smtp m|^220 ([-.+\w]+) running IBM AS/400 SMTP V([\w]+)| p|IBM AS/400 smtpd| h|$1| v|$2|
+-match smtp m|^220 ([-.+\w]+) ESMTP MailEnable Service, Version: (\d[.\w]+)- ready at | p/MailEnable smptd/ h/$1/ v/$2/ o/Windows/
++match smtp m|^220 ([-.+\w]+) ESMTP MailEnable Service, Version: (\d[\w.]+)- ready at | p/MailEnable smptd/ h/$1/ v/$2/ o/Windows/
+ match smtp m/^220 ([-.+\w]+) ESMTP Mail Enable SMTP Service, Version: (\d[\w.]+)-- ready at/ p/MailEnable smptd/ h/$1/ v/$2/ o/Windows/
+ # Enterprise version number seems to be preceeded by "0--"; Professional with "0-"
+ match smtp m|^220 ([-.+\w]+) ESMTP MailEnable Service, Version: \d+--([\d.]+) ready at| p/MailEnable Enterprise smptd/ h/$1/ v/$2/ o/Windows/
+@@ -2464,8 +2464,8 @@ match sourceviewerserver m|^OK SourceViewerService v1\.0\r\n| p/NetBeans Source
+ # http://udk.openoffice.org/common/man/spec/urp.html
+ match urp m|^\0\0\0\x60\0\0\0\x01\xf8\x04\x96\0\0'com\.sun\.star\.bridge\.XProtocolProperties\x15UrpProtocolProperties\0\0\x14\r\0\0\0\x85\xfbc\x80\x9e\xca@\$\xbc\xc7\x9e\xbb#\x0f\xfc\xd6\0\0\x92\]\xe4\xb8$| p/UNO Remote Protocol (URP)/
+ 
+-match sourceoffice m|^200\r\nProtocol-Version:(\d[.\d]+)\r\nMessage-ID:\d+\r\nDatabase .*\r\nContent-Length:\d+\r\n\r\n(\w:\\.*ini)\r\n\r\n| p/Sourcegear SourceOffSite/ i/Protocol $1; INI file: $2/
+-match sourceoffice m|^250\r\nProtocol-Version:(\d[.\d]+)\r\nMessage-ID:\d+\r\nDatabase .*\r\nContent-Length:\d+\r\nKey Length:(\d+)\r\n\r\n.*(\w:\\.*ini)\r\n\r\n|s p/Sourcegear SourceOffSite/ i/Protocol $1; Key len: $2; INI file: $3/
++match sourceoffice m|^200\r\nProtocol-Version:(\d[\d.]+)\r\nMessage-ID:\d+\r\nDatabase .*\r\nContent-Length:\d+\r\n\r\n(\w:\\.*ini)\r\n\r\n| p/Sourcegear SourceOffSite/ i/Protocol $1; INI file: $2/
++match sourceoffice m|^250\r\nProtocol-Version:(\d[\d.]+)\r\nMessage-ID:\d+\r\nDatabase .*\r\nContent-Length:\d+\r\nKey Length:(\d+)\r\n\r\n.*(\w:\\.*ini)\r\n\r\n|s p/Sourcegear SourceOffSite/ i/Protocol $1; Key len: $2; INI file: $3/
+ 
+ match spmd m|^SPMD_ACK\0\0\x01\0\x01$| p/Softimage XSI SPMD license server/ o/Windows/
+ 
+@@ -2477,14 +2477,14 @@ match ssh m|^SSH-([\d.]+)-ReflectionForSecureIT_([-\w_.]+) - Process Software Mu
+ match ssh m|^SSH-([\d.]+)-ReflectionForSecureIT_([-\w_.]+)\r?\n| p/WRQ Reflection for Secure IT sshd/ v/$2/ i/protocol $1/
+ 
+ # SCS
+-match ssh m|^SSH-(\d[.\d]+)-SSH Protocol Compatible Server SCS (\d[-.\w]+)\r?\n| p/SCS NetScreen sshd/ v/$2/ i/protocol $1/
++match ssh m|^SSH-(\d[\d.]+)-SSH Protocol Compatible Server SCS (\d[-.\w]+)\r?\n| p/SCS NetScreen sshd/ v/$2/ i/protocol $1/
+ match ssh m|^SSH-([\d.]+)-SSH Compatible Server\r?\n| p/SCS NetScreen sshd/ i/protocol $1/
+ match ssh m|^SSH-([\d.]+)-([\d.]+) SSH Secure Shell Tru64 UNIX\r?\n| p/SCS sshd/ v/$2/ i/protocol $1/ o/Tru64 UNIX/
+-match ssh m/^SSH-([.\d]+)-(\d+\.\d+\.\d+) SSH Secure Shell/ p/SCS sshd/ v/$2/ i/protocol $1/
+-match ssh m|^sshd: SSH Secure Shell (\d[-.\w]+) on ([-.\w]+)\nSSH-(\d[.\d]+)-| p/SCS SSH Secure Shell/ v/$1/ i/on $2; protocol $3/
+-match ssh m|^sshd: SSH Secure Shell (\d[-.\w]+) \(([^\r\n\)]+)\) on ([-.\w]+)\nSSH-(\d[.\d]+)-| p/SCS sshd/ v/$1/ i/$2; on $3; protocol $4/
++match ssh m/^SSH-([\d.]+)-(\d+\.\d+\.\d+) SSH Secure Shell/ p/SCS sshd/ v/$2/ i/protocol $1/
++match ssh m|^sshd: SSH Secure Shell (\d[-.\w]+) on ([-.\w]+)\nSSH-(\d[\d.]+)-| p/SCS SSH Secure Shell/ v/$1/ i/on $2; protocol $3/
++match ssh m|^sshd: SSH Secure Shell (\d[-.\w]+) \(([^\r\n\)]+)\) on ([-.\w]+)\nSSH-(\d[\d.]+)-| p/SCS sshd/ v/$1/ i/$2; on $3; protocol $4/
+ match ssh m|^sshd2\[\d+\]: .*\r\nSSH-(\d[\d.]+)-(\d[-.\w]+) SSH Secure Shell \(([^\r\n\)]+)\)\r?\n| p/SCS sshd/ v/$2/ i/protocol $1/
+-match ssh m/^SSH-([.\d]+)-(\d+\.\d+\.[-.\w]+)/ p/SCS sshd/ v/$2/ i/protocol $1/
++match ssh m/^SSH-([\d.]+)-(\d+\.\d+\.[-.\w]+)/ p/SCS sshd/ v/$2/ i/protocol $1/
+ 
+ # OpenSSH
+ match ssh m|^SSH-([\d.]+)-OpenSSH_([\w._-]+) Debian-(\S*maemo\S*)\r?\n| p/OpenSSH/ v/$2 Debian $1/ i/Nokia Maemo tablet; protocol $1/ o/Linux/
+@@ -2518,9 +2518,9 @@ match ssh m|^SSH-([\d.]+)-OpenSSH_([-\w_.]+) NCSA_GSSAPI_GPT_([-\w_.]+) GSI\n| p
+ 
+ # Choose 1 of the following:
+ # 1) Match all OpenSSHs:
+-#match ssh m/^SSH-([.\d]+)-OpenSSH[_-]([\S ]+)/i p/OpenSSH/ v/$2/ i/protocol $1/
++#match ssh m/^SSH-([\d.]+)-OpenSSH[_-]([\S ]+)/i p/OpenSSH/ v/$2/ i/protocol $1/
+ # 2) Don't match unknown SSHs (and generate fingerprints)
+-match ssh m/^SSH-([.\d]+)-OpenSSH[_-]([\w.]+)\r?\n/i p/OpenSSH/ v/$2/ i/protocol $1/
++match ssh m/^SSH-([\d.]+)-OpenSSH[_-]([\w.]+)\r?\n/i p/OpenSSH/ v/$2/ i/protocol $1/
+ 
+ # These are strange ones. These routers pretend to be OpenSSH, but don't do it that well (see the \r):
+ match ssh m|^SSH-2\.0-OpenSSH\r?\n| p/Linksys WRT45G modified dropbear sshd/ i/protocol 2.0/ d/router/
+@@ -2530,31 +2530,31 @@ match ssh m|^\0\0\0\$\0\0\0\0\x01\0\0\0\x1bNo host key is configured!\n\r!\"v| p
+ match ssh m|^SSH-(\d[\d.]+)-SSF-(\d[-.\w]+)\r?\n| p/SSF French SSH/ v/$2/ i/protocol $1/
+ match ssh m|^SSH-(\d[\d.]+)-lshd_(\d[-.\w]+) lsh - a free ssh\r\n\0\0| p/lshd secure shell/ v/$2/ i/protocol $1/
+ match ssh m|^SSH-(\d[\d.]+)-lshd-(\d[-.\w]+) lsh - a GNU ssh\r\n\0\0| p/lshd secure shell/ v/$2/ i/protocol $1/
+-match ssh m/^SSH-([.\d]+)-Sun_SSH_(\S+)/ p/SunSSH/ v/$2/ i/protocol $1/
+-match ssh m/^SSH-([.\d]+)-meow roototkt by rebel/ p/meow SSH ROOTKIT/ i/protocol $1/
++match ssh m/^SSH-([\d.]+)-Sun_SSH_(\S+)/ p/SunSSH/ v/$2/ i/protocol $1/
++match ssh m/^SSH-([\d.]+)-meow roototkt by rebel/ p/meow SSH ROOTKIT/ i/protocol $1/
+ # Akamai hosted systems tend to run this - found on www.microsoft.com
+-match ssh m|^SSH-(\d[.\d]*)-(AKAMAI-I*)\r?\n$| p/Akamai SSH/ v/$2/ i/protocol $1/
+-match ssh m|^SSH-(\d[.\d]*)-(Server-V)\r?\n$| p/Akamai SSH/ v/$2/ i/protocol $1/
+-match ssh m|^SSH-(\d[.\d]*)-(Server-VI)\r?\n$| p/Akamai SSH/ v/$2/ i/protocol $1/
+-match ssh m|^SSH-(\d[.\d]*)-(Server-VII)\r?\n| p/Akamai SSH/ v/$2/ i/protocol $1/
+-match ssh m|^SSH-(\d[.\d]+)-Cisco-(\d[.\d]+)\r?\n$| p/Cisco SSH/ v/$2/ i/protocol $1/ o/IOS/
+-match ssh m|^SSH-(\d[.\d]+)-CiscoIOS_([\d.]+)XA\r?\n| p/Cisco SSH/ v/$2/ i/protocol $1; Chinese IOS XA/ o/IOS/
++match ssh m|^SSH-(\d[\d.]*)-(AKAMAI-I*)\r?\n$| p/Akamai SSH/ v/$2/ i/protocol $1/
++match ssh m|^SSH-(\d[\d.]*)-(Server-V)\r?\n$| p/Akamai SSH/ v/$2/ i/protocol $1/
++match ssh m|^SSH-(\d[\d.]*)-(Server-VI)\r?\n$| p/Akamai SSH/ v/$2/ i/protocol $1/
++match ssh m|^SSH-(\d[\d.]*)-(Server-VII)\r?\n| p/Akamai SSH/ v/$2/ i/protocol $1/
++match ssh m|^SSH-(\d[\d.]+)-Cisco-(\d[\d.]+)\r?\n$| p/Cisco SSH/ v/$2/ i/protocol $1/ o/IOS/
++match ssh m|^SSH-(\d[\d.]+)-CiscoIOS_([\d.]+)XA\r?\n| p/Cisco SSH/ v/$2/ i/protocol $1; Chinese IOS XA/ o/IOS/
+ match ssh m|^\r\nDestination server does not have Ssh activated\.\r\nContact Cisco Systems, Inc to purchase a\r\nlicense key to activate Ssh\.\r\n| p/Cisco CSS SSH/ i/Unlicensed/
+-match ssh m|^SSH-(\d[.\d]+)-VShell_(\d[._\d]+) VShell\r?\n$| p/VanDyke VShell sshd/ v/$SUBST(2,"_",".")/ i/protocol $1/
++match ssh m|^SSH-(\d[\d.]+)-VShell_(\d[_\d.]+) VShell\r?\n$| p/VanDyke VShell sshd/ v/$SUBST(2,"_",".")/ i/protocol $1/
+ match ssh m|^SSH-2\.0-0\.0 \r?\n| p/VanDyke VShell sshd/ i/version info hidden; protocol 2.0/
+ match ssh m|^SSH-([\d.]+)-([\w.]+) VShell\r?\n| p/VanDyke VShell/ v/$2/ i/protocol $1/
+ match ssh m|^SSH-([\d.]+)-([\w.]+) \(beta\) VShell\r?\n| p/VanDyke VShell/ v/$2 beta/ i/protocol $1/
+-match ssh m/^SSH-([.\d]+)-(\d[-.\w]+) sshlib: WinSSHD (\d[-.\w]+)\r?\n/ p/Bitvise WinSSHD/ v/$3/ i/sshlib $2; protocol $1/ o/Windows/
+-match ssh m/^SSH-([.\d]+)-(\d[-.\w]+) sshlib: WinSSHD\r?\n/ p/Bitvise WinSSHD/ i/sshlib $2; protocol $1; server version hidden/ o/Windows/
+-match ssh m|^SSH-([.\d]+)-([\w._-]+) sshlib: sshlibSrSshServer ([\w._-]+)\r\n| p/SrSshServer/ i/sshlib $2; protocol $1/ v/$3/
++match ssh m/^SSH-([\d.]+)-(\d[-.\w]+) sshlib: WinSSHD (\d[-.\w]+)\r?\n/ p/Bitvise WinSSHD/ v/$3/ i/sshlib $2; protocol $1/ o/Windows/
++match ssh m/^SSH-([\d.]+)-(\d[-.\w]+) sshlib: WinSSHD\r?\n/ p/Bitvise WinSSHD/ i/sshlib $2; protocol $1; server version hidden/ o/Windows/
++match ssh m|^SSH-([\d.]+)-([\w._-]+) sshlib: sshlibSrSshServer ([\w._-]+)\r\n| p/SrSshServer/ i/sshlib $2; protocol $1/ v/$3/
+ match ssh m|^SSH-([\d.]+)-([\w._-]+) sshlib: GlobalScape\r?\n| p/GlobalScape CuteFTP sshd/ i/sshlib $2; protocol $1/ o/Windows/
+ match ssh m|^SSH-([\d.]+)-([\w._-]+) sshlib: EdmzSshDaemon ([\w._-]+)\r\n| p/EdmzSshDaemon/ v/$3/ i/sshlib $2; protocol $1/
+-match ssh m|^SSH-([.\d]+)-([\w._-]+) FlowSsh: WinSSHD ([\w._-]+)\r\n| p/Bitvise WinSSHD/ i/FlowSsh $2; protocol $1/ v/$3/ o/Windows/
+-match ssh m|^SSH-([.\d]+)-([\w._-]+) FlowSsh: WinSSHD ([\w._-]+): free only for personal non-commercial use\r\n| p/Bitvise WinSSHD/ i/FlowSsh $2; protocol $1; non-commercial use/ v/$3/ o/Windows/
+-match ssh m|^SSH-([.\d]+)-([\w._-]+) FlowSsh: WinSSHD: free only for personal non-commercial use\r\n| p/Bitvise WinSSHD/ i/FlowSsh $2; protocol $1; non-commercial use/ o/Windows/
++match ssh m|^SSH-([\d.]+)-([\w._-]+) FlowSsh: WinSSHD ([\w._-]+)\r\n| p/Bitvise WinSSHD/ i/FlowSsh $2; protocol $1/ v/$3/ o/Windows/
++match ssh m|^SSH-([\d.]+)-([\w._-]+) FlowSsh: WinSSHD ([\w._-]+): free only for personal non-commercial use\r\n| p/Bitvise WinSSHD/ i/FlowSsh $2; protocol $1; non-commercial use/ v/$3/ o/Windows/
++match ssh m|^SSH-([\d.]+)-([\w._-]+) FlowSsh: WinSSHD: free only for personal non-commercial use\r\n| p/Bitvise WinSSHD/ i/FlowSsh $2; protocol $1; non-commercial use/ o/Windows/
+ # Cisco VPN 3000 Concentrator
+ # Cisco VPN Concentrator 3005 - Cisco Systems, Inc./VPN 3000 Concentrator Version 4.0.1.B Jun 20 2003
+-match ssh m/^SSH-([.\d]+)-OpenSSH\r?\n$/ p/OpenSSH/ i/protocol $1/ d/terminal server/
++match ssh m/^SSH-([\d.]+)-OpenSSH\r?\n$/ p/OpenSSH/ i/protocol $1/ d/terminal server/
+ match ssh m|^SSH-1\.5-X\r?\n| p/Cisco VPN Concentrator SSHd/ i/protocol 1.5/ d/terminal server/
+ match ssh m|^SSH-([\d.]+)-NetScreen\r?\n| p/NetScreen sshd/ i/protocol $1/ d/firewall/
+ match ssh m|^SSH-1\.5-FucKiT RootKit by Cyrax\r?\n| p/FucKiT RootKit sshd/ i/**BACKDOOR** protocol 1.5/ o/Linux/
+@@ -2562,7 +2562,7 @@ match ssh m|^SSH-2\.0-dropbear_([-\w.]+)\r?\n| p/Dropbear sshd/ v/$1/ i/protocol
+ match ssh m|^Access to service sshd from [-\w_.]+@[-\w_.]+ has been denied\.\r\n| p/libwrap'd OpenSSH/ i/Access denied/
+ match ssh m|^SSH-([\d.]+)-FortiSSH_([\d.]+)\r?\n| p/FortiSSH/ v/$2/ i/protocol $1/
+ match ssh m|^SSH-([\d.]+)-cryptlib\r?\n| p/APC AOS cryptlib sshd/ i/protocol $1/ o/AOS/
+-match ssh m/^SSH-([.\d]+)-([.\d]+) Radware\r?\n$/ p/Radware Linkproof SSH/ v/$2/ i/protocol $1/ d/terminal server/
++match ssh m/^SSH-([\d.]+)-([\d.]+) Radware\r?\n$/ p/Radware Linkproof SSH/ v/$2/ i/protocol $1/ d/terminal server/
+ match ssh m|^SSH-2\.0-1\.0 Radware SSH \r?\n| p/Radware sshd/ i|protocol 2.0| d/firewall/
+ match ssh m|^SSH-([\d.]+)-Radware_([\d.]+)\r?\n| p/Radware sshd/ v/$2/ i/protocol $1/ d/firewall/
+ match ssh m|^SSH-1\.5-By-ICE_4_All \( Hackers Not Allowed! \)\r?\n| p/ICE_4_All backdoor sshd/ i/**BACKDOOR** protocol 1.5/
+@@ -2599,8 +2599,8 @@ match ssh m|^SSH-1\.5-SSH\.0\.1\r?\n| p/Dell PowerConnect sshd/ i/protocol 1.5/
+ match ssh m|^SSH-([\d.]+)-Ingrian_SSH\r?\n| p/Ingrian SSH/ i/protocol $1/ d/security-misc/
+ match ssh m|^SSH-([\d.]+)-PSFTPd PE\. Secure FTP Server ready\r?\n| p/PSFTPd sshd/ i/protocol $1/ o/Windows/
+ match ssh m|^SSH-([\d.]+)-BlueArcSSH_([\d.]+)\r?\n| p/BlueArc sshd/ v/$2/ i/protocol $1/ d/storage-misc/
+-match ssh m|^SSH-([.\d]+)-Zyxel SSH server\r?\n| p/ZyXEL ZyWALL sshd/ o/ZyNOS/ d/security-misc/ i/protocol $1/
+-match ssh m|^SSH-([.\d]+)-paramiko_([\w._-]+)\r?\n| p/Paramiko Python sshd/ v/$2/ i/protocol $1/
++match ssh m|^SSH-([\d.]+)-Zyxel SSH server\r?\n| p/ZyXEL ZyWALL sshd/ o/ZyNOS/ d/security-misc/ i/protocol $1/
++match ssh m|^SSH-([\d.]+)-paramiko_([\w._-]+)\r?\n| p/Paramiko Python sshd/ v/$2/ i/protocol $1/
+ match ssh m|^SSH-([\d.]+)-USHA SSHv([\w._-]+)\r?\n| p/USHA SSH/ v/$2/ i/protocol $1/ d/power-device/
+ match ssh m|^SSH-2\.0-SSH_0\.2\r?\n$| p/3com WAP sshd/ d/WAP/ v/0.2/ i/protocol 2.0/
+ match ssh m|^SSH-([\d.]+)-CoreFTP-([\w._-]+)\r?\n| p/CoreFTP sshd/ v/$2/ i/protocol $1/
+@@ -2619,7 +2619,7 @@ match ssh m|^SSH-([\d.]+)-3Com OS-([\w._-]+ Release \w+)\n| p/3Com switch sshd/
+ match ssh m|^SSH-2\.0-XXXX\r\n| p/Cyberoam firewall sshd/ d/firewall/
+ match ssh m|^SSH-2\.0-Tc6l51-sD1m-m_\n| p/Fortinet FortiWifi 60C firewall sshd/ d/firewall/
+ 
+-softmatch ssh m/^SSH-([.\d]+)-/ i/protocol $1/
++softmatch ssh m/^SSH-([\d.]+)-/ i/protocol $1/
+ 
+ 
+ match soldat m|^Soldat Admin Connection Established\.\.\.\r\nAdmin connected\.\r\n| p/Soldat multiplayer-game server/
+@@ -2740,7 +2740,7 @@ match telnet m|^\xff\xfd\x1f\n\n\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
+ match telnet m|^\r\nRaptor Firewall Secure Gateway\.\r\n| p/Symantec Raptor firewall secure gateway telnetd/
+ match telnet m|^\r\nSynchronet BBS for Win32  Version (\d[-.\w]+)\r\n| p/Synchronet BBS/ v/$1/ i/on Win32/
+ match telnet m|^\xff\xfb\x01\xff\xfb\x03\r\nlogin: $| p/Orinoco WAP telnetd/
+-match telnet m|^\xff\xfd\x03\xff\xfb\x01\xff\xfb\x03\x1b\[1;1H\x1b\[2K\x1b\[2;1H\x1b\[2K\x1b\[3;1H\x1b.*Nortel Networks.*BayStack ([-.\w]+).*Versions: ([.: \w]+)|s p/Nortel Networks telnetd/ i/Baystack $1; Versions: $2/ d/switch/
++match telnet m|^\xff\xfd\x03\xff\xfb\x01\xff\xfb\x03\x1b\[1;1H\x1b\[2K\x1b\[2;1H\x1b\[2K\x1b\[3;1H\x1b.*Nortel Networks.*BayStack ([-.\w]+).*Versions: ([: \w.]+)|s p/Nortel Networks telnetd/ i/Baystack $1; Versions: $2/ d/switch/
+ match telnet m|^\xff\xfd\x03\xff\xfb\x01\xff\xfb\x03\x1b\[1;1H\x1b\[2K\x1b\[2;1H\x1b\[2K\x1b\[3;1H\x1b.*BayStack ([-\w_.]+) .*HW:(\w+)  FW:V([\d.]+) SW:V([\d.]+)\x1b|s p/BayStack switch $1 telnetd/ v/HW:$2 FW:$3 SW:$4/ d/switch/
+ # ASCII art banner that says "BAYSTACK"
+ match telnet m|^\xff\xfb\x01\x1b\[2J\x1b\[58259456;1H\x1b\[0m\x1b\[1;1H \*\*\*\*\*      \*\*\*     \*     \*    \*\*\*\*\*   \*\*\*\*\*\*\*\*\*     \*\*\*       \*\*\*\*\*  \*      \*\x1b\[2;1H| p/BayStack switch telnetd/ d/switch/
+@@ -4536,7 +4536,7 @@ match http m|^HTTP/1\.0 \d\d\d .*\r\nServer: SimpleServer:WWW/(\d[-.\w]+)\r\n| p
+ match http m|^HTTP/1\.[01] \d\d\d .*\r\nContent-Length: \d+\r\nX-Powered-By: ([-/.\w ]+)\r\nContent-Type: .*\r\nServer: Xitami\r\n| p/Xitami httpd/ i/$1/
+ match http m|^HTTP/1\.[01] \d\d\d .*\r\nServer: Xitami\r\n|s p/Xitami httpd/
+ match http m|^ERROR: Malformed startup string$| p/Xitami httpd admin port/
+-match http m|^HTTP/1\.1 500 Server Error\r\nConnection: close\r\nContent-Length: \d+\r\nDate: .*\r\nServer: Radio UserLand/(\d[.\w ]+)-([-.\w ]+)\r\n\r\n| p/Radio Userland blog server/ v/$1/ i/$2/ 
++match http m|^HTTP/1\.1 500 Server Error\r\nConnection: close\r\nContent-Length: \d+\r\nDate: .*\r\nServer: Radio UserLand/(\d[\w .]+)-([-.\w ]+)\r\n\r\n| p/Radio Userland blog server/ v/$1/ i/$2/ 
+ match http m|^HTTP/1\.1 \d\d\d .*\r\nServer: (prod )?[Ff]red (\d[-.\w]+) \(build (\d+)\) HTTP Servlets\r\n\r\n|s p/Freenet Fred anonymous P2P/ v/$2 build $3/
+ match http m|^HTTP/1\.0 200 Ok\r\nServer: diva_httpd\r\n| p/Eicon Diva ISDN card configuration server/
+ match http m|^HTTP/1\.0 \d\d\d .*\r\nServer: Resin/(\d[-.\w]+)\r\n| p/Caucho Resin JSP engine/ v/$1/
+@@ -4752,9 +4752,9 @@ match http m|^HTTP/1\.[01] \d\d\d .*\r\nServer: Domino-Go-Webserver/([\d.]+)\r\n
+ match http m|^HTTP/1.1 302 Document Follows\r\nLocation: /hag/pages/home.ssi\r\n\r\n$| p/GlobespanVirata httpd/ i/on broadband router/
+ match http m|^HTTP/1.0 200 OK\r\nServer:HTTP/1.0\r\n.*Hewlett Packard|s p/HP Jetdirect httpd/
+ match http m|^HTTP/1\.0 \d\d\d .*\r\nServer: EHTTP/([\d.]+)\r\nPragma:no-cache\r\nContent-Type:text/html\r\n\r\n \n\n \n(.*) \n- HP (J\w+) ProCurve Switch (\w+)\n| p/HP $3 Procurve Switch $4 http config/ i/EHTTPd $1; Name $2/ d/switch/
+-match http m|^HTTP/1\.0 401 Unauthorized\r\nServer: EHTTP/([.\d]+)\r\nWWW-Authenticate: Basic realm=\"HP ([-.\w]+)\"\r\n| p/HP switch EHTTP admin server/ v/$1/ i/HP $2 switch/ d/switch/
++match http m|^HTTP/1\.0 401 Unauthorized\r\nServer: EHTTP/([\d.]+)\r\nWWW-Authenticate: Basic realm=\"HP ([-.\w]+)\"\r\n| p/HP switch EHTTP admin server/ v/$1/ i/HP $2 switch/ d/switch/
+ match http m|^HTTP/1\.1 \d\d\d .*\r\nServer: Virata-EmWeb/([-.\w]+)\r\n.*\r\n\r\n\n */
+ #include "FtpNegotiationCommand.h"
+ 
++#ifdef HAVE_STDINT_H
+ #include 
++#endif
++
++#ifdef HAVE_INTTYPES_H
++#include 
++#endif
++
+ #include 
+ #include 
+ #include 
+@@ -918,7 +925,7 @@ bool FtpNegotiationCommand::processSequence
+   case SEQ_WAIT_CONNECTION:
+     return waitConnection();
+   default:
+-    abort();
++    std::abort();
+   }
+   return doNextSequence;
+ }
+diff --git a/src/HttpResponse.h b/src/HttpResponse.h
+index 2a28916..44a42df 100644
+--- a/src/HttpResponse.h
++++ b/src/HttpResponse.h
+@@ -37,7 +37,14 @@
+ 
+ #include "common.h"
+ 
++#ifdef HAVE_STDINT_H
+ #include 
++#endif
++
++#ifdef HAVE_INTTYPES_H
++#include 
++#endif
++
+ #include 
+ 
+ #include "SharedHandle.h"
+diff --git a/src/MultiUrlRequestInfo.cc b/src/MultiUrlRequestInfo.cc
+index 760fe7e..8442d0e 100644
+--- a/src/MultiUrlRequestInfo.cc
++++ b/src/MultiUrlRequestInfo.cc
+@@ -121,11 +121,11 @@ ares_addr_node* parseAsyncDNSServers(const std::string& serversOpt)
+       if(node->family == AF_INET) {
+         struct sockaddr_in* in =
+           reinterpret_cast(res->ai_addr);
+-        memcpy(&node->addr.addr4, &(in->sin_addr), 4);
++        std::memcpy(&node->addr.addr4, &(in->sin_addr), 4);
+       } else {
+         struct sockaddr_in6* in =
+           reinterpret_cast(res->ai_addr);
+-        memcpy(&node->addr.addr6, &(in->sin6_addr), 16);
++        std::memcpy(&node->addr.addr6, &(in->sin6_addr), 16);
+       }
+       tail->next = node;
+       tail = node;
+diff --git a/src/Option.cc b/src/Option.cc
+index 579d7e7..555c91b 100644
+--- a/src/Option.cc
++++ b/src/Option.cc
+@@ -38,6 +38,11 @@
+ #include 
+ #include 
+ 
++// For strtoll not in cstdlib in Solaris 9
++#ifdef HAVE_STDLIB_H
++#include 
++#endif
++
+ namespace aria2 {
+ 
+ Option::Option() {}
+@@ -73,7 +78,7 @@ int32_t Option::getAsInt(const std::string& name) const {
+   if(value.empty()) {
+     return 0;
+   } else {
+-    return strtol(value.c_str(), 0, 10);
++    return std::strtol(value.c_str(), 0, 10);
+   }
+ }
+ 
+@@ -95,7 +100,7 @@ double Option::getAsDouble(const std::string& name) const {
+   if(value.empty()) {
+     return 0.0;
+   } else {
+-    return strtod(value.c_str(), 0);
++    return std::strtod(value.c_str(), 0);
+   }
+ }
+ 
+diff --git a/src/OptionHandlerImpl.cc b/src/OptionHandlerImpl.cc
+index c8967f0..e0203d6 100644
+--- a/src/OptionHandlerImpl.cc
++++ b/src/OptionHandlerImpl.cc
+@@ -291,7 +291,7 @@ FloatNumberOptionHandler::~FloatNumberOptionHandler() {}
+ void FloatNumberOptionHandler::parseArg
+ (Option& option, const std::string& optarg)
+ {
+-  double number = strtod(optarg.c_str(), 0);
++  double number = std::strtod(optarg.c_str(), 0);
+   if((min_ < 0 || min_ <= number) && (max_ < 0 || number <= max_)) {
+     option.put(optName_, optarg);
+   } else {
+diff --git a/src/OptionParser.cc b/src/OptionParser.cc
+index c2a00ee..0633e35 100644
+--- a/src/OptionParser.cc
++++ b/src/OptionParser.cc
+@@ -96,7 +96,7 @@ void putOptions(struct option* longOpts, int* plopt,
+         (*longOpts).has_arg = no_argument;
+         break;
+       default:
+-        abort();
++        std::abort();
+       }
+       if((*first)->getShortName() == 0) {
+         (*longOpts).flag = plopt;
+diff --git a/src/PeerConnection.cc b/src/PeerConnection.cc
+index b894f8a..bb2a926 100644
+--- a/src/PeerConnection.cc
++++ b/src/PeerConnection.cc
+@@ -132,7 +132,7 @@ bool PeerConnection::receiveMessage(unsigned char* data, size_t& dataLength) {
+       return false;
+     }
+     uint32_t payloadLength;
+-    memcpy(&payloadLength, lenbuf_, sizeof(payloadLength));
++    std::memcpy(&payloadLength, lenbuf_, sizeof(payloadLength));
+     payloadLength = ntohl(payloadLength);
+     if(payloadLength > MAX_PAYLOAD_LEN) {
+       throw DL_ABORT_EX(fmt(EX_TOO_LONG_PAYLOAD, payloadLength));
+@@ -169,7 +169,7 @@ bool PeerConnection::receiveMessage(unsigned char* data, size_t& dataLength) {
+   resbufLength_ = 0;
+   lenbufLength_ = 0;
+   if(data) {
+-    memcpy(data, resbuf_, currentPayloadLength_);
++    std::memcpy(data, resbuf_, currentPayloadLength_);
+   }
+   dataLength = currentPayloadLength_;
+   return true;
+@@ -201,7 +201,7 @@ bool PeerConnection::receiveHandshake(unsigned char* data, size_t& dataLength,
+     }
+   }
+   size_t writeLength = std::min(resbufLength_, dataLength);
+-  memcpy(data, resbuf_, writeLength);
++  std::memcpy(data, resbuf_, writeLength);
+   dataLength = writeLength;
+   if(retval && !peek) {
+     resbufLength_ = 0;
+@@ -235,7 +235,7 @@ void PeerConnection::enableEncryption
+ void PeerConnection::presetBuffer(const unsigned char* data, size_t length)
+ {
+   size_t nwrite = std::min((size_t)MAX_PAYLOAD_LEN, length);
+-  memcpy(resbuf_, data, nwrite);
++  std::memcpy(resbuf_, data, nwrite);
+   resbufLength_ = length;
+ }
+ 
+diff --git a/src/Piece.h b/src/Piece.h
+index 128c83a..c30aa75 100644
+--- a/src/Piece.h
++++ b/src/Piece.h
+@@ -37,7 +37,14 @@
+ 
+ #include "common.h"
+ 
++#ifdef HAVE_STDINT_H
+ #include 
++#endif
++
++#ifdef HAVE_INTTYPES_H
++#include 
++#endif
++
+ #include 
+ #include 
+ 
+diff --git a/src/PieceSelector.h b/src/PieceSelector.h
+index 659a386..5d2756a 100644
+--- a/src/PieceSelector.h
++++ b/src/PieceSelector.h
+@@ -46,7 +46,7 @@ public:
+   virtual ~PieceSelector() {}
+ 
+   virtual bool select
+-  (size_t& index, const unsigned char* bitfield, size_t nbits) const = 0;
++  (std::size_t& index, const unsigned char* bitfield, std::size_t nbits) const = 0;
+ };
+ 
+ } // namespace aria2
+diff --git a/src/PieceStatMan.cc b/src/PieceStatMan.cc
+index a196702..91b4d33 100644
+--- a/src/PieceStatMan.cc
++++ b/src/PieceStatMan.cc
+@@ -36,6 +36,9 @@
+ 
+ #include 
+ 
++// For SIZE_MAX
++#include 
++
+ #include "SimpleRandomizer.h"
+ #include "bitfield.h"
+ 
+diff --git a/src/ProgressAwareEntry.h b/src/ProgressAwareEntry.h
+index 48f0ad0..9acb576 100644
+--- a/src/ProgressAwareEntry.h
++++ b/src/ProgressAwareEntry.h
+@@ -37,7 +37,14 @@
+ 
+ #include "common.h"
+ 
++#ifdef HAVE_STDINT_H
+ #include 
++#endif
++
++#ifdef HAVE_INTTYPES_H
++#include 
++#endif
++
+ #include 
+ 
+ #include "SharedHandle.h"
+diff --git a/src/ProtocolDetector.cc b/src/ProtocolDetector.cc
+index 1daa199..2cd839c 100644
+--- a/src/ProtocolDetector.cc
++++ b/src/ProtocolDetector.cc
+@@ -97,7 +97,7 @@ bool ProtocolDetector::guessMetalinkFile(const std::string& uri) const
+   if(in) {
+     char head[6];
+     in >> std::setw(6) >> head;
+-    return strcmp(head, "
++#endif
++
++#ifdef HAVE_INTTYPES_H
++#include 
++#endif
++
+ #include 
+ 
+ #include "SharedHandle.h"
+diff --git a/src/SelectEventPoll.cc b/src/SelectEventPoll.cc
+index bb3c21a..f1665f9 100644
+--- a/src/SelectEventPoll.cc
++++ b/src/SelectEventPoll.cc
+@@ -172,8 +172,8 @@ void SelectEventPoll::poll(const struct timeval& tv)
+   fd_set rfds;
+   fd_set wfds;
+   
+-  memcpy(&rfds, &rfdset_, sizeof(fd_set));
+-  memcpy(&wfds, &wfdset_, sizeof(fd_set));
++  std::memcpy(&rfds, &rfdset_, sizeof(fd_set));
++  std::memcpy(&wfds, &wfdset_, sizeof(fd_set));
+ #ifdef __MINGW32__
+   fd_set efds;
+   FD_ZERO(&efds);
+@@ -248,8 +248,15 @@ void SelectEventPoll::updateFdSet()
+ #else // !__MINGW32__
+   fdmax_ = 0;
+ #endif // !__MINGW32__
++/*
++  using namespace std;
+   FD_ZERO(&rfdset_);
+   FD_ZERO(&wfdset_);
++*/
++( void ) std::memset ( ( & rfdset_ ) , 0 , sizeof ( * ( & rfdset_ ) ) ) ; 
++( void ) std::memset ( ( & wfdset_ ) , 0 , sizeof ( * ( & wfdset_ ) ) ) ; 
++
++
+   for(std::deque >::const_iterator i =
+         socketEntries_.begin(), eoi = socketEntries_.end(); i != eoi; ++i) {
+     sock_t fd = (*i)->getSocket();
+diff --git a/src/SimpleRandomizer.cc b/src/SimpleRandomizer.cc
+index 27d3e0c..87eba7a 100644
+--- a/src/SimpleRandomizer.cc
++++ b/src/SimpleRandomizer.cc
+@@ -52,7 +52,7 @@ const SharedHandle& SimpleRandomizer::getInstance()
+   
+ void SimpleRandomizer::init()
+ {
+-  srand(time(0)^getpid());
++  std::srand(time(0)^getpid());
+ }
+ 
+ SimpleRandomizer::SimpleRandomizer() {}
+@@ -61,7 +61,7 @@ SimpleRandomizer::~SimpleRandomizer() {}
+ 
+ long int SimpleRandomizer::getRandomNumber()
+ {
+-  return rand();
++  return std::rand();
+ }
+ 
+ long int SimpleRandomizer::getMaxRandomNumber()
+diff --git a/src/SingleFileAllocationIterator.cc b/src/SingleFileAllocationIterator.cc
+index a12df5d..9552ccd 100644
+--- a/src/SingleFileAllocationIterator.cc
++++ b/src/SingleFileAllocationIterator.cc
+@@ -82,7 +82,7 @@ void SingleFileAllocationIterator::init()
+ #else
+   buffer_ = new unsigned char[BUFSIZE];
+ #endif // HAVE_POSIX_MEMALIGN
+-  memset(buffer_, 0, BUFSIZE);
++  std::memset(buffer_, 0, BUFSIZE);
+ }
+ 
+ void SingleFileAllocationIterator::allocateChunk()
+diff --git a/src/SocketRecvBuffer.cc b/src/SocketRecvBuffer.cc
+index 2c5a1cd..254cb04 100644
+--- a/src/SocketRecvBuffer.cc
++++ b/src/SocketRecvBuffer.cc
+@@ -70,7 +70,7 @@ ssize_t SocketRecvBuffer::recv()
+ void SocketRecvBuffer::shiftBuffer(size_t offset)
+ {
+   assert(offset <= bufLen_);
+-  memmove(buf_, buf_+offset, bufLen_-offset);
++  std::memmove(buf_, buf_+offset, bufLen_-offset);
+   bufLen_ -= offset;
+ }
+ 
+diff --git a/src/TimeA2.h b/src/TimeA2.h
+index 97302a5..b8679fb 100644
+--- a/src/TimeA2.h
++++ b/src/TimeA2.h
+@@ -37,7 +37,13 @@
+ 
+ #include "common.h"
+ 
++#ifdef HAVE_STDINT_H
+ #include 
++#endif
++
++#ifdef HAVE_INTTYPES_H
++#include 
++#endif
+ 
+ #include 
+ 
+diff --git a/src/TransferStat.h b/src/TransferStat.h
+index b8ffef4..fb9a8ac 100644
+--- a/src/TransferStat.h
++++ b/src/TransferStat.h
+@@ -36,7 +36,14 @@
+ #define D_TRANSFER_STAT_H
+ 
+ #include "common.h"
++
++#ifdef HAVE_STDINT_H
+ #include 
++#endif
++
++#ifdef HAVE_INTTYPES_H
++#include 
++#endif
+ 
+ namespace aria2 {
+ 
+diff --git a/src/UnknownLengthPieceStorage.cc b/src/UnknownLengthPieceStorage.cc
+index c0809df..0a6669c 100644
+--- a/src/UnknownLengthPieceStorage.cc
++++ b/src/UnknownLengthPieceStorage.cc
+@@ -75,7 +75,7 @@ void UnknownLengthPieceStorage::initStorage()
+ 
+ bool UnknownLengthPieceStorage::hasMissingPiece(const SharedHandle& peer)
+ {
+-  abort();
++  std::abort();
+ }
+ 
+ void UnknownLengthPieceStorage::getMissingPiece
+@@ -84,7 +84,7 @@ void UnknownLengthPieceStorage::getMissingPiece
+  const SharedHandle& peer,
+  cuid_t cuid)
+ {
+-  abort();
++  std::abort();
+ }
+ 
+ void UnknownLengthPieceStorage::getMissingPiece
+@@ -94,7 +94,7 @@ void UnknownLengthPieceStorage::getMissingPiece
+  const std::vector& excludedIndexes,
+  cuid_t cuid)
+ {
+-  abort();
++  std::abort();
+ }
+ 
+ void UnknownLengthPieceStorage::getMissingFastPiece
+@@ -103,7 +103,7 @@ void UnknownLengthPieceStorage::getMissingFastPiece
+  const SharedHandle& peer,
+  cuid_t cuid)
+ {
+-  abort();
++  std::abort();
+ }
+ 
+ void UnknownLengthPieceStorage::getMissingFastPiece
+@@ -113,14 +113,14 @@ void UnknownLengthPieceStorage::getMissingFastPiece
+  const std::vector& excludedIndexes,
+  cuid_t cuid)
+ {
+-  abort();
++  std::abort();
+ }
+ 
+ SharedHandle UnknownLengthPieceStorage::getMissingPiece
+ (const SharedHandle& peer,
+  cuid_t cuid)
+ {
+-  abort();
++  std::abort();
+ }
+ 
+ SharedHandle UnknownLengthPieceStorage::getMissingPiece
+@@ -128,13 +128,14 @@ SharedHandle UnknownLengthPieceStorage::getMissingPiece
+  const std::vector& excludedIndexes,
+  cuid_t cuid)
+ {
+-  abort();
++  std::abort();
+ }
+ #endif // ENABLE_BITTORRENT
+ 
+ bool UnknownLengthPieceStorage::hasMissingUnusedPiece()
+ {
+-  abort();
++  std::abort();
++  return false;
+ }
+ 
+ SharedHandle UnknownLengthPieceStorage::getMissingPiece
+@@ -241,13 +242,13 @@ void UnknownLengthPieceStorage::markAllPiecesDone()
+ void UnknownLengthPieceStorage::markPiecesDone(uint64_t length)
+ {
+   // TODO not implemented yet
+-  abort();
++  std::abort();
+ }
+ 
+ void UnknownLengthPieceStorage::markPieceMissing(size_t index)
+ {
+   // TODO not implemented yet
+-  abort();
++  std::abort();
+ }
+ 
+ void UnknownLengthPieceStorage::getInFlightPieces
+diff --git a/src/array_fun.h b/src/array_fun.h
+index 897a7a8..a27899e 100644
+--- a/src/array_fun.h
++++ b/src/array_fun.h
+@@ -41,8 +41,10 @@
+ namespace aria2 {
+ 
+ // calculate length of array
++/* Error: An integer constant expression is required within the array subscript operator
+ template
+ char (&char_array_ref_fun(T (&)[N]))[N];
++*/
+ 
+ // For 0 length array
+ template
+diff --git a/src/bitfield.h b/src/bitfield.h
+index 39313a1..47576ec 100644
+--- a/src/bitfield.h
++++ b/src/bitfield.h
+@@ -116,7 +116,7 @@ inline size_t countSetBit(const unsigned char* bitfield, size_t nbits)
+   size_t to = len/size;
+   for(size_t i = 0; i < to; ++i) {
+     uint32_t v;
+-    memcpy(&v, &bitfield[i*size], sizeof(v));
++    std::memcpy(&v, &bitfield[i*size], sizeof(v));
+     count += countBit32(v);
+   }
+   for(size_t i = len-len%size; i < len; ++i) {
+diff --git a/src/common.h b/src/common.h
+index dee2bff..671aeff 100644
+--- a/src/common.h
++++ b/src/common.h
+@@ -77,6 +77,13 @@ typedef _off_t off_t;
+ // use C99 limit macros
+ #define __STDC_LIMIT_MACROS
+ // included here for compatibility issues with old compiler/libraries.
++
++#ifdef HAVE_STDINT_H
+ #include 
++#endif
++
++#ifdef HAVE_INTTYPES_H
++#include 
++#endif
+ 
+ #endif // D_COMMON_H
+diff --git a/src/fmt.cc b/src/fmt.cc
+index a4e9733..6432bb5 100644
+--- a/src/fmt.cc
++++ b/src/fmt.cc
+@@ -34,6 +34,12 @@
+ /* copyright --> */
+ #include "fmt.h"
+ 
++// Make sure Sun Studio knows about va_list
++#ifdef __SUNPRO_CC
++#include 
++#include 
++#endif 
++
+ #include 
+ #include 
+ #include 
+diff --git a/src/util.cc b/src/util.cc
+index 16e4d5e..888e922 100644
+--- a/src/util.cc
++++ b/src/util.cc
+@@ -36,13 +36,26 @@
+ 
+ #include 
+ #include 
++
++#ifdef HAVE_STDINT_H
+ #include 
++#endif
++
++#ifdef HAVE_INTTYPES_H
++#include 
++#endif
++
+ 
+ #include 
+ #include 
+ #include 
+ #include 
+ #include 
++
++#ifdef HAVE_STDLIB_H /* for strtoll and strtoul not in iso cstdlib */
++#include 
++#endif
++
+ #include 
+ #include 
+ #include 
+@@ -498,9 +511,9 @@ std::string secfmt(time_t sec) {
+ 
+ int getNum(const char* buf, int offset, size_t length) {
+   char* temp = new char[length+1];
+-  memcpy(temp, buf+offset, length);
++  std::memcpy(temp, buf+offset, length);
+   temp[length] = '\0';
+-  int x = strtol(temp, 0, 10);
++  int x = std::strtol(temp, 0, 10);
+   delete [] temp;
+   return x;
+ }
+@@ -517,14 +530,14 @@ int32_t parseInt(const std::string& s, int32_t base)
+ 
+ bool parseIntNoThrow(int32_t& result, const std::string& s, int base)
+ {
+-  // Without trim, strtol("  -1  ",..) emits error.
++  // Without trim, std::strtol("  -1  ",..) emits error.
+   std::string trimed = strip(s);
+   if(trimed.empty()) {
+     return false;
+   }
+   char* stop;
+   errno = 0;
+-  long int v = strtol(trimed.c_str(), &stop, base);
++  long int v = std::strtol(trimed.c_str(), &stop, base);
+   if(*stop != '\0') {
+     return false;
+   } else if(((v == LONG_MAX || v == LONG_MIN) && (errno == ERANGE)) ||
+@@ -547,7 +560,7 @@ uint32_t parseUInt(const std::string& s, int base)
+ 
+ bool parseUIntNoThrow(uint32_t& result, const std::string& s, int base)
+ {
+-  // Without trim, strtol("  -1  ",..) emits error.
++  // Without trim, std::strtol("  -1  ",..) emits error.
+   std::string trimed = strip(s);
+   if(trimed.empty()) {
+     return false;
+@@ -590,7 +603,7 @@ int64_t parseLLInt(const std::string& s, int32_t base)
+ 
+ bool parseLLIntNoThrow(int64_t& result, const std::string& s, int base)
+ {
+-  // Without trim, strtol("  -1  ",..) emits error.
++  // Without trim, std::strtol("  -1  ",..) emits error.
+   std::string trimed = strip(s);
+   if(trimed.empty()) {
+     return false;
+@@ -926,7 +939,7 @@ std::string randomAlpha(size_t length, const RandomizerHandle& randomizer) {
+   static const char *random_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+   std::string str;
+   for(size_t i = 0; i < length; ++i) {
+-    size_t index = randomizer->getRandomNumber(strlen(random_chars));
++    size_t index = randomizer->getRandomNumber(std::strlen(random_chars));
+     str += random_chars[index];
+   }
+   return str;
+@@ -958,7 +971,7 @@ bool isNumericHost(const std::string& name)
+ {
+   struct addrinfo hints;
+   struct addrinfo* res;
+-  memset(&hints, 0, sizeof(hints));
++  std::memset(&hints, 0, sizeof(hints));
+   hints.ai_family = AF_UNSPEC;
+   hints.ai_flags = AI_NUMERICHOST;
+   if(getaddrinfo(name.c_str(), 0, &hints, &res)) {
+@@ -982,7 +995,7 @@ void setGlobalSignalHandler(int sig, void (*handler)(int), int flags) {
+ 
+ std::string getHomeDir()
+ {
+-  const char* p = getenv("HOME");
++  const char* p = std::getenv("HOME");
+   if(p) {
+     return p;
+   } else {
+@@ -1232,7 +1245,7 @@ getNumericNameInfo(const struct sockaddr* sockaddr, socklen_t len)
+     throw DL_ABORT_EX(fmt("Failed to get hostname and port. cause: %s",
+                           gai_strerror(s)));
+   }
+-  return std::pair(host, atoi(service)); // TODO
++  return std::pair(host, std::atoi(service)); // TODO
+ }
+ 
+ std::string htmlEscape(const std::string& src)
+@@ -1500,7 +1513,7 @@ void executeHook
+           firstFilename.c_str(),
+           reinterpret_cast(0));
+     perror(("Could not execute user command: "+command).c_str());
+-    exit(EXIT_FAILURE);
++    std::exit(EXIT_FAILURE);
+   }
+ #else
+   PROCESS_INFORMATION pi;
+@@ -1604,7 +1617,7 @@ std::string makeString(const char* str)
+ 
+ std::string safeStrerror(int errNum)
+ {
+-  return makeString(strerror(errNum));
++  return makeString(std::strerror(errNum));
+ }
+ 
+ } // namespace util
+-- 
+1.7.6
+

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 Aug 26 15:41:20 2011
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 26 Aug 2011 13:41:20 +0000
Subject: [csw-devel] SF.net SVN: gar:[15447] csw/mgar/pkg/samba/trunk
Message-ID: 

Revision: 15447
          http://gar.svn.sourceforge.net/gar/?rev=15447&view=rev
Author:   dmichelsen
Date:     2011-08-26 13:41:19 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
samba: Minor restructuring

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

Modified: csw/mgar/pkg/samba/trunk/Makefile
===================================================================
--- csw/mgar/pkg/samba/trunk/Makefile	2011-08-26 12:57:41 UTC (rev 15446)
+++ csw/mgar/pkg/samba/trunk/Makefile	2011-08-26 13:41:19 UTC (rev 15447)
@@ -1,5 +1,5 @@
 NAME = samba
-VERSION = 3.5.6
+VERSION = 3.6.0
 CATEGORIES = apps
 
 DESCRIPTION = Tools to access a servers filespace and printers via SMB (server)
@@ -10,38 +10,40 @@
 MASTER_SITES = http://samba.org/samba/ftp/stable/
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 
-PACKAGES = CSWsamba CSWsambaclient CSWsambacommon CSWsambadoc CSWsambalib CSWsambalibdev CSWsambaswat CSWsambawb
+BUILD_DEP_PKGS += CSWlibtalloc-dev
 
-CATALOGNAME_CSWsamba = samba
+PACKAGES += CSWsamba
 SPKG_DESC_CSWsamba = $(DESCRIPTION)
-CATALOGNAME_CSWsambaclient =  samba_client
+RUNTIME_DEP_PKGS_CSWsamba = CSWsasl CSWsambacommon CSWoldaprt CSWlibpopt CSWlibnet CSWlibcups CSWkrb5lib CSWiconv CSWggettext CSWfam
+
+#PACKAGES += CSWsambaclient
 SPKG_DESC_CSWsambaclient = Client binaries for samba
-CATALOGNAME_CSWsambacommon = samba_common
+RUNTIME_DEP_PKGS_CSWsambaclient = CSWsasl  CSWsambacommon CSWreadline CSWlibpopt CSWlibnet CSWkrb5lib CSWiconv CSWggettext
+
+#PACKAGES += CSWsambacommon
 SPKG_DESC_CSWsambacommon = Shared support files for samba
-CATALOGNAME_CSWsambadoc = samba_doc
+RUNTIME_DEP_PKGS_CSWsambacommon = CSWsasl CSWreadline CSWlibpopt CSWlibnet CSWkrb5lib CSWiconv CSWggettext
+
+#PACKAGES += CSWsambadoc
 SPKG_DESC_CSWsambadoc = Samba documentation
-CATALOGNAME_CSWsambalib = samba_lib
+ARCHALL_CSWsambadoc = 1
+
+#PACKAGES += CSWsambalib
 SPKG_DESC_CSWsambalib = Samba shared libraries
-CATALOGNAME_CSWsambalibdev = samba_libdev
+RUNTIME_DEP_PKGS_CSWsambalib = CSWsasl CSWlibnet CSWkrb5lib CSWiconv
+
+#PACKAGES += CSWsambalibdev
 SPKG_DESC_CSWsambalibdev = Development files for the samba libraries
-CATALOGNAME_CSWsambaswat = samba_swat
+RUNTIME_DEP_PKGS_CSWsambalibdev = CSWsasl CSWlibnet CSWkrb5lib CSWiconv
+
+#PACKAGES += CSWsambaswat
 SPKG_DESC_CSWsambaswat = Web-based samba administration tools
-CATALOGNAME_CSWsambawb = samba_wb
+RUNTIME_DEP_PKGS_CSWsambaswat = CSWsasl CSWlibpopt CSWlibnet CSWlibcups CSWkrb5lib CSWiconv CSWggettext
+
+#PACKAGES += CSWsambawb
 SPKG_DESC_CSWsambawb = not sure what this is
-
-RUNTIME_DEP_PKGS_CSWsamba = CSWsasl CSWsambacommon CSWoldaprt CSWlibpopt CSWlibnet CSWlibcups CSWkrb5lib CSWiconv CSWggettext CSWfam
-RUNTIME_DEP_PKGS_CSWsambaclient = CSWsasl  CSWsambacommon CSWreadline CSWlibpopt CSWlibnet CSWkrb5lib CSWiconv CSWggettext
-RUNTIME_DEP_PKGS_CSWsambacommon = CSWsasl CSWreadline CSWlibpopt CSWlibnet CSWkrb5lib CSWiconv CSWggettext
-RUNTIME_DEP_PKGS_CSWsambalib = CSWsasl CSWlibnet CSWkrb5lib CSWiconv
-RUNTIME_DEP_PKGS_CSWsambalibdev = CSWsasl CSWlibnet CSWkrb5lib CSWiconv
-RUNTIME_DEP_PKGS_CSWsambaswat = CSWsasl CSWlibpopt CSWlibnet CSWlibcups CSWkrb5lib CSWiconv CSWggettext
 RUNTIME_DEP_PKGS_CSWsambawb = CSWsamba
 
-ARCHALL_CSWsambadoc = 1
-
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
-
 CONFIGURE_SCRIPTS = $(WORKSRC)/source3/configure
 CONFIGURE_ARGS = $(DIRPATHS)
 

Modified: csw/mgar/pkg/samba/trunk/checksums
===================================================================
--- csw/mgar/pkg/samba/trunk/checksums	2011-08-26 12:57:41 UTC (rev 15446)
+++ csw/mgar/pkg/samba/trunk/checksums	2011-08-26 13:41:19 UTC (rev 15447)
@@ -1 +1 @@
-bf6c09ea497a166df8bd672db1d8da8f  samba-3.5.6.tar.gz
+e297e0ea7923c7de8d7c1d8fd0ec0a05  samba-3.6.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  Fri Aug 26 15:48:15 2011
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 26 Aug 2011 13:48:15 +0000
Subject: [csw-devel] SF.net SVN: gar:[15448] csw/mgar/pkg/talloc/trunk
Message-ID: 

Revision: 15448
          http://gar.svn.sourceforge.net/gar/?rev=15448&view=rev
Author:   dmichelsen
Date:     2011-08-26 13:48:14 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
talloc: Update to 2.0.6, minor cleanup

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

Modified: csw/mgar/pkg/talloc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/talloc/trunk/Makefile	2011-08-26 13:41:19 UTC (rev 15447)
+++ csw/mgar/pkg/talloc/trunk/Makefile	2011-08-26 13:48:14 UTC (rev 15448)
@@ -1,6 +1,6 @@
 # $Id$
 NAME = talloc
-VERSION = 2.0.5
+VERSION = 2.0.6
 CATEGORIES = lib
 
 DESCRIPTION = A hierarchical, reference counted memory pool system
@@ -10,27 +10,28 @@
 MASTER_SITES = http://samba.org/ftp/talloc/
 DISTFILES  = $(DISTNAME).tar.gz
 
-# File name regex to get notifications about upstream software releases
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+VENDOR_URL = http://talloc.samba.org/talloc/doc/html/index.html
 
+LICENSE = NEWS
+
 PACKAGES += CSWlibtalloc2
 CATALOGNAME_CSWlibtalloc2 = libtalloc2
 SPKG_DESC_CSWlibtalloc2 = A hierarchical, reference counted memory pool system, libtalloc.so.2
-PKGFILES_CSWlibtalloc2 += $(call baseisadirs,$(libdir),libtalloc\.so\.2(\.\d+)*)
+PKGFILES_CSWlibtalloc2 += $(call pkgfiles_lib,libtalloc.so.2)
 
 PACKAGES += CSWlibtalloc-dev
 CATALOGNAME_CSWlibtalloc-dev = libtalloc_dev
 SPKG_DESC_CSWlibtalloc-dev = Development Files for libtalloc
+# PKGFILES is catchall
 RUNTIME_DEP_PKGS_CSWlibtalloc-dev += CSWlibtalloc2
 RUNTIME_DEP_PKGS_CSWlibtalloc-dev += CSWpy-talloc
-# PKGFILES is catchall
 
 PACKAGES += CSWlibpytalloc-util2
 CATALOGNAME_CSWlibpytalloc-util2 = libpytalloc_util2
 SPKG_DESC_CSWlibpytalloc-util2 = Python talloc library, libpytalloc-util.so.2
+PKGFILES_CSWlibpytalloc-util2 = $(call pkgfiles_lib,libpytalloc-util.so.2)
 RUNTIME_DEP_PKGS_CSWlibpytalloc-util2 += CSWlibtalloc2
 RUNTIME_DEP_PKGS_CSWlibpytalloc-util2 += CSWlibpython2-6-1-0
-PKGFILES_CSWlibpytalloc-util2 = $(call baseisadirs,$(libdir),libpytalloc-util\.so\.2(\.\d+)*)
 
 PACKAGES += CSWpy-talloc
 CATALOGNAME_CSWpy-talloc = py_talloc
@@ -50,10 +51,6 @@
 RUNTIME_DEP_PKGS_CSWpy-talloc-dev += CSWpy-talloc
 RUNTIME_DEP_PKGS_CSWpy-talloc-dev += CSWlibpytalloc-util2
 
-VENDOR_URL = http://talloc.samba.org/talloc/doc/html/index.html
-
-LICENSE = NEWS
-
 BUILD64 = 1
 NODIRPATHS = --exec_prefix
 CONFIGURE_ARGS = $(DIRPATHS)

Modified: csw/mgar/pkg/talloc/trunk/checksums
===================================================================
--- csw/mgar/pkg/talloc/trunk/checksums	2011-08-26 13:41:19 UTC (rev 15447)
+++ csw/mgar/pkg/talloc/trunk/checksums	2011-08-26 13:48:14 UTC (rev 15448)
@@ -1 +1 @@
-6e3fdfbc43dde8ccba27b6af894b8fb2  talloc-2.0.5.tar.gz
+bd1be34297e89b27a394b49d5182550e  talloc-2.0.6.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 Aug 26 16:08:02 2011
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 26 Aug 2011 14:08:02 +0000
Subject: [csw-devel] SF.net SVN: gar:[15449] csw/mgar/pkg/nmap/trunk/Makefile
Message-ID: 

Revision: 15449
          http://gar.svn.sourceforge.net/gar/?rev=15449&view=rev
Author:   dmichelsen
Date:     2011-08-26 14:08:02 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
nmap: Add comment about patches

Modified Paths:
--------------
    csw/mgar/pkg/nmap/trunk/Makefile

Modified: csw/mgar/pkg/nmap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nmap/trunk/Makefile	2011-08-26 13:48:14 UTC (rev 15448)
+++ csw/mgar/pkg/nmap/trunk/Makefile	2011-08-26 14:08:02 UTC (rev 15449)
@@ -17,6 +17,8 @@
 MASTER_SITES = http://nmap.org/dist/
 DISTFILES = $(NAME)-$(VERSION).tar.bz2
 
+# Patches unless this is fixed:
+#   http://seclists.org/nmap-dev/2011/q3/646
 PATCHFILES += 0001-Add-definition-for-INT_MAX.patch
 PATCHFILES += 0002-Add-definitions-for-CMSG_ALIGN-CMSG_SPACE-and-CMSG_L.patch
 PATCHFILES += 0003-Do-not-use-__attribute__.patch
@@ -41,6 +43,8 @@
 RUNTIME_DEP_PKGS_CSWnmap += CSWlibpcap1
 RUNTIME_DEP_PKGS_CSWnmap += CSWlua
 RUNTIME_DEP_PKGS_CSWnmap += CSWpython
+# For Zenmap
+RUNTIME_DEP_PKGS_CSWnmap += CSWpygtk
 
 # Tons of docs and identification of programs installed there
 CHECKPKG_OVERRIDES_CSWnmap += file-with-bad-content

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


From bdwalton at users.sourceforge.net  Sat Aug 27 02:13:21 2011
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Sat, 27 Aug 2011 00:13:21 +0000
Subject: [csw-devel] SF.net SVN: opencsw:[515]
	catalog_signatures/etc/signing_daemon.conf
Message-ID: 

Revision: 515
          http://opencsw.svn.sourceforge.net/opencsw/?rev=515&view=rev
Author:   bdwalton
Date:     2011-08-27 00:13:21 +0000 (Sat, 27 Aug 2011)
Log Message:
-----------
spam more people when the passphrase expires

Signed-off-by: Ben Walton 

Modified Paths:
--------------
    catalog_signatures/etc/signing_daemon.conf

Modified: catalog_signatures/etc/signing_daemon.conf
===================================================================
--- catalog_signatures/etc/signing_daemon.conf	2011-08-18 22:43:20 UTC (rev 514)
+++ catalog_signatures/etc/signing_daemon.conf	2011-08-27 00:13:21 UTC (rev 515)
@@ -6,7 +6,7 @@
 APP_GPG_ENV="${APP_TMP}/gpg-agent-env.conf"
 APP_MIRROR_BASE="/export/mirror"
 APP_PORT=9981
-APP_MAILTO="bwalton"
+APP_MAILTO="bwalton maciej ihsan"
 
 export APP_HOME APP_BIN APP_GPG APP_TMP APP_GPG_ENV APP_DAEMON
 export APP_LOGDIR APP_MIRROR_BASE APP_PORT APP_MAILTO

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


From bdwalton at users.sourceforge.net  Sat Aug 27 02:23:21 2011
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Sat, 27 Aug 2011 00:23:21 +0000
Subject: [csw-devel] SF.net SVN: opencsw:[516]
	catalog_signatures/bin/passphrase_verify
Message-ID: 

Revision: 516
          http://opencsw.svn.sourceforge.net/opencsw/?rev=516&view=rev
Author:   bdwalton
Date:     2011-08-27 00:23:21 +0000 (Sat, 27 Aug 2011)
Log Message:
-----------
send a mail notice when the passphrase is reset too as multiple eyes will see the first mail

Signed-off-by: Ben Walton 

Modified Paths:
--------------
    catalog_signatures/bin/passphrase_verify

Modified: catalog_signatures/bin/passphrase_verify
===================================================================
--- catalog_signatures/bin/passphrase_verify	2011-08-27 00:13:21 UTC (rev 515)
+++ catalog_signatures/bin/passphrase_verify	2011-08-27 00:23:21 UTC (rev 516)
@@ -8,6 +8,11 @@
     gpg --yes --batch --homedir "${APP_GPG}" --clearsign --armor --output "${APP_TMP}/$(basename ${APP_DAEMON}).asc" "${APP_DAEMON}"
 
     if [ $? -eq 0 ]; then
+	if [ -f "${APP_TMP}/human_has_arrived" ]; then
+	    echo "A human has intervened and restored the passphrase." | mail -s '[CSW Notice] Catalog Signature Daemon has been reset' ${APP_MAILTO}
+	    rm -f "${APP_TMP}/human_has_arrived"
+	fi
+
 	echo "$(date +%c): Checking; Ok."
 	sleep 60
     else
@@ -17,5 +22,6 @@
 	echo "$(date +%c): AHA!  The passphrase has expired...[Mail sent.]"
 	echo "$(date +%c): Press ENTER to continue monitoring."
 	read CONT
+	touch "${APP_TMP}/human_has_arrived"
     fi
 done

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


From maciej at opencsw.org  Sat Aug 27 10:30:08 2011
From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=)
Date: Sat, 27 Aug 2011 09:30:08 +0100
Subject: [csw-devel] [PATCH] mGAR v2: Add an option to run pigz
In-Reply-To: <1313388961-24600-1-git-send-email-maciej@opencsw.org>
References: <1313388961-24600-1-git-send-email-maciej@opencsw.org>
Message-ID: 

Dagobert, ping?

From rthurner at users.sourceforge.net  Sat Aug 27 10:43:05 2011
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Sat, 27 Aug 2011 08:43:05 +0000
Subject: [csw-devel] SF.net SVN: gar:[15450] csw/mgar/pkg/mercurial/trunk
Message-ID: 

Revision: 15450
          http://gar.svn.sourceforge.net/gar/?rev=15450&view=rev
Author:   rthurner
Date:     2011-08-27 08:43:05 +0000 (Sat, 27 Aug 2011)
Log Message:
-----------
mercurial: upgrade to hg-1.9.2

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

Modified: csw/mgar/pkg/mercurial/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mercurial/trunk/Makefile	2011-08-26 14:08:02 UTC (rev 15449)
+++ csw/mgar/pkg/mercurial/trunk/Makefile	2011-08-27 08:43:05 UTC (rev 15450)
@@ -1,5 +1,5 @@
 NAME = mercurial
-VERSION = 1.9.1
+VERSION = 1.9.2
 CATEGORIES = python
 
 DESCRIPTION = Fast, lightweight Source Control Management system

Modified: csw/mgar/pkg/mercurial/trunk/checksums
===================================================================
--- csw/mgar/pkg/mercurial/trunk/checksums	2011-08-26 14:08:02 UTC (rev 15449)
+++ csw/mgar/pkg/mercurial/trunk/checksums	2011-08-27 08:43:05 UTC (rev 15450)
@@ -1 +1 @@
-601990cc58af8316af4e1ea63e19d1be  mercurial-1.9.1.tar.gz
+0bda8040e2626e70d3d1a0654b0b03f2  mercurial-1.9.2.tar.gz

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


From dam at opencsw.org  Sat Aug 27 14:43:15 2011
From: dam at opencsw.org (Dagobert Michelsen)
Date: Sat, 27 Aug 2011 14:43:15 +0200
Subject: [csw-devel] [PATCH] mGAR v2: Add an option to run pigz
In-Reply-To: 
References: <1313388961-24600-1-git-send-email-maciej@opencsw.org>
	
Message-ID: <799FBE44-6E74-4689-B0A2-36FC5DFE7460@opencsw.org>

Hi Maciej,

Am 27.08.2011 um 10:30 schrieb Maciej Blizi?ski:
> Dagobert, ping?

Ah, yes. I look next week.


Bestr regards

  -- Dago

From rthurner at users.sourceforge.net  Sat Aug 27 19:13:04 2011
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Sat, 27 Aug 2011 17:13:04 +0000
Subject: [csw-devel] SF.net SVN: gar:[15451] csw/mgar/pkg/subversion/trunk
Message-ID: 

Revision: 15451
          http://gar.svn.sourceforge.net/gar/?rev=15451&view=rev
Author:   rthurner
Date:     2011-08-27 17:13:04 +0000 (Sat, 27 Aug 2011)
Log Message:
-----------
subversion: upgrade to svn-1.7-beta3

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	2011-08-27 08:43:05 UTC (rev 15450)
+++ csw/mgar/pkg/subversion/trunk/Makefile	2011-08-27 17:13:04 UTC (rev 15451)
@@ -24,7 +24,7 @@
 #   http://subversion.apache.org/mailing-lists.html
 
 NAME = subversion
-VERSION = 1.7.0-beta2
+VERSION = 1.7.0-beta3
 CATEGORIES = utils
 
 DESCRIPTION = Version control rethought

Modified: csw/mgar/pkg/subversion/trunk/checksums
===================================================================
--- csw/mgar/pkg/subversion/trunk/checksums	2011-08-27 08:43:05 UTC (rev 15450)
+++ csw/mgar/pkg/subversion/trunk/checksums	2011-08-27 17:13:04 UTC (rev 15451)
@@ -1 +1 @@
-4e4c1e742585239b2a335325e2378d7a  subversion-1.7.0-beta2.tar.bz2
+adb488867231de39f71d53cefcb9fa9a  subversion-1.7.0-beta3.tar.bz2

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


From wahwah at users.sourceforge.net  Sun Aug 28 13:14:09 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 28 Aug 2011 11:14:09 +0000
Subject: [csw-devel] SF.net SVN: gar:[15452]
	csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile
Message-ID: 

Revision: 15452
          http://gar.svn.sourceforge.net/gar/?rev=15452&view=rev
Author:   wahwah
Date:     2011-08-28 11:14:09 +0000 (Sun, 28 Aug 2011)
Log Message:
-----------
pkg/gcc4/branches/opt-csw-prefix: add program prefix

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile

Modified: csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile	2011-08-27 17:13:04 UTC (rev 15451)
+++ csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile	2011-08-28 11:14:09 UTC (rev 15452)
@@ -44,7 +44,8 @@
 # http://gcc.gnu.org/install/configure.html
 
 # Could be used to break out of the /opt/csw/gcc4 prefix
-# CONFIGURE_ARGS += --program-prefix=gcc4-
+PROGRAM_PREFIX = gcc4-
+CONFIGURE_ARGS += --program-prefix=$(PROGRAM_PREFIX)
 
 CONFIGURE_ARGS += $(DIRPATHS)
 CONFIGURE_ARGS += --with-gnu-as
@@ -81,6 +82,7 @@
 CPU_i386_64 = x86-64
 
 CONFIGURE_ARGS_sparc += --with-cpu=$(CPU_$(GARCH)_32)
+# These two should not be defined, otherwise the Intel build breaks.
 # CONFIGURE_ARGS_i386 += --with-cpu-32=$(CPU_$(GARCH)_32)
 # CONFIGURE_ARGS_i386 += --with-cpu-64=$(CPU_$(GARCH)_64)
 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARCH))
@@ -305,8 +307,8 @@
 PACKAGES += CSWgcc4g++
 CATALOGNAME_CSWgcc4g++ = gcc4g++
 SPKG_DESC_CSWgcc4g++ = GNU C++ Compiler
-PKGFILES_CSWgcc4g++  = $(bindir)/[cg]\+\+
-PKGFILES_CSWgcc4g++ += $(bindir)/\w+-\w+-solaris[\d\.]+-[cg]\+\+
+PKGFILES_CSWgcc4g++  = $(bindir)/$(PROGRAM_PREFIX)[cg]\+\+
+PKGFILES_CSWgcc4g++ += $(bindir)/$(PROGRAM_PREFIX)\w+-\w+-solaris[\d\.]+-[cg]\+\+
 PKGFILES_CSWgcc4g++ += $(libexecdir)/.*cc1plus
 PKGFILES_CSWgcc4g++ += $(libdir)/.*libstdc.*a
 PKGFILES_CSWgcc4g++ += $(call baseisadirs,$(libdir),libstdc\+\+\.so)
@@ -332,8 +334,8 @@
 RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibgfortran3
 RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibmpc2
 RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibz1
-PKGFILES_CSWgcc4gfortran  = $(bindir)/gfortran
-PKGFILES_CSWgcc4gfortran += $(bindir)/\w+-\w+-solaris[\d\.]+-gfortran
+PKGFILES_CSWgcc4gfortran  = $(bindir)/$(PROGRAM_PREFIX)gfortran
+PKGFILES_CSWgcc4gfortran += $(bindir)/$(PROGRAM_PREFIX)\w+-\w+-solaris[\d\.]+-gfortran
 PKGFILES_CSWgcc4gfortran += $(libdir)/.*libgfortran.*a
 PKGFILES_CSWgcc4gfortran += $(libexecdir)/.*f951
 PKGFILES_CSWgcc4gfortran += $(mandir)/.*gfortran.1
@@ -354,25 +356,25 @@
 RUNTIME_DEP_PKGS_CSWgcc4java += CSWlibmpc2
 RUNTIME_DEP_PKGS_CSWgcc4java += CSWlibz1
 
-PKGFILES_CSWgcc4java  = $(bindir)/.*gcj.*
-PKGFILES_CSWgcc4java += $(bindir)/.*jv-scan
-PKGFILES_CSWgcc4java += $(bindir)/.*jv-convert
-PKGFILES_CSWgcc4java += $(bindir)/.*jcf-dump
-PKGFILES_CSWgcc4java += $(bindir)/.*grmi.*
-PKGFILES_CSWgcc4java += $(bindir)/.*grepjar
-PKGFILES_CSWgcc4java += $(bindir)/.*gjnih
-PKGFILES_CSWgcc4java += $(bindir)/.*gij
-PKGFILES_CSWgcc4java += $(bindir)/.*fastjar
-PKGFILES_CSWgcc4java += $(bindir)/.*gjar.*
-PKGFILES_CSWgcc4java += $(bindir)/.*gjavah
-PKGFILES_CSWgcc4java += $(bindir)/.*gorbd
-PKGFILES_CSWgcc4java += $(bindir)/.*addr2name.awk
-PKGFILES_CSWgcc4java += $(bindir)/.*gappletviewer
-PKGFILES_CSWgcc4java += $(bindir)/.*gkeytool
-PKGFILES_CSWgcc4java += $(bindir)/.*gserialver
-PKGFILES_CSWgcc4java += $(bindir)/.*gtnameserv
-PKGFILES_CSWgcc4java += $(bindir)/.*gnative2ascii
-PKGFILES_CSWgcc4java += $(bindir)/.*gc-analyze
+PKGFILES_CSWgcc4java  = $(bindir)/$(PROGRAM_PREFIX).*gcj.*
+PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*jv-scan
+PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*jv-convert
+PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*jcf-dump
+PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*grmi.*
+PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*grepjar
+PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*gjnih
+PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX)/.*gij
+PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX)/.*fastjar
+PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX)/.*gjar.*
+PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX)/.*gjavah
+PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX)/.*gorbd
+PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX)/.*addr2name.awk
+PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX)/.*gappletviewer
+PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX)/.*gkeytool
+PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX)/.*gserialver
+PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX)/.*gtnameserv
+PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX)/.*gnative2ascii
+PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX)/.*gc-analyze
 PKGFILES_CSWgcc4java += $(mandir)/.*/gcj.*
 PKGFILES_CSWgcc4java += $(mandir)/.*/gij.*
 PKGFILES_CSWgcc4java += $(mandir)/.*/jv.*

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 Aug 28 14:02:03 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 28 Aug 2011 12:02:03 +0000
Subject: [csw-devel] SF.net SVN: gar:[15453]
	csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile
Message-ID: 

Revision: 15453
          http://gar.svn.sourceforge.net/gar/?rev=15453&view=rev
Author:   wahwah
Date:     2011-08-28 12:02:02 +0000 (Sun, 28 Aug 2011)
Log Message:
-----------
pkg/gcc4/branches/opt-csw-prefix: better paths

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile

Modified: csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile	2011-08-28 11:14:09 UTC (rev 15452)
+++ csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile	2011-08-28 12:02:02 UTC (rev 15453)
@@ -163,41 +163,40 @@
 CHECKPKG_OVERRIDES_CSWgcc4g++ += file-with-bad-content
 CHECKPKG_OVERRIDES_CSWgcc4java += file-with-bad-content
 CHECKPKG_OVERRIDES_CSWlibgcj12 += file-with-bad-content
-CHECKPKG_OVERRIDES_CSWgcc4core += discouraged-path-in-pkgmap|/opt/csw/gcc4/libexec/gcc/i386-pc-solaris2.9/$(VERSION)/liblto_plugin.la
-CHECKPKG_OVERRIDES_CSWgcc4core += discouraged-path-in-pkgmap|/opt/csw/gcc4/libexec/gcc/sparc-sun-solaris2.9/$(VERSION)/liblto_plugin.la
-CHECKPKG_OVERRIDES_CSWgcc4core += discouraged-path-in-pkgmap|/opt/csw/gcc4/libexec/gcc/sparc-sun-solaris2.10/$(VERSION)/liblto_plugin.la
+CHECKPKG_OVERRIDES_CSWgcc4core += discouraged-path-in-pkgmap|$(libexecdir)/gcc/i386-pc-solaris2.9/$(VERSION)/liblto_plugin.la
+CHECKPKG_OVERRIDES_CSWgcc4core += discouraged-path-in-pkgmap|$(libexecdir)/gcc/sparc-sun-solaris2.9/$(VERSION)/liblto_plugin.la
+CHECKPKG_OVERRIDES_CSWgcc4core += discouraged-path-in-pkgmap|$(libexecdir)/gcc/sparc-sun-solaris2.10/$(VERSION)/liblto_plugin.la
 CHECKPKG_OVERRIDES_CSWgcc4objc += file-with-bad-content
 CHECKPKG_OVERRIDES_CSWgcc4gfortran += file-with-bad-content
 # Due to complex regular expressions
-CHECKPKG_OVERRIDES_CSWgcc4java += file-collision|/opt/csw/gcc4/include/c++/$(VERSION)/sun/awt/CausedFocusEvent.h|CSWgcc4g++|CSWgcc4java
-CHECKPKG_OVERRIDES_CSWgcc4g++ += file-collision|/opt/csw/gcc4/include/c++/$(VERSION)/sun/awt/CausedFocusEvent.h|CSWgcc4g++|CSWgcc4java
-CHECKPKG_OVERRIDES_CSWgcc4java += file-collision|/opt/csw/include/c++/$(VERSION)/sun/awt/CausedFocusEvent.h|CSWgcc4g++|CSWgcc4java
-CHECKPKG_OVERRIDES_CSWgcc4g++ += file-collision|/opt/csw/include/c++/$(VERSION)/sun/awt/CausedFocusEvent.h|CSWgcc4g++|CSWgcc4java
+CHECKPKG_OVERRIDES_CSWgcc4java += file-collision|$(includedir)/c++/$(VERSION)/sun/awt/CausedFocusEvent.h|CSWgcc4g++|CSWgcc4java
+CHECKPKG_OVERRIDES_CSWgcc4g++ += file-collision|$(includedir)/c++/$(VERSION)/sun/awt/CausedFocusEvent.h|CSWgcc4g++|CSWgcc4java
 
 # Only man pages, so not a big problem. Alternatives could be used, but it
 # requires rebuilding libffi.
-CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/share/man/man3/ffi_call.3|CSWgcc4core|CSWlibffi-dev
-CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/share/man/man3/ffi.3|CSWgcc4core|CSWlibffi-dev
-CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/share/man/man3/ffi_prep_cif.3|CSWgcc4core|CSWlibffi-dev
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|$(mandir)/man3/ffi_call.3|CSWgcc4core|CSWlibffi-dev
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|$(mandir)/man3/ffi.3|CSWgcc4core|CSWlibffi-dev
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|$(mandir)/man3/ffi_prep_cif.3|CSWgcc4core|CSWlibffi-dev
 
 # The .a files are necessary
 CHECKPKG_OVERRIDES_CSWgcc4core += discouraged-path-in-pkgmap
 CHECKPKG_OVERRIDES_CSWgcc4objc += discouraged-path-in-pkgmap
 CHECKPKG_OVERRIDES_CSWgcc4java += discouraged-path-in-pkgmap
+
 CHECKPKG_OVERRIDES_CSWgcc4gfortran += discouraged-path-in-pkgmap
 
 # From the 'hopeless errors' department:
-CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/libffi.so|CSWgcc3javart|CSWgcc4core
-CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/libgcc_s.so|CSWgcc3core|CSWgcc4core
-CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/libgcj.so|CSWgcc3javart|CSWgcc4core
-CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/libobjc.so|CSWgcc3objcrt|CSWgcc4core
-CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/sparcv9/lib-gnu-awt-xlib.so|CSWgcc3javart|CSWgcc4core
-CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/sparcv9/libffi.so|CSWgcc3javart|CSWgcc4core
-CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/sparcv9/libgcj.so|CSWgcc3javart|CSWgcc4core
-CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/sparcv9/libobjc.so|CSWgcc3objcrt|CSWgcc4core
-CHECKPKG_OVERRIDES_CSWgcc4objc += file-collision|/opt/csw/lib/libobjc.so|CSWgcc3objcrt|CSWgcc4objc
-CHECKPKG_OVERRIDES_CSWgcc4objc += file-collision|/opt/csw/lib/sparcv9/libobjc.so|CSWgcc3objcrt|CSWgcc4objc
-CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/lib-gnu-awt-xlib.so|CSWgcc3javart|CSWgcc4core
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|$(libdir)/libffi.so|CSWgcc3javart|CSWgcc4core
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|$(libdir)/libgcc_s.so|CSWgcc3core|CSWgcc4core
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|$(libdir)/libgcj.so|CSWgcc3javart|CSWgcc4core
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|$(libdir)/libobjc.so|CSWgcc3objcrt|CSWgcc4core
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|$(libdir)/sparcv9/lib-gnu-awt-xlib.so|CSWgcc3javart|CSWgcc4core
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|$(libdir)/sparcv9/libffi.so|CSWgcc3javart|CSWgcc4core
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|$(libdir)/sparcv9/libgcj.so|CSWgcc3javart|CSWgcc4core
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|$(libdir)/sparcv9/libobjc.so|CSWgcc3objcrt|CSWgcc4core
+CHECKPKG_OVERRIDES_CSWgcc4objc += file-collision|$(libdir)/libobjc.so|CSWgcc3objcrt|CSWgcc4objc
+CHECKPKG_OVERRIDES_CSWgcc4objc += file-collision|$(libdir)/sparcv9/libobjc.so|CSWgcc3objcrt|CSWgcc4objc
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|$(libdir)/lib-gnu-awt-xlib.so|CSWgcc3javart|CSWgcc4core
 
 # Some static libraries are required to build binaries with gcc, for example
 # libgcc.a and libgcc_eh.a. Otherwise: ld: fatal: library -lgcc: not found
@@ -308,7 +307,7 @@
 CATALOGNAME_CSWgcc4g++ = gcc4g++
 SPKG_DESC_CSWgcc4g++ = GNU C++ Compiler
 PKGFILES_CSWgcc4g++  = $(bindir)/$(PROGRAM_PREFIX)[cg]\+\+
-PKGFILES_CSWgcc4g++ += $(bindir)/$(PROGRAM_PREFIX)\w+-\w+-solaris[\d\.]+-[cg]\+\+
+PKGFILES_CSWgcc4g++ += $(bindir)/\w+-\w+-solaris[\d\.]+-$(PROGRAM_PREFIX)[cg]\+\+
 PKGFILES_CSWgcc4g++ += $(libexecdir)/.*cc1plus
 PKGFILES_CSWgcc4g++ += $(libdir)/.*libstdc.*a
 PKGFILES_CSWgcc4g++ += $(call baseisadirs,$(libdir),libstdc\+\+\.so)
@@ -335,11 +334,11 @@
 RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibmpc2
 RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibz1
 PKGFILES_CSWgcc4gfortran  = $(bindir)/$(PROGRAM_PREFIX)gfortran
-PKGFILES_CSWgcc4gfortran += $(bindir)/$(PROGRAM_PREFIX)\w+-\w+-solaris[\d\.]+-gfortran
+PKGFILES_CSWgcc4gfortran += $(bindir)/\w+-\w+-solaris[\d\.]+-$(PROGRAM_PREFIX)gfortran
 PKGFILES_CSWgcc4gfortran += $(libdir)/.*libgfortran.*a
 PKGFILES_CSWgcc4gfortran += $(libexecdir)/.*f951
 PKGFILES_CSWgcc4gfortran += $(mandir)/.*gfortran.1
-PKGFILES_CSWgcc4gfortran += .*/gcc4/info/gfortran.*
+PKGFILES_CSWgcc4gfortran += $(infodir)/gfortran.*
 PKGFILES_CSWgcc4gfortran += $(call baseisadirs,$(libdir),libgfortran\.so)
 OBSOLETED_BY_CSWgcc4gfortran  = CSWgcc4g95
 OBSOLETED_BY_CSWgcc4gfortran += CSWgcc4g95rt
@@ -363,18 +362,18 @@
 PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*grmi.*
 PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*grepjar
 PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*gjnih
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX)/.*gij
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX)/.*fastjar
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX)/.*gjar.*
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX)/.*gjavah
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX)/.*gorbd
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX)/.*addr2name.awk
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX)/.*gappletviewer
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX)/.*gkeytool
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX)/.*gserialver
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX)/.*gtnameserv
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX)/.*gnative2ascii
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX)/.*gc-analyze
+PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*gij
+PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*fastjar
+PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*gjar.*
+PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*gjavah
+PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*gorbd
+PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*addr2name.awk
+PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*gappletviewer
+PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*gkeytool
+PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*gserialver
+PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*gtnameserv
+PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*gnative2ascii
+PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*gc-analyze
 PKGFILES_CSWgcc4java += $(mandir)/.*/gcj.*
 PKGFILES_CSWgcc4java += $(mandir)/.*/gij.*
 PKGFILES_CSWgcc4java += $(mandir)/.*/jv.*
@@ -390,7 +389,7 @@
 PKGFILES_CSWgcc4java += $(mandir)/.*/gtnameserv.*
 PKGFILES_CSWgcc4java += $(mandir)/.*/gnative2ascii.*
 PKGFILES_CSWgcc4java += $(mandir)/.*/gc-analyze.*
-PKGFILES_CSWgcc4java += .*/gcc4/share/java/.*
+PKGFILES_CSWgcc4java += $(datadir)/java/.*
 PKGFILES_CSWgcc4java += $(libdir)/.*libgij.*a
 PKGFILES_CSWgcc4java += $(libdir)/.*libffi.*a
 PKGFILES_CSWgcc4java += $(libdir)/.*lib-gnu-awt.*a
@@ -402,7 +401,7 @@
 PKGFILES_CSWgcc4java += $(libexecdir)/.*collect.*
 PKGFILES_CSWgcc4java += $(libexecdir)/.*jvgenmain
 PKGFILES_CSWgcc4java += $(libexecdir)/.*jc1.*
-PKGFILES_CSWgcc4java += .*/gcc4/info/gcj.*
+PKGFILES_CSWgcc4java += $(infodir)/gcj.*
 PKGFILES_CSWgcc4java += $(includedir)/.*gcj/.*
 PKGFILES_CSWgcc4java += $(includedir)/.*awt/.*
 PKGFILES_CSWgcc4java += $(includedir)/.*classpath/.*

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


From j_arndt at users.sourceforge.net  Sun Aug 28 21:19:20 2011
From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net)
Date: Sun, 28 Aug 2011 19:19:20 +0000
Subject: [csw-devel] SF.net SVN: gar:[15454]
	csw/mgar/pkg/nagios/trunk/Makefile
Message-ID: 

Revision: 15454
          http://gar.svn.sourceforge.net/gar/?rev=15454&view=rev
Author:   j_arndt
Date:     2011-08-28 19:19:20 +0000 (Sun, 28 Aug 2011)
Log Message:
-----------
nagios: override of failures reported by chkpkg

Modified Paths:
--------------
    csw/mgar/pkg/nagios/trunk/Makefile

Modified: csw/mgar/pkg/nagios/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nagios/trunk/Makefile	2011-08-28 12:02:02 UTC (rev 15453)
+++ csw/mgar/pkg/nagios/trunk/Makefile	2011-08-28 19:19:20 UTC (rev 15454)
@@ -29,6 +29,7 @@
 RUNTIME_DEP_PKGS_CSWnagios  = CSWapache2 CSWgd CSWglib2 CSWiconv CSWjpeg CSWlibtoolrt CSWggettextrt
 RUNTIME_DEP_PKGS_CSWnagios += CSWosslrt CSWperl CSWpng CSWzlib CSWnagiosp CSWap2modphp5 CSWbdb
 RUNTIME_DEP_PKGS_CSWnagios += CSWcswclassutils 
+RUNTIME_DEP_PKGS_CSWnagios += CSWlibgd2
 
 LICENSE = LICENSE
 
@@ -86,7 +87,7 @@
 
 BUILD_ARGS = all
 
-ENABLE_CHECK = 0
+# ENABLE_CHECK = 0
 
 TEST_TARGET = none
 
@@ -98,6 +99,63 @@
 #INSTALL_ARGS += install-config
 INSTALL_ARGS += install-commandmode
 
+#
+# override chkpkg
+# (in all html and cfg files the string /usr/local appears, which is uncritical.
+#  the string appears in /opt/csw/nagios/bin/nagios and opt/csw/nagios/bin/p1.pl too, where it is a comment)
+#
+
+CHECKPKG_OVERRIDES_CSWnagios += action-class-only-in-pkginfo|ugfiles
+CHECKPKG_OVERRIDES_CSWnagios += action-class-only-in-pkginfo|cswmigrateconf
+CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/bin/nagios
+CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/bin/p1.pl
+CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/cgisecurity.html
+CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/monitoring-windows.html
+CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/volatileservices.html
+CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/faststartup.html
+CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/freshness.html
+CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/macros.html
+CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/config.html
+CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/upgrading.html
+CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/quickstart-opensuse.html
+CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/notifications.html
+CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/verifyconfig.html
+CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/redundancy.html
+CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/perfdata.html
+CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/configmain.html
+CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/monitoring-printers.html
+CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/quickstart-ubuntu.html
+CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/security.html
+CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/eventhandlers.html
+CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/startstop.html
+CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/cgiincludes.html
+CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/configcgi.html
+CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/distributed.html
+CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/int-tcpwrappers.html
+CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/cgiauth.html
+CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/objectdefinitions.html
+CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/monitoring-routers.html
+CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/clusters.html
+CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/nagiostats.html
+CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/quickstart-fedora.html
+CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/configobject.html
+CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/etc/templates/CSWnagios/etc/opt/csw/nagios/nagios.cfg
+CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/etc/templates/CSWnagios/etc/opt/csw/nagios/cgi.cfg
+
+#
+# yes, we need this dependencies
+#
+
+CHECKPKG_OVERRIDES_CSWnagios += obsolete-dependency|CSWcswclassutils
+CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWgd
+CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWglib2
+CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWnagiosp
+CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWlibtoolrt
+CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWap2modphp5
+CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWggettextrt
+CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWbdb
+CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWosslrt
+
 include gar/category.mk
 
 DOCS        = Changelog INSTALLING README UPGRADING

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


From maciej at opencsw.org  Sun Aug 28 21:36:43 2011
From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=)
Date: Sun, 28 Aug 2011 20:36:43 +0100
Subject: [csw-devel] SF.net SVN: gar:[15454]
	csw/mgar/pkg/nagios/trunk/Makefile
In-Reply-To: 
References: 
Message-ID: 

Hi Juergen,

Here's a couple of comments below.

2011/8/28  :
> Revision: 15454
> ? ? ? ? ?http://gar.svn.sourceforge.net/gar/?rev=15454&view=rev
> Author: ? j_arndt
> Date: ? ? 2011-08-28 19:19:20 +0000 (Sun, 28 Aug 2011)
> Log Message:
> -----------
> nagios: override of failures reported by chkpkg
>
> Modified Paths:
> --------------
> ? ?csw/mgar/pkg/nagios/trunk/Makefile
>
> Modified: csw/mgar/pkg/nagios/trunk/Makefile
> ===================================================================
> --- csw/mgar/pkg/nagios/trunk/Makefile ?2011-08-28 12:02:02 UTC (rev 15453)
> +++ csw/mgar/pkg/nagios/trunk/Makefile ?2011-08-28 19:19:20 UTC (rev 15454)
> @@ -29,6 +29,7 @@
> ?RUNTIME_DEP_PKGS_CSWnagios ?= CSWapache2 CSWgd CSWglib2 CSWiconv CSWjpeg CSWlibtoolrt CSWggettextrt
> ?RUNTIME_DEP_PKGS_CSWnagios += CSWosslrt CSWperl CSWpng CSWzlib CSWnagiosp CSWap2modphp5 CSWbdb
> ?RUNTIME_DEP_PKGS_CSWnagios += CSWcswclassutils
> +RUNTIME_DEP_PKGS_CSWnagios += CSWlibgd2
>
> ?LICENSE = LICENSE
>
> @@ -86,7 +87,7 @@
>
> ?BUILD_ARGS = all
>
> -ENABLE_CHECK = 0
> +# ENABLE_CHECK = 0
>
> ?TEST_TARGET = none
>
> @@ -98,6 +99,63 @@
> ?#INSTALL_ARGS += install-config
> ?INSTALL_ARGS += install-commandmode
>
> +#
> +# override chkpkg
> +# (in all html and cfg files the string /usr/local appears, which is uncritical.
> +# ?the string appears in /opt/csw/nagios/bin/nagios and opt/csw/nagios/bin/p1.pl too, where it is a comment)
> +#
> +
> +CHECKPKG_OVERRIDES_CSWnagios += action-class-only-in-pkginfo|ugfiles
> +CHECKPKG_OVERRIDES_CSWnagios += action-class-only-in-pkginfo|cswmigrateconf

If there are no files using the ugfiles or cswmigrateconf classes, why
include them in the pkginfo?

> +CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/bin/nagios
> +CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/bin/p1.pl
> +CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/cgisecurity.html
> +CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/monitoring-windows.html
> +CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/volatileservices.html
> +CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/faststartup.html
> +CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/freshness.html
> +CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/macros.html
> +CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/config.html
> +CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/upgrading.html
> +CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/quickstart-opensuse.html
> +CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/notifications.html
> +CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/verifyconfig.html
> +CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/redundancy.html
> +CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/perfdata.html
> +CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/configmain.html
> +CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/monitoring-printers.html
> +CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/quickstart-ubuntu.html
> +CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/security.html
> +CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/eventhandlers.html
> +CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/startstop.html
> +CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/cgiincludes.html
> +CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/configcgi.html
> +CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/distributed.html
> +CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/int-tcpwrappers.html
> +CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/cgiauth.html
> +CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/objectdefinitions.html
> +CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/monitoring-routers.html
> +CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/clusters.html
> +CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/nagiostats.html
> +CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/quickstart-fedora.html
> +CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/configobject.html
> +CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/etc/templates/CSWnagios/etc/opt/csw/nagios/nagios.cfg
> +CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/etc/templates/CSWnagios/etc/opt/csw/nagios/cgi.cfg

You could replace this block with a single line:

CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content

> +#
> +# yes, we need this dependencies
> +#
> +

> +CHECKPKG_OVERRIDES_CSWnagios += obsolete-dependency|CSWcswclassutils

No package should depend on cswclassutils any more. Packages should
instead depend on the specific CAS package they need.

> +CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWgd
> +CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWglib2
> +CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWnagiosp
> +CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWlibtoolrt
> +CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWap2modphp5
> +CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWggettextrt
> +CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWbdb
> +CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWosslrt

If you know why the dependencies are needed, you could write that in
the comments. For example, CSWosslrt contains shared libraries, and
there are no binaries in the nagios packages that link against the ssl
libraries.  Perhaps there are binaries that use dlopen - if that's the
case, it makes sense to make a note of that in the build description.
The next person after you, not knowing why the dependencies are
needed, could simply remove them and break the package.

Maciej

From j_arndt at users.sourceforge.net  Sun Aug 28 21:44:23 2011
From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net)
Date: Sun, 28 Aug 2011 19:44:23 +0000
Subject: [csw-devel] SF.net SVN: gar:[15455]
	csw/mgar/pkg/nagios/trunk/Makefile
Message-ID: 

Revision: 15455
          http://gar.svn.sourceforge.net/gar/?rev=15455&view=rev
Author:   j_arndt
Date:     2011-08-28 19:44:23 +0000 (Sun, 28 Aug 2011)
Log Message:
-----------
nagios: added missing dependencies

Modified Paths:
--------------
    csw/mgar/pkg/nagios/trunk/Makefile

Modified: csw/mgar/pkg/nagios/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nagios/trunk/Makefile	2011-08-28 19:19:20 UTC (rev 15454)
+++ csw/mgar/pkg/nagios/trunk/Makefile	2011-08-28 19:44:23 UTC (rev 15455)
@@ -30,6 +30,9 @@
 RUNTIME_DEP_PKGS_CSWnagios += CSWosslrt CSWperl CSWpng CSWzlib CSWnagiosp CSWap2modphp5 CSWbdb
 RUNTIME_DEP_PKGS_CSWnagios += CSWcswclassutils 
 RUNTIME_DEP_PKGS_CSWnagios += CSWlibgd2
+RUNTIME_DEP_PKGS_CSWnagios += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWnagios += CSWlibpng12-0
+RUNTIME_DEP_PKGS_CSWnagios += CSWlibz1
 
 LICENSE = LICENSE
 
@@ -141,6 +144,9 @@
 CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/configobject.html
 CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/etc/templates/CSWnagios/etc/opt/csw/nagios/nagios.cfg
 CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/etc/templates/CSWnagios/etc/opt/csw/nagios/cgi.cfg
+CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWpng
+CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWzlib
+CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWiconv
 
 #
 # yes, we need this dependencies
@@ -156,6 +162,7 @@
 CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWbdb
 CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWosslrt
 
+
 include gar/category.mk
 
 DOCS        = Changelog INSTALLING README UPGRADING

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


From maciej at opencsw.org  Sun Aug 28 21:56:22 2011
From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=)
Date: Sun, 28 Aug 2011 20:56:22 +0100
Subject: [csw-devel] SF.net SVN: gar:[15455]
	csw/mgar/pkg/nagios/trunk/Makefile
In-Reply-To: 
References: 
Message-ID: 

Hi Juergen,

> +CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWpng
> +CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWzlib
> +CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWiconv

Checkpkg tells you the right thing, these are not needed. CSWpng is
now replaced by the CSWlibpng12-0, it's a legacy package to ensure
backward-compatibility.  The same situation is with CSWzlib (replaced
by CSWlibz1) and CSWiconv (replaced by CSWiconv2).

From wahwah at users.sourceforge.net  Mon Aug 29 10:14:29 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Mon, 29 Aug 2011 08:14:29 +0000
Subject: [csw-devel] SF.net SVN: gar:[15456]
	csw/mgar/pkg/krb5-lib/trunk/Makefile
Message-ID: 

Revision: 15456
          http://gar.svn.sourceforge.net/gar/?rev=15456&view=rev
Author:   wahwah
Date:     2011-08-29 08:14:29 +0000 (Mon, 29 Aug 2011)
Log Message:
-----------
pkg/krb5-lib/trunk: An override for private shared libs

Modified Paths:
--------------
    csw/mgar/pkg/krb5-lib/trunk/Makefile

Modified: csw/mgar/pkg/krb5-lib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/krb5-lib/trunk/Makefile	2011-08-28 19:44:23 UTC (rev 15455)
+++ csw/mgar/pkg/krb5-lib/trunk/Makefile	2011-08-29 08:14:29 UTC (rev 15456)
@@ -101,6 +101,7 @@
 RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibkrb5support0
 RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibcom-err3
 RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibk5crypto3
+CHECKPKG_OVERRIDES_CSWlibkrb5-priv += non-uniform-lib-versions-in-package
 
 PACKAGES += CSWlibkrb5-3
 CATALOGNAME_CSWlibkrb5-3 = libkrb5_3

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 Aug 29 10:51:07 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Mon, 29 Aug 2011 08:51:07 +0000
Subject: [csw-devel] SF.net SVN: gar:[15457]
	csw/mgar/gar/v2/lib/web/releases_web.py
Message-ID: 

Revision: 15457
          http://gar.svn.sourceforge.net/gar/?rev=15457&view=rev
Author:   wahwah
Date:     2011-08-29 08:51:07 +0000 (Mon, 29 Aug 2011)
Log Message:
-----------
releases-web: A better error message

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/web/releases_web.py

Modified: csw/mgar/gar/v2/lib/web/releases_web.py
===================================================================
--- csw/mgar/gar/v2/lib/web/releases_web.py	2011-08-29 08:14:29 UTC (rev 15456)
+++ csw/mgar/gar/v2/lib/web/releases_web.py	2011-08-29 08:51:07 UTC (rev 15457)
@@ -149,7 +149,8 @@
       raise web.notfound()
     try:
       if arch_name == 'all':
-        raise checkpkg_lib.CatalogDatabaseError("Cannot add to 'all' catalog.")
+        raise checkpkg_lib.CatalogDatabaseError(
+            "There is no 'all' catalog, cannot proceed.")
       srv4 = models.Srv4FileStats.selectBy(md5_sum=md5_sum).getOne()
       parsed_basename = opencsw.ParsePackageFileName(srv4.basename)
       if parsed_basename["vendortag"] != "CSW":

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 Aug 29 10:52:24 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Mon, 29 Aug 2011 08:52:24 +0000
Subject: [csw-devel] SF.net SVN: gar:[15458]
	csw/mgar/gar/v2/lib/python/csw_upload_pkg.py
Message-ID: 

Revision: 15458
          http://gar.svn.sourceforge.net/gar/?rev=15458&view=rev
Author:   wahwah
Date:     2011-08-29 08:52:24 +0000 (Mon, 29 Aug 2011)
Log Message:
-----------
csw-upload-pkg: Pass --debug to pkgdb

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/python/csw_upload_pkg.py

Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg.py
===================================================================
--- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py	2011-08-29 08:51:07 UTC (rev 15457)
+++ csw/mgar/gar/v2/lib/python/csw_upload_pkg.py	2011-08-29 08:52:24 UTC (rev 15458)
@@ -109,7 +109,10 @@
         "Could not find %s. Make sure that the pkgdb executable is "
         "available \n"
         "from the same directory as csw-upload-pkg." % pkgdb_executable)
-    args = [pkgdb_executable, "importpkg", filename]
+    args = [pkgdb_executable, "importpkg"]
+    if self.debug:
+      args.append("--debug")
+    args.append(filename)
     ret = subprocess.call(args)
     if ret:
       raise OSError("An error occurred when running %s." % args)

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 Aug 29 10:53:02 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Mon, 29 Aug 2011 08:53:02 +0000
Subject: [csw-devel] SF.net SVN: gar:[15459] csw/mgar/gar/v2
Message-ID: 

Revision: 15459
          http://gar.svn.sourceforge.net/gar/?rev=15459&view=rev
Author:   wahwah
Date:     2011-08-29 08:53:01 +0000 (Mon, 29 Aug 2011)
Log Message:
-----------
mGAR v2: Add an option to run pigz

Modified Paths:
--------------
    csw/mgar/gar/v2/bin/mkpackage
    csw/mgar/gar/v2/gar.conf.mk
    csw/mgar/gar/v2/gar.pkg.mk

Modified: csw/mgar/gar/v2/bin/mkpackage
===================================================================
--- csw/mgar/gar/v2/bin/mkpackage	2011-08-29 08:52:24 UTC (rev 15458)
+++ csw/mgar/gar/v2/bin/mkpackage	2011-08-29 08:53:01 UTC (rev 15459)
@@ -318,6 +318,7 @@
         'overwrite!'   => \$config{overwrite},
         'compress!'    => \$config{compress},
         'usebzip'      => \$config{usebzip},
+        'usepigz'      => \$config{usepigz},
         'quiet|q'      => \$config{quiet},
         'help'         => \$args{help},
         'manual'       => \$args{man},
@@ -397,6 +398,7 @@
     $config{transfer}  = 1 unless defined $config{transfer};
     $config{overwrite} = 0 unless defined $config{overwrite};
     $config{usebzip}   = 0 unless defined $config{usebzip};
+    $config{usepigz}   = 0 unless defined $config{usepigz};
 
     # Export variables to the spec
     $ENV{$_} = $config{$_} foreach qw/
@@ -911,7 +913,7 @@
         my $compress =
           $config{usebzip}
           ? 'bzip2 -9 -f %s'
-          : 'gzip -9 -f %s';
+          : ($config{usepigz} ? 'pigz -9 -f %s' : 'gzip -9 -f %s');
 
         vexec( sprintf( $compress, $tmppkg ), "Failed to compress $tmppkg" );
         $tmppkg .= $config{usebzip} ? ".bz2" : ".gz";
@@ -953,8 +955,8 @@
  mkpackage --spec  [--destdir ] [--workdir ]
         [--spooldir ] [--pkgroot ] [--tmpdir ]
         [--[no]transfer] [--[no]overwrite] [--[no]compress]
-        [--usebzip] [-v var=value...] [--dump |-dumpall] [--quiet]
-        [--help] [--manual] [--version]
+        [--usebzip] [--usepigz] [-v var=value...] [--dump |-dumpall]
+        [--quiet] [--help] [--manual] [--version]
 
 =head1 DESCRIPTION
 
@@ -1032,6 +1034,10 @@
 specified, mkpackage will compress bitstream packages using gzip.  Specifying
 --usebzip will use bzip2 instead, producing smaller archives in most cases.
 
+=head2 --usepigz
+
+Use pigz, a parallel implementation of gzip.
+
 =head2 -v var=value
 
 Build time variables.  Specify one or more variable replacements for pkgmk

Modified: csw/mgar/gar/v2/gar.conf.mk
===================================================================
--- csw/mgar/gar/v2/gar.conf.mk	2011-08-29 08:52:24 UTC (rev 15458)
+++ csw/mgar/gar/v2/gar.conf.mk	2011-08-29 08:53:01 UTC (rev 15459)
@@ -736,6 +736,9 @@
 # prepend the local file listing
 FILE_SITES = $(foreach DIR,$(FILEDIR) $(GARCHIVEPATH),file://$(DIR)/)
 
+# For example, --usepigz
+EXTRA_MKPACKAGE_OPTS ?=
+
 # Extra libraries
 EXTRA_LIBS = gar.pkg.mk gar.common.mk gar.svn.mk
 ccenv:

Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk	2011-08-29 08:52:24 UTC (rev 15458)
+++ csw/mgar/gar/v2/gar.pkg.mk	2011-08-29 08:53:01 UTC (rev 15459)
@@ -941,6 +941,7 @@
 						 --workdir  $(SPKG_WORKDIR) \
 						 --pkgbase  $(SPKG_PKGBASE) \
 						 --pkgroot  $(SPKG_PKGROOT) \
+						 $(EXTRA_MKPACKAGE_OPTS)  \
 						-v WORKDIR_FIRSTMOD=../build-$(firstword $(MODULATIONS)) \
 						 $(if $(_DIRPACKAGE),--notransfer --nocompress,--compress) \
 						 $(MKPACKAGE_ARGS) ) || exit 2

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


From wahwah at users.sourceforge.net  Mon Aug 29 17:12:45 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Mon, 29 Aug 2011 15:12:45 +0000
Subject: [csw-devel] SF.net SVN: gar:[15460]
 csw/mgar/pkg/gcc4/branches/bootstrap-3.4/files/ test-results/
Message-ID: 

Revision: 15460
          http://gar.svn.sourceforge.net/gar/?rev=15460&view=rev
Author:   wahwah
Date:     2011-08-29 15:12:45 +0000 (Mon, 29 Aug 2011)
Log Message:
-----------
pkg/gcc4/branches/bootstrap-3.4: removing test results

Removed Paths:
-------------
    csw/mgar/pkg/gcc4/branches/bootstrap-3.4/files/test-results/

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 Aug 29 17:14:11 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Mon, 29 Aug 2011 15:14:11 +0000
Subject: [csw-devel] SF.net SVN: gar:[15461]
	csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile
Message-ID: 

Revision: 15461
          http://gar.svn.sourceforge.net/gar/?rev=15461&view=rev
Author:   wahwah
Date:     2011-08-29 15:14:10 +0000 (Mon, 29 Aug 2011)
Log Message:
-----------
pkg/gcc4/branches/opt-csw-prefix: Using program suffix

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile

Modified: csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile	2011-08-29 15:12:45 UTC (rev 15460)
+++ csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile	2011-08-29 15:14:10 UTC (rev 15461)
@@ -10,6 +10,7 @@
 VERSION   = 4.6.1
 CATEGORIES   = lang
 GARTYPE = v2
+BASE_VERSION = $(shell echo $(VERSION) | gsed -e 's/^\([0-9]\+\.[0-9]\+\)\(.*\)/\1/')
 
 DESCRIPTION  = The GNU Compiler Collection
 define BLURB
@@ -44,8 +45,8 @@
 # http://gcc.gnu.org/install/configure.html
 
 # Could be used to break out of the /opt/csw/gcc4 prefix
-PROGRAM_PREFIX = gcc4-
-CONFIGURE_ARGS += --program-prefix=$(PROGRAM_PREFIX)
+PROGRAM_SUFFIX = -$(BASE_VERSION)
+CONFIGURE_ARGS += --program-suffix=$(PROGRAM_SUFFIX)
 
 CONFIGURE_ARGS += $(DIRPATHS)
 CONFIGURE_ARGS += --with-gnu-as
@@ -306,8 +307,8 @@
 PACKAGES += CSWgcc4g++
 CATALOGNAME_CSWgcc4g++ = gcc4g++
 SPKG_DESC_CSWgcc4g++ = GNU C++ Compiler
-PKGFILES_CSWgcc4g++  = $(bindir)/$(PROGRAM_PREFIX)[cg]\+\+
-PKGFILES_CSWgcc4g++ += $(bindir)/\w+-\w+-solaris[\d\.]+-$(PROGRAM_PREFIX)[cg]\+\+
+PKGFILES_CSWgcc4g++  = $(bindir)/[cg]\+\+$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4g++ += $(bindir)/\w+-\w+-solaris[\d\.]+-[cg]\+\+$(PROGRAM_SUFFIX)
 PKGFILES_CSWgcc4g++ += $(libexecdir)/.*cc1plus
 PKGFILES_CSWgcc4g++ += $(libdir)/.*libstdc.*a
 PKGFILES_CSWgcc4g++ += $(call baseisadirs,$(libdir),libstdc\+\+\.so)
@@ -333,8 +334,8 @@
 RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibgfortran3
 RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibmpc2
 RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibz1
-PKGFILES_CSWgcc4gfortran  = $(bindir)/$(PROGRAM_PREFIX)gfortran
-PKGFILES_CSWgcc4gfortran += $(bindir)/\w+-\w+-solaris[\d\.]+-$(PROGRAM_PREFIX)gfortran
+PKGFILES_CSWgcc4gfortran  = $(bindir)/gfortran$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4gfortran += $(bindir)/\w+-\w+-solaris[\d\.]+-gfortran$(PROGRAM_SUFFIX)
 PKGFILES_CSWgcc4gfortran += $(libdir)/.*libgfortran.*a
 PKGFILES_CSWgcc4gfortran += $(libexecdir)/.*f951
 PKGFILES_CSWgcc4gfortran += $(mandir)/.*gfortran.1
@@ -355,25 +356,25 @@
 RUNTIME_DEP_PKGS_CSWgcc4java += CSWlibmpc2
 RUNTIME_DEP_PKGS_CSWgcc4java += CSWlibz1
 
-PKGFILES_CSWgcc4java  = $(bindir)/$(PROGRAM_PREFIX).*gcj.*
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*jv-scan
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*jv-convert
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*jcf-dump
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*grmi.*
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*grepjar
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*gjnih
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*gij
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*fastjar
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*gjar.*
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*gjavah
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*gorbd
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*addr2name.awk
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*gappletviewer
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*gkeytool
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*gserialver
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*gtnameserv
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*gnative2ascii
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*gc-analyze
+PKGFILES_CSWgcc4java  = $(bindir)/.*gcj.*$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*jv-scan$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*jv-convert$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*jcf-dump$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*grmi.*$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*grepjar$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*gjnih$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*gij$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*fastjar$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*gjar.*$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*gjavah$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*gorbd$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*addr2name.awk$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*gappletviewer$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*gkeytool$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*gserialver$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*gtnameserv$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*gnative2ascii$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*gc-analyze$(PROGRAM_SUFFIX)
 PKGFILES_CSWgcc4java += $(mandir)/.*/gcj.*
 PKGFILES_CSWgcc4java += $(mandir)/.*/gij.*
 PKGFILES_CSWgcc4java += $(mandir)/.*/jv.*

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


From j_arndt at users.sourceforge.net  Mon Aug 29 19:13:07 2011
From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net)
Date: Mon, 29 Aug 2011 17:13:07 +0000
Subject: [csw-devel] SF.net SVN: gar:[15462]
	csw/mgar/pkg/nagios/trunk/Makefile
Message-ID: 

Revision: 15462
          http://gar.svn.sourceforge.net/gar/?rev=15462&view=rev
Author:   j_arndt
Date:     2011-08-29 17:13:07 +0000 (Mon, 29 Aug 2011)
Log Message:
-----------
nagios: dependencies corrected

Modified Paths:
--------------
    csw/mgar/pkg/nagios/trunk/Makefile

Modified: csw/mgar/pkg/nagios/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nagios/trunk/Makefile	2011-08-29 15:14:10 UTC (rev 15461)
+++ csw/mgar/pkg/nagios/trunk/Makefile	2011-08-29 17:13:07 UTC (rev 15462)
@@ -30,9 +30,6 @@
 RUNTIME_DEP_PKGS_CSWnagios += CSWosslrt CSWperl CSWpng CSWzlib CSWnagiosp CSWap2modphp5 CSWbdb
 RUNTIME_DEP_PKGS_CSWnagios += CSWcswclassutils 
 RUNTIME_DEP_PKGS_CSWnagios += CSWlibgd2
-RUNTIME_DEP_PKGS_CSWnagios += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWnagios += CSWlibpng12-0
-RUNTIME_DEP_PKGS_CSWnagios += CSWlibz1
 
 LICENSE = LICENSE
 
@@ -144,9 +141,6 @@
 CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/configobject.html
 CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/etc/templates/CSWnagios/etc/opt/csw/nagios/nagios.cfg
 CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/etc/templates/CSWnagios/etc/opt/csw/nagios/cgi.cfg
-CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWpng
-CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWzlib
-CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWiconv
 
 #
 # yes, we need this dependencies

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


From j_arndt at users.sourceforge.net  Mon Aug 29 20:49:31 2011
From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net)
Date: Mon, 29 Aug 2011 18:49:31 +0000
Subject: [csw-devel] SF.net SVN: gar:[15463]
	csw/mgar/pkg/nagios/trunk/Makefile
Message-ID: 

Revision: 15463
          http://gar.svn.sourceforge.net/gar/?rev=15463&view=rev
Author:   j_arndt
Date:     2011-08-29 18:49:30 +0000 (Mon, 29 Aug 2011)
Log Message:
-----------
nagios: dependencies corrected for opencsw-future

Modified Paths:
--------------
    csw/mgar/pkg/nagios/trunk/Makefile

Modified: csw/mgar/pkg/nagios/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nagios/trunk/Makefile	2011-08-29 17:13:07 UTC (rev 15462)
+++ csw/mgar/pkg/nagios/trunk/Makefile	2011-08-29 18:49:30 UTC (rev 15463)
@@ -26,10 +26,13 @@
 PACKAGING_PLATFORMS = solaris9-sparc
 PACKAGING_PLATFORMS += solaris9-i386
 
-RUNTIME_DEP_PKGS_CSWnagios  = CSWapache2 CSWgd CSWglib2 CSWiconv CSWjpeg CSWlibtoolrt CSWggettextrt
-RUNTIME_DEP_PKGS_CSWnagios += CSWosslrt CSWperl CSWpng CSWzlib CSWnagiosp CSWap2modphp5 CSWbdb
+RUNTIME_DEP_PKGS_CSWnagios  = CSWapache2 CSWgd CSWglib2 CSWjpeg CSWlibtoolrt CSWggettextrt
+RUNTIME_DEP_PKGS_CSWnagios += CSWosslrt CSWperl CSWnagiosp CSWap2modphp5 CSWbdb
 RUNTIME_DEP_PKGS_CSWnagios += CSWcswclassutils 
 RUNTIME_DEP_PKGS_CSWnagios += CSWlibgd2
+RUNTIME_DEP_PKGS_CSWnagios += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWnagios += CSWlibpng12-0
+RUNTIME_DEP_PKGS_CSWnagios += CSWlibz1
 
 LICENSE = LICENSE
 
@@ -156,7 +159,6 @@
 CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWbdb
 CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWosslrt
 
-
 include gar/category.mk
 
 DOCS        = Changelog INSTALLING README UPGRADING

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


From bwalton at opencsw.org  Tue Aug 30 02:58:17 2011
From: bwalton at opencsw.org (Ben Walton)
Date: Mon, 29 Aug 2011 20:58:17 -0400
Subject: [csw-devel] psuedo sketch of web and mantis automation
In-Reply-To: <1313802712-sup-5904@pinkfloyd.chass.utoronto.ca>
References: <1313717595-sup-109@pinkfloyd.chass.utoronto.ca>
	
	<1313802712-sup-5904@pinkfloyd.chass.utoronto.ca>
Message-ID: <1314665791-sup-1083@pinkfloyd.chass.utoronto.ca>

Excerpts from Ben Walton's message of Fri Aug 19 21:30:46 -0400 2011:
> Excerpts from Maciej Blizi?ski's message of Fri Aug 19 07:34:55 -0400 2011:
> 
> > 1. Both pkgname and catalogname change, e.g. CSWfoodev/foodev ?
> > CSWfoo-dev/foo_dev
> > 2. Only the catalogname changes (CSWfoo-dev/foodev ? >
> > CSWfoo-dev/foo_dev)
> 
> As far as the catalog diff engine is concerned, both of these are the
> same.  They'll appear as the drop of one package and the addition of a
> new one.  The special case of _stub packages is handled in the pseudo
> code.  The general case would require doing a reverse index of package
> names.  The _stub handling rename detection could be extended to:

I've already written tests that catch the first one case as an error,
but I think the second should be too.  Although it's less harmful to
the users, a catalog name change should be banned unless it's an
explicit action (done with a manual script/tool instead of via
automation).

Agreed?

Thanks
-Ben
--
Ben Walton
Systems Programmer - CHASS
University of Toronto
C:416.407.5610 | W:416.978.4302


From maciej at opencsw.org  Tue Aug 30 09:57:29 2011
From: maciej at opencsw.org (=?UTF-8?Q?Maciej_Blizi=C5=84ski?=)
Date: Tue, 30 Aug 2011 08:57:29 +0100
Subject: [csw-devel] psuedo sketch of web and mantis automation
In-Reply-To: <1314665791-sup-1083@pinkfloyd.chass.utoronto.ca>
References: <1313717595-sup-109@pinkfloyd.chass.utoronto.ca>
	
	<1313802712-sup-5904@pinkfloyd.chass.utoronto.ca>
	<1314665791-sup-1083@pinkfloyd.chass.utoronto.ca>
Message-ID: 

2011/8/30 Ben Walton :
> I've already written tests that catch the first one case as an error,
> but I think the second should be too. ?Although it's less harmful to
> the users, a catalog name change should be banned unless it's an
> explicit action (done with a manual script/tool instead of via
> automation).
>
> Agreed?

Yes.  Will there be some form of alert when this is attempted?

Maciej

From bwalton at opencsw.org  Tue Aug 30 12:23:52 2011
From: bwalton at opencsw.org (Ben Walton)
Date: Tue, 30 Aug 2011 06:23:52 -0400
Subject: [csw-devel] psuedo sketch of web and mantis automation
In-Reply-To: 
References: <1313717595-sup-109@pinkfloyd.chass.utoronto.ca>
	
	<1313802712-sup-5904@pinkfloyd.chass.utoronto.ca>
	<1314665791-sup-1083@pinkfloyd.chass.utoronto.ca>
	
Message-ID: <834b6f30-be1a-4e41-8213-9f855a7131c1@email.android.com>

The plan is that this will halt the assembly line. Some (not sure who) will get mail.

Thanks
-Ben

"Maciej Blizi?ski"  wrote:

2011/8/30 Ben Walton :
> I've already written tests that catch the first one case as an error,
> but I think the second should be too.  Although it's less harmful to
> the users, a catalog name change should be banned unless it's an
> explicit action (done with a manual script/tool instead of via
> automation).
>
> Agreed?

Yes. Will there be some form of alert when this is attempted?

Maciej

-------------- next part --------------
An HTML attachment was scrubbed...
URL: 

From wahwah at users.sourceforge.net  Tue Aug 30 13:56:13 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 30 Aug 2011 11:56:13 +0000
Subject: [csw-devel] SF.net SVN: gar:[15464]
	csw/mgar/pkg/libgcrypt/trunk/Makefile
Message-ID: 

Revision: 15464
          http://gar.svn.sourceforge.net/gar/?rev=15464&view=rev
Author:   wahwah
Date:     2011-08-30 11:56:13 +0000 (Tue, 30 Aug 2011)
Log Message:
-----------
pkg/libgcrypt/trunk: Depends on CSWlibgpg-error-dev

Modified Paths:
--------------
    csw/mgar/pkg/libgcrypt/trunk/Makefile

Modified: csw/mgar/pkg/libgcrypt/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libgcrypt/trunk/Makefile	2011-08-29 18:49:30 UTC (rev 15463)
+++ csw/mgar/pkg/libgcrypt/trunk/Makefile	2011-08-30 11:56:13 UTC (rev 15464)
@@ -12,6 +12,8 @@
 
 VENDOR_URL = http://www.gnupg.org/related_software/libraries.en.html#lib-libgcrypt
 
+BUILD_DEP_PKGS = CSWlibgpg-error-dev
+
 PACKAGES += CSWlibgcrypt11
 SPKG_DESC_CSWlibgcrypt11 = GNU libgcrypt, libgcrypt.so.11
 PKGFILES_CSWlibgcrypt11 += $(call pkgfiles_lib,libgcrypt.so.11)
@@ -21,6 +23,7 @@
 SPKG_DESC_CSWlibgcrypt-dev = Development files for libgcrypt.so.11
 PKGFILES_CSWlibgcrypt-dev += $(PKGFILES_DEVEL)
 RUNTIME_DEP_PKGS_CSWlibgcrypt-dev += CSWlibgcrypt11
+RUNTIME_DEP_PKGS_CSWlibgcrypt-dev += $(BUILD_DEP_PKGS)
 
 PACKAGES += CSWlibgcrypt-utils
 SPKG_DESC_CSWlibgcrypt-utils = Utility programs for libgcrypt

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


From wahwah at users.sourceforge.net  Tue Aug 30 17:56:37 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 30 Aug 2011 15:56:37 +0000
Subject: [csw-devel] SF.net SVN: gar:[15465] csw/mgar/pkg/cups/trunk
Message-ID: 

Revision: 15465
          http://gar.svn.sourceforge.net/gar/?rev=15465&view=rev
Author:   wahwah
Date:     2011-08-30 15:56:37 +0000 (Tue, 30 Aug 2011)
Log Message:
-----------
pkg/cups/trunk: upgrade to 1.5.0

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

Added Paths:
-----------
    csw/mgar/pkg/cups/trunk/files/0001-cswcups-for-the-service-name.patch

Removed Paths:
-------------
    csw/mgar/pkg/cups/trunk/files/0001-cswcups-for-service-name.patch

Modified: csw/mgar/pkg/cups/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cups/trunk/Makefile	2011-08-30 11:56:13 UTC (rev 15464)
+++ csw/mgar/pkg/cups/trunk/Makefile	2011-08-30 15:56:37 UTC (rev 15465)
@@ -3,7 +3,7 @@
 # $Id$
 
 NAME = cups
-VERSION = 1.4.5
+VERSION = 1.5.0
 CATEGORIES = net
 
 define BLURB
@@ -52,28 +52,32 @@
 DISTFILES += client.conf.CSW
 DISTFILES += CSWcupsclient.README
 
-PATCHFILES  = 0001-cswcups-for-service-name.patch
-PATCHFILES += 0002-Adding-the-refcount-member-to-mime_type_t.patch
-PATCHFILES += 0003-Reference-counting-for-printers-only.patch
-PATCHFILES += 0006-Fail-compilation-if-no-SSL-impl-chosen.patch
-PATCHFILES += 0007-Solaris-zone-support-in-init-script.patch
-PATCHFILES += CFLAGS-leaking-to-C++-compiler.patch
-PATCHFILES += 0008-Adding-CFLAGS-and-CXXFLAGS-to-linker-calls.patch
-PATCHFILES += 0009-Add-workaround-for-krb5-config-outputting-CFLAGS.patch
-PATCHFILES += 0009-giving-precedence-to-statvfs-in-printers.c.patch
+PATCHFILES += 0001-cswcups-for-the-service-name.patch
+# PATCHFILES  = 0001-cswcups-for-service-name.patch
+# PATCHFILES += 0002-Adding-the-refcount-member-to-mime_type_t.patch
+# PATCHFILES += 0003-Reference-counting-for-printers-only.patch
+# PATCHFILES += 0006-Fail-compilation-if-no-SSL-impl-chosen.patch
+# PATCHFILES += 0007-Solaris-zone-support-in-init-script.patch
+# PATCHFILES += CFLAGS-leaking-to-C++-compiler.patch
+# PATCHFILES += 0008-Adding-CFLAGS-and-CXXFLAGS-to-linker-calls.patch
+# PATCHFILES += 0009-Add-workaround-for-krb5-config-outputting-CFLAGS.patch
+# PATCHFILES += 0009-giving-precedence-to-statvfs-in-printers.c.patch
 
 BUILD_DEP_PKGS  = CSWggettext
 BUILD_DEP_PKGS += CSWjpeg
-BUILD_DEP_PKGS += CSWkrb5libdev
 BUILD_DEP_PKGS += CSWoldapdevel
 BUILD_DEP_PKGS += CSWossldevel
 BUILD_DEP_PKGS += CSWtiff
-BUILD_DEP_PKGS += CSWzlib
+BUILD_DEP_PKGS += CSWlibkrb5-dev
+BUILD_DEP_PKGS += CSWlibgcrypt-dev
+BUILD_DEP_PKGS += CSWlibgpg-error-dev
+BUILD_DEP_PKGS += CSWlibiconv-dev
 BUILD_DEP_PKGS += SUNWhea
 BUILD_DEP_PKGS += SUNWlibm
 BUILD_DEP_PKGS += SUNWslpu
 
 EXTRA_CXXFLAGS += -norunpath
+EXTRA_LINKER_FLAGS += -liconv
 
 # The main metapackage
 PACKAGES           += CSWcups
@@ -119,17 +123,23 @@
 PKGFILES_CSWcupsd += $(sysconfdir)/cups/snmp.*
 PKGFILES_CSWcupsd += $(sysconfdir)/cups/ssl.*
 PKGFILES_CSWcupsd += $(sysconfdir)/init\.d/.*
-RUNTIME_DEP_PKGS_CSWcupsd += CSWkrb5lib
+RUNTIME_DEP_PKGS_CSWcupsd += CSWlibcom-err3
 RUNTIME_DEP_PKGS_CSWcupsd += CSWlibcups2
 RUNTIME_DEP_PKGS_CSWcupsd += CSWlibcupscgi1
 RUNTIME_DEP_PKGS_CSWcupsd += CSWlibcupsdriver1
 RUNTIME_DEP_PKGS_CSWcupsd += CSWlibcupsimage2
 RUNTIME_DEP_PKGS_CSWcupsd += CSWlibcupsmime1
 RUNTIME_DEP_PKGS_CSWcupsd += CSWlibcupsppdc1
-RUNTIME_DEP_PKGS_CSWcupsd += CSWlibdbus
+RUNTIME_DEP_PKGS_CSWcupsd += CSWlibdbus1-3
+RUNTIME_DEP_PKGS_CSWcupsd += CSWlibgcrypt11
+RUNTIME_DEP_PKGS_CSWcupsd += CSWlibgnutls26
+RUNTIME_DEP_PKGS_CSWcupsd += CSWlibgpg-error0
+RUNTIME_DEP_PKGS_CSWcupsd += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWcupsd += CSWlibk5crypto3
+RUNTIME_DEP_PKGS_CSWcupsd += CSWlibkrb5-3
+RUNTIME_DEP_PKGS_CSWcupsd += CSWlibslp1
+RUNTIME_DEP_PKGS_CSWcupsd += CSWlibz1
 RUNTIME_DEP_PKGS_CSWcupsd += CSWoldaprt
-RUNTIME_DEP_PKGS_CSWcupsd += CSWosslrt
-RUNTIME_DEP_PKGS_CSWcupsd += CSWzlib
 EXTRA_MERGE_EXCLUDE_FILES +=  $(sysconfdir)/rc.*
 
 # http://lists.opencsw.org/pipermail/maintainers/2009-September/004249.html
@@ -142,6 +152,8 @@
 PKGFILES_CSWcupsclient += $(sbindir)/(lp(admin|p|c|info|move))
 PKGFILES_CSWcupsclient += $(bindir)/(cancel|cupstest(dsc|ppd))
 PKGFILES_CSWcupsclient += $(bindir)/(lp(|options|passwd|q|r|rm|stat))
+PKGFILES_CSWcupsclient += $(bindir)/ipptool
+PKGFILES_CSWcupsclient += $(mandir)/man1/ipptool.1
 PKGFILES_CSWcupsclient += $(mandir)/man1/(cancel|cupstest(dsc|ppd)|lp).1
 PKGFILES_CSWcupsclient += $(mandir)/man1/(lpoptions|lppasswd|lpq|lpr|lprm).1
 PKGFILES_CSWcupsclient += $(mandir)/man1/lpstat.1
@@ -155,10 +167,16 @@
 PKGFILES_CSWcupsclient += $(mandir)/man7/(drv|notifier)\.7
 PKGFILES_CSWcupsclient += $(sysconfdir)/cups/client\.conf\.CSW
 PKGFILES_CSWcupsclient += $(datadir)/doc/cupsclient.*
-RUNTIME_DEP_PKGS_CSWcupsclient += CSWosslrt
 RUNTIME_DEP_PKGS_CSWcupsclient += CSWlibcups2
-RUNTIME_DEP_PKGS_CSWcupsclient += CSWzlib
 RUNTIME_DEP_PKGS_CSWcupsclient += CSWlibcupsimage2
+RUNTIME_DEP_PKGS_CSWcupsclient += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWcupsclient += CSWlibgcrypt11
+RUNTIME_DEP_PKGS_CSWcupsclient += CSWlibz1
+RUNTIME_DEP_PKGS_CSWcupsclient += CSWlibgpg-error0
+RUNTIME_DEP_PKGS_CSWcupsclient += CSWlibcom-err3
+RUNTIME_DEP_PKGS_CSWcupsclient += CSWlibkrb5-3
+RUNTIME_DEP_PKGS_CSWcupsclient += CSWlibgnutls26
+RUNTIME_DEP_PKGS_CSWcupsclient += CSWlibk5crypto3
 
 PACKAGES += CSWcupsdoc
 CHECKPKG_OVERRIDES_CSWcupsdoc += file-with-bad-content
@@ -216,47 +234,82 @@
 CATALOGNAME_CSWlibcups2 = libcups2
 PKGFILES_CSWlibcups2 += $(call baseisadirs,$(libdir),libcups\.so\.2(\.\d+)*)
 SPKG_DESC_CSWlibcups2 += CUPS libraries, libcups.so.2
-RUNTIME_DEP_PKGS_CSWlibcups2 += CSWosslrt
-RUNTIME_DEP_PKGS_CSWlibcups2 += CSWzlib
+RUNTIME_DEP_PKGS_CSWlibcups2 += CSWlibcom-err3
+RUNTIME_DEP_PKGS_CSWlibcups2 += CSWlibgcrypt11
+RUNTIME_DEP_PKGS_CSWlibcups2 += CSWlibgnutls26
+RUNTIME_DEP_PKGS_CSWlibcups2 += CSWlibgpg-error0
+RUNTIME_DEP_PKGS_CSWlibcups2 += CSWlibk5crypto3
+RUNTIME_DEP_PKGS_CSWlibcups2 += CSWlibkrb5-3
+RUNTIME_DEP_PKGS_CSWlibcups2 += CSWlibz1
 
 PACKAGES += CSWlibcupscgi1
 CATALOGNAME_CSWlibcupscgi1 = libcupscgi1
 PKGFILES_CSWlibcupscgi1 += $(call baseisadirs,$(libdir),libcupscgi\.so\.1(\.\d+)*)
 SPKG_DESC_CSWlibcupscgi1 += CUPS libraries, libcupscgi.so.1
+RUNTIME_DEP_PKGS_CSWlibcupscgi1 += CSWlibcom-err3
 RUNTIME_DEP_PKGS_CSWlibcupscgi1 += CSWlibcups2
-RUNTIME_DEP_PKGS_CSWlibcupscgi1 += CSWosslrt
+RUNTIME_DEP_PKGS_CSWlibcupscgi1 += CSWlibgcrypt11
+RUNTIME_DEP_PKGS_CSWlibcupscgi1 += CSWlibgnutls26
+RUNTIME_DEP_PKGS_CSWlibcupscgi1 += CSWlibgpg-error0
+RUNTIME_DEP_PKGS_CSWlibcupscgi1 += CSWlibk5crypto3
+RUNTIME_DEP_PKGS_CSWlibcupscgi1 += CSWlibkrb5-3
+RUNTIME_DEP_PKGS_CSWlibcupscgi1 += CSWlibz1
 
 PACKAGES += CSWlibcupsdriver1
 CATALOGNAME_CSWlibcupsdriver1 = libcupsdriver1
 PKGFILES_CSWlibcupsdriver1 += $(call baseisadirs,$(libdir),libcupsdriver\.so\.1(\.\d+)*)
 SPKG_DESC_CSWlibcupsdriver1 += CUPS libraries, libcupsdriver.so.1
-RUNTIME_DEP_PKGS_CSWlibcupsdriver1 += CSWosslrt
 RUNTIME_DEP_PKGS_CSWlibcupsdriver1 += CSWlibcups2
+RUNTIME_DEP_PKGS_CSWlibcupsdriver1 += CSWlibgcrypt11
+RUNTIME_DEP_PKGS_CSWlibcupsdriver1 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibcupsdriver1 += CSWlibgpg-error0
+RUNTIME_DEP_PKGS_CSWlibcupsdriver1 += CSWlibcom-err3
+RUNTIME_DEP_PKGS_CSWlibcupsdriver1 += CSWlibkrb5-3
+RUNTIME_DEP_PKGS_CSWlibcupsdriver1 += CSWlibgnutls26
+RUNTIME_DEP_PKGS_CSWlibcupsdriver1 += CSWlibk5crypto3
 
 PACKAGES += CSWlibcupsimage2
 CATALOGNAME_CSWlibcupsimage2 = libcupsimage2
 PKGFILES_CSWlibcupsimage2 += $(call baseisadirs,$(libdir),libcupsimage\.so\.2(\.\d+)*)
 SPKG_DESC_CSWlibcupsimage2 += CUPS libraries, libcupsimage.so.2
+RUNTIME_DEP_PKGS_CSWlibcupsimage2 += CSWjpeg
+RUNTIME_DEP_PKGS_CSWlibcupsimage2 += CSWlibcom-err3
+RUNTIME_DEP_PKGS_CSWlibcupsimage2 += CSWlibcups2
+RUNTIME_DEP_PKGS_CSWlibcupsimage2 += CSWlibgcrypt11
+RUNTIME_DEP_PKGS_CSWlibcupsimage2 += CSWlibgnutls26
+RUNTIME_DEP_PKGS_CSWlibcupsimage2 += CSWlibgpg-error0
+RUNTIME_DEP_PKGS_CSWlibcupsimage2 += CSWlibk5crypto3
+RUNTIME_DEP_PKGS_CSWlibcupsimage2 += CSWlibkrb5-3
+RUNTIME_DEP_PKGS_CSWlibcupsimage2 += CSWlibpng12-0
+RUNTIME_DEP_PKGS_CSWlibcupsimage2 += CSWlibz1
 RUNTIME_DEP_PKGS_CSWlibcupsimage2 += CSWtiff
-RUNTIME_DEP_PKGS_CSWlibcupsimage2 += CSWlibcups2
-RUNTIME_DEP_PKGS_CSWlibcupsimage2 += CSWpng
-RUNTIME_DEP_PKGS_CSWlibcupsimage2 += CSWosslrt
-RUNTIME_DEP_PKGS_CSWlibcupsimage2 += CSWzlib
-RUNTIME_DEP_PKGS_CSWlibcupsimage2 += CSWjpeg
 
 PACKAGES += CSWlibcupsmime1
 CATALOGNAME_CSWlibcupsmime1 = libcupsmime1
 PKGFILES_CSWlibcupsmime1 += $(call baseisadirs,$(libdir),libcupsmime\.so\.1(\.\d+)*)
 SPKG_DESC_CSWlibcupsmime1 += CUPS libraries, libcupsmime.so.1
-RUNTIME_DEP_PKGS_CSWlibcupsmime1 += CSWosslrt
+RUNTIME_DEP_PKGS_CSWlibcupsmime1 += CSWlibcom-err3
 RUNTIME_DEP_PKGS_CSWlibcupsmime1 += CSWlibcups2
+RUNTIME_DEP_PKGS_CSWlibcupsmime1 += CSWlibgcrypt11
+RUNTIME_DEP_PKGS_CSWlibcupsmime1 += CSWlibgnutls26
+RUNTIME_DEP_PKGS_CSWlibcupsmime1 += CSWlibgpg-error0
+RUNTIME_DEP_PKGS_CSWlibcupsmime1 += CSWlibk5crypto3
+RUNTIME_DEP_PKGS_CSWlibcupsmime1 += CSWlibkrb5-3
+RUNTIME_DEP_PKGS_CSWlibcupsmime1 += CSWlibz1
 
 PACKAGES += CSWlibcupsppdc1
 CATALOGNAME_CSWlibcupsppdc1 = libcupsppdc1
 PKGFILES_CSWlibcupsppdc1 += $(call baseisadirs,$(libdir),libcupsppdc\.so\.1(\.\d+)*)
 SPKG_DESC_CSWlibcupsppdc1 += CUPS libraries, libcupsppdc.so.1
-RUNTIME_DEP_PKGS_CSWlibcupsppdc1 += CSWosslrt
 RUNTIME_DEP_PKGS_CSWlibcupsppdc1 += CSWlibcups2
+CHECKPKG_OVERRIDES_CSWlibcupsppdc1 += bad-rpath-entry
+RUNTIME_DEP_PKGS_CSWlibcupsppdc1 += CSWlibgcrypt11
+RUNTIME_DEP_PKGS_CSWlibcupsppdc1 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibcupsppdc1 += CSWlibgpg-error0
+RUNTIME_DEP_PKGS_CSWlibcupsppdc1 += CSWlibcom-err3
+RUNTIME_DEP_PKGS_CSWlibcupsppdc1 += CSWlibkrb5-3
+RUNTIME_DEP_PKGS_CSWlibcupsppdc1 += CSWlibgnutls26
+RUNTIME_DEP_PKGS_CSWlibcupsppdc1 += CSWlibk5crypto3
 
 # http://lists.opencsw.org/pipermail/maintainers/2009-September/004249.html
 SAMPLECONF_CSWcupsclient += $(sysconfdir)/cups/client\.conf\.CSW

Modified: csw/mgar/pkg/cups/trunk/checksums
===================================================================
--- csw/mgar/pkg/cups/trunk/checksums	2011-08-30 11:56:13 UTC (rev 15464)
+++ csw/mgar/pkg/cups/trunk/checksums	2011-08-30 15:56:37 UTC (rev 15465)
@@ -1 +1 @@
-50729f6fc46ba54223e0eaf5009f3419  cups-1.4.5-source.tar.bz2
+e54ed09ede2340fc3014913333520fe4  cups-1.5.0-source.tar.bz2

Deleted: csw/mgar/pkg/cups/trunk/files/0001-cswcups-for-service-name.patch
===================================================================
--- csw/mgar/pkg/cups/trunk/files/0001-cswcups-for-service-name.patch	2011-08-30 11:56:13 UTC (rev 15464)
+++ csw/mgar/pkg/cups/trunk/files/0001-cswcups-for-service-name.patch	2011-08-30 15:56:37 UTC (rev 15465)
@@ -1,72 +0,0 @@
-From 7ef5a09e7257782a5f8b4d9bcf681a399ef82996 Mon Sep 17 00:00:00 2001
-From: Super-User 
-Date: Wed, 9 Sep 2009 16:41:17 +0100
-Subject: [PATCH 1/3] cswcups for service name
-
----
- Makefile        |   12 ++++++------
- locale/Makefile |    3 ++-
- 2 files changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 91be6e5..a1ff6f8 100644
---- a/Makefile
-+++ b/Makefile
-@@ -178,18 +178,18 @@ install-data:
- 	if test "x$(INITDIR)" != x; then \
- 		echo Installing init scripts...; \
- 		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \
--		$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \
-+		$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cswcups; \
- 		for level in $(RCLEVELS); do \
- 			$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc$${level}.d; \
--			$(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc$${level}.d/S$(RCSTART)cups; \
-+			$(LN) ../init.d/cswcups $(BUILDROOT)$(INITDIR)/rc$${level}.d/S$(RCSTART)cups; \
- 			if test `uname` = HP-UX; then \
- 				level=`expr $$level - 1`; \
- 				$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc$${level}.d; \
- 			fi; \
--			$(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc$${level}.d/K$(RCSTOP)cups; \
-+			$(LN) ../init.d/cswcups $(BUILDROOT)$(INITDIR)/rc$${level}.d/K$(RCSTOP)cups; \
- 		done; \
- 		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \
--		$(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc0.d/K$(RCSTOP)cups; \
-+		$(LN) ../init.d/cswcups $(BUILDROOT)$(INITDIR)/rc0.d/K$(RCSTOP)cups; \
- 	fi
- 	if test "x$(INITDIR)" = x -a "x$(INITDDIR)" != x; then \
- 		$(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \
-@@ -227,7 +227,7 @@ install-data:
- 		$(INSTALL_DATA) init/cups-lpd $(BUILDROOT)$(XINETD)/cups-lpd; \
- 	fi
- 	if test "x$(MENUDIR)" != x; then \
--		echo Installing desktop menu...; \
-+		echo Installing desktop menu into $(BUILDROOT)$(MENUDIR)...; \
- 		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(MENUDIR); \
- 		$(INSTALL_DATA) desktop/cups.desktop $(BUILDROOT)$(MENUDIR); \
- 	fi
-@@ -290,7 +290,7 @@ uninstall:
- 	-$(RMDIR) $(BINDIR)
- 	echo Uninstalling startup script...
- 	if test "x$(INITDIR)" != x; then \
--		$(RM) $(BUILDROOT)$(INITDIR)/init.d/cups; \
-+		$(RM) $(BUILDROOT)$(INITDIR)/init.d/cswcups; \
- 		$(RMDIR) $(BUILDROOT)$(INITDIR)/init.d; \
- 		$(RM)  $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \
- 		$(RMDIR) $(BUILDROOT)$(INITDIR)/rc0.d; \
-diff --git a/locale/Makefile b/locale/Makefile
-index 6241b66..f76b8bc 100644
---- a/locale/Makefile
-+++ b/locale/Makefile
-@@ -75,7 +75,8 @@ install-languages:
- 	for loc in $(LANGUAGES) ; do \
- 		if test -f cups_$$loc.po; then \
- 			$(INSTALL_DIR) -m 755 $(LOCALEDIR)/$$loc ; \
--			$(INSTALL_DATA) cups_$$loc.po $(LOCALEDIR)/$$loc/cups_$$loc.po ; \
-+			$(INSTALL_DIR) -m 755 $(LOCALEDIR)/$$loc/LC_MESSAGES ; \
-+			$(INSTALL_DATA) cups_$$loc.po $(LOCALEDIR)/$$loc/LC_MESSAGES/cups_$$loc.po ; \
- 		fi ; \
- 	done
- 
--- 
-1.6.3.2
-

Added: csw/mgar/pkg/cups/trunk/files/0001-cswcups-for-the-service-name.patch
===================================================================
--- csw/mgar/pkg/cups/trunk/files/0001-cswcups-for-the-service-name.patch	                        (rev 0)
+++ csw/mgar/pkg/cups/trunk/files/0001-cswcups-for-the-service-name.patch	2011-08-30 15:56:37 UTC (rev 15465)
@@ -0,0 +1,48 @@
+From cbfd0de81191b4e5df8f2729886f743e173d5103 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski 
+Date: Tue, 30 Aug 2011 17:38:01 +0200
+Subject: [PATCH] cswcups for the service name
+
+---
+ scheduler/Makefile |   10 ++++++----
+ 1 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/scheduler/Makefile b/scheduler/Makefile
+index 18dc80c..9711b91 100644
+--- a/scheduler/Makefile
++++ b/scheduler/Makefile
+@@ -139,6 +139,8 @@ install:	all install-data install-headers install-libs install-exec
+ # Install data files...
+ #
+ 
++INITSCRIPT = cswcups
++
+ install-data:
+ 	echo Creating $(SERVERBIN)/driver...
+ 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/driver
+@@ -170,18 +172,18 @@ install-data:
+ 	if test "x$(INITDIR)" != x; then \
+ 		echo Installing init scripts...; \
+ 		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \
+-		$(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \
++		$(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/init.d/$(INITSCRIPT); \
+ 		for level in $(RCLEVELS); do \
+ 			$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc$${level}.d; \
+-			$(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc$${level}.d/S$(RCSTART)cups; \
++			$(LN) ../init.d/$(INITSCRIPT) $(BUILDROOT)$(INITDIR)/rc$${level}.d/S$(RCSTART)$(INITSCRIPT); \
+ 			if test `uname` = HP-UX; then \
+ 				level=`expr $$level - 1`; \
+ 				$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc$${level}.d; \
+ 			fi; \
+-			$(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc$${level}.d/K$(RCSTOP)cups; \
++			$(LN) ../init.d/$(INITSCRIPT) $(BUILDROOT)$(INITDIR)/rc$${level}.d/K$(RCSTOP)$(INITSCRIPT); \
+ 		done; \
+ 		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \
+-		$(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc0.d/K$(RCSTOP)cups; \
++		$(LN) ../init.d/$(INITSCRIPT) $(BUILDROOT)$(INITDIR)/rc0.d/K$(RCSTOP)$(INITSCRIPT); \
+ 	fi
+ 	if test "x$(INITDIR)" = x -a "x$(INITDDIR)" != x; then \
+ 		$(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \
+-- 
+1.7.6
+

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


From wahwah at users.sourceforge.net  Wed Aug 31 00:32:06 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 30 Aug 2011 22:32:06 +0000
Subject: [csw-devel] SF.net SVN: gar:[15466]
	csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile
Message-ID: 

Revision: 15466
          http://gar.svn.sourceforge.net/gar/?rev=15466&view=rev
Author:   wahwah
Date:     2011-08-30 22:32:06 +0000 (Tue, 30 Aug 2011)
Log Message:
-----------
pkg/gcc4/branches/opt-csw-prefix: alternatives support

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile

Modified: csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile	2011-08-30 15:56:37 UTC (rev 15465)
+++ csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile	2011-08-30 22:32:06 UTC (rev 15466)
@@ -151,14 +151,14 @@
 RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibssp0
 RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibz1
 RUNTIME_DEP_PKGS_CSWgcc4core += CSWpython
-RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibmpc2
-RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibobjc-gc3
-RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibobjc3
-RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibz1
-RUNTIME_DEP_PKGS_CSWlibgcj-tools12 += CSWlibz1
-RUNTIME_DEP_PKGS_CSWlibgcj12 += CSWlibz1
-RUNTIME_DEP_PKGS_CSWlibgij12 += CSWlibz1
 
+ALTERNATIVES_CSWgcc4core += cpp
+ALTERNATIVE_cpp = $(bindir)/cpp gcc $(bindir)/cpp$(PROGRAM_SUFFIX) 460
+ALTERNATIVES_CSWgcc4core += gcc
+ALTERNATIVE_gcc = $(bindir)/gcc gcc $(bindir)/gcc$(PROGRAM_SUFFIX) 460
+ALTERNATIVES_CSWgcc4core += gcov
+ALTERNATIVE_gcov = $(bindir)/gcov gcc $(bindir)/gcov$(PROGRAM_SUFFIX) 460
+
 # Because I can.
 CHECKPKG_OVERRIDES_CSWgcc4core += file-with-bad-content
 CHECKPKG_OVERRIDES_CSWgcc4g++ += file-with-bad-content
@@ -210,7 +210,7 @@
 PACKAGES += CSWlib-gnu-awt-xlib12
 CATALOGNAME_CSWlib-gnu-awt-xlib12 = lib_gnu_awt_xlib12
 PKGFILES_CSWlib-gnu-awt-xlib12 += $(call baseisadirs,$(libdir),lib-gnu-awt-xlib\.so\.12(\.\d+)*)
-SPKG_DESC_CSWlib-gnu-awt-xlib12 += The GNU Compiler Collection, lib-gnu-awt-xlib.so.12
+SPKG_DESC_CSWlib-gnu-awt-xlib12 += $(DESCRIPTION), lib-gnu-awt-xlib.so.12
 RUNTIME_DEP_PKGS_CSWgcc4 += CSWlib-gnu-awt-xlib12
 RUNTIME_DEP_PKGS_CSWlib-gnu-awt-xlib12 += CSWlibstdc++6
 RUNTIME_DEP_PKGS_CSWlib-gnu-awt-xlib12 += CSWlibgcc-s1
@@ -218,14 +218,14 @@
 PACKAGES += CSWlibffi4
 CATALOGNAME_CSWlibffi4 = libffi4
 PKGFILES_CSWlibffi4 += $(call baseisadirs,$(libdir),libffi\.so\.4(\.\d+)*)
-SPKG_DESC_CSWlibffi4 += The GNU Compiler Collection, libffi.so.4
+SPKG_DESC_CSWlibffi4 += $(DESCRIPTION), libffi.so.4
 RUNTIME_DEP_PKGS_CSWgcc4 += CSWlibffi4
 RUNTIME_DEP_PKGS_CSWlibffi4 += CSWlibgcc-s1
 
 PACKAGES += CSWlibgcc-s1
 CATALOGNAME_CSWlibgcc-s1 = libgcc_s1
 PKGFILES_CSWlibgcc-s1 += $(call baseisadirs,$(libdir),libgcc_s\.so\.1(\.\d+)*)
-SPKG_DESC_CSWlibgcc-s1 += The GNU Compiler Collection, libgcc_s.so.1
+SPKG_DESC_CSWlibgcc-s1 += $(DESCRIPTION), libgcc_s.so.1
 RUNTIME_DEP_PKGS_CSWgcc4 += CSWlibgcc-s1
 # For reference, the old CSWgcc3corert:
 # http://buildfarm.opencsw.org/pkgdb/srv4/1991387f2cb9f545b2a1b254b50638ef/
@@ -234,21 +234,23 @@
 PACKAGES += CSWlibgcj-tools12
 CATALOGNAME_CSWlibgcj-tools12 = libgcj_tools12
 PKGFILES_CSWlibgcj-tools12 += $(call baseisadirs,$(libdir),libgcj-tools\.so\.12(\.\d+)*)
-SPKG_DESC_CSWlibgcj-tools12 += The GNU Compiler Collection, libgcj-tools.so.12
+SPKG_DESC_CSWlibgcj-tools12 += $(DESCRIPTION), libgcj-tools.so.12
 RUNTIME_DEP_PKGS_CSWgcc4 += CSWlibgcj-tools12
+RUNTIME_DEP_PKGS_CSWlibgcj-tools12 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibgcj-tools12 += CSWlibgcj12
-RUNTIME_DEP_PKGS_CSWlibgcj-tools12 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibgcj-tools12 += CSWlibz1
 
 PACKAGES += CSWlibgcj12
 CATALOGNAME_CSWlibgcj12 = libgcj12
 PKGFILES_CSWlibgcj12 += $(call baseisadirs,$(libdir),libgcj\.so\.12(\.\d+)*)
-SPKG_DESC_CSWlibgcj12 += The GNU Compiler Collection, libgcj.so.12
+SPKG_DESC_CSWlibgcj12 += $(DESCRIPTION), libgcj.so.12
 RUNTIME_DEP_PKGS_CSWlibgcj12 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibgcj12 += CSWlibz1
 
 PACKAGES += CSWlibgfortran3
 CATALOGNAME_CSWlibgfortran3 = libgfortran3
 PKGFILES_CSWlibgfortran3 += $(call baseisadirs,$(libdir),libgfortran\.so\.3(\.\d+)*)
-SPKG_DESC_CSWlibgfortran3 += The GNU Compiler Collection, libgfortran.so.3
+SPKG_DESC_CSWlibgfortran3 += $(DESCRIPTION), libgfortran.so.3
 RUNTIME_DEP_PKGS_CSWgcc4 += CSWlibgfortran3
 RUNTIME_DEP_PKGS_CSWlibgfortran3 += CSWlibgcc-s1
 OBSOLETED_BY_CSWlibgfortran3 = CSWgcc4gfortranrt
@@ -256,38 +258,39 @@
 PACKAGES += CSWlibgij12
 CATALOGNAME_CSWlibgij12 = libgij12
 PKGFILES_CSWlibgij12 += $(call baseisadirs,$(libdir),libgij\.so\.12(\.\d+)*)
-SPKG_DESC_CSWlibgij12 += The GNU Compiler Collection, libgij.so.12
+SPKG_DESC_CSWlibgij12 += $(DESCRIPTION), libgij.so.12
+RUNTIME_DEP_PKGS_CSWlibgij12 += CSWlibz1
 
 PACKAGES += CSWlibgomp1
 CATALOGNAME_CSWlibgomp1 = libgomp1
 PKGFILES_CSWlibgomp1 += $(call baseisadirs,$(libdir),libgomp\.so\.1(\.\d+)*)
-SPKG_DESC_CSWlibgomp1 += The GNU Compiler Collection, libgomp.so.1
+SPKG_DESC_CSWlibgomp1 += $(DESCRIPTION), libgomp.so.1
 RUNTIME_DEP_PKGS_CSWlibgomp1 += CSWlibgcc-s1
 OBSOLETED_BY_CSWlibgomp1 += CSWgcc4corert
 
 PACKAGES += CSWlibobjc3
 CATALOGNAME_CSWlibobjc3 = libobjc3
 PKGFILES_CSWlibobjc3 += $(call baseisadirs,$(libdir),libobjc\.so\.3(\.\d+)*)
-SPKG_DESC_CSWlibobjc3 += The GNU Compiler Collection, libobjc.so.3
+SPKG_DESC_CSWlibobjc3 += $(DESCRIPTION), libobjc.so.3
 RUNTIME_DEP_PKGS_CSWlibobjc3 += CSWlibgcc-s1
 
 PACKAGES += CSWlibobjc-gc3
 CATALOGNAME_CSWlibobjc-gc3 = libobjc_gc3
 PKGFILES_CSWlibobjc-gc3 += $(call baseisadirs,$(libdir),libobjc_gc\.so\.3(\.\d+)*)
-SPKG_DESC_CSWlibobjc-gc3 += The GNU Compiler Collection, libobjc_gc.so.3
+SPKG_DESC_CSWlibobjc-gc3 += $(DESCRIPTION), libobjc_gc.so.3
 RUNTIME_DEP_PKGS_CSWlibobjc-gc3 += CSWlibgcc-s1
 
 PACKAGES += CSWlibssp0
 CATALOGNAME_CSWlibssp0 = libssp0
 PKGFILES_CSWlibssp0 += $(call baseisadirs,$(libdir),libssp\.so\.0(\.\d+)*)
-SPKG_DESC_CSWlibssp0 += The GNU Compiler Collection, libssp.so.0
+SPKG_DESC_CSWlibssp0 += $(DESCRIPTION), libssp.so.0
 RUNTIME_DEP_PKGS_CSWlibssp0 += CSWlibgcc-s1
 OBSOLETED_BY_CSWlibssp0 += CSWgcc4corert
 
 PACKAGES += CSWlibstdc++6
 CATALOGNAME_CSWlibstdc++6 = libstdc++6
 PKGFILES_CSWlibstdc++6 += $(call baseisadirs,$(libdir),libstdc\+\+\.so\.6(\.\d+)*)
-SPKG_DESC_CSWlibstdc++6 += The GNU Compiler Collection, libstdc++.so.6
+SPKG_DESC_CSWlibstdc++6 += $(DESCRIPTION), libstdc++.so.6
 RUNTIME_DEP_PKGS_CSWlibstdc++6 += CSWlibgcc-s1
 OBSOLETED_BY_CSWlibstdc++6 = CSWgcc4g++rt
 
@@ -321,6 +324,8 @@
 RUNTIME_DEP_PKGS_CSWgcc4g++ += CSWlibmpfr4
 RUNTIME_DEP_PKGS_CSWgcc4g++ += CSWlibstdc++6
 RUNTIME_DEP_PKGS_CSWgcc4g++ += CSWlibz1
+ALTERNATIVES_CSWgcc4g++ += g++
+ALTERNATIVE_g++ = $(bindir)/g++ gcc $(bindir)/g++$(PROGRAM_SUFFIX) 460
 
 OBSOLETED_BY_CSWlibgcc-s1 += CSWgcc4corert
 RUNTIME_DEP_PKGS_CSWlibgij12 += CSWlibgcc-s1
@@ -343,6 +348,8 @@
 PKGFILES_CSWgcc4gfortran += $(call baseisadirs,$(libdir),libgfortran\.so)
 OBSOLETED_BY_CSWgcc4gfortran  = CSWgcc4g95
 OBSOLETED_BY_CSWgcc4gfortran += CSWgcc4g95rt
+ALTERNATIVES_CSWgcc4gfortran += gfortran
+ALTERNATIVE_gfortran = $(bindir)/gfortran gcc $(bindir)/gfortran$(PROGRAM_SUFFIX) 460
 
 PACKAGES += CSWgcc4java
 CATALOGNAME_CSWgcc4java       = gcc4java
@@ -410,6 +417,43 @@
 PKGFILES_CSWgcc4java += $(includedir)/.*ffi.h
 PKGFILES_CSWgcc4java += $(includedir)/.*org/.*
 
+ALTERNATIVES_CSWgcc4java += gappletviewer
+ALTERNATIVE_gappletviewer = $(bindir)/gappletviewer gcc $(bindir)/gappletviewer-4.6 460
+ALTERNATIVES_CSWgcc4java += gc-analyze
+ALTERNATIVE_gc-analyze = $(bindir)/gc-analyze gcc $(bindir)/gc-analyze-4.6 460
+ALTERNATIVES_CSWgcc4java += gcj-dbtool
+ALTERNATIVE_gcj-dbtool = $(bindir)/gcj-dbtool gcc $(bindir)/gcj-dbtool-4.6 460
+ALTERNATIVES_CSWgcc4java += gcjh
+ALTERNATIVE_gcjh = $(bindir)/gcjh gcc $(bindir)/gcjh-4.6 460
+ALTERNATIVES_CSWgcc4java += gjar
+ALTERNATIVE_gjar = $(bindir)/gjar gcc $(bindir)/gjar-4.6 460
+ALTERNATIVES_CSWgcc4java += gjarsigner
+ALTERNATIVE_gjarsigner = $(bindir)/gjarsigner gcc $(bindir)/gjarsigner-4.6 460
+ALTERNATIVES_CSWgcc4java += gjavah
+ALTERNATIVE_gjavah = $(bindir)/gjavah gcc $(bindir)/gjavah-4.6 460
+ALTERNATIVES_CSWgcc4java += gkeytool
+ALTERNATIVE_gkeytool = $(bindir)/gkeytool gcc $(bindir)/gkeytool-4.6 460
+ALTERNATIVES_CSWgcc4java += gnative2ascii
+ALTERNATIVE_gnative2ascii = $(bindir)/gnative2ascii gcc $(bindir)/gnative2ascii-4.6 460
+ALTERNATIVES_CSWgcc4java += gorbd
+ALTERNATIVE_gorbd = $(bindir)/gorbd gcc $(bindir)/gorbd-4.6 460
+ALTERNATIVES_CSWgcc4java += grmic
+ALTERNATIVE_grmic = $(bindir)/grmic gcc $(bindir)/grmic-4.6 460
+ALTERNATIVES_CSWgcc4java += grmid
+ALTERNATIVE_grmid = $(bindir)/grmid gcc $(bindir)/grmid-4.6 460
+ALTERNATIVES_CSWgcc4java += grmregistry
+ALTERNATIVE_grmregistry = $(bindir)/grmregistry gcc $(bindir)/grmregistry-4.6 460
+ALTERNATIVES_CSWgcc4java += gserialver
+ALTERNATIVE_gserialver = $(bindir)/gserialver gcc $(bindir)/gserialver-4.6 460
+ALTERNATIVES_CSWgcc4java += gtnameserv
+ALTERNATIVE_gtnameserv = $(bindir)/gtnameserv gcc $(bindir)/gtnameserv-4.6 460
+ALTERNATIVES_CSWgcc4java += jcf-dump
+ALTERNATIVE_jcf-dump = $(bindir)/jcf-dump gcc $(bindir)/jcf-dump-4.6 460
+ALTERNATIVES_CSWgcc4java += jv-convert
+ALTERNATIVE_jv-convert = $(bindir)/jv-convert gcc $(bindir)/jv-convert-4.6 460
+ALTERNATIVES_CSWgcc4java += rebuild-gcj-db
+ALTERNATIVE_rebuild-gcj-db = $(bindir)/rebuild-gcj-db gcc $(bindir)/rebuild-gcj-db-4.6 460
+
 PACKAGES += CSWgcc4objc
 CATALOGNAME_CSWgcc4objc       = gcc4objc
 SPKG_DESC_CSWgcc4objc       = GNU Objective C Compiler
@@ -419,8 +463,12 @@
 PKGFILES_CSWgcc4objc += $(libdir)/.*/include/objc/.*
 PKGFILES_CSWgcc4objc += $(call baseisadirs,$(libdir),libobjc.so)
 PKGFILES_CSWgcc4objc += $(call baseisadirs,$(libdir),libobjc_gc.so)
+RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibgmp10
+RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibmpc2
 RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibmpfr4
-RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibgmp10
+RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibobjc-gc3
+RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibobjc3
+RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibz1
 
 # libiconv deps cropped up relatively late in the porting process. Perhaps
 # they apply to all arch/OS combinations.

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 Aug 31 10:32:00 2011
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 31 Aug 2011 08:32:00 +0000
Subject: [csw-devel] SF.net SVN: gar:[15467]
	csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile
Message-ID: 

Revision: 15467
          http://gar.svn.sourceforge.net/gar/?rev=15467&view=rev
Author:   dmichelsen
Date:     2011-08-31 08:32:00 +0000 (Wed, 31 Aug 2011)
Log Message:
-----------
gcc4/branches/opt-csw-prefix: Fix alternatives

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile

Modified: csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile	2011-08-30 22:32:06 UTC (rev 15466)
+++ csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile	2011-08-31 08:32:00 UTC (rev 15467)
@@ -152,12 +152,10 @@
 RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibz1
 RUNTIME_DEP_PKGS_CSWgcc4core += CSWpython
 
-ALTERNATIVES_CSWgcc4core += cpp
-ALTERNATIVE_cpp = $(bindir)/cpp gcc $(bindir)/cpp$(PROGRAM_SUFFIX) 460
-ALTERNATIVES_CSWgcc4core += gcc
-ALTERNATIVE_gcc = $(bindir)/gcc gcc $(bindir)/gcc$(PROGRAM_SUFFIX) 460
-ALTERNATIVES_CSWgcc4core += gcov
-ALTERNATIVE_gcov = $(bindir)/gcov gcc $(bindir)/gcov$(PROGRAM_SUFFIX) 460
+ALTERNATIVES_CSWgcc4core += gcc4core
+ALTERNATIVE_gcc4core += $(bindir)/cpp gcc_core $(bindir)/cpp$(PROGRAM_SUFFIX) 460
+ALTERNATIVE_gcc4core += $(bindir)/gcc gcc_core $(bindir)/gcc$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4core += $(bindir)/gcov gcc_core $(bindir)/gcov$(PROGRAM_SUFFIX)
 
 # Because I can.
 CHECKPKG_OVERRIDES_CSWgcc4core += file-with-bad-content
@@ -324,9 +322,10 @@
 RUNTIME_DEP_PKGS_CSWgcc4g++ += CSWlibmpfr4
 RUNTIME_DEP_PKGS_CSWgcc4g++ += CSWlibstdc++6
 RUNTIME_DEP_PKGS_CSWgcc4g++ += CSWlibz1
-ALTERNATIVES_CSWgcc4g++ += g++
-ALTERNATIVE_g++ = $(bindir)/g++ gcc $(bindir)/g++$(PROGRAM_SUFFIX) 460
 
+ALTERNATIVES_CSWgcc4g++ += gcc4g++
+ALTERNATIVE_gcc4g++ += $(bindir)/g++ gcc_gplusplus $(bindir)/g++$(PROGRAM_SUFFIX) 460
+
 OBSOLETED_BY_CSWlibgcc-s1 += CSWgcc4corert
 RUNTIME_DEP_PKGS_CSWlibgij12 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibgij12 += CSWlibgcj12
@@ -348,8 +347,9 @@
 PKGFILES_CSWgcc4gfortran += $(call baseisadirs,$(libdir),libgfortran\.so)
 OBSOLETED_BY_CSWgcc4gfortran  = CSWgcc4g95
 OBSOLETED_BY_CSWgcc4gfortran += CSWgcc4g95rt
+
 ALTERNATIVES_CSWgcc4gfortran += gfortran
-ALTERNATIVE_gfortran = $(bindir)/gfortran gcc $(bindir)/gfortran$(PROGRAM_SUFFIX) 460
+ALTERNATIVE_gfortran += $(bindir)/gfortran gcc_gfortran $(bindir)/gfortran$(PROGRAM_SUFFIX) 460
 
 PACKAGES += CSWgcc4java
 CATALOGNAME_CSWgcc4java       = gcc4java
@@ -417,42 +417,25 @@
 PKGFILES_CSWgcc4java += $(includedir)/.*ffi.h
 PKGFILES_CSWgcc4java += $(includedir)/.*org/.*
 
-ALTERNATIVES_CSWgcc4java += gappletviewer
-ALTERNATIVE_gappletviewer = $(bindir)/gappletviewer gcc $(bindir)/gappletviewer-4.6 460
-ALTERNATIVES_CSWgcc4java += gc-analyze
-ALTERNATIVE_gc-analyze = $(bindir)/gc-analyze gcc $(bindir)/gc-analyze-4.6 460
-ALTERNATIVES_CSWgcc4java += gcj-dbtool
-ALTERNATIVE_gcj-dbtool = $(bindir)/gcj-dbtool gcc $(bindir)/gcj-dbtool-4.6 460
-ALTERNATIVES_CSWgcc4java += gcjh
-ALTERNATIVE_gcjh = $(bindir)/gcjh gcc $(bindir)/gcjh-4.6 460
-ALTERNATIVES_CSWgcc4java += gjar
-ALTERNATIVE_gjar = $(bindir)/gjar gcc $(bindir)/gjar-4.6 460
-ALTERNATIVES_CSWgcc4java += gjarsigner
-ALTERNATIVE_gjarsigner = $(bindir)/gjarsigner gcc $(bindir)/gjarsigner-4.6 460
-ALTERNATIVES_CSWgcc4java += gjavah
-ALTERNATIVE_gjavah = $(bindir)/gjavah gcc $(bindir)/gjavah-4.6 460
-ALTERNATIVES_CSWgcc4java += gkeytool
-ALTERNATIVE_gkeytool = $(bindir)/gkeytool gcc $(bindir)/gkeytool-4.6 460
-ALTERNATIVES_CSWgcc4java += gnative2ascii
-ALTERNATIVE_gnative2ascii = $(bindir)/gnative2ascii gcc $(bindir)/gnative2ascii-4.6 460
-ALTERNATIVES_CSWgcc4java += gorbd
-ALTERNATIVE_gorbd = $(bindir)/gorbd gcc $(bindir)/gorbd-4.6 460
-ALTERNATIVES_CSWgcc4java += grmic
-ALTERNATIVE_grmic = $(bindir)/grmic gcc $(bindir)/grmic-4.6 460
-ALTERNATIVES_CSWgcc4java += grmid
-ALTERNATIVE_grmid = $(bindir)/grmid gcc $(bindir)/grmid-4.6 460
-ALTERNATIVES_CSWgcc4java += grmregistry
-ALTERNATIVE_grmregistry = $(bindir)/grmregistry gcc $(bindir)/grmregistry-4.6 460
-ALTERNATIVES_CSWgcc4java += gserialver
-ALTERNATIVE_gserialver = $(bindir)/gserialver gcc $(bindir)/gserialver-4.6 460
-ALTERNATIVES_CSWgcc4java += gtnameserv
-ALTERNATIVE_gtnameserv = $(bindir)/gtnameserv gcc $(bindir)/gtnameserv-4.6 460
-ALTERNATIVES_CSWgcc4java += jcf-dump
-ALTERNATIVE_jcf-dump = $(bindir)/jcf-dump gcc $(bindir)/jcf-dump-4.6 460
-ALTERNATIVES_CSWgcc4java += jv-convert
-ALTERNATIVE_jv-convert = $(bindir)/jv-convert gcc $(bindir)/jv-convert-4.6 460
-ALTERNATIVES_CSWgcc4java += rebuild-gcj-db
-ALTERNATIVE_rebuild-gcj-db = $(bindir)/rebuild-gcj-db gcc $(bindir)/rebuild-gcj-db-4.6 460
+ALTERNATIVES_CSWgcc4java += gcc4java
+ALTERNATIVE_gcc4java += $(bindir)/gappletviewer gcc_gjava $(bindir)/gappletviewer$(PROGRAM_SUFFIX) 460
+ALTERNATIVE_gcc4java += $(bindir)/gc-analyze gcc_gjava $(bindir)/gc-analyze$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/gcj-dbtool gcc_gjava $(bindir)/gcj-dbtool$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/gcjh gcc_gjava $(bindir)/gcjh$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/gjar gcc_gjava $(bindir)/gjar$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/gjarsigner gcc_gjava $(bindir)/gjarsigner$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/gjavah gcc_gjava $(bindir)/gjavah$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/gkeytool gcc_gjava $(bindir)/gkeytool$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/gnative2ascii gcc_gjava $(bindir)/$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/gorbd gcc_gjava $(bindir)/gorbd$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/grmic gcc_gjava $(bindir)/grmic$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/grmid gcc_gjava $(bindir)/grmid$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/grmregistry gcc_gjava $(bindir)/grmregistry$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/gserialver gcc_gjava $(bindir)/gserialver$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/gtnameserv gcc_gjava $(bindir)/gtnameserv$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/jcf-dump gcc_gjava $(bindir)/jcf-dump$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/jv-convert gcc_gjava $(bindir)/jv-convert$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/rebuild-gcj-db gcc_gjava $(bindir)/rebuild-gcj-db$(PROGRAM_SUFFIX)
 
 PACKAGES += CSWgcc4objc
 CATALOGNAME_CSWgcc4objc       = gcc4objc

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


From wahwah at users.sourceforge.net  Wed Aug 31 10:34:47 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 31 Aug 2011 08:34:47 +0000
Subject: [csw-devel] SF.net SVN: gar:[15468]
	csw/mgar/pkg/mysql5/branches/mysql-5.0.x
Message-ID: 

Revision: 15468
          http://gar.svn.sourceforge.net/gar/?rev=15468&view=rev
Author:   wahwah
Date:     2011-08-31 08:34:47 +0000 (Wed, 31 Aug 2011)
Log Message:
-----------
pkg/mysql5/branches/mysql-5.0.x: work in progress, new version does not build

Modified Paths:
--------------
    csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile
    csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile	2011-08-31 08:32:00 UTC (rev 15467)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile	2011-08-31 08:34:47 UTC (rev 15468)
@@ -9,7 +9,7 @@
 PROJ_NAME = mysql
 NAME = $(PROJ_NAME)5
 BASE_VERSION = 5.0
-PATCHLEVEL = 87
+PATCHLEVEL = 92
 VERSION = $(BASE_VERSION).$(PATCHLEVEL)
 CATEGORIES = server
 
@@ -28,7 +28,7 @@
 # Change prefix to /opt/csw/$(NAME)
 prefix = /opt/csw/$(NAME)
 localstatedir = /var$(prefix)
-sysconfdir = /etc/opt/csw
+sysconfdir = /etc$(prefix)
 libdir = /opt/csw/lib
 includedir = /opt/csw/include
 
@@ -47,7 +47,7 @@
 # Where to link the binaries
 global_bindir = /opt/csw/bin
 
-INITSMF = $(global_sysconfdir)/init\.d/csw$(NAME)
+INITSMF = $(sysconfdir)/init\.d/csw$(NAME)
 
 PACKAGES += CSWlibmysqlclient15
 PKGFILES_CSWlibmysqlclient15 += $(call baseisadirs,$(libdir),libmysqlclient\.so\.15(\.\d+)*)
@@ -73,7 +73,7 @@
 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWzlib
 # Defining the client programs, which are going to pick up the 32- and 64-bit
 # binaries, symbolic links, isaexec stuff and man pages.
-CSW$(NAME)client_programs  = myisamlog
+CSW$(NAME)client_programs += myisamlog
 CSW$(NAME)client_programs += myisampack
 CSW$(NAME)client_programs += mysql
 CSW$(NAME)client_programs += mysqlaccess
@@ -114,6 +114,8 @@
 CATALOGNAME_CSW$(NAME)devel  = $(NAME)devel
 CATALOGNAME_CSW$(NAME)test   = $(NAME)test
 
+EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
+EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
 ARCHALL_CSW$(NAME)bench = 1
 ARCHALL_CSW$(NAME)test  = 1
 
@@ -138,20 +140,16 @@
 RUNTIME_DEP_PKGS_CSW$(NAME)test        = CSW$(NAME)
 RUNTIME_DEP_PKGS_CSW$(NAME)test       += CSWperl
 
-MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-$(BASE_VERSION)/
+MASTER_SITES = http://ftp.heanet.ie/mirrors/www.mysql.com/Downloads/MySQL-$(BASE_VERSION)/
 DISTFILES  = mysql-$(VERSION).tar.gz
 DISTFILES += csw$(NAME) quick_start-csw README.CSW ChangeLog
 DISTFILES += CSW$(NAME).preinstall
 DISTFILES += CSW$(NAME).postinstall
 DISTFILES += cswusergroup
 
-UFILES_REGEX = mysql-(\d+(?:\.\d+)*).tar.gz
-
 # TODO: Do the proper prerequsite pkgs.
 BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS)
 
-EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
-EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
 
 # Set ./configure options
 CONFIGURE_ARGS  = $(DIRPATHS)
@@ -167,7 +165,10 @@
 CONFIGURE_ARGS += --with-zlib-dir=/opt/csw
 CONFIGURE_ARGS += --with-ssl=/opt/csw
 CONFIGURE_ARGS += --with-plugins=max-no-ndb
-CONFIGURE_ARGS += --with-comment
+CONFIGURE_ARGS += --with-comment="(OpenCSW)"
+CONFIGURE_ARGS += --with-mysqld-user=mysql
+CONFIGURE_ARGS += --with-fast-mutexes
+CONFIGURE_ARGS += --with-libwrap
 CONFIGURE_ARGS += --with-mysqld-libs=-lmtmalloc
 CONFIGURE_ARGS += --with-big-tables
 CONFIGURE_ARGS += --enable-thread-safe-client
@@ -175,7 +176,9 @@
 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR))
 
 # TODO: Make the tests pass. They don't at the moment.
-TEST_SCRIPTS =
+SKIPTEST ?= 1
+TEST_SCRIPTS = custom
+TEST_TARGETS = check
 
 ALTERNATIVES_CSW$(NAME)client = mysql$(BASE_VERSION)
 ALTERNATIVE_mysql$(BASE_VERSION) = $(global_bindir)/$(firstword $(CSW$(NAME)client_programs)) mysql $(bindir)/$(firstword $(CSW$(NAME)client_programs)) 50
@@ -215,6 +218,62 @@
 CHECKPKG_OVERRIDES_CSWmysql5 += file-with-bad-content|/usr/local|root/opt/csw/mysql5/bin/i386/mysqlbug
 CHECKPKG_OVERRIDES_CSWmysql5 += file-with-bad-content|/usr/local|root/opt/csw/mysql5/bin/amd64/mysqlbug
 
+EXECUTABLES += comp_err
+EXECUTABLES += innochecksum
+EXECUTABLES += msql2mysql
+EXECUTABLES += my_print_defaults
+EXECUTABLES += myisam_ftdump
+EXECUTABLES += myisamchk
+EXECUTABLES += myisamlog
+EXECUTABLES += myisampack
+EXECUTABLES += mysql
+EXECUTABLES += mysql_client_test
+EXECUTABLES += mysql_config
+EXECUTABLES += mysql_convert_table_format
+EXECUTABLES += mysql_explain_log
+EXECUTABLES += mysql_find_rows
+EXECUTABLES += mysql_fix_extensions
+EXECUTABLES += mysql_fix_privilege_tables
+EXECUTABLES += mysql_install_db
+EXECUTABLES += mysql_secure_installation
+EXECUTABLES += mysql_setpermission
+EXECUTABLES += mysql_tableinfo
+EXECUTABLES += mysql_tzinfo_to_sql
+EXECUTABLES += mysql_upgrade
+EXECUTABLES += mysql_upgrade_shell
+EXECUTABLES += mysql_waitpid
+EXECUTABLES += mysql_zap
+EXECUTABLES += mysqlaccess
+EXECUTABLES += mysqladmin
+EXECUTABLES += mysqlbinlog
+EXECUTABLES += mysqlbug
+EXECUTABLES += mysqlcheck
+EXECUTABLES += mysqld_multi
+EXECUTABLES += mysqld_safe
+EXECUTABLES += mysqldump
+EXECUTABLES += mysqldumpslow
+EXECUTABLES += mysqlhotcopy
+EXECUTABLES += mysqlimport
+EXECUTABLES += mysqlshow
+EXECUTABLES += mysqltest
+EXECUTABLES += mysqltestmanager
+EXECUTABLES += mysqltestmanager-pwgen
+EXECUTABLES += mysqltestmanagerc
+EXECUTABLES += perror
+EXECUTABLES += replace
+EXECUTABLES += resolve_stack_dump
+EXECUTABLES += resolveip
+
+ALTERNATIVES = $(EXECUTABLES)
+
+# This list could be generated automatically from $(EXECUTABLES)
+
+
+# Collisions:
+# /opt/csw/share/mysql/doc/README.CSW
+
+ALTERNATIVES_CSW$(NAME) = 
+
 include gar/category.mk
 
 CFLAGS := $(filter-out -I%,$(CFLAGS))
@@ -236,16 +295,17 @@
 
 post-install-modulated:
 	(cd $(DESTDIR)$(libdir); gmv -v mysql/* .)
+	(cd $(DESTDIR)$(libdir); grmdir -v mysql)
 	@$(MAKECOOKIE)
 
 post-merge:
 	ginstall -m 755 -d $(PKGROOT)$(localstatedir)
-	ginstall -m 755 -d $(PKGROOT)$(datadir)/mysql/doc
-	ginstall -m 644 $(FILEDIR)/ChangeLog $(PKGROOT)$(datadir)/mysql/doc
-	ginstall -m 644 $(FILEDIR)/README.CSW $(PKGROOT)$(datadir)/mysql/doc
-	ginstall -m 755 -d $(PKGROOT)/opt/csw/share/mysql/doc
-	gln -sf ../../../$(NAME)/share/mysql/doc/README.CSW \
-		$(PKGROOT)/opt/csw/share/mysql/doc/README.CSW
+	ginstall -m 755 -d $(PKGROOT)$(datadir)/$(NAME)/doc
+	ginstall -m 644 $(FILEDIR)/ChangeLog $(PKGROOT)$(datadir)/$(NAME)/doc
+	ginstall -m 644 $(FILEDIR)/README.CSW $(PKGROOT)$(datadir)/$(NAME)/doc
+	ginstall -m 755 -d $(PKGROOT)/opt/csw/share/$(NAME)/doc
+	gln -sf ../../../$(NAME)/share/$(NAME)/doc/README.CSW \
+		$(PKGROOT)/opt/csw/share/$(NAME)/doc/README.CSW
 	ginstall -m 755 -d $(PKGROOT)$(sysconfdir)/init.d
 	ginstall -m 755 $(FILEDIR)/csw$(NAME) $(PKGROOT)$(sysconfdir)/init.d
 	ginstall -m 755 $(FILEDIR)/quick_start-csw $(PKGROOT)$(datadir)/mysql
@@ -266,3 +326,6 @@
 
 show-dirpaths:
 	echo $(DIRPATHS)
+
+# We need the GNU userland
+PATH := /opt/csw/gnu:$(PATH)

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums	2011-08-31 08:32:00 UTC (rev 15467)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums	2011-08-31 08:34:47 UTC (rev 15468)
@@ -1 +1 @@
-65e6229cc98b6a8d4c5206d7fe16c7be  mysql-5.0.87.tar.gz
+a72ee3d1d54bff74836de9500858a311  mysql-5.0.92.tar.gz

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


From wahwah at users.sourceforge.net  Wed Aug 31 15:51:54 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 31 Aug 2011 13:51:54 +0000
Subject: [csw-devel] SF.net SVN: gar:[15469] csw/mgar/pkg/ppl/trunk
Message-ID: 

Revision: 15469
          http://gar.svn.sourceforge.net/gar/?rev=15469&view=rev
Author:   wahwah
Date:     2011-08-31 13:51:54 +0000 (Wed, 31 Aug 2011)
Log Message:
-----------
pkg/ppl/trunk: add a patch

Modified Paths:
--------------
    csw/mgar/pkg/ppl/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/ppl/trunk/files/0003-Remove-a-const-arg-declaration.patch

Modified: csw/mgar/pkg/ppl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ppl/trunk/Makefile	2011-08-31 08:34:47 UTC (rev 15468)
+++ csw/mgar/pkg/ppl/trunk/Makefile	2011-08-31 13:51:54 UTC (rev 15469)
@@ -31,6 +31,7 @@
 
 PATCHFILES += 0001-R1-is-defined-in-usr-include-ia32-sys-reg.h-disturbi.patch
 PATCHFILES += 0002-Make-call-to-version-explicit-to-avoid-clash-with-ma.patch
+PATCHFILES += 0003-Remove-a-const-arg-declaration.patch
 
 VENDOR_URL = http://www.cs.unipr.it/ppl/
 

Added: csw/mgar/pkg/ppl/trunk/files/0003-Remove-a-const-arg-declaration.patch
===================================================================
--- csw/mgar/pkg/ppl/trunk/files/0003-Remove-a-const-arg-declaration.patch	                        (rev 0)
+++ csw/mgar/pkg/ppl/trunk/files/0003-Remove-a-const-arg-declaration.patch	2011-08-31 13:51:54 UTC (rev 15469)
@@ -0,0 +1,25 @@
+From e77ea81edab7f19845f0c202abf769227172830d Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski 
+Date: Wed, 31 Aug 2011 15:46:41 +0200
+Subject: [PATCH] Remove a const arg declaration
+
+---
+ Watchdog/src/Watchdog.cc |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Watchdog/src/Watchdog.cc b/Watchdog/src/Watchdog.cc
+index 42d57fa..f8b4e40 100644
+--- a/Watchdog/src/Watchdog.cc
++++ b/Watchdog/src/Watchdog.cc
+@@ -98,7 +98,7 @@ my_getitimer(int which, struct itimerval* value) {
+ 
+ void
+ my_setitimer(int which,
+-	     const struct itimerval* value, struct itimerval* ovalue) {
++	     struct itimerval* value, struct itimerval* ovalue) {
+   if (setitimer(which, value, ovalue) != 0)
+     throw_syscall_error("setitimer");
+ }
+-- 
+1.7.5.4
+

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


From wahwah at users.sourceforge.net  Wed Aug 31 18:29:00 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 31 Aug 2011 16:29:00 +0000
Subject: [csw-devel] SF.net SVN: gar:[15470] csw/mgar/pkg/gcc4/branches/gccgo
Message-ID: 

Revision: 15470
          http://gar.svn.sourceforge.net/gar/?rev=15470&view=rev
Author:   wahwah
Date:     2011-08-31 16:29:00 +0000 (Wed, 31 Aug 2011)
Log Message:
-----------
pkg/gcc4/branches/gccgo: merge in the main devel branch (opt-csw-prefix)

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/gccgo/Makefile

Property Changed:
----------------
    csw/mgar/pkg/gcc4/branches/gccgo/


Property changes on: csw/mgar/pkg/gcc4/branches/gccgo
___________________________________________________________________
Modified: svn:mergeinfo
   - /csw/mgar/pkg/gcc4/branches/bootstrap-4.6:15395-15421
   + /csw/mgar/pkg/gcc4/branches/bootstrap-4.6:15395-15435
/csw/mgar/pkg/gcc4/branches/opt-csw-prefix:15436-15469

Modified: csw/mgar/pkg/gcc4/branches/gccgo/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/gccgo/Makefile	2011-08-31 13:51:54 UTC (rev 15469)
+++ csw/mgar/pkg/gcc4/branches/gccgo/Makefile	2011-08-31 16:29:00 UTC (rev 15470)
@@ -10,6 +10,7 @@
 VERSION   = 4.7-20110820
 CATEGORIES   = lang
 GARTYPE = v2
+BASE_VERSION = $(shell echo $(VERSION) | gsed -e 's/^\([0-9]\+\.[0-9]\+\)\(.*\)/\1/')
 
 DESCRIPTION  = The GNU Compiler Collection
 define BLURB
@@ -34,21 +35,21 @@
 ## Copyright File
 LICENSE = COPYING3
 
-prefix = $(BUILD_PREFIX)/gcc4
-libdir_install = $(BUILD_PREFIX)/lib
-libdir = $(abspath $(BUILD_PREFIX)/lib/$(MM_LIBDIR))
+# prefix = $(BUILD_PREFIX)/gcc4
+# libdir_install = $(BUILD_PREFIX)/lib
+# libdir = $(abspath $(BUILD_PREFIX)/lib/$(MM_LIBDIR))
+# CONFIGURE_ARGS += --prefix=$(prefix)
+# CONFIGURE_ARGS += --libdir=$(libdir)
+# CONFIGURE_ARGS += --exec-prefix=$(BUILD_PREFIX)/gcc4
 
 ## build options
 # http://gcc.gnu.org/install/configure.html
 
 # Could be used to break out of the /opt/csw/gcc4 prefix
-# CONFIGURE_ARGS += --program-prefix=gcc4-
+PROGRAM_SUFFIX = -$(BASE_VERSION)
+CONFIGURE_ARGS += --program-suffix=$(PROGRAM_SUFFIX)
 
-CONFIGURE_ARGS += --prefix=$(prefix)
-CONFIGURE_ARGS += --libdir=$(libdir)
-# The theory is that DIRPATHS confuse the installer, e.g. includedir
-# CONFIGURE_ARGS += --includedir=$(prefix)/include
-CONFIGURE_ARGS += --exec-prefix=$(BUILD_PREFIX)/gcc4
+CONFIGURE_ARGS += $(DIRPATHS)
 CONFIGURE_ARGS += --with-gnu-as
 CONFIGURE_ARGS += --with-as=/opt/csw/bin/gas
 CONFIGURE_ARGS += --without-gnu-ld
@@ -83,6 +84,7 @@
 CPU_i386_64 = x86-64
 
 CONFIGURE_ARGS_sparc += --with-cpu=$(CPU_$(GARCH)_32)
+# These two should not be defined, otherwise the Intel build breaks.
 # CONFIGURE_ARGS_i386 += --with-cpu-32=$(CPU_$(GARCH)_32)
 # CONFIGURE_ARGS_i386 += --with-cpu-64=$(CPU_$(GARCH)_64)
 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARCH))
@@ -150,46 +152,51 @@
 RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibssp0
 RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibz1
 RUNTIME_DEP_PKGS_CSWgcc4core += CSWpython
-RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibmpc2
-RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibobjc-gc3
-RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibobjc3
-RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibz1
-RUNTIME_DEP_PKGS_CSWlibgcj-tools12 += CSWlibz1
-RUNTIME_DEP_PKGS_CSWlibgcj12 += CSWlibz1
-RUNTIME_DEP_PKGS_CSWlibgij12 += CSWlibz1
 
+ALTERNATIVES_CSWgcc4core += gcc4core
+ALTERNATIVE_gcc4core += $(bindir)/cpp gcc_core $(bindir)/cpp$(PROGRAM_SUFFIX) 460
+ALTERNATIVE_gcc4core += $(bindir)/gcc gcc_core $(bindir)/gcc$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4core += $(bindir)/gcov gcc_core $(bindir)/gcov$(PROGRAM_SUFFIX)
+
 # Because I can.
 CHECKPKG_OVERRIDES_CSWgcc4core += file-with-bad-content
 CHECKPKG_OVERRIDES_CSWgcc4g++ += file-with-bad-content
 CHECKPKG_OVERRIDES_CSWgcc4java += file-with-bad-content
 CHECKPKG_OVERRIDES_CSWlibgcj12 += file-with-bad-content
-CHECKPKG_OVERRIDES_CSWgcc4core += discouraged-path-in-pkgmap|/opt/csw/gcc4/libexec/gcc/i386-pc-solaris2.9/$(VERSION)/liblto_plugin.la
-CHECKPKG_OVERRIDES_CSWgcc4core += discouraged-path-in-pkgmap|/opt/csw/gcc4/libexec/gcc/sparc-sun-solaris2.9/$(VERSION)/liblto_plugin.la
-CHECKPKG_OVERRIDES_CSWgcc4core += discouraged-path-in-pkgmap|/opt/csw/gcc4/libexec/gcc/sparc-sun-solaris2.10/$(VERSION)/liblto_plugin.la
+CHECKPKG_OVERRIDES_CSWgcc4core += discouraged-path-in-pkgmap|$(libexecdir)/gcc/i386-pc-solaris2.9/$(VERSION)/liblto_plugin.la
+CHECKPKG_OVERRIDES_CSWgcc4core += discouraged-path-in-pkgmap|$(libexecdir)/gcc/sparc-sun-solaris2.9/$(VERSION)/liblto_plugin.la
+CHECKPKG_OVERRIDES_CSWgcc4core += discouraged-path-in-pkgmap|$(libexecdir)/gcc/sparc-sun-solaris2.10/$(VERSION)/liblto_plugin.la
 CHECKPKG_OVERRIDES_CSWgcc4objc += file-with-bad-content
 CHECKPKG_OVERRIDES_CSWgcc4gfortran += file-with-bad-content
 # Due to complex regular expressions
-CHECKPKG_OVERRIDES_CSWgcc4java += file-collision|/opt/csw/gcc4/include/c++/$(VERSION)/sun/awt/CausedFocusEvent.h|CSWgcc4g++|CSWgcc4java
-CHECKPKG_OVERRIDES_CSWgcc4g++ += file-collision|/opt/csw/gcc4/include/c++/$(VERSION)/sun/awt/CausedFocusEvent.h|CSWgcc4g++|CSWgcc4java
+CHECKPKG_OVERRIDES_CSWgcc4java += file-collision|$(includedir)/c++/$(VERSION)/sun/awt/CausedFocusEvent.h|CSWgcc4g++|CSWgcc4java
+CHECKPKG_OVERRIDES_CSWgcc4g++ += file-collision|$(includedir)/c++/$(VERSION)/sun/awt/CausedFocusEvent.h|CSWgcc4g++|CSWgcc4java
 
+# Only man pages, so not a big problem. Alternatives could be used, but it
+# requires rebuilding libffi.
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|$(mandir)/man3/ffi_call.3|CSWgcc4core|CSWlibffi-dev
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|$(mandir)/man3/ffi.3|CSWgcc4core|CSWlibffi-dev
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|$(mandir)/man3/ffi_prep_cif.3|CSWgcc4core|CSWlibffi-dev
+
 # The .a files are necessary
 CHECKPKG_OVERRIDES_CSWgcc4core += discouraged-path-in-pkgmap
 CHECKPKG_OVERRIDES_CSWgcc4objc += discouraged-path-in-pkgmap
 CHECKPKG_OVERRIDES_CSWgcc4java += discouraged-path-in-pkgmap
+
 CHECKPKG_OVERRIDES_CSWgcc4gfortran += discouraged-path-in-pkgmap
 
 # From the 'hopeless errors' department:
-CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/libffi.so|CSWgcc3javart|CSWgcc4core
-CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/libgcc_s.so|CSWgcc3core|CSWgcc4core
-CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/libgcj.so|CSWgcc3javart|CSWgcc4core
-CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/libobjc.so|CSWgcc3objcrt|CSWgcc4core
-CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/sparcv9/lib-gnu-awt-xlib.so|CSWgcc3javart|CSWgcc4core
-CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/sparcv9/libffi.so|CSWgcc3javart|CSWgcc4core
-CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/sparcv9/libgcj.so|CSWgcc3javart|CSWgcc4core
-CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/sparcv9/libobjc.so|CSWgcc3objcrt|CSWgcc4core
-CHECKPKG_OVERRIDES_CSWgcc4objc += file-collision|/opt/csw/lib/libobjc.so|CSWgcc3objcrt|CSWgcc4objc
-CHECKPKG_OVERRIDES_CSWgcc4objc += file-collision|/opt/csw/lib/sparcv9/libobjc.so|CSWgcc3objcrt|CSWgcc4objc
-CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/lib-gnu-awt-xlib.so|CSWgcc3javart|CSWgcc4core
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|$(libdir)/libffi.so|CSWgcc3javart|CSWgcc4core
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|$(libdir)/libgcc_s.so|CSWgcc3core|CSWgcc4core
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|$(libdir)/libgcj.so|CSWgcc3javart|CSWgcc4core
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|$(libdir)/libobjc.so|CSWgcc3objcrt|CSWgcc4core
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|$(libdir)/sparcv9/lib-gnu-awt-xlib.so|CSWgcc3javart|CSWgcc4core
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|$(libdir)/sparcv9/libffi.so|CSWgcc3javart|CSWgcc4core
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|$(libdir)/sparcv9/libgcj.so|CSWgcc3javart|CSWgcc4core
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|$(libdir)/sparcv9/libobjc.so|CSWgcc3objcrt|CSWgcc4core
+CHECKPKG_OVERRIDES_CSWgcc4objc += file-collision|$(libdir)/libobjc.so|CSWgcc3objcrt|CSWgcc4objc
+CHECKPKG_OVERRIDES_CSWgcc4objc += file-collision|$(libdir)/sparcv9/libobjc.so|CSWgcc3objcrt|CSWgcc4objc
+CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|$(libdir)/lib-gnu-awt-xlib.so|CSWgcc3javart|CSWgcc4core
 
 # Some static libraries are required to build binaries with gcc, for example
 # libgcc.a and libgcc_eh.a. Otherwise: ld: fatal: library -lgcc: not found
@@ -202,7 +209,7 @@
 PACKAGES += CSWlib-gnu-awt-xlib12
 CATALOGNAME_CSWlib-gnu-awt-xlib12 = lib_gnu_awt_xlib12
 PKGFILES_CSWlib-gnu-awt-xlib12 += $(call baseisadirs,$(libdir),lib-gnu-awt-xlib\.so\.12(\.\d+)*)
-SPKG_DESC_CSWlib-gnu-awt-xlib12 += The GNU Compiler Collection, lib-gnu-awt-xlib.so.12
+SPKG_DESC_CSWlib-gnu-awt-xlib12 += $(DESCRIPTION), lib-gnu-awt-xlib.so.12
 RUNTIME_DEP_PKGS_CSWgcc4 += CSWlib-gnu-awt-xlib12
 RUNTIME_DEP_PKGS_CSWlib-gnu-awt-xlib12 += CSWlibstdc++6
 RUNTIME_DEP_PKGS_CSWlib-gnu-awt-xlib12 += CSWlibgcc-s1
@@ -210,14 +217,14 @@
 PACKAGES += CSWlibffi4
 CATALOGNAME_CSWlibffi4 = libffi4
 PKGFILES_CSWlibffi4 += $(call baseisadirs,$(libdir),libffi\.so\.4(\.\d+)*)
-SPKG_DESC_CSWlibffi4 += The GNU Compiler Collection, libffi.so.4
+SPKG_DESC_CSWlibffi4 += $(DESCRIPTION), libffi.so.4
 RUNTIME_DEP_PKGS_CSWgcc4 += CSWlibffi4
 RUNTIME_DEP_PKGS_CSWlibffi4 += CSWlibgcc-s1
 
 PACKAGES += CSWlibgcc-s1
 CATALOGNAME_CSWlibgcc-s1 = libgcc_s1
 PKGFILES_CSWlibgcc-s1 += $(call baseisadirs,$(libdir),libgcc_s\.so\.1(\.\d+)*)
-SPKG_DESC_CSWlibgcc-s1 += The GNU Compiler Collection, libgcc_s.so.1
+SPKG_DESC_CSWlibgcc-s1 += $(DESCRIPTION), libgcc_s.so.1
 RUNTIME_DEP_PKGS_CSWgcc4 += CSWlibgcc-s1
 # For reference, the old CSWgcc3corert:
 # http://buildfarm.opencsw.org/pkgdb/srv4/1991387f2cb9f545b2a1b254b50638ef/
@@ -226,21 +233,23 @@
 PACKAGES += CSWlibgcj-tools12
 CATALOGNAME_CSWlibgcj-tools12 = libgcj_tools12
 PKGFILES_CSWlibgcj-tools12 += $(call baseisadirs,$(libdir),libgcj-tools\.so\.12(\.\d+)*)
-SPKG_DESC_CSWlibgcj-tools12 += The GNU Compiler Collection, libgcj-tools.so.12
+SPKG_DESC_CSWlibgcj-tools12 += $(DESCRIPTION), libgcj-tools.so.12
 RUNTIME_DEP_PKGS_CSWgcc4 += CSWlibgcj-tools12
+RUNTIME_DEP_PKGS_CSWlibgcj-tools12 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibgcj-tools12 += CSWlibgcj12
-RUNTIME_DEP_PKGS_CSWlibgcj-tools12 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibgcj-tools12 += CSWlibz1
 
 PACKAGES += CSWlibgcj12
 CATALOGNAME_CSWlibgcj12 = libgcj12
 PKGFILES_CSWlibgcj12 += $(call baseisadirs,$(libdir),libgcj\.so\.12(\.\d+)*)
-SPKG_DESC_CSWlibgcj12 += The GNU Compiler Collection, libgcj.so.12
+SPKG_DESC_CSWlibgcj12 += $(DESCRIPTION), libgcj.so.12
 RUNTIME_DEP_PKGS_CSWlibgcj12 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibgcj12 += CSWlibz1
 
 PACKAGES += CSWlibgfortran3
 CATALOGNAME_CSWlibgfortran3 = libgfortran3
 PKGFILES_CSWlibgfortran3 += $(call baseisadirs,$(libdir),libgfortran\.so\.3(\.\d+)*)
-SPKG_DESC_CSWlibgfortran3 += The GNU Compiler Collection, libgfortran.so.3
+SPKG_DESC_CSWlibgfortran3 += $(DESCRIPTION), libgfortran.so.3
 RUNTIME_DEP_PKGS_CSWgcc4 += CSWlibgfortran3
 RUNTIME_DEP_PKGS_CSWlibgfortran3 += CSWlibgcc-s1
 OBSOLETED_BY_CSWlibgfortran3 = CSWgcc4gfortranrt
@@ -248,38 +257,39 @@
 PACKAGES += CSWlibgij12
 CATALOGNAME_CSWlibgij12 = libgij12
 PKGFILES_CSWlibgij12 += $(call baseisadirs,$(libdir),libgij\.so\.12(\.\d+)*)
-SPKG_DESC_CSWlibgij12 += The GNU Compiler Collection, libgij.so.12
+SPKG_DESC_CSWlibgij12 += $(DESCRIPTION), libgij.so.12
+RUNTIME_DEP_PKGS_CSWlibgij12 += CSWlibz1
 
 PACKAGES += CSWlibgomp1
 CATALOGNAME_CSWlibgomp1 = libgomp1
 PKGFILES_CSWlibgomp1 += $(call baseisadirs,$(libdir),libgomp\.so\.1(\.\d+)*)
-SPKG_DESC_CSWlibgomp1 += The GNU Compiler Collection, libgomp.so.1
+SPKG_DESC_CSWlibgomp1 += $(DESCRIPTION), libgomp.so.1
 RUNTIME_DEP_PKGS_CSWlibgomp1 += CSWlibgcc-s1
 OBSOLETED_BY_CSWlibgomp1 += CSWgcc4corert
 
 PACKAGES += CSWlibobjc3
 CATALOGNAME_CSWlibobjc3 = libobjc3
 PKGFILES_CSWlibobjc3 += $(call baseisadirs,$(libdir),libobjc\.so\.3(\.\d+)*)
-SPKG_DESC_CSWlibobjc3 += The GNU Compiler Collection, libobjc.so.3
+SPKG_DESC_CSWlibobjc3 += $(DESCRIPTION), libobjc.so.3
 RUNTIME_DEP_PKGS_CSWlibobjc3 += CSWlibgcc-s1
 
 PACKAGES += CSWlibobjc-gc3
 CATALOGNAME_CSWlibobjc-gc3 = libobjc_gc3
 PKGFILES_CSWlibobjc-gc3 += $(call baseisadirs,$(libdir),libobjc_gc\.so\.3(\.\d+)*)
-SPKG_DESC_CSWlibobjc-gc3 += The GNU Compiler Collection, libobjc_gc.so.3
+SPKG_DESC_CSWlibobjc-gc3 += $(DESCRIPTION), libobjc_gc.so.3
 RUNTIME_DEP_PKGS_CSWlibobjc-gc3 += CSWlibgcc-s1
 
 PACKAGES += CSWlibssp0
 CATALOGNAME_CSWlibssp0 = libssp0
 PKGFILES_CSWlibssp0 += $(call baseisadirs,$(libdir),libssp\.so\.0(\.\d+)*)
-SPKG_DESC_CSWlibssp0 += The GNU Compiler Collection, libssp.so.0
+SPKG_DESC_CSWlibssp0 += $(DESCRIPTION), libssp.so.0
 RUNTIME_DEP_PKGS_CSWlibssp0 += CSWlibgcc-s1
 OBSOLETED_BY_CSWlibssp0 += CSWgcc4corert
 
 PACKAGES += CSWlibstdc++6
 CATALOGNAME_CSWlibstdc++6 = libstdc++6
 PKGFILES_CSWlibstdc++6 += $(call baseisadirs,$(libdir),libstdc\+\+\.so\.6(\.\d+)*)
-SPKG_DESC_CSWlibstdc++6 += The GNU Compiler Collection, libstdc++.so.6
+SPKG_DESC_CSWlibstdc++6 += $(DESCRIPTION), libstdc++.so.6
 RUNTIME_DEP_PKGS_CSWlibstdc++6 += CSWlibgcc-s1
 OBSOLETED_BY_CSWlibstdc++6 = CSWgcc4g++rt
 
@@ -299,8 +309,8 @@
 PACKAGES += CSWgcc4g++
 CATALOGNAME_CSWgcc4g++ = gcc4g++
 SPKG_DESC_CSWgcc4g++ = GNU C++ Compiler
-PKGFILES_CSWgcc4g++  = $(bindir)/[cg]\+\+
-PKGFILES_CSWgcc4g++ += $(bindir)/\w+-\w+-solaris[\d\.]+-[cg]\+\+
+PKGFILES_CSWgcc4g++  = $(bindir)/[cg]\+\+$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4g++ += $(bindir)/\w+-\w+-solaris[\d\.]+-[cg]\+\+$(PROGRAM_SUFFIX)
 PKGFILES_CSWgcc4g++ += $(libexecdir)/.*cc1plus
 PKGFILES_CSWgcc4g++ += $(libdir)/.*libstdc.*a
 PKGFILES_CSWgcc4g++ += $(call baseisadirs,$(libdir),libstdc\+\+\.so)
@@ -314,6 +324,9 @@
 RUNTIME_DEP_PKGS_CSWgcc4g++ += CSWlibstdc++6
 RUNTIME_DEP_PKGS_CSWgcc4g++ += CSWlibz1
 
+ALTERNATIVES_CSWgcc4g++ += gcc4g++
+ALTERNATIVE_gcc4g++ += $(bindir)/g++ gcc_gplusplus $(bindir)/g++$(PROGRAM_SUFFIX) 460
+
 OBSOLETED_BY_CSWlibgcc-s1 += CSWgcc4corert
 RUNTIME_DEP_PKGS_CSWlibgij12 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibgij12 += CSWlibgcj12
@@ -326,16 +339,19 @@
 RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibgfortran3
 RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibmpc2
 RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibz1
-PKGFILES_CSWgcc4gfortran  = $(bindir)/gfortran
-PKGFILES_CSWgcc4gfortran += $(bindir)/\w+-\w+-solaris[\d\.]+-gfortran
+PKGFILES_CSWgcc4gfortran  = $(bindir)/gfortran$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4gfortran += $(bindir)/\w+-\w+-solaris[\d\.]+-gfortran$(PROGRAM_SUFFIX)
 PKGFILES_CSWgcc4gfortran += $(libdir)/.*libgfortran.*a
 PKGFILES_CSWgcc4gfortran += $(libexecdir)/.*f951
 PKGFILES_CSWgcc4gfortran += $(mandir)/.*gfortran.1
-PKGFILES_CSWgcc4gfortran += .*/gcc4/info/gfortran.*
+PKGFILES_CSWgcc4gfortran += $(infodir)/gfortran.*
 PKGFILES_CSWgcc4gfortran += $(call baseisadirs,$(libdir),libgfortran\.so)
 OBSOLETED_BY_CSWgcc4gfortran  = CSWgcc4g95
 OBSOLETED_BY_CSWgcc4gfortran += CSWgcc4g95rt
 
+ALTERNATIVES_CSWgcc4gfortran += gfortran
+ALTERNATIVE_gfortran += $(bindir)/gfortran gcc_gfortran $(bindir)/gfortran$(PROGRAM_SUFFIX) 460
+
 PACKAGES += CSWgcc4java
 CATALOGNAME_CSWgcc4java       = gcc4java
 SPKG_DESC_CSWgcc4java       = GNU Java Compiler
@@ -348,25 +364,25 @@
 RUNTIME_DEP_PKGS_CSWgcc4java += CSWlibmpc2
 RUNTIME_DEP_PKGS_CSWgcc4java += CSWlibz1
 
-PKGFILES_CSWgcc4java  = $(bindir)/.*gcj.*
-PKGFILES_CSWgcc4java += $(bindir)/.*jv-scan
-PKGFILES_CSWgcc4java += $(bindir)/.*jv-convert
-PKGFILES_CSWgcc4java += $(bindir)/.*jcf-dump
-PKGFILES_CSWgcc4java += $(bindir)/.*grmi.*
-PKGFILES_CSWgcc4java += $(bindir)/.*grepjar
-PKGFILES_CSWgcc4java += $(bindir)/.*gjnih
-PKGFILES_CSWgcc4java += $(bindir)/.*gij
-PKGFILES_CSWgcc4java += $(bindir)/.*fastjar
-PKGFILES_CSWgcc4java += $(bindir)/.*gjar.*
-PKGFILES_CSWgcc4java += $(bindir)/.*gjavah
-PKGFILES_CSWgcc4java += $(bindir)/.*gorbd
-PKGFILES_CSWgcc4java += $(bindir)/.*addr2name.awk
-PKGFILES_CSWgcc4java += $(bindir)/.*gappletviewer
-PKGFILES_CSWgcc4java += $(bindir)/.*gkeytool
-PKGFILES_CSWgcc4java += $(bindir)/.*gserialver
-PKGFILES_CSWgcc4java += $(bindir)/.*gtnameserv
-PKGFILES_CSWgcc4java += $(bindir)/.*gnative2ascii
-PKGFILES_CSWgcc4java += $(bindir)/.*gc-analyze
+PKGFILES_CSWgcc4java  = $(bindir)/.*gcj.*$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*jv-scan$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*jv-convert$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*jcf-dump$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*grmi.*$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*grepjar$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*gjnih$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*gij$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*fastjar$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*gjar.*$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*gjavah$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*gorbd$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*addr2name.awk$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*gappletviewer$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*gkeytool$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*gserialver$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*gtnameserv$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*gnative2ascii$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*gc-analyze$(PROGRAM_SUFFIX)
 PKGFILES_CSWgcc4java += $(mandir)/.*/gcj.*
 PKGFILES_CSWgcc4java += $(mandir)/.*/gij.*
 PKGFILES_CSWgcc4java += $(mandir)/.*/jv.*
@@ -382,7 +398,7 @@
 PKGFILES_CSWgcc4java += $(mandir)/.*/gtnameserv.*
 PKGFILES_CSWgcc4java += $(mandir)/.*/gnative2ascii.*
 PKGFILES_CSWgcc4java += $(mandir)/.*/gc-analyze.*
-PKGFILES_CSWgcc4java += .*/gcc4/share/java/.*
+PKGFILES_CSWgcc4java += $(datadir)/java/.*
 PKGFILES_CSWgcc4java += $(libdir)/.*libgij.*a
 PKGFILES_CSWgcc4java += $(libdir)/.*libffi.*a
 PKGFILES_CSWgcc4java += $(libdir)/.*lib-gnu-awt.*a
@@ -394,7 +410,7 @@
 PKGFILES_CSWgcc4java += $(libexecdir)/.*collect.*
 PKGFILES_CSWgcc4java += $(libexecdir)/.*jvgenmain
 PKGFILES_CSWgcc4java += $(libexecdir)/.*jc1.*
-PKGFILES_CSWgcc4java += .*/gcc4/info/gcj.*
+PKGFILES_CSWgcc4java += $(infodir)/gcj.*
 PKGFILES_CSWgcc4java += $(includedir)/.*gcj/.*
 PKGFILES_CSWgcc4java += $(includedir)/.*awt/.*
 PKGFILES_CSWgcc4java += $(includedir)/.*classpath/.*
@@ -402,6 +418,26 @@
 PKGFILES_CSWgcc4java += $(includedir)/.*ffi.h
 PKGFILES_CSWgcc4java += $(includedir)/.*org/.*
 
+ALTERNATIVES_CSWgcc4java += gcc4java
+ALTERNATIVE_gcc4java += $(bindir)/gappletviewer gcc_gjava $(bindir)/gappletviewer$(PROGRAM_SUFFIX) 460
+ALTERNATIVE_gcc4java += $(bindir)/gc-analyze gcc_gjava $(bindir)/gc-analyze$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/gcj-dbtool gcc_gjava $(bindir)/gcj-dbtool$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/gcjh gcc_gjava $(bindir)/gcjh$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/gjar gcc_gjava $(bindir)/gjar$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/gjarsigner gcc_gjava $(bindir)/gjarsigner$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/gjavah gcc_gjava $(bindir)/gjavah$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/gkeytool gcc_gjava $(bindir)/gkeytool$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/gnative2ascii gcc_gjava $(bindir)/$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/gorbd gcc_gjava $(bindir)/gorbd$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/grmic gcc_gjava $(bindir)/grmic$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/grmid gcc_gjava $(bindir)/grmid$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/grmregistry gcc_gjava $(bindir)/grmregistry$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/gserialver gcc_gjava $(bindir)/gserialver$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/gtnameserv gcc_gjava $(bindir)/gtnameserv$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/jcf-dump gcc_gjava $(bindir)/jcf-dump$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/jv-convert gcc_gjava $(bindir)/jv-convert$(PROGRAM_SUFFIX)
+ALTERNATIVE_gcc4java += $(bindir)/rebuild-gcj-db gcc_gjava $(bindir)/rebuild-gcj-db$(PROGRAM_SUFFIX)
+
 PACKAGES += CSWgcc4objc
 CATALOGNAME_CSWgcc4objc       = gcc4objc
 SPKG_DESC_CSWgcc4objc       = GNU Objective C Compiler
@@ -411,8 +447,12 @@
 PKGFILES_CSWgcc4objc += $(libdir)/.*/include/objc/.*
 PKGFILES_CSWgcc4objc += $(call baseisadirs,$(libdir),libobjc.so)
 PKGFILES_CSWgcc4objc += $(call baseisadirs,$(libdir),libobjc_gc.so)
+RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibgmp10
+RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibmpc2
 RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibmpfr4
-RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibgmp10
+RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibobjc-gc3
+RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibobjc3
+RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibz1
 
 # libiconv deps cropped up relatively late in the porting process. Perhaps
 # they apply to all arch/OS combinations.

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


From wahwah at users.sourceforge.net  Wed Aug 31 18:36:11 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 31 Aug 2011 16:36:11 +0000
Subject: [csw-devel] SF.net SVN: gar:[15471] csw/mgar/pkg/lighttpd/trunk
Message-ID: 

Revision: 15471
          http://gar.svn.sourceforge.net/gar/?rev=15471&view=rev
Author:   wahwah
Date:     2011-08-31 16:36:11 +0000 (Wed, 31 Aug 2011)
Log Message:
-----------
pkg/lighttpd/trunk: update to 1.4.29, let's see what breaks

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

Modified: csw/mgar/pkg/lighttpd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lighttpd/trunk/Makefile	2011-08-31 16:29:00 UTC (rev 15470)
+++ csw/mgar/pkg/lighttpd/trunk/Makefile	2011-08-31 16:36:11 UTC (rev 15471)
@@ -1,6 +1,6 @@
 # $Id$
 NAME = lighttpd
-VERSION = 1.4.28
+VERSION = 1.4.29
 CATEGORIES = server
 
 DESCRIPTION = HTTP server built for security, speed, compliance, and flexibility

Modified: csw/mgar/pkg/lighttpd/trunk/checksums
===================================================================
--- csw/mgar/pkg/lighttpd/trunk/checksums	2011-08-31 16:29:00 UTC (rev 15470)
+++ csw/mgar/pkg/lighttpd/trunk/checksums	2011-08-31 16:36:11 UTC (rev 15471)
@@ -1 +1 @@
-202d36efc6324adb95a3600d2826ec6a  lighttpd-1.4.28.tar.gz
+4130d2440777b7911e62de6a89c98a90  lighttpd-1.4.29.tar.gz

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


From dmichelsen at users.sourceforge.net  Wed Aug 31 18:43:45 2011
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 31 Aug 2011 16:43:45 +0000
Subject: [csw-devel] SF.net SVN: gar:[15472] csw/mgar/gar/v2/gar.pkg.mk
Message-ID: 

Revision: 15472
          http://gar.svn.sourceforge.net/gar/?rev=15472&view=rev
Author:   dmichelsen
Date:     2011-08-31 16:43:44 +0000 (Wed, 31 Aug 2011)
Log Message:
-----------
mGAR v2: Make sure SPKG_VERSION doesn't contain a minus and allow man suffixes

Modified Paths:
--------------
    csw/mgar/gar/v2/gar.pkg.mk

Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk	2011-08-31 16:36:11 UTC (rev 15471)
+++ csw/mgar/gar/v2/gar.pkg.mk	2011-08-31 16:43:44 UTC (rev 15472)
@@ -190,7 +190,7 @@
 endif
 
 SPKG_DESC      ?= $(DESCRIPTION)
-SPKG_VERSION   ?= $(VERSION)$(SPKG_VERSION_FLAGS)
+SPKG_VERSION   ?= $(subst -,_,$(VERSION)$(SPKG_VERSION_FLAGS))
 SPKG_CATEGORY  ?= application
 SPKG_SOURCEURL ?= $(firstword $(VENDOR_URL) \
 			$(if $(filter $(GNU_MIRROR),$(MASTER_SITES)),http://www.gnu.org/software/$(GNU_PROJ)) \
@@ -360,7 +360,7 @@
 PKGFILES_DEVEL += $(PKGFILES_DEVEL_ACLOCAL)
 PKGFILES_DEVEL_CONFIG_MANPAGE ?= $(mandir)/man1/.*-config\.1.*
 PKGFILES_DEVEL += $(PKGFILES_DEVEL_CONFIG_MANPAGE)
-PKGFILES_DEVEL_MAN3_MANPAGE ?= $(mandir)/man3/.*\.3
+PKGFILES_DEVEL_MAN3_MANPAGE ?= $(mandir)/man3/.*\.3.*
 PKGFILES_DEVEL += $(PKGFILES_DEVEL_MAN3_MANPAGE)
 
 # PKGFILES_DOC selects files beloging to a documentation package

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


From dmichelsen at users.sourceforge.net  Wed Aug 31 19:17:46 2011
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 31 Aug 2011 17:17:46 +0000
Subject: [csw-devel] SF.net SVN: gar:[15473]
	csw/mgar/pkg/lighttpd/trunk/Makefile
Message-ID: 

Revision: 15473
          http://gar.svn.sourceforge.net/gar/?rev=15473&view=rev
Author:   dmichelsen
Date:     2011-08-31 17:17:45 +0000 (Wed, 31 Aug 2011)
Log Message:
-----------
lighttpd: Update to new standards

Modified Paths:
--------------
    csw/mgar/pkg/lighttpd/trunk/Makefile

Modified: csw/mgar/pkg/lighttpd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lighttpd/trunk/Makefile	2011-08-31 16:43:44 UTC (rev 15472)
+++ csw/mgar/pkg/lighttpd/trunk/Makefile	2011-08-31 17:17:45 UTC (rev 15473)
@@ -30,12 +30,15 @@
 #   http://redmine.lighttpd.net/boards/2/topics/4163
 PATCHFILES += 0003-Ignore-ENOSYS-on-mkdir-which-happens-on-automounted-.patch
 
+PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386                                                                          
+PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
+
 PACKAGES += CSWlighttpd
 CATALOGNAME_CSWlighttpd = lighttpd
 SPKG_DESC_CSWlighttpd = HTTP server built for security, speed, compliance, and flexibility
 RUNTIME_DEP_PKGS_CSWlighttpd += CSWlibpcre0
-RUNTIME_DEP_PKGS_CSWlighttpd += CSWbzip2
-RUNTIME_DEP_PKGS_CSWlighttpd += CSWzlib
+RUNTIME_DEP_PKGS_CSWlighttpd += CSWlibbz2-1-0
+RUNTIME_DEP_PKGS_CSWlighttpd += CSWlibz1
 
 EXTRA_LINKER_FLAGS += -lsendfile
 
@@ -47,10 +50,6 @@
 # because modules are not supposed to be in /opt/csw/lib.
 libdir_install = $(prefix)/lib/lighttpd
 
-# Solaris Zones support
-sysconfdir = /etc$(prefix)
-localstatedir = /var$(prefix)
-
 CONFIGURE_ARGS  = $(DIRPATHS)
 
 # Solaris 9 does not have IPV6_V6ONLY.
@@ -58,9 +57,6 @@
 CONFIGURE_ARGS_5.9 = --disable-ipv6
 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GAROSREL))
 
-PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386                                                                          
-PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
-
 INITSMF = $(sysconfdir)/init\.d/cswlighttpd
 PRESERVECONF = $(sysconfdir)/lighttpd\.conf
 USERGROUP = $(sysconfdir)/pkg/$(NAME)/cswusergroup

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


From igalic at users.sourceforge.net  Wed Aug 31 23:21:35 2011
From: igalic at users.sourceforge.net (igalic at users.sourceforge.net)
Date: Wed, 31 Aug 2011 21:21:35 +0000
Subject: [csw-devel] SF.net SVN: gar:[15474] csw/mgar/pkg/logrotate/trunk
Message-ID: 

Revision: 15474
          http://gar.svn.sourceforge.net/gar/?rev=15474&view=rev
Author:   igalic
Date:     2011-08-31 21:21:35 +0000 (Wed, 31 Aug 2011)
Log Message:
-----------
Update of logrotate to 3.8.1:
- remove now obsolete patches
- Fix platforms (Sol10 only)

Tests are still failing - but differently:
https://fedorahosted.org/logrotate/ticket/17

Modified Paths:
--------------
    csw/mgar/pkg/logrotate/trunk/Makefile
    csw/mgar/pkg/logrotate/trunk/checksums
    csw/mgar/pkg/logrotate/trunk/files/003-test.patch

Removed Paths:
-------------
    csw/mgar/pkg/logrotate/trunk/files/001-makefu.patch
    csw/mgar/pkg/logrotate/trunk/files/002-strndup.patch
    csw/mgar/pkg/logrotate/trunk/files/004-alloca.patch
    csw/mgar/pkg/logrotate/trunk/files/006-mbrtowc_empty.patch
    csw/mgar/pkg/logrotate/trunk/files/007-warn-unreached.patch

Modified: csw/mgar/pkg/logrotate/trunk/Makefile
===================================================================
--- csw/mgar/pkg/logrotate/trunk/Makefile	2011-08-31 17:17:45 UTC (rev 15473)
+++ csw/mgar/pkg/logrotate/trunk/Makefile	2011-08-31 21:21:35 UTC (rev 15474)
@@ -3,7 +3,7 @@
 # $Id$
 
 NAME = logrotate
-VERSION = 3.8.0
+VERSION = 3.8.1
 CATEGORIES = apps
 
 DESCRIPTION = rotates, compresses, and mails system logs
@@ -17,21 +17,12 @@
 SPKG_SOURCEURL = https://fedorahosted.org/logrotate/
 MASTER_SITES = https://fedorahosted.org/releases/l/o/logrotate/
 
-PATCHFILES  = 001-makefu.patch
-PATCHFILES += 002-strndup.patch
 PATCHFILES += 003-test.patch
-PATCHFILES += 004-alloca.patch
 PATCHFILES += 005-gzippath.patch
-PATCHFILES += 006-mbrtowc_empty.patch
-PATCHFILES += 007-warn-unreached.patch
 
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
-DISTFILES += 001-makefu.patch
-DISTFILES += 002-strndup.patch
 DISTFILES += 003-test.patch
 DISTFILES += 005-gzippath.patch
-DISTFILES += 006-mbrtowc_empty.patch
-DISTFILES += 007-warn-unreached.patch
 
 RUNTIME_DEP_PKGS = CSWlibpopt
 BUILD_DEP_PKGS   = $(RUNTIME_DEP_PKGS)
@@ -42,6 +33,8 @@
 # "optimize"
 NOISALIST = 1
 
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+
 # Don't ask, it doesn't work otherwise.
 export EXTRA_CFLAGS = -I$(includedir)
 export EXTRA_LDFLAGS = -L$(libdir)
@@ -53,13 +46,13 @@
 
 # This is a hack, as I have no idea what's going wrong.
 pre-test-modulated:
-        @( cd $(WORKSRC) ; \
-                rm -f .depend )
+	@( cd $(WORKSRC) ; \
+		rm -f .depend )
 
 pre-install-modulated:
-        @( cd $(WORKSRC) ; \
-                rm -f .depend )
+	@( cd $(WORKSRC) ; \
+		rm -f .depend )
 
 pre-build-modulated:
-        @( cd $(WORKSRC) ; \
-                rm -f .depend )
+	@( cd $(WORKSRC) ; \
+		rm -f .depend )

Modified: csw/mgar/pkg/logrotate/trunk/checksums
===================================================================
--- csw/mgar/pkg/logrotate/trunk/checksums	2011-08-31 17:17:45 UTC (rev 15473)
+++ csw/mgar/pkg/logrotate/trunk/checksums	2011-08-31 21:21:35 UTC (rev 15474)
@@ -1,8 +1,3 @@
-590f77c13077a4c384dbec7ca9c5f242 logrotate-3.8.0.tar.gz
-59ed81c960568f086b9e59388807f6a3  001-makefu.patch
-5603f2be02e6fd4bbd8d57a4f3e9dcd4  002-strndup.patch
+bd2e20d8dc644291b08f9215397d28a5  logrotate-3.8.1.tar.gz
 02f36862d4e190a7eb920bd816ca4927  003-test.patch
-e98fb00c0ea9c7c0102e2029292308dd  004-alloca.patch
 d6232a06412a2302a582abdc51607518  005-gzippath.patch
-27ac9259ade93a47f71779d396c6a096  006-mbrtowc_empty.patch
-384b011461b8aef679a884051dc25015  007-warn-unreached.patch

Deleted: csw/mgar/pkg/logrotate/trunk/files/001-makefu.patch
===================================================================
--- csw/mgar/pkg/logrotate/trunk/files/001-makefu.patch	2011-08-31 17:17:45 UTC (rev 15473)
+++ csw/mgar/pkg/logrotate/trunk/files/001-makefu.patch	2011-08-31 21:21:35 UTC (rev 15474)
@@ -1,40 +0,0 @@
---- logrotate-3.8.0/Makefile	2011-06-21 08:12:03.000000000 +0000
-+++ logrotate-3.8.0-solfix/Makefile	2011-06-27 01:08:10.876632251 +0000
-@@ -41,16 +41,14 @@
- 
- # Solaris using gcc
- ifeq ($(OS_NAME),SunOS)
--    CFLAGS = -I/opt/baw/include -D_GNU_SOURCE -D$(OS_NAME) -DVERSION=\"$(VERSION)\" $(RPM_OPT_FLAGS) $(LFS)
-+    CFLAGS = -D_GNU_SOURCE -D$(OS_NAME) -DVERSION=\"$(VERSION)\" $(RPM_OPT_FLAGS) $(LFS)
-     CC ?= gcc
-     CPP = $(CC) -E -M
-     INSTALL = /usr/ucb/install
-     ifeq ($(CC),cc)
-         CPP = cc -xM
-     endif
--	ifeq ($(BASEDIR),)
--	BASEDIR = /usr/local
--    endif
-+    BASEDIR ?= /usr/local
- endif
- 
- # Red Hat Linux
-@@ -83,7 +81,7 @@
- endif
- 
- BINDIR = $(BASEDIR)/sbin
--MANDIR = $(BASEDIR)/man
-+MANDIR ?= $(BASEDIR)/man
- 
- #--------------------------------------------------------------------------
- 
-@@ -95,6 +93,9 @@
- LDFLAGS = -g
- endif
- 
-+LDFLAGS += $(EXTRA_LDFLAGS) $(EXTRA_LIBS)
-+CFLAGS  += $(EXTRA_CPPFLAGS) $(EXTRA_CFLAGS) 
-+
- ifeq (.depend,$(wildcard .depend))
- TARGET=$(PROG)
- else

Deleted: csw/mgar/pkg/logrotate/trunk/files/002-strndup.patch
===================================================================
--- csw/mgar/pkg/logrotate/trunk/files/002-strndup.patch	2011-08-31 17:17:45 UTC (rev 15473)
+++ csw/mgar/pkg/logrotate/trunk/files/002-strndup.patch	2011-08-31 21:21:35 UTC (rev 15474)
@@ -1,32 +0,0 @@
---- logrotate-3.8.0/config.c	Tue Jun 21 08:12:02 2011
-+++ logrotate-3.8.0-solfix/config.c	Sun Jun 26 22:54:39 2011
-@@ -74,6 +74,29 @@
- 
- #endif
- 
-+#if !defined(strndup)
-+char *strndup(const char *s, size_t n)
-+{
-+	size_t nAvail;
-+	char *p;
-+	
-+	if(!s)
-+		return NULL;
-+
-+	/* min() */
-+	nAvail = strlen(s) + 1;
-+	if ( (n + 1) < nAvail)
-+		nAvail = n + 1;
-+
-+	p = malloc(nAvail);
-+	if (!p)
-+		return NULL;
-+	memcpy(p, s, nAvail);
-+	p[nAvail - 1] = 0;
-+	return p;
-+}
-+#endif
-+
- enum {
- 	STATE_DEFAULT = 2,
- 	STATE_SKIP_LINE = 4,

Modified: csw/mgar/pkg/logrotate/trunk/files/003-test.patch
===================================================================
--- csw/mgar/pkg/logrotate/trunk/files/003-test.patch	2011-08-31 17:17:45 UTC (rev 15473)
+++ csw/mgar/pkg/logrotate/trunk/files/003-test.patch	2011-08-31 21:21:35 UTC (rev 15474)
@@ -1,6 +1,6 @@
 diff -ur logrotate-3.8.0/test/test logrotate-3.8.0-solfix/test/test
---- logrotate-3.8.0/test/test   Tue Jun 21 08:12:02 2011
-+++ logrotate-3.8.0-solfix/test/test    Sun Jun 26 23:08:30 2011
+--- logrotate-3.8.0/test/test	Tue Jun 21 08:12:02 2011
++++ logrotate-3.8.0-solfix/test/test	Sun Jun 26 23:08:30 2011
 @@ -17,7 +17,7 @@
      input=test-config.$1.in
      output=test-config.$1
@@ -11,107 +11,107 @@
  
  createlog() {
 @@ -118,7 +118,7 @@
-            echo expected: \'$expected\'
-            exit 2
-        fi
--       echo "$config_crc" | md5sum -c - 2>&1 > /dev/null
-+       echo "$config_crc" | gmd5sum -c - 2>&1 > /dev/null
-        if [ $? != 0 ]; then
-                echo "config file $output has been altered: MD5 sum mismatch"
-                exit 3
+ 	    echo expected: \'$expected\'
+ 	    exit 2
+ 	fi
+-	echo "$config_crc" | md5sum -c - 2>&1 > /dev/null
++	echo "$config_crc" | gmd5sum -c - 2>&1 > /dev/null
+ 	if [ $? != 0 ]; then
+ 		echo "config file $output has been altered: MD5 sum mismatch"
+ 		exit 3
 diff -ur logrotate-3.8.0/test/test-config.11.in logrotate-3.8.0-solfix/test/test-config.11.in
---- logrotate-3.8.0/test/test-config.11.in      Tue Jun 21 08:12:02 2011
-+++ logrotate-3.8.0-solfix/test/test-config.11.in       Sun Jun 26 23:02:28 2011
+--- logrotate-3.8.0/test/test-config.11.in	Tue Jun 21 08:12:02 2011
++++ logrotate-3.8.0-solfix/test/test-config.11.in	Sun Jun 26 23:02:28 2011
 @@ -11,7 +11,7 @@
  
      postrotate
-        touch scriptout
--       echo $(cat scriptout) foo > foo
-+       echo `cat scriptout` foo > foo
-        mv foo scriptout
+ 	touch scriptout
+-	echo $(cat scriptout) foo > foo
++	echo `cat scriptout` foo > foo
+ 	mv foo scriptout
      endscript
  }
 diff -ur logrotate-3.8.0/test/test-config.3.in logrotate-3.8.0-solfix/test/test-config.3.in
---- logrotate-3.8.0/test/test-config.3.in       Tue Jun 21 08:12:02 2011
-+++ logrotate-3.8.0-solfix/test/test-config.3.in        Sun Jun 26 23:03:29 2011
+--- logrotate-3.8.0/test/test-config.3.in	Tue Jun 21 08:12:02 2011
++++ logrotate-3.8.0-solfix/test/test-config.3.in	Sun Jun 26 23:03:29 2011
 @@ -8,7 +8,7 @@
  
      postrotate
-        touch scriptout
--       echo $(cat scriptout) foo > foo
-+       echo `cat scriptout` foo > foo
-        mv foo scriptout
+ 	touch scriptout
+-	echo $(cat scriptout) foo > foo
++	echo `cat scriptout` foo > foo
+ 	mv foo scriptout
      endscript
  }
 diff -ur logrotate-3.8.0/test/test-config.4.in logrotate-3.8.0-solfix/test/test-config.4.in
---- logrotate-3.8.0/test/test-config.4.in       Tue Jun 21 08:12:02 2011
-+++ logrotate-3.8.0-solfix/test/test-config.4.in        Sun Jun 26 23:03:39 2011
+--- logrotate-3.8.0/test/test-config.4.in	Tue Jun 21 08:12:02 2011
++++ logrotate-3.8.0-solfix/test/test-config.4.in	Sun Jun 26 23:03:39 2011
 @@ -9,7 +9,7 @@
  
      postrotate
-        touch scriptout
--       echo $(cat scriptout) foo > foo
-+       echo `cat scriptout` foo > foo
-        mv foo scriptout
+ 	touch scriptout
+-	echo $(cat scriptout) foo > foo
++	echo `cat scriptout` foo > foo
+ 	mv foo scriptout
      endscript
  }
 diff -ur logrotate-3.8.0/test/test-config.5.in logrotate-3.8.0-solfix/test/test-config.5.in
---- logrotate-3.8.0/test/test-config.5.in       Tue Jun 21 08:12:02 2011
-+++ logrotate-3.8.0-solfix/test/test-config.5.in        Sun Jun 26 23:03:51 2011
+--- logrotate-3.8.0/test/test-config.5.in	Tue Jun 21 08:12:02 2011
++++ logrotate-3.8.0-solfix/test/test-config.5.in	Sun Jun 26 23:03:51 2011
 @@ -9,7 +9,7 @@
  
      postrotate
-        touch scriptout
--       echo $(cat scriptout) foo > foo
-+       echo `cat scriptout` foo > foo
-        mv foo scriptout
+ 	touch scriptout
+-	echo $(cat scriptout) foo > foo
++	echo `cat scriptout` foo > foo
+ 	mv foo scriptout
      endscript
  }
 diff -ur logrotate-3.8.0/test/test-config.6.in logrotate-3.8.0-solfix/test/test-config.6.in
---- logrotate-3.8.0/test/test-config.6.in       Tue Jun 21 08:12:02 2011
-+++ logrotate-3.8.0-solfix/test/test-config.6.in        Sun Jun 26 23:04:09 2011
+--- logrotate-3.8.0/test/test-config.6.in	Tue Jun 21 08:12:02 2011
++++ logrotate-3.8.0-solfix/test/test-config.6.in	Sun Jun 26 23:04:09 2011
 @@ -10,7 +10,7 @@
  
      postrotate
-        touch scriptout
--       echo $(cat scriptout) foo > foo
-+       echo `cat scriptout` foo > foo
-        mv foo scriptout
+ 	touch scriptout
+-	echo $(cat scriptout) foo > foo
++	echo `cat scriptout` foo > foo
+ 	mv foo scriptout
      endscript
  }
 diff -ur logrotate-3.8.0/test/test-config.7.in logrotate-3.8.0-solfix/test/test-config.7.in
---- logrotate-3.8.0/test/test-config.7.in       Tue Jun 21 08:12:02 2011
-+++ logrotate-3.8.0-solfix/test/test-config.7.in        Sun Jun 26 23:04:23 2011
+--- logrotate-3.8.0/test/test-config.7.in	Tue Jun 21 08:12:02 2011
++++ logrotate-3.8.0-solfix/test/test-config.7.in	Sun Jun 26 23:04:23 2011
 @@ -10,7 +10,7 @@
  
      postrotate
-        touch scriptout
--       echo $(cat scriptout) foo > foo
-+       echo `cat scriptout` foo > foo
-        mv foo scriptout
+ 	touch scriptout
+-	echo $(cat scriptout) foo > foo
++	echo `cat scriptout` foo > foo
+ 	mv foo scriptout
      endscript
  }
 diff -ur logrotate-3.8.0/test/test-config.8.in logrotate-3.8.0-solfix/test/test-config.8.in
---- logrotate-3.8.0/test/test-config.8.in       Tue Jun 21 08:12:02 2011
-+++ logrotate-3.8.0-solfix/test/test-config.8.in        Sun Jun 26 23:04:36 2011
+--- logrotate-3.8.0/test/test-config.8.in	Tue Jun 21 08:12:02 2011
++++ logrotate-3.8.0-solfix/test/test-config.8.in	Sun Jun 26 23:04:36 2011
 @@ -11,7 +11,7 @@
  
      postrotate
-        touch scriptout
--       echo $(cat scriptout) foo > foo
-+       echo `cat scriptout` foo > foo
-        mv foo scriptout
+ 	touch scriptout
+-	echo $(cat scriptout) foo > foo
++	echo `cat scriptout` foo > foo
+ 	mv foo scriptout
      endscript
  }
 diff -ur logrotate-3.8.0/test/test-config.9.in logrotate-3.8.0-solfix/test/test-config.9.in
---- logrotate-3.8.0/test/test-config.9.in       Tue Jun 21 08:12:02 2011
-+++ logrotate-3.8.0-solfix/test/test-config.9.in        Sun Jun 26 23:04:47 2011
+--- logrotate-3.8.0/test/test-config.9.in	Tue Jun 21 08:12:02 2011
++++ logrotate-3.8.0-solfix/test/test-config.9.in	Sun Jun 26 23:04:47 2011
 @@ -11,7 +11,7 @@
  
      postrotate
-        touch scriptout
--       echo $(cat scriptout) foo > foo
-+       echo `cat scriptout` foo > foo
-        mv foo scriptout
+ 	touch scriptout
+-	echo $(cat scriptout) foo > foo
++	echo `cat scriptout` foo > foo
+ 	mv foo scriptout
      endscript
  }

Deleted: csw/mgar/pkg/logrotate/trunk/files/004-alloca.patch
===================================================================
--- csw/mgar/pkg/logrotate/trunk/files/004-alloca.patch	2011-08-31 17:17:45 UTC (rev 15473)
+++ csw/mgar/pkg/logrotate/trunk/files/004-alloca.patch	2011-08-31 21:21:35 UTC (rev 15474)
@@ -1,18 +0,0 @@
---- logrotate-3.8.0/config.c	Tue Jun 21 08:12:02 2011
-+++ logrotate-3.8.0-solfix/config.c	Sun Jun 26 23:54:28 2011
-@@ -1,5 +1,5 @@
- #include 
--#ifdef _ALLOCA_H
-+#ifndef _ALLOCA_H
- #include 
- #else
- #include 
---- logrotate-3.8.0/logrotate.c	Tue Jun 21 08:12:02 2011
-+++ logrotate-3.8.0-solfix/logrotate.c	Sun Jun 26 23:35:19 2011
-@@ -1,5 +1,5 @@
- #include 
--#ifdef _ALLOCA_H
-+#ifndef _ALLOCA_H
- #include 
- #else
- #include 

Deleted: csw/mgar/pkg/logrotate/trunk/files/006-mbrtowc_empty.patch
===================================================================
--- csw/mgar/pkg/logrotate/trunk/files/006-mbrtowc_empty.patch	2011-08-31 17:17:45 UTC (rev 15473)
+++ csw/mgar/pkg/logrotate/trunk/files/006-mbrtowc_empty.patch	2011-08-31 21:21:35 UTC (rev 15474)
@@ -1,11 +0,0 @@
---- logrotate-3.8.0/config.c	Tue Jun 21 08:12:02 2011
-+++ logrotate-3.8.0-solfix/config.c	Mon Jun 27 20:57:53 2011
-@@ -166,7 +166,7 @@
- 
- 	chptr = start;
- 
--	while( (len = mbrtowc(&pwc, chptr, strlen(chptr), NULL)) != 0 ) {
-+        while( (len = mbrtowc(&pwc, chptr, strlen(chptr), NULL)) != 0 && strlen(chptr) != 0) {
- 		if( len == (size_t)(-1) || len == (size_t)(-2) || !iswprint(pwc) || iswblank(pwc) ) {
- 		    message(MESS_ERROR, "%s:%d bad %s path %s\n",
- 			    configFile, lineNum, key, start);

Deleted: csw/mgar/pkg/logrotate/trunk/files/007-warn-unreached.patch
===================================================================
--- csw/mgar/pkg/logrotate/trunk/files/007-warn-unreached.patch	2011-08-31 17:17:45 UTC (rev 15473)
+++ csw/mgar/pkg/logrotate/trunk/files/007-warn-unreached.patch	2011-08-31 21:21:35 UTC (rev 15474)
@@ -1,35 +0,0 @@
---- logrotate-3.8.0/config.c    Tue Jun 21 08:12:02 2011
-+++ logrotate-3.8.0-solfix/config.c     Mon Jun 27 20:29:25 2011
-@@ -1133,5 +1133,5 @@
- 						}
- 					}
--					else continue;
-+
- #if 0
- 					if (stat(newlog->oldDir, &sb)) {
-@@ -1178,5 +1178,4 @@
- 						}
- 					}
--					else continue;
- 
- 					if (access(newlog->compress_prog, X_OK)) {
-@@ -1209,5 +1208,4 @@
- 						}
- 					}
--					else continue;
- 
- 					if (access(newlog->uncompress_prog, X_OK)) {
-@@ -1245,5 +1243,5 @@
- 							goto error;
- 						}
--					} else continue;
-+					}
- 
- 					if (poptParseArgvString(options,
-@@ -1278,5 +1276,5 @@
- 							goto error;
- 						}
--					} else continue;
-+					}
- 
- 					message(MESS_DEBUG, "compress_ext is now %s\n",

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


From wahwah at users.sourceforge.net  Wed Aug 31 23:52:48 2011
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 31 Aug 2011 21:52:48 +0000
Subject: [csw-devel] SF.net SVN: gar:[15475]
	csw/mgar/pkg/gcc4/branches/compat-test/
Message-ID: 

Revision: 15475
          http://gar.svn.sourceforge.net/gar/?rev=15475&view=rev
Author:   wahwah
Date:     2011-08-31 21:52:48 +0000 (Wed, 31 Aug 2011)
Log Message:
-----------
gcc: A branch for lightweight compat testing.

Added Paths:
-----------
    csw/mgar/pkg/gcc4/branches/compat-test/

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


From bwalton at opencsw.org  Wed Aug 31 23:53:42 2011
From: bwalton at opencsw.org (Ben Walton)
Date: Wed, 31 Aug 2011 17:53:42 -0400
Subject: [csw-devel] SF.net SVN: gar:[15474] csw/mgar/pkg/logrotate/trunk
In-Reply-To: 
References: 
Message-ID: <1314827591-sup-2064@pinkfloyd.chass.utoronto.ca>

Excerpts from igalic's message of Wed Aug 31 17:21:35 -0400 2011:

Hi Igor,

> Update of logrotate to 3.8.1:
> - remove now obsolete patches
> - Fix platforms (Sol10 only)

This doesn't build on solaris 9?

Thanks
-Ben
--
Ben Walton
Systems Programmer - CHASS
University of Toronto
C:416.407.5610 | W:416.978.4302


From bwalton at opencsw.org  Wed Aug 31 23:55:32 2011
From: bwalton at opencsw.org (Ben Walton)
Date: Wed, 31 Aug 2011 17:55:32 -0400
Subject: [csw-devel] Fwd: Re: SF.net SVN: gar:[15474]
	csw/mgar/pkg/logrotate/trunk
Message-ID: <1314827717-sup-1225@pinkfloyd.chass.utoronto.ca>

Ooops...replied to the @sourceforge.

Thanks
-Ben

--- Begin forwarded message from Ben Walton ---
From: Ben Walton 
To: igalic 
Cc: devel 
Date: Wed, 31 Aug 2011 17:53:42 -0400
Subject: Re: [csw-devel] SF.net SVN: gar:[15474] csw/mgar/pkg/logrotate/trunk

Excerpts from igalic's message of Wed Aug 31 17:21:35 -0400 2011:

Hi Igor,

> Update of logrotate to 3.8.1:
> - remove now obsolete patches
> - Fix platforms (Sol10 only)

This doesn't build on solaris 9?

Thanks
-Ben
--- End forwarded message ---
--
Ben Walton
Systems Programmer - CHASS
University of Toronto
C:416.407.5610 | W:416.978.4302