From rthurner at users.sourceforge.net Thu Dec 1 06:55:06 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 01 Dec 2011 05:55:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[16342] csw/mgar/pkg/cmake/trunk/ Message-ID: Revision: 16342 http://gar.svn.sourceforge.net/gar/?rev=16342&view=rev Author: rthurner Date: 2011-12-01 05:55:06 +0000 (Thu, 01 Dec 2011) Log Message: ----------- cmake, remove external reference, as there is mgar now Property Changed: ---------------- csw/mgar/pkg/cmake/trunk/ Property changes on: csw/mgar/pkg/cmake/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Thu Dec 1 07:06:58 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 01 Dec 2011 06:06:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[16343] csw/mgar/pkg/libserf/trunk/ Message-ID: Revision: 16343 http://gar.svn.sourceforge.net/gar/?rev=16343&view=rev Author: rthurner Date: 2011-12-01 06:06:58 +0000 (Thu, 01 Dec 2011) Log Message: ----------- libserf, remove svn:externals to gar not necessary any more Property Changed: ---------------- csw/mgar/pkg/libserf/trunk/ Property changes on: csw/mgar/pkg/libserf/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Thu Dec 1 09:47:20 2011 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Thu, 01 Dec 2011 08:47:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[16344] csw/mgar/pkg/ganglia/trunk/Makefile Message-ID: Revision: 16344 http://gar.svn.sourceforge.net/gar/?rev=16344&view=rev Author: d_pocock Date: 2011-12-01 08:47:20 +0000 (Thu, 01 Dec 2011) Log Message: ----------- ganglia: clean up the Makefile a little bit more Modified Paths: -------------- csw/mgar/pkg/ganglia/trunk/Makefile Modified: csw/mgar/pkg/ganglia/trunk/Makefile =================================================================== --- csw/mgar/pkg/ganglia/trunk/Makefile 2011-12-01 06:06:58 UTC (rev 16343) +++ csw/mgar/pkg/ganglia/trunk/Makefile 2011-12-01 08:47:20 UTC (rev 16344) @@ -170,10 +170,26 @@ CHECKPKG_OVERRIDES_CSWlibganglia0 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libganglia-3.2.0.0.so.0.0.0|soname=libganglia-3.2.0.0.so.0|pkgname=CSWlibganglia0|expected=CSWlibganglia3-2-0-0-0 PKGFILES_CSWgangliamodpython = .*python.* -PKGFILES_CSWganglia-dev = .*/include/.*.h .*/bin/ganglia-config $(libdir)/libganglia.so -PKGFILES_CSWgangliagmetad = .*/sbin/gmetad .*/gmetad.conf.CSW /var/opt/csw/ganglia/rrds /etc/opt/csw/init.d/cswgmetad .*/gmetad.1 -PKGFILES_CSWgangliaweb = $(WWWGANGLIA)/.* /opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW +PKGFILES_CSWganglia-dev = /opt/csw/include/ganglia.h +PKGFILES_CSWganglia-dev += /opt/csw/include/ganglia_gexec.h +PKGFILES_CSWganglia-dev += /opt/csw/include/gm_metric.h +PKGFILES_CSWganglia-dev += /opt/csw/include/gm_mmn.h +PKGFILES_CSWganglia-dev += /opt/csw/include/gm_msg.h +PKGFILES_CSWganglia-dev += /opt/csw/include/gm_protocol.h +PKGFILES_CSWganglia-dev += /opt/csw/include/gm_value.h +PKGFILES_CSWganglia-dev += /opt/csw/bin/ganglia-config +PKGFILES_CSWganglia-dev += $(libdir)/libganglia.so + +PKGFILES_CSWgangliagmetad = /opt/csw/sbin/gmetad +PKGFILES_CSWgangliagmetad += /etc/opt/csw/ganglia/gmetad.conf.CSW +PKGFILES_CSWgangliagmetad += /etc/opt/csw/init.d/cswgmetad +PKGFILES_CSWgangliagmetad += /var/opt/csw/ganglia/rrds +PKGFILES_CSWgangliagmetad += /opt/csw/share/man/man1/gmetad.1 + +PKGFILES_CSWgangliaweb = $(WWWGANGLIA)/.* +PKGFILES_CSWgangliaweb += /opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW + PRESERVECONF = /opt/csw/apache2/etc/extra/httpd-ganglia.conf PRESERVECONF += /etc/opt/csw/ganglia/gmond.conf PRESERVECONF += /etc/opt/csw/ganglia/gmetad.conf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Fri Dec 2 16:56:32 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 02 Dec 2011 15:56:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[16345] csw/mgar/pkg/mercurial/trunk Message-ID: Revision: 16345 http://gar.svn.sourceforge.net/gar/?rev=16345&view=rev Author: rthurner Date: 2011-12-02 15:56:32 +0000 (Fri, 02 Dec 2011) Log Message: ----------- mercurial: upgrade to hg-2.0.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-12-01 08:47:20 UTC (rev 16344) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2011-12-02 15:56:32 UTC (rev 16345) @@ -1,5 +1,5 @@ NAME = mercurial -VERSION = 2.0 +VERSION = 2.0.1 CATEGORIES = python DESCRIPTION = Fast, lightweight Source Control Management system Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2011-12-01 08:47:20 UTC (rev 16344) +++ csw/mgar/pkg/mercurial/trunk/checksums 2011-12-02 15:56:32 UTC (rev 16345) @@ -1 +1 @@ -38f439a63bae1687d385758c8ad3d53e mercurial-2.0.tar.gz +16576b3089a88a84a35edc30e17a03a9 mercurial-2.0.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Fri Dec 2 16:57:28 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 02 Dec 2011 15:57:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[16346] csw/mgar/pkg/mercurial/trunk/ Message-ID: Revision: 16346 http://gar.svn.sourceforge.net/gar/?rev=16346&view=rev Author: rthurner Date: 2011-12-02 15:57:28 +0000 (Fri, 02 Dec 2011) Log Message: ----------- external property deleted, mgar does not need it any more (from mercurial) Property Changed: ---------------- csw/mgar/pkg/mercurial/trunk/ Property changes on: csw/mgar/pkg/mercurial/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Fri Dec 2 21:22:18 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Fri, 02 Dec 2011 20:22:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[16347] csw/mgar/pkg/postgresql/branches/postgresql-8. 3-raos Message-ID: Revision: 16347 http://gar.svn.sourceforge.net/gar/?rev=16347&view=rev Author: guengel Date: 2011-12-02 20:22:18 +0000 (Fri, 02 Dec 2011) Log Message: ----------- postgresql/branches/postgresql-8.3-raos: Work in progress. PostgreSQL will be installed in $(prefix) with binaries going to $(libexecdir)/postgresql/ and libraries going to $(libdir). Extensions are going to $(libdir)/postgres/. Other portions of the package will also live in versioned directories. Alternatives are still unfinished, i.e. not working. Currently, the recipe produces on giant package. No library splitting so far. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/checksums csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswusergroup.tmpl Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile 2011-12-02 15:57:28 UTC (rev 16346) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile 2011-12-02 20:22:18 UTC (rev 16347) @@ -2,8 +2,35 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ # -# Based on the Ubuntu PostgreSQL package. +# Note 1 +# ------ +# +# A word of caution: PostgreSQL does use autoconf, but it does *not* use +# automake. That said, it `misses' many features found in pure +# autoconf/automake builds, e.g. --program-suffix is not available. This also +# explains some quirks of this recipe. +# +# +# Note 2 +# ------ +# +# The idea is to make it possible to install different major/minor versions of +# PostgreSQL at the same time but without installing them to distinct --prefix +# directories, which in turn makes linking against PostgreSQL easier. This has +# been achieved as follows: +# +# * libraries go into $(libdir) +# +# * binaries go into $(libexec)/postgres/XY/ and alternatives are used to +# bring the binaries into $(prefix)/bin +# +# Generally, putting libraries in $(libdir) should not pose a problem, but in +# the case of PostgresSQL, there is also a directory $(libdir)/postgres which +# is unversioned and cannot be changed by passing arguments to configure. This +# shortcoming can be lifted by adjusting $(pkglibdir) in +# $(WORKSRC)/src/Makefile.global.in which is what we do. + # This BUILD is NOT READY! It needs work before it's usable. # TODO: Initialize the database cluster during installation if not already @@ -17,10 +44,9 @@ NAME = postgresql BASE_VERSION = 8.3 -# How to make one automatically? -VERSION_NODOT = 8_3 -BASE_VERSION_G = 83 -PATCHLEVEL = 13 +VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) +BASE_VERSION_G = $(subst .,,$(BASE_VERSION)) +PATCHLEVEL = 16 VERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = apps @@ -32,32 +58,10 @@ define BLURB endef -version_dependent = /lib/$(NAME)/$(BASE_VERSION) -bindir_install = $(prefix)$(version_dependent)/bin -# bindir = $(prefix)$(version_dependent)/bin -sbindir_install = $(prefix)$(version_dependent)/sbin -# sbindir = $(prefix)$(version_dependent)/sbin -libdir_install = $(prefix)$(version_dependent)/lib -# libdir = $(prefix)$(version_dependent)/lib -# Otherwise initdb can't find the right libraries, see: -# http://archives.postgresql.org/pgsql-general/2010-01/msg00422.php -libdir = $(abspath $(prefix)$(version_dependent)/lib/$(MM_LIBDIR)) -localstatedir = /var$(prefix)/$(NAME)/$(BASE_VERSION) -sysconfdir = /etc$(prefix)/postgresql-common -datadir = $(prefix)/share/$(NAME)/$(BASE_VERSION) -docdir = $(prefix)/share/doc/$(NAME)-doc-$(BASE_VERSION) -includedir = $(prefix)/include/postgresql/ -infodir = $(datadir)/info -libexecdir_install = $(prefix)/libexec/$(NAME)/$(BASE_VERSION) -lispdir = $(datadir)/emacs/site-lisp -mandir = $(datadir)/man -sharedstatedir = $(prefix)/share/$(NAME)/$(BASE_VERSION) -sourcedir = $(prefix)/src/$(NAME)/$(BASE_VERSION) - MIGRATE_FILES_CSWpostgresql-$(BASE_VERSION_G) = postgresql.conf MIGRATE_DEST_DIR_CSWpostgresql-$(BASE_VERSION_G) = $(sysconfdir) -MASTER_SITES = http://wwwmaster.postgresql.org/redir/53/h/source/v$(VERSION)/ +MASTER_SITES = http://ftp.postgresql.org/pub/source/v$(VERSION)/ DISTFILES = $(NAME)-$(VERSION).tar.bz2 DISTFILES += cswpostgres.tmpl DISTFILES += cswusergroup.tmpl @@ -65,34 +69,25 @@ DISTFILES += README-CSW.txt DISTFILES += CSWpostgresql-$(BASE_VERSION_G).postinstall -PACKAGES += CSWpostgresql -PACKAGES += CSWpostgresql-$(BASE_VERSION_G)-doc +# ARCHALL_CSWpostgresql = 1 +# ARCHALL_CSWpostgresql-$(BASE_VERSION_G)-doc = 1 -CATALOGNAME_CSWpostgresql-$(BASE_VERSION_G)-doc = postgresql_$(BASE_VERSION_G)_doc -CATALOGNAME_CSWpostgresql = postgresql +LICENSE = COPYRIGHT -SPKG_DESC_CSWpostgresql = An advanced open source database -SPKG_DESC_CSWpostgresql-$(BASE_VERSION_G)-doc = PostgreSQL $(BASE_VERSION).x Documentation +BUILD_DEP_PKGS = CSWlibxml2-dev +BUILD_DEP_PKGS += CSWlibxslt-dev +BUILD_DEP_PKGS += CSWperl +BUILD_DEP_PKGS += CSWpython-dev +BUILD_DEP_PKGS += CSWossldevel +BUILD_DEP_PKGS += CSWlibreadline-dev +BUILD_DEP_PKGS += CSWgsed # gsed is used in this recipe +BUILD_DEP_PKGS += CSWlibz-dev -RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWlibgnugetopt0 -RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWlibgssapi-krb5-2 -RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWlibpq5 -RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWlibreadline6 -RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWlibxslt1 -RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWlibz1 -RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWosslrt +# Why's that? --raos +# +# EXTRA_INC = $(BUILD_PREFIX)/include +# EXTRA_LIB = $(BUILD_PREFIX)/lib -CHECKPKG_OVERRIDES_CSWpostgresql-$(BASE_VERSION_G) += file-with-bad-content - -ARCHALL_CSWpostgresql = 1 -ARCHALL_CSWpostgresql-$(BASE_VERSION_G)-doc = 1 - -LICENSE = COPYRIGHT - -EXTRA_INC = $(BUILD_PREFIX)/include -EXTRA_LIB = $(BUILD_PREFIX)/lib - EXTRA_LD_OPTIONS = -R$(prefix)/lib/\$$ISALIST BUILD64 = 1 @@ -108,20 +103,35 @@ # I'd like to get some hard data though. What is the difference in the memory # footprint, and what is the difference in execution speed between 32 and # 64-bit versions? +ISAEXEC = 0 + # -# NOISAEXEC = 1 +# Postgres specific variables +# +PGBINDIR = $(libexecdir)/$(NAME)/$(BASE_VERSION_G) +PGSBINDIR = $(libexecdir)/$(NAME)/$(BASE_VERSION_G) +PGDATADIR = $(datadir)/$(NAME)/$(BASE_VERSION_G) +PGDOCDIR = $(datadir)/doc/$(NAME)/$(BASE_VERSION_G) +PGLOCALSTATEDIR_BASE = $(localstatedir)/$(NAME) +PGDATA = $(PGLOCALSTATEDIR_BASE)/$(BASE_VERSION_G) +USERGROUPDIR = $(sysconfdir)/pkg/$(NAME) + + CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-includes=/opt/csw/include -CONFIGURE_ARGS += --with-library=$(abspath /opt/csw/lib/$(MM_LIBDIR)) -# # Perl support only in the 32-bit version -# CONFIGURE_ARGS_isa-sparcv8 += --with-perl -# CONFIGURE_ARGS_isa-i386 += --with-perl +# This is one of the quirks mentioned at the beginning: --program-suffix is not +# supported, so IMHO, binaries should go to --libexecdir +CONFIGURE_ARGS += --bindir=$(PGBINDIR) +CONFIGURE_ARGS += --sbindir=$(PGSBINDIR) -# # Python support in 32-bit only -# CONFIGURE_ARGS_isa-sparcv8 += --with-python -# CONFIGURE_ARGS_isa-i386 += --with-python +CONFIGURE_ARGS += --datadir=$(PGDATADIR) +CONFIGURE_ARGS += --localstatedir=$(PGDATA) +CONFIGURE_ARGS += --with-includes=/opt/csw/include +CONFIGURE_ARGS += --with-libraries=$(abspath /opt/csw/lib/$(MM_LIBDIR)) +CONFIGURE_ARGS += --with-docdir=$(PGDOCDIR) +# configure complains that we are not thread-safe, wtf? --raos +#CONFIGURE_ARGS += --enable-thread-safety CONFIGURE_ARGS += --with-gssapi # CONFIGURE_ARGS += --with-krb5 @@ -133,19 +143,42 @@ CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MODULATION)) # Skipping tests to save time during packaging, and to enable x86 builds. +# +# IMHO, tests are essential, especially on Solaris, and I do not experience +# build troubles on x86 having them enabled --raos SKIPTEST ?= 1 TEST_TARGET = check -PKGFILES_CSWpostgresql = NOFILES -PKGFILES_CSWpostgresql-$(BASE_VERSION_G)-doc = $(PKGFILES_DOC) +# PKGFILES_CSWpostgresql = NOFILES +# PKGFILES_CSWpostgresql-$(BASE_VERSION_G)-doc = $(PKGFILES_DOC) # initscript_base_name = cswpostgres_$(subst .,_,$(BASE_VERSION)) -initscript_base_name = cswpostgres_$(VERSION_NODOT) -INITSMF = /etc$(prefix)/init\.d/$(initscript_base_name) -USERGROUP = /etc$(prefix)/pkg/postgresql/cswusergroup_$(VERSION_NODOT) -PRESERVECONF = $(sysconfdir)/postgresql\.conf +#initscript_base_name = cswpostgres_$(VERSION_NODOT) +#INITSMF = /etc$(prefix)/init\.d/$(initscript_base_name) +USERGROUP = $(USERGROUPDIR)/cswusergroup-$(BASE_VERSION) + +#PRESERVECONF = $(sysconfdir)/postgresql\.conf + +PROTOTYPE_MODIFIERS = pgdata +PROTOTYPE_FILES_pgdata = $(PGDATA) +PROTOTYPE_USER_pgdata = postgres +PROTOTYPE_GROUP_pgdata = sys +PROTOTYPE_PERMS_pgdata = 0700 +PROTOTYPE_CLASS_pgdata = ugfiles + +EXPANDVARS = CSWpostgresql-$(BASE_VERSION_G).postinstall +EXPANDVARS += cswpostgres.tmpl +# This is one of the rare cases where a protoype filter is needed. +# Do not copy this for other Makefiles unless you understand exactly what it does!! +# (explanation: It adds -isaexec to the isaexec-name of the binaries to be isaexec'ed) +# +# Since we are not using isaexec, this line is not needed, right? --raos +#PROTOTYPE_FILTER = perl -npe 's,=/opt/csw/bin/isaexec,-isaexec=/opt/csw/bin/isaexec,' + +# Here come the alternatives we use to let the user choose between 32/64bit +# variants of the binaries BIN_NAMES = clusterdb BIN_NAMES += createdb BIN_NAMES += createlang @@ -172,158 +205,157 @@ BIN_NAMES += vacuumdb BIN_NAMES += vacuumlo -PGDATA = $(localstatedir)/pgdata +# Bad voodoo coming up... +ALTERNATIVES = $(BUILD_ISAS) +$(foreach alt,$(ALTERNATIVES), $(eval ALTERNATIVE_$(alt) = $(subst /$(DEFAULT_ISA)/,/,$(foreach n,$(BIN_NAMES),$(bindir)/$(n)-$(BASE_VERSION_G) $(NAME)-$(BASE_VERSION_G) $(libexecdir)/$(alt)/$(NAME)/$(BASE_VERSION_G)/$(n) 20)))) -PROTOTYPE_MODIFIERS = pgdata -PROTOTYPE_FILES_pgdata = $(PGDATA) -PROTOTYPE_USER_pgdata = postgres -PROTOTYPE_GROUP_pgdata = sys -PROTOTYPE_PERMS_pgdata = 0700 -PROTOTYPE_CLASS_pgdata = ugfiles -EXPANDVARS = CSWpostgresql-$(BASE_VERSION_G).postinstall -EXPANDVARS += cswpostgres.tmpl -# This is one of the rare cases where a protoype filter is needed. -# Do not copy this for other Makefiles unless you understand exactly what it does!! -# (explanation: It adds -isaexec to the isaexec-name of the binaries to be isaexec'ed) -PROTOTYPE_FILTER = perl -npe 's,=/opt/csw/bin/isaexec,-isaexec=/opt/csw/bin/isaexec,' - # ISAEXEC_FILES = $(addsuffix -isaexec,$(foreach B,$(BIN_NAMES),$(bindir_install)/$B)) -ALTERNATIVES_CSWpostgresql-$(BASE_VERSION_G) = $(NAME)$(BASE_VERSION_G)-32 $(NAME)$(BASE_VERSION_G)-64 $(NAME)$(BASE_VERSION_G)-auto -ALTERNATIVE_$(NAME)$(BASE_VERSION_G)-32 = $(bindir_install)/$(firstword $(BIN_NAMES)) $(firstword $(BIN_NAMES)) $(bindir_install)/$(ISA_DEFAULT)/$(firstword $(BIN_NAMES)) 100 -ALTERNATIVE_$(NAME)$(BASE_VERSION_G)-32 += $(foreach B,$(wordlist 2,$(words $(BIN_NAMES)),$(BIN_NAMES)),$(bindir_install)/$B $B $(bindir_install)/$(ISA_DEFAULT)/$B) -ALTERNATIVE_$(NAME)$(BASE_VERSION_G)-64 = $(bindir_install)/$(firstword $(BIN_NAMES)) $(firstword $(BIN_NAMES)) $(bindir_install)/$(ISA_DEFAULT64)/$(firstword $(BIN_NAMES)) 200 -ALTERNATIVE_$(NAME)$(BASE_VERSION_G)-64 += $(foreach B,$(wordlist 2,$(words $(BIN_NAMES)),$(BIN_NAMES)),$(bindir_install)/$B $B $(bindir_install)/$(ISA_DEFAULT64)/$B) -ALTERNATIVE_$(NAME)$(BASE_VERSION_G)-auto = $(bindir_install)/$(firstword $(BIN_NAMES)) $(firstword $(BIN_NAMES)) $(bindir_install)/$(firstword $(BIN_NAMES))-isaexec 300 -ALTERNATIVE_$(NAME)$(BASE_VERSION_G)-auto += $(foreach B,$(wordlist 2,$(words $(BIN_NAMES)),$(BIN_NAMES)),$(bindir_install)/$B $B $(bindir_install)/$B-isaexec) +# ALTERNATIVES_CSWpostgresql-$(BASE_VERSION_G) = $(NAME)$(BASE_VERSION_G)-32 $(NAME)$(BASE_VERSION_G)-64 $(NAME)$(BASE_VERSION_G)-auto +# ALTERNATIVE_$(NAME)$(BASE_VERSION_G)-32 = $(bindir_install)/$(firstword $(BIN_NAMES)) $(firstword $(BIN_NAMES)) $(bindir_install)/$(ISA_DEFAULT)/$(firstword $(BIN_NAMES)) 100 +# ALTERNATIVE_$(NAME)$(BASE_VERSION_G)-32 += $(foreach B,$(wordlist 2,$(words $(BIN_NAMES)),$(BIN_NAMES)),$(bindir_install)/$B $B $(bindir_install)/$(ISA_DEFAULT)/$B) +# ALTERNATIVE_$(NAME)$(BASE_VERSION_G)-64 = $(bindir_install)/$(firstword $(BIN_NAMES)) $(firstword $(BIN_NAMES)) $(bindir_install)/$(ISA_DEFAULT64)/$(firstword $(BIN_NAMES)) 200 +# ALTERNATIVE_$(NAME)$(BASE_VERSION_G)-64 += $(foreach B,$(wordlist 2,$(words $(BIN_NAMES)),$(BIN_NAMES)),$(bindir_install)/$B $B $(bindir_install)/$(ISA_DEFAULT64)/$B) +# ALTERNATIVE_$(NAME)$(BASE_VERSION_G)-auto = $(bindir_install)/$(firstword $(BIN_NAMES)) $(firstword $(BIN_NAMES)) $(bindir_install)/$(firstword $(BIN_NAMES))-isaexec 300 +# ALTERNATIVE_$(NAME)$(BASE_VERSION_G)-auto += $(foreach B,$(wordlist 2,$(words $(BIN_NAMES)),$(BIN_NAMES)),$(bindir_install)/$B $B $(bindir_install)/$B-isaexec) -# checkpkg does not detect this dependency automatically -CHECKPKG_OVERRIDES_CSWpostgresql-$(BASE_VERSION_G) += surplus-dependency|CSWalternatives +# # checkpkg does not detect this dependency automatically +# CHECKPKG_OVERRIDES_CSWpostgresql-$(BASE_VERSION_G) += surplus-dependency|CSWalternatives -PACKAGES += CSWlibpq5 -CATALOGNAME_CSWlibpq5 = libpq5 -PKGFILES_CSWlibpq5 += $(call baseisadirs,$(prefix)/lib,libpq\.so\.5(\.\d+)*) -SPKG_DESC_CSWlibpq5 += PostgreSQL C client library (built from $(BASE_VERSION).x sources), libpq.so.5 -RUNTIME_DEP_PKGS_CSWlibpq5 += CSWlibgssapi-krb5-2 -RUNTIME_DEP_PKGS_CSWlibpq5 += CSWosslrt +# PACKAGES += CSWlibpq5 +# CATALOGNAME_CSWlibpq5 = libpq5 +# PKGFILES_CSWlibpq5 += $(call baseisadirs,$(prefix)/lib,libpq\.so\.5(\.\d+)*) +# SPKG_DESC_CSWlibpq5 += PostgreSQL C client library (built from $(BASE_VERSION).x sources), libpq.so.5 +# RUNTIME_DEP_PKGS_CSWlibpq5 += CSWlibgssapi-krb5-2 +# RUNTIME_DEP_PKGS_CSWlibpq5 += CSWosslrt -PACKAGES += CSWlibecpg6 -CATALOGNAME_CSWlibecpg6 = libecpg6 -PKGFILES_CSWlibecpg6 += $(call baseisadirs,$(prefix)/lib,libecpg\.so\.6(\.\d+)*) -SPKG_DESC_CSWlibecpg6 += Embedded PostgreSQL for C library (built from $(BASE_VERSION).x sources), libecpg.so.6 -RUNTIME_DEP_PKGS_CSWlibecpg6 += CSWlibpgtypes3 -RUNTIME_DEP_PKGS_CSWlibecpg6 += CSWlibpq5 +# PACKAGES += CSWlibecpg6 +# CATALOGNAME_CSWlibecpg6 = libecpg6 +# PKGFILES_CSWlibecpg6 += $(call baseisadirs,$(prefix)/lib,libecpg\.so\.6(\.\d+)*) +# SPKG_DESC_CSWlibecpg6 += Embedded PostgreSQL for C library (built from $(BASE_VERSION).x sources), libecpg.so.6 +# RUNTIME_DEP_PKGS_CSWlibecpg6 += CSWlibpgtypes3 +# RUNTIME_DEP_PKGS_CSWlibecpg6 += CSWlibpq5 -PACKAGES += CSWlibecpg-compat3 -CATALOGNAME_CSWlibecpg-compat3 = libecpg_compat3 -PKGFILES_CSWlibecpg-compat3 += $(call baseisadirs,$(prefix)/lib,libecpg_compat\.so\.3(\.\d+)*) -SPKG_DESC_CSWlibecpg-compat3 += Older version of run-time library for ECPG programs (built from $(BASE_VERSION).x sources), libecpg_compat.so.3 -RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibecpg6 -RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibpgtypes3 -RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibpq5 +# PACKAGES += CSWlibecpg-compat3 +# CATALOGNAME_CSWlibecpg-compat3 = libecpg_compat3 +# PKGFILES_CSWlibecpg-compat3 += $(call baseisadirs,$(prefix)/lib,libecpg_compat\.so\.3(\.\d+)*) +# SPKG_DESC_CSWlibecpg-compat3 += Older version of run-time library for ECPG programs (built from $(BASE_VERSION).x sources), libecpg_compat.so.3 +# RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibecpg6 +# RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibpgtypes3 +# RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibpq5 -PACKAGES += CSWlibpgtypes3 -CATALOGNAME_CSWlibpgtypes3 = libpgtypes3 -PKGFILES_CSWlibpgtypes3 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.3\.0) -PKGFILES_CSWlibpgtypes3 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.3(\.\d+)*) -SPKG_DESC_CSWlibpgtypes3 += Used by programs built with ecpg (Embedded PostgreSQL for C, from $(BASE_VERSION).x sources), libpgtypes.so.3 +# PACKAGES += CSWlibpgtypes3 +# CATALOGNAME_CSWlibpgtypes3 = libpgtypes3 +# PKGFILES_CSWlibpgtypes3 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.3\.0) +# PKGFILES_CSWlibpgtypes3 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.3(\.\d+)*) +# SPKG_DESC_CSWlibpgtypes3 += Used by programs built with ecpg (Embedded PostgreSQL for C, from $(BASE_VERSION).x sources), libpgtypes.so.3 -PACKAGES += CSWlibpq-dev -CATALOGNAME_CSWlibpq-dev = libpq_dev -SPKG_DESC_CSWlibpq-dev = PostgreSQL C client headers (built from $(BASE_VERSION).x sources) -RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibgnugetopt0 -RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibgssapi-krb5-2 -RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibreadline6 -RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibxslt1 -RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWosslrt -PKGFILES_CSWlibpq-dev += $(prefix)/include/postgresql.* -PKGFILES_CSWlibpq-dev += $(prefix)/lib/.*libpq.so -PKGFILES_CSWlibpq-dev += $(prefix)/lib/.*libecpg.so -PKGFILES_CSWlibpq-dev += $(prefix)/lib/.*libecpg_compat.so -PKGFILES_CSWlibpq-dev += $(prefix)/lib/.*libpgtypes.so -PKGFILES_CSWlibpq-dev += $(prefix)/bin/.*pg_config.* -PKGFILES_CSWlibpq-dev += $(prefix)/share/postgresql/8.4/man/man1/pg_config.1 -PKGFILES_CSWlibpq-dev += $(prefix)/share/locale/*/LC_MESSAGES/pg_config.*\.mo -RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibpq5 -RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibecpg6 -RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibecpg-compat3 -RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibpgtypes3 +# PACKAGES += CSWlibpq-dev +# CATALOGNAME_CSWlibpq-dev = libpq_dev +# SPKG_DESC_CSWlibpq-dev = PostgreSQL C client headers (built from $(BASE_VERSION).x sources) +# RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibgnugetopt0 +# RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibgssapi-krb5-2 +# RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibreadline6 +# RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibxml2-2 +# RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibxslt1 +# RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibz1 +# RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWosslrt +# PKGFILES_CSWlibpq-dev += $(prefix)/include/postgresql.* +# PKGFILES_CSWlibpq-dev += $(prefix)/lib/.*libpq.so +# PKGFILES_CSWlibpq-dev += $(prefix)/lib/.*libecpg.so +# PKGFILES_CSWlibpq-dev += $(prefix)/lib/.*libecpg_compat.so +# PKGFILES_CSWlibpq-dev += $(prefix)/lib/.*libpgtypes.so +# PKGFILES_CSWlibpq-dev += $(prefix)/bin/.*pg_config.* +# PKGFILES_CSWlibpq-dev += $(prefix)/share/postgresql/8.4/man/man1/pg_config.1 +# PKGFILES_CSWlibpq-dev += $(prefix)/share/locale/*/LC_MESSAGES/pg_config.*\.mo +# RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibpq5 +# RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibecpg6 +# RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibecpg-compat3 +# RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibpgtypes3 -PACKAGES += CSWpostgresql-$(BASE_VERSION_G) -CATALOGNAME_CSWpostgresql-$(BASE_VERSION_G) = postgresql_$(BASE_VERSION_G) -SPKG_DESC_CSWpostgresql-$(BASE_VERSION_G) = PostgreSQL, version $(BASE_VERSION).x +# PACKAGES += CSWpostgresql-$(BASE_VERSION_G) +# CATALOGNAME_CSWpostgresql-$(BASE_VERSION_G) = postgresql_$(BASE_VERSION_G) +# SPKG_DESC_CSWpostgresql-$(BASE_VERSION_G) = PostgreSQL, version $(BASE_VERSION).x -# Private shared libraries have sonames, which triggers this error. -CHECKPKG_OVERRIDES_CSWpostgresql-$(BASE_VERSION_G) += soname-not-part-of-filename +# # Private shared libraries have sonames, which triggers this error. +# CHECKPKG_OVERRIDES_CSWpostgresql-$(BASE_VERSION_G) += soname-not-part-of-filename -# Legacy libraries -PACKAGES += CSWlibpq3 -CATALOGNAME_CSWlibpq3 = libpq3 -PKGFILES_CSWlibpq3 += $(call baseisadirs,$(prefix)/lib,libpq\.so\.3(\.\d+)*) -SPKG_DESC_CSWlibpq3 += PostgreSQL C client library, libpq.so.3 -RUNTIME_DEP_PKGS_CSWlibpq3 += CSWosslrt +# # Legacy libraries +# PACKAGES += CSWlibpq3 +# CATALOGNAME_CSWlibpq3 = libpq3 +# PKGFILES_CSWlibpq3 += $(call baseisadirs,$(prefix)/lib,libpq\.so\.3(\.\d+)*) +# SPKG_DESC_CSWlibpq3 += PostgreSQL C client library, libpq.so.3 +# RUNTIME_DEP_PKGS_CSWlibpq3 += CSWosslrt -PACKAGES += CSWlibpq4 -CATALOGNAME_CSWlibpq4 = libpq4 -PKGFILES_CSWlibpq4 += $(call baseisadirs,$(prefix)/lib,libpq\.so\.4(\.\d+)*) -SPKG_DESC_CSWlibpq4 += PostgreSQL C client library, libpq.so.4 -RUNTIME_DEP_PKGS_CSWlibpq4 += CSWosslrt +# PACKAGES += CSWlibpq4 +# CATALOGNAME_CSWlibpq4 = libpq4 +# PKGFILES_CSWlibpq4 += $(call baseisadirs,$(prefix)/lib,libpq\.so\.4(\.\d+)*) +# SPKG_DESC_CSWlibpq4 += PostgreSQL C client library, libpq.so.4 +# RUNTIME_DEP_PKGS_CSWlibpq4 += CSWosslrt -PACKAGES += CSWlibpgtypes1 -CATALOGNAME_CSWlibpgtypes1 = libpgtypes1 -PKGFILES_CSWlibpgtypes1 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.1(\.\d+)*) -SPKG_DESC_CSWlibpgtypes1 += Used by programs built with ecpg (Embedded PostgreSQL for C), libpgtypes.so.1 +# PACKAGES += CSWlibpgtypes1 +# CATALOGNAME_CSWlibpgtypes1 = libpgtypes1 +# PKGFILES_CSWlibpgtypes1 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.1(\.\d+)*) +# SPKG_DESC_CSWlibpgtypes1 += Used by programs built with ecpg (Embedded PostgreSQL for C), libpgtypes.so.1 -PACKAGES += CSWlibpgtypes2 -CATALOGNAME_CSWlibpgtypes2 = libpgtypes2 -PKGFILES_CSWlibpgtypes2 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.2(\.\d+)*) -SPKG_DESC_CSWlibpgtypes2 += Used by programs built with ecpg (Embedded PostgreSQL for C), libpgtypes.so.2 +# PACKAGES += CSWlibpgtypes2 +# CATALOGNAME_CSWlibpgtypes2 = libpgtypes2 +# PKGFILES_CSWlibpgtypes2 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.2(\.\d+)*) +# SPKG_DESC_CSWlibpgtypes2 += Used by programs built with ecpg (Embedded PostgreSQL for C), libpgtypes.so.2 -PACKAGES += CSWlibecpg4 -CATALOGNAME_CSWlibecpg4 = libecpg4 -PKGFILES_CSWlibecpg4 += $(call baseisadirs,$(prefix)/lib,libecpg\.so\.4(\.\d+)*) -SPKG_DESC_CSWlibecpg4 += Embedded PostgreSQL for C library, libecpg.so.4 -RUNTIME_DEP_PKGS_CSWlibecpg4 += CSWlibpgtypes1 -RUNTIME_DEP_PKGS_CSWlibecpg4 += CSWosslrt -RUNTIME_DEP_PKGS_CSWlibecpg4 += CSWlibpq3 +# PACKAGES += CSWlibecpg4 +# CATALOGNAME_CSWlibecpg4 = libecpg4 +# PKGFILES_CSWlibecpg4 += $(call baseisadirs,$(prefix)/lib,libecpg\.so\.4(\.\d+)*) +# SPKG_DESC_CSWlibecpg4 += Embedded PostgreSQL for C library, libecpg.so.4 +# RUNTIME_DEP_PKGS_CSWlibecpg4 += CSWlibpgtypes1 +# RUNTIME_DEP_PKGS_CSWlibecpg4 += CSWosslrt +# RUNTIME_DEP_PKGS_CSWlibecpg4 += CSWlibpq3 -PACKAGES += CSWlibecpg5 -CATALOGNAME_CSWlibecpg5 = libecpg5 -PKGFILES_CSWlibecpg5 += $(call baseisadirs,$(prefix)/lib,libecpg\.so\.5(\.\d+)*) -SPKG_DESC_CSWlibecpg5 += Embedded PostgreSQL for C library, libecpg.so.5 -RUNTIME_DEP_PKGS_CSWlibecpg5 += CSWlibpgtypes2 -RUNTIME_DEP_PKGS_CSWlibecpg5 += CSWlibpq5 +# PACKAGES += CSWlibecpg5 +# CATALOGNAME_CSWlibecpg5 = libecpg5 +# PKGFILES_CSWlibecpg5 += $(call baseisadirs,$(prefix)/lib,libecpg\.so\.5(\.\d+)*) +# SPKG_DESC_CSWlibecpg5 += Embedded PostgreSQL for C library, libecpg.so.5 +# RUNTIME_DEP_PKGS_CSWlibecpg5 += CSWlibpgtypes2 +# RUNTIME_DEP_PKGS_CSWlibecpg5 += CSWlibpq5 -PACKAGES += CSWlibecpg-compat2 -CATALOGNAME_CSWlibecpg-compat2 = libecpg_compat2 -PKGFILES_CSWlibecpg-compat2 += $(call baseisadirs,$(prefix)/lib,libecpg_compat\.so\.2(\.\d+)*) -SPKG_DESC_CSWlibecpg-compat2 += Older version of run-time library for ECPG programs, libecpg_compat.so.2 -RUNTIME_DEP_PKGS_CSWlibecpg-compat2 += CSWlibpgtypes2 -RUNTIME_DEP_PKGS_CSWlibecpg-compat2 += CSWlibecpg5 -RUNTIME_DEP_PKGS_CSWlibecpg-compat2 += CSWlibpq5 +# PACKAGES += CSWlibecpg-compat2 +# CATALOGNAME_CSWlibecpg-compat2 = libecpg_compat2 +# PKGFILES_CSWlibecpg-compat2 += $(call baseisadirs,$(prefix)/lib,libecpg_compat\.so\.2(\.\d+)*) +# SPKG_DESC_CSWlibecpg-compat2 += Older version of run-time library for ECPG programs, libecpg_compat.so.2 +# RUNTIME_DEP_PKGS_CSWlibecpg-compat2 += CSWlibpgtypes2 +# RUNTIME_DEP_PKGS_CSWlibecpg-compat2 += CSWlibecpg5 +# RUNTIME_DEP_PKGS_CSWlibecpg-compat2 += CSWlibpq5 -# The horrible transitional package -PACKAGES += CSWlibpq -PKGFILES_CSWlibpq += $(prefix)/postgresql.* -SPKG_DESC_CSWlibpq = Transitional package for PostgreSQL shared libraries -RUNTIME_DEP_PKGS_CSWlibpq += CSWlibecpg-compat2 -RUNTIME_DEP_PKGS_CSWlibpq += CSWlibecpg-compat3 -RUNTIME_DEP_PKGS_CSWlibpq += CSWlibecpg4 -RUNTIME_DEP_PKGS_CSWlibpq += CSWlibecpg5 -RUNTIME_DEP_PKGS_CSWlibpq += CSWlibecpg6 -RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpgtypes1 -RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpgtypes2 -RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpgtypes3 -RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpq3 -RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpq4 -RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpq5 +# # The horrible transitional package +# PACKAGES += CSWlibpq +# PKGFILES_CSWlibpq += $(prefix)/postgresql.* +# SPKG_DESC_CSWlibpq = Transitional package for PostgreSQL shared libraries +# RUNTIME_DEP_PKGS_CSWlibpq += CSWlibecpg-compat2 +# RUNTIME_DEP_PKGS_CSWlibpq += CSWlibecpg-compat3 +# RUNTIME_DEP_PKGS_CSWlibpq += CSWlibecpg4 +# RUNTIME_DEP_PKGS_CSWlibpq += CSWlibecpg5 +# RUNTIME_DEP_PKGS_CSWlibpq += CSWlibecpg6 +# RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpgtypes1 +# RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpgtypes2 +# RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpgtypes3 +# RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpq3 +# RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpq4 +# RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpq5 include gar/category.mk -CFLAGS := $(filter-out -I%,$(CFLAGS)) +# what's that good for? --raos +# +#CFLAGS := $(filter-out -I%,$(CFLAGS)) +# We adjust the $(pkglibdir) found in $(WORKSRC)/src/Makefile.global.in, so +# that it should be possible to install 8.x and 8.y concurrently +pre-configure-modulated: + if [ -r $(WORKSRC)/src/Makefile.global.in ] ; then \ + gsed -i -r -e 's|^(pkglibdir[[:space:]]*=[[:space:]]*)\$$\(libdir\).*$$|\1$$(libdir)/postgresql/$(BASE_VERSION_G)|' $(WORKSRC)/src/Makefile.global.in ; \ + fi + @$(MAKECOOKIE) + post-build-modulated: $(BUILD_ENV) gmake -C $(WORKSRC)/contrib all @$(MAKECOOKIE) @@ -336,54 +368,61 @@ @$(MAKECOOKIE) post-merge: - ginstall -d $(PKGROOT)/etc$(prefix)/init.d - ginstall \ - $(WORKDIR)/cswpostgres.tmpl \ - $(PKGROOT)/etc$(prefix)/init.d/$(initscript_base_name) - ginstall -d $(PKGROOT)/etc$(prefix)/pkg/$(NAME) - gsed -e 's+ at PGDATA@+$(PGDATA)+g' \ - < $(FILEDIR)/cswusergroup.tmpl \ - > $(WORKDIR)/cswusergroup - ginstall $(WORKDIR)/cswusergroup \ - $(PKGROOT)/etc$(prefix)/pkg/$(NAME)/cswusergroup_$(VERSION_NODOT) - ginstall -d $(PKGROOT)$(sysconfdir) - gsed -e 's+ at PGDATA@+$(PGDATA)+g' \ - < $(FILEDIR)/postgresql.conf.tmpl \ - > $(WORKDIR)/postgresql.conf - ginstall $(WORKDIR)/postgresql.conf \ - $(PKGROOT)$(sysconfdir) - ginstall -d $(PKGROOT)$(docdir) - # ginstall $(WORKDIR)/README-CSW.txt $(PKGROOT)$(docdir) - ginstall -m 755 -d $(PKGROOT)$(prefix)/bin - # for b in $(BIN_NAMES); do \ - # gln -s ..$(version_dependent)/bin/$${b} $(PKGROOT)$(prefix)/bin/$${b}; \ - # done +# Create the PGDATA directory ginstall -d $(PKGROOT)$(PGDATA) - gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 - mkdir -p $(PKGROOT)$(prefix)/lib - mkdir -p $(PKGROOT)$(prefix)/lib/$(ISA_DEFAULT64) - for libname in libpq libecpg libecpg_compat libpgtypes; do \ - mv $(PKGROOT)$(libdir)/$${libname}.so $(PKGROOT)$(prefix)/lib; \ - mv $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/$${libname}.so $(PKGROOT)$(prefix)/lib/$(ISA_DEFAULT64); \ - mv $(PKGROOT)$(libdir)/$${libname}.so.* $(PKGROOT)$(prefix)/lib; \ - mv $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/$${libname}.so.* $(PKGROOT)$(prefix)/lib/$(ISA_DEFAULT64); \ - done - $(FILEDIR)/merge_legacy_libs.sh $(GARCH) $(FILEDIR) $(PKGROOT)/$(prefix)/lib +# Create the directory for the user group file + ginstall -d $(PKGROOT)$(USERGROUPDIR) +# PGLOCALSTATEDIR_BASE has been chosen, because this should be stable, i.e +# unversioned, across different PostgreSQL installation + gsed -e 's+ at PGLOCALSTATEDIR_BASE@+$(PGLOCALSTATEDIR_BASE)+g' $(FILEDIR)/cswusergroup.tmpl > $(PKGROOT)$(USERGROUP) +# ginstall -d $(PKGROOT)/etc$(prefix)/init.d +# ginstall \ +# $(WORKDIR)/cswpostgres.tmpl \ +# $(PKGROOT)/etc$(prefix)/init.d/$(initscript_base_name) +# ginstall -d $(PKGROOT)/etc$(prefix)/pkg/$(NAME) +# gsed -e 's+ at PGDATA@+$(PGDATA)+g' \ +# < $(FILEDIR)/cswusergroup.tmpl \ +# > $(WORKDIR)/cswusergroup +# ginstall $(WORKDIR)/cswusergroup \ +# $(PKGROOT)/etc$(prefix)/pkg/$(NAME)/cswusergroup_$(VERSION_NODOT) +# ginstall -d $(PKGROOT)$(sysconfdir) +# gsed -e 's+ at PGDATA@+$(PGDATA)+g' \ +# < $(FILEDIR)/postgresql.conf.tmpl \ +# > $(WORKDIR)/postgresql.conf +# ginstall $(WORKDIR)/postgresql.conf \ +# $(PKGROOT)$(sysconfdir) +# ginstall -d $(PKGROOT)$(docdir) +# # ginstall $(WORKDIR)/README-CSW.txt $(PKGROOT)$(docdir) +# ginstall -m 755 -d $(PKGROOT)$(prefix)/bin +# # for b in $(BIN_NAMES); do \ +# # gln -s ..$(version_dependent)/bin/$${b} $(PKGROOT)$(prefix)/bin/$${b}; \ +# # done +# ginstall -d $(PKGROOT)$(PGDATA) +# gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 +# mkdir -p $(PKGROOT)$(prefix)/lib +# mkdir -p $(PKGROOT)$(prefix)/lib/$(ISA_DEFAULT64) +# for libname in libpq libecpg libecpg_compat libpgtypes; do \ +# mv $(PKGROOT)$(libdir)/$${libname}.so $(PKGROOT)$(prefix)/lib; \ +# mv $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/$${libname}.so $(PKGROOT)$(prefix)/lib/$(ISA_DEFAULT64); \ +# mv $(PKGROOT)$(libdir)/$${libname}.so.* $(PKGROOT)$(prefix)/lib; \ +# mv $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/$${libname}.so.* $(PKGROOT)$(prefix)/lib/$(ISA_DEFAULT64); \ +# done +# $(FILEDIR)/merge_legacy_libs.sh $(GARCH) $(FILEDIR) $(PKGROOT)/$(prefix)/lib - # Backward compatibility provided by CSWlibpq - mkdir -p $(PKGROOT)$(prefix)/postgresql/lib - mkdir -p $(PKGROOT)$(prefix)/postgresql/lib/$(ISA_DEFAULT64) - gln -s . $(PKGROOT)$(prefix)/postgresql/lib/$(ISA_DEFAULT) - gln -s $(ISA_DEFAULT64) $(PKGROOT)$(prefix)/postgresql/lib/64 - gln -s $(ISA_DEFAULT) $(PKGROOT)$(prefix)/postgresql/lib/32 - for f in $(PKGROOT)$(prefix)/lib/*.so.*; do \ - ln -s \ - ../../lib/`basename $${f}` \ - $(PKGROOT)$(prefix)/postgresql/lib; \ - done - for f in $(PKGROOT)$(prefix)/lib/$(ISA_DEFAULT64)/lib*.so.*; do \ - ln -s \ - ../../lib/$(ISA_DEFAULT64)/`basename $${f}` \ - $(PKGROOT)$(prefix)/postgresql/lib/$(ISA_DEFAULT64); \ - done - @$(MAKECOOKIE) +# # Backward compatibility provided by CSWlibpq +# mkdir -p $(PKGROOT)$(prefix)/postgresql/lib +# mkdir -p $(PKGROOT)$(prefix)/postgresql/lib/$(ISA_DEFAULT64) +# gln -s . $(PKGROOT)$(prefix)/postgresql/lib/$(ISA_DEFAULT) +# gln -s $(ISA_DEFAULT64) $(PKGROOT)$(prefix)/postgresql/lib/64 +# gln -s $(ISA_DEFAULT) $(PKGROOT)$(prefix)/postgresql/lib/32 +# for f in $(PKGROOT)$(prefix)/lib/*.so.*; do \ +# ln -s \ +# ../../lib/`basename $${f}` \ +# $(PKGROOT)$(prefix)/postgresql/lib; \ +# done +# for f in $(PKGROOT)$(prefix)/lib/$(ISA_DEFAULT64)/lib*.so.*; do \ +# ln -s \ +# ../../lib/$(ISA_DEFAULT64)/`basename $${f}` \ +# $(PKGROOT)$(prefix)/postgresql/lib/$(ISA_DEFAULT64); \ +# done +# @$(MAKECOOKIE) Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/checksums =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/checksums 2011-12-02 15:57:28 UTC (rev 16346) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/checksums 2011-12-02 20:22:18 UTC (rev 16347) @@ -1 +1 @@ -56e8796510afb6a268d512f0ca262ddf postgresql-8.3.13.tar.bz2 +92004b0494b646748a1f562cea7d695e postgresql-8.3.16.tar.bz2 Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswusergroup.tmpl =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswusergroup.tmpl 2011-12-02 15:57:28 UTC (rev 16346) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswusergroup.tmpl 2011-12-02 20:22:18 UTC (rev 16347) @@ -1 +1 @@ -postgres::CSW Postgres:@PGDATA@:/bin/sh:: +postgres::CSW Postgres:@PGLOCALSTATEDIR_BASE@:/bin/sh:: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sat Dec 3 10:36:09 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 03 Dec 2011 09:36:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[16348] csw/mgar/pkg/gdk-pixbuf/trunk/Makefile Message-ID: Revision: 16348 http://gar.svn.sourceforge.net/gar/?rev=16348&view=rev Author: guengel Date: 2011-12-03 09:36:08 +0000 (Sat, 03 Dec 2011) Log Message: ----------- gdk-pixbuf/trunk: Added BUILD_DEP_PKGS Modified Paths: -------------- csw/mgar/pkg/gdk-pixbuf/trunk/Makefile Modified: csw/mgar/pkg/gdk-pixbuf/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdk-pixbuf/trunk/Makefile 2011-12-02 20:22:18 UTC (rev 16347) +++ csw/mgar/pkg/gdk-pixbuf/trunk/Makefile 2011-12-03 09:36:08 UTC (rev 16348) @@ -24,6 +24,13 @@ RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibpng12-0 RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWglib2 +BUILD_DEP_PKGS = CSWggettext-dev +BUILD_DEP_PKGS += CSWlibiconv-dev +BUILD_DEP_PKGS += CSWtiff +BUILD_DEP_PKGS += CSWlibpng-dev +BUILD_DEP_PKGS += CSWlibjpeg-dev +BUILD_DEP_PKGS += CSWlibglib2-dev + BUILD64 = 1 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 Sat Dec 3 14:07:15 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 03 Dec 2011 13:07:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[16349] csw/mgar/pkg/gcc4/branches/ada-enable/Makefile Message-ID: Revision: 16349 http://gar.svn.sourceforge.net/gar/?rev=16349&view=rev Author: wahwah Date: 2011-12-03 13:07:15 +0000 (Sat, 03 Dec 2011) Log Message: ----------- gcc4/branches/ada-enable: work in progress. Modified Paths: -------------- csw/mgar/pkg/gcc4/branches/ada-enable/Makefile Modified: csw/mgar/pkg/gcc4/branches/ada-enable/Makefile =================================================================== --- csw/mgar/pkg/gcc4/branches/ada-enable/Makefile 2011-12-03 09:36:08 UTC (rev 16348) +++ csw/mgar/pkg/gcc4/branches/ada-enable/Makefile 2011-12-03 13:07:15 UTC (rev 16349) @@ -1,10 +1,4 @@ # $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.2 @@ -36,7 +30,7 @@ ## Source URLs VENDOR_URL = http://gcc.gnu.org -GCC4_CC_HOME = $(HOME)/usr-$(GARCH) +GCC4_CC_HOME = $(HOME)/usr-$(GARCH)-$(GAROSREL) ## Copyright File LICENSE = COPYING3 @@ -77,13 +71,11 @@ CONFIGURE_ARGS += --with-cloog=$(BUILD_PREFIX) CONFIGURE_ARGS += --enable-cloog-backend=isl CONFIGURE_ARGS += --enable-java-awt=xlib -# CONFIGURE_ARGS += --enable-libada +CONFIGURE_ARGS += --enable-libada CONFIGURE_ARGS += --enable-libssp CONFIGURE_ARGS += --enable-objc-gc CONFIGURE_ARGS += --enable-threads=posix -# 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=ada,c,c++,fortran,java,objc CONFIGURE_ARGS += --with-system-zlib=/opt/csw # there could be some abstractions in gar.conf.mk, but at the moment there @@ -119,9 +111,10 @@ # 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. -CFLAGS = -CXXFLAGS = +# CFLAGS = -D_RESTRICT_KYWD= +# CXXFLAGS = -D_RESTRICT_KYWD= + # Might be necessary, but CFLAGS_FOR_TARGET seem to be enough for now. # BOOT_CFLAGS = $(CFLAGS_FOR_TARGET) # EXTRA_EXPORTS += BOOT_FLAGS @@ -505,6 +498,41 @@ RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibiconv2 RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibiconv2 +PACKAGES += $(PKG_BASENAME)ada +SPKG_DESC_$(PKG_BASENAME)ada = GCC Ada compiler (GNAT) +RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada = $(PKG_BASENAME)core +PKGFILES_$(PKG_BASENAME)ada = $(prefix)/libexec/.*gnat1 +PKGFILES_$(PKG_BASENAME)ada += $(prefix)/lib/.*libgnat.*a +PKGFILES_$(PKG_BASENAME)ada += $(prefix)/lib/.*libgnarl.*a +PKGFILES_$(PKG_BASENAME)ada += $(prefix)/.*/adalib/.* +PKGFILES_$(PKG_BASENAME)ada += $(prefix)/.*/adainclude/.* +PKGFILES_$(PKG_BASENAME)ada += $(prefix)/info/.*gnat.* +PKGFILES_$(PKG_BASENAME)ada += $(prefix)/bin/gnat(?!ive).* +# There are static libraries, .a files in the ada package. Let them be. +CHECKPKG_OVERRIDES_CSWgcc4ada += discouraged-path-in-pkgmap +# It needs the core compiler. +CHECKPKG_OVERRIDES_CSWgcc4ada += surplus-dependency|CSWgcc4core + +RUNTIME_DEP_PKGS_CSWgcc4ada += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWgcc4ada += CSWlibppl-c4 +RUNTIME_DEP_PKGS_CSWgcc4ada += CSWlibz1 +RUNTIME_DEP_PKGS_CSWgcc4ada += CSWlibmpfr4 +RUNTIME_DEP_PKGS_CSWgcc4ada += CSWlibpwl5 +RUNTIME_DEP_PKGS_CSWgcc4ada += CSWlibmpc2 +RUNTIME_DEP_PKGS_CSWgcc4ada += CSWlibgmpxx4 +RUNTIME_DEP_PKGS_CSWgcc4ada += CSWlibisl7 +RUNTIME_DEP_PKGS_CSWgcc4ada += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWgcc4ada += CSWlibgmp10 +RUNTIME_DEP_PKGS_CSWgcc4ada += CSWlibcloog-isl2 +RUNTIME_DEP_PKGS_CSWgcc4ada += CSWlibppl9 + +PACKAGES += $(PKG_BASENAME)adart +SPKG_DESC_$(PKG_BASENAME)adart = A deprecated package +PKGFILES_$(PKG_BASENAME)adart = flying-spaghetti-monster +RUNTIME_DEP_PKGS_CSWgcc4adart += CSWlibgcc-s1 +PKGFILES_$(PKG_BASENAME)adart = $(prefix)/lib/.*libgnat.*\.so.* +PKGFILES_$(PKG_BASENAME)adart += $(prefix)/lib/.*libgnarl.*\.so.* + # Maybe it's unnecessary. # # Solaris 10 on i386 specific: # RUNTIME_DEP_PKGS_$(PKG_BASENAME)core_i386_5.10 += CSWlibiconv2 @@ -550,7 +578,8 @@ @$(MAKECOOKIE) # We need GNU find as find -PATH := /opt/csw/gnu:$(PATH) +# PATH := /opt/csw/gnu:$(PATH) +PATH := $(GCC4_CC_HOME)/bin:/opt/csw/gnu:$(PATH) # This override sets the right RPATH on libstdc++ and other libraries. LD_OPTIONS := -R/opt/csw/lib -R/opt/csw/lib/\$$ISALIST This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sat Dec 3 14:16:40 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 03 Dec 2011 13:16:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[16350] csw/mgar/pkg/gdk-pixbuf/trunk Message-ID: Revision: 16350 http://gar.svn.sourceforge.net/gar/?rev=16350&view=rev Author: guengel Date: 2011-12-03 13:16:40 +0000 (Sat, 03 Dec 2011) Log Message: ----------- gdk-pixbuf/trunk: Package split. Postinstall for querying gdk pixbuf loaders. Modified Paths: -------------- csw/mgar/pkg/gdk-pixbuf/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/gdk-pixbuf/trunk/files/CSWgdkpixbuf.postinstall Modified: csw/mgar/pkg/gdk-pixbuf/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdk-pixbuf/trunk/Makefile 2011-12-03 13:07:15 UTC (rev 16349) +++ csw/mgar/pkg/gdk-pixbuf/trunk/Makefile 2011-12-03 13:16:40 UTC (rev 16350) @@ -12,28 +12,95 @@ MASTER_SITES = $(GNOME_MIRROR) DISTFILES = $(DISTNAME).tar.xz +DISTFILES += CSWgdkpixbuf.postinstall +EXPANDVARS = CSWgdkpixbuf.postinstall + PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 PACKAGES += CSWgdkpixbuf -CATALOGNAME_CSWgdkpixbuf = gdk_pixbuf -# PKGFILES is catchall +CATALOGNAME_CSWgdkpixbuf = gdkpixbuf +SPKG_DESC_CSWgdkpixbuf = $(DESCRIPTION) +RUNTIME_DEP_PKGS_CSWgdkpixbuf = CSWlibgdk_pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgdk_pixbuf_xlib2-0-0 +RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWtiff -RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibjpeg62 RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibpng12-0 -RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWglib2 +RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibz1 + +PACKAGES += CSWlibgdk_pixbuf2-0-0 +SPKG_DESC_CSWlibgdk_pixbuf2-0-0 = $(DESCRIPTION), libgdk_pixbuf-2.0.so.0 +PKGFILES_CSWlibgdk_pixbuf2-0-0 = $(call pkgfiles_lib,libgdk_pixbuf-2.0.so.0) +RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf2-0-0 = CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf2-0-0 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf2-0-0 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf2-0-0 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf2-0-0 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf2-0-0 += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf2-0-0 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf2-0-0 += CSWlibz1 + +PACKAGES += CSWlibgdk_pixbuf_xlib2-0-0 +SPKG_DESC_CSWlibgdk_pixbuf_xlib2-0-0 = $(DESCRIPTION), libgdk_pixbuf_xlib-2.0.so.0 +PKGFILES_CSWlibgdk_pixbuf_xlib2-0-0 = $(call pkgfiles_lib,libgdk_pixbuf_xlib-2.0.so.0) +RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf_xlib2-0-0 = CSWlibgdk_pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf_xlib2-0-0 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf_xlib2-0-0 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf_xlib2-0-0 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf_xlib2-0-0 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf_xlib2-0-0 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf_xlib2-0-0 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf_xlib2-0-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf_xlib2-0-0 += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf_xlib2-0-0 += CSWlibz1 + +PACKAGES += CSWgdkpixbuf-loaders +CATALOGNAME_CSWgdkpixbuf-loaders = gdkpixbuf_loaders +SPKG_DESC_CSWgdkpixbuf-loaders = $(DESCRIPTION), loader modules +PKGFILES_CSWgdkpixbuf-loaders = .*/loaders/.*\.so +RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders = CSWlibgdk_pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWjbigkit +RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibz1 +RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWtiff + +PACKAGES += CSWgdkpixbuf-dev +CATALOGNAME_CSWgdkpixbuf-dev = gdkpixbuf_dev +SPKG_DESC_CSWgdkpixbuf-dev = Developtment files $(DESCRIPTION) +PKGFILES_CSWgdkpixbuf-dev = $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWgdkpixbuf-dev = CSWgdkpixbuf + BUILD_DEP_PKGS = CSWggettext-dev +BUILD_DEP_PKGS += CSWjbigkit +BUILD_DEP_PKGS += CSWlibglib2-dev BUILD_DEP_PKGS += CSWlibiconv-dev +BUILD_DEP_PKGS += CSWlibintl8 +BUILD_DEP_PKGS += CSWlibjpeg-dev +BUILD_DEP_PKGS += CSWlibpng-dev BUILD_DEP_PKGS += CSWtiff -BUILD_DEP_PKGS += CSWlibpng-dev -BUILD_DEP_PKGS += CSWlibjpeg-dev -BUILD_DEP_PKGS += CSWlibglib2-dev +# I don't want to do this, but currently I see no other way to get the 32/64 +# binaries into the package. The default only includes the 32bit binaries, but +# not the 64bit ones. --raos +ISAEXEC = 1 BUILD64 = 1 -CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-libiconv-prefix +CONFIGURE_ARGS += --with-libintl-prefix include gar/category.mk Added: csw/mgar/pkg/gdk-pixbuf/trunk/files/CSWgdkpixbuf.postinstall =================================================================== --- csw/mgar/pkg/gdk-pixbuf/trunk/files/CSWgdkpixbuf.postinstall (rev 0) +++ csw/mgar/pkg/gdk-pixbuf/trunk/files/CSWgdkpixbuf.postinstall 2011-12-03 13:16:40 UTC (rev 16350) @@ -0,0 +1,37 @@ +#!/bin/sh +# +# We will call gdk-pixbuf-query-loaders for all ISAs + +GDKPBQUERY=gdk-pixbuf-query-loaders +GDKPBQUERY_OPTS="--update-cache" + +echo "** Updating GDK pixbuf loaders" + +# But first, do the obvious +/usr/bin/printf "- Default ISA... " + at prefix@/bin/${GDKPBQUERY} ${GDKPBQUERY_OPTS} >/dev/null 2>&1 +if [ $? -ne 0 ] +then + echo "Error" +else + echo "OK" +fi + +# Now, do all other +for i in @BUILD_ISAS@ +do + queryloader=@prefix@/bin/$i/gdk-pixbuf-query-loaders + if [ -x "${queryloader}" ] + then + /usr/bin/printf "- $i ISA... " + "${queryloader}" ${GDKPBQUERY_OPTS} >/dev/null 2>&1 + if [ $? -ne 0 ] + then + echo "Error" + else + echo "OK" + fi + fi +done + +echo "** Done updating GDK pixbuf loaders" 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 Dec 3 19:34:56 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 03 Dec 2011 18:34:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[16351] csw/mgar/pkg/subversion/trunk Message-ID: Revision: 16351 http://gar.svn.sourceforge.net/gar/?rev=16351&view=rev Author: rthurner Date: 2011-12-03 18:34:56 +0000 (Sat, 03 Dec 2011) Log Message: ----------- subversion, upgrade to svn-1.7.2-rc, remove external not used by mgar Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile csw/mgar/pkg/subversion/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/subversion/trunk/ Property changes on: csw/mgar/pkg/subversion/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2011-12-03 13:16:40 UTC (rev 16350) +++ csw/mgar/pkg/subversion/trunk/Makefile 2011-12-03 18:34:56 UTC (rev 16351) @@ -25,7 +25,7 @@ # http://subversion.apache.org/mailing-lists.html NAME = subversion -VERSION = 1.7.1 +VERSION = 1.7.2 CATEGORIES = utils DESCRIPTION = Version control rethought @@ -35,8 +35,8 @@ endef VENDOR_URL = http://subversion.apache.org/ -MASTER_SITES = http://archive.apache.org/dist/subversion/ -#MASTER_SITES = http://orac.ece.utexas.edu/pub/svn/1.6.7/yuletide-eggnog/ +#MASTER_SITES = http://archive.apache.org/dist/subversion/ +MASTER_SITES = http://people.apache.org/~hwright/svn/1.7.2/ DISTFILES = $(NAME)-$(VERSION).tar.bz2 BUILD_DEP_PKGS += CSWlibexpat-dev Modified: csw/mgar/pkg/subversion/trunk/checksums =================================================================== --- csw/mgar/pkg/subversion/trunk/checksums 2011-12-03 13:16:40 UTC (rev 16350) +++ csw/mgar/pkg/subversion/trunk/checksums 2011-12-03 18:34:56 UTC (rev 16351) @@ -1 +1 @@ -8a4fa74385df85a9702141b6b68b8307 subversion-1.7.1.tar.bz2 +1e5dfffd27be080672e5a042564368a8 subversion-1.7.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Dec 3 19:57:50 2011 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 03 Dec 2011 18:57:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[16352] csw/mgar/pkg/ca_certificates/trunk/files/ certdata2pem.pl Message-ID: Revision: 16352 http://gar.svn.sourceforge.net/gar/?rev=16352&view=rev Author: chninkel Date: 2011-12-03 18:57:50 +0000 (Sat, 03 Dec 2011) Log Message: ----------- cacertificates: fixed a mistake in certdata2pem.pl that caused some certificates to be ignored Modified Paths: -------------- csw/mgar/pkg/ca_certificates/trunk/files/certdata2pem.pl Modified: csw/mgar/pkg/ca_certificates/trunk/files/certdata2pem.pl =================================================================== --- csw/mgar/pkg/ca_certificates/trunk/files/certdata2pem.pl 2011-12-03 18:34:56 UTC (rev 16351) +++ csw/mgar/pkg/ca_certificates/trunk/files/certdata2pem.pl 2011-12-03 18:57:50 UTC (rev 16352) @@ -85,19 +85,21 @@ if ($line =~ /^\s*$/) { - if (exists($certdata_object->{"SERIAL_NUMBER"})) { + if (exists ($certdata_object->{"ISSUER"}) and exists ($certdata_object->{"SERIAL_NUMBER"})) { + my $serial_number = $certdata_object->{"SERIAL_NUMBER"}; - if (exists ($certificates_list->{$serial_number})) { - my $certificate = $certificates_list->{$serial_number}; + my $issuer = $certdata_object->{"ISSUER"}; - if ($certificate->{"ISSUER"} eq $certdata_object->{"ISSUER"}) { - @{$certificate}{ keys (%{$certdata_object}) } = values (%{$certdata_object}); - } + $certificates_list->{$issuer} = {} if (not exists ($certificates_list->{$issuer})); + if (exists ($certificates_list->{$issuer}->{$serial_number})) { + + my $certificate = $certificates_list->{$issuer}->{$serial_number}; + @{$certificate}{ keys (%{$certdata_object}) } = values (%{$certdata_object}); + } else { - $certificates_list->{$serial_number} = $certdata_object; + $certificates_list->{$issuer}->{$serial_number} = $certdata_object; } - } $certdata_object = {}; next; @@ -124,29 +126,33 @@ } -foreach my $certificate (values(%{$certificates_list})) { - my $trusted = 1; - foreach my $trust ("TRUST_SERVER_AUTH", - "TRUST_EMAIL_PROTECTION", - "TRUST_CODE_SIGNING") { - if ($certificate->{$trust} eq "CKT_NSS_NOT_TRUSTED") { - $trusted = 0; +foreach my $certificates_by_issuer (values (%{$certificates_list})) { + + foreach my $certificate (values (%{$certificates_by_issuer})) { + + my $trusted = 1; + foreach my $trust ("TRUST_SERVER_AUTH", + "TRUST_EMAIL_PROTECTION", + "TRUST_CODE_SIGNING") { + if ($certificate->{$trust} eq "CKT_NSS_NOT_TRUSTED") { + $trusted = 0; + } } - } - if ($trusted) { + if ($trusted) { - my $filename = label_to_filename ($certificate->{"LABEL"}); + my $filename = label_to_filename ($certificate->{"LABEL"}); - open (FH, "> $filename"); - print FH "-----BEGIN CERTIFICATE-----\n"; - print FH encode_base64 ($certificate->{"VALUE"}); - print FH "-----END CERTIFICATE-----\n"; - close (FH); - print "Created $filename certificate\n"; + open (FH, "> $filename"); + print FH "-----BEGIN CERTIFICATE-----\n"; + print FH encode_base64 ($certificate->{"VALUE"}); + print FH "-----END CERTIFICATE-----\n"; + close (FH); + print "Created $filename certificate\n"; - } else { + } else { - print "Certificate " . $certificate->{"LABEL"} . " Not trusted\n"; + print "Certificate " . $certificate->{"LABEL"} . " Not trusted\n"; + } } } 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 Dec 3 20:11:15 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 03 Dec 2011 19:11:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[16353] csw/mgar/pkg Message-ID: Revision: 16353 http://gar.svn.sourceforge.net/gar/?rev=16353&view=rev Author: rthurner Date: 2011-12-03 19:11:15 +0000 (Sat, 03 Dec 2011) Log Message: ----------- berkely-db: new version 5.2.36, copy of 5.1.x Added Paths: ----------- csw/mgar/pkg/bdb52/ csw/mgar/pkg/bdb52/Makefile csw/mgar/pkg/bdb52/branches/ csw/mgar/pkg/bdb52/tags/ csw/mgar/pkg/bdb52/trunk/ csw/mgar/pkg/bdb52/trunk/Makefile csw/mgar/pkg/bdb52/trunk/checksums csw/mgar/pkg/bdb52/trunk/files/ Added: csw/mgar/pkg/bdb52/Makefile =================================================================== --- csw/mgar/pkg/bdb52/Makefile (rev 0) +++ csw/mgar/pkg/bdb52/Makefile 2011-12-03 19:11:15 UTC (rev 16353) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/bdb52/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/bdb52/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb52/trunk/Makefile (rev 0) +++ csw/mgar/pkg/bdb52/trunk/Makefile 2011-12-03 19:11:15 UTC (rev 16353) @@ -0,0 +1,101 @@ +NAME = db +VERSION = 5.1.29 +CATEGORIES = lib + +DESCRIPTION = Berkeley DB 5.1 +define BLURB + Berkeley DB (libdb) is a programmatic toolkit that provides embedded database + support for both traditional and client/server applications. It includes + b+tree, queue, extended linear hashing, fixed, and variable-length record + access methods, transactions, locking, logging, shared memory caching and + database recovery. DB supports C, C++, Java, and Perl APIs. It is available + for a wide variety of UNIX platforms as well as Windows NT and Windows 95 + (MSVC 4, 5 and 6). +endef + +MASTER_SITES = http://download.oracle.com/berkeley-db/ +DISTFILES = $(NAME)-$(VERSION).tar.gz + +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +WORKSRC = $(WORKDIR)/$(NAME)-$(VERSION)/build_unix + +PATCHDIR = $(WORKSRC)/.. +PATCHDIRLEVEL = 0 +PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*)) +RELEASE = p$(words $(filter patch.$(VERSION).%,$(PATCHFILES))) + +BUILD64 = 1 + +CONFIGURE_SCRIPTS = dist + +prefix = $(BUILD_PREFIX)/bdb51 +docdir = $(BUILD_PREFIX)/share/doc + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-compat185 +CONFIGURE_ARGS += --enable-o_direct +# No longer there in 4.8 +#CONFIGURE_ARGS += --enable-rpc +CONFIGURE_ARGS += --enable-cxx +CONFIGURE_ARGS += --enable-java + +# Exclude TCL support for 64 bit until we have a 64 bit TCL +CONFIGURE_ARGS-mm-32 = --enable-tcl --with-tcl=$(libpath) +CONFIGURE_ARGS += $(CONFIGURE_ARGS-mm-$(MEMORYMODEL)) + +# bdb tests are *very* time consuming +TEST_SCRIPTS = + +PACKAGES = CSWbdb51 CSWbdb51devel CSWbdb51doc + +CATALOGNAME_CSWbdb51 = berkeleydb51 +SPKG_DESC_CSWbdb51 = BerkeleyDB 5.1 embedded database libraries and utilities +RUNTIME_DEP_PKGS_CSWbdb51 += CSWbdb51devel + +CATALOGNAME_CSWbdb51devel = berkeleydb51_devel +SPKG_DESC_CSWbdb51devel = BerkeleyDB 5.1 development support +PKGFILES_CSWbdb51devel = $(PKGFILES_DEVEL) + +CATALOGNAME_CSWbdb51doc = berkeleydb51_doc +SPKG_DESC_CSWbdb51doc = BerkeleyDB 5.1 documentation +PKGFILES_CSWbdb51doc = $(PKGFILES_DOC) + +ARCHALL_CSWbdb51doc = 1 + + +SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html + +LICENSE = LICENSE + +EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb51),' +EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* $(libdir)/db.jar +EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* $(libdir)/db.jar + +# Remove the license from share/doc/berkeleydb/license/.* +# because GAR expects license to be a file instead of a directory +EXTRA_MERGE_EXCLUDE_FILES = .*/license.* + + +include gar/category.mk + +LIBS += -lnsl +export LIBS + +JAVA_HOME := /usr/jdk1.6.0_20 +export JAVA_HOME +PATH := $(JAVA_HOME)/bin:$(PATH) +export PATH + +configure-dist: + @( cd $(WORKSRC) ; $(CONFIGURE_ENV) ../dist/configure $(CONFIGURE_ARGS) ) + @$(MAKECOOKIE) + +post-merge: + gln -s . $(PKGROOT)$(libdir)/32 + gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 + @$(MAKECOOKIE) + +SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE) + Property changes on: csw/mgar/pkg/bdb52/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/bdb52/trunk/checksums =================================================================== 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 Dec 3 20:15:50 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 03 Dec 2011 19:15:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[16354] csw/mgar/pkg/bdb52/trunk Message-ID: Revision: 16354 http://gar.svn.sourceforge.net/gar/?rev=16354&view=rev Author: rthurner Date: 2011-12-03 19:15:50 +0000 (Sat, 03 Dec 2011) Log Message: ----------- bdb-5.2.36, update makefile and checksums Modified Paths: -------------- csw/mgar/pkg/bdb52/trunk/Makefile csw/mgar/pkg/bdb52/trunk/checksums Modified: csw/mgar/pkg/bdb52/trunk/Makefile =================================================================== --- csw/mgar/pkg/bdb52/trunk/Makefile 2011-12-03 19:11:15 UTC (rev 16353) +++ csw/mgar/pkg/bdb52/trunk/Makefile 2011-12-03 19:15:50 UTC (rev 16354) @@ -1,8 +1,8 @@ NAME = db -VERSION = 5.1.29 +VERSION = 5.2.36 CATEGORIES = lib -DESCRIPTION = Berkeley DB 5.1 +DESCRIPTION = Berkeley DB 5.2 define BLURB Berkeley DB (libdb) is a programmatic toolkit that provides embedded database support for both traditional and client/server applications. It includes @@ -30,7 +30,7 @@ CONFIGURE_SCRIPTS = dist -prefix = $(BUILD_PREFIX)/bdb51 +prefix = $(BUILD_PREFIX)/bdb52 docdir = $(BUILD_PREFIX)/share/doc CONFIGURE_ARGS = $(DIRPATHS) @@ -48,28 +48,28 @@ # bdb tests are *very* time consuming TEST_SCRIPTS = -PACKAGES = CSWbdb51 CSWbdb51devel CSWbdb51doc +PACKAGES = CSWbdb52 CSWbdb52dev CSWbdb52doc -CATALOGNAME_CSWbdb51 = berkeleydb51 -SPKG_DESC_CSWbdb51 = BerkeleyDB 5.1 embedded database libraries and utilities -RUNTIME_DEP_PKGS_CSWbdb51 += CSWbdb51devel +CATALOGNAME_CSWbdb52 = berkeleydb52 +SPKG_DESC_CSWbdb52 = BerkeleyDB 5.2 embedded database libraries and utilities +RUNTIME_DEP_PKGS_CSWbdb52 += CSWbdb52dev -CATALOGNAME_CSWbdb51devel = berkeleydb51_devel -SPKG_DESC_CSWbdb51devel = BerkeleyDB 5.1 development support -PKGFILES_CSWbdb51devel = $(PKGFILES_DEVEL) +CATALOGNAME_CSWbdb52dev = berkeleydb52_dev +SPKG_DESC_CSWbdb52dev = BerkeleyDB 5.2 development support +PKGFILES_CSWbdb52dev = $(PKGFILES_DEVEL) -CATALOGNAME_CSWbdb51doc = berkeleydb51_doc -SPKG_DESC_CSWbdb51doc = BerkeleyDB 5.1 documentation -PKGFILES_CSWbdb51doc = $(PKGFILES_DOC) +CATALOGNAME_CSWbdb52doc = berkeleydb52_doc +SPKG_DESC_CSWbdb52doc = BerkeleyDB 5.2 documentation +PKGFILES_CSWbdb52doc = $(PKGFILES_DOC) -ARCHALL_CSWbdb51doc = 1 +ARCHALL_CSWbdb52doc = 1 SPKG_SOURCEURL = http://www.oracle.com/technology/software/products/berkeley-db/db/index.html LICENSE = LICENSE -EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb51),' +EXTRA_PAX_ARGS += -s ',^\.$(prefix)/docs,.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME_CSWbdb52),' EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.* $(libdir)/db.jar EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.* $(libdir)/db.jar Modified: csw/mgar/pkg/bdb52/trunk/checksums =================================================================== --- csw/mgar/pkg/bdb52/trunk/checksums 2011-12-03 19:11:15 UTC (rev 16353) +++ csw/mgar/pkg/bdb52/trunk/checksums 2011-12-03 19:15:50 UTC (rev 16354) @@ -0,0 +1 @@ +88466dd6c13d5d8cddb406be8a1d4d92 db-5.2.36.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Dec 3 20:16:24 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 03 Dec 2011 19:16:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[16355] csw/mgar/pkg/bdb52/trunk/ Message-ID: Revision: 16355 http://gar.svn.sourceforge.net/gar/?rev=16355&view=rev Author: rthurner Date: 2011-12-03 19:16:24 +0000 (Sat, 03 Dec 2011) Log Message: ----------- remove unnecessary svn:external Property Changed: ---------------- csw/mgar/pkg/bdb52/trunk/ Property changes on: csw/mgar/pkg/bdb52/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Dec 3 23:57:16 2011 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 03 Dec 2011 22:57:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[16356] csw/mgar/pkg/openssl/trunk/Makefile Message-ID: Revision: 16356 http://gar.svn.sourceforge.net/gar/?rev=16356&view=rev Author: chninkel Date: 2011-12-03 22:57:16 +0000 (Sat, 03 Dec 2011) Log Message: ----------- openssl: fixed various checkpkg errors Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2011-12-03 19:16:24 UTC (rev 16355) +++ csw/mgar/pkg/openssl/trunk/Makefile 2011-12-03 22:57:16 UTC (rev 16356) @@ -33,6 +33,7 @@ CATALOGNAME_CSWopenssl = openssl RUNTIME_DEP_PKGS_CSWopenssl = CSWlibssl-dev CSWopenssl-utils CSWlibssl0-9-8 ARCHALL_CSWopenssl = 1 +OBSOLETED_BY_CSWopenssl = CSWossl SPKG_DESC_CSWlibssl0-9-8 = Openssl runtime libraries CATALOGNAME_CSWlibssl0-9-8 = libssl0_9_8 @@ -43,6 +44,7 @@ CATALOGNAME_CSWlibssl-dev = libssl_dev RUNTIME_DEP_PKGS_CSWlibssl-dev = CSWlibssl0-9-8 OBSOLETED_BY_CSWlibssl-dev = CSWossldevel +CHECKPKG_OVERRIDES_CSWossldevel += archall-devel-package SPKG_DESC_CSWopenssl-utils = Openssl binaries and related tools CATALOGNAME_CSWopenssl-utils = openssl_utils @@ -60,7 +62,7 @@ #CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += surplus-dependency|CSWcacertificates -# this package doesn't yet obey the new shared libraries standard +# this package contains several libraries files and we will not split CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += non-uniform-lib-versions-in-package|sonames=libcrypto.so.0.9.7,libcrypto.so.0.9.8,libssl.so.0.9.7,libssl.so.0.9.8 # we will not recompile old 0.9.7 version for now @@ -97,14 +99,15 @@ CHECKPKG_OVERRIDES_CSWopenssl += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl/INSTALL CHECKPKG_OVERRIDES_CSWopenssl += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl/CHANGES CHECKPKG_OVERRIDES_CSWopenssl += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl/FAQ -CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl_rt/FAQ -CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl_rt/INSTALL -CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl_rt/CHANGES -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl_devel/CHANGES -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl_devel/INSTALL -CHECKPKG_OVERRIDES_CSWlibssl-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl_devel/FAQ +CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += file-with-bad-content|/usr/local|root/opt/csw/share/doc/libssl0_9_8/INSTALL +CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += file-with-bad-content|/usr/local|root/opt/csw/share/doc/libssl0_9_8/FAQ +CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += file-with-bad-content|/usr/local|root/opt/csw/share/doc/libssl0_9_8/CHANGES +CHECKPKG_OVERRIDES_CSWlibssl-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/libssl_dev/CHANGES +CHECKPKG_OVERRIDES_CSWlibssl-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/libssl_dev/FAQ +CHECKPKG_OVERRIDES_CSWlibssl-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/libssl_dev/INSTALL + ###### Upstream and opencsw files information ####### MASTER_SITES = http://www.openssl.org/source/ http://openssl.org/news/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Dec 4 00:07:51 2011 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 03 Dec 2011 23:07:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[16357] csw/mgar/pkg/openssl/trunk Message-ID: Revision: 16357 http://gar.svn.sourceforge.net/gar/?rev=16357&view=rev Author: chninkel Date: 2011-12-03 23:07:51 +0000 (Sat, 03 Dec 2011) Log Message: ----------- openssl: block Malaysian's Digicert Sdn. Bhd. certificates Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/openssl/trunk/files/block_bad_certificates.patch Removed Paths: ------------- csw/mgar/pkg/openssl/trunk/files/block_diginotar.patch Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2011-12-03 22:57:16 UTC (rev 16356) +++ csw/mgar/pkg/openssl/trunk/Makefile 2011-12-03 23:07:51 UTC (rev 16357) @@ -132,9 +132,9 @@ # Update openssl.cnf path in man page to follow opencsw standard PATCHFILES += opencsw_paths.patch -# Let's always block the compromised DigiNotar CA, whatever the CA configured -# (patch taken from Debian Package) -PATCHFILES += block_diginotar.patch +# Let's always block some compromised CA, whatever the CA configured +# (patchs taken from Debian Package) +PATCHFILES += block_bad_certificates.patch LICENSE=LICENSE Copied: csw/mgar/pkg/openssl/trunk/files/block_bad_certificates.patch (from rev 16350, csw/mgar/pkg/openssl/trunk/files/block_diginotar.patch) =================================================================== --- csw/mgar/pkg/openssl/trunk/files/block_bad_certificates.patch (rev 0) +++ csw/mgar/pkg/openssl/trunk/files/block_bad_certificates.patch 2011-12-03 23:07:51 UTC (rev 16357) @@ -0,0 +1,60 @@ +From: Raphael Geissert +Description: make X509_verify_cert indicate that any certificate whose + name contains "DigiNotar" is revoked. +Origin: vendor +Forwarded: not-needed +Last-Update: 2011-09-07 +Bug: http://bugs.debian.org/639744 + +diff -urpN openssl-0.9.8o-4squeeze1.orig/crypto/x509/x509_vfy.c openssl-0.9.8o-4squeeze1/crypto/x509/x509_vfy.c +--- openssl-0.9.8o-4squeeze1.orig/crypto/x509/x509_vfy.c 2009-06-26 06:34:21.000000000 -0500 ++++ openssl-0.9.8o-4squeeze1/crypto/x509/x509_vfy.c 2011-09-07 21:23:58.000000000 -0500 +@@ -78,6 +78,7 @@ static int check_trust(X509_STORE_CTX *c + static int check_revocation(X509_STORE_CTX *ctx); + static int check_cert(X509_STORE_CTX *ctx); + static int check_policy(X509_STORE_CTX *ctx); ++static int check_ca_blacklist(X509_STORE_CTX *ctx); + static int internal_verify(X509_STORE_CTX *ctx); + const char X509_version[]="X.509" OPENSSL_VERSION_PTEXT; + +@@ -312,6 +313,9 @@ int X509_verify_cert(X509_STORE_CTX *ctx + ok=internal_verify(ctx); + if(!ok) goto end; + ++ ok = check_ca_blacklist(ctx); ++ if(!ok) goto end; ++ + #ifndef OPENSSL_NO_RFC3779 + /* RFC 3779 path validation, now that CRL check has been done */ + ok = v3_asid_validate_path(ctx); +@@ -661,6 +665,29 @@ static int check_crl_time(X509_STORE_CTX + return 1; + } + ++static int check_ca_blacklist(X509_STORE_CTX *ctx) ++ { ++ X509 *x; ++ int i; ++ /* Check all certificates against the blacklist */ ++ for (i = sk_X509_num(ctx->chain) - 1; i >= 0; i--) ++ { ++ x = sk_X509_value(ctx->chain, i); ++ /* Mark certificates containing the following names as ++ * revoked, no matter where in the chain they are. ++ */ ++ if (x->name && (strstr(x->name, "DigiNotar") || ++ strstr(x->name, "Digicert Sdn. Bhd."))) ++ { ++ ctx->error = X509_V_ERR_CERT_REVOKED; ++ ctx->error_depth = i; ++ ctx->current_cert = x; ++ if (!ctx->verify_cb(0,ctx)) ++ return 0; ++ } ++ } ++ return 1; ++ } ++ + /* Lookup CRLs from the supplied list. Look for matching isser name + * and validity. If we can't find a valid CRL return the last one + * with matching name. This gives more meaningful error codes. Otherwise Deleted: csw/mgar/pkg/openssl/trunk/files/block_diginotar.patch =================================================================== --- csw/mgar/pkg/openssl/trunk/files/block_diginotar.patch 2011-12-03 22:57:16 UTC (rev 16356) +++ csw/mgar/pkg/openssl/trunk/files/block_diginotar.patch 2011-12-03 23:07:51 UTC (rev 16357) @@ -1,59 +0,0 @@ -From: Raphael Geissert -Description: make X509_verify_cert indicate that any certificate whose - name contains "DigiNotar" is revoked. -Origin: vendor -Forwarded: not-needed -Last-Update: 2011-09-07 -Bug: http://bugs.debian.org/639744 - -diff -urpN openssl-0.9.8o-4squeeze1.orig/crypto/x509/x509_vfy.c openssl-0.9.8o-4squeeze1/crypto/x509/x509_vfy.c ---- openssl-0.9.8o-4squeeze1.orig/crypto/x509/x509_vfy.c 2009-06-26 06:34:21.000000000 -0500 -+++ openssl-0.9.8o-4squeeze1/crypto/x509/x509_vfy.c 2011-09-07 21:23:58.000000000 -0500 -@@ -78,6 +78,7 @@ static int check_trust(X509_STORE_CTX *c - static int check_revocation(X509_STORE_CTX *ctx); - static int check_cert(X509_STORE_CTX *ctx); - static int check_policy(X509_STORE_CTX *ctx); -+static int check_ca_blacklist(X509_STORE_CTX *ctx); - static int internal_verify(X509_STORE_CTX *ctx); - const char X509_version[]="X.509" OPENSSL_VERSION_PTEXT; - -@@ -312,6 +313,9 @@ int X509_verify_cert(X509_STORE_CTX *ctx - ok=internal_verify(ctx); - if(!ok) goto end; - -+ ok = check_ca_blacklist(ctx); -+ if(!ok) goto end; -+ - #ifndef OPENSSL_NO_RFC3779 - /* RFC 3779 path validation, now that CRL check has been done */ - ok = v3_asid_validate_path(ctx); -@@ -661,6 +665,29 @@ static int check_crl_time(X509_STORE_CTX - return 1; - } - -+static int check_ca_blacklist(X509_STORE_CTX *ctx) -+ { -+ X509 *x; -+ int i; -+ /* Check all certificates against the blacklist */ -+ for (i = sk_X509_num(ctx->chain) - 1; i >= 0; i--) -+ { -+ x = sk_X509_value(ctx->chain, i); -+ /* Mark DigiNotar certificates as revoked, no matter -+ * where in the chain they are. -+ */ -+ if (x->name && strstr(x->name, "DigiNotar")) -+ { -+ ctx->error = X509_V_ERR_CERT_REVOKED; -+ ctx->error_depth = i; -+ ctx->current_cert = x; -+ if (!ctx->verify_cb(0,ctx)) -+ return 0; -+ } -+ } -+ return 1; -+ } -+ - /* Lookup CRLs from the supplied list. Look for matching isser name - * and validity. If we can't find a valid CRL return the last one - * with matching name. This gives more meaningful error codes. Otherwise This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Dec 4 07:54:37 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 04 Dec 2011 06:54:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[16358] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 16358 http://gar.svn.sourceforge.net/gar/?rev=16358&view=rev Author: rthurner Date: 2011-12-04 06:54:37 +0000 (Sun, 04 Dec 2011) Log Message: ----------- subversion, move overrides to the package it belongs to Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2011-12-03 23:07:51 UTC (rev 16357) +++ csw/mgar/pkg/subversion/trunk/Makefile 2011-12-04 06:54:37 UTC (rev 16358) @@ -48,6 +48,24 @@ CATALOGNAME_CSWsvn = subversion CHECKPKG_OVERRIDES_CSWsvn += catalogname-does-not-match-pkgname|pkgname=CSWsvn|catalogname=subversion|expected-catalogname=svn CHECKPKG_OVERRIDES_CSWsvn += license-missing|/opt/csw/share/doc/subversion/license +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/repos.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/wc.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/__init__.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/client.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/core.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/delta.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/diff.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/fs.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/ra.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/repos.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/wc.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/__init__.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/client.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/core.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/delta.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/diff.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/fs.pyc +CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/ra.pyc RUNTIME_DEP_PKGS_CSWsvn = CSWbdb48 RUNTIME_DEP_PKGS_CSWsvn += CSWsasl RUNTIME_DEP_PKGS_CSWsvn += CSWlibmagic1 @@ -189,24 +207,7 @@ PKGFILES_CSWpythonsvn = $(libdir)/python.* PKGFILES_CSWpythonsvn += $(SVNLIB)/.*swig_py.* PKGFILES_CSWpythonsvn += $(docdir)/$(CATALOGNAME_CSWpythonsvn)/changelog.CSW -CHECKPKG_OVERRIDES_CSWpythonsvn += action-class-only-in-pkginfo|none CHECKPKG_OVERRIDES_CSWpythonsvn += license-missing|/opt/csw/share/doc/pythonsvn/license -CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/__init__.pyc -CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/client.pyc -CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/core.pyc -CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/delta.pyc -CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/diff.pyc -CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/fs.pyc -CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/ra.pyc -CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/repos.pyc -CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/wc.pyc -CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/__init__.pyc -CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/client.pyc -CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/core.pyc -CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/delta.pyc -CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/diff.pyc -CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/fs.pyc -CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/ra.pyc RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibmagic1 RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibexpat1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Dec 4 08:07:43 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 04 Dec 2011 07:07:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[16359] csw/mgar/pkg/sqlite3/trunk Message-ID: Revision: 16359 http://gar.svn.sourceforge.net/gar/?rev=16359&view=rev Author: rthurner Date: 2011-12-04 07:07:43 +0000 (Sun, 04 Dec 2011) Log Message: ----------- sqlite upgrade to 3.7.9 Modified Paths: -------------- csw/mgar/pkg/sqlite3/trunk/Makefile csw/mgar/pkg/sqlite3/trunk/checksums Modified: csw/mgar/pkg/sqlite3/trunk/Makefile =================================================================== --- csw/mgar/pkg/sqlite3/trunk/Makefile 2011-12-04 06:54:37 UTC (rev 16358) +++ csw/mgar/pkg/sqlite3/trunk/Makefile 2011-12-04 07:07:43 UTC (rev 16359) @@ -1,5 +1,5 @@ NAME = sqlite3 -VERSION = 3070800 +VERSION = 3070900 CATEGORIES = lib DESCRIPTION = An embeddable SQL engine in a C library Modified: csw/mgar/pkg/sqlite3/trunk/checksums =================================================================== --- csw/mgar/pkg/sqlite3/trunk/checksums 2011-12-04 06:54:37 UTC (rev 16358) +++ csw/mgar/pkg/sqlite3/trunk/checksums 2011-12-04 07:07:43 UTC (rev 16359) @@ -1,2 +1,2 @@ fc9432136482bcde03102bc3e06dd413 copyright-release.html -6bfb46d73caaa1bbbcd2b52184b6c542 sqlite-autoconf-3070800.tar.gz +dce303524736fe89a76b8ed29d566352 sqlite-autoconf-3070900.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Dec 4 13:59:19 2011 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 04 Dec 2011 12:59:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[16360] csw/mgar/pkg/openssl/trunk/files/ block_bad_certificates.patch Message-ID: Revision: 16360 http://gar.svn.sourceforge.net/gar/?rev=16360&view=rev Author: chninkel Date: 2011-12-04 12:59:19 +0000 (Sun, 04 Dec 2011) Log Message: ----------- openssl: fixed error in block_bad_certificates.patch Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/files/block_bad_certificates.patch Modified: csw/mgar/pkg/openssl/trunk/files/block_bad_certificates.patch =================================================================== --- csw/mgar/pkg/openssl/trunk/files/block_bad_certificates.patch 2011-12-04 07:07:43 UTC (rev 16359) +++ csw/mgar/pkg/openssl/trunk/files/block_bad_certificates.patch 2011-12-04 12:59:19 UTC (rev 16360) @@ -27,7 +27,7 @@ #ifndef OPENSSL_NO_RFC3779 /* RFC 3779 path validation, now that CRL check has been done */ ok = v3_asid_validate_path(ctx); -@@ -661,6 +665,29 @@ static int check_crl_time(X509_STORE_CTX +@@ -661,6 +666,30 @@ static int check_crl_time(X509_STORE_CTX return 1; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Dec 4 14:02:53 2011 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sun, 04 Dec 2011 13:02:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[16361] csw/mgar/pkg/openssl/trunk/Makefile Message-ID: Revision: 16361 http://gar.svn.sourceforge.net/gar/?rev=16361&view=rev Author: chninkel Date: 2011-12-04 13:02:53 +0000 (Sun, 04 Dec 2011) Log Message: ----------- openssl: fixed some checkpkg errors Modified Paths: -------------- csw/mgar/pkg/openssl/trunk/Makefile Modified: csw/mgar/pkg/openssl/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl/trunk/Makefile 2011-12-04 12:59:19 UTC (rev 16360) +++ csw/mgar/pkg/openssl/trunk/Makefile 2011-12-04 13:02:53 UTC (rev 16361) @@ -34,11 +34,13 @@ RUNTIME_DEP_PKGS_CSWopenssl = CSWlibssl-dev CSWopenssl-utils CSWlibssl0-9-8 ARCHALL_CSWopenssl = 1 OBSOLETED_BY_CSWopenssl = CSWossl +CHECKPKG_OVERRIDES_CSWossl += surplus-dependency|CSWopenssl SPKG_DESC_CSWlibssl0-9-8 = Openssl runtime libraries CATALOGNAME_CSWlibssl0-9-8 = libssl0_9_8 RUNTIME_DEP_PKGS_CSWlibssl0-9-8 = CSWcacertificates OBSOLETED_BY_CSWlibssl0-9-8 = CSWosslrt +CHECKPKG_OVERRIDES_CSWosslrt += surplus-dependency|CSWlibssl0-9-8 SPKG_DESC_CSWlibssl-dev = Openssl development libraries and headers CATALOGNAME_CSWlibssl-dev = libssl_dev @@ -51,6 +53,7 @@ RUNTIME_DEP_PKGS_CSWopenssl-utils = CSWlibssl0-9-8 SPKG_CLASSES_CSWopenssl-utils = none cswpreserveconf OBSOLETED_BY_CSWopenssl-utils = CSWosslutils +CHECKPKG_OVERRIDES_CSWosslutils += surplus-dependency|CSWopenssl-utils # openssl is a meta-package CHECKPKG_OVERRIDES_CSWopenssl += surplus-dependency|CSWopenssl-utils This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Dec 4 16:24:16 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 04 Dec 2011 15:24:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[16362] csw/mgar/pkg/postgresql/branches/postgresql-8. 3-raos Message-ID: Revision: 16362 http://gar.svn.sourceforge.net/gar/?rev=16362&view=rev Author: guengel Date: 2011-12-04 15:24:16 +0000 (Sun, 04 Dec 2011) Log Message: ----------- postgresql/branches/postgresql-8.3-raos: Alternatives in place. Package split done. Contrib stuff still missing. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/postgresql.conf.tmpl Added Paths: ----------- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswpostgresql.tmpl csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/pgconf.mk Removed Paths: ------------- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswpostgres.tmpl Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile 2011-12-04 13:02:53 UTC (rev 16361) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile 2011-12-04 15:24:16 UTC (rev 16362) @@ -29,8 +29,40 @@ # is unversioned and cannot be changed by passing arguments to configure. This # shortcoming can be lifted by adjusting $(pkglibdir) in # $(WORKSRC)/src/Makefile.global.in which is what we do. +# +# +# Note 3: Alternatives +# ------ +# +# I was unable to get the alternatives system to work with using +# +# ALTERNATIVES_CSWpostgresql83-server = server_amd64 server_pentium_pro +# +# and then defining those alternatives. /opt/csw/sbin/alternatives choked on +# the one file generated for server containing two distinct alternatives. So I +# cooked my own soup: +# +# 1. Create for server, client, contrib, devel separate files containing the +# alternatives for the ISAs +# +# 2. Adjust the prototype to add include the class 'cswalternatives' for the +# files in question. +# +# The problem appeared to be having two lines in the same file. So my approach +# is to generate one file per line of alternatives. +# +# +# Note 4: New upstream releases +# ------ +# +# 1. Adjust BASE_VERSION and/or PATCHLEVEL. +# +# 2. `mgar merge` +# +# 3. If step 2 succeeded, check the prototype of +# CSW$(NAME)$(BASE_VERSION_NODOT) for files that have slipped by and put +# them in the proper place. - # This BUILD is NOT READY! It needs work before it's usable. # TODO: Initialize the database cluster during installation if not already @@ -45,7 +77,7 @@ NAME = postgresql BASE_VERSION = 8.3 VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) -BASE_VERSION_G = $(subst .,,$(BASE_VERSION)) +BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION)) PATCHLEVEL = 16 VERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = apps @@ -58,22 +90,148 @@ define BLURB endef -MIGRATE_FILES_CSWpostgresql-$(BASE_VERSION_G) = postgresql.conf -MIGRATE_DEST_DIR_CSWpostgresql-$(BASE_VERSION_G) = $(sysconfdir) +# Here we will fetch various variables that are used in this recipe. I decided +# to place those in a separate file for the sake of uncluttering this recipe. +# +# Many of the varibles defined in pgconf.mk depend on the various $(VERSION*) +# variables. +include pgconf.mk +EXPANDVARS = CSWpostgresql-$(BASE_VERSION_NODOT).postinstall +EXPANDVARS += $(INITSCRIPTFILETMPL) +EXPANDVARS += $(USERGROUPFILETMPL) +EXPANDVARS += $(CSWPGSQLCONFFILETMPL) + MASTER_SITES = http://ftp.postgresql.org/pub/source/v$(VERSION)/ DISTFILES = $(NAME)-$(VERSION).tar.bz2 -DISTFILES += cswpostgres.tmpl -DISTFILES += cswusergroup.tmpl -DISTFILES += postgresql.conf.tmpl DISTFILES += README-CSW.txt -DISTFILES += CSWpostgresql-$(BASE_VERSION_G).postinstall +DISTFILES += $(EXPANDVARS) -# ARCHALL_CSWpostgresql = 1 -# ARCHALL_CSWpostgresql-$(BASE_VERSION_G)-doc = 1 +INITSMF = $(sysconfdir)/init\.d/$(INITSCRIPTFILE_VERSIONED) +USERGROUP = $(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED) +PRESERVECONF = $(sysconfdir)/$(CSWPGSQLCONFFILE_VERSIONED) LICENSE = COPYRIGHT +PROTOTYPE_MODIFIERS = pgdata alternatives +PROTOTYPE_FILES_pgdata = $(PGLOCALSTATEDIR_BASE).* +PROTOTYPE_USER_pgdata = postgres +PROTOTYPE_GROUP_pgdata = sys +PROTOTYPE_PERMS_pgdata = 0700 +PROTOTYPE_CLASS_pgdata = ugfiles + +PROTOTYPE_FILES_alternatives = .*/alternatives/$(NAME)$(BASE_VERSION_NODOT).* +PROTOTYPE_CLASS_alternatives = cswalternatives + +# This is the catchall package. It should not contain any files from +# $(PKGROOT). After building all the packages, I check the prototype of this +# package to make sure there are no files slipped by. +PACKAGES = CSW$(NAME)$(BASE_VERSION_NODOT) +SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT) = PostgreSQL $(VERSION), Meta Package +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT) = CSW$(NAME)$(BASE_VERSION_NODOT)-server +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT) += CSW$(NAME)$(BASE_VERSION_NODOT)-client +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT) += CSW$(NAME)$(BASE_VERSION_NODOT)-contrib +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT) += CSW$(NAME)$(BASE_VERSION_NODOT)-devel + +PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-server +CATALOGNAME_CSW$(NAME)$(BASE_VERSION_NODOT)-server = $(NAME)$(BASE_VERSION_NODOT)_server +SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-server = PostgreSQL $(VERSION), Server +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server = $(foreach n,$(BIN_NAMES_SERVER),.*$(n)$$) +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += $(foreach n,$(BIN_NAMES_SERVER),.*/man1/$(n)\.1$$) +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += $(foreach n,$(SO_NAMES_SERVER),.*/$(NAME)/$(BASE_VERSION_NODOT)/*$(n)$$) +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += $(MISC_NAMES_SERVER) +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*/$(NAME)/$(BASE_VERSION_NODOT)/timezone(sets|)/.* +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*/$(NAME)/$(BASE_VERSION_NODOT)/tsearch_.*/.* +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += $(PGLOCALSTATEDIR_BASE).* +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*$(USERGROUP) +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*$(sysconfdir)/init\.d/.* +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*$(sysconfdir)/$(CSWPGSQLCONFFILE_VERSIONED).CSW +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_server.* +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server = CSWlibiconv2 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibncurses5 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibreadline6 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibxml2 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibxslt +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWosslrt +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibz1 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWalternatives +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibpq5-1 +#ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-server = $(foreach i,$(BUILD_ISAS), server_$(i)) + + +PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-client +CATALOGNAME_CSW$(NAME)$(BASE_VERSION_NODOT)-client = $(NAME)$(BASE_VERSION_NODOT)_client +SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-client = PostgreSQL $(VERSION), Client +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client = $(foreach n,$(BIN_NAMES_CLIENT),.*$(n)$$) +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += $(foreach n,$(BIN_NAMES_CLIENT),.*/man1/$(n)\.1$$) +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += $(MISC_NAMES_CLIENT) +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_client.* +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client = CSWlibiconv2 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibncurses5 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibreadline6 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibxml2 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibxslt +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWosslrt +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibz1 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibpq5-1 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWalternatives +#ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-client = $(foreach i,$(BUILD_ISAS), client_$(i)) + + +PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-contrib +CATALOGNAME_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = $(NAME)$(BASE_VERSION_NODOT)_contrib +SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = PostgreSQL $(VERSION), Contrib +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = $(foreach n,$(BIN_NAMES_CONTRIB),.*$(n)$$) +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += $(foreach n,$(BIN_NAMES_CONTRIB),.*/man1/$(n)\.1$$) +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_contrib.* +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWalternatives +#ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = $(foreach i,$(BUILD_ISAS), contrib_$(i)) + + +PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-devel +CATALOGNAME_CSW$(NAME)$(BASE_VERSION_NODOT)-devel = $(NAME)$(BASE_VERSION_NODOT)_devel +SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-devel = PostgreSQL $(VERSION), Development Files +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-devel = .*/pgxs/.* +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-devel += $(PKGFILES_DEVEL) +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-devel += $(foreach n,$(BIN_NAMES_DEVEL),.*$(n)$$) +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-devel += $(foreach n,$(BIN_NAMES_DEVEL),.*/man1/$(n)\.1$$) +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-devel += .*/man5/.* +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-devel += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_devel.* +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-devel += CSWalternatives +#ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-devel = $(foreach i,$(BUILD_ISAS), devel_$(i)) + +PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-doc +ARCHALL_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = 1 +CATALOGNAME_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = $(NAME)$(BASE_VERSION_NODOT)_doc +SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = PostgreSQL $(VERSION), Documentation Files +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = .*/doc/$(NAME)/$(BASE_VERSION_NODOT)/.* + +PACKAGES += CSWlibecpg_compat3-0 +CATALOGNAME_CSWlibecpg_compat3-0 = libecpg_compat3_0 +SPKG_DESC_CSWlibecpg_compat3-0 = PostgreSQL $(VERSION), libecpg_compat +PKGFILES_CSWlibecpg_compat3-0 = $(call pkgfiles_lib,libecpg_compat.so.3) +RUNTIME_DEP_PKGS_CSWlibecpg_compat3-0 = CSWlibecpg6-0 +RUNTIME_DEP_PKGS_CSWlibecpg_compat3-0 += CSWlibpgtypes3-0 +RUNTIME_DEP_PKGS_CSWlibecpg_compat3-0 += CSWlibpq5-1 + +PACKAGES += CSWlibecpg6-0 +CATALOGNAME_CSWlibecpg6-0 = libecpg6_0 +SPKG_DESC_CSWlibecpg6-0 = PostgreSQL $(VERSION), libecpg +PKGFILES_CSWlibecpg6-0 = $(call pkgfiles_lib,libecpg.so.6) +RUNTIME_DEP_PKGS_CSWlibecpg6-0 += CSWlibpgtypes3-0 +RUNTIME_DEP_PKGS_CSWlibecpg6-0 += CSWlibpq5-1 + +PACKAGES += CSWlibpgtypes3-0 +CATALOGNAME_CSWlibpgtypes3-0 = libpgtypes3_0 +SPKG_DESC_CSWlibpgtypes3-0 = PostgreSQL $(VERSION), libpgtypes +PKGFILES_CSWlibpgtypes3-0 = $(call pkgfiles_lib,libpgtypes.so.3) + +PACKAGES += CSWlibpq5-1 +CATALOGNAME_CSWlibpq5-1 = libpq5_1 +SPKG_DESC_CSWlibpq5-1 = PostgreSQL $(VERSION), libpq +PKGFILES_CSWlibpq5-1 = $(call pkgfiles_lib,libpq.so.5) +RUNTIME_DEP_PKGS_CSWlibpq5-1 = CSWosslrt + BUILD_DEP_PKGS = CSWlibxml2-dev BUILD_DEP_PKGS += CSWlibxslt-dev BUILD_DEP_PKGS += CSWperl @@ -83,15 +241,9 @@ BUILD_DEP_PKGS += CSWgsed # gsed is used in this recipe BUILD_DEP_PKGS += CSWlibz-dev -# Why's that? --raos -# -# EXTRA_INC = $(BUILD_PREFIX)/include -# EXTRA_LIB = $(BUILD_PREFIX)/lib - EXTRA_LD_OPTIONS = -R$(prefix)/lib/\$$ISALIST BUILD64 = 1 - # There was a discussion about whether to use ISAEXEC by default. The argument # is that enabling 64-bit by default where possible (using isaexec) is a waste. # I'm not completely convinced. Leaving this line commented out for future @@ -105,21 +257,7 @@ # 64-bit versions? ISAEXEC = 0 -# -# Postgres specific variables -# -PGBINDIR = $(libexecdir)/$(NAME)/$(BASE_VERSION_G) -PGSBINDIR = $(libexecdir)/$(NAME)/$(BASE_VERSION_G) -PGDATADIR = $(datadir)/$(NAME)/$(BASE_VERSION_G) -PGDOCDIR = $(datadir)/doc/$(NAME)/$(BASE_VERSION_G) -PGLOCALSTATEDIR_BASE = $(localstatedir)/$(NAME) -PGDATA = $(PGLOCALSTATEDIR_BASE)/$(BASE_VERSION_G) - -USERGROUPDIR = $(sysconfdir)/pkg/$(NAME) - - CONFIGURE_ARGS = $(DIRPATHS) - # This is one of the quirks mentioned at the beginning: --program-suffix is not # supported, so IMHO, binaries should go to --libexecdir CONFIGURE_ARGS += --bindir=$(PGBINDIR) @@ -134,12 +272,12 @@ #CONFIGURE_ARGS += --enable-thread-safety CONFIGURE_ARGS += --with-gssapi -# CONFIGURE_ARGS += --with-krb5 CONFIGURE_ARGS += --with-pam -# CONFIGURE_ARGS += --with-bonjour CONFIGURE_ARGS += --with-openssl CONFIGURE_ARGS += --with-libxml CONFIGURE_ARGS += --with-libxslt +CONFIGURE_ARGS += --without-krb5 +CONFIGURE_ARGS += --without-bonjour CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MODULATION)) # Skipping tests to save time during packaging, and to enable x86 builds. @@ -149,107 +287,6 @@ SKIPTEST ?= 1 TEST_TARGET = check -# PKGFILES_CSWpostgresql = NOFILES -# PKGFILES_CSWpostgresql-$(BASE_VERSION_G)-doc = $(PKGFILES_DOC) - - -# initscript_base_name = cswpostgres_$(subst .,_,$(BASE_VERSION)) -#initscript_base_name = cswpostgres_$(VERSION_NODOT) -#INITSMF = /etc$(prefix)/init\.d/$(initscript_base_name) - -USERGROUP = $(USERGROUPDIR)/cswusergroup-$(BASE_VERSION) - -#PRESERVECONF = $(sysconfdir)/postgresql\.conf - -PROTOTYPE_MODIFIERS = pgdata -PROTOTYPE_FILES_pgdata = $(PGDATA) -PROTOTYPE_USER_pgdata = postgres -PROTOTYPE_GROUP_pgdata = sys -PROTOTYPE_PERMS_pgdata = 0700 -PROTOTYPE_CLASS_pgdata = ugfiles - -EXPANDVARS = CSWpostgresql-$(BASE_VERSION_G).postinstall -EXPANDVARS += cswpostgres.tmpl -# This is one of the rare cases where a protoype filter is needed. -# Do not copy this for other Makefiles unless you understand exactly what it does!! -# (explanation: It adds -isaexec to the isaexec-name of the binaries to be isaexec'ed) -# -# Since we are not using isaexec, this line is not needed, right? --raos -#PROTOTYPE_FILTER = perl -npe 's,=/opt/csw/bin/isaexec,-isaexec=/opt/csw/bin/isaexec,' - -# Here come the alternatives we use to let the user choose between 32/64bit -# variants of the binaries -BIN_NAMES = clusterdb -BIN_NAMES += createdb -BIN_NAMES += createlang -BIN_NAMES += createuser -BIN_NAMES += dropdb -BIN_NAMES += droplang -BIN_NAMES += dropuser -BIN_NAMES += ecpg -BIN_NAMES += initdb -BIN_NAMES += oid2name -BIN_NAMES += pg_config -BIN_NAMES += pg_controldata -BIN_NAMES += pg_ctl -BIN_NAMES += pg_dump -BIN_NAMES += pg_dumpall -BIN_NAMES += pg_resetxlog -BIN_NAMES += pg_restore -BIN_NAMES += pg_standby -BIN_NAMES += pgbench -BIN_NAMES += postgres -BIN_NAMES += postmaster -BIN_NAMES += psql -BIN_NAMES += reindexdb -BIN_NAMES += vacuumdb -BIN_NAMES += vacuumlo - -# Bad voodoo coming up... -ALTERNATIVES = $(BUILD_ISAS) -$(foreach alt,$(ALTERNATIVES), $(eval ALTERNATIVE_$(alt) = $(subst /$(DEFAULT_ISA)/,/,$(foreach n,$(BIN_NAMES),$(bindir)/$(n)-$(BASE_VERSION_G) $(NAME)-$(BASE_VERSION_G) $(libexecdir)/$(alt)/$(NAME)/$(BASE_VERSION_G)/$(n) 20)))) - - -# ISAEXEC_FILES = $(addsuffix -isaexec,$(foreach B,$(BIN_NAMES),$(bindir_install)/$B)) -# ALTERNATIVES_CSWpostgresql-$(BASE_VERSION_G) = $(NAME)$(BASE_VERSION_G)-32 $(NAME)$(BASE_VERSION_G)-64 $(NAME)$(BASE_VERSION_G)-auto -# ALTERNATIVE_$(NAME)$(BASE_VERSION_G)-32 = $(bindir_install)/$(firstword $(BIN_NAMES)) $(firstword $(BIN_NAMES)) $(bindir_install)/$(ISA_DEFAULT)/$(firstword $(BIN_NAMES)) 100 -# ALTERNATIVE_$(NAME)$(BASE_VERSION_G)-32 += $(foreach B,$(wordlist 2,$(words $(BIN_NAMES)),$(BIN_NAMES)),$(bindir_install)/$B $B $(bindir_install)/$(ISA_DEFAULT)/$B) -# ALTERNATIVE_$(NAME)$(BASE_VERSION_G)-64 = $(bindir_install)/$(firstword $(BIN_NAMES)) $(firstword $(BIN_NAMES)) $(bindir_install)/$(ISA_DEFAULT64)/$(firstword $(BIN_NAMES)) 200 -# ALTERNATIVE_$(NAME)$(BASE_VERSION_G)-64 += $(foreach B,$(wordlist 2,$(words $(BIN_NAMES)),$(BIN_NAMES)),$(bindir_install)/$B $B $(bindir_install)/$(ISA_DEFAULT64)/$B) -# ALTERNATIVE_$(NAME)$(BASE_VERSION_G)-auto = $(bindir_install)/$(firstword $(BIN_NAMES)) $(firstword $(BIN_NAMES)) $(bindir_install)/$(firstword $(BIN_NAMES))-isaexec 300 -# ALTERNATIVE_$(NAME)$(BASE_VERSION_G)-auto += $(foreach B,$(wordlist 2,$(words $(BIN_NAMES)),$(BIN_NAMES)),$(bindir_install)/$B $B $(bindir_install)/$B-isaexec) - -# # checkpkg does not detect this dependency automatically -# CHECKPKG_OVERRIDES_CSWpostgresql-$(BASE_VERSION_G) += surplus-dependency|CSWalternatives - -# PACKAGES += CSWlibpq5 -# CATALOGNAME_CSWlibpq5 = libpq5 -# PKGFILES_CSWlibpq5 += $(call baseisadirs,$(prefix)/lib,libpq\.so\.5(\.\d+)*) -# SPKG_DESC_CSWlibpq5 += PostgreSQL C client library (built from $(BASE_VERSION).x sources), libpq.so.5 -# RUNTIME_DEP_PKGS_CSWlibpq5 += CSWlibgssapi-krb5-2 -# RUNTIME_DEP_PKGS_CSWlibpq5 += CSWosslrt - -# PACKAGES += CSWlibecpg6 -# CATALOGNAME_CSWlibecpg6 = libecpg6 -# PKGFILES_CSWlibecpg6 += $(call baseisadirs,$(prefix)/lib,libecpg\.so\.6(\.\d+)*) -# SPKG_DESC_CSWlibecpg6 += Embedded PostgreSQL for C library (built from $(BASE_VERSION).x sources), libecpg.so.6 -# RUNTIME_DEP_PKGS_CSWlibecpg6 += CSWlibpgtypes3 -# RUNTIME_DEP_PKGS_CSWlibecpg6 += CSWlibpq5 - -# PACKAGES += CSWlibecpg-compat3 -# CATALOGNAME_CSWlibecpg-compat3 = libecpg_compat3 -# PKGFILES_CSWlibecpg-compat3 += $(call baseisadirs,$(prefix)/lib,libecpg_compat\.so\.3(\.\d+)*) -# SPKG_DESC_CSWlibecpg-compat3 += Older version of run-time library for ECPG programs (built from $(BASE_VERSION).x sources), libecpg_compat.so.3 -# RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibecpg6 -# RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibpgtypes3 -# RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibpq5 - -# PACKAGES += CSWlibpgtypes3 -# CATALOGNAME_CSWlibpgtypes3 = libpgtypes3 -# PKGFILES_CSWlibpgtypes3 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.3\.0) -# PKGFILES_CSWlibpgtypes3 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.3(\.\d+)*) -# SPKG_DESC_CSWlibpgtypes3 += Used by programs built with ecpg (Embedded PostgreSQL for C, from $(BASE_VERSION).x sources), libpgtypes.so.3 - # PACKAGES += CSWlibpq-dev # CATALOGNAME_CSWlibpq-dev = libpq_dev # SPKG_DESC_CSWlibpq-dev = PostgreSQL C client headers (built from $(BASE_VERSION).x sources) @@ -273,13 +310,6 @@ # RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibecpg-compat3 # RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibpgtypes3 -# PACKAGES += CSWpostgresql-$(BASE_VERSION_G) -# CATALOGNAME_CSWpostgresql-$(BASE_VERSION_G) = postgresql_$(BASE_VERSION_G) -# SPKG_DESC_CSWpostgresql-$(BASE_VERSION_G) = PostgreSQL, version $(BASE_VERSION).x - -# # Private shared libraries have sonames, which triggers this error. -# CHECKPKG_OVERRIDES_CSWpostgresql-$(BASE_VERSION_G) += soname-not-part-of-filename - # # Legacy libraries # PACKAGES += CSWlibpq3 # CATALOGNAME_CSWlibpq3 = libpq3 @@ -343,16 +373,30 @@ # RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpq5 include gar/category.mk +# This variable will be increased in the course of the following foreach loops +alt_priority = 20 +# This will generate the ALTERNATIVEs for the binaries in $(libexecdir)/postgresql/XY. +# I consider this bad voodoo. +## Server +$(foreach alt,$(BUILD_ISAS), $(eval alt_priority=$(shell expr $(alt_priority) + 10)) $(eval ALTERNATIVE_server_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_SERVER)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT) $(libexecdir)/$(subst server_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) $(eval ALTERNATIVE_server_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_SERVER)),$(BIN_NAMES_SERVER)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT) $(libexecdir)/$(subst server_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) ) +## Client +# reset priority +alt_priority = 20 +$(foreach alt,$(BUILD_ISAS), $(eval alt_priority=$(shell expr $(alt_priority) + 10)) $(eval ALTERNATIVE_client_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_SERVER)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT) $(libexecdir)/$(subst client_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) $(eval ALTERNATIVE_client_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_SERVER)),$(BIN_NAMES_SERVER)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT) $(libexecdir)/$(subst client_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) ) +## Contrib +# reset priority +alt_priority = 20 +$(foreach alt,$(BUILD_ISAS), $(eval alt_priority=$(shell expr $(alt_priority) + 10)) $(eval ALTERNATIVE_contrib_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_SERVER)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT) $(libexecdir)/$(subst contrib_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) $(eval ALTERNATIVE_contrib_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_SERVER)),$(BIN_NAMES_SERVER)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT) $(libexecdir)/$(subst contrib_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) ) +## Devel +# reset priority +alt_priority = 20 +$(foreach alt,$(BUILD_ISAS), $(eval alt_priority=$(shell expr $(alt_priority) + 10)) $(eval ALTERNATIVE_devel_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_SERVER)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT) $(libexecdir)/$(subst devel_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) $(eval ALTERNATIVE_devel_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_SERVER)),$(BIN_NAMES_SERVER)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT) $(libexecdir)/$(subst devel_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) ) -# what's that good for? --raos -# -#CFLAGS := $(filter-out -I%,$(CFLAGS)) - # We adjust the $(pkglibdir) found in $(WORKSRC)/src/Makefile.global.in, so # that it should be possible to install 8.x and 8.y concurrently pre-configure-modulated: if [ -r $(WORKSRC)/src/Makefile.global.in ] ; then \ - gsed -i -r -e 's|^(pkglibdir[[:space:]]*=[[:space:]]*)\$$\(libdir\).*$$|\1$$(libdir)/postgresql/$(BASE_VERSION_G)|' $(WORKSRC)/src/Makefile.global.in ; \ + gsed -i -r -e 's|^(pkglibdir[[:space:]]*=[[:space:]]*)\$$\(libdir\).*$$|\1$$(libdir)/postgresql/$(BASE_VERSION_NODOT)|' $(WORKSRC)/src/Makefile.global.in ; \ fi @$(MAKECOOKIE) @@ -360,21 +404,29 @@ $(BUILD_ENV) gmake -C $(WORKSRC)/contrib all @$(MAKECOOKIE) -post-install-modulated: - $(INSTALL_ENV) gmake -C $(WORKSRC)/contrib DESTDIR=$(DESTDIR) install - ginstall -d -m 755 $(DESTDIR)$(prefix)/bin - [ -r $(DESTDIR)$(bindir)/pg_config ] && \ - gmv -v $(DESTDIR)$(bindir)/pg_config $(DESTDIR)$(prefix)/bin || true - @$(MAKECOOKIE) +#post-install-modulated: +# $(INSTALL_ENV) gmake -C $(WORKSRC)/contrib DESTDIR=$(DESTDIR) install +# ginstall -d -m 755 $(DESTDIR)$(prefix)/bin +# [ -r $(DESTDIR)$(bindir)/pg_config ] && \ +# gmv -v $(DESTDIR)$(bindir)/pg_config $(DESTDIR)$(prefix)/bin || true +# @$(MAKECOOKIE) post-merge: # Create the PGDATA directory ginstall -d $(PKGROOT)$(PGDATA) -# Create the directory for the user group file +# The usergroup file ginstall -d $(PKGROOT)$(USERGROUPDIR) -# PGLOCALSTATEDIR_BASE has been chosen, because this should be stable, i.e -# unversioned, across different PostgreSQL installation - gsed -e 's+ at PGLOCALSTATEDIR_BASE@+$(PGLOCALSTATEDIR_BASE)+g' $(FILEDIR)/cswusergroup.tmpl > $(PKGROOT)$(USERGROUP) + ginstall $(WORKDIR)/$(USERGROUPFILETMPL) $(PKGROOT)$(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED) +# The init script + ginstall -d $(PKGROOT)$(sysconfdir)/init.d + ginstall $(WORKDIR)/$(INITSCRIPTFILETMPL) $(PKGROOT)$(sysconfdir)/init.d/$(INITSCRIPTFILE_VERSIONED) +# The init script config + ginstall $(WORKDIR)/$(CSWPGSQLCONFFILETMPL) $(PKGROOT)$(sysconfdir)/$(CSWPGSQLCONFFILE_VERSIONED).CSW +# Create my alternatives files + $(foreach a,$(myALTERNATIVES), $(foreach i,$(BUILD_ISAS), $(shell ginstall -d $(PKGROOT)$(sharedstatedir)/alternatives ; echo "$(ALTERNATIVE_$(a)_$(i))" > $(PKGROOT)$(sharedstatedir)/alternatives/$(NAME)$(BASE_VERSION_NODOT)_$(a)_$(i)))) + +# Create the directory for the usergroup file and install it +# gsed -e 's|@PGLOCALSTATEDIR_BASE@|$(PGLOCALSTATEDIR_BASE)|g' $(FILEDIR)/$(USERGROUPFILETMPL) > $(PKGROOT)$(USERGROUPDIR)/$(USERGROUPFILE)-$(BASE_VERSION_NODOT) # ginstall -d $(PKGROOT)/etc$(prefix)/init.d # ginstall \ # $(WORKDIR)/cswpostgres.tmpl \ @@ -425,4 +477,4 @@ # ../../lib/$(ISA_DEFAULT64)/`basename $${f}` \ # $(PKGROOT)$(prefix)/postgresql/lib/$(ISA_DEFAULT64); \ # done -# @$(MAKECOOKIE) + @$(MAKECOOKIE) Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswpostgres.tmpl =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswpostgres.tmpl 2011-12-04 13:02:53 UTC (rev 16361) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswpostgres.tmpl 2011-12-04 15:24:16 UTC (rev 16362) @@ -1,91 +0,0 @@ -#!/bin/sh -# $Id$ -# -# PostgreSQL startup script - part of the CSWpostgresql package -# mark at blastwave.org -# -# 2009-11-29 Maciej Blizinski (maciej at opencsw.org) -# - Parametrized file locations -# - Style changes -# -# -# This files is a template. The following variables need to be substituted -# before it can be run: -# -# - PGDATA -# - bindir -# - sysconfdir - - -# Read in the user configuration file -[ -s /opt/csw/etc/postgresql.conf ] && . /opt/csw/etc/postgresql.conf -[ -s @sysconfdir@/postgresql.conf ] && . @sysconfdir@/postgresql.conf - -# Defaults -[ -z "${PGDATA}" ] && PGDATA=@PGDATA@ -[ -z "${PGCTL}" ] && PGCTL=@bindir@/pg_ctl -[ -z "${PGINIT}" ] && PGINIT=@bindir@/initdb - - -# Exit if postgres user hasn't been created. -# FIXME: This bit of code is old. It might be obsolete. -if grep '^postgres:' /etc/passwd >/dev/null; then - echo > /dev/null -else - getent passwd postgres >/dev/null - if [ $? -ne 0 ] ; then - exit 0 - fi -fi - -# Change to /var/tmp, as pgctl etc. need to be started from -# a directory that they can read -cd /var/tmp - -case "$1" in -start) - if [ -d ${PGDATA} -a `ls -l ${PGDATA} 2> /dev/null | wc -l` -gt 1 ]; then - # PostgreSQL data directory exists and is populated - echo "Starting PostgreSQL..." - su postgres -c "${PGCTL} -D ${PGDATA} -l ${PGDATA}/postgresql.log start ${SERVEROPTS}" - fi - ;; - -stop) - echo "Stopping PostgreSQL database..." - su postgres -c "${PGCTL} -D ${PGDATA} -l ${PGDATA}/postgresql.log stop" - true # The previous command fails when there's no .pid file - ;; - -restart) - echo "Restarting PostgreSQL database..." - su postgres -c "${PGCTL} -D ${PGDATA} -l ${PGDATA}/postgresql.log restart ${SERVEROPTS}" - ;; - -reload) - echo "Reloading PostgreSQL database..." - su postgres -c "${PGCTL} -D ${PGDATA} -l ${PGDATA}/postgresql.log reload ${SERVEROPTS}" - ;; - -status) - su postgres -c "${PGCTL} -D ${PGDATA} status" - ;; - -init) - # create and initialise data directory - echo "Creating PostgreSQL data directory at ${PGDATA}..." - # Create it, unless it's already there and empty - [ -d "${PGDATA}" -a `ls -l ${PGDATA} 2> /dev/null | wc -l` -eq 1 ] || mkdir -p "${PGDATA}" - chown postgres "${PGDATA}" - chmod 0700 "${PGDATA}" - echo "Initialising PostgreSQL database..." - su postgres -c "\"${PGINIT}\" -D \"${PGDATA}\" -E utf-8" - ;; - -*) - echo "Usage: ${0} (init|start|stop|restart|reload|status)" - ;; - -esac - -# vim:set ft=sh sw=2 ts=2 sts=2 expandtab si ci: Copied: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswpostgresql.tmpl (from rev 16347, csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswpostgres.tmpl) =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswpostgresql.tmpl (rev 0) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswpostgresql.tmpl 2011-12-04 15:24:16 UTC (rev 16362) @@ -0,0 +1,92 @@ +#!/bin/sh +# $Id$ +# +# PostgreSQL startup script - part of the CSWpostgresql package +# mark at blastwave.org +# +# 2009-11-29 Maciej Blizinski (maciej at opencsw.org) +# - Parametrized file locations +# - Style changes +# +# +# This files is a template. The following variables need to be substituted +# before it can be run: +# +# - PGDATA +# - bindir +# - sysconfdir + +USERCONF=postgresql- at BASE_VERSION_NODOT@.conf +PGCTL=@bindir@/pg_ctl- at BASE_VERSION_NODOT@ +PGINIT=@bindir@/initdb- at BASE_VERSION_NODOT@ + +# Read in the user configuration file +[ -s /opt/csw/etc/${USERCONF} ] && . /opt/csw/etc/${USERCONF} +[ -s @sysconfdir@/${USERCONF} ] && . @sysconfdir@/${USERCONF} + +# Defaults +[ -z "${PGDATA}" ] && PGDATA=@PGDATA@ + + +# Exit if postgres user hasn't been created. +# FIXME: This bit of code is old. It might be obsolete. +if grep '^postgres:' /etc/passwd >/dev/null; then + echo > /dev/null +else + getent passwd postgres >/dev/null + if [ $? -ne 0 ] ; then + exit 0 + fi +fi + +# Change to ${PGDATA}, as pgctl etc. need to be started from +# a directory that they can read +cd "${PGDATA}" + +case "$1" in +start) + if [ -d ${PGDATA} -a `ls -l ${PGDATA} 2> /dev/null | wc -l` -gt 1 ]; then + # PostgreSQL data directory exists and is populated + echo "Starting PostgreSQL..." + su postgres -c "${PGCTL} -D ${PGDATA} -l ${PGDATA}/postgresql.log start ${SERVEROPTS}" + fi + ;; + +stop) + echo "Stopping PostgreSQL database..." + su postgres -c "${PGCTL} -D ${PGDATA} -l ${PGDATA}/postgresql.log stop" + true # The previous command fails when there's no .pid file + ;; + +restart) + echo "Restarting PostgreSQL database..." + su postgres -c "${PGCTL} -D ${PGDATA} -l ${PGDATA}/postgresql.log restart ${SERVEROPTS}" + ;; + +reload) + echo "Reloading PostgreSQL database..." + su postgres -c "${PGCTL} -D ${PGDATA} -l ${PGDATA}/postgresql.log reload ${SERVEROPTS}" + ;; + +status) + su postgres -c "${PGCTL} -D ${PGDATA} status" + ;; + +init) + # create and initialise data directory + echo "Creating PostgreSQL data directory at ${PGDATA}..." + # Create it, unless it's already there and empty + [ -d "${PGDATA}" -a `ls -l ${PGDATA} 2> /dev/null | wc -l` -eq 1 ] || mkdir -p "${PGDATA}" + chown postgres "${PGDATA}" + chmod 0700 "${PGDATA}" + echo "Initialising PostgreSQL database..." + su postgres -c "\"${PGINIT}\" -D \"${PGDATA}\" -E utf-8" + ;; + +*) + echo "Usage: ${0} (init|start|stop|restart|reload|status)" + ;; + +esac + +# vim:set ft=sh sw=2 ts=2 sts=2 expandtab si ci: Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/postgresql.conf.tmpl =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/postgresql.conf.tmpl 2011-12-04 13:02:53 UTC (rev 16361) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/postgresql.conf.tmpl 2011-12-04 15:24:16 UTC (rev 16362) @@ -3,27 +3,13 @@ # Provided by the OpenCSW package of PostgreSQL. This file is read by the # /etc/opt/csw/init.d/cswpostgres startup script, and can be used to override # the defaults. +# +# Please use alternatives to choose between 32/64bit version of the server. # The location of the data directory. -# Default : /opt/csw/var/pgdata +# Default : @PGDATA@ PGDATA=@PGDATA@ -# Which binaries to use, 32- or 64-bit. Only use the 64-bit server if you're -# sure you need it. Make sure you have read -# /opt/csw/postgresql/share/doc/README-CSW.txt before changing these, as your -# databases may not work without a 'dump and restore' cycle! - -# 32-bit server - default, and fine for most uses -# -# PGCTL=/opt/csw/postgresql/bin/sparcv8/pg_ctl -# PGINIT=/opt/csw/postgresql/bin/sparcv8/initdb - -# 64-bit server - uncomment these lines only if you really need them. -# -# PGCTL=/opt/csw/postgresql/bin/sparcv9/pg_ctl -# PGINIT=/opt/csw/postgresql/bin/sparcv9/initdb - - # Additional options to pass to postmaster. # # These options will be passed to the postmaster program. The most common use @@ -34,4 +20,3 @@ # directory. # # SERVEROPTS="-o -i" - Added: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/pgconf.mk =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/pgconf.mk (rev 0) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/pgconf.mk 2011-12-04 15:24:16 UTC (rev 16362) @@ -0,0 +1,64 @@ +# $Id$ + +# +# Postgres specific variables +# +PGBINDIR = $(libexecdir)/$(NAME)/$(BASE_VERSION_NODOT) +PGSBINDIR = $(libexecdir)/$(NAME)/$(BASE_VERSION_NODOT) +PGDATADIR = $(datadir)/$(NAME)/$(BASE_VERSION_NODOT) +PGDOCDIR = $(datadir)/doc/$(NAME)/$(BASE_VERSION_NODOT) +PGLOCALSTATEDIR_BASE = $(localstatedir)/$(NAME) +PGDATA = $(PGLOCALSTATEDIR_BASE)/$(BASE_VERSION_NODOT) +# Those BIN_NAMES_* are used both, for package creation and alternatives +BIN_NAMES_SERVER = initdb ipcclean pg_controldata pg_ctl pg_resetxlog postmaster postgres +BIN_NAMES_DEVEL = ecpg pg_config +BIN_NAMES_CLIENT = clusterdb createdb createlang createuser dropdb droplang dropuser pg_dump pg_dumpall pg_restore psql reindexdb vacuumdb +BIN_NAMES_CONTRIB = oid2name pgbench pg_standby vacuumlo +# These are shared objects used by the server. Please note, contrib installs +# also shared object in the same place, so make sure you don't mix up things +SO_NAMES_SERVER = ascii_and_mic.so cyrillic_and_mic.so dict_snowball.so euc_cn_and_mic.so +SO_NAMES_SERVER += euc_jis_2004_and_shift_jis_2004.so euc_jp_and_sjis.so euc_kr_and_mic.so +SO_NAMES_SERVER += euc_tw_and_big5.so latin2_and_win1250.so latin_and_mic.so plpgsql.so +SO_NAMES_SERVER += utf8_and_ascii.so utf8_and_big5.so utf8_and_cyrillic.so utf8_and_euc_cn.so +SO_NAMES_SERVER += utf8_and_euc_jis_2004.so utf8_and_euc_jp.so utf8_and_euc_kr.so utf8_and_euc_tw.so +SO_NAMES_SERVER += utf8_and_gb18030.so utf8_and_gbk.so utf8_and_iso8859.so utf8_and_iso8859_1.so +SO_NAMES_SERVER += utf8_and_johab.so utf8_and_shift_jis_2004.so utf8_and_sjis.so utf8_and_uhc.so utf8_and_win.so +# Miscellaneous files +MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/conversion_create.sql +MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/information_schema.sql +MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/pg_hba.conf.sample +MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/pg_ident.conf.sample +MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/pg_service.conf.sample +MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/postgres.bki +MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/postgres.description +MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/postgres.shdescription +MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/postgresql.conf.sample +MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/recovery.conf.sample +MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/snowball_create.sql +MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/sql_features.txt +MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/system_views.sql +MISC_NAMES_CLIENT += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/psqlrc.sample + +# Used for the PostgreSQL user. Please note, although the file does not feature +# a version number here, it will be installed with $(BASE_VERSION_NODOT) +# appended. +USERGROUPDIR = $(sysconfdir)/pkg/$(NAME) +USERGROUPFILE = cswusergroup +USERGROUPFILETMPL = $(USERGROUPFILE).tmpl +USERGROUPFILE_VERSIONED = $(USERGROUPFILE)-$(BASE_VERSION_NODOT) + +# The configuration file for the init.d script. Please note, although the file +# does not feature a version number here, it will be installed with +# $(BASE_VERSION_NODOT) inserted. +CSWPGSQLCONFFILE = postgresql.conf +CSWPGSQLCONFFILETMPL = $(CSWPGSQLCONFFILE).tmpl +CSWPGSQLCONFFILE_VERSIONED = $(subst $(suffix $(CSWPGSQLCONFFILE)),,$(CSWPGSQLCONFFILE))-$(BASE_VERSION_NODOT).conf + +# The initscript. Please note, although the file does not feature a version +# number here, it will be installed with $(BASE_VERSION_NODOT) appended +INITSCRIPTFILE = cswpostgresql +INITSCRIPTFILETMPL = $(INITSCRIPTFILE).tmpl +INITSCRIPTFILE_VERSIONED = $(INITSCRIPTFILE)-$(BASE_VERSION_NODOT) + +# These are the alternatives provided for the packages. +myALTERNATIVES= server client devel contrib Property changes on: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/pgconf.mk ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Dec 4 18:08:15 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 04 Dec 2011 17:08:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[16363] csw/mgar/pkg/gtk2/trunk/Makefile Message-ID: Revision: 16363 http://gar.svn.sourceforge.net/gar/?rev=16363&view=rev Author: rthurner Date: 2011-12-04 17:08:14 +0000 (Sun, 04 Dec 2011) Log Message: ----------- gtk2, noisaexec is now default Modified Paths: -------------- csw/mgar/pkg/gtk2/trunk/Makefile Modified: csw/mgar/pkg/gtk2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtk2/trunk/Makefile 2011-12-04 15:24:16 UTC (rev 16362) +++ csw/mgar/pkg/gtk2/trunk/Makefile 2011-12-04 17:08:14 UTC (rev 16363) @@ -48,7 +48,6 @@ SPKG_SOURCEURL = http://www.gtk.org/ -NOISAEXEC = 1 NOISALIST = 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 Sun Dec 4 18:36:40 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 04 Dec 2011 17:36:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[16364] csw/mgar/pkg/gcc4/branches/ada-enable/Makefile Message-ID: Revision: 16364 http://gar.svn.sourceforge.net/gar/?rev=16364&view=rev Author: wahwah Date: 2011-12-04 17:36:40 +0000 (Sun, 04 Dec 2011) Log Message: ----------- gcc4/branches/ada-enable: ada updates Modified Paths: -------------- csw/mgar/pkg/gcc4/branches/ada-enable/Makefile Modified: csw/mgar/pkg/gcc4/branches/ada-enable/Makefile =================================================================== --- csw/mgar/pkg/gcc4/branches/ada-enable/Makefile 2011-12-04 17:08:14 UTC (rev 16363) +++ csw/mgar/pkg/gcc4/branches/ada-enable/Makefile 2011-12-04 17:36:40 UTC (rev 16364) @@ -509,29 +509,26 @@ PKGFILES_$(PKG_BASENAME)ada += $(prefix)/info/.*gnat.* PKGFILES_$(PKG_BASENAME)ada += $(prefix)/bin/gnat(?!ive).* # There are static libraries, .a files in the ada package. Let them be. -CHECKPKG_OVERRIDES_CSWgcc4ada += discouraged-path-in-pkgmap +CHECKPKG_OVERRIDES_$(PKG_BASENAME)ada += discouraged-path-in-pkgmap # It needs the core compiler. -CHECKPKG_OVERRIDES_CSWgcc4ada += surplus-dependency|CSWgcc4core +CHECKPKG_OVERRIDES_$(PKG_BASENAME)ada += surplus-dependency|$(PKG_BASENAME)core +CHECKPKG_OVERRIDES_CSWgcc4ada += file-with-bad-content -RUNTIME_DEP_PKGS_CSWgcc4ada += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWgcc4ada += CSWlibppl-c4 -RUNTIME_DEP_PKGS_CSWgcc4ada += CSWlibz1 -RUNTIME_DEP_PKGS_CSWgcc4ada += CSWlibmpfr4 -RUNTIME_DEP_PKGS_CSWgcc4ada += CSWlibpwl5 -RUNTIME_DEP_PKGS_CSWgcc4ada += CSWlibmpc2 -RUNTIME_DEP_PKGS_CSWgcc4ada += CSWlibgmpxx4 -RUNTIME_DEP_PKGS_CSWgcc4ada += CSWlibisl7 -RUNTIME_DEP_PKGS_CSWgcc4ada += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWgcc4ada += CSWlibgmp10 -RUNTIME_DEP_PKGS_CSWgcc4ada += CSWlibcloog-isl2 -RUNTIME_DEP_PKGS_CSWgcc4ada += CSWlibppl9 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibiconv2 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibppl-c4 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibz1 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibmpfr4 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibpwl5 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibmpc2 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibgmpxx4 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibisl7 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibgmp10 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibcloog-isl2 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibppl9 -PACKAGES += $(PKG_BASENAME)adart -SPKG_DESC_$(PKG_BASENAME)adart = A deprecated package -PKGFILES_$(PKG_BASENAME)adart = flying-spaghetti-monster -RUNTIME_DEP_PKGS_CSWgcc4adart += CSWlibgcc-s1 -PKGFILES_$(PKG_BASENAME)adart = $(prefix)/lib/.*libgnat.*\.so.* -PKGFILES_$(PKG_BASENAME)adart += $(prefix)/lib/.*libgnarl.*\.so.* +# Not sure about the shared libraries. +OBSOLETED_BY_RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada = $(PKG_BASENAME)adart # Maybe it's unnecessary. # # Solaris 10 on i386 specific: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Dec 4 19:07:17 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 04 Dec 2011 18:07:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[16365] csw/mgar/pkg/sqlite3/trunk/ Message-ID: Revision: 16365 http://gar.svn.sourceforge.net/gar/?rev=16365&view=rev Author: rthurner Date: 2011-12-04 18:07:17 +0000 (Sun, 04 Dec 2011) Log Message: ----------- sqlite, delete svn:externals not necessary with mgar Property Changed: ---------------- csw/mgar/pkg/sqlite3/trunk/ Property changes on: csw/mgar/pkg/sqlite3/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Dec 4 20:42:26 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 04 Dec 2011 19:42:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[16366] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 16366 http://gar.svn.sourceforge.net/gar/?rev=16366&view=rev Author: rthurner Date: 2011-12-04 19:42:26 +0000 (Sun, 04 Dec 2011) Log Message: ----------- subversion, include gnomekeyring to not pass passwords on the commandline Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2011-12-04 18:07:17 UTC (rev 16365) +++ csw/mgar/pkg/subversion/trunk/Makefile 2011-12-04 19:42:26 UTC (rev 16366) @@ -78,8 +78,12 @@ RUNTIME_DEP_PKGS_CSWsvn += CSWlibaprutil1-0 RUNTIME_DEP_PKGS_CSWsvn += CSWlibneon27 RUNTIME_DEP_PKGS_CSWsvn += CSWosslrt +RUNTIME_DEP_PKGS_CSWsvn += CSWlibgnome-keyring0 +RUNTIME_DEP_PKGS_CSWsvn += CSWlibdbus1-3 +RUNTIME_DEP_PKGS_CSWsvn += CSWglib2 +RUNTIME_DEP_PKGS_CSWsvn += CSWlibdbus1-3 +RUNTIME_DEP_PKGS_CSWsvn += CSWglib2 - PACKAGES += CSWsvn-devel SPKG_DESC_CSWsvn-devel = Subversion Development Support CATALOGNAME_CSWsvn-devel = subversion_devel @@ -276,11 +280,12 @@ CONFIGURE_ARGS += --with-apr=$(bindir)/apr-1-config CONFIGURE_ARGS += --with-apr-util=$(bindir)/apu-1-config CONFIGURE_ARGS += --with-apxs=$(prefix)/apache2/sbin/apxs +CONFIGURE_ARGS += --with-gnome-keyring=$(prefix) CONFIGURE_ARGS += --with-jdk=$(JAVA_HOME) CONFIGURE_ARGS += --with-sasl=$(prefix) +CONFIGURE_ARGS += --with-serf=$(prefix) CONFIGURE_ARGS += --with-ssl=$(prefix) CONFIGURE_ARGS += --with-zlib=$(prefix) -CONFIGURE_ARGS += --with-serf=$(prefix) # Once you have verified that a new upstream release passes the tests, you can use # "SKIPTEST=1 gmake " to skip the tests for simple repackaging tasks. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Dec 4 21:00:37 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 04 Dec 2011 20:00:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[16367] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 16367 http://gar.svn.sourceforge.net/gar/?rev=16367&view=rev Author: rthurner Date: 2011-12-04 20:00:37 +0000 (Sun, 04 Dec 2011) Log Message: ----------- subversion, change rc link to productive link Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2011-12-04 19:42:26 UTC (rev 16366) +++ csw/mgar/pkg/subversion/trunk/Makefile 2011-12-04 20:00:37 UTC (rev 16367) @@ -35,8 +35,8 @@ endef VENDOR_URL = http://subversion.apache.org/ -#MASTER_SITES = http://archive.apache.org/dist/subversion/ -MASTER_SITES = http://people.apache.org/~hwright/svn/1.7.2/ +MASTER_SITES = http://archive.apache.org/dist/subversion/ +#MASTER_SITES = http://people.apache.org/~hwright/svn/1.7.2/ DISTFILES = $(NAME)-$(VERSION).tar.bz2 BUILD_DEP_PKGS += CSWlibexpat-dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Dec 4 21:09:19 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 04 Dec 2011 20:09:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[16368] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 16368 http://gar.svn.sourceforge.net/gar/?rev=16368&view=rev Author: rthurner Date: 2011-12-04 20:09:19 +0000 (Sun, 04 Dec 2011) Log Message: ----------- subversion, do not list dependencies twice Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2011-12-04 20:00:37 UTC (rev 16367) +++ csw/mgar/pkg/subversion/trunk/Makefile 2011-12-04 20:09:19 UTC (rev 16368) @@ -81,8 +81,6 @@ RUNTIME_DEP_PKGS_CSWsvn += CSWlibgnome-keyring0 RUNTIME_DEP_PKGS_CSWsvn += CSWlibdbus1-3 RUNTIME_DEP_PKGS_CSWsvn += CSWglib2 -RUNTIME_DEP_PKGS_CSWsvn += CSWlibdbus1-3 -RUNTIME_DEP_PKGS_CSWsvn += CSWglib2 PACKAGES += CSWsvn-devel SPKG_DESC_CSWsvn-devel = Subversion Development Support This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Dec 4 21:14:24 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 04 Dec 2011 20:14:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[16369] csw/mgar/pkg/postgresql/branches/postgresql-8. 3-raos/files/cswpostgresql.tmpl Message-ID: Revision: 16369 http://gar.svn.sourceforge.net/gar/?rev=16369&view=rev Author: guengel Date: 2011-12-04 20:14:24 +0000 (Sun, 04 Dec 2011) Log Message: ----------- postgresql/branches/postgresql-8.3-raos: Added shutdown mode, reordered arguments to pgctl. It does not expect SERVEROPTS to have -o supplied by the user. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswpostgresql.tmpl Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswpostgresql.tmpl =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswpostgresql.tmpl 2011-12-04 20:09:19 UTC (rev 16368) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswpostgresql.tmpl 2011-12-04 20:14:24 UTC (rev 16369) @@ -16,7 +16,7 @@ # - bindir # - sysconfdir -USERCONF=postgresql- at BASE_VERSION_NODOT@.conf +USERCONF=@CSWPGSQLCONFFILE_VERSIONED@ PGCTL=@bindir@/pg_ctl- at BASE_VERSION_NODOT@ PGINIT=@bindir@/initdb- at BASE_VERSION_NODOT@ @@ -26,8 +26,11 @@ # Defaults [ -z "${PGDATA}" ] && PGDATA=@PGDATA@ +[ -z "${PGDATA}" ] && SHUTDOWNMODE=fast +[ -n "${SERVEROPTS}" ] && SERVEROPTS="-o ${SERVEROPTS}" + # Exit if postgres user hasn't been created. # FIXME: This bit of code is old. It might be obsolete. if grep '^postgres:' /etc/passwd >/dev/null; then @@ -48,28 +51,28 @@ if [ -d ${PGDATA} -a `ls -l ${PGDATA} 2> /dev/null | wc -l` -gt 1 ]; then # PostgreSQL data directory exists and is populated echo "Starting PostgreSQL..." - su postgres -c "${PGCTL} -D ${PGDATA} -l ${PGDATA}/postgresql.log start ${SERVEROPTS}" + su postgres -c "${PGCTL} start -D ${PGDATA} -l ${PGDATA}/postgresql.log "${SERVEROPTS}"" fi ;; stop) echo "Stopping PostgreSQL database..." - su postgres -c "${PGCTL} -D ${PGDATA} -l ${PGDATA}/postgresql.log stop" + su postgres -c "${PGCTL} stop -D ${PGDATA} -l ${PGDATA}/postgresql.log -m ${SHUTDOWNMODE}" true # The previous command fails when there's no .pid file ;; restart) echo "Restarting PostgreSQL database..." - su postgres -c "${PGCTL} -D ${PGDATA} -l ${PGDATA}/postgresql.log restart ${SERVEROPTS}" + su postgres -c "${PGCTL} restart -D ${PGDATA} -l ${PGDATA}/postgresql.log "${SERVEROPTS}" -m ${SHUTDOWNMODE}" ;; reload) echo "Reloading PostgreSQL database..." - su postgres -c "${PGCTL} -D ${PGDATA} -l ${PGDATA}/postgresql.log reload ${SERVEROPTS}" + su postgres -c "${PGCTL} reload -D ${PGDATA} -l ${PGDATA}/postgresql.log" ;; status) - su postgres -c "${PGCTL} -D ${PGDATA} status" + su postgres -c "${PGCTL} status -D ${PGDATA}" ;; init) @@ -80,7 +83,7 @@ chown postgres "${PGDATA}" chmod 0700 "${PGDATA}" echo "Initialising PostgreSQL database..." - su postgres -c "\"${PGINIT}\" -D \"${PGDATA}\" -E utf-8" + su postgres -c "\"${PGINIT}\" -D \"${PGDATA}\" -E UTF8" ;; *) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Dec 4 21:15:42 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 04 Dec 2011 20:15:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[16370] csw/mgar/pkg/postgresql/branches/postgresql-8. 3-raos/files/CSWpostgresql-83.postinstall Message-ID: Revision: 16370 http://gar.svn.sourceforge.net/gar/?rev=16370&view=rev Author: guengel Date: 2011-12-04 20:15:42 +0000 (Sun, 04 Dec 2011) Log Message: ----------- postgresql/branches/postgresql-8.3-raos: Renamed to CSWpostgresql-server.postinstall.tmp Removed Paths: ------------- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/CSWpostgresql-83.postinstall Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/CSWpostgresql-83.postinstall =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/CSWpostgresql-83.postinstall 2011-12-04 20:14:24 UTC (rev 16369) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/CSWpostgresql-83.postinstall 2011-12-04 20:15:42 UTC (rev 16370) @@ -1,39 +0,0 @@ -#!/bin/sh -# vim:set ft=sh: -# -# $Id$ -# -# Initialize the database cluster if it hasn't been initialized before. - -# Read in the user configuration file -[ -s /opt/csw/etc/postgresql.conf ] && . /opt/csw/etc/postgresql.conf -[ -s @sysconfdir@/postgresql.conf ] && . @sysconfdir@/postgresql.conf - -PGDATA=@PGDATA@ -PGINIT=@bindir@/initdb - -initialize_cluster() { - chown postgres "${PGDATA}" - chmod 0700 "${PGDATA}" - echo "Initializing PostgreSQL database..." - su postgres -c "\"${PGINIT}\" -D \"${PGDATA}\" -E utf-8" -} - -if [ `ls -l ${PGDATA} 2>/dev/null | wc -l` -eq 1 ]; then - initialize_cluster -else - echo "The database cluster seems to be initialized already." -fi - -if [ -x /usr/sbin/svcadm ]; then - fmri="cswpostgres_ at VERSION_NODOT@" - echo "Enabling the ${fmri} service in SMF" - svcadm clear "${fmri}" - svcadm enable "${fmri}" -else - initscript="/etc/opt/csw/init.d/cswpostgres_ at VERSION_NODOT@" - echo "Issuing ${initscript} start" - "${initscript}" start -fi - -exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Dec 4 21:35:50 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 04 Dec 2011 20:35:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[16371] csw/mgar/pkg/postgresql/branches/postgresql-8. 3-raos/files/cswpostgresql.tmpl Message-ID: Revision: 16371 http://gar.svn.sourceforge.net/gar/?rev=16371&view=rev Author: guengel Date: 2011-12-04 20:35:49 +0000 (Sun, 04 Dec 2011) Log Message: ----------- postgresql/branches/postgresql-8.3-raos: Put SERVEROPTS at the end of pgctl call. Add -o only to SERVEROPTS if not already present. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswpostgresql.tmpl Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswpostgresql.tmpl =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswpostgresql.tmpl 2011-12-04 20:15:42 UTC (rev 16370) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswpostgresql.tmpl 2011-12-04 20:35:49 UTC (rev 16371) @@ -28,7 +28,15 @@ [ -z "${PGDATA}" ] && PGDATA=@PGDATA@ [ -z "${PGDATA}" ] && SHUTDOWNMODE=fast -[ -n "${SERVEROPTS}" ] && SERVEROPTS="-o ${SERVEROPTS}" +if [ -n "${SERVEROPTS}" ] +then + # Make sure, SERVEROPTS start with -o + echo "${SERVEROPTS}" | grep '^-o' >/dev/null 2>&1 + if [ $? -ne 0 ] + then + SERVEROPTS="-o ${SERVEROPTS}" + fi +fi # Exit if postgres user hasn't been created. @@ -51,7 +59,7 @@ if [ -d ${PGDATA} -a `ls -l ${PGDATA} 2> /dev/null | wc -l` -gt 1 ]; then # PostgreSQL data directory exists and is populated echo "Starting PostgreSQL..." - su postgres -c "${PGCTL} start -D ${PGDATA} -l ${PGDATA}/postgresql.log "${SERVEROPTS}"" + su postgres -c "${PGCTL} start -D ${PGDATA} -l ${PGDATA}/postgresql.log ${SERVEROPTS}" fi ;; @@ -63,7 +71,7 @@ restart) echo "Restarting PostgreSQL database..." - su postgres -c "${PGCTL} restart -D ${PGDATA} -l ${PGDATA}/postgresql.log "${SERVEROPTS}" -m ${SHUTDOWNMODE}" + su postgres -c "${PGCTL} restart -D ${PGDATA} -l ${PGDATA}/postgresql.log -m ${SHUTDOWNMODE} ${SERVEROPTS}" ;; reload) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Dec 4 21:37:23 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 04 Dec 2011 20:37:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[16372] csw/mgar/pkg/postgresql/branches/postgresql-8. 3-raos/pgconf.mk Message-ID: Revision: 16372 http://gar.svn.sourceforge.net/gar/?rev=16372&view=rev Author: guengel Date: 2011-12-04 20:37:23 +0000 (Sun, 04 Dec 2011) Log Message: ----------- postgresql/branches/postgresql-8.3-raos: Added SO_NAMES_CONTRIB. Use mySED instead of EXPANDVARS. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/pgconf.mk Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/pgconf.mk =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/pgconf.mk 2011-12-04 20:35:49 UTC (rev 16371) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/pgconf.mk 2011-12-04 20:37:23 UTC (rev 16372) @@ -23,6 +23,14 @@ SO_NAMES_SERVER += utf8_and_euc_jis_2004.so utf8_and_euc_jp.so utf8_and_euc_kr.so utf8_and_euc_tw.so SO_NAMES_SERVER += utf8_and_gb18030.so utf8_and_gbk.so utf8_and_iso8859.so utf8_and_iso8859_1.so SO_NAMES_SERVER += utf8_and_johab.so utf8_and_shift_jis_2004.so utf8_and_sjis.so utf8_and_uhc.so utf8_and_win.so +# These are shared object used by contrib. Please note, the server installs +# also shared object in the same place, so make sure you don't mix up things +SO_NAMES_CONTRIB = _int.so adminpack.so autoinc.so btree_gist.so chkpass.so +SO_NAMES_CONTRIB += cube.so dblink.so dict_int.so dict_xsyn.so earthdistance.so +SO_NAMES_CONTRIB += fuzzystrmatch.so hstore.so insert_username.so int_aggregate.so +SO_NAMES_CONTRIB += isn.so lo.so ltree.so moddatetime.so pageinspect.so pg_buffercache.so +SO_NAMES_CONTRIB += pg_freespacemap.so pg_trgm.so pgcrypto.so pgrowlocks.so pgstattuple.so +SO_NAMES_CONTRIB += pgxml.so refint.so seg.so sslinfo.so tablefunc.so test_parser.so timetravel.so tsearch2.so # Miscellaneous files MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/conversion_create.sql MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/information_schema.sql @@ -60,5 +68,19 @@ INITSCRIPTFILETMPL = $(INITSCRIPTFILE).tmpl INITSCRIPTFILE_VERSIONED = $(INITSCRIPTFILE)-$(BASE_VERSION_NODOT) -# These are the alternatives provided for the packages. +# These are the alternatives provided for the packages. I use them in the +# recipe to iterate over all possible alternatives (see 'post-merge:') myALTERNATIVES= server client devel contrib + +# My sed, since EXPANDVARS has proven unreliable to me +mySED = gsed -e 's|@USERGROUPFILE_VERSIONED@|$(USERGROUPFILE_VERSIONED)|g' \ + -e 's|@CSWPGSQLCONFFILE_VERSIONED@|$(CSWPGSQLCONFFILE_VERSIONED)|g' \ + -e 's|@INITSCRIPTFILE_VERSIONED@|$(INITSCRIPTFILE_VERSIONED)|g' \ + -e 's|@NAME@|$(NAME)|g' \ + -e 's|@VERSION@|$(VERSION)|g' \ + -e 's|@BASE_VERSION_NODOT@|$(BASE_VERSION_NODOT)|g' \ + -e 's|@PGLOCALSTATEDIR_BASE@|$(PGLOCALSTATEDIR_BASE)|g' \ + -e 's|@PGDATA@|$(PGDATA)|g' \ + -e 's|@sysconfdir@|$(sysconfdir)|g' \ + -e 's|@bindir@|$(bindir)|g' + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Dec 4 21:38:43 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 04 Dec 2011 20:38:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[16373] csw/mgar/pkg/postgresql/branches/postgresql-8. 3-raos/files/postgresql.conf.tmpl Message-ID: Revision: 16373 http://gar.svn.sourceforge.net/gar/?rev=16373&view=rev Author: guengel Date: 2011-12-04 20:38:43 +0000 (Sun, 04 Dec 2011) Log Message: ----------- postgresql/branches/postgresql-8.3-raos: Introduced the SHUTDOWNMODE. Amended SERVEROPTS. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/postgresql.conf.tmpl Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/postgresql.conf.tmpl =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/postgresql.conf.tmpl 2011-12-04 20:37:23 UTC (rev 16372) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/postgresql.conf.tmpl 2011-12-04 20:38:43 UTC (rev 16373) @@ -10,13 +10,25 @@ # Default : @PGDATA@ PGDATA=@PGDATA@ +# The shutdown mode used +# +# Shutdown modes are: +# smart quit after all clients have disconnected +# fast quit directly, with proper shutdown +# immediate quit without complete shutdown; will lead to recovery on restart +# +# Default: fast +SHUTDOWNMODE=fast + # Additional options to pass to postmaster. # # These options will be passed to the postmaster program. The most common use # of these is to allow network access to PostgreSQL from other hosts over -# TCP/IP. This is done by using the flags "-o -i", as in the example below. +# TCP/IP. This is done by using the flags "-i", as in the example below. # Uncomment this line to enable network access to PostgreSQL. Note that you # will still need to configure authentication in the pg_hba.conf in your data # directory. +# +# Please note: it is no longer necessary to pass the '-o' option. # -# SERVEROPTS="-o -i" +# SERVEROPTS="-i" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Dec 4 21:42:28 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 04 Dec 2011 20:42:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[16374] csw/mgar/pkg/postgresql/branches/postgresql-8. 3-raos/files/CSWpostgresql-server.postinstall.tmpl Message-ID: Revision: 16374 http://gar.svn.sourceforge.net/gar/?rev=16374&view=rev Author: guengel Date: 2011-12-04 20:42:28 +0000 (Sun, 04 Dec 2011) Log Message: ----------- postgresql/branches/postgresql-8.3-raos: Added USERCONF variable. Changed some names due to recipe changes. When using SMF, sleep for 4 secs before clearing and enabling server in order to prevent it going to maintenance immediately. Added Paths: ----------- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/CSWpostgresql-server.postinstall.tmpl Copied: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/CSWpostgresql-server.postinstall.tmpl (from rev 16347, csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/CSWpostgresql-83.postinstall) =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/CSWpostgresql-server.postinstall.tmpl (rev 0) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/CSWpostgresql-server.postinstall.tmpl 2011-12-04 20:42:28 UTC (rev 16374) @@ -0,0 +1,44 @@ +#!/bin/sh +# vim:set ft=sh: +# +# $Id$ +# +# Initialize the database cluster if it hasn't been initialized before. + +USERCONF=@CSWPGSQLCONFFILE_VERSIONED@ +PGCTL=@bindir@/pg_ctl- at BASE_VERSION_NODOT@ +PGINIT=@bindir@/initdb- at BASE_VERSION_NODOT@ + +# Read in the user configuration file +[ -s /opt/csw/etc/${USERCONF} ] && . /opt/csw/etc/${USERCONF} +[ -s @sysconfdir@/${USERCONF} ] && . @sysconfdir@/${USERCONF} + +initialize_cluster() { + chown postgres "${PGDATA}" + chmod 0700 "${PGDATA}" + echo "Initializing PostgreSQL database..." + su postgres -c "\"${PGINIT}\" -D \"${PGDATA}\" -E UTF8" +} + +if [ `ls -l ${PGDATA} 2>/dev/null | wc -l` -eq 1 ]; then + initialize_cluster +else + echo "The database cluster seems to be initialized already." +fi + +# FIXME: We assume that every Sol 10 user is using SMF, whereas it is possible +# to use CSW on Sol 10 without SMF +if [ -x /usr/sbin/svcadm ]; then + fmri="cswpostgresql- at BASE_VERSION_NODOT@" + echo "Enabling the ${fmri} service in SMF" + # Let things settle a little bit + sleep 4 + svcadm clear "${fmri}" + svcadm enable "${fmri}" +else + initscript="/etc/opt/csw/init.d/cswpostgresql- at BASE_VERSION_NODOT@" + echo "Issuing ${initscript} start" + "${initscript}" start +fi + +exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Dec 4 21:50:01 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 04 Dec 2011 20:50:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[16375] csw/mgar/pkg/postgresql/branches/postgresql-8. 3-raos/Makefile Message-ID: Revision: 16375 http://gar.svn.sourceforge.net/gar/?rev=16375&view=rev Author: guengel Date: 2011-12-04 20:50:01 +0000 (Sun, 04 Dec 2011) Log Message: ----------- postgresql/branches/postgresql-8.3-raos: Using mySED instead of EXPANDVARS. Man pages in (1) are now versioned. Added RUNTIME_DEP_PKGS for contrib package. Server, client, contrib, and devel now use dedicated alternatives and do not share one alternative name anymore. Contrib package finished. Postinstall for server package will be create in post-package rule. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile 2011-12-04 20:42:28 UTC (rev 16374) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile 2011-12-04 20:50:01 UTC (rev 16375) @@ -97,15 +97,13 @@ # variables. include pgconf.mk -EXPANDVARS = CSWpostgresql-$(BASE_VERSION_NODOT).postinstall -EXPANDVARS += $(INITSCRIPTFILETMPL) -EXPANDVARS += $(USERGROUPFILETMPL) -EXPANDVARS += $(CSWPGSQLCONFFILETMPL) - MASTER_SITES = http://ftp.postgresql.org/pub/source/v$(VERSION)/ DISTFILES = $(NAME)-$(VERSION).tar.bz2 DISTFILES += README-CSW.txt -DISTFILES += $(EXPANDVARS) +DISTFILES += CSWpostgresql-server.postinstall.tmpl +DISTFILES += $(INITSCRIPTFILETMPL) +DISTFILES += $(USERGROUPFILETMPL) +DISTFILES += $(CSWPGSQLCONFFILETMPL) INITSMF = $(sysconfdir)/init\.d/$(INITSCRIPTFILE_VERSIONED) USERGROUP = $(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED) @@ -137,7 +135,7 @@ CATALOGNAME_CSW$(NAME)$(BASE_VERSION_NODOT)-server = $(NAME)$(BASE_VERSION_NODOT)_server SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-server = PostgreSQL $(VERSION), Server PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server = $(foreach n,$(BIN_NAMES_SERVER),.*$(n)$$) -PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += $(foreach n,$(BIN_NAMES_SERVER),.*/man1/$(n)\.1$$) +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += $(foreach n,$(BIN_NAMES_SERVER),.*/man1/$(n)-$(BASE_VERSION_NODOT)\.1$$) PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += $(foreach n,$(SO_NAMES_SERVER),.*/$(NAME)/$(BASE_VERSION_NODOT)/*$(n)$$) PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += $(MISC_NAMES_SERVER) PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*/$(NAME)/$(BASE_VERSION_NODOT)/timezone(sets|)/.* @@ -158,12 +156,11 @@ RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibpq5-1 #ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-server = $(foreach i,$(BUILD_ISAS), server_$(i)) - PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-client CATALOGNAME_CSW$(NAME)$(BASE_VERSION_NODOT)-client = $(NAME)$(BASE_VERSION_NODOT)_client SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-client = PostgreSQL $(VERSION), Client PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client = $(foreach n,$(BIN_NAMES_CLIENT),.*$(n)$$) -PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += $(foreach n,$(BIN_NAMES_CLIENT),.*/man1/$(n)\.1$$) +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += $(foreach n,$(BIN_NAMES_CLIENT),.*/man1/$(n)-$(BASE_VERSION_NODOT)\.1$$) PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += $(MISC_NAMES_CLIENT) PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_client.* RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client = CSWlibiconv2 @@ -177,24 +174,30 @@ RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWalternatives #ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-client = $(foreach i,$(BUILD_ISAS), client_$(i)) - PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-contrib CATALOGNAME_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = $(NAME)$(BASE_VERSION_NODOT)_contrib SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = PostgreSQL $(VERSION), Contrib PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = $(foreach n,$(BIN_NAMES_CONTRIB),.*$(n)$$) -PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += $(foreach n,$(BIN_NAMES_CONTRIB),.*/man1/$(n)\.1$$) +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += $(foreach n,$(BIN_NAMES_CONTRIB),.*/man1/$(n)-$(BASE_VERSION_NODOT)\.1$$) +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += $(foreach n,$(SO_NAMES_CONTRIB),.*/$(NAME)/$(BASE_VERSION_NODOT)/*$(n)$$) +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*/$(NAME)/$(BASE_VERSION_NODOT)/contrib.* PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_contrib.* +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = CSWlibiconv2 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibxml2 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibxslt +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWosslrt +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibz1 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibpq5-1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWalternatives #ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = $(foreach i,$(BUILD_ISAS), contrib_$(i)) - PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-devel CATALOGNAME_CSW$(NAME)$(BASE_VERSION_NODOT)-devel = $(NAME)$(BASE_VERSION_NODOT)_devel SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-devel = PostgreSQL $(VERSION), Development Files PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-devel = .*/pgxs/.* PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-devel += $(PKGFILES_DEVEL) PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-devel += $(foreach n,$(BIN_NAMES_DEVEL),.*$(n)$$) -PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-devel += $(foreach n,$(BIN_NAMES_DEVEL),.*/man1/$(n)\.1$$) +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-devel += $(foreach n,$(BIN_NAMES_DEVEL),.*/man1/$(n)-$(BASE_VERSION_NODOT)\.1$$) PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-devel += .*/man5/.* PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-devel += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_devel.* RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-devel += CSWalternatives @@ -378,19 +381,19 @@ # This will generate the ALTERNATIVEs for the binaries in $(libexecdir)/postgresql/XY. # I consider this bad voodoo. ## Server -$(foreach alt,$(BUILD_ISAS), $(eval alt_priority=$(shell expr $(alt_priority) + 10)) $(eval ALTERNATIVE_server_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_SERVER)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT) $(libexecdir)/$(subst server_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) $(eval ALTERNATIVE_server_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_SERVER)),$(BIN_NAMES_SERVER)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT) $(libexecdir)/$(subst server_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) ) +$(foreach alt,$(BUILD_ISAS), $(eval alt_priority=$(shell expr $(alt_priority) + 10)) $(eval ALTERNATIVE_server_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_SERVER)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-server $(libexecdir)/$(subst server_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) $(eval ALTERNATIVE_server_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_SERVER)),$(BIN_NAMES_SERVER)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT) $(libexecdir)/$(subst server_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) ) ## Client # reset priority alt_priority = 20 -$(foreach alt,$(BUILD_ISAS), $(eval alt_priority=$(shell expr $(alt_priority) + 10)) $(eval ALTERNATIVE_client_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_SERVER)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT) $(libexecdir)/$(subst client_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) $(eval ALTERNATIVE_client_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_SERVER)),$(BIN_NAMES_SERVER)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT) $(libexecdir)/$(subst client_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) ) +$(foreach alt,$(BUILD_ISAS), $(eval alt_priority=$(shell expr $(alt_priority) + 10)) $(eval ALTERNATIVE_client_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_CLIENT)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-client $(libexecdir)/$(subst client_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) $(eval ALTERNATIVE_client_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_CLIENT)),$(BIN_NAMES_CLIENT)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT) $(libexecdir)/$(subst client_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) ) ## Contrib # reset priority alt_priority = 20 -$(foreach alt,$(BUILD_ISAS), $(eval alt_priority=$(shell expr $(alt_priority) + 10)) $(eval ALTERNATIVE_contrib_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_SERVER)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT) $(libexecdir)/$(subst contrib_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) $(eval ALTERNATIVE_contrib_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_SERVER)),$(BIN_NAMES_SERVER)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT) $(libexecdir)/$(subst contrib_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) ) +$(foreach alt,$(BUILD_ISAS), $(eval alt_priority=$(shell expr $(alt_priority) + 10)) $(eval ALTERNATIVE_contrib_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_CONTRIB)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-contrib $(libexecdir)/$(subst contrib_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) $(eval ALTERNATIVE_contrib_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_CONTRIB)),$(BIN_NAMES_CONTRIB)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT) $(libexecdir)/$(subst contrib_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) ) ## Devel # reset priority alt_priority = 20 -$(foreach alt,$(BUILD_ISAS), $(eval alt_priority=$(shell expr $(alt_priority) + 10)) $(eval ALTERNATIVE_devel_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_SERVER)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT) $(libexecdir)/$(subst devel_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) $(eval ALTERNATIVE_devel_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_SERVER)),$(BIN_NAMES_SERVER)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT) $(libexecdir)/$(subst devel_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) ) +$(foreach alt,$(BUILD_ISAS), $(eval alt_priority=$(shell expr $(alt_priority) + 10)) $(eval ALTERNATIVE_devel_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_DEVEL)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-devel $(libexecdir)/$(subst devel_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) $(eval ALTERNATIVE_devel_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_DEVEL)),$(BIN_NAMES_DEVEL)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT) $(libexecdir)/$(subst devel_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) ) # We adjust the $(pkglibdir) found in $(WORKSRC)/src/Makefile.global.in, so # that it should be possible to install 8.x and 8.y concurrently @@ -404,77 +407,33 @@ $(BUILD_ENV) gmake -C $(WORKSRC)/contrib all @$(MAKECOOKIE) -#post-install-modulated: -# $(INSTALL_ENV) gmake -C $(WORKSRC)/contrib DESTDIR=$(DESTDIR) install -# ginstall -d -m 755 $(DESTDIR)$(prefix)/bin -# [ -r $(DESTDIR)$(bindir)/pg_config ] && \ -# gmv -v $(DESTDIR)$(bindir)/pg_config $(DESTDIR)$(prefix)/bin || true -# @$(MAKECOOKIE) +post-install-modulated: + $(INSTALL_ENV) gmake -C $(WORKSRC)/contrib DESTDIR=$(DESTDIR) install + ginstall -d -m 755 $(DESTDIR)$(prefix)/bin + [ -r $(DESTDIR)$(bindir)/pg_config ] && \ + gmv -v $(DESTDIR)$(bindir)/pg_config $(DESTDIR)$(prefix)/bin || true + @$(MAKECOOKIE) post-merge: +# Create my alternatives files + $(foreach a,$(myALTERNATIVES), $(foreach i,$(BUILD_ISAS), $(shell ginstall -d $(PKGROOT)$(sharedstatedir)/alternatives ; echo "$(ALTERNATIVE_$(a)_$(i))" > $(PKGROOT)$(sharedstatedir)/alternatives/$(NAME)$(BASE_VERSION_NODOT)_$(a)_$(i)))) # Create the PGDATA directory ginstall -d $(PKGROOT)$(PGDATA) # The usergroup file ginstall -d $(PKGROOT)$(USERGROUPDIR) - ginstall $(WORKDIR)/$(USERGROUPFILETMPL) $(PKGROOT)$(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED) + $(mySED) $(FILEDIR)/$(USERGROUPFILETMPL) > $(PKGROOT)$(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED) # The init script ginstall -d $(PKGROOT)$(sysconfdir)/init.d - ginstall $(WORKDIR)/$(INITSCRIPTFILETMPL) $(PKGROOT)$(sysconfdir)/init.d/$(INITSCRIPTFILE_VERSIONED) + $(mySED) $(FILEDIR)/$(INITSCRIPTFILETMPL) > $(PKGROOT)$(sysconfdir)/init.d/$(INITSCRIPTFILE_VERSIONED) + chmod 0755 $(PKGROOT)$(sysconfdir)/init.d/$(INITSCRIPTFILE_VERSIONED) # The init script config - ginstall $(WORKDIR)/$(CSWPGSQLCONFFILETMPL) $(PKGROOT)$(sysconfdir)/$(CSWPGSQLCONFFILE_VERSIONED).CSW -# Create my alternatives files - $(foreach a,$(myALTERNATIVES), $(foreach i,$(BUILD_ISAS), $(shell ginstall -d $(PKGROOT)$(sharedstatedir)/alternatives ; echo "$(ALTERNATIVE_$(a)_$(i))" > $(PKGROOT)$(sharedstatedir)/alternatives/$(NAME)$(BASE_VERSION_NODOT)_$(a)_$(i)))) - -# Create the directory for the usergroup file and install it -# gsed -e 's|@PGLOCALSTATEDIR_BASE@|$(PGLOCALSTATEDIR_BASE)|g' $(FILEDIR)/$(USERGROUPFILETMPL) > $(PKGROOT)$(USERGROUPDIR)/$(USERGROUPFILE)-$(BASE_VERSION_NODOT) -# ginstall -d $(PKGROOT)/etc$(prefix)/init.d -# ginstall \ -# $(WORKDIR)/cswpostgres.tmpl \ -# $(PKGROOT)/etc$(prefix)/init.d/$(initscript_base_name) -# ginstall -d $(PKGROOT)/etc$(prefix)/pkg/$(NAME) -# gsed -e 's+ at PGDATA@+$(PGDATA)+g' \ -# < $(FILEDIR)/cswusergroup.tmpl \ -# > $(WORKDIR)/cswusergroup -# ginstall $(WORKDIR)/cswusergroup \ -# $(PKGROOT)/etc$(prefix)/pkg/$(NAME)/cswusergroup_$(VERSION_NODOT) -# ginstall -d $(PKGROOT)$(sysconfdir) -# gsed -e 's+ at PGDATA@+$(PGDATA)+g' \ -# < $(FILEDIR)/postgresql.conf.tmpl \ -# > $(WORKDIR)/postgresql.conf -# ginstall $(WORKDIR)/postgresql.conf \ -# $(PKGROOT)$(sysconfdir) -# ginstall -d $(PKGROOT)$(docdir) -# # ginstall $(WORKDIR)/README-CSW.txt $(PKGROOT)$(docdir) -# ginstall -m 755 -d $(PKGROOT)$(prefix)/bin -# # for b in $(BIN_NAMES); do \ -# # gln -s ..$(version_dependent)/bin/$${b} $(PKGROOT)$(prefix)/bin/$${b}; \ -# # done -# ginstall -d $(PKGROOT)$(PGDATA) -# gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 -# mkdir -p $(PKGROOT)$(prefix)/lib -# mkdir -p $(PKGROOT)$(prefix)/lib/$(ISA_DEFAULT64) -# for libname in libpq libecpg libecpg_compat libpgtypes; do \ -# mv $(PKGROOT)$(libdir)/$${libname}.so $(PKGROOT)$(prefix)/lib; \ -# mv $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/$${libname}.so $(PKGROOT)$(prefix)/lib/$(ISA_DEFAULT64); \ -# mv $(PKGROOT)$(libdir)/$${libname}.so.* $(PKGROOT)$(prefix)/lib; \ -# mv $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/$${libname}.so.* $(PKGROOT)$(prefix)/lib/$(ISA_DEFAULT64); \ -# done -# $(FILEDIR)/merge_legacy_libs.sh $(GARCH) $(FILEDIR) $(PKGROOT)/$(prefix)/lib - -# # Backward compatibility provided by CSWlibpq -# mkdir -p $(PKGROOT)$(prefix)/postgresql/lib -# mkdir -p $(PKGROOT)$(prefix)/postgresql/lib/$(ISA_DEFAULT64) -# gln -s . $(PKGROOT)$(prefix)/postgresql/lib/$(ISA_DEFAULT) -# gln -s $(ISA_DEFAULT64) $(PKGROOT)$(prefix)/postgresql/lib/64 -# gln -s $(ISA_DEFAULT) $(PKGROOT)$(prefix)/postgresql/lib/32 -# for f in $(PKGROOT)$(prefix)/lib/*.so.*; do \ -# ln -s \ -# ../../lib/`basename $${f}` \ -# $(PKGROOT)$(prefix)/postgresql/lib; \ -# done -# for f in $(PKGROOT)$(prefix)/lib/$(ISA_DEFAULT64)/lib*.so.*; do \ -# ln -s \ -# ../../lib/$(ISA_DEFAULT64)/`basename $${f}` \ -# $(PKGROOT)$(prefix)/postgresql/lib/$(ISA_DEFAULT64); \ -# done + $(mySED) $(FILEDIR)/$(CSWPGSQLCONFFILETMPL) > $(PKGROOT)$(sysconfdir)/$(CSWPGSQLCONFFILE_VERSIONED).CSW +# Adjust the man page names for man1 + for f in $(PKGROOT)$(datadir)/man/man1/* ; do \ + f_no_suffix="`echo $$f | sed -e 's/.1$$//'`" ; \ + mv $$f $${f_no_suffix}-$(BASE_VERSION_NODOT).1 ; \ + done @$(MAKECOOKIE) + +pre-package: + $(mySED) $(FILEDIR)/CSWpostgresql-server.postinstall.tmpl > $(WORKDIR)/CSW$(NAME)$(BASE_VERSION_NODOT)-server.postinstall This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Dec 4 23:58:52 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 04 Dec 2011 22:58:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[16376] csw/mgar/pkg/postgresql/branches/postgresql-8. 3-raos Message-ID: Revision: 16376 http://gar.svn.sourceforge.net/gar/?rev=16376&view=rev Author: guengel Date: 2011-12-04 22:58:52 +0000 (Sun, 04 Dec 2011) Log Message: ----------- postgresql/branches/postgresql-8.3-raos: Added patch for adding SONAME with major and minor version to shared libraries. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile Added Paths: ----------- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/0000-SONAME-including-major-and-minor-version.patch Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile 2011-12-04 20:50:01 UTC (rev 16375) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile 2011-12-04 22:58:52 UTC (rev 16376) @@ -57,12 +57,30 @@ # # 1. Adjust BASE_VERSION and/or PATCHLEVEL. # -# 2. `mgar merge` +# 2. Make sure the SONAME patch for +# $(WORKDIR)/postgresql-x.y.z/src/Makefile.shlib still works # -# 3. If step 2 succeeded, check the prototype of +# 3. Comment out 'post-install-modulated:'. So we can identify changes in the +# server/client environment. +# +# 4. `mgar package` +# +# 5. If step 4 succeeded, check the prototype of # CSW$(NAME)$(BASE_VERSION_NODOT) for files that have slipped by and put # them in the proper place. +# +# 6. Uncomment 'post-install-modulated:'. This will shed light on changes in +# the contrib environment. +# +# 7. `mgar spotless package` +# +# 8. If step 6 succeeded, check the prototype of +# CSW$(NAME)$(BASE_VERSION_NODOT) for files that have slipped by and put +# them in the proper place. +# +# 9. Make sure the proper version numbers are used for the library packages. + # This BUILD is NOT READY! It needs work before it's usable. # TODO: Initialize the database cluster during installation if not already @@ -105,6 +123,13 @@ DISTFILES += $(USERGROUPFILETMPL) DISTFILES += $(CSWPGSQLCONFFILETMPL) +# This patch will make the SONAME of the libraries to contain the major and +# minor version. This is important when having multiple installations of +# PostgreSQL where the library versions differ only in the minor part, such as +# with PostgreSQL 8.3 and PostgreSQL 8.4. +# +PATCHFILES += 0000-SONAME-including-major-and-minor-version.patch + INITSMF = $(sysconfdir)/init\.d/$(INITSCRIPTFILE_VERSIONED) USERGROUP = $(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED) PRESERVECONF = $(sysconfdir)/$(CSWPGSQLCONFFILE_VERSIONED) Added: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/0000-SONAME-including-major-and-minor-version.patch =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/0000-SONAME-including-major-and-minor-version.patch (rev 0) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/0000-SONAME-including-major-and-minor-version.patch 2011-12-04 22:58:52 UTC (rev 16376) @@ -0,0 +1,25 @@ +From 0783c2280989e9175f1bdb91a0035822275eebc4 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sun, 4 Dec 2011 23:39:42 +0100 +Subject: [PATCH] SONAME including major and minor version + +--- + src/Makefile.shlib | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/Makefile.shlib b/src/Makefile.shlib +index 84fc918..15594cf 100644 +--- a/src/Makefile.shlib ++++ b/src/Makefile.shlib +@@ -93,7 +93,7 @@ shlib_bare = lib$(NAME)$(DLSUFFIX) + + override CFLAGS += $(CFLAGS_SL) + +-soname = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) ++soname = $(shlib) + + ifeq ($(PORTNAME), aix) + shlib = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) +-- +1.7.6.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Mon Dec 5 10:35:16 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Mon, 5 Dec 2011 09:35:16 +0000 Subject: [csw-devel] PostgreSQL In-Reply-To: <20111205093237.GA13641@quince.home.blizinski.pl> References: <20111119095548.GB8540@bender.opencsw.org> <20111201220037.GA15661@bender.opencsw.org> <20111205085955.GA18805@bender.opencsw.org> <20111205093237.GA13641@quince.home.blizinski.pl> Message-ID: [+devel] This time with the correct address of the devel mailing list. 2011/12/5 Maciej Blizi?ski : > Rafael Ostertag wrote: >> Hi Maciej >> >> You may want to have a look at the latest postgresql commit. The recipe does >> now basically the following: >> >> ?* Installs libraries into $(libdir). >> >> ?* Binaries got into $(libexecdir)/postgresql/XY/ and will be linked to >> ? ?$(bindir) using alternatives. >> >> ?* Some other stuff making parallel installs possible. >> >> This recipe should make it possible to install different PostreSQL versions, >> e.g. 8.3, 8.4 etc, in parallel. >> >> Please let me know what you think about it. > > The recipe looks good overall, good job! ?I pasted it below for some > detailed comments. > > I included Dago, maybe he'll have some comments about alternatives. > I also Cc'd the devel mailing list, where the reviews usually happen. > >> # Copyright 2009 OpenCSW >> # Distributed under the terms of the GNU General Public License v2 >> # $Id$ >> # >> # Note 1 >> # ------ >> # >> # A word of caution: PostgreSQL does use autoconf, but it does *not* use >> # automake. That said, it `misses' many features found in pure >> # autoconf/automake builds, e.g. --program-suffix is not available. This also >> # explains some quirks of this recipe. > > Good clarification. > >> # >> # Note 2 >> # ------ >> # >> # The idea is to make it possible to install different major/minor versions of >> # PostgreSQL at the same time but without installing them to distinct --prefix >> # directories, which in turn makes linking against PostgreSQL easier. This has >> # been achieved as follows: >> # >> # ?* libraries go into $(libdir) >> # >> # ?* binaries go into $(libexec)/postgres/XY/ and alternatives are used to >> # ? ?bring the binaries into $(prefix)/bin >> # >> # Generally, putting libraries in $(libdir) should not pose a problem, but in >> # the case of PostgresSQL, there is also a directory $(libdir)/postgres which >> # is unversioned and cannot be changed by passing arguments to configure. This >> # shortcoming can be lifted by adjusting $(pkglibdir) in >> # $(WORKSRC)/src/Makefile.global.in which is what we do. >> # >> # >> # Note 3: Alternatives >> # ------ >> # >> # I was unable to get the alternatives system to work with using >> # >> # ?ALTERNATIVES_CSWpostgresql83-server = server_amd64 server_pentium_pro >> # >> # and then defining those alternatives. /opt/csw/sbin/alternatives choked on >> # the one file generated for server containing two distinct alternatives. So I >> # cooked my own soup: >> # >> # ?1. Create for server, client, contrib, devel separate files containing the >> # ? ? alternatives for the ISAs >> # >> # ?2. Adjust the prototype to add include the class 'cswalternatives' for the >> # ? ? files in question. >> # >> # The problem appeared to be having two lines in the same file. So my approach >> # is to generate one file per line of alternatives. > > Maybe Dago can have a look? > >> # >> # Note 4: ?New upstream releases >> # ------ >> # >> # 1. Adjust BASE_VERSION and/or PATCHLEVEL. >> # >> # 2. Make sure the SONAME patch for >> # ? ?$(WORKDIR)/postgresql-x.y.z/src/Makefile.shlib still works >> # >> # 3. Comment out 'post-install-modulated:'. So we can identify changes in the >> # ? ?server/client environment. >> # >> # 4. `mgar package` >> # >> # 5. If step 4 succeeded, check the prototype of >> # ? ?CSW$(NAME)$(BASE_VERSION_NODOT) for files that have slipped by and put >> # ? ?them in the proper place. >> # >> # 6. Uncomment 'post-install-modulated:'. This will shed light on changes in >> # ? ?the contrib environment. >> # >> # 7. `mgar spotless package` >> # >> # 8. If step 6 succeeded, check the prototype of >> # ? ?CSW$(NAME)$(BASE_VERSION_NODOT) for files that have slipped by and put >> # ? ?them in the proper place. >> # >> # 9. Make sure the proper version numbers are used for the library packages. >> >> >> # This BUILD is NOT READY! ?It needs work before it's usable. >> >> # TODO: Initialize the database cluster during installation if not already >> # there. >> # >> # TODO: Migration plan from 8.3: Installing 8.3 and 8.4 at the same time, and >> # migrating >> # >> # TODO: The isaexec part in GAR doesn't work very well. ?Let's write a minimal >> # example of it. ? (gmake repackage may produce the right output) > > These are my comments; you can remove them if they're no longer > relevant; or you can merge them with your notes. > >> NAME = postgresql >> BASE_VERSION = 8.3 >> VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) >> BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION)) >> PATCHLEVEL = 16 >> VERSION = $(BASE_VERSION).$(PATCHLEVEL) >> CATEGORIES = apps >> >> # Useful when making a series of builds on the same day >> # GARFLAVOR ?= DBG >> >> VENDOR_URL = http://www.postgresql.org/ >> >> define BLURB >> endef >> >> # Here we will fetch various variables that are used in this recipe. I decided >> # to place those in a separate file for the sake of uncluttering this recipe. > > I wouldn't worry about cluttering one recipe. ?pgconf.mk is not that > long, and there's value in everything being in one file. > >> # Many of the varibles defined in pgconf.mk depend on the various $(VERSION*) >> # variables. >> include pgconf.mk >> >> MASTER_SITES = http://ftp.postgresql.org/pub/source/v$(VERSION)/ >> DISTFILES ?= $(NAME)-$(VERSION).tar.bz2 >> DISTFILES += README-CSW.txt >> DISTFILES += CSWpostgresql-server.postinstall.tmpl >> DISTFILES += $(INITSCRIPTFILETMPL) >> DISTFILES += $(USERGROUPFILETMPL) >> DISTFILES += $(CSWPGSQLCONFFILETMPL) >> >> # This patch will make the SONAME of the libraries to contain the major and >> # minor version. This is important when having multiple installations of >> # PostgreSQL where the library versions differ only in the minor part, such as >> # with PostgreSQL 8.3 and PostgreSQL 8.4. >> # >> PATCHFILES += 0000-SONAME-including-major-and-minor-version.patch > > Maybe this is not needed? ?If the major version doesn't change, you > should be able to use libpq from PostgreSQL 8.4 with binaries from > PostgreSQL 8.3. > > (Unless you tried it and it doesn't work in practice.) > > Less numbered shared libraries is better. If you end up with packages > with the same name (e.g. CSWlibpq5) from two different recipes, you only > publish CSWlibpq5 from the newer version of PostgreSQL, just like you do > with CSW*-dev. > >> INITSMF = $(sysconfdir)/init\.d/$(INITSCRIPTFILE_VERSIONED) >> USERGROUP = $(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED) >> PRESERVECONF = $(sysconfdir)/$(CSWPGSQLCONFFILE_VERSIONED) >> >> LICENSE = COPYRIGHT >> >> PROTOTYPE_MODIFIERS = pgdata alternatives >> PROTOTYPE_FILES_pgdata = $(PGLOCALSTATEDIR_BASE).* >> PROTOTYPE_USER_pgdata = postgres >> PROTOTYPE_GROUP_pgdata = sys >> PROTOTYPE_PERMS_pgdata = 0700 >> PROTOTYPE_CLASS_pgdata = ugfiles >> >> PROTOTYPE_FILES_alternatives = .*/alternatives/$(NAME)$(BASE_VERSION_NODOT).* >> PROTOTYPE_CLASS_alternatives = cswalternatives >> >> # This is the catchall package. It should not contain any files from >> # $(PKGROOT). After building all the packages, I check the prototype of this >> # package to make sure there are no files slipped by. >> PACKAGES = CSW$(NAME)$(BASE_VERSION_NODOT) >> SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT) = PostgreSQL $(VERSION), Meta Package >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT) ?= CSW$(NAME)$(BASE_VERSION_NODOT)-server >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT) += CSW$(NAME)$(BASE_VERSION_NODOT)-client >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT) += CSW$(NAME)$(BASE_VERSION_NODOT)-contrib >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT) += CSW$(NAME)$(BASE_VERSION_NODOT)-devel > > I like this naming scheme. > >> PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-server >> CATALOGNAME_CSW$(NAME)$(BASE_VERSION_NODOT)-server = $(NAME)$(BASE_VERSION_NODOT)_server > > Automatic CATALOGNAME works well these days. If it's just about > substitutting "-" with "_", GAR will take care of it. > >> SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-server = PostgreSQL $(VERSION), Server >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server ?= $(foreach n,$(BIN_NAMES_SERVER),.*$(n)$$) >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += $(foreach n,$(BIN_NAMES_SERVER),.*/man1/$(n)-$(BASE_VERSION_NODOT)\.1$$) >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += $(foreach n,$(SO_NAMES_SERVER),.*/$(NAME)/$(BASE_VERSION_NODOT)/*$(n)$$) >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += $(MISC_NAMES_SERVER) >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*/$(NAME)/$(BASE_VERSION_NODOT)/timezone(sets|)/.* >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*/$(NAME)/$(BASE_VERSION_NODOT)/tsearch_.*/.* >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += $(PGLOCALSTATEDIR_BASE).* >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*$(USERGROUP) >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*$(sysconfdir)/init\.d/.* >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*$(sysconfdir)/$(CSWPGSQLCONFFILE_VERSIONED).CSW >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_server.* >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server ?= CSWlibiconv2 >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibncurses5 >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibreadline6 >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibxml2 >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibxslt >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWosslrt >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibz1 >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWalternatives >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibpq5-1 >> #ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-server = $(foreach i,$(BUILD_ISAS), server_$(i)) >> >> PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-client >> CATALOGNAME_CSW$(NAME)$(BASE_VERSION_NODOT)-client = $(NAME)$(BASE_VERSION_NODOT)_client >> SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-client = PostgreSQL $(VERSION), Client >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client = $(foreach n,$(BIN_NAMES_CLIENT),.*$(n)$$) >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += $(foreach n,$(BIN_NAMES_CLIENT),.*/man1/$(n)-$(BASE_VERSION_NODOT)\.1$$) >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += $(MISC_NAMES_CLIENT) >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_client.* >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client ?= CSWlibiconv2 >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibncurses5 >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibreadline6 >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibxml2 >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibxslt >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWosslrt >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibz1 >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibpq5-1 >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWalternatives >> #ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-client = $(foreach i,$(BUILD_ISAS), client_$(i)) >> >> PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-contrib >> CATALOGNAME_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = $(NAME)$(BASE_VERSION_NODOT)_contrib >> SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = PostgreSQL $(VERSION), Contrib >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = $(foreach n,$(BIN_NAMES_CONTRIB),.*$(n)$$) >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += $(foreach n,$(BIN_NAMES_CONTRIB),.*/man1/$(n)-$(BASE_VERSION_NODOT)\.1$$) >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += $(foreach n,$(SO_NAMES_CONTRIB),.*/$(NAME)/$(BASE_VERSION_NODOT)/*$(n)$$) >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*/$(NAME)/$(BASE_VERSION_NODOT)/contrib.* >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_contrib.* >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib ?= CSWlibiconv2 >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibxml2 >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibxslt >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWosslrt >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibz1 >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibpq5-1 >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWalternatives >> #ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = $(foreach i,$(BUILD_ISAS), contrib_$(i)) >> >> PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-devel >> CATALOGNAME_CSW$(NAME)$(BASE_VERSION_NODOT)-devel = $(NAME)$(BASE_VERSION_NODOT)_devel >> SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-devel = PostgreSQL $(VERSION), Development Files >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-devel ?= .*/pgxs/.* >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-devel += $(PKGFILES_DEVEL) >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-devel += $(foreach n,$(BIN_NAMES_DEVEL),.*$(n)$$) >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-devel += $(foreach n,$(BIN_NAMES_DEVEL),.*/man1/$(n)-$(BASE_VERSION_NODOT)\.1$$) >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-devel += .*/man5/.* >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-devel += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_devel.* >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-devel += CSWalternatives >> #ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-devel = $(foreach i,$(BUILD_ISAS), devel_$(i)) >> >> PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-doc >> ARCHALL_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = 1 >> CATALOGNAME_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = $(NAME)$(BASE_VERSION_NODOT)_doc >> SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = PostgreSQL $(VERSION), Documentation Files >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-doc ?= ?.*/doc/$(NAME)/$(BASE_VERSION_NODOT)/.* >> >> PACKAGES += CSWlibecpg_compat3-0 >> CATALOGNAME_CSWlibecpg_compat3-0 = libecpg_compat3_0 >> SPKG_DESC_CSWlibecpg_compat3-0 = PostgreSQL $(VERSION), libecpg_compat >> PKGFILES_CSWlibecpg_compat3-0 ?= $(call pkgfiles_lib,libecpg_compat.so.3) >> RUNTIME_DEP_PKGS_CSWlibecpg_compat3-0 ?= CSWlibecpg6-0 >> RUNTIME_DEP_PKGS_CSWlibecpg_compat3-0 += CSWlibpgtypes3-0 >> RUNTIME_DEP_PKGS_CSWlibecpg_compat3-0 += CSWlibpq5-1 >> >> PACKAGES += CSWlibecpg6-0 >> CATALOGNAME_CSWlibecpg6-0 = libecpg6_0 >> SPKG_DESC_CSWlibecpg6-0 = PostgreSQL $(VERSION), libecpg >> PKGFILES_CSWlibecpg6-0 ?= $(call pkgfiles_lib,libecpg.so.6) >> RUNTIME_DEP_PKGS_CSWlibecpg6-0 += CSWlibpgtypes3-0 >> RUNTIME_DEP_PKGS_CSWlibecpg6-0 += CSWlibpq5-1 >> >> PACKAGES += CSWlibpgtypes3-0 >> CATALOGNAME_CSWlibpgtypes3-0 = libpgtypes3_0 >> SPKG_DESC_CSWlibpgtypes3-0 = PostgreSQL $(VERSION), libpgtypes >> PKGFILES_CSWlibpgtypes3-0 ?= $(call pkgfiles_lib,libpgtypes.so.3) >> >> PACKAGES += CSWlibpq5-1 >> CATALOGNAME_CSWlibpq5-1 = libpq5_1 >> SPKG_DESC_CSWlibpq5-1 = PostgreSQL $(VERSION), libpq >> PKGFILES_CSWlibpq5-1 ?= $(call pkgfiles_lib,libpq.so.5) >> RUNTIME_DEP_PKGS_CSWlibpq5-1 ?= CSWosslrt >> >> BUILD_DEP_PKGS ?= CSWlibxml2-dev >> BUILD_DEP_PKGS += CSWlibxslt-dev >> BUILD_DEP_PKGS += CSWperl >> BUILD_DEP_PKGS += CSWpython-dev >> BUILD_DEP_PKGS += CSWossldevel >> BUILD_DEP_PKGS += CSWlibreadline-dev >> BUILD_DEP_PKGS += CSWgsed # gsed is used in this recipe >> BUILD_DEP_PKGS += CSWlibz-dev >> >> EXTRA_LD_OPTIONS ?= -R$(prefix)/lib/\$$ISALIST >> >> BUILD64 = 1 >> # There was a discussion about whether to use ISAEXEC by default. ?The argument >> # is that enabling 64-bit by default where possible (using isaexec) is a waste. >> # I'm not completely convinced. ?Leaving this line commented out for future >> # consideration. >> # >> # References: >> # - http://lists.opencsw.org/pipermail/maintainers/2009-November/004903.html >> # >> # I'd like to get some hard data though. ?What is the difference in the memory >> # footprint, and what is the difference in execution speed between 32 and >> # 64-bit versions? >> ISAEXEC = 0 >> >> CONFIGURE_ARGS ?= $(DIRPATHS) >> # This is one of the quirks mentioned at the beginning: --program-suffix is not >> # supported, so IMHO, binaries should go to --libexecdir >> CONFIGURE_ARGS += --bindir=$(PGBINDIR) >> CONFIGURE_ARGS += --sbindir=$(PGSBINDIR) >> >> CONFIGURE_ARGS += --datadir=$(PGDATADIR) >> CONFIGURE_ARGS += --localstatedir=$(PGDATA) >> CONFIGURE_ARGS += --with-includes=/opt/csw/include >> CONFIGURE_ARGS += --with-libraries=$(abspath /opt/csw/lib/$(MM_LIBDIR)) >> CONFIGURE_ARGS += --with-docdir=$(PGDOCDIR) >> # configure complains that we are not thread-safe, wtf? --raos >> #CONFIGURE_ARGS += --enable-thread-safety >> >> CONFIGURE_ARGS += --with-gssapi >> CONFIGURE_ARGS += --with-pam >> CONFIGURE_ARGS += --with-openssl >> CONFIGURE_ARGS += --with-libxml >> CONFIGURE_ARGS += --with-libxslt >> CONFIGURE_ARGS += --without-krb5 >> CONFIGURE_ARGS += --without-bonjour >> CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MODULATION)) > > The above line takes no effect, I don't see any definitions like > e.g. CONFIGURE_ARGS_isa-amd64. > >> >> # Skipping tests to save time during packaging, and to enable x86 builds. >> # >> # IMHO, tests are essential, especially on Solaris, and I do not experience >> # build troubles on x86 having them enabled --raos >> SKIPTEST ?= 1 > > Feel free to delete this line, and let tests run. ?In my experience lots > of tests don't work because of test porting issues, not code porting > issues. ?If you have the time to make sure tests are ported properly -- > awesome! > >> TEST_TARGET = check > > 'check' is now the default, you can remove this line. > >> # PACKAGES += CSWlibpq-dev >> # CATALOGNAME_CSWlibpq-dev = libpq_dev >> # SPKG_DESC_CSWlibpq-dev = PostgreSQL C client headers (built from $(BASE_VERSION).x sources) >> # RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibgnugetopt0 >> # RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibgssapi-krb5-2 >> # RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibreadline6 >> # RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibxml2-2 >> # RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibxslt1 >> # RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibz1 >> # RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWosslrt >> # PKGFILES_CSWlibpq-dev += $(prefix)/include/postgresql.* >> # PKGFILES_CSWlibpq-dev += $(prefix)/lib/.*libpq.so >> # PKGFILES_CSWlibpq-dev += $(prefix)/lib/.*libecpg.so >> # PKGFILES_CSWlibpq-dev += $(prefix)/lib/.*libecpg_compat.so >> # PKGFILES_CSWlibpq-dev += $(prefix)/lib/.*libpgtypes.so >> # PKGFILES_CSWlibpq-dev += $(prefix)/bin/.*pg_config.* >> # PKGFILES_CSWlibpq-dev += $(prefix)/share/postgresql/8.4/man/man1/pg_config.1 >> # PKGFILES_CSWlibpq-dev += $(prefix)/share/locale/*/LC_MESSAGES/pg_config.*\.mo >> # RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibpq5 >> # RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibecpg6 >> # RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibecpg-compat3 >> # RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibpgtypes3 >> >> # # Legacy libraries >> # PACKAGES += CSWlibpq3 >> # CATALOGNAME_CSWlibpq3 = libpq3 >> # PKGFILES_CSWlibpq3 += $(call baseisadirs,$(prefix)/lib,libpq\.so\.3(\.\d+)*) >> # SPKG_DESC_CSWlibpq3 += PostgreSQL C client library, libpq.so.3 >> # RUNTIME_DEP_PKGS_CSWlibpq3 += CSWosslrt >> >> # PACKAGES += CSWlibpq4 >> # CATALOGNAME_CSWlibpq4 = libpq4 >> # PKGFILES_CSWlibpq4 += $(call baseisadirs,$(prefix)/lib,libpq\.so\.4(\.\d+)*) >> # SPKG_DESC_CSWlibpq4 += PostgreSQL C client library, libpq.so.4 >> # RUNTIME_DEP_PKGS_CSWlibpq4 += CSWosslrt >> >> # PACKAGES += CSWlibpgtypes1 >> # CATALOGNAME_CSWlibpgtypes1 = libpgtypes1 >> # PKGFILES_CSWlibpgtypes1 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.1(\.\d+)*) >> # SPKG_DESC_CSWlibpgtypes1 += Used by programs built with ecpg (Embedded PostgreSQL for C), libpgtypes.so.1 >> >> # PACKAGES += CSWlibpgtypes2 >> # CATALOGNAME_CSWlibpgtypes2 = libpgtypes2 >> # PKGFILES_CSWlibpgtypes2 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.2(\.\d+)*) >> # SPKG_DESC_CSWlibpgtypes2 += Used by programs built with ecpg (Embedded PostgreSQL for C), libpgtypes.so.2 >> >> # PACKAGES += CSWlibecpg4 >> # CATALOGNAME_CSWlibecpg4 = libecpg4 >> # PKGFILES_CSWlibecpg4 += $(call baseisadirs,$(prefix)/lib,libecpg\.so\.4(\.\d+)*) >> # SPKG_DESC_CSWlibecpg4 += Embedded PostgreSQL for C library, libecpg.so.4 >> # RUNTIME_DEP_PKGS_CSWlibecpg4 += CSWlibpgtypes1 >> # RUNTIME_DEP_PKGS_CSWlibecpg4 += CSWosslrt >> # RUNTIME_DEP_PKGS_CSWlibecpg4 += CSWlibpq3 >> >> # PACKAGES += CSWlibecpg5 >> # CATALOGNAME_CSWlibecpg5 = libecpg5 >> # PKGFILES_CSWlibecpg5 += $(call baseisadirs,$(prefix)/lib,libecpg\.so\.5(\.\d+)*) >> # SPKG_DESC_CSWlibecpg5 += Embedded PostgreSQL for C library, libecpg.so.5 >> # RUNTIME_DEP_PKGS_CSWlibecpg5 += CSWlibpgtypes2 >> # RUNTIME_DEP_PKGS_CSWlibecpg5 += CSWlibpq5 >> >> # PACKAGES += CSWlibecpg-compat2 >> # CATALOGNAME_CSWlibecpg-compat2 = libecpg_compat2 >> # PKGFILES_CSWlibecpg-compat2 += $(call baseisadirs,$(prefix)/lib,libecpg_compat\.so\.2(\.\d+)*) >> # SPKG_DESC_CSWlibecpg-compat2 += Older version of run-time library for ECPG programs, libecpg_compat.so.2 >> # RUNTIME_DEP_PKGS_CSWlibecpg-compat2 += CSWlibpgtypes2 >> # RUNTIME_DEP_PKGS_CSWlibecpg-compat2 += CSWlibecpg5 >> # RUNTIME_DEP_PKGS_CSWlibecpg-compat2 += CSWlibpq5 >> >> # # The horrible transitional package >> # PACKAGES += CSWlibpq >> # PKGFILES_CSWlibpq += $(prefix)/postgresql.* >> # SPKG_DESC_CSWlibpq = Transitional package for PostgreSQL shared libraries >> # RUNTIME_DEP_PKGS_CSWlibpq += CSWlibecpg-compat2 >> # RUNTIME_DEP_PKGS_CSWlibpq += CSWlibecpg-compat3 >> # RUNTIME_DEP_PKGS_CSWlibpq += CSWlibecpg4 >> # RUNTIME_DEP_PKGS_CSWlibpq += CSWlibecpg5 >> # RUNTIME_DEP_PKGS_CSWlibpq += CSWlibecpg6 >> # RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpgtypes1 >> # RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpgtypes2 >> # RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpgtypes3 >> # RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpq3 >> # RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpq4 >> # RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpq5 > > You can delete the commented code. You always have the subversion > history if you need it. > >> include gar/category.mk >> # This variable will be increased in the course of the following foreach loops >> alt_priority = 20 >> # This will generate the ALTERNATIVEs for the binaries in $(libexecdir)/postgresql/XY. >> # I consider this bad voodoo. > > Maybe Dago can chime in. ?Could this be handled by an external program > or script? > >> ## Server >> $(foreach alt,$(BUILD_ISAS), $(eval alt_priority=$(shell expr $(alt_priority) + 10)) $(eval ALTERNATIVE_server_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_SERVER)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-server $(libexecdir)/$(subst server_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) $(eval ALTERNATIVE_server_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_SERVER)),$(BIN_NAMES_SERVER)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT) $(libexecdir)/$(subst server_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) ) >> ## Client >> # reset priority >> alt_priority = 20 >> $(foreach alt,$(BUILD_ISAS), $(eval alt_priority=$(shell expr $(alt_priority) + 10)) $(eval ALTERNATIVE_client_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_CLIENT)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-client $(libexecdir)/$(subst client_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) $(eval ALTERNATIVE_client_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_CLIENT)),$(BIN_NAMES_CLIENT)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT) $(libexecdir)/$(subst client_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) ) >> ## Contrib >> # reset priority >> alt_priority = 20 >> $(foreach alt,$(BUILD_ISAS), $(eval alt_priority=$(shell expr $(alt_priority) + 10)) $(eval ALTERNATIVE_contrib_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_CONTRIB)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-contrib $(libexecdir)/$(subst contrib_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) $(eval ALTERNATIVE_contrib_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_CONTRIB)),$(BIN_NAMES_CONTRIB)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT) $(libexecdir)/$(subst contrib_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) ) >> ## Devel >> # reset priority >> alt_priority = 20 >> $(foreach alt,$(BUILD_ISAS), $(eval alt_priority=$(shell expr $(alt_priority) + 10)) $(eval ALTERNATIVE_devel_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_DEVEL)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-devel $(libexecdir)/$(subst devel_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) $(eval ALTERNATIVE_devel_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_DEVEL)),$(BIN_NAMES_DEVEL)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT) $(libexecdir)/$(subst devel_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) ) >> >> # We adjust the $(pkglibdir) found in $(WORKSRC)/src/Makefile.global.in, so >> # that it should be possible to install 8.x and 8.y concurrently >> pre-configure-modulated: >> ? ? ? if [ -r $(WORKSRC)/src/Makefile.global.in ] ; then \ >> ? ? ? ? ? ? ? gsed -i -r -e 's|^(pkglibdir[[:space:]]*=[[:space:]]*)\$$\(libdir\).*$$|\1$$(libdir)/postgresql/$(BASE_VERSION_NODOT)|' $(WORKSRC)/src/Makefile.global.in ; \ >> ? ? ? fi >> ? ? ? @$(MAKECOOKIE) >> >> post-build-modulated: >> ? ? ? $(BUILD_ENV) gmake -C $(WORKSRC)/contrib all >> ? ? ? @$(MAKECOOKIE) >> >> post-install-modulated: >> ? ? ? $(INSTALL_ENV) gmake -C $(WORKSRC)/contrib DESTDIR=$(DESTDIR) install >> ? ? ? ginstall -d -m 755 $(DESTDIR)$(prefix)/bin >> ? ? ? [ -r $(DESTDIR)$(bindir)/pg_config ] && \ >> ? ? ? gmv -v $(DESTDIR)$(bindir)/pg_config $(DESTDIR)$(prefix)/bin || true >> ? ? ? @$(MAKECOOKIE) >> >> post-merge: >> # Create my alternatives files >> ? ? ? $(foreach a,$(myALTERNATIVES), $(foreach i,$(BUILD_ISAS), $(shell ginstall -d $(PKGROOT)$(sharedstatedir)/alternatives ; echo "$(ALTERNATIVE_$(a)_$(i))" > $(PKGROOT)$(sharedstatedir)/alternatives/$(NAME)$(BASE_VERSION_NODOT)_$(a)_$(i)))) >> # Create the PGDATA directory >> ? ? ? ginstall -d $(PKGROOT)$(PGDATA) >> # The usergroup file >> ? ? ? ginstall -d $(PKGROOT)$(USERGROUPDIR) >> ? ? ? $(mySED) $(FILEDIR)/$(USERGROUPFILETMPL) > $(PKGROOT)$(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED) > > Where does mySED come from? > >> # The init script >> ? ? ? ginstall -d $(PKGROOT)$(sysconfdir)/init.d >> ? ? ? $(mySED) $(FILEDIR)/$(INITSCRIPTFILETMPL) > $(PKGROOT)$(sysconfdir)/init.d/$(INITSCRIPTFILE_VERSIONED) >> ? ? ? chmod 0755 $(PKGROOT)$(sysconfdir)/init.d/$(INITSCRIPTFILE_VERSIONED) >> # The init script config >> ? ? ? $(mySED) $(FILEDIR)/$(CSWPGSQLCONFFILETMPL) > $(PKGROOT)$(sysconfdir)/$(CSWPGSQLCONFFILE_VERSIONED).CSW >> # Adjust the man page names for man1 >> ? ? ? for f in $(PKGROOT)$(datadir)/man/man1/* ; do \ >> ? ? ? ? ? ? ? f_no_suffix="`echo $$f | sed -e 's/.1$$//'`" ; \ >> ? ? ? ? ? ? ? mv $$f $${f_no_suffix}-$(BASE_VERSION_NODOT).1 ; \ >> ? ? ? done >> ? ? ? @$(MAKECOOKIE) >> >> pre-package: >> ? ? ? $(mySED) $(FILEDIR)/CSWpostgresql-server.postinstall.tmpl > $(WORKDIR)/CSW$(NAME)$(BASE_VERSION_NODOT)-server.postinstall > > Very good job. > > Maciej From dam at opencsw.org Mon Dec 5 15:01:52 2011 From: dam at opencsw.org (Dagobert Michelsen) Date: Mon, 5 Dec 2011 15:01:52 +0100 Subject: [csw-devel] PostgreSQL In-Reply-To: <20111205093237.GA13641@quince.home.blizinski.pl> References: <20111119095548.GB8540@bender.opencsw.org> <20111201220037.GA15661@bender.opencsw.org> <20111205085955.GA18805@bender.opencsw.org> <20111205093237.GA13641@quince.home.blizinski.pl> Message-ID: <86408A8E-5E81-4E5D-B916-BCEAE23B6FF0@opencsw.org> Hi Rafi, Am 05.12.2011 um 10:32 schrieb Maciej Blizi?ski: > Rafael Ostertag wrote: >> # Note 3: Alternatives >> # ------ >> # >> # I was unable to get the alternatives system to work with using >> # >> # ALTERNATIVES_CSWpostgresql83-server = server_amd64 server_pentium_pro >> # >> # and then defining those alternatives. /opt/csw/sbin/alternatives choked on >> # the one file generated for server containing two distinct alternatives. So I >> # cooked my own soup: >> # >> # 1. Create for server, client, contrib, devel separate files containing the >> # alternatives for the ISAs >> # >> # 2. Adjust the prototype to add include the class 'cswalternatives' for the >> # files in question. >> # >> # The problem appeared to be having two lines in the same file. So my approach >> # is to generate one file per line of alternatives. > > Maybe Dago can have a look? Sure, I am running the build now, but it will probably take some time. >> # >> # Note 4: New upstream releases >> # ------ >> # >> # 1. Adjust BASE_VERSION and/or PATCHLEVEL. >> # >> # 2. Make sure the SONAME patch for >> # $(WORKDIR)/postgresql-x.y.z/src/Makefile.shlib still works >> # >> # 3. Comment out 'post-install-modulated:'. So we can identify changes in the >> # server/client environment. >> # >> # 4. `mgar package` >> # >> # 5. If step 4 succeeded, check the prototype of >> # CSW$(NAME)$(BASE_VERSION_NODOT) for files that have slipped by and put >> # them in the proper place. >> # >> # 6. Uncomment 'post-install-modulated:'. This will shed light on changes in >> # the contrib environment. >> # >> # 7. `mgar spotless package` >> # >> # 8. If step 6 succeeded, check the prototype of >> # CSW$(NAME)$(BASE_VERSION_NODOT) for files that have slipped by and put >> # them in the proper place. >> # >> # 9. Make sure the proper version numbers are used for the library packages. >> >> >> # This BUILD is NOT READY! It needs work before it's usable. >> >> # TODO: Initialize the database cluster during installation if not already >> # there. >> # >> # TODO: Migration plan from 8.3: Installing 8.3 and 8.4 at the same time, and >> # migrating >> # >> # TODO: The isaexec part in GAR doesn't work very well. Let's write a minimal >> # example of it. (gmake repackage may produce the right output) > > These are my comments; you can remove them if they're no longer > relevant; or you can merge them with your notes. > >> NAME = postgresql >> BASE_VERSION = 8.3 >> VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) >> BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION)) >> PATCHLEVEL = 16 >> VERSION = $(BASE_VERSION).$(PATCHLEVEL) >> CATEGORIES = apps >> >> # Useful when making a series of builds on the same day >> # GARFLAVOR ?= DBG >> >> VENDOR_URL = http://www.postgresql.org/ >> >> define BLURB >> endef >> >> # Here we will fetch various variables that are used in this recipe. I decided >> # to place those in a separate file for the sake of uncluttering this recipe. > > I wouldn't worry about cluttering one recipe. pgconf.mk is not that > long, and there's value in everything being in one file. +1. >> # Many of the varibles defined in pgconf.mk depend on the various $(VERSION*) >> # variables. >> include pgconf.mk Multiple includes usually not make the Makefile easier to read, but complicate it for readers. >> MASTER_SITES = http://ftp.postgresql.org/pub/source/v$(VERSION)/ >> DISTFILES = $(NAME)-$(VERSION).tar.bz2 >> DISTFILES += README-CSW.txt >> DISTFILES += CSWpostgresql-server.postinstall.tmpl >> DISTFILES += $(INITSCRIPTFILETMPL) >> DISTFILES += $(USERGROUPFILETMPL) >> DISTFILES += $(CSWPGSQLCONFFILETMPL) >> >> # This patch will make the SONAME of the libraries to contain the major and >> # minor version. This is important when having multiple installations of >> # PostgreSQL where the library versions differ only in the minor part, such as >> # with PostgreSQL 8.3 and PostgreSQL 8.4. >> # >> PATCHFILES += 0000-SONAME-including-major-and-minor-version.patch > > Maybe this is not needed? If the major version doesn't change, you > should be able to use libpq from PostgreSQL 8.4 with binaries from > PostgreSQL 8.3. > > (Unless you tried it and it doesn't work in practice.) > > Less numbered shared libraries is better. If you end up with packages > with the same name (e.g. CSWlibpq5) from two different recipes, you only > publish CSWlibpq5 from the newer version of PostgreSQL, just like you do > with CSW*-dev. > >> INITSMF = $(sysconfdir)/init\.d/$(INITSCRIPTFILE_VERSIONED) >> USERGROUP = $(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED) >> PRESERVECONF = $(sysconfdir)/$(CSWPGSQLCONFFILE_VERSIONED) >> >> LICENSE = COPYRIGHT >> >> PROTOTYPE_MODIFIERS = pgdata alternatives >> PROTOTYPE_FILES_pgdata = $(PGLOCALSTATEDIR_BASE).* >> PROTOTYPE_USER_pgdata = postgres >> PROTOTYPE_GROUP_pgdata = sys >> PROTOTYPE_PERMS_pgdata = 0700 >> PROTOTYPE_CLASS_pgdata = ugfiles >> >> PROTOTYPE_FILES_alternatives = .*/alternatives/$(NAME)$(BASE_VERSION_NODOT).* >> PROTOTYPE_CLASS_alternatives = cswalternatives >> >> # This is the catchall package. It should not contain any files from >> # $(PKGROOT). After building all the packages, I check the prototype of this >> # package to make sure there are no files slipped by. >> PACKAGES = CSW$(NAME)$(BASE_VERSION_NODOT) >> SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT) = PostgreSQL $(VERSION), Meta Package >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT) = CSW$(NAME)$(BASE_VERSION_NODOT)-server >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT) += CSW$(NAME)$(BASE_VERSION_NODOT)-client >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT) += CSW$(NAME)$(BASE_VERSION_NODOT)-contrib >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT) += CSW$(NAME)$(BASE_VERSION_NODOT)-devel > > I like this naming scheme. > >> PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-server >> CATALOGNAME_CSW$(NAME)$(BASE_VERSION_NODOT)-server = $(NAME)$(BASE_VERSION_NODOT)_server > > Automatic CATALOGNAME works well these days. If it's just about > substitutting "-" with "_", GAR will take care of it. +1. Catalog names should only be explicitly specified if they differ from the package name. >> SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-server = PostgreSQL $(VERSION), Server >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server = $(foreach n,$(BIN_NAMES_SERVER),.*$(n)$$) >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += $(foreach n,$(BIN_NAMES_SERVER),.*/man1/$(n)-$(BASE_VERSION_NODOT)\.1$$) >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += $(foreach n,$(SO_NAMES_SERVER),.*/$(NAME)/$(BASE_VERSION_NODOT)/*$(n)$$) >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += $(MISC_NAMES_SERVER) >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*/$(NAME)/$(BASE_VERSION_NODOT)/timezone(sets|)/.* >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*/$(NAME)/$(BASE_VERSION_NODOT)/tsearch_.*/.* >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += $(PGLOCALSTATEDIR_BASE).* >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*$(USERGROUP) >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*$(sysconfdir)/init\.d/.* >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*$(sysconfdir)/$(CSWPGSQLCONFFILE_VERSIONED).CSW >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_server.* >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server = CSWlibiconv2 >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibncurses5 >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibreadline6 >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibxml2 >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibxslt >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWosslrt >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibz1 >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWalternatives This should be automatic when alternatives are detected. >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibpq5-1 >> #ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-server = $(foreach i,$(BUILD_ISAS), server_$(i)) >> >> PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-client >> CATALOGNAME_CSW$(NAME)$(BASE_VERSION_NODOT)-client = $(NAME)$(BASE_VERSION_NODOT)_client >> SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-client = PostgreSQL $(VERSION), Client >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client = $(foreach n,$(BIN_NAMES_CLIENT),.*$(n)$$) >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += $(foreach n,$(BIN_NAMES_CLIENT),.*/man1/$(n)-$(BASE_VERSION_NODOT)\.1$$) >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += $(MISC_NAMES_CLIENT) >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_client.* >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client = CSWlibiconv2 >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibncurses5 >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibreadline6 >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibxml2 >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibxslt >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWosslrt >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibz1 >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibpq5-1 >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWalternatives >> #ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-client = $(foreach i,$(BUILD_ISAS), client_$(i)) >> >> PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-contrib >> CATALOGNAME_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = $(NAME)$(BASE_VERSION_NODOT)_contrib >> SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = PostgreSQL $(VERSION), Contrib >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = $(foreach n,$(BIN_NAMES_CONTRIB),.*$(n)$$) >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += $(foreach n,$(BIN_NAMES_CONTRIB),.*/man1/$(n)-$(BASE_VERSION_NODOT)\.1$$) >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += $(foreach n,$(SO_NAMES_CONTRIB),.*/$(NAME)/$(BASE_VERSION_NODOT)/*$(n)$$) >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*/$(NAME)/$(BASE_VERSION_NODOT)/contrib.* >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_contrib.* >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = CSWlibiconv2 >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibxml2 >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibxslt >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWosslrt >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibz1 >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibpq5-1 >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWalternatives >> #ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = $(foreach i,$(BUILD_ISAS), contrib_$(i)) >> >> PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-devel >> CATALOGNAME_CSW$(NAME)$(BASE_VERSION_NODOT)-devel = $(NAME)$(BASE_VERSION_NODOT)_devel >> SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-devel = PostgreSQL $(VERSION), Development Files >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-devel = .*/pgxs/.* >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-devel += $(PKGFILES_DEVEL) >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-devel += $(foreach n,$(BIN_NAMES_DEVEL),.*$(n)$$) >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-devel += $(foreach n,$(BIN_NAMES_DEVEL),.*/man1/$(n)-$(BASE_VERSION_NODOT)\.1$$) >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-devel += .*/man5/.* >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-devel += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_devel.* >> RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-devel += CSWalternatives >> #ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-devel = $(foreach i,$(BUILD_ISAS), devel_$(i)) >> >> PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-doc >> ARCHALL_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = 1 >> CATALOGNAME_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = $(NAME)$(BASE_VERSION_NODOT)_doc >> SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = PostgreSQL $(VERSION), Documentation Files >> PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = .*/doc/$(NAME)/$(BASE_VERSION_NODOT)/.* >> >> PACKAGES += CSWlibecpg_compat3-0 >> CATALOGNAME_CSWlibecpg_compat3-0 = libecpg_compat3_0 >> SPKG_DESC_CSWlibecpg_compat3-0 = PostgreSQL $(VERSION), libecpg_compat >> PKGFILES_CSWlibecpg_compat3-0 = $(call pkgfiles_lib,libecpg_compat.so.3) >> RUNTIME_DEP_PKGS_CSWlibecpg_compat3-0 = CSWlibecpg6-0 >> RUNTIME_DEP_PKGS_CSWlibecpg_compat3-0 += CSWlibpgtypes3-0 >> RUNTIME_DEP_PKGS_CSWlibecpg_compat3-0 += CSWlibpq5-1 >> >> PACKAGES += CSWlibecpg6-0 >> CATALOGNAME_CSWlibecpg6-0 = libecpg6_0 >> SPKG_DESC_CSWlibecpg6-0 = PostgreSQL $(VERSION), libecpg >> PKGFILES_CSWlibecpg6-0 = $(call pkgfiles_lib,libecpg.so.6) >> RUNTIME_DEP_PKGS_CSWlibecpg6-0 += CSWlibpgtypes3-0 >> RUNTIME_DEP_PKGS_CSWlibecpg6-0 += CSWlibpq5-1 >> >> PACKAGES += CSWlibpgtypes3-0 >> CATALOGNAME_CSWlibpgtypes3-0 = libpgtypes3_0 >> SPKG_DESC_CSWlibpgtypes3-0 = PostgreSQL $(VERSION), libpgtypes >> PKGFILES_CSWlibpgtypes3-0 = $(call pkgfiles_lib,libpgtypes.so.3) >> >> PACKAGES += CSWlibpq5-1 >> CATALOGNAME_CSWlibpq5-1 = libpq5_1 >> SPKG_DESC_CSWlibpq5-1 = PostgreSQL $(VERSION), libpq >> PKGFILES_CSWlibpq5-1 = $(call pkgfiles_lib,libpq.so.5) >> RUNTIME_DEP_PKGS_CSWlibpq5-1 = CSWosslrt >> >> BUILD_DEP_PKGS = CSWlibxml2-dev >> BUILD_DEP_PKGS += CSWlibxslt-dev >> BUILD_DEP_PKGS += CSWperl >> BUILD_DEP_PKGS += CSWpython-dev >> BUILD_DEP_PKGS += CSWossldevel >> BUILD_DEP_PKGS += CSWlibreadline-dev >> BUILD_DEP_PKGS += CSWgsed # gsed is used in this recipe >> BUILD_DEP_PKGS += CSWlibz-dev >> >> EXTRA_LD_OPTIONS = -R$(prefix)/lib/\$$ISALIST >> >> BUILD64 = 1 >> # There was a discussion about whether to use ISAEXEC by default. The argument >> # is that enabling 64-bit by default where possible (using isaexec) is a waste. >> # I'm not completely convinced. Leaving this line commented out for future >> # consideration. >> # >> # References: >> # - http://lists.opencsw.org/pipermail/maintainers/2009-November/004903.html >> # >> # I'd like to get some hard data though. What is the difference in the memory >> # footprint, and what is the difference in execution speed between 32 and >> # 64-bit versions? >> ISAEXEC = 0 I guess I am convinced now to default to 64 bit. >> CONFIGURE_ARGS = $(DIRPATHS) >> # This is one of the quirks mentioned at the beginning: --program-suffix is not >> # supported, so IMHO, binaries should go to --libexecdir >> CONFIGURE_ARGS += --bindir=$(PGBINDIR) >> CONFIGURE_ARGS += --sbindir=$(PGSBINDIR) >> >> CONFIGURE_ARGS += --datadir=$(PGDATADIR) >> CONFIGURE_ARGS += --localstatedir=$(PGDATA) >> CONFIGURE_ARGS += --with-includes=/opt/csw/include $(includedir)? >> CONFIGURE_ARGS += --with-libraries=$(abspath /opt/csw/lib/$(MM_LIBDIR)) $(libdir)? >> CONFIGURE_ARGS += --with-docdir=$(PGDOCDIR) >> # configure complains that we are not thread-safe, wtf? --raos >> #CONFIGURE_ARGS += --enable-thread-safety >> >> CONFIGURE_ARGS += --with-gssapi >> CONFIGURE_ARGS += --with-pam >> CONFIGURE_ARGS += --with-openssl >> CONFIGURE_ARGS += --with-libxml >> CONFIGURE_ARGS += --with-libxslt >> CONFIGURE_ARGS += --without-krb5 >> CONFIGURE_ARGS += --without-bonjour >> CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MODULATION)) > > The above line takes no effect, I don't see any definitions like > e.g. CONFIGURE_ARGS_isa-amd64. > >> >> # Skipping tests to save time during packaging, and to enable x86 builds. >> # >> # IMHO, tests are essential, especially on Solaris, and I do not experience >> # build troubles on x86 having them enabled --raos >> SKIPTEST ?= 1 > > Feel free to delete this line, and let tests run. In my experience lots > of tests don't work because of test porting issues, not code porting > issues. If you have the time to make sure tests are ported properly -- > awesome! When the tests run too long for a casual build please disable them on a on-demand basis with SKIPTEST=1 mgar package and leave them on for the default build if at all possible. >> TEST_TARGET = check > > 'check' is now the default, you can remove this line. > >> # PACKAGES += CSWlibpq-dev >> # CATALOGNAME_CSWlibpq-dev = libpq_dev >> # SPKG_DESC_CSWlibpq-dev = PostgreSQL C client headers (built from $(BASE_VERSION).x sources) >> # RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibgnugetopt0 >> # RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibgssapi-krb5-2 >> # RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibreadline6 >> # RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibxml2-2 >> # RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibxslt1 >> # RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibz1 >> # RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWosslrt >> # PKGFILES_CSWlibpq-dev += $(prefix)/include/postgresql.* >> # PKGFILES_CSWlibpq-dev += $(prefix)/lib/.*libpq.so >> # PKGFILES_CSWlibpq-dev += $(prefix)/lib/.*libecpg.so >> # PKGFILES_CSWlibpq-dev += $(prefix)/lib/.*libecpg_compat.so >> # PKGFILES_CSWlibpq-dev += $(prefix)/lib/.*libpgtypes.so >> # PKGFILES_CSWlibpq-dev += $(prefix)/bin/.*pg_config.* >> # PKGFILES_CSWlibpq-dev += $(prefix)/share/postgresql/8.4/man/man1/pg_config.1 >> # PKGFILES_CSWlibpq-dev += $(prefix)/share/locale/*/LC_MESSAGES/pg_config.*\.mo >> # RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibpq5 >> # RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibecpg6 >> # RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibecpg-compat3 >> # RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibpgtypes3 >> >> # # Legacy libraries >> # PACKAGES += CSWlibpq3 >> # CATALOGNAME_CSWlibpq3 = libpq3 >> # PKGFILES_CSWlibpq3 += $(call baseisadirs,$(prefix)/lib,libpq\.so\.3(\.\d+)*) >> # SPKG_DESC_CSWlibpq3 += PostgreSQL C client library, libpq.so.3 >> # RUNTIME_DEP_PKGS_CSWlibpq3 += CSWosslrt >> >> # PACKAGES += CSWlibpq4 >> # CATALOGNAME_CSWlibpq4 = libpq4 >> # PKGFILES_CSWlibpq4 += $(call baseisadirs,$(prefix)/lib,libpq\.so\.4(\.\d+)*) >> # SPKG_DESC_CSWlibpq4 += PostgreSQL C client library, libpq.so.4 >> # RUNTIME_DEP_PKGS_CSWlibpq4 += CSWosslrt >> >> # PACKAGES += CSWlibpgtypes1 >> # CATALOGNAME_CSWlibpgtypes1 = libpgtypes1 >> # PKGFILES_CSWlibpgtypes1 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.1(\.\d+)*) >> # SPKG_DESC_CSWlibpgtypes1 += Used by programs built with ecpg (Embedded PostgreSQL for C), libpgtypes.so.1 >> >> # PACKAGES += CSWlibpgtypes2 >> # CATALOGNAME_CSWlibpgtypes2 = libpgtypes2 >> # PKGFILES_CSWlibpgtypes2 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.2(\.\d+)*) >> # SPKG_DESC_CSWlibpgtypes2 += Used by programs built with ecpg (Embedded PostgreSQL for C), libpgtypes.so.2 >> >> # PACKAGES += CSWlibecpg4 >> # CATALOGNAME_CSWlibecpg4 = libecpg4 >> # PKGFILES_CSWlibecpg4 += $(call baseisadirs,$(prefix)/lib,libecpg\.so\.4(\.\d+)*) >> # SPKG_DESC_CSWlibecpg4 += Embedded PostgreSQL for C library, libecpg.so.4 >> # RUNTIME_DEP_PKGS_CSWlibecpg4 += CSWlibpgtypes1 >> # RUNTIME_DEP_PKGS_CSWlibecpg4 += CSWosslrt >> # RUNTIME_DEP_PKGS_CSWlibecpg4 += CSWlibpq3 >> >> # PACKAGES += CSWlibecpg5 >> # CATALOGNAME_CSWlibecpg5 = libecpg5 >> # PKGFILES_CSWlibecpg5 += $(call baseisadirs,$(prefix)/lib,libecpg\.so\.5(\.\d+)*) >> # SPKG_DESC_CSWlibecpg5 += Embedded PostgreSQL for C library, libecpg.so.5 >> # RUNTIME_DEP_PKGS_CSWlibecpg5 += CSWlibpgtypes2 >> # RUNTIME_DEP_PKGS_CSWlibecpg5 += CSWlibpq5 >> >> # PACKAGES += CSWlibecpg-compat2 >> # CATALOGNAME_CSWlibecpg-compat2 = libecpg_compat2 >> # PKGFILES_CSWlibecpg-compat2 += $(call baseisadirs,$(prefix)/lib,libecpg_compat\.so\.2(\.\d+)*) >> # SPKG_DESC_CSWlibecpg-compat2 += Older version of run-time library for ECPG programs, libecpg_compat.so.2 >> # RUNTIME_DEP_PKGS_CSWlibecpg-compat2 += CSWlibpgtypes2 >> # RUNTIME_DEP_PKGS_CSWlibecpg-compat2 += CSWlibecpg5 >> # RUNTIME_DEP_PKGS_CSWlibecpg-compat2 += CSWlibpq5 >> >> # # The horrible transitional package >> # PACKAGES += CSWlibpq >> # PKGFILES_CSWlibpq += $(prefix)/postgresql.* >> # SPKG_DESC_CSWlibpq = Transitional package for PostgreSQL shared libraries >> # RUNTIME_DEP_PKGS_CSWlibpq += CSWlibecpg-compat2 >> # RUNTIME_DEP_PKGS_CSWlibpq += CSWlibecpg-compat3 >> # RUNTIME_DEP_PKGS_CSWlibpq += CSWlibecpg4 >> # RUNTIME_DEP_PKGS_CSWlibpq += CSWlibecpg5 >> # RUNTIME_DEP_PKGS_CSWlibpq += CSWlibecpg6 >> # RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpgtypes1 >> # RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpgtypes2 >> # RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpgtypes3 >> # RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpq3 >> # RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpq4 >> # RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpq5 > > You can delete the commented code. You always have the subversion > history if you need it. They should be done in a separate Makefile bundling up only the old stuff anyway. >> include gar/category.mk Too early!! As a rule of thumb: 1. All variable definitions 2. include gar/category.mk 3. Variable overrides *only* 4. Extra rules Otherwise lots of things will not behave correctly and I guess the alternatives thing has something to do with it. >> # This variable will be increased in the course of the following foreach loops >> alt_priority = 20 >> # This will generate the ALTERNATIVEs for the binaries in $(libexecdir)/postgresql/XY. >> # I consider this bad voodoo. > > Maybe Dago can chime in. Could this be handled by an external program > or script? This looks pretty advanced, give me some time to dig through. >> ## Server >> $(foreach alt,$(BUILD_ISAS), $(eval alt_priority=$(shell expr $(alt_priority) + 10)) $(eval ALTERNATIVE_server_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_SERVER)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-server $(libexecdir)/$(subst server_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) $(eval ALTERNATIVE_server_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_SERVER)),$(BIN_NAMES_SERVER)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT) $(libexecdir)/$(subst server_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) ) >> ## Client >> # reset priority >> alt_priority = 20 >> $(foreach alt,$(BUILD_ISAS), $(eval alt_priority=$(shell expr $(alt_priority) + 10)) $(eval ALTERNATIVE_client_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_CLIENT)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-client $(libexecdir)/$(subst client_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) $(eval ALTERNATIVE_client_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_CLIENT)),$(BIN_NAMES_CLIENT)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT) $(libexecdir)/$(subst client_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) ) >> ## Contrib >> # reset priority >> alt_priority = 20 >> $(foreach alt,$(BUILD_ISAS), $(eval alt_priority=$(shell expr $(alt_priority) + 10)) $(eval ALTERNATIVE_contrib_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_CONTRIB)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-contrib $(libexecdir)/$(subst contrib_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) $(eval ALTERNATIVE_contrib_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_CONTRIB)),$(BIN_NAMES_CONTRIB)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT) $(libexecdir)/$(subst contrib_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) ) >> ## Devel >> # reset priority >> alt_priority = 20 >> $(foreach alt,$(BUILD_ISAS), $(eval alt_priority=$(shell expr $(alt_priority) + 10)) $(eval ALTERNATIVE_devel_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_DEVEL)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-devel $(libexecdir)/$(subst devel_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) $(eval ALTERNATIVE_devel_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_DEVEL)),$(BIN_NAMES_DEVEL)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT) $(libexecdir)/$(subst devel_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) ) >> >> # We adjust the $(pkglibdir) found in $(WORKSRC)/src/Makefile.global.in, so >> # that it should be possible to install 8.x and 8.y concurrently >> pre-configure-modulated: >> if [ -r $(WORKSRC)/src/Makefile.global.in ] ; then \ >> gsed -i -r -e 's|^(pkglibdir[[:space:]]*=[[:space:]]*)\$$\(libdir\).*$$|\1$$(libdir)/postgresql/$(BASE_VERSION_NODOT)|' $(WORKSRC)/src/Makefile.global.in ; \ >> fi >> @$(MAKECOOKIE) >> >> post-build-modulated: >> $(BUILD_ENV) gmake -C $(WORKSRC)/contrib all >> @$(MAKECOOKIE) >> >> post-install-modulated: >> $(INSTALL_ENV) gmake -C $(WORKSRC)/contrib DESTDIR=$(DESTDIR) install >> ginstall -d -m 755 $(DESTDIR)$(prefix)/bin >> [ -r $(DESTDIR)$(bindir)/pg_config ] && \ >> gmv -v $(DESTDIR)$(bindir)/pg_config $(DESTDIR)$(prefix)/bin || true >> @$(MAKECOOKIE) >> >> post-merge: >> # Create my alternatives files >> $(foreach a,$(myALTERNATIVES), $(foreach i,$(BUILD_ISAS), $(shell ginstall -d $(PKGROOT)$(sharedstatedir)/alternatives ; echo "$(ALTERNATIVE_$(a)_$(i))" > $(PKGROOT)$(sharedstatedir)/alternatives/$(NAME)$(BASE_VERSION_NODOT)_$(a)_$(i)))) >> # Create the PGDATA directory >> ginstall -d $(PKGROOT)$(PGDATA) >> # The usergroup file >> ginstall -d $(PKGROOT)$(USERGROUPDIR) >> $(mySED) $(FILEDIR)/$(USERGROUPFILETMPL) > $(PKGROOT)$(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED) > > Where does mySED come from? > >> # The init script >> ginstall -d $(PKGROOT)$(sysconfdir)/init.d >> $(mySED) $(FILEDIR)/$(INITSCRIPTFILETMPL) > $(PKGROOT)$(sysconfdir)/init.d/$(INITSCRIPTFILE_VERSIONED) >> chmod 0755 $(PKGROOT)$(sysconfdir)/init.d/$(INITSCRIPTFILE_VERSIONED) >> # The init script config >> $(mySED) $(FILEDIR)/$(CSWPGSQLCONFFILETMPL) > $(PKGROOT)$(sysconfdir)/$(CSWPGSQLCONFFILE_VERSIONED).CSW >> # Adjust the man page names for man1 >> for f in $(PKGROOT)$(datadir)/man/man1/* ; do \ >> f_no_suffix="`echo $$f | sed -e 's/.1$$//'`" ; \ >> mv $$f $${f_no_suffix}-$(BASE_VERSION_NODOT).1 ; \ >> done >> @$(MAKECOOKIE) >> >> pre-package: >> $(mySED) $(FILEDIR)/CSWpostgresql-server.postinstall.tmpl > $(WORKDIR)/CSW$(NAME)$(BASE_VERSION_NODOT)-server.postinstall > > Very good job. +1. Best regards -- Dago From bdwalton at users.sourceforge.net Mon Dec 5 16:01:59 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 05 Dec 2011 15:01:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[16377] csw/mgar/pkg/git/trunk Message-ID: Revision: 16377 http://gar.svn.sourceforge.net/gar/?rev=16377&view=rev Author: bdwalton Date: 2011-12-05 15:01:59 +0000 (Mon, 05 Dec 2011) Log Message: ----------- git/trunk: version bump to 1.7.8 (drop the svn test disabling stuff for now) Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile csw/mgar/pkg/git/trunk/checksums Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2011-12-04 22:58:52 UTC (rev 16376) +++ csw/mgar/pkg/git/trunk/Makefile 2011-12-05 15:01:59 UTC (rev 16377) @@ -1,5 +1,5 @@ NAME = git -VERSION = 1.7.7.1 +VERSION = 1.7.8 #PATCHLEVEL = rc1 CATEGORIES = devel @@ -12,10 +12,6 @@ # TEST_SCRIPTS = TEST_TARGET = test -# This is just until mantis 4854 is resolved -NO_SVN_TESTS = 1 -EXTRA_TEST_EXPORTS = NO_SVN_TESTS - PACKAGES = CSWgit CSWgitk CSWgit-gui CSWgit-svn CSWgit-cvs PACKAGES += CSWgit-emacs CSWgit-doc CSWgit-completion CSWgit-dev Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2011-12-04 22:58:52 UTC (rev 16376) +++ csw/mgar/pkg/git/trunk/checksums 2011-12-05 15:01:59 UTC (rev 16377) @@ -1 +1 @@ -7cfb3e7ea585037272a7ad8e35f4ac0a git-1.7.7.1.tar.gz +4a3c03a04dbb857ecc875dae1278b76e git-1.7.8.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Mon Dec 5 19:00:33 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Mon, 05 Dec 2011 18:00:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[16378] csw/mgar/pkg/postgresql/branches/postgresql-8. 3-raos Message-ID: Revision: 16378 http://gar.svn.sourceforge.net/gar/?rev=16378&view=rev Author: guengel Date: 2011-12-05 18:00:33 +0000 (Mon, 05 Dec 2011) Log Message: ----------- Updated recipe as per suggestions in http://lists.opencsw.org/pipermail/devel/2011-December/021359.html and http://lists.opencsw.org/pipermail/devel/2011-December/021358.html Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile Removed Paths: ------------- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/pgconf.mk Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile 2011-12-05 15:01:59 UTC (rev 16377) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile 2011-12-05 18:00:33 UTC (rev 16378) @@ -83,15 +83,6 @@ # This BUILD is NOT READY! It needs work before it's usable. -# TODO: Initialize the database cluster during installation if not already -# there. -# -# TODO: Migration plan from 8.3: Installing 8.3 and 8.4 at the same time, and -# migrating -# -# TODO: The isaexec part in GAR doesn't work very well. Let's write a minimal -# example of it. (gmake repackage may produce the right output) - NAME = postgresql BASE_VERSION = 8.3 VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) @@ -108,13 +99,91 @@ define BLURB endef -# Here we will fetch various variables that are used in this recipe. I decided -# to place those in a separate file for the sake of uncluttering this recipe. # -# Many of the varibles defined in pgconf.mk depend on the various $(VERSION*) -# variables. -include pgconf.mk +# These variables control many aspects of the build +# +PGBINDIR = $(libexecdir)/$(NAME)/$(BASE_VERSION_NODOT) +PGSBINDIR = $(libexecdir)/$(NAME)/$(BASE_VERSION_NODOT) +PGDATADIR = $(datadir)/$(NAME)/$(BASE_VERSION_NODOT) +PGDOCDIR = $(datadir)/doc/$(NAME)/$(BASE_VERSION_NODOT) +PGLOCALSTATEDIR_BASE = $(localstatedir)/$(NAME) +PGDATA = $(PGLOCALSTATEDIR_BASE)/$(BASE_VERSION_NODOT) +# Those BIN_NAMES_* are used both, for package creation and alternatives +BIN_NAMES_SERVER = initdb ipcclean pg_controldata pg_ctl pg_resetxlog postmaster postgres +BIN_NAMES_DEVEL = ecpg pg_config +BIN_NAMES_CLIENT = clusterdb createdb createlang createuser dropdb droplang dropuser pg_dump pg_dumpall pg_restore psql reindexdb vacuumdb +BIN_NAMES_CONTRIB = oid2name pgbench pg_standby vacuumlo +# These are shared objects used by the server. Please note, contrib installs +# also shared object in the same place, so make sure you don't mix up things +SO_NAMES_SERVER = ascii_and_mic.so cyrillic_and_mic.so dict_snowball.so euc_cn_and_mic.so +SO_NAMES_SERVER += euc_jis_2004_and_shift_jis_2004.so euc_jp_and_sjis.so euc_kr_and_mic.so +SO_NAMES_SERVER += euc_tw_and_big5.so latin2_and_win1250.so latin_and_mic.so plpgsql.so +SO_NAMES_SERVER += utf8_and_ascii.so utf8_and_big5.so utf8_and_cyrillic.so utf8_and_euc_cn.so +SO_NAMES_SERVER += utf8_and_euc_jis_2004.so utf8_and_euc_jp.so utf8_and_euc_kr.so utf8_and_euc_tw.so +SO_NAMES_SERVER += utf8_and_gb18030.so utf8_and_gbk.so utf8_and_iso8859.so utf8_and_iso8859_1.so +SO_NAMES_SERVER += utf8_and_johab.so utf8_and_shift_jis_2004.so utf8_and_sjis.so utf8_and_uhc.so utf8_and_win.so +# These are shared object used by contrib. Please note, the server installs +# also shared object in the same place, so make sure you don't mix up things +SO_NAMES_CONTRIB = _int.so adminpack.so autoinc.so btree_gist.so chkpass.so +SO_NAMES_CONTRIB += cube.so dblink.so dict_int.so dict_xsyn.so earthdistance.so +SO_NAMES_CONTRIB += fuzzystrmatch.so hstore.so insert_username.so int_aggregate.so +SO_NAMES_CONTRIB += isn.so lo.so ltree.so moddatetime.so pageinspect.so pg_buffercache.so +SO_NAMES_CONTRIB += pg_freespacemap.so pg_trgm.so pgcrypto.so pgrowlocks.so pgstattuple.so +SO_NAMES_CONTRIB += pgxml.so refint.so seg.so sslinfo.so tablefunc.so test_parser.so timetravel.so tsearch2.so +# Miscellaneous files +MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/conversion_create.sql +MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/information_schema.sql +MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/pg_hba.conf.sample +MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/pg_ident.conf.sample +MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/pg_service.conf.sample +MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/postgres.bki +MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/postgres.description +MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/postgres.shdescription +MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/postgresql.conf.sample +MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/recovery.conf.sample +MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/snowball_create.sql +MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/sql_features.txt +MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/system_views.sql +MISC_NAMES_CLIENT += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/psqlrc.sample +# Used for the PostgreSQL user. Please note, although the file does not feature +# a version number here, it will be installed with $(BASE_VERSION_NODOT) +# appended. +USERGROUPDIR = $(sysconfdir)/pkg/$(NAME) +USERGROUPFILE = cswusergroup +USERGROUPFILETMPL = $(USERGROUPFILE).tmpl +USERGROUPFILE_VERSIONED = $(USERGROUPFILE)-$(BASE_VERSION_NODOT) + +# The configuration file for the init.d script. Please note, although the file +# does not feature a version number here, it will be installed with +# $(BASE_VERSION_NODOT) inserted. +CSWPGSQLCONFFILE = postgresql.conf +CSWPGSQLCONFFILETMPL = $(CSWPGSQLCONFFILE).tmpl +CSWPGSQLCONFFILE_VERSIONED = $(subst $(suffix $(CSWPGSQLCONFFILE)),,$(CSWPGSQLCONFFILE))-$(BASE_VERSION_NODOT).conf + +# The initscript. Please note, although the file does not feature a version +# number here, it will be installed with $(BASE_VERSION_NODOT) appended +INITSCRIPTFILE = cswpostgresql +INITSCRIPTFILETMPL = $(INITSCRIPTFILE).tmpl +INITSCRIPTFILE_VERSIONED = $(INITSCRIPTFILE)-$(BASE_VERSION_NODOT) + +# These are the alternatives provided for the packages. I use them in the +# recipe to iterate over all possible alternatives (see 'post-merge:') +myALTERNATIVES= server client devel contrib + +# My sed, since EXPANDVARS has proven unreliable to me +mySED = gsed -e 's|@USERGROUPFILE_VERSIONED@|$(USERGROUPFILE_VERSIONED)|g' \ + -e 's|@CSWPGSQLCONFFILE_VERSIONED@|$(CSWPGSQLCONFFILE_VERSIONED)|g' \ + -e 's|@INITSCRIPTFILE_VERSIONED@|$(INITSCRIPTFILE_VERSIONED)|g' \ + -e 's|@NAME@|$(NAME)|g' \ + -e 's|@VERSION@|$(VERSION)|g' \ + -e 's|@BASE_VERSION_NODOT@|$(BASE_VERSION_NODOT)|g' \ + -e 's|@PGLOCALSTATEDIR_BASE@|$(PGLOCALSTATEDIR_BASE)|g' \ + -e 's|@PGDATA@|$(PGDATA)|g' \ + -e 's|@sysconfdir@|$(sysconfdir)|g' \ + -e 's|@bindir@|$(bindir)|g' + + MASTER_SITES = http://ftp.postgresql.org/pub/source/v$(VERSION)/ DISTFILES = $(NAME)-$(VERSION).tar.bz2 DISTFILES += README-CSW.txt @@ -157,7 +226,6 @@ RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT) += CSW$(NAME)$(BASE_VERSION_NODOT)-devel PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-server -CATALOGNAME_CSW$(NAME)$(BASE_VERSION_NODOT)-server = $(NAME)$(BASE_VERSION_NODOT)_server SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-server = PostgreSQL $(VERSION), Server PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server = $(foreach n,$(BIN_NAMES_SERVER),.*$(n)$$) PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += $(foreach n,$(BIN_NAMES_SERVER),.*/man1/$(n)-$(BASE_VERSION_NODOT)\.1$$) @@ -177,12 +245,10 @@ RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibxslt RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWosslrt RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibz1 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWalternatives RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibpq5-1 #ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-server = $(foreach i,$(BUILD_ISAS), server_$(i)) PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-client -CATALOGNAME_CSW$(NAME)$(BASE_VERSION_NODOT)-client = $(NAME)$(BASE_VERSION_NODOT)_client SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-client = PostgreSQL $(VERSION), Client PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client = $(foreach n,$(BIN_NAMES_CLIENT),.*$(n)$$) PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += $(foreach n,$(BIN_NAMES_CLIENT),.*/man1/$(n)-$(BASE_VERSION_NODOT)\.1$$) @@ -196,11 +262,9 @@ RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWosslrt RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibz1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibpq5-1 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWalternatives #ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-client = $(foreach i,$(BUILD_ISAS), client_$(i)) PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-contrib -CATALOGNAME_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = $(NAME)$(BASE_VERSION_NODOT)_contrib SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = PostgreSQL $(VERSION), Contrib PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = $(foreach n,$(BIN_NAMES_CONTRIB),.*$(n)$$) PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += $(foreach n,$(BIN_NAMES_CONTRIB),.*/man1/$(n)-$(BASE_VERSION_NODOT)\.1$$) @@ -213,11 +277,9 @@ RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWosslrt RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibz1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibpq5-1 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWalternatives #ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = $(foreach i,$(BUILD_ISAS), contrib_$(i)) PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-devel -CATALOGNAME_CSW$(NAME)$(BASE_VERSION_NODOT)-devel = $(NAME)$(BASE_VERSION_NODOT)_devel SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-devel = PostgreSQL $(VERSION), Development Files PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-devel = .*/pgxs/.* PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-devel += $(PKGFILES_DEVEL) @@ -225,17 +287,18 @@ PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-devel += $(foreach n,$(BIN_NAMES_DEVEL),.*/man1/$(n)-$(BASE_VERSION_NODOT)\.1$$) PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-devel += .*/man5/.* PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-devel += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_devel.* -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-devel += CSWalternatives +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-devel += CSWlibecpg_compat3-0 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-devel += CSWlibecpg6-0 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-devel += CSWlibpq5-1 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-devel += CSWlibpgtypes3-0 #ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-devel = $(foreach i,$(BUILD_ISAS), devel_$(i)) PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-doc ARCHALL_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = 1 -CATALOGNAME_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = $(NAME)$(BASE_VERSION_NODOT)_doc SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = PostgreSQL $(VERSION), Documentation Files PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = .*/doc/$(NAME)/$(BASE_VERSION_NODOT)/.* PACKAGES += CSWlibecpg_compat3-0 -CATALOGNAME_CSWlibecpg_compat3-0 = libecpg_compat3_0 SPKG_DESC_CSWlibecpg_compat3-0 = PostgreSQL $(VERSION), libecpg_compat PKGFILES_CSWlibecpg_compat3-0 = $(call pkgfiles_lib,libecpg_compat.so.3) RUNTIME_DEP_PKGS_CSWlibecpg_compat3-0 = CSWlibecpg6-0 @@ -243,14 +306,12 @@ RUNTIME_DEP_PKGS_CSWlibecpg_compat3-0 += CSWlibpq5-1 PACKAGES += CSWlibecpg6-0 -CATALOGNAME_CSWlibecpg6-0 = libecpg6_0 SPKG_DESC_CSWlibecpg6-0 = PostgreSQL $(VERSION), libecpg PKGFILES_CSWlibecpg6-0 = $(call pkgfiles_lib,libecpg.so.6) RUNTIME_DEP_PKGS_CSWlibecpg6-0 += CSWlibpgtypes3-0 RUNTIME_DEP_PKGS_CSWlibecpg6-0 += CSWlibpq5-1 PACKAGES += CSWlibpgtypes3-0 -CATALOGNAME_CSWlibpgtypes3-0 = libpgtypes3_0 SPKG_DESC_CSWlibpgtypes3-0 = PostgreSQL $(VERSION), libpgtypes PKGFILES_CSWlibpgtypes3-0 = $(call pkgfiles_lib,libpgtypes.so.3) @@ -293,8 +354,8 @@ CONFIGURE_ARGS += --datadir=$(PGDATADIR) CONFIGURE_ARGS += --localstatedir=$(PGDATA) -CONFIGURE_ARGS += --with-includes=/opt/csw/include -CONFIGURE_ARGS += --with-libraries=$(abspath /opt/csw/lib/$(MM_LIBDIR)) +CONFIGURE_ARGS += --with-includes=$(includedir) +CONFIGURE_ARGS += --with-libraries=$(libdir) CONFIGURE_ARGS += --with-docdir=$(PGDOCDIR) # configure complains that we are not thread-safe, wtf? --raos #CONFIGURE_ARGS += --enable-thread-safety @@ -306,100 +367,13 @@ CONFIGURE_ARGS += --with-libxslt CONFIGURE_ARGS += --without-krb5 CONFIGURE_ARGS += --without-bonjour -CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MODULATION)) # Skipping tests to save time during packaging, and to enable x86 builds. # # IMHO, tests are essential, especially on Solaris, and I do not experience # build troubles on x86 having them enabled --raos SKIPTEST ?= 1 -TEST_TARGET = check -# PACKAGES += CSWlibpq-dev -# CATALOGNAME_CSWlibpq-dev = libpq_dev -# SPKG_DESC_CSWlibpq-dev = PostgreSQL C client headers (built from $(BASE_VERSION).x sources) -# RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibgnugetopt0 -# RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibgssapi-krb5-2 -# RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibreadline6 -# RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibxml2-2 -# RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibxslt1 -# RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibz1 -# RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWosslrt -# PKGFILES_CSWlibpq-dev += $(prefix)/include/postgresql.* -# PKGFILES_CSWlibpq-dev += $(prefix)/lib/.*libpq.so -# PKGFILES_CSWlibpq-dev += $(prefix)/lib/.*libecpg.so -# PKGFILES_CSWlibpq-dev += $(prefix)/lib/.*libecpg_compat.so -# PKGFILES_CSWlibpq-dev += $(prefix)/lib/.*libpgtypes.so -# PKGFILES_CSWlibpq-dev += $(prefix)/bin/.*pg_config.* -# PKGFILES_CSWlibpq-dev += $(prefix)/share/postgresql/8.4/man/man1/pg_config.1 -# PKGFILES_CSWlibpq-dev += $(prefix)/share/locale/*/LC_MESSAGES/pg_config.*\.mo -# RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibpq5 -# RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibecpg6 -# RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibecpg-compat3 -# RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibpgtypes3 - -# # Legacy libraries -# PACKAGES += CSWlibpq3 -# CATALOGNAME_CSWlibpq3 = libpq3 -# PKGFILES_CSWlibpq3 += $(call baseisadirs,$(prefix)/lib,libpq\.so\.3(\.\d+)*) -# SPKG_DESC_CSWlibpq3 += PostgreSQL C client library, libpq.so.3 -# RUNTIME_DEP_PKGS_CSWlibpq3 += CSWosslrt - -# PACKAGES += CSWlibpq4 -# CATALOGNAME_CSWlibpq4 = libpq4 -# PKGFILES_CSWlibpq4 += $(call baseisadirs,$(prefix)/lib,libpq\.so\.4(\.\d+)*) -# SPKG_DESC_CSWlibpq4 += PostgreSQL C client library, libpq.so.4 -# RUNTIME_DEP_PKGS_CSWlibpq4 += CSWosslrt - -# PACKAGES += CSWlibpgtypes1 -# CATALOGNAME_CSWlibpgtypes1 = libpgtypes1 -# PKGFILES_CSWlibpgtypes1 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.1(\.\d+)*) -# SPKG_DESC_CSWlibpgtypes1 += Used by programs built with ecpg (Embedded PostgreSQL for C), libpgtypes.so.1 - -# PACKAGES += CSWlibpgtypes2 -# CATALOGNAME_CSWlibpgtypes2 = libpgtypes2 -# PKGFILES_CSWlibpgtypes2 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.2(\.\d+)*) -# SPKG_DESC_CSWlibpgtypes2 += Used by programs built with ecpg (Embedded PostgreSQL for C), libpgtypes.so.2 - -# PACKAGES += CSWlibecpg4 -# CATALOGNAME_CSWlibecpg4 = libecpg4 -# PKGFILES_CSWlibecpg4 += $(call baseisadirs,$(prefix)/lib,libecpg\.so\.4(\.\d+)*) -# SPKG_DESC_CSWlibecpg4 += Embedded PostgreSQL for C library, libecpg.so.4 -# RUNTIME_DEP_PKGS_CSWlibecpg4 += CSWlibpgtypes1 -# RUNTIME_DEP_PKGS_CSWlibecpg4 += CSWosslrt -# RUNTIME_DEP_PKGS_CSWlibecpg4 += CSWlibpq3 - -# PACKAGES += CSWlibecpg5 -# CATALOGNAME_CSWlibecpg5 = libecpg5 -# PKGFILES_CSWlibecpg5 += $(call baseisadirs,$(prefix)/lib,libecpg\.so\.5(\.\d+)*) -# SPKG_DESC_CSWlibecpg5 += Embedded PostgreSQL for C library, libecpg.so.5 -# RUNTIME_DEP_PKGS_CSWlibecpg5 += CSWlibpgtypes2 -# RUNTIME_DEP_PKGS_CSWlibecpg5 += CSWlibpq5 - -# PACKAGES += CSWlibecpg-compat2 -# CATALOGNAME_CSWlibecpg-compat2 = libecpg_compat2 -# PKGFILES_CSWlibecpg-compat2 += $(call baseisadirs,$(prefix)/lib,libecpg_compat\.so\.2(\.\d+)*) -# SPKG_DESC_CSWlibecpg-compat2 += Older version of run-time library for ECPG programs, libecpg_compat.so.2 -# RUNTIME_DEP_PKGS_CSWlibecpg-compat2 += CSWlibpgtypes2 -# RUNTIME_DEP_PKGS_CSWlibecpg-compat2 += CSWlibecpg5 -# RUNTIME_DEP_PKGS_CSWlibecpg-compat2 += CSWlibpq5 - -# # The horrible transitional package -# PACKAGES += CSWlibpq -# PKGFILES_CSWlibpq += $(prefix)/postgresql.* -# SPKG_DESC_CSWlibpq = Transitional package for PostgreSQL shared libraries -# RUNTIME_DEP_PKGS_CSWlibpq += CSWlibecpg-compat2 -# RUNTIME_DEP_PKGS_CSWlibpq += CSWlibecpg-compat3 -# RUNTIME_DEP_PKGS_CSWlibpq += CSWlibecpg4 -# RUNTIME_DEP_PKGS_CSWlibpq += CSWlibecpg5 -# RUNTIME_DEP_PKGS_CSWlibpq += CSWlibecpg6 -# RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpgtypes1 -# RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpgtypes2 -# RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpgtypes3 -# RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpq3 -# RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpq4 -# RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpq5 - include gar/category.mk # This variable will be increased in the course of the following foreach loops alt_priority = 20 Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/pgconf.mk =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/pgconf.mk 2011-12-05 15:01:59 UTC (rev 16377) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/pgconf.mk 2011-12-05 18:00:33 UTC (rev 16378) @@ -1,86 +0,0 @@ -# $Id$ - -# -# Postgres specific variables -# -PGBINDIR = $(libexecdir)/$(NAME)/$(BASE_VERSION_NODOT) -PGSBINDIR = $(libexecdir)/$(NAME)/$(BASE_VERSION_NODOT) -PGDATADIR = $(datadir)/$(NAME)/$(BASE_VERSION_NODOT) -PGDOCDIR = $(datadir)/doc/$(NAME)/$(BASE_VERSION_NODOT) -PGLOCALSTATEDIR_BASE = $(localstatedir)/$(NAME) -PGDATA = $(PGLOCALSTATEDIR_BASE)/$(BASE_VERSION_NODOT) -# Those BIN_NAMES_* are used both, for package creation and alternatives -BIN_NAMES_SERVER = initdb ipcclean pg_controldata pg_ctl pg_resetxlog postmaster postgres -BIN_NAMES_DEVEL = ecpg pg_config -BIN_NAMES_CLIENT = clusterdb createdb createlang createuser dropdb droplang dropuser pg_dump pg_dumpall pg_restore psql reindexdb vacuumdb -BIN_NAMES_CONTRIB = oid2name pgbench pg_standby vacuumlo -# These are shared objects used by the server. Please note, contrib installs -# also shared object in the same place, so make sure you don't mix up things -SO_NAMES_SERVER = ascii_and_mic.so cyrillic_and_mic.so dict_snowball.so euc_cn_and_mic.so -SO_NAMES_SERVER += euc_jis_2004_and_shift_jis_2004.so euc_jp_and_sjis.so euc_kr_and_mic.so -SO_NAMES_SERVER += euc_tw_and_big5.so latin2_and_win1250.so latin_and_mic.so plpgsql.so -SO_NAMES_SERVER += utf8_and_ascii.so utf8_and_big5.so utf8_and_cyrillic.so utf8_and_euc_cn.so -SO_NAMES_SERVER += utf8_and_euc_jis_2004.so utf8_and_euc_jp.so utf8_and_euc_kr.so utf8_and_euc_tw.so -SO_NAMES_SERVER += utf8_and_gb18030.so utf8_and_gbk.so utf8_and_iso8859.so utf8_and_iso8859_1.so -SO_NAMES_SERVER += utf8_and_johab.so utf8_and_shift_jis_2004.so utf8_and_sjis.so utf8_and_uhc.so utf8_and_win.so -# These are shared object used by contrib. Please note, the server installs -# also shared object in the same place, so make sure you don't mix up things -SO_NAMES_CONTRIB = _int.so adminpack.so autoinc.so btree_gist.so chkpass.so -SO_NAMES_CONTRIB += cube.so dblink.so dict_int.so dict_xsyn.so earthdistance.so -SO_NAMES_CONTRIB += fuzzystrmatch.so hstore.so insert_username.so int_aggregate.so -SO_NAMES_CONTRIB += isn.so lo.so ltree.so moddatetime.so pageinspect.so pg_buffercache.so -SO_NAMES_CONTRIB += pg_freespacemap.so pg_trgm.so pgcrypto.so pgrowlocks.so pgstattuple.so -SO_NAMES_CONTRIB += pgxml.so refint.so seg.so sslinfo.so tablefunc.so test_parser.so timetravel.so tsearch2.so -# Miscellaneous files -MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/conversion_create.sql -MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/information_schema.sql -MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/pg_hba.conf.sample -MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/pg_ident.conf.sample -MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/pg_service.conf.sample -MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/postgres.bki -MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/postgres.description -MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/postgres.shdescription -MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/postgresql.conf.sample -MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/recovery.conf.sample -MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/snowball_create.sql -MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/sql_features.txt -MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/system_views.sql -MISC_NAMES_CLIENT += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/psqlrc.sample - -# Used for the PostgreSQL user. Please note, although the file does not feature -# a version number here, it will be installed with $(BASE_VERSION_NODOT) -# appended. -USERGROUPDIR = $(sysconfdir)/pkg/$(NAME) -USERGROUPFILE = cswusergroup -USERGROUPFILETMPL = $(USERGROUPFILE).tmpl -USERGROUPFILE_VERSIONED = $(USERGROUPFILE)-$(BASE_VERSION_NODOT) - -# The configuration file for the init.d script. Please note, although the file -# does not feature a version number here, it will be installed with -# $(BASE_VERSION_NODOT) inserted. -CSWPGSQLCONFFILE = postgresql.conf -CSWPGSQLCONFFILETMPL = $(CSWPGSQLCONFFILE).tmpl -CSWPGSQLCONFFILE_VERSIONED = $(subst $(suffix $(CSWPGSQLCONFFILE)),,$(CSWPGSQLCONFFILE))-$(BASE_VERSION_NODOT).conf - -# The initscript. Please note, although the file does not feature a version -# number here, it will be installed with $(BASE_VERSION_NODOT) appended -INITSCRIPTFILE = cswpostgresql -INITSCRIPTFILETMPL = $(INITSCRIPTFILE).tmpl -INITSCRIPTFILE_VERSIONED = $(INITSCRIPTFILE)-$(BASE_VERSION_NODOT) - -# These are the alternatives provided for the packages. I use them in the -# recipe to iterate over all possible alternatives (see 'post-merge:') -myALTERNATIVES= server client devel contrib - -# My sed, since EXPANDVARS has proven unreliable to me -mySED = gsed -e 's|@USERGROUPFILE_VERSIONED@|$(USERGROUPFILE_VERSIONED)|g' \ - -e 's|@CSWPGSQLCONFFILE_VERSIONED@|$(CSWPGSQLCONFFILE_VERSIONED)|g' \ - -e 's|@INITSCRIPTFILE_VERSIONED@|$(INITSCRIPTFILE_VERSIONED)|g' \ - -e 's|@NAME@|$(NAME)|g' \ - -e 's|@VERSION@|$(VERSION)|g' \ - -e 's|@BASE_VERSION_NODOT@|$(BASE_VERSION_NODOT)|g' \ - -e 's|@PGLOCALSTATEDIR_BASE@|$(PGLOCALSTATEDIR_BASE)|g' \ - -e 's|@PGDATA@|$(PGDATA)|g' \ - -e 's|@sysconfdir@|$(sysconfdir)|g' \ - -e 's|@bindir@|$(bindir)|g' - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Dec 5 22:24:43 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 05 Dec 2011 21:24:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[16379] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 16379 http://gar.svn.sourceforge.net/gar/?rev=16379&view=rev Author: bdwalton Date: 2011-12-05 21:24:43 +0000 (Mon, 05 Dec 2011) Log Message: ----------- subversion/trunk: Renamed the devel package to conform with the new dev standard Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2011-12-05 18:00:33 UTC (rev 16378) +++ csw/mgar/pkg/subversion/trunk/Makefile 2011-12-05 21:24:43 UTC (rev 16379) @@ -82,17 +82,19 @@ RUNTIME_DEP_PKGS_CSWsvn += CSWlibdbus1-3 RUNTIME_DEP_PKGS_CSWsvn += CSWglib2 -PACKAGES += CSWsvn-devel -SPKG_DESC_CSWsvn-devel = Subversion Development Support +PACKAGES += CSWsvn-dev +SPKG_DESC_CSWsvn-dev = Subversion Development Support +OBSOLETED_BY_CSWsvn-dev = CSWsvn-devel +ARCHALL_CSWsvn-dev = 1 +PKGFILES_CSWsvn-dev = $(PKGFILES_DEVEL) +PKGFILES_CSWsvn-dev += $(docdir)/$(CATALOGNAME_CSWsvn-dev)/changelog.CSW +CHECKPKG_OVERRIDES_CSWsvn-dev += archall-devel-package +CHECKPKG_OVERRIDES_CSWsvn-dev += license-missing|/opt/csw/share/doc/subversion_dev/license + +# Note: This is just to prevent a catalog name change for a stub +# package. We made the real package have matching names. CATALOGNAME_CSWsvn-devel = subversion_devel -ARCHALL_CSWsvn-devel = 1 -PKGFILES_CSWsvn-devel = $(PKGFILES_DEVEL) -PKGFILES_CSWsvn-devel += $(docdir)/$(CATALOGNAME_CSWsvn-devel)/changelog.CSW -CHECKPKG_OVERRIDES_CSWsvn-devel += archall-devel-package -CHECKPKG_OVERRIDES_CSWsvn-devel += catalogname-does-not-match-pkgname|pkgname=CSWsvn-devel|catalogname=subversion_devel|expected-catalogname=svn_devel -CHECKPKG_OVERRIDES_CSWsvn-devel += license-missing|/opt/csw/share/doc/subversion_devel/license - PACKAGES += CSWsvn-contrib SPKG_DESC_CSWsvn-contrib = Contributed subversion scripts CATALOGNAME_CSWsvn-contrib = subversion_contrib 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 Dec 6 09:48:27 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 06 Dec 2011 08:48:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[16380] csw/mgar/pkg/gcc4/trunk Message-ID: Revision: 16380 http://gar.svn.sourceforge.net/gar/?rev=16380&view=rev Author: wahwah Date: 2011-12-06 08:48:27 +0000 (Tue, 06 Dec 2011) Log Message: ----------- gcc4/trunk: merging the ada-enable branch Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/gcc4/trunk/ Property changes on: csw/mgar/pkg/gcc4/trunk ___________________________________________________________________ Modified: svn:mergeinfo - /csw/mgar/pkg/gcc4/branches/bootstrap-4.6:15321-15435 /csw/mgar/pkg/gcc4/branches/opt-csw-prefix:15436-15623 + /csw/mgar/pkg/gcc4/branches/ada-enable:16158-16379 /csw/mgar/pkg/gcc4/branches/bootstrap-4.6:15321-15435 /csw/mgar/pkg/gcc4/branches/opt-csw-prefix:15436-15623 Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2011-12-05 21:24:43 UTC (rev 16379) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2011-12-06 08:48:27 UTC (rev 16380) @@ -1,10 +1,4 @@ # $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.2 @@ -36,6 +30,7 @@ ## Source URLs VENDOR_URL = http://gcc.gnu.org +GCC4_CC_HOME = $(HOME)/usr-$(GARCH)-$(GAROSREL) ## Copyright File LICENSE = COPYING3 @@ -76,13 +71,11 @@ CONFIGURE_ARGS += --with-cloog=$(BUILD_PREFIX) CONFIGURE_ARGS += --enable-cloog-backend=isl CONFIGURE_ARGS += --enable-java-awt=xlib -# CONFIGURE_ARGS += --enable-libada +CONFIGURE_ARGS += --enable-libada CONFIGURE_ARGS += --enable-libssp CONFIGURE_ARGS += --enable-objc-gc CONFIGURE_ARGS += --enable-threads=posix -# 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=ada,c,c++,fortran,java,objc CONFIGURE_ARGS += --with-system-zlib=/opt/csw # there could be some abstractions in gar.conf.mk, but at the moment there @@ -118,9 +111,10 @@ # 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. -CFLAGS = -CXXFLAGS = +# CFLAGS = -D_RESTRICT_KYWD= +# CXXFLAGS = -D_RESTRICT_KYWD= + # Might be necessary, but CFLAGS_FOR_TARGET seem to be enough for now. # BOOT_CFLAGS = $(CFLAGS_FOR_TARGET) # EXTRA_EXPORTS += BOOT_FLAGS @@ -504,6 +498,38 @@ RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibiconv2 RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibiconv2 +PACKAGES += $(PKG_BASENAME)ada +SPKG_DESC_$(PKG_BASENAME)ada = GCC Ada compiler (GNAT) +RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada = $(PKG_BASENAME)core +PKGFILES_$(PKG_BASENAME)ada = $(prefix)/libexec/.*gnat1 +PKGFILES_$(PKG_BASENAME)ada += $(prefix)/lib/.*libgnat.*a +PKGFILES_$(PKG_BASENAME)ada += $(prefix)/lib/.*libgnarl.*a +PKGFILES_$(PKG_BASENAME)ada += $(prefix)/.*/adalib/.* +PKGFILES_$(PKG_BASENAME)ada += $(prefix)/.*/adainclude/.* +PKGFILES_$(PKG_BASENAME)ada += $(prefix)/info/.*gnat.* +PKGFILES_$(PKG_BASENAME)ada += $(prefix)/bin/gnat(?!ive).* +# There are static libraries, .a files in the ada package. Let them be. +CHECKPKG_OVERRIDES_$(PKG_BASENAME)ada += discouraged-path-in-pkgmap +# It needs the core compiler. +CHECKPKG_OVERRIDES_$(PKG_BASENAME)ada += surplus-dependency|$(PKG_BASENAME)core +CHECKPKG_OVERRIDES_CSWgcc4ada += file-with-bad-content + +RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibiconv2 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibppl-c4 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibz1 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibmpfr4 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibpwl5 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibmpc2 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibgmpxx4 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibisl7 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibgmp10 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibcloog-isl2 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibppl9 + +# Not sure about the shared libraries. +OBSOLETED_BY_RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada = $(PKG_BASENAME)adart + # Maybe it's unnecessary. # # Solaris 10 on i386 specific: # RUNTIME_DEP_PKGS_$(PKG_BASENAME)core_i386_5.10 += CSWlibiconv2 @@ -549,7 +575,8 @@ @$(MAKECOOKIE) # We need GNU find as find -PATH := /opt/csw/gnu:$(PATH) +# PATH := /opt/csw/gnu:$(PATH) +PATH := $(GCC4_CC_HOME)/bin:/opt/csw/gnu:$(PATH) # This override sets the right RPATH on libstdc++ and other libraries. LD_OPTIONS := -R/opt/csw/lib -R/opt/csw/lib/\$$ISALIST 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 Dec 6 09:52:57 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 06 Dec 2011 08:52:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[16381] csw/mgar/pkg/gcc4/trunk/Makefile Message-ID: Revision: 16381 http://gar.svn.sourceforge.net/gar/?rev=16381&view=rev Author: wahwah Date: 2011-12-06 08:52:56 +0000 (Tue, 06 Dec 2011) Log Message: ----------- gcc4/trunk: Makefile cleanup Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2011-12-06 08:48:27 UTC (rev 16380) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2011-12-06 08:52:56 UTC (rev 16381) @@ -24,23 +24,15 @@ 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 +# GIT init takes a long time. NOGITPATCH ?= 1 ## Source URLs VENDOR_URL = http://gcc.gnu.org -GCC4_CC_HOME = $(HOME)/usr-$(GARCH)-$(GAROSREL) ## Copyright File LICENSE = COPYING3 -# prefix = $(BUILD_PREFIX)/$(PKG_VERSION_TOKEN) -# 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)/$(PKG_VERSION_TOKEN) - BUILD_DEP_PKGS += CSWlibz-dev BUILD_DEP_PKGS += CSWlibgmp-dev BUILD_DEP_PKGS += CSWlibmpc-dev @@ -48,13 +40,13 @@ BUILD_DEP_PKGS += CSWlibppl-dev BUILD_DEP_PKGS += CSWcloog-dev +# Could be used to break out of the /opt/csw/$(PKG_VERSION_TOKEN) prefix +PROGRAM_SUFFIX = -$(BASE_VERSION) + ## build options # http://gcc.gnu.org/install/configure.html -# Could be used to break out of the /opt/csw/$(PKG_VERSION_TOKEN) prefix -PROGRAM_SUFFIX = -$(BASE_VERSION) CONFIGURE_ARGS += --program-suffix=$(PROGRAM_SUFFIX) - CONFIGURE_ARGS += $(DIRPATHS) CONFIGURE_ARGS += --with-gnu-as CONFIGURE_ARGS += --with-as=/opt/csw/bin/gas @@ -66,7 +58,6 @@ 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 += --with-cloog=$(BUILD_PREFIX) CONFIGURE_ARGS += --enable-cloog-backend=isl @@ -88,9 +79,6 @@ 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)) # GCC can't be built in the same directory with the sources. @@ -106,30 +94,14 @@ EXTRA_EXPORTS += CFLAGS_FOR_TARGET EXTRA_EXPORTS += CXXFLAGS_FOR_TARGET -# The theory goes that the CFLAGS and CXXFLAGS 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. -# CFLAGS = -D_RESTRICT_KYWD= +EXTRA_CONFIGURE_EXPORTS += CFLAGS_FOR_TARGET +EXTRA_CONFIGURE_EXPORTS += CXXFLAGS_FOR_TARGET -# CXXFLAGS = -D_RESTRICT_KYWD= - -# 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 EXTRA_EXPORTS += CONFIG_SHELL -EXTRA_CONFIGURE_EXPORTS += CFLAGS_FOR_TARGET -EXTRA_CONFIGURE_EXPORTS += CXXFLAGS_FOR_TARGET - -# Only required for Sun Studio bootstrapping -# 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 @@ -530,29 +502,6 @@ # Not sure about the shared libraries. OBSOLETED_BY_RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada = $(PKG_BASENAME)adart -# Maybe it's unnecessary. -# # Solaris 10 on i386 specific: -# RUNTIME_DEP_PKGS_$(PKG_BASENAME)core_i386_5.10 += CSWlibiconv2 -# RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++_i386_5.10 += CSWlibiconv2 -# RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran_i386_5.10 += CSWlibiconv2 -# RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc_i386_5.10 += CSWlibiconv2 -# RUNTIME_DEP_PKGS_$(PKG_BASENAME)java_i386_5.10 += CSWlibiconv2 -# RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += $(RUNTIME_DEP_PKGS_$(PKG_BASENAME)core_$(GARCH)_$(GAROSREL)) -# RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += $(RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++_$(GARCH)_$(GAROSREL)) -# RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += $(RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran_$(GARCH)_$(GAROSREL)) -# RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += $(RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc_$(GARCH)_$(GAROSREL)) -# RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += $(RUNTIME_DEP_PKGS_$(PKG_BASENAME)java_$(GARCH)_$(GAROSREL)) - -# Not needed even on i386/5.10? -# -# # These dependencies seem to exist only in the i386 packages on 5.10 -# RUNTIME_DEP_PKGS_CSWlibgcj$(JAVA_LIB_VERSION)_i386_5.10 = CSWlibz1 -# RUNTIME_DEP_PKGS_CSWlibgcj$(JAVA_LIB_VERSION) += $(RUNTIME_DEP_PKGS_CSWlibgcj$(JAVA_LIB_VERSION)_$(GARCH)_$(GAROSREL)) -# RUNTIME_DEP_PKGS_CSWlibgij$(JAVA_LIB_VERSION)_i386_5.10 = CSWlibz1 -# RUNTIME_DEP_PKGS_CSWlibgij$(JAVA_LIB_VERSION) += $(RUNTIME_DEP_PKGS_CSWlibgij$(JAVA_LIB_VERSION)_$(GARCH)_$(GAROSREL)) -# RUNTIME_DEP_PKGS_CSWlibgcj-tools$(JAVA_LIB_VERSION)_i386_5.10 += CSWlibz1 -# RUNTIME_DEP_PKGS_CSWlibgcj-tools$(JAVA_LIB_VERSION) += $(RUNTIME_DEP_PKGS_CSWlibgcj-tools$(JAVA_LIB_VERSION)_$(GARCH)_$(GAROSREL)) - PACKAGES += $(PACKAGES_$(GARCH)) CORE_BINARIES = cpp gcc gcov CXX_BINARIES = g\+\+ c\+\+ @@ -575,8 +524,7 @@ @$(MAKECOOKIE) # We need GNU find as find -# PATH := /opt/csw/gnu:$(PATH) -PATH := $(GCC4_CC_HOME)/bin:/opt/csw/gnu:$(PATH) +PATH := /opt/csw/gnu:$(PATH) # This override sets the right RPATH on libstdc++ and other libraries. LD_OPTIONS := -R/opt/csw/lib -R/opt/csw/lib/\$$ISALIST This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Tue Dec 6 12:50:19 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Tue, 06 Dec 2011 11:50:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[16382] csw/mgar/pkg/glib2/trunk/Makefile Message-ID: Revision: 16382 http://gar.svn.sourceforge.net/gar/?rev=16382&view=rev Author: guengel Date: 2011-12-06 11:50:19 +0000 (Tue, 06 Dec 2011) Log Message: ----------- glib2/trunk: Only supports Solaris 10 as packaging platform. Modified Paths: -------------- csw/mgar/pkg/glib2/trunk/Makefile Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2011-12-06 08:52:56 UTC (rev 16381) +++ csw/mgar/pkg/glib2/trunk/Makefile 2011-12-06 11:50:19 UTC (rev 16382) @@ -55,9 +55,7 @@ # SPARCv9 Specific Patches PATCHFILES_isa-sparcv9 += 0023-Disable-run-assert-msg-test.sh.patch -PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 -# Make special build for Solaris 10 to use dtrace -PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 PACKAGES += CSWglib2 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 Dec 6 14:20:22 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 06 Dec 2011 13:20:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[16383] csw/mgar/pkg/gcc4/trunk/Makefile Message-ID: Revision: 16383 http://gar.svn.sourceforge.net/gar/?rev=16383&view=rev Author: wahwah Date: 2011-12-06 13:20:21 +0000 (Tue, 06 Dec 2011) Log Message: ----------- gcc4/trunk: making gcc4adart as incompatible with gcc4ada Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2011-12-06 11:50:19 UTC (rev 16382) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2011-12-06 13:20:21 UTC (rev 16383) @@ -499,8 +499,8 @@ RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibcloog-isl2 RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibppl9 -# Not sure about the shared libraries. -OBSOLETED_BY_RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada = $(PKG_BASENAME)adart +# This is an obsolete package. Nothing depends on it, so we can remove it. +INCOMPATIBLE_PKGS_$(PKG_BASENAME)ada = $(PKG_BASENAME)adart PACKAGES += $(PACKAGES_$(GARCH)) CORE_BINARIES = cpp gcc gcov This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Tue Dec 6 19:37:44 2011 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Tue, 06 Dec 2011 18:37:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[16384] csw/mgar/pkg/dovecot/trunk Message-ID: Revision: 16384 http://gar.svn.sourceforge.net/gar/?rev=16384&view=rev Author: jake_goerzen Date: 2011-12-06 18:37:43 +0000 (Tue, 06 Dec 2011) Log Message: ----------- dovecot: install minimal configuration for fresh installs Modified Paths: -------------- csw/mgar/pkg/dovecot/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/dovecot/trunk/files/dovecot-minimal.conf Modified: csw/mgar/pkg/dovecot/trunk/Makefile =================================================================== --- csw/mgar/pkg/dovecot/trunk/Makefile 2011-12-06 13:20:21 UTC (rev 16383) +++ csw/mgar/pkg/dovecot/trunk/Makefile 2011-12-06 18:37:43 UTC (rev 16384) @@ -87,6 +87,15 @@ s| /usr/lib/dovecot| /opt/csw/lib/dovecot|; \ s| /usr/local| /opt/csw|;' \ $(WORKSRC)/doc/example-config/dovecot.conf + perl -pi -e '\ + s|/etc/ssl|/opt/csw/ssl|; \ + s|/usr/local|/opt/csw|;' \ + $(WORKSRC)/doc/example-config/conf.d/* + perl -pi -e '\ + s|/etc/ssl|/opt/csw/ssl|; \ + s|/usr/local|/opt/csw|; \ + s|/usr/share|/opt/csw/share|;' \ + $(WORKSRC)/doc/wiki/* @$(MAKECOOKIE) post-install-modulated: DOCDEST = $(DESTDIR)$(docdir)/$(NAME) @@ -94,19 +103,13 @@ post-install-modulated: CSWDOCS=README.CSW changelog.CSW post-install-modulated: SSLDIR = $(DESTDIR)/opt/csw/ssl post-install-modulated: - perl -pi -e 's/usr\/local/opt\/csw/g' \ - $(DESTDIR)/opt/csw/share/doc/dovecot/wiki/* - perl -pi -e 's/usr\/share/opt\/csw\/share/g' \ - $(DESTDIR)/opt/csw/share/doc/dovecot/wiki/* - perl -pi -e 's/usr\/local/opt\/csw/g' \ - $(DESTDIR)/opt/csw/share/doc/dovecot/example-config/conf.d/* # Include these in the pkg. dovecot will create them otherwise # with root:root ownership, which conflicts with other pkg's ginstall -d $(DESTDIR)$(localstatedir)/run ginstall -d $(DESTDIR)$(localstatedir)/lib - cp $(DESTDIR)/opt/csw/share/doc/dovecot/example-config/dovecot.conf \ + cp $(FILEDIR)/dovecot-minimal.conf \ $(DESTDIR)$(sysconfdir)/dovecot/dovecot.conf # Create self-signed sample cert Added: csw/mgar/pkg/dovecot/trunk/files/dovecot-minimal.conf =================================================================== --- csw/mgar/pkg/dovecot/trunk/files/dovecot-minimal.conf (rev 0) +++ csw/mgar/pkg/dovecot/trunk/files/dovecot-minimal.conf 2011-12-06 18:37:43 UTC (rev 16384) @@ -0,0 +1,7 @@ +## CSWdovecot minimal configuration + +# This is a minimal configuration to get CSWdovecot up and running with +# the defaults. + +ssl_cert = Revision: 16385 http://gar.svn.sourceforge.net/gar/?rev=16385&view=rev Author: jake_goerzen Date: 2011-12-06 19:53:56 +0000 (Tue, 06 Dec 2011) Log Message: ----------- dovecot: move search n replace rule Modified Paths: -------------- csw/mgar/pkg/dovecot/trunk/Makefile Modified: csw/mgar/pkg/dovecot/trunk/Makefile =================================================================== --- csw/mgar/pkg/dovecot/trunk/Makefile 2011-12-06 18:37:43 UTC (rev 16384) +++ csw/mgar/pkg/dovecot/trunk/Makefile 2011-12-06 19:53:56 UTC (rev 16385) @@ -91,11 +91,6 @@ s|/etc/ssl|/opt/csw/ssl|; \ s|/usr/local|/opt/csw|;' \ $(WORKSRC)/doc/example-config/conf.d/* - perl -pi -e '\ - s|/etc/ssl|/opt/csw/ssl|; \ - s|/usr/local|/opt/csw|; \ - s|/usr/share|/opt/csw/share|;' \ - $(WORKSRC)/doc/wiki/* @$(MAKECOOKIE) post-install-modulated: DOCDEST = $(DESTDIR)$(docdir)/$(NAME) @@ -104,6 +99,12 @@ post-install-modulated: SSLDIR = $(DESTDIR)/opt/csw/ssl post-install-modulated: + perl -pi -e '\ + s|/etc/ssl|/opt/csw/ssl|; \ + s|/usr/local|/opt/csw|; \ + s|/usr/share|/opt/csw/share|;' \ + $(DESTDIR)/opt/csw/share/doc/dovecot/wiki/* + # Include these in the pkg. dovecot will create them otherwise # with root:root ownership, which conflicts with other pkg's ginstall -d $(DESTDIR)$(localstatedir)/run This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Wed Dec 7 00:21:11 2011 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Tue, 06 Dec 2011 23:21:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[16386] csw/mgar/pkg/dovecot/trunk/Makefile Message-ID: Revision: 16386 http://gar.svn.sourceforge.net/gar/?rev=16386&view=rev Author: jake_goerzen Date: 2011-12-06 23:21:10 +0000 (Tue, 06 Dec 2011) Log Message: ----------- dovecot: override file-with-bad-content as it docs only Modified Paths: -------------- csw/mgar/pkg/dovecot/trunk/Makefile Modified: csw/mgar/pkg/dovecot/trunk/Makefile =================================================================== --- csw/mgar/pkg/dovecot/trunk/Makefile 2011-12-06 19:53:56 UTC (rev 16385) +++ csw/mgar/pkg/dovecot/trunk/Makefile 2011-12-06 23:21:10 UTC (rev 16386) @@ -76,6 +76,13 @@ SAMPLECONF = .*/dovecot.pem $(sysconfdir)/dovecot/dovecot.conf MIGRATE_FILES = dovecot.conf +# the perl search and replace is missing this. Need to rework the below perl +# lines. For now overriding since the file(s) are only documentation. + +CHECKPKG_OVERRIDES_CSWdovecot = file-with-bad-content|/usr/local|root/opt/csw/share/doc/dovecot/wiki/CompilingSource.txt +CHECKPKG_OVERRIDES_CSWdovecot += file-with-bad-content|/usr/local|root/opt/csw/share/doc/dovecot/wiki/HowTo.PopBSMTPAndDovecot.txt +CHECKPKG_OVERRIDES_CSWdovecot += file-with-bad-content|/usr/local|root/opt/csw/share/doc/dovecot/wiki/LDA.Sendmail.txt + include gar/category.mk pre-install-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 Wed Dec 7 02:12:29 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 07 Dec 2011 01:12:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[16387] csw/mgar/pkg Message-ID: Revision: 16387 http://gar.svn.sourceforge.net/gar/?rev=16387&view=rev Author: wahwah Date: 2011-12-07 01:12:29 +0000 (Wed, 07 Dec 2011) Log Message: ----------- wkhtmltopdf: a stub, does not build Modified Paths: -------------- csw/mgar/pkg/wkhtmltopdf/trunk/Makefile csw/mgar/pkg/wkhtmltopdf/trunk/checksums Added Paths: ----------- csw/mgar/pkg/wkhtmltopdf/ Modified: csw/mgar/pkg/wkhtmltopdf/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-11-08 02:20:36 UTC (rev 11524) +++ csw/mgar/pkg/wkhtmltopdf/trunk/Makefile 2011-12-07 01:12:29 UTC (rev 16387) @@ -11,8 +11,8 @@ ## For more information about GAR variables, please see: ## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference ## -GARNAME = mypkg -GARVERSION = 1.0 +NAME = wkhtmltopdf +VERSION = 0.11.0_rc1 ## ## The category that your software fits in. This is not a descriptive field, but ## influences the build process. Depending on the CATEGORIES setting, different @@ -25,24 +25,23 @@ CATEGORIES = lib ## ## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = +DESCRIPTION = Convert html to pdf using webkit (qtwebkit) ## ## A longer description of the package. This is only for descriptive purposes ## inside the Makefile and is not used elsewhere. define BLURB - endef ## ## Upstream URL that should show up in the VENDOR field as well as on ## http://opencsw.org/packages/. -SPKG_SOURCEURL = +SPKG_SOURCEURL = http://code.google.com/p/wkhtmltopdf ## ## Whitespace-separated list of URLs to download the source package from. ## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = +MASTER_SITES = $(GOOGLE_MIRROR) ## ## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge +## Sourceforge project name differs from $(NAME). Specifies the Sourceforge ## project name of the software you wish to download. ## SF_PROJ = ## @@ -54,10 +53,9 @@ ## Whitespace-separated list of files which comprise this build. mGAR will look ## for the files in the $(FILEDIR) (trunk/files) directory and on the ## $(MASTER_SITES). -DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz +DISTFILES = $(NAME)-$(VERSION).tar.bz2 +# http://wkhtmltopdf.googlecode.com/files/wkhtmltopdf-0.11.0_rc1.tar.bz2 ## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz ## ## Catalog name is the name to be used with pkg{-get,util} -i . ## It is different from the system package name, which by convention is CSWpkgname. @@ -145,15 +143,15 @@ ## completely (for example when your software doesn't need to be compiled) assign ## this variable an empty value. The procedure works for configure, build, ## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = +CONFIGURE_SCRIPTS = custom +# BUILD_SCRIPTS = ## INSTALL_SCRIPTS = ## TEST_SCRIPTS = ## ## Compilation settings ## ## The build directory. -## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION) +## WORKSRC = $(WORKDIR)/$(NAME)-$(VERSION) ## ## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this ## for example, if you need to override Makefile variables. @@ -176,10 +174,8 @@ ## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. ## GARCOMPILER = SOS11 ## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true +include gar/category.mk -#include gar/category.mk +configure-custom: + cd $(WORKSRC); qmake + @$(MAKECOOKIE) Modified: csw/mgar/pkg/wkhtmltopdf/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2010-11-08 02:20:36 UTC (rev 11524) +++ csw/mgar/pkg/wkhtmltopdf/trunk/checksums 2011-12-07 01:12:29 UTC (rev 16387) @@ -0,0 +1 @@ +65378cf59698c676fcd6d8f5efd54be6 wkhtmltopdf-0.11.0_rc1.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 Wed Dec 7 13:36:11 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 07 Dec 2011 12:36:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[16388] csw/mgar/pkg/libmcrypt/trunk/Makefile Message-ID: Revision: 16388 http://gar.svn.sourceforge.net/gar/?rev=16388&view=rev Author: wahwah Date: 2011-12-07 12:36:11 +0000 (Wed, 07 Dec 2011) Log Message: ----------- libmcrypt/trunk: fixed the libltd compilation problem, enabled dynamic loading Modified Paths: -------------- csw/mgar/pkg/libmcrypt/trunk/Makefile Modified: csw/mgar/pkg/libmcrypt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmcrypt/trunk/Makefile 2011-12-07 01:12:29 UTC (rev 16387) +++ csw/mgar/pkg/libmcrypt/trunk/Makefile 2011-12-07 12:36:11 UTC (rev 16388) @@ -20,6 +20,7 @@ STRIP_LIBTOOL = 1 EXTRA_BUILD_ISAS_i386 = pentium_pro +EXTRA_BUILD_ISAS_sparc = sparcv8plus EXTRA_CPPFLAGS = -D__const=const @@ -28,7 +29,7 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-dynamic-loading CONFIGURE_ARGS += --with-included-algos=cast-128,gost,rijndael-128,twofish,arcfour,cast-256,loki97,rijndael-192,saferplus,wake,blowfish-compat,des,rijndael-256,serpent,xtea,blowfish,enigma,rc2,tripledes -CONFIGURE_ARGS += --disable-dynamic-loading +# CONFIGURE_ARGS += --disable-dynamic-loading PACKAGES += CSWlibmcrypt4 CATALOGNAME_CSWlibmcrypt4 = libmcrypt4 @@ -37,6 +38,7 @@ SPKG_DESC_CSWlibmcrypt4 += $(DESCRIPTION), libmcrypt.so.4 RUNTIME_DEP_PKGS_CSWlibmcrypt += CSWlibmcrypt4 RUNTIME_DEP_PKGS_CSWlibmcrypt4 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibmcrypt4 += CSWlibltdl7 OBSOLETED_BY_CSWlibmcrypt4 = CSWlibmcrypt PACKAGES += CSWmcrypt-dev @@ -52,3 +54,9 @@ SKIPTEST = 1 include gar/category.mk + +# http://www.mail-archive.com/bug-guile at gnu.org/msg01233.html +pre-configure-modulated: + (cd $(WORKSRC); autoconf) + (cd $(WORKSRC)/libltdl; autoconf) + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Dec 7 13:40:35 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 07 Dec 2011 12:40:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[16389] csw/mgar/pkg/libmcrypt/trunk/Makefile Message-ID: Revision: 16389 http://gar.svn.sourceforge.net/gar/?rev=16389&view=rev Author: wahwah Date: 2011-12-07 12:40:34 +0000 (Wed, 07 Dec 2011) Log Message: ----------- libmcrypt/trunk: explicitly enable dynamic loading Modified Paths: -------------- csw/mgar/pkg/libmcrypt/trunk/Makefile Modified: csw/mgar/pkg/libmcrypt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmcrypt/trunk/Makefile 2011-12-07 12:36:11 UTC (rev 16388) +++ csw/mgar/pkg/libmcrypt/trunk/Makefile 2011-12-07 12:40:34 UTC (rev 16389) @@ -29,7 +29,7 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-dynamic-loading CONFIGURE_ARGS += --with-included-algos=cast-128,gost,rijndael-128,twofish,arcfour,cast-256,loki97,rijndael-192,saferplus,wake,blowfish-compat,des,rijndael-256,serpent,xtea,blowfish,enigma,rc2,tripledes -# CONFIGURE_ARGS += --disable-dynamic-loading +CONFIGURE_ARGS += --enable-dynamic-loading PACKAGES += CSWlibmcrypt4 CATALOGNAME_CSWlibmcrypt4 = libmcrypt4 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 Dec 7 14:08:51 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 07 Dec 2011 13:08:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[16390] csw/mgar/pkg/syslog_ng/trunk Message-ID: Revision: 16390 http://gar.svn.sourceforge.net/gar/?rev=16390&view=rev Author: wahwah Date: 2011-12-07 13:08:50 +0000 (Wed, 07 Dec 2011) Log Message: ----------- syslog_ng/trunk: version bump to 3.3.3 Modified Paths: -------------- csw/mgar/pkg/syslog_ng/trunk/Makefile csw/mgar/pkg/syslog_ng/trunk/checksums Modified: csw/mgar/pkg/syslog_ng/trunk/Makefile =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/Makefile 2011-12-07 12:40:34 UTC (rev 16389) +++ csw/mgar/pkg/syslog_ng/trunk/Makefile 2011-12-07 13:08:50 UTC (rev 16390) @@ -1,7 +1,7 @@ # $Id$ NAME = syslog-ng -VERSION = 3.2.4 +VERSION = 3.3.3 CATEGORIES = server DESCRIPTION = A powerful syslogd replacement @@ -68,6 +68,9 @@ CHECKPKG_OVERRIDES_CSWsyslogng += shared-lib-package-contains-so-symlink CHECKPKG_OVERRIDES_CSWsyslogng += shared-lib-pkgname-mismatch +# Missing TLS symbols +EXTRA_LINKER_FLAGS = -lgnutls + post-install-modulated: ginstall -d $(DESTDIR)/etc/opt/csw ginstall -m 444 $(WORKDIR)/$(NAME).conf.CSW \ Modified: csw/mgar/pkg/syslog_ng/trunk/checksums =================================================================== --- csw/mgar/pkg/syslog_ng/trunk/checksums 2011-12-07 12:40:34 UTC (rev 16389) +++ csw/mgar/pkg/syslog_ng/trunk/checksums 2011-12-07 13:08:50 UTC (rev 16390) @@ -1 +1 @@ -5995f7dad0053a478b60a63f6f754203 syslog-ng_3.2.4.tar.gz +04b1804e8a5a1413c9b92428bc8227bb syslog-ng_3.3.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Dec 7 14:35:40 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 07 Dec 2011 13:35:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[16391] csw/mgar/pkg/glib2/trunk/Makefile Message-ID: Revision: 16391 http://gar.svn.sourceforge.net/gar/?rev=16391&view=rev Author: wahwah Date: 2011-12-07 13:35:40 +0000 (Wed, 07 Dec 2011) Log Message: ----------- glib2/trunk: cut a dependency loop Modified Paths: -------------- csw/mgar/pkg/glib2/trunk/Makefile Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2011-12-07 13:08:50 UTC (rev 16390) +++ csw/mgar/pkg/glib2/trunk/Makefile 2011-12-07 13:35:40 UTC (rev 16391) @@ -66,7 +66,10 @@ RUNTIME_DEP_PKGS_CSWglib2 += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWglib2 += CSWlibz1 RUNTIME_DEP_PKGS_CSWglib2 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWglib2 += CSWgamin +# The dependency on CSWgamin creates a dependency loop. Whatever the current +# solution is, we need to cut the loop somewhere, and we'll cut the loop here +# for the time being. +# RUNTIME_DEP_PKGS_CSWglib2 += CSWgamin # Did not see any runtime dependency #RUNTIME_DEP_PKGS_CSWglib2 += CSWpython RUNTIME_DEP_PKGS_CSWglib2 += CSWlibgobject2-0-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 Wed Dec 7 20:33:35 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 07 Dec 2011 19:33:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[16392] csw/mgar/pkg/pkg-gate/trunk/Makefile Message-ID: Revision: 16392 http://gar.svn.sourceforge.net/gar/?rev=16392&view=rev Author: dmichelsen Date: 2011-12-07 19:33:35 +0000 (Wed, 07 Dec 2011) Log Message: ----------- pkg-gate: Add more deps and upstream comment Modified Paths: -------------- csw/mgar/pkg/pkg-gate/trunk/Makefile Modified: csw/mgar/pkg/pkg-gate/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkg-gate/trunk/Makefile 2011-12-07 13:35:40 UTC (rev 16391) +++ csw/mgar/pkg/pkg-gate/trunk/Makefile 2011-12-07 19:33:35 UTC (rev 16392) @@ -1,5 +1,6 @@ # $Id$ # TODO (release-critical prefixed with !, non release-critical with *) +# ! Integrate stuff from http://tom.blog.in-ulm.de/node/10 # NAME = pkg-gate VERSION = 2589 @@ -38,6 +39,8 @@ RUNTIME_DEP_PKGS_CSWips-pkg-server += CSWpy-openssl RUNTIME_DEP_PKGS_CSWips-pkg-server += CSWcherrypy RUNTIME_DEP_PKGS_CSWips-pkg-server += CSWpy-simplejson +RUNTIME_DEP_PKGS_CSWips-pkg-server += CSWpy-curl +RUNTIME_DEP_PKGS_CSWips-pkg-server += CSWpy-ply # With all the replacements and the large repo this takes forever NOGITPATCH = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Dec 7 20:45:12 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 07 Dec 2011 19:45:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[16393] csw/mgar/gar/v2/gar.lib.mk Message-ID: Revision: 16393 http://gar.svn.sourceforge.net/gar/?rev=16393&view=rev Author: dmichelsen Date: 2011-12-07 19:45:11 +0000 (Wed, 07 Dec 2011) Log Message: ----------- mGAR v2: Use gtar for copying as Solaris has issues with extralong filenames 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-12-07 19:33:35 UTC (rev 16392) +++ csw/mgar/gar/v2/gar.lib.mk 2011-12-07 19:45:11 UTC (rev 16393) @@ -624,7 +624,7 @@ cp-extract-%: @echo " ==> Copying $(DOWNLOADDIR)/$*" @# Make sure to keep symlinks and don't traverse recursive ones - @(cd $(DOWNLOADDIR); tar cf - $*) | (cd $(WORKDIR); tar xf -) + @(cd $(DOWNLOADDIR); gtar cf - $*) | (cd $(WORKDIR); gtar xf -) @$(MAKECOOKIE) #gets the meat of a .deb into $(WORKSRC) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Dec 7 20:46:08 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 07 Dec 2011 19:46:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[16394] csw/mgar/gar/v2/categories/rbgems/category.mk Message-ID: Revision: 16394 http://gar.svn.sourceforge.net/gar/?rev=16394&view=rev Author: dmichelsen Date: 2011-12-07 19:46:08 +0000 (Wed, 07 Dec 2011) Log Message: ----------- mGAR v2: In category 'rbgems' make sure name conforms to naming rules Modified Paths: -------------- csw/mgar/gar/v2/categories/rbgems/category.mk Modified: csw/mgar/gar/v2/categories/rbgems/category.mk =================================================================== --- csw/mgar/gar/v2/categories/rbgems/category.mk 2011-12-07 19:45:11 UTC (rev 16393) +++ csw/mgar/gar/v2/categories/rbgems/category.mk 2011-12-07 19:46:08 UTC (rev 16394) @@ -10,7 +10,7 @@ DISTFILES += $(GEMFILE) GEMPKGVERSION ?= $(subst .,-,$(GEMVERSION)) -GEMPKGNAME ?= $(GEMNAME)-$(GEMPKGVERSION) +GEMPKGNAME ?= $(subst _,-,$(GEMNAME)-$(GEMPKGVERSION)) GEMCATALOGNAME ?= $(subst -,_,$(GEMPKGNAME)) # PACKAGES ?= CSWgem-$(GEMPKGNAME) CSWgem-$(GEMPKGNAME)-doc This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Dec 7 20:48:01 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 07 Dec 2011 19:48:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[16395] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 16395 http://gar.svn.sourceforge.net/gar/?rev=16395&view=rev Author: dmichelsen Date: 2011-12-07 19:48:01 +0000 (Wed, 07 Dec 2011) Log Message: ----------- mGAR v2: Allow empty reinplacement value and change regex parantheses to rarely used curly braces Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2011-12-07 19:46:08 UTC (rev 16394) +++ csw/mgar/gar/v2/gar.mk 2011-12-07 19:48:01 UTC (rev 16395) @@ -420,7 +420,6 @@ $(foreach REINPLACEMENT,$(_ALL_REINPLACEMENTS),\ $(if $(REINPLACE_FILES_$(REINPLACEMENT)),,$(error Reinplacement '$(REINPLACEMENT)' has been set but REINPLACE_FILES_$(REINPLACEMENT) is empty))\ $(if $(REINPLACE_MATCH_$(REINPLACEMENT)),,$(error Reinplacement '$(REINPLACEMENT)' has been set but REINPLACE_MATCH_$(REINPLACEMENT) is empty))\ - $(if $(REINPLACE_WITH_$(REINPLACEMENT)),,$(error Reinplacement '$(REINPLACEMENT)' has been set but REINPLACE_WITH_$(REINPLACEMENT) is empty))\ ) # We call an additional extract-modulated without resetting any variables so @@ -487,7 +486,7 @@ @$(MAKECOOKIE) post-extract-reinplace-%: - -perl -p -i$(REINPLACE_BACKUP_$*) -e "s($(REINPLACE_MATCH_$*))($(REINPLACE_WITH_$*))g" \ + -perl -p -i$(REINPLACE_BACKUP_$*) -e 's{$(REINPLACE_MATCH_$*)}{$(REINPLACE_WITH_$*)}g' \ $(addprefix $(WORKSRC)/,$(REINPLACE_FILES_$*)) @( if [ -d "$(PATCHDIR)/.git" ]; then \ echo "Committing reinplacements..."; \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Dec 7 21:22:10 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 07 Dec 2011 20:22:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[16396] csw/mgar/pkg/slang/trunk Message-ID: Revision: 16396 http://gar.svn.sourceforge.net/gar/?rev=16396&view=rev Author: dmichelsen Date: 2011-12-07 20:22:10 +0000 (Wed, 07 Dec 2011) Log Message: ----------- slang/trunk: Discard version modulation, update package split, do reinplacements Modified Paths: -------------- csw/mgar/pkg/slang/trunk/Makefile csw/mgar/pkg/slang/trunk/checksums Modified: csw/mgar/pkg/slang/trunk/Makefile =================================================================== --- csw/mgar/pkg/slang/trunk/Makefile 2011-12-07 19:48:01 UTC (rev 16395) +++ csw/mgar/pkg/slang/trunk/Makefile 2011-12-07 20:22:10 UTC (rev 16396) @@ -4,54 +4,80 @@ VERSION = 2.2.4 CATEGORIES = lib -EXTRA_MODULATORS = VERSION -MODULATIONS_VERSION = 1.4.9 2.2.4 - -# The old package didn't contain 64 bit, so don't bother building it for compat -SKIP_MODULATIONS = isa-sparcv9-version-1.4.9 -SKIP_MODULATIONS += isa-amd64-version-1.4.9 - DESCRIPTION = Library primarily to provide an alternative to libcurses define BLURB endef -MASTER_SITES = $(foreach V,$(MODULATIONS_VERSION),ftp://space.mit.edu/pub/davis/slang/v$(shell echo $V | perl -ne 'print /(\d+\.\d+)/')/) -SOURCEFILES = $(foreach VERSION,$(MODULATIONS_VERSION), $(NAME)-$(VERSION).tar.bz2) -DISTFILES = $(SOURCEFILES) -NOEXTRACT = $(filter-out $(NAME)-$(VERSION).tar.bz2,$(SOURCEFILES)) +MASTER_SITES = ftp://space.mit.edu/pub/davis/slang/v$(shell echo $V | perl -ne 'print /(\d+\.\d+)/') +DISTFILES = $(DISTNAME).tar.bz2 -# RUNTIME_DEP_PKGS = CSWiconv CSWpcrert CSWpng CSWzlib CSWoniguruma - VENDOR_URL = http://www.s-lang.org/ -# Setting -L$(libdir) before the newly built lib confuses function -# definitions if the installed lib is older than the newly built one. -LINKER_FLAGS = +BUILD_DEP_PKGS += CSWlibpcre-dev +BUILD_DEP_PKGS += CSWlibonig-dev +BUILD_DEP_PKGS += CSWlibpng-dev +BUILD_DEP_PKGS += CSWlibz-dev +BUILD_DEP_PKGS += CSWlibiconv-dev -BUILD64 = 1 -CONFIGURE_ARGS = $(DIRPATHS) +FOREIGN_PACKAGES += CSWlibslang1 +OBSOLETED_BY_CSWlibslang1 += CSWslang -TEST_TARGET_VERSION-1.4.9 = -TEST_TARGET_VERSION-2.2.4 = check -TEST_TARGET = $(TEST_TARGET_VERSION-$(VERSION)) +PACKAGES += CSWlibslang2 +SPKG_DESC_CSWlibslang2 = Library primarily to provide an alternative to libcurses, libslang.so.2 +PKGFILES_CSWlibslang2 += $(call pkgfiles_lib,libslang.so.2) +PKGFILES_CSWlibslang2 += $(call baseisadirs,$(libdir),slang/.*) +RUNTIME_DEP_PKGS_CSWlibslang2 += CSWlibpcre0 +RUNTIME_DEP_PKGS_CSWlibslang2 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibslang2 += CSWlibonig2 +RUNTIME_DEP_PKGS_CSWlibslang2 += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWlibslang2 += CSWlibz1 +OBSOLETED_BY_CSWlibslang2 += CSWslang +# These are locations of fallback terminfo/ directories, /opt/csw/share/terminfo comes first +# due to our reinplacement +CHECKPKG_OVERRIDES_CSWlibslang2 += file-with-bad-content|/usr/local|root/opt/csw/lib/libslang.so.2.2.4 +CHECKPKG_OVERRIDES_CSWlibslang2 += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libslang.so.2.2.4 +CHECKPKG_OVERRIDES_CSWlibslang2 += file-with-bad-content|/usr/share|root/opt/csw/lib/libslang.so.2.2.4 +CHECKPKG_OVERRIDES_CSWlibslang2 += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libslang.so.2.2.4 -INSTALL_ARGS_VERSION-1.4.9 = install-elf install-links -INSTALL_ARGS = $(INSTALL_ARGS_VERSION-$(VERSION)) +PACKAGES += CSWlibslang-dev +SPKG_DESC_CSWlibslang-dev = Development for libslang.so.2 +PKGFILES_CSWlibslang-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWlibslang-dev += $(docdir)/slang/.* +RUNTIME_DEP_PKGS_CSWlibslang-dev += CSWlibslang2 +# These are docs only +CHECKPKG_OVERRIDES_CSWlibslang-dev += file-with-bad-content -BUILD_ARGS_VERSION-1.4.9 = elf -BUILD_ARGS = $(BUILD_ARGS_VERSION-$(VERSION)) +PACKAGES += CSWslsh +SPKG_DESC_CSWslsh = SLANG shell, a shell using slang for terminal control +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWslsh += CSWlibslang2 -BUILD_OVERRIDE_VARS_VERSION-1.4.9 = ELF_CFLAGS -BUILD_OVERRIDE_VARS = $(BUILD_OVERRIDE_VARS_VERSION-$(VERSION)) -BUILD_OVERRIDE_VAR_ELF_CFLAGS = -K pic $(CFLAGS) +# These are examples on\xC3ly +CHECKPKG_OVERRIDES_CSWslsh += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/slsh.1 +CHECKPKG_OVERRIDES_CSWslsh += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/slsh.1 -MERGE_SCRIPTS_isa-default-version-1.4.9 = copy-only -MERGE_DIRS_isa-default-version-1.4.9 = $(libdir) -MERGE_SCRIPTS_isa-default64-version-1.4.9 = copy-relocated-only -MERGE_DIRS_isa-default64-version-1.4.9 = $(libdir) +# This is funny, the slsh.rc is placed in the correct location, but the search path +# is hardwired to something different +REINPLACEMENTS += slshrc +REINPLACE_MATCH_slshrc = define DEFAULT_CONF_PATH.* +REINPLACE_WITH_slshrc = define DEFAULT_CONF_PATH "/etc/opt/csw:/opt/csw/etc" +REINPLACE_FILES_slshrc = slsh/slsh.c -MERGE_SCRIPTS_isa-default-version-2.2.4 = copy-all -MERGE_SCRIPTS_isa-default64-version-2.2.4 = copy-relocated-only -MERGE_DIRS_isa-default64-version-2.2.4 = $(libdir) +REINPLACEMENTS += slshrc_man +REINPLACE_MATCH_slshrc_man = \$$\(prefix\)/etc +REINPLACE_WITH_slshrc_man = /etc/opt/csw/:/opt/csw/etc/ +REINPLACE_FILES_slshrc_man = slsh/doc/man/slsh.1 +# Replace all the other default pathes with nothing +REINPLACEMENTS += slshrc_man_skip +REINPLACE_MATCH_slshrc_man_skip = \\fI(/usr/local/etc/|/usr/local/etc/slsh/|/etc/|/etc/slsh/)\\fR +REINPLACE_WITH_slshrc_man_skip = +REINPLACE_FILES_slshrc_man_skip = slsh/doc/man/slsh.1 + +# Setting -L$(libdir) before the newly built lib confuses function +# definitions if the installed lib is older than the newly built one. +LINKER_FLAGS = + +BUILD64 = 1 + include gar/category.mk Modified: csw/mgar/pkg/slang/trunk/checksums =================================================================== --- csw/mgar/pkg/slang/trunk/checksums 2011-12-07 19:48:01 UTC (rev 16395) +++ csw/mgar/pkg/slang/trunk/checksums 2011-12-07 20:22:10 UTC (rev 16396) @@ -1,2 +1 @@ -4fbb1a7f1257e065ca830deefe13d350 slang-1.4.9.tar.bz2 7fcfd447e378f07dd0c0bae671fe6487 slang-2.2.4.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Dec 7 21:25:54 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 07 Dec 2011 20:25:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[16397] csw/mgar/pkg/slang/trunk/Makefile Message-ID: Revision: 16397 http://gar.svn.sourceforge.net/gar/?rev=16397&view=rev Author: dmichelsen Date: 2011-12-07 20:25:54 +0000 (Wed, 07 Dec 2011) Log Message: ----------- slang/trunk: Add amd64 overrides Modified Paths: -------------- csw/mgar/pkg/slang/trunk/Makefile Modified: csw/mgar/pkg/slang/trunk/Makefile =================================================================== --- csw/mgar/pkg/slang/trunk/Makefile 2011-12-07 20:22:10 UTC (rev 16396) +++ csw/mgar/pkg/slang/trunk/Makefile 2011-12-07 20:25:54 UTC (rev 16397) @@ -36,8 +36,10 @@ # due to our reinplacement CHECKPKG_OVERRIDES_CSWlibslang2 += file-with-bad-content|/usr/local|root/opt/csw/lib/libslang.so.2.2.4 CHECKPKG_OVERRIDES_CSWlibslang2 += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libslang.so.2.2.4 +CHECKPKG_OVERRIDES_CSWlibslang2 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libslang.so.2.2.4 CHECKPKG_OVERRIDES_CSWlibslang2 += file-with-bad-content|/usr/share|root/opt/csw/lib/libslang.so.2.2.4 CHECKPKG_OVERRIDES_CSWlibslang2 += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libslang.so.2.2.4 +CHECKPKG_OVERRIDES_CSWlibslang2 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libslang.so.2.2.4 PACKAGES += CSWlibslang-dev SPKG_DESC_CSWlibslang-dev = Development for libslang.so.2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Dec 7 21:53:56 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 07 Dec 2011 20:53:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[16398] csw/mgar/pkg/trafshow/trunk Message-ID: Revision: 16398 http://gar.svn.sourceforge.net/gar/?rev=16398&view=rev Author: dmichelsen Date: 2011-12-07 20:53:55 +0000 (Wed, 07 Dec 2011) Log Message: ----------- trafshow/trunk: Update to 5.2.3 and latest standards Modified Paths: -------------- csw/mgar/pkg/trafshow/trunk/Makefile csw/mgar/pkg/trafshow/trunk/checksums Modified: csw/mgar/pkg/trafshow/trunk/Makefile =================================================================== --- csw/mgar/pkg/trafshow/trunk/Makefile 2011-12-07 20:25:54 UTC (rev 16397) +++ csw/mgar/pkg/trafshow/trunk/Makefile 2011-12-07 20:53:55 UTC (rev 16398) @@ -1,5 +1,5 @@ NAME = trafshow -VERSION = 5.2.1 +VERSION = 5.2.3 CATEGORIES = net DESCRIPTION = Network traffic monitoring utility @@ -12,27 +12,20 @@ so you can inspect a required part of network traffic. endef -MASTER_SITES = ftp://ftp.planix.com/pub/mirror/ -MASTER_SITES += ftp://ftp.eenet.ee/pub/gentoo/distfiles/ -MASTER_SITES += ftp://ftp.mgts.by/pub/FreeBSD/ports/distfiles/ -DISTFILES = $(NAME)-$(VERSION).tgz +MASTER_SITES += http://fossies.org/linux/misc/ +DISTFILES += $(DISTNAME).tgz +PATCHFILES += Makefile.patch -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +LICENSE = README -# we require -RUNTIME_DEP_PKGS = CSWlibpcap CSWslang +RUNTIME_DEP_PKGS_CSWtrafshow += CSWlibpcap1 +RUNTIME_DEP_PKGS_CSWtrafshow += CSWlibslang2 -# patch away GNUishm -PATCHFILES = Makefile.patch +EXTRA_CFLAGS += $(CPPFLAGS) -# configure args -CONFIGURE_ARGS = $(DIRPATHS) - -# no testscript +# No testscript TEST_SCRIPTS = -# use a custom install INSTALL_SCRIPTS = custom include gar/category.mk Modified: csw/mgar/pkg/trafshow/trunk/checksums =================================================================== --- csw/mgar/pkg/trafshow/trunk/checksums 2011-12-07 20:25:54 UTC (rev 16397) +++ csw/mgar/pkg/trafshow/trunk/checksums 2011-12-07 20:53:55 UTC (rev 16398) @@ -1,2 +1 @@ -d2ae55421d34ed84cff905f2b8699bfa download/Makefile.patch -e3ad2e3f1aac2e1bac9b467df44cf8f0 download/trafshow-5.2.1.tgz +0b2f0bb23b7832138b7d841437b9e182 trafshow-5.2.3.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Dec 7 22:04:54 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 07 Dec 2011 21:04:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[16399] csw/mgar/pkg/timidity Message-ID: Revision: 16399 http://gar.svn.sourceforge.net/gar/?rev=16399&view=rev Author: dmichelsen Date: 2011-12-07 21:04:54 +0000 (Wed, 07 Dec 2011) Log Message: ----------- timidity: Move legacy to tags/ Added Paths: ----------- csw/mgar/pkg/timidity/branches/ csw/mgar/pkg/timidity/tags/ csw/mgar/pkg/timidity/tags/legacy/ Removed Paths: ------------- csw/mgar/pkg/timidity/trunk/legacy/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Dec 8 00:13:19 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 07 Dec 2011 23:13:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[16400] csw/mgar/pkg/dhcp/trunk Message-ID: Revision: 16400 http://gar.svn.sourceforge.net/gar/?rev=16400&view=rev Author: bonivart Date: 2011-12-07 23:13:18 +0000 (Wed, 07 Dec 2011) Log Message: ----------- dhcp/trunk: update to 4.2.3-P1 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-12-07 21:04:54 UTC (rev 16399) +++ csw/mgar/pkg/dhcp/trunk/Makefile 2011-12-07 23:13:18 UTC (rev 16400) @@ -1,10 +1,10 @@ NAME = dhcp VERSION = 4.2.3 -#RELEASE = P1 -#DISTVERSION = $(VERSION)-$(RELEASE) -#SPKG_VERSION = $(VERSION)$(RELEASE) -#DISTNAME = $(NAME)-$(VERSION)-$(RELEASE) -#WORKSRC = $(WORKDIR)/$(DISTNAME) +RELEASE = P1 +DISTVERSION = $(VERSION)-$(RELEASE) +SPKG_VERSION = $(VERSION)$(RELEASE) +DISTNAME = $(NAME)-$(VERSION)-$(RELEASE) +WORKSRC = $(WORKDIR)/$(DISTNAME) CATEGORIES = net DESCRIPTION = ISC DHCP reference implementation @@ -15,8 +15,8 @@ suitable for use in high-volume and high-reliability applications. endef -#MASTER_SITES = http://ftp.isc.org/isc/dhcp/ -MASTER_SITES = http://ftp.isc.org/isc/dhcp/$(VERSION)/ +#MASTER_SITES = http://ftp.isc.org/isc/dhcp/$(VERSION)/ +MASTER_SITES = http://ftp.isc.org/isc/dhcp/$(DISTVERSION)/ DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES = $(DISTNAME).tar.gz Modified: csw/mgar/pkg/dhcp/trunk/checksums =================================================================== --- csw/mgar/pkg/dhcp/trunk/checksums 2011-12-07 21:04:54 UTC (rev 16399) +++ csw/mgar/pkg/dhcp/trunk/checksums 2011-12-07 23:13:18 UTC (rev 16400) @@ -1 +1 @@ -a06649ec5336d284fc86a0232c0edd63 dhcp-4.2.3.tar.gz +04599f1557a5cafd10d7745267a68c8b dhcp-4.2.3-P1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Dec 8 01:33:38 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 08 Dec 2011 00:33:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[16401] csw/mgar/pkg/gamin/trunk/Makefile Message-ID: Revision: 16401 http://gar.svn.sourceforge.net/gar/?rev=16401&view=rev Author: wahwah Date: 2011-12-08 00:33:37 +0000 (Thu, 08 Dec 2011) Log Message: ----------- gamin/trunk: Adding the Id tag Modified Paths: -------------- csw/mgar/pkg/gamin/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/gamin/trunk/Makefile Modified: csw/mgar/pkg/gamin/trunk/Makefile =================================================================== --- csw/mgar/pkg/gamin/trunk/Makefile 2011-12-07 23:13:18 UTC (rev 16400) +++ csw/mgar/pkg/gamin/trunk/Makefile 2011-12-08 00:33:37 UTC (rev 16401) @@ -1,3 +1,5 @@ +# $Id$ + NAME = gamin VERSION = 0.1.10 CATEGORIES = server Property changes on: csw/mgar/pkg/gamin/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 Dec 8 09:01:53 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 08 Dec 2011 08:01:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[16402] csw/mgar/pkg/gamin/trunk/Makefile Message-ID: Revision: 16402 http://gar.svn.sourceforge.net/gar/?rev=16402&view=rev Author: wahwah Date: 2011-12-08 08:01:52 +0000 (Thu, 08 Dec 2011) Log Message: ----------- gamin/trunk: glib2 is Solaris 10 only now Modified Paths: -------------- csw/mgar/pkg/gamin/trunk/Makefile Modified: csw/mgar/pkg/gamin/trunk/Makefile =================================================================== --- csw/mgar/pkg/gamin/trunk/Makefile 2011-12-08 00:33:37 UTC (rev 16401) +++ csw/mgar/pkg/gamin/trunk/Makefile 2011-12-08 08:01:52 UTC (rev 16402) @@ -19,6 +19,8 @@ # As taken from # http://src.opensolaris.org/source/xref/jds/spec-files/trunk/base-specs/gamin.spec +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + MASTER_SITES += http://src.opensolaris.org/source/raw/jds/spec-files/branches/opensolaris-2010-03/patches/ PATCHDIRLEVEL = 0 PATCHFILES += gamin-01-all.diff 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 Dec 8 09:17:46 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 08 Dec 2011 08:17:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[16403] csw/mgar/pkg/gamin/trunk/Makefile Message-ID: Revision: 16403 http://gar.svn.sourceforge.net/gar/?rev=16403&view=rev Author: wahwah Date: 2011-12-08 08:17:46 +0000 (Thu, 08 Dec 2011) Log Message: ----------- gamin/trunk: cutting a dependency loop Modified Paths: -------------- csw/mgar/pkg/gamin/trunk/Makefile Modified: csw/mgar/pkg/gamin/trunk/Makefile =================================================================== --- csw/mgar/pkg/gamin/trunk/Makefile 2011-12-08 08:01:52 UTC (rev 16402) +++ csw/mgar/pkg/gamin/trunk/Makefile 2011-12-08 08:17:46 UTC (rev 16403) @@ -56,7 +56,7 @@ SPKG_DESC_CSWgamin = GAMIN file alteration monitor daemon (compatible to FAM) # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWgamin += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWgamin += CSWglib2 +RUNTIME_DEP_PKGS_CSWgamin += CSWlibglib2-0-0 OBSOLETED_BY_CSWgamin += CSWfam # For socket, recvmsg, connect 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 Dec 8 09:48:12 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 08 Dec 2011 08:48:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[16404] csw/mgar/pkg/gamin/trunk/Makefile Message-ID: Revision: 16404 http://gar.svn.sourceforge.net/gar/?rev=16404&view=rev Author: wahwah Date: 2011-12-08 08:48:12 +0000 (Thu, 08 Dec 2011) Log Message: ----------- when compiled on intel, gamin installs into python2.4 Modified Paths: -------------- csw/mgar/pkg/gamin/trunk/Makefile Modified: csw/mgar/pkg/gamin/trunk/Makefile =================================================================== --- csw/mgar/pkg/gamin/trunk/Makefile 2011-12-08 08:17:46 UTC (rev 16403) +++ csw/mgar/pkg/gamin/trunk/Makefile 2011-12-08 08:48:12 UTC (rev 16404) @@ -77,6 +77,7 @@ PYCOMPILE = 1 EXTRA_MERGE_EXCLUDE_FILES += .*\.pyo .*\.pyc EXTRA_PAX_ARGS += -s ,$(libdir)/python2.6/site-packages,$(libdir)/site-packages, +EXTRA_PAX_ARGS += -s ,$(libdir)/python2.4/site-packages,$(libdir)/site-packages, 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 Thu Dec 8 10:06:23 2011 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Thu, 08 Dec 2011 09:06:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[16405] csw/mgar/pkg/zsh/trunk Message-ID: Revision: 16405 http://gar.svn.sourceforge.net/gar/?rev=16405&view=rev Author: opk Date: 2011-12-08 09:06:23 +0000 (Thu, 08 Dec 2011) Log Message: ----------- update for zsh 4.3.14 Modified Paths: -------------- csw/mgar/pkg/zsh/trunk/Makefile csw/mgar/pkg/zsh/trunk/checksums Modified: csw/mgar/pkg/zsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/zsh/trunk/Makefile 2011-12-08 08:48:12 UTC (rev 16404) +++ csw/mgar/pkg/zsh/trunk/Makefile 2011-12-08 09:06:23 UTC (rev 16405) @@ -1,5 +1,5 @@ NAME = zsh -VERSION = 4.3.12 +VERSION = 4.3.14 CATEGORIES = devel DESCRIPTION = Powerful UNIX shell Modified: csw/mgar/pkg/zsh/trunk/checksums =================================================================== --- csw/mgar/pkg/zsh/trunk/checksums 2011-12-08 08:48:12 UTC (rev 16404) +++ csw/mgar/pkg/zsh/trunk/checksums 2011-12-08 09:06:23 UTC (rev 16405) @@ -1 +1 @@ -7a82c0bf0635e046ca4e9ec1bdef3811 zsh-4.3.12.tar.bz2 +1c819a3ff7302b42eba988e333e76109 zsh-4.3.14.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Dec 8 12:45:38 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 08 Dec 2011 11:45:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[16406] csw/mgar/pkg/manifold/trunk/Makefile Message-ID: Revision: 16406 http://gar.svn.sourceforge.net/gar/?rev=16406&view=rev Author: dmichelsen Date: 2011-12-08 11:45:38 +0000 (Thu, 08 Dec 2011) Log Message: ----------- manifold/trunk: Add required dependency to genshi Modified Paths: -------------- csw/mgar/pkg/manifold/trunk/Makefile Modified: csw/mgar/pkg/manifold/trunk/Makefile =================================================================== --- csw/mgar/pkg/manifold/trunk/Makefile 2011-12-08 09:06:23 UTC (rev 16405) +++ csw/mgar/pkg/manifold/trunk/Makefile 2011-12-08 11:45:38 UTC (rev 16406) @@ -19,6 +19,9 @@ PACKAGES += CSWmanifold SPKG_DESC_CSWmanifold = An SMF service manifest creation tool ARCHALL_CSWmanifold = 1 +# Python dependencies cannot be detected by checkpkg +RUNTIME_DEP_PKGS_CSWmanifold += CSWgenshi +CHECKPKG_OVERRIDES_CSWmanifold += surplus-dependency|CSWgenshi # That is the URL of the DTD to check against CHECKPKG_OVERRIDES_CSWmanifold += file-with-bad-content|/usr/share|root/opt/csw/lib/python/site-packages/manifold/manifold.py This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Dec 8 13:19:22 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 08 Dec 2011 12:19:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[16407] csw/mgar/pkg/gamin/trunk/Makefile Message-ID: Revision: 16407 http://gar.svn.sourceforge.net/gar/?rev=16407&view=rev Author: dmichelsen Date: 2011-12-08 12:19:22 +0000 (Thu, 08 Dec 2011) Log Message: ----------- gamin/trunk: Make sure to not pick up installed libs first Modified Paths: -------------- csw/mgar/pkg/gamin/trunk/Makefile Modified: csw/mgar/pkg/gamin/trunk/Makefile =================================================================== --- csw/mgar/pkg/gamin/trunk/Makefile 2011-12-08 11:45:38 UTC (rev 16406) +++ csw/mgar/pkg/gamin/trunk/Makefile 2011-12-08 12:19:22 UTC (rev 16407) @@ -60,7 +60,8 @@ OBSOLETED_BY_CSWgamin += CSWfam # For socket, recvmsg, connect -EXTRA_LINKER_FLAGS = -lsocket -lnsl +# Overwrite existing -L/opt/csw/lib or installed libs will be picked up first +LINKER_FLAGS = -lsocket -lnsl BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Dec 8 14:01:42 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 08 Dec 2011 13:01:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[16408] csw/mgar/pkg Message-ID: Revision: 16408 http://gar.svn.sourceforge.net/gar/?rev=16408&view=rev Author: dmichelsen Date: 2011-12-08 13:01:42 +0000 (Thu, 08 Dec 2011) Log Message: ----------- jed: Initial commit Added Paths: ----------- csw/mgar/pkg/jed/ csw/mgar/pkg/jed/Makefile csw/mgar/pkg/jed/branches/ csw/mgar/pkg/jed/tags/ csw/mgar/pkg/jed/trunk/ csw/mgar/pkg/jed/trunk/Makefile csw/mgar/pkg/jed/trunk/checksums csw/mgar/pkg/jed/trunk/files/ Added: csw/mgar/pkg/jed/Makefile =================================================================== --- csw/mgar/pkg/jed/Makefile (rev 0) +++ csw/mgar/pkg/jed/Makefile 2011-12-08 13:01:42 UTC (rev 16408) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/jed/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/jed/trunk/Makefile =================================================================== --- csw/mgar/pkg/jed/trunk/Makefile (rev 0) +++ csw/mgar/pkg/jed/trunk/Makefile 2011-12-08 13:01:42 UTC (rev 16408) @@ -0,0 +1,59 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = jed +MAJOR = 0.99 +MINOR = 19 +VERSION = 0.99.$(MINOR) +GARTYPE = v2 +CATEGORIES = apps + +DESCRIPTION = Editor based on slang +define BLURB +endef + +MASTER_SITES = ftp://space.mit.edu/pub/davis/jed/v$(VERSION)/ +DISTNAME = $(NAME)-$(MAJOR)-$(MINOR) +DISTFILES += $(DISTNAME).tar.bz2 + +VENDOR_URL = http://www.jedsoft.org/jed/ + +PACKAGES += CSWjed +SPKG_DESC_CSWjed = Editor based on slang +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWjed += CSWlibslang2 + +# These may or may not be bad and need more investigation +CHECKPKG_OVERRIDES_CSWjed += file-with-bad-content|/usr/local|root/opt/csw/share/jed/lib/compile.sl +CHECKPKG_OVERRIDES_CSWjed += file-with-bad-content|/usr/local|root/opt/csw/share/jed/lib/site.sl +CHECKPKG_OVERRIDES_CSWjed += file-with-bad-content|/usr/local|root/opt/csw/share/jed/doc/txt/script.txt +CHECKPKG_OVERRIDES_CSWjed += file-with-bad-content|/usr/local|root/opt/csw/share/jed/doc/manual/jed.tex +CHECKPKG_OVERRIDES_CSWjed += file-with-bad-content|/usr/share|root/opt/csw/share/jed/lib/site.sl + +PACKAGES += CSWxjed +SPKG_DESC_CSWxjed = The 'jed' editor with X11 bindings +PKGFILES_CSWxjed += $(bindir)/xjed +# There is lots of stuff in the base package we need +RUNTIME_DEP_PKGS_CSWxjed += CSWjed +CHECKPKG_OVERRIDES_CSWxjed += surplus-dependency|CSWjed +RUNTIME_DEP_PKGS_CSWxjed += CSWlibslang2 +RUNTIME_DEP_PKGS_CSWxjed += CSWlibxft2 + +# Relocate from /opt/csw/jed +EXTRA_CONFIGURE_EXPORTS = JED_ROOT +CONFIGURE_ENV_JED_ROOT = $(sharedstatedir)/jed + +CONFIGURE_ARGS += $(DIRPATHS) +CONFIGURE_ARGS += --with-x + +# GTK is not build by default, "cd src; gmake gtkjed" is missing +# The original package doesn't have this also, so skip for until requested. +#CONFIGURE_ARGS += --with-gtk=$(libdir)/pkgconfig + +BUILD_ARGS += all xjed + +# There is no testsuite +TEST_SCRIPTS = + +include gar/category.mk + Property changes on: csw/mgar/pkg/jed/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/jed/trunk/checksums =================================================================== --- csw/mgar/pkg/jed/trunk/checksums (rev 0) +++ csw/mgar/pkg/jed/trunk/checksums 2011-12-08 13:01:42 UTC (rev 16408) @@ -0,0 +1 @@ +c9b2f58a3defc6f61faa1ce7d6d629ea jed-0.99-19.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Dec 8 14:05:33 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 08 Dec 2011 13:05:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[16409] csw/mgar/pkg/jed/trunk/Makefile Message-ID: Revision: 16409 http://gar.svn.sourceforge.net/gar/?rev=16409&view=rev Author: dmichelsen Date: 2011-12-08 13:05:33 +0000 (Thu, 08 Dec 2011) Log Message: ----------- jed/trunk: Add build deps Modified Paths: -------------- csw/mgar/pkg/jed/trunk/Makefile Modified: csw/mgar/pkg/jed/trunk/Makefile =================================================================== --- csw/mgar/pkg/jed/trunk/Makefile 2011-12-08 13:01:42 UTC (rev 16408) +++ csw/mgar/pkg/jed/trunk/Makefile 2011-12-08 13:05:33 UTC (rev 16409) @@ -18,6 +18,9 @@ VENDOR_URL = http://www.jedsoft.org/jed/ +BUILD_DEP_PKGS += CSWlibslang-dev +BUILD_DEP_PKGS += CSWlibxft2devel + PACKAGES += CSWjed SPKG_DESC_CSWjed = Editor based on slang # PKGFILES is catchall This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Dec 8 16:20:39 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 08 Dec 2011 15:20:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[16410] csw/mgar/pkg/gnome-base/gnomevfs2 Message-ID: Revision: 16410 http://gar.svn.sourceforge.net/gar/?rev=16410&view=rev Author: dmichelsen Date: 2011-12-08 15:20:39 +0000 (Thu, 08 Dec 2011) Log Message: ----------- gnome-base/gnomevfs2: Move legacy/ to tags Added Paths: ----------- csw/mgar/pkg/gnome-base/gnomevfs2/tags/legacy/ Removed Paths: ------------- csw/mgar/pkg/gnome-base/gnomevfs2/trunk/legacy/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Thu Dec 8 17:15:55 2011 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Thu, 08 Dec 2011 16:15:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[16411] csw/mgar/pkg Message-ID: Revision: 16411 http://gar.svn.sourceforge.net/gar/?rev=16411&view=rev Author: d_pocock Date: 2011-12-08 16:15:55 +0000 (Thu, 08 Dec 2011) Log Message: ----------- ganglia-modules-solaris: Initial import for ganglia-modules-solaris Added Paths: ----------- csw/mgar/pkg/ganglia-modules-solaris/ csw/mgar/pkg/ganglia-modules-solaris/branches/ csw/mgar/pkg/ganglia-modules-solaris/tags/ csw/mgar/pkg/ganglia-modules-solaris/trunk/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Dec 8 17:28:50 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 08 Dec 2011 16:28:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[16412] csw/mgar/pkg/librsvg/trunk Message-ID: Revision: 16412 http://gar.svn.sourceforge.net/gar/?rev=16412&view=rev Author: dmichelsen Date: 2011-12-08 16:28:50 +0000 (Thu, 08 Dec 2011) Log Message: ----------- librsvg/trunk: Update to 2.35.0, dependencies, enable 64 bit Modified Paths: -------------- csw/mgar/pkg/librsvg/trunk/Makefile csw/mgar/pkg/librsvg/trunk/checksums Modified: csw/mgar/pkg/librsvg/trunk/Makefile =================================================================== --- csw/mgar/pkg/librsvg/trunk/Makefile 2011-12-08 16:15:55 UTC (rev 16411) +++ csw/mgar/pkg/librsvg/trunk/Makefile 2011-12-08 16:28:50 UTC (rev 16412) @@ -1,5 +1,5 @@ NAME = librsvg -VERSION = 2.34.0 +VERSION = 2.35.0 CATEGORIES = lib DESCRIPTION = Scalable Vector Graphics library @@ -18,21 +18,29 @@ LICENSE = COPYING.LIB +# We need the new glib only available on Solaris 10 +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 + +# TBD: There are more missing +BUILD_DEP_PKGS += CSWlibxml2-dev + PACKAGES += CSWlibrsvg2-2 SPKG_DESC_CSWlibrsvg2-2 = Scalable Vector Graphics library, librsvg-2.so.2 PKGFILES_CSWlibrsvg2-2 += $(call pkgfiles_lib,librsvg-2.so.2) -OBSOLETED_BY_CSWlibrsvg2-2 = CSWlibrsvg RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWpango RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWpng RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWgtk2 -RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibcairo -RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWftype2 RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibcroco -RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWfconfig RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibgsf -RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWglib2 +RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibglib2-0-0 +OBSOLETED_BY_CSWlibrsvg2-2 = CSWlibrsvg PACKAGES += CSWlibrsvg-dev SPKG_DESC_CSWlibrsvg-dev = Development files for librsvg-2.so.2 @@ -49,16 +57,19 @@ RUNTIME_DEP_PKGS_CSWrsvg += CSWlibrsvg2-2 RUNTIME_DEP_PKGS_CSWrsvg += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWrsvg += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWrsvg += CSWpng +RUNTIME_DEP_PKGS_CSWrsvg += CSWlibpng12-0 RUNTIME_DEP_PKGS_CSWrsvg += CSWftype2 -RUNTIME_DEP_PKGS_CSWrsvg += CSWlibcairo +RUNTIME_DEP_PKGS_CSWrsvg += CSWlibcairo2 RUNTIME_DEP_PKGS_CSWrsvg += CSWgtk2 -RUNTIME_DEP_PKGS_CSWrsvg += CSWlibatk +RUNTIME_DEP_PKGS_CSWrsvg += CSWlibatk1-0-0 RUNTIME_DEP_PKGS_CSWrsvg += CSWpango RUNTIME_DEP_PKGS_CSWrsvg += CSWlibcroco RUNTIME_DEP_PKGS_CSWrsvg += CSWfconfig -RUNTIME_DEP_PKGS_CSWrsvg += CSWlibgsf -RUNTIME_DEP_PKGS_CSWrsvg += CSWglib2 +RUNTIME_DEP_PKGS_CSWrsvg += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWrsvg += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWrsvg += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWrsvg += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWrsvg += CSWlibgio2-0-0 PACKAGES += CSWlibrsvg-gnome PKGFILES_CSWlibrsvg-gnome = $(libdir)/gtk-2.0/.* @@ -66,24 +77,27 @@ RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibrsvg2-2 RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWpango RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWpng +RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibpng12-0 RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWftype2 -RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibcairo +RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibcairo2 RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWgtk2 -RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibatk +RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibatk1-0-0 RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibcroco RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWfconfig -RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibgsf -RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWglib2 +RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibgio2-0-0 -BUILD_DEP_PKGS += CSWlibxml2-dev - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shared=yes --enable-static=no +# This causes an configure abort +CONFIGURE_ARGS += --disable-Bsymbolic -# Won't work until libgsf-1 is 64bit -# BUILD64 = 1 +BUILD64 = 1 +ISAEXEC = 1 STRIP_LIBTOOL = 1 Modified: csw/mgar/pkg/librsvg/trunk/checksums =================================================================== --- csw/mgar/pkg/librsvg/trunk/checksums 2011-12-08 16:15:55 UTC (rev 16411) +++ csw/mgar/pkg/librsvg/trunk/checksums 2011-12-08 16:28:50 UTC (rev 16412) @@ -1 +1 @@ -5eb2fcd0765aa5e47a4999985e3c27ab librsvg-2.34.0.tar.bz2 +59581f17a6d34d81b4d73872d1a9f01b librsvg-2.35.0.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Thu Dec 8 17:49:29 2011 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Thu, 08 Dec 2011 16:49:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[16413] csw/mgar/pkg/ganglia-modules-solaris/trunk/Makefile Message-ID: Revision: 16413 http://gar.svn.sourceforge.net/gar/?rev=16413&view=rev Author: d_pocock Date: 2011-12-08 16:49:29 +0000 (Thu, 08 Dec 2011) Log Message: ----------- ganglia-modules-solaris: initial import Added Paths: ----------- csw/mgar/pkg/ganglia-modules-solaris/trunk/Makefile Added: csw/mgar/pkg/ganglia-modules-solaris/trunk/Makefile =================================================================== --- csw/mgar/pkg/ganglia-modules-solaris/trunk/Makefile (rev 0) +++ csw/mgar/pkg/ganglia-modules-solaris/trunk/Makefile 2011-12-08 16:49:29 UTC (rev 16413) @@ -0,0 +1,59 @@ +NAME = ganglia-modules-solaris +VERSION = 1.0 +CATEGORIES = utils + +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + +# Hardwired to skip the tests +ifeq ($(VERSION),1.0) +#TEST_TARGET = check +TEST_SCRIPTS = +endif + +DESCRIPTION = Ganglia modules for IO and per-core CPU stats on Solaris +define BLURB + Ganglia is a distributed architecture for performance metrics. + These modules provide statistics from IO (disk) activity and + individual CPU cores. The IO module includes read and write + request rates, average service time and average wait time. +endef + +SF_PROJ = gmod-solaris +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES += $(PATCHFILES) +DISTNAME = $(NAME)-$(VERSION) + +EXTRA_DOCS = $(PATCHFILES) + +# We define upstream file regex so we can be notifed of new upstream software release +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 = + +BUILD64 = 1 + +BUILD_DEP_PKGS = CSWlibapr1-0 CSWganglia-dev + +RUNTIME_DEP_PKGS = CSWlibapr1-0 CSWgangliaagent CSWlibganglia0 + +PKGFILES = /opt/csw/lib/ganglia/mod_io.so +PKGFILES += /opt/csw/lib/ganglia/mod_multicpu.so +PKGFILES += /etc/opt/csw/ganglia/conf.d/mod_io.conf.CSW +PKGFILES += /etc/opt/csw/ganglia/conf.d/mod_multicpu.conf.CSW + +PRESERVECONF = /etc/opt/csw/ganglia/conf.d/mod_io.conf +PRESERVECONF += /etc/opt/csw/ganglia/conf.d/mod_multicpu.conf + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-shared --disable-nls + +include gar/category.mk + +post-install-modulated: + @ginstall -d $(DESTDIR)/etc/opt/csw/ganglia + cp $(WORKSRC)/conf.d/mod_io.conf $(DESTDIR)/etc/opt/csw/ganglia/mod_io.conf.CSW + cp $(WORKSRC)/conf.d/mod_multicpu.conf $(DESTDIR)/etc/opt/csw/ganglia/mod_multicpu.conf.CSW + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Thu Dec 8 17:50:25 2011 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Thu, 08 Dec 2011 16:50:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[16414] csw/mgar/pkg/ganglia-modules-solaris/trunk/Makefile Message-ID: Revision: 16414 http://gar.svn.sourceforge.net/gar/?rev=16414&view=rev Author: d_pocock Date: 2011-12-08 16:50:24 +0000 (Thu, 08 Dec 2011) Log Message: ----------- ganglia-modules-solaris: revise names of binaries Modified Paths: -------------- csw/mgar/pkg/ganglia-modules-solaris/trunk/Makefile Modified: csw/mgar/pkg/ganglia-modules-solaris/trunk/Makefile =================================================================== --- csw/mgar/pkg/ganglia-modules-solaris/trunk/Makefile 2011-12-08 16:49:29 UTC (rev 16413) +++ csw/mgar/pkg/ganglia-modules-solaris/trunk/Makefile 2011-12-08 16:50:24 UTC (rev 16414) @@ -39,8 +39,8 @@ RUNTIME_DEP_PKGS = CSWlibapr1-0 CSWgangliaagent CSWlibganglia0 -PKGFILES = /opt/csw/lib/ganglia/mod_io.so -PKGFILES += /opt/csw/lib/ganglia/mod_multicpu.so +PKGFILES = /opt/csw/lib/ganglia/modio.so +PKGFILES += /opt/csw/lib/ganglia/modmulticpu.so PKGFILES += /etc/opt/csw/ganglia/conf.d/mod_io.conf.CSW PKGFILES += /etc/opt/csw/ganglia/conf.d/mod_multicpu.conf.CSW This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Thu Dec 8 17:54:02 2011 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Thu, 08 Dec 2011 16:54:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[16415] csw/mgar/pkg/ganglia-modules-solaris/trunk/ checksums Message-ID: Revision: 16415 http://gar.svn.sourceforge.net/gar/?rev=16415&view=rev Author: d_pocock Date: 2011-12-08 16:54:01 +0000 (Thu, 08 Dec 2011) Log Message: ----------- ganglia-modules-solaris: add checksums Added Paths: ----------- csw/mgar/pkg/ganglia-modules-solaris/trunk/checksums Added: csw/mgar/pkg/ganglia-modules-solaris/trunk/checksums =================================================================== --- csw/mgar/pkg/ganglia-modules-solaris/trunk/checksums (rev 0) +++ csw/mgar/pkg/ganglia-modules-solaris/trunk/checksums 2011-12-08 16:54:01 UTC (rev 16415) @@ -0,0 +1 @@ +74310f94ebe6ba5c704768e9deffc259 ganglia-modules-solaris-1.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Thu Dec 8 17:58:53 2011 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Thu, 08 Dec 2011 16:58:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[16416] csw/mgar/pkg/ganglia-modules-solaris/trunk Message-ID: Revision: 16416 http://gar.svn.sourceforge.net/gar/?rev=16416&view=rev Author: d_pocock Date: 2011-12-08 16:58:53 +0000 (Thu, 08 Dec 2011) Log Message: ----------- ganglia-modules-solaris: add license Modified Paths: -------------- csw/mgar/pkg/ganglia-modules-solaris/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/ganglia-modules-solaris/trunk/files/ csw/mgar/pkg/ganglia-modules-solaris/trunk/files/COPYING Modified: csw/mgar/pkg/ganglia-modules-solaris/trunk/Makefile =================================================================== --- csw/mgar/pkg/ganglia-modules-solaris/trunk/Makefile 2011-12-08 16:54:01 UTC (rev 16415) +++ csw/mgar/pkg/ganglia-modules-solaris/trunk/Makefile 2011-12-08 16:58:53 UTC (rev 16416) @@ -22,6 +22,7 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += $(PATCHFILES) +DISTFILES += COPYING DISTNAME = $(NAME)-$(VERSION) EXTRA_DOCS = $(PATCHFILES) Added: csw/mgar/pkg/ganglia-modules-solaris/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/ganglia-modules-solaris/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/ganglia-modules-solaris/trunk/files/COPYING 2011-12-08 16:58:53 UTC (rev 16416) @@ -0,0 +1,4 @@ + + +GNU license + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Dec 8 18:17:16 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 08 Dec 2011 17:17:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[16417] csw/mgar/gar/v2 Message-ID: Revision: 16417 http://gar.svn.sourceforge.net/gar/?rev=16417&view=rev Author: dmichelsen Date: 2011-12-08 17:17:16 +0000 (Thu, 08 Dec 2011) Log Message: ----------- mGAR v2: Make sure EXTRA_MERGE_INCLUDE_FILES works again Modified Paths: -------------- csw/mgar/gar/v2/bin/pcopy csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/bin/pcopy =================================================================== --- csw/mgar/gar/v2/bin/pcopy 2011-12-08 16:58:53 UTC (rev 16416) +++ csw/mgar/gar/v2/bin/pcopy 2011-12-08 17:17:16 UTC (rev 16417) @@ -12,8 +12,9 @@ use Data::Dumper; -# pcopy [-s ]* [--paxargs ]* +# pcopy [-i ] [-s ]* [--paxargs ]* # Regex: -s 's,(/opt/csw/lib)/(.*\.so),\1/bdb33/\2,' +# -i Make sure to include this path, later exclusions or replacements to the empty name are ignored # Objectives: # - Copy directory trees verbatim # - exclude entries @@ -26,10 +27,11 @@ my $help = 0; my $verbose = 0; my $matchonly = 0; # Copy only files that match at least one regex -my @subst; +my (@subst, at incl); GetOptions( 's=s' => \@subst, + 'i=s' => \@incl, 'm|matchonly' => \$matchonly, 'v' => \$verbose, 'help|?' => \$help, @@ -70,6 +72,11 @@ my $target = $File::Find::name; my @matches = ($target); my $didmatch = 0; + + my $keepfile = 0; + foreach my $i (@incl) { + $keepfile = 1 if( $target =~ /$i/ ); + } foreach my $s (@subst) { my $t = $target; $s =~ s/p$//; @@ -77,6 +84,13 @@ $s =~ s/\\\)/)/; # print "Regex: $s\n"; eval( '$didmatch = 1 if( $target =~ s' . $s . ')'); + + # Undo deletions if we want to keep this file + if( $keepfile && $target eq '' ) { + $target = $t; + $keepfile = 2; + } + if( $t ne $target ) { push @matches, $target; #$didmatch = 1; @@ -87,7 +101,11 @@ return; } - print join( " >> ", @matches ), "\n" if( $matches[-1] ne '' ); + if( $matches[-1] ne '' ) { + print join( " >> ", @matches ); + print " (kept)" if( $keepfile == 2 ); + print "\n"; + } if( $target eq '' ) { return; Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2011-12-08 16:58:53 UTC (rev 16416) +++ csw/mgar/gar/v2/gar.mk 2011-12-08 17:17:16 UTC (rev 16417) @@ -820,7 +820,7 @@ # This variable contains parameter for pax to honor global file inclusion/exclusion # Make sure include overrides are processed first -_INC_EXT_RULE = $(foreach F,$(EXTRA_MERGE_INCLUDE_FILES) $(EXTRA_MERGE_INCLUDE_FILES_$(MODULATION)),-s ",^\(\.$F\)$$,\1,") +_INC_EXT_RULE = $(foreach F,$(EXTRA_MERGE_INCLUDE_FILES) $(EXTRA_MERGE_INCLUDE_FILES_$(MODULATION)),-i "^\.$F$$") # Exclude by replacing files with the empty string _INC_EXT_RULE += $(foreach F,$(_MERGE_EXCLUDE_FILES),-s ',^\.$F$$,,') # Replace files by itself terminating on first match @@ -945,7 +945,7 @@ # Copy merge-copy-config-only: - $(_DBG_MERGE)(cd $(INSTALLISADIR)$(if $(ALLOW_RELOCATE),$(RELOCATE_PREFIX)); umask 022 && pcopy $(_PAX_ARGS) \ + $(_DBG_MERGE)(cd $(INSTALLISADIR)$(if $(ALLOW_RELOCATE),$(RELOCATE_PREFIX)); umask 022 && pcopy \ -m -s ",^\(\.$(bindir)/.*-config\)\$$,\1,p" \ . $(PKGROOT) \ ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Dec 8 18:27:06 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 08 Dec 2011 17:27:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[16418] csw/mgar/pkg/gnome-base/orbit2/trunk/Makefile Message-ID: Revision: 16418 http://gar.svn.sourceforge.net/gar/?rev=16418&view=rev Author: dmichelsen Date: 2011-12-08 17:27:05 +0000 (Thu, 08 Dec 2011) Log Message: ----------- gnome-base/orbit2/trunk: Update dependencies Modified Paths: -------------- csw/mgar/pkg/gnome-base/orbit2/trunk/Makefile Modified: csw/mgar/pkg/gnome-base/orbit2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnome-base/orbit2/trunk/Makefile 2011-12-08 17:17:16 UTC (rev 16417) +++ csw/mgar/pkg/gnome-base/orbit2/trunk/Makefile 2011-12-08 17:27:05 UTC (rev 16418) @@ -13,13 +13,20 @@ PATCHFILES += 0001-Make-test-non-interactive-on-Solaris.patch +# New glib is only Solaris 10 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + +BUILD_DEP_PKGS += CSWlibidl-dev + PACKAGES = CSWorbit2 -CATALOGNAME = orbit2 +SPKG_DESC_CSWorbit2 = ORBit 2.x CORBA tools and libs +RUNTIME_DEP_PKGS_CSWorbit2 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWorbit2 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWorbit2 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWorbit2 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWorbit2 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWorbit2 += CSWlibidl2-0 -RUNTIME_DEP_PKGS += CSWlibintl8 -RUNTIME_DEP_PKGS += CSWglib2 -RUNTIME_DEP_PKGS += CSWlibidl - # No package split yet CHECKPKG_OVERRIDES_CSWorbit2 += shared-lib-pkgname-mismatch CHECKPKG_OVERRIDES_CSWorbit2 += shared-lib-package-contains-so-symlink @@ -30,8 +37,6 @@ CXXCPP = /usr/lib/cpp EXTRA_COMMON_EXPORTS = CPP CXXCPP -STRIP_LIBTOOL = 1 - BUILD64 = 1 EXTRA_MERGE_INCLUDE_FILES = $(libdir)/libname-server-2.a This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Dec 8 19:21:40 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 08 Dec 2011 18:21:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[16419] csw/mgar/pkg/dbus-glib/trunk Message-ID: Revision: 16419 http://gar.svn.sourceforge.net/gar/?rev=16419&view=rev Author: dmichelsen Date: 2011-12-08 18:21:40 +0000 (Thu, 08 Dec 2011) Log Message: ----------- dbus-glib/trunk: Update to 0.98, general rework Modified Paths: -------------- csw/mgar/pkg/dbus-glib/trunk/Makefile csw/mgar/pkg/dbus-glib/trunk/checksums Modified: csw/mgar/pkg/dbus-glib/trunk/Makefile =================================================================== --- csw/mgar/pkg/dbus-glib/trunk/Makefile 2011-12-08 17:27:05 UTC (rev 16418) +++ csw/mgar/pkg/dbus-glib/trunk/Makefile 2011-12-08 18:21:40 UTC (rev 16419) @@ -1,8 +1,8 @@ -NAME = dbus-glib -VERSION = 0.86 -CATEGORIES = lib +NAME = dbus-glib +VERSION = 0.98 +CATEGORIES = lib -DESCRIPTION = DBus GLib Bindings +DESCRIPTION = DBus GLib Bindings define BLURB This package provides the bindings between GLib and DBus. D-Bus is a message bus system, a simple way for applications to talk to one another. @@ -11,36 +11,51 @@ and to launch applications and daemons on demand when their services are needed. endef -MASTER_SITES = http://dbus.freedesktop.org/releases/dbus-glib/ -DISTFILES = $(NAME)-$(VERSION).tar.gz -PKGDIST = $(DISTFILE) +MASTER_SITES = http://dbus.freedesktop.org/releases/dbus-glib/ +DISTFILES = $(DISTNAME).tar.gz -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +# New glib is Solaris 10 only +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 -SPKG_DESC_CSWdbusglib = $(DESCRIPTION) -SPKG_DESC_CSWdbusglibdev = $(DESCRIPTION) development package +BUILD_DEP_PKGS += CSWlibglib2-dev +BUILD_DEP_PKGS += CSWlibdbus-dev -PACKAGES = CSWdbusglib CSWdbusglibdev +PACKAGES += CSWlibdbus-glib1-2 +SPKG_DESC_CSWlibdbus-glib1-2 = DBus glib bindings +PKGFILES_CSWlibdbus-glib1-2 += $(call pkgfiles_lib,libdbus-glib-1.so.2) +RUNTIME_DEP_PKGS_CSWlibdbus-glib1-2 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibdbus-glib1-2 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibdbus-glib1-2 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibdbus-glib1-2 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibdbus-glib1-2 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibdbus-glib1-2 += CSWlibdbus1-3 +RUNTIME_DEP_PKGS_CSWlibdbus-glib1-2 += CSWlibgio2-0-0 +OBSOLETED_BY_CSWlibdbus-glib1-2 += CSWdbusglib +CATALOGNAME_CSWdbusglib = dbus_glib_stub -CATALOGNAME_CSWdbusglib = dbus_glib -CATALOGNAME_CSWdbusglibdev = dbus_glibdev +PACKAGES += CSWlibdbus-glib-dev +SPKG_DESC_CSWlibdbus-glib-dev = Development files for libdbus-glib-1.so.2 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibdbus-glib-dev += CSWlibdbus-glib1-2 +RUNTIME_DEP_PKGS_CSWlibdbus-glib-dev += CSWlibglib2-dev +RUNTIME_DEP_PKGS_CSWlibdbus-glib-dev += CSWlibdbus-dev +RUNTIME_DEP_PKGS_CSWlibdbus-glib-dev += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibdbus-glib-dev += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibdbus-glib-dev += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibdbus-glib-dev += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibdbus-glib-dev += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWlibdbus-glib-dev += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibdbus-glib-dev += CSWlibdbus1-3 +RUNTIME_DEP_PKGS_CSWlibdbus-glib-dev += CSWlibglib2-0-0 +OBSOLETED_BY_CSWlibdbus-glib-dev += CSWdbusglibdev +CATALOGNAME_CSWdbusglibdev = dbus_glibdev_stub -BUILD_DEP_PKGS = CSWglib2devel CSWlibdbusdev -RUNTIME_DEP_PKGS_CSWdbusglib = CSWexpat CSWggettextrt CSWglib2 CSWlibdbus -RUNTIME_DEP_PKGS_CSWdbusglibdev = CSWdbusglib CSWglib2devel CSWlibdbusdev +# These are docs only, ignore for now +CHECKPKG_OVERRIDES_CSWlibdbus-glib-dev += file-with-bad-content|/usr/share|root/opt/csw/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGMethod.html +CHECKPKG_OVERRIDES_CSWlibdbus-glib-dev += file-with-bad-content|/usr/share|root/opt/csw/share/gtk-doc/html/dbus-glib/dbus-glib-DBus-GObject-related-functions.html +CHECKPKG_OVERRIDES_CSWlibdbus-glib-dev += file-with-bad-content|/usr/share|root/opt/csw/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html -PKGFILES_CSWdbusglibdev = $(PKGFILES_DEVEL) - -NOISAEXEC = 1 -CONFIGURE_ARGS = $(DIRPATHS) - BUILD64 = 1 -# These development dependencies are needed -CHECKPKG_OVERRIDES_CSWdbusglibdev += surplus-dependency|CSWdbusglib -CHECKPKG_OVERRIDES_CSWdbusglibdev += surplus-dependency|CSWlibdbusdev -CHECKPKG_OVERRIDES_CSWdbusglibdev += surplus-dependency|CSWglib2devel - include gar/category.mk Modified: csw/mgar/pkg/dbus-glib/trunk/checksums =================================================================== --- csw/mgar/pkg/dbus-glib/trunk/checksums 2011-12-08 17:27:05 UTC (rev 16418) +++ csw/mgar/pkg/dbus-glib/trunk/checksums 2011-12-08 18:21:40 UTC (rev 16419) @@ -1 +1 @@ -cd0ab148fb0c786fc88be49d19971f50 dbus-glib-0.86.tar.gz +3f7f117dc7c8d899d9acfdcbf9253fb8 dbus-glib-0.98.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 Dec 8 19:26:24 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 08 Dec 2011 18:26:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[16420] csw/mgar/pkg/gnome-base/orbit2/trunk/Makefile Message-ID: Revision: 16420 http://gar.svn.sourceforge.net/gar/?rev=16420&view=rev Author: dmichelsen Date: 2011-12-08 18:26:24 +0000 (Thu, 08 Dec 2011) Log Message: ----------- gnome-base/orbit2/trunk: Add config-binaries for 64 bit Modified Paths: -------------- csw/mgar/pkg/gnome-base/orbit2/trunk/Makefile Modified: csw/mgar/pkg/gnome-base/orbit2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnome-base/orbit2/trunk/Makefile 2011-12-08 18:21:40 UTC (rev 16419) +++ csw/mgar/pkg/gnome-base/orbit2/trunk/Makefile 2011-12-08 18:26:24 UTC (rev 16420) @@ -40,5 +40,6 @@ BUILD64 = 1 EXTRA_MERGE_INCLUDE_FILES = $(libdir)/libname-server-2.a +EXTRA_MERGE_DIRS_isa-extra = $(bindir) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Dec 8 19:59:20 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 08 Dec 2011 18:59:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[16421] csw/mgar/pkg/gnome-base/gconf2/trunk Message-ID: Revision: 16421 http://gar.svn.sourceforge.net/gar/?rev=16421&view=rev Author: dmichelsen Date: 2011-12-08 18:59:20 +0000 (Thu, 08 Dec 2011) Log Message: ----------- gnome-base/gconf2/trunk: Update to 2.32.4, complete rework Modified Paths: -------------- csw/mgar/pkg/gnome-base/gconf2/trunk/Makefile csw/mgar/pkg/gnome-base/gconf2/trunk/checksums Modified: csw/mgar/pkg/gnome-base/gconf2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnome-base/gconf2/trunk/Makefile 2011-12-08 18:26:24 UTC (rev 16420) +++ csw/mgar/pkg/gnome-base/gconf2/trunk/Makefile 2011-12-08 18:59:20 UTC (rev 16421) @@ -1,6 +1,5 @@ NAME = gconf2 -GNOME_PROJ = GConf -VERSION = 2.28.1 +VERSION = 2.32.4 CATEGORIES = apps DESCRIPTION = GNOME configuration database system @@ -10,40 +9,63 @@ arbitrary data storage. endef +GNOME_PROJ = GConf MASTER_SITES = $(GNOME_MIRROR) DISTNAME = GConf-$(VERSION) -DISTFILES = $(DISTNAME).tar.bz2 +DISTFILES += $(DISTNAME).tar.bz2 -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 +# New glib is only available for Solaris 10 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 -SPKG_SOURCEURL = http://projects.gnome.org/gconf/ +VENDOR_URL = http://projects.gnome.org/gconf/ +# Many more missing +BUILD_DEP_PKGS += CSWlibdbus-glib-dev -#Normally, woudl split out doc. but the doc part is tiny compared -# to the rest of it, so makes no sense. -# -##PACKAGES=CSWgconf2 CSWgconf2doc -##SPKG_DESC_CSWgconf2doc = Documentation for gconf2 -##PKGFILES_CSWgconf2doc = $(sharedstatedir)/gtk-doc/.* +PACKAGES += CSWlibgconf2-4 +SPKG_DESC_CSWlibgconf2-4 = GNOME configuration database system, libgconf-2.so.4 +PKGFILES_CSWlibgconf2-4 += $(call pkgfiles_lib,libgconf-2.so.4) +PKGFILES_CSWlibgconf2-4 += $(call baseisadirs,$(libdir),GConf/2/.*) +PKGFILES_CSWlibgconf2-4 += $(sharedstatedir)/locale/.*\.mo +PKGFILES_CSWlibgconf2-4 += $(sysconfdir)/gconf/.* +RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWorbit2 +RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWoldaprt +RUNTIME_DEP_PKGS_CSWlibgconf2-4 += CSWlibgio2-0-0 +OBSOLETED_BY_CSWlibgconf2-4 += CSWgconf2 -RUNTIME_DEP_PKGS_CSWgconf2 += CSWfconfig CSWftype2 CSWggettextrt CSWglib2 -RUNTIME_DEP_PKGS_CSWgconf2 += CSWgtk2 CSWlibcairo CSWlibxml2 -RUNTIME_DEP_PKGS_CSWgconf2 += CSWorbit2 CSWpango -# Arg it's absurd gconf is this complex... -RUNTIME_DEP_PKGS_CSWgconf2 += CSWlibdbus CSWdbusglib CSWlibatk +PACKAGES += CSWlibgconf-dev +SPKG_DESC_CSWlibgconf-dev = Development files for libgconf-2.so.4 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibgconf-dev += CSWorbit2 +RUNTIME_DEP_PKGS_CSWlibgconf-dev += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibgconf-dev += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibgconf-dev += CSWlibgconf2-4 +RUNTIME_DEP_PKGS_CSWlibgconf-dev += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgconf-dev += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibgconf-dev += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibgconf-dev += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWlibgconf-dev += CSWlibdbus-glib1-2 +RUNTIME_DEP_PKGS_CSWlibgconf-dev += CSWlibdbus1-3 +RUNTIME_DEP_PKGS_CSWlibgconf-dev += CSWlibgio2-0-0 +# man-page only, override for now +CHECKPKG_OVERRIDES_CSWlibgconf-dev += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/gsettings-data-convert.1 -#BUILD64 = 1 -#NOISAEXEC = 1 +BUILD64 = 1 -TEST_TARGET = check - STRIP_LIBTOOL = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-static=no CONFIGURE_ARGS += --enable-gtk-doc -CONFIGURE_ARGS += --disable-defaults-service + +# CONFIGURE_ARGS += --disable-defaults-service #The "defaults service" requires polkit. and dbus. #We're better off without em. Modified: csw/mgar/pkg/gnome-base/gconf2/trunk/checksums =================================================================== --- csw/mgar/pkg/gnome-base/gconf2/trunk/checksums 2011-12-08 18:26:24 UTC (rev 16420) +++ csw/mgar/pkg/gnome-base/gconf2/trunk/checksums 2011-12-08 18:59:20 UTC (rev 16421) @@ -1 +1 @@ -27663faf0af4f6a6d534de9270f6d24a GConf-2.28.1.tar.bz2 +b4475bb58c51ca59c7781cd95b302c13 GConf-2.32.4.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Dec 8 20:06:52 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 08 Dec 2011 19:06:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[16422] csw/mgar/pkg/libgegl/trunk Message-ID: Revision: 16422 http://gar.svn.sourceforge.net/gar/?rev=16422&view=rev Author: dmichelsen Date: 2011-12-08 19:06:51 +0000 (Thu, 08 Dec 2011) Log Message: ----------- libgegl/trunk: Complete rework Modified Paths: -------------- csw/mgar/pkg/libgegl/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/libgegl/trunk/files/0001-Enforce-array-size-even-if-zero-length.patch csw/mgar/pkg/libgegl/trunk/files/0002-Keep-norunpath-during-linkage.patch Removed Paths: ------------- csw/mgar/pkg/libgegl/trunk/files/0001-Use-inttypes.h-if-stdint.h-is-not-available.patch csw/mgar/pkg/libgegl/trunk/files/patch-xml_insert.sh Modified: csw/mgar/pkg/libgegl/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgegl/trunk/Makefile 2011-12-08 18:59:20 UTC (rev 16421) +++ csw/mgar/pkg/libgegl/trunk/Makefile 2011-12-08 19:06:51 UTC (rev 16422) @@ -9,13 +9,16 @@ MASTER_SITES = http://ftp.gtk.org/pub/gegl/$(shell echo $(VERSION) | awk -F. '{print $$1"."$$2}')/ DISTFILES += $(NAME)-$(VERSION).tar.bz2 +PATCHFILES += 0001-Enforce-array-size-even-if-zero-length.patch +PATCHFILES += 0002-Keep-norunpath-during-linkage.patch + PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 VENDOR_URL = http://gegl.org/ BUILD_DEP_PKGS += CSWlibpng-dev BUILD_DEP_PKGS += CSWlibrsvg-dev -BUILD_DEP_PKGS += CSWlibsdldevel +BUILD_DEP_PKGS += CSWlibsdl-dev BUILD_DEP_PKGS += CSWasciidoc BUILD_DEP_PKGS += CSWlua @@ -24,13 +27,23 @@ PKGFILES_CSWlibgegl0-1-0 += $(call pkgfiles_lib,libgegl-0.1.so.0) PKGFILES_CSWlibgegl0-1-0 += $(call baseisadirs,$(libdir),gegl-0.1/.*) RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibpng12-0 -RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibsdl +RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibsdl1-2-0 RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibbabl0-1-0 RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWjasper RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWgtk2 -RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibjpeg62 -RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWglib2 +RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibrsvg2-2 +RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWilmbase +RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWpango +RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWopenexrrt +RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibgio2-0-0 OBSOLETED_BY_CSWlibgegl0-1-0 += CSWlibgegl PACKAGES += CSWlibgegl-dev @@ -45,8 +58,22 @@ RUNTIME_DEP_PKGS_CSWgegl += CSWlibbabl0-1-0 RUNTIME_DEP_PKGS_CSWgegl += CSWlibgegl0-1-0 RUNTIME_DEP_PKGS_CSWgegl += CSWlibpng12-0 -RUNTIME_DEP_PKGS_CSWgegl += CSWglib2 +RUNTIME_DEP_PKGS_CSWgegl += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWgegl += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWgegl += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWgegl += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWgegl += CSWlibgmodule2-0-0 +# There are zero-sized structs/unions used +EXTRA_CXXFLAGS += -features=extensions +EXTRA_CXXFLAGS += -features=zla -feat +EXTRA_CXXFLAGS += -norunpath + +# We don't need it and if defined the test breaks +LD_OPTIONS = +EXTRA_LINKER_FLAGS += $(RUNPATH_LINKER_FLAGS) + +# librsvg is missing BUILD64 = 1 ISAEXEC = 1 Added: csw/mgar/pkg/libgegl/trunk/files/0001-Enforce-array-size-even-if-zero-length.patch =================================================================== --- csw/mgar/pkg/libgegl/trunk/files/0001-Enforce-array-size-even-if-zero-length.patch (rev 0) +++ csw/mgar/pkg/libgegl/trunk/files/0001-Enforce-array-size-even-if-zero-length.patch 2011-12-08 19:06:51 UTC (rev 16422) @@ -0,0 +1,25 @@ +From 12bba7cb6c0d79a212452ab0470c288a8b55fdec Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 8 Dec 2011 14:55:12 +0100 +Subject: [PATCH] Enforce array size, even if zero length + +--- + gegl/gegl-lookup.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/gegl/gegl-lookup.h b/gegl/gegl-lookup.h +index d1e239f..940690d 100644 +--- a/gegl/gegl-lookup.h ++++ b/gegl/gegl-lookup.h +@@ -33,7 +33,7 @@ typedef struct GeglLookup + gint shift; + guint32 positive_min, positive_max, negative_min, negative_max; + guint32 bitmask[GEGL_LOOKUP_MAX_ENTRIES/32]; +- gfloat table[]; ++ gfloat table[0]; + } GeglLookup; + + +-- +1.7.5.4 + Deleted: csw/mgar/pkg/libgegl/trunk/files/0001-Use-inttypes.h-if-stdint.h-is-not-available.patch =================================================================== --- csw/mgar/pkg/libgegl/trunk/files/0001-Use-inttypes.h-if-stdint.h-is-not-available.patch 2011-12-08 18:59:20 UTC (rev 16421) +++ csw/mgar/pkg/libgegl/trunk/files/0001-Use-inttypes.h-if-stdint.h-is-not-available.patch 2011-12-08 19:06:51 UTC (rev 16422) @@ -1,113 +0,0 @@ -From 2aebaf7b99852121d4314ea77f20b395f959d9f3 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Fri, 25 Nov 2011 11:35:09 +0100 -Subject: [PATCH] Use inttypes.h if stdint.h is not available - ---- - babl/babl-memory.c | 4 ++++ - babl/babl-mutex.c | 4 ++++ - babl/base/type-u16.c | 4 ++++ - babl/base/type-u32.c | 4 ++++ - babl/base/type-u8.c | 4 ++++ - extensions/sse-fixups.c | 4 ++++ - 6 files changed, 24 insertions(+), 0 deletions(-) - -diff --git a/babl/babl-memory.c b/babl/babl-memory.c -index 6ceca90..799e91d 100644 ---- a/babl/babl-memory.c -+++ b/babl/babl-memory.c -@@ -17,7 +17,11 @@ - */ - - #include "config.h" -+#ifdef HAVE_STDINT_H - #include -+#elif defined(HAVE_INTTYPES_H) -+#include -+#endif - #include - #include - #include -diff --git a/babl/babl-mutex.c b/babl/babl-mutex.c -index 3f82cc5..dce124b 100644 ---- a/babl/babl-mutex.c -+++ b/babl/babl-mutex.c -@@ -17,7 +17,11 @@ - */ - - #include "config.h" -+#ifdef HAVE_STDINT_H - #include -+#elif defined(HAVE_INTTYPES_H) -+#include -+#endif - #include - #include - #include -diff --git a/babl/base/type-u16.c b/babl/base/type-u16.c -index 9fcad8b..7f1926a 100644 ---- a/babl/base/type-u16.c -+++ b/babl/base/type-u16.c -@@ -18,7 +18,11 @@ - - #include "config.h" - #include -+#ifdef HAVE_STDINT_H - #include -+#elif defined(HAVE_INTTYPES_H) -+#include -+#endif - #include - #include - -diff --git a/babl/base/type-u32.c b/babl/base/type-u32.c -index fc38a01..6a31e8b 100644 ---- a/babl/base/type-u32.c -+++ b/babl/base/type-u32.c -@@ -18,7 +18,11 @@ - - #include "config.h" - #include -+#ifdef HAVE_STDINT_H - #include -+#elif defined(HAVE_INTTYPES_H) -+#include -+#endif - #include - #include - -diff --git a/babl/base/type-u8.c b/babl/base/type-u8.c -index 9a67a0e..d4f804e 100644 ---- a/babl/base/type-u8.c -+++ b/babl/base/type-u8.c -@@ -19,7 +19,11 @@ - #include "config.h" - #include - #include -+#ifdef HAVE_STDINT_H - #include -+#elif defined(HAVE_INTTYPES_H) -+#include -+#endif - - #include "babl-internal.h" - #include "babl-base.h" -diff --git a/extensions/sse-fixups.c b/extensions/sse-fixups.c -index 96c2585..7c98969 100644 ---- a/extensions/sse-fixups.c -+++ b/extensions/sse-fixups.c -@@ -23,7 +23,11 @@ - - #if defined(__GNUC__) && (__GNUC__ >= 4) && defined(USE_SSE) && defined(USE_MMX) - -+#ifdef HAVE_STDINT_H - #include -+#elif defined(HAVE_INTTYPES_H) -+#include -+#endif - #include - - #include "babl.h" --- -1.7.6.1 - Added: csw/mgar/pkg/libgegl/trunk/files/0002-Keep-norunpath-during-linkage.patch =================================================================== --- csw/mgar/pkg/libgegl/trunk/files/0002-Keep-norunpath-during-linkage.patch (rev 0) +++ csw/mgar/pkg/libgegl/trunk/files/0002-Keep-norunpath-during-linkage.patch 2011-12-08 19:06:51 UTC (rev 16422) @@ -0,0 +1,25 @@ +From 6e9141101cbe79f728e2a93c315fb5e5b63cf8dd Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 8 Dec 2011 18:34:01 +0100 +Subject: [PATCH] Keep -norunpath during linkage + +--- + ltmain.sh | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/ltmain.sh b/ltmain.sh +index c7d06c3..4e4e214 100644 +--- a/ltmain.sh ++++ b/ltmain.sh +@@ -5853,7 +5853,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=*|--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.6.1 + Deleted: csw/mgar/pkg/libgegl/trunk/files/patch-xml_insert.sh =================================================================== --- csw/mgar/pkg/libgegl/trunk/files/patch-xml_insert.sh 2011-12-08 18:59:20 UTC (rev 16421) +++ csw/mgar/pkg/libgegl/trunk/files/patch-xml_insert.sh 2011-12-08 19:06:51 UTC (rev 16422) @@ -1,40 +0,0 @@ ---- babl-0.1.2.orig/docs/tools/xml_insert.sh 2009-09-25 18:14:41.000000000 +0200 -+++ babl-0.1.2/docs/tools/xml_insert.sh 2010-02-18 13:57:12.000000000 +0100 -@@ -11,7 +11,7 @@ - # - # FIXME: add argument checking / error handling - --: ${AWK="awk"} -+: ${AWK="nawk"} - : ${ECHO="echo"} - : ${MKDIR="mkdir"} - : ${SED="sed"} -@@ -84,8 +84,27 @@ - - $ECHO "X$my_tmpdir" | $Xsed - } -+# tmp_dir="`func_mktempdir`" -+ -+func_perlfunc_mktempdir () -+{ -+ my_template="${TMPDIR-/tmp}/${1-$progname}" -+ if test "$opt_dry_run" = ":"; then -+ # Return a directory name, but don't create it in dry-run mode -+ my_tmpdir="${my_template}-$$" -+ else -+ my_template="${my_template}-XXXXXXXX" -+ my_tmpdir=`/opt/csw/bin/perl -e 'use File::Temp qw/ :mktemp /; print mkdtemp("'${my_template}'")."\n"'` -+ if test ! -d "$my_tmpdir"; then -+ func_fatal_error "cannot create temporary directory \`$my_tmpdir'" -+ fi -+ -+ fi -+ -+ $ECHO "X$my_tmpdir" | $Xsed -+} -+tmp_dir="`func_perlfunc_mktempdir`" - --tmp_dir="`func_mktempdir`" - tmp_file="$tmp_dir/one" - - cp $1 $tmp_file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Fri Dec 9 08:58:12 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Fri, 09 Dec 2011 07:58:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[16423] csw/mgar/pkg/glib2/trunk/Makefile Message-ID: Revision: 16423 http://gar.svn.sourceforge.net/gar/?rev=16423&view=rev Author: guengel Date: 2011-12-09 07:58:11 +0000 (Fri, 09 Dec 2011) Log Message: ----------- glib2/trunk: Moved stray bash_completion.d to $(sysconfdir) Modified Paths: -------------- csw/mgar/pkg/glib2/trunk/Makefile Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2011-12-08 19:06:51 UTC (rev 16422) +++ csw/mgar/pkg/glib2/trunk/Makefile 2011-12-09 07:58:11 UTC (rev 16423) @@ -235,3 +235,10 @@ done ; \ fi ; \ done + +post-merge: + if [ -d $(PKGROOT)$(prefix)/bash_completion.d ] ; \ + then \ + ginstall -d $(PKGROOT)$(sysconfdir) ;\ + mv $(PKGROOT)$(prefix)/bash_completion.d $(PKGROOT)$(sysconfdir)/ ;\ + fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Fri Dec 9 09:12:21 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Fri, 09 Dec 2011 08:12:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[16424] csw/mgar/pkg/glib2/trunk/Makefile Message-ID: Revision: 16424 http://gar.svn.sourceforge.net/gar/?rev=16424&view=rev Author: guengel Date: 2011-12-09 08:12:21 +0000 (Fri, 09 Dec 2011) Log Message: ----------- glib2/trunk: Split off the gio fam backend Modified Paths: -------------- csw/mgar/pkg/glib2/trunk/Makefile Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2011-12-09 07:58:11 UTC (rev 16423) +++ csw/mgar/pkg/glib2/trunk/Makefile 2011-12-09 08:12:21 UTC (rev 16424) @@ -66,10 +66,6 @@ RUNTIME_DEP_PKGS_CSWglib2 += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWglib2 += CSWlibz1 RUNTIME_DEP_PKGS_CSWglib2 += CSWlibintl8 -# The dependency on CSWgamin creates a dependency loop. Whatever the current -# solution is, we need to cut the loop somewhere, and we'll cut the loop here -# for the time being. -# RUNTIME_DEP_PKGS_CSWglib2 += CSWgamin # Did not see any runtime dependency #RUNTIME_DEP_PKGS_CSWglib2 += CSWpython RUNTIME_DEP_PKGS_CSWglib2 += CSWlibgobject2-0-0 @@ -80,9 +76,14 @@ ## No package split yet #CHECKPKG_OVERRIDES_CSWglib2 += non-uniform-lib-versions-in-package +PACKAGES += CSWgio-fam-backend +SPKG_DESC_CSWgio-fam-backend = $(DESCRIPTION), GIO FAM backend +PKGFILES_CSWgio-fam-backend = .*/libgiofam.so +RUNTIME_DEP_PKGS_CSWgio-fam-backend = CSWlibfam0 + PACKAGES += CSWlibgio2-0-0 +SPKG_DESC_CSWlibgio2-0-0 += $(DESCRIPTION), libgio-2.0.so.0 PKGFILES_CSWlibgio2-0-0 += $(call pkgfiles_lib,libgio-2.0.so.0) -SPKG_DESC_CSWlibgio2-0-0 += $(DESCRIPTION), libgio-2.0.so.0 RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += CSWlibgthread2-0-0 RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += CSWlibgmodule2-0-0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Fri Dec 9 09:21:47 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Fri, 09 Dec 2011 08:21:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[16425] csw/mgar/pkg/glib2/trunk/Makefile Message-ID: Revision: 16425 http://gar.svn.sourceforge.net/gar/?rev=16425&view=rev Author: guengel Date: 2011-12-09 08:21:47 +0000 (Fri, 09 Dec 2011) Log Message: ----------- glib2/trunk: Updated dependency on CSWglib2 (->CSWgio-fam-backend). Modified Paths: -------------- csw/mgar/pkg/glib2/trunk/Makefile Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2011-12-09 08:12:21 UTC (rev 16424) +++ csw/mgar/pkg/glib2/trunk/Makefile 2011-12-09 08:21:47 UTC (rev 16425) @@ -73,6 +73,7 @@ #RUNTIME_DEP_PKGS_CSWglib2 += CSWlibffi5 RUNTIME_DEP_PKGS_CSWglib2 += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWglib2 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWglib2 += CSWgio-fam-backend ## No package split yet #CHECKPKG_OVERRIDES_CSWglib2 += non-uniform-lib-versions-in-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 Fri Dec 9 09:21:56 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Dec 2011 08:21:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[16426] csw/mgar/pkg/gnome-base/libbonobo2/trunk Message-ID: Revision: 16426 http://gar.svn.sourceforge.net/gar/?rev=16426&view=rev Author: dmichelsen Date: 2011-12-09 08:21:56 +0000 (Fri, 09 Dec 2011) Log Message: ----------- gnome-base/libbonobo2/trunk: Update to 2.32.1, complete rework Modified Paths: -------------- csw/mgar/pkg/gnome-base/libbonobo2/trunk/Makefile csw/mgar/pkg/gnome-base/libbonobo2/trunk/checksums Added Paths: ----------- csw/mgar/pkg/gnome-base/libbonobo2/trunk/files/0001-Use-bash-on-test.patch Modified: csw/mgar/pkg/gnome-base/libbonobo2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnome-base/libbonobo2/trunk/Makefile 2011-12-09 08:21:47 UTC (rev 16425) +++ csw/mgar/pkg/gnome-base/libbonobo2/trunk/Makefile 2011-12-09 08:21:56 UTC (rev 16426) @@ -1,5 +1,5 @@ NAME = libbonobo -VERSION = 2.24.2 +VERSION = 2.32.1 CATEGORIES = gnome DESCRIPTION = GNOME component and compound document system @@ -8,45 +8,25 @@ VENDOR_URL = http://live.gnome.org/Bonobo MASTER_SITES = $(GNOME_MIRROR) -DISTFILES = $(NAME)-$(VERSION).tar.bz2 +DISTFILES = $(DISTNAME).tar.bz2 -PACKAGES = CSWlibbonobo CSWlibbonobo2 -CATALOGNAME_CSWlibbonobo = libbonobo -CATALOGNAME_CSWlibbonobo2 = libbonobo2 -SPKG_DESC_CSWlibbonobo = $(DESCRIPTION) -SPKG_DESC_CSWlibbonobo2 = $(DESCRIPTION) - stub package for legacy +PATCHFILES += 0001-Use-bash-on-test.patch -RUNTIME_DEP_PKGS_CSWlibbonobo += CSWdbusglib -RUNTIME_DEP_PKGS_CSWlibbonobo += CSWggettextrt -RUNTIME_DEP_PKGS_CSWlibbonobo += CSWglib2 -RUNTIME_DEP_PKGS_CSWlibbonobo += CSWlibdbus -RUNTIME_DEP_PKGS_CSWlibbonobo += CSWlibxml2 -RUNTIME_DEP_PKGS_CSWlibbonobo += CSWorbit2 +# New glib2 is only available on Solaris 10 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +PACKAGES += CSWlibbonobo2 +SPKG_DESC_CSWlibbonobo2 = GNOME component and compound document system +RUNTIME_DEP_PKGS_CSWlibbonobo2 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibbonobo2 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibbonobo2 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibbonobo2 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibbonobo2 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibbonobo2 += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWlibbonobo2 += CSWlibgio2-0-0 -# Create a empty libbonobo2 packaage just for legacy purpose -RUNTIME_DEP_PKGS_CSWlibbonobo2 += CSWlibbonobo -PKGFILES_CSWlibbonobo2 = no files -ARCHALL_CSWlibbonobo2 = 1 -CHECKPKG_OVERRIDES_CSWlibbonobo2 += surplus-dependency|CSWlibbonobo +BUILD64 = 1 -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - -#BUILD64 = 1 - -EXTRA_INC = $(prefix)/X11/include -EXTRA_LIB = $(prefix)/X11/lib -EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) - -CONFIGURE_ARGS = $(DIRPATHS) - -# Tests fail for som unknown reason -#TEST_TARGET = check -TEST_TARGET = - - CPP = /usr/lib/cpp EXTRA_COMMON_EXPORTS += CPP CXXCPP = /usr/lib/cpp Modified: csw/mgar/pkg/gnome-base/libbonobo2/trunk/checksums =================================================================== --- csw/mgar/pkg/gnome-base/libbonobo2/trunk/checksums 2011-12-09 08:21:47 UTC (rev 16425) +++ csw/mgar/pkg/gnome-base/libbonobo2/trunk/checksums 2011-12-09 08:21:56 UTC (rev 16426) @@ -1 +1 @@ -5c7c5ea9c2f78a3c1e9ff2f1e27ad751 libbonobo-2.24.2.tar.bz2 +27fa902d4fdf6762ee010e7053aaf77b libbonobo-2.32.1.tar.bz2 Added: csw/mgar/pkg/gnome-base/libbonobo2/trunk/files/0001-Use-bash-on-test.patch =================================================================== --- csw/mgar/pkg/gnome-base/libbonobo2/trunk/files/0001-Use-bash-on-test.patch (rev 0) +++ csw/mgar/pkg/gnome-base/libbonobo2/trunk/files/0001-Use-bash-on-test.patch 2011-12-09 08:21:56 UTC (rev 16426) @@ -0,0 +1,22 @@ +From b151728acbb4c8eb10e6158554da5448b49817e5 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Thu, 8 Dec 2011 18:49:10 +0100 +Subject: [PATCH] Use bash on test + +--- + tests/test-activation/test.sh | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/tests/test-activation/test.sh b/tests/test-activation/test.sh +index 4d1cb45..8d91086 100755 +--- a/tests/test-activation/test.sh ++++ b/tests/test-activation/test.sh +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + + # This is a generic script for firing up a server, waiting for it to write + # its stringified IOR to a file, then firing up a server +-- +1.7.6.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Fri Dec 9 09:24:02 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Fri, 09 Dec 2011 08:24:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[16427] csw/mgar/pkg/sasl/trunk/Makefile Message-ID: Revision: 16427 http://gar.svn.sourceforge.net/gar/?rev=16427&view=rev Author: guengel Date: 2011-12-09 08:24:02 +0000 (Fri, 09 Dec 2011) Log Message: ----------- sasl/trunk: Removed CATALOGNAME_ where not needed. Modified Paths: -------------- csw/mgar/pkg/sasl/trunk/Makefile Modified: csw/mgar/pkg/sasl/trunk/Makefile =================================================================== --- csw/mgar/pkg/sasl/trunk/Makefile 2011-12-09 08:21:56 UTC (rev 16426) +++ csw/mgar/pkg/sasl/trunk/Makefile 2011-12-09 08:24:02 UTC (rev 16427) @@ -34,14 +34,12 @@ VENDOR_URL = http://asg.web.cmu.edu/sasl/ PACKAGES += CSWsasl -CATALOGNAME_CSWsasl = sasl SPKG_DESC_CSWsasl = Cyrus Simple Authentication and Security Layer RUNTIME_DEP_PKGS_CSWsasl = CSWosslrt RUNTIME_DEP_PKGS_CSWsasl += CSWbdb47 RUNTIME_DEP_PKGS_CSWsasl += CSWlibsasl2-2 PACKAGES += CSWsaslauthd -CATALOGNAME_CSWsaslauthd = saslauthd SPKG_DESC_CSWsaslauthd = Cyrus Simple Authentication and Security Layer Authentication Daemon RUNTIME_DEP_PKGS_CSWsaslauthd += CSWsasl RUNTIME_DEP_PKGS_CSWsaslauthd += CSWosslrt @@ -99,8 +97,8 @@ RUNTIME_DEP_PKGS_CSWsasl-dev += CSWlibsasl2-2 PACKAGES += CSWsaslsample -SPKG_DESC_CSWsaslsample = Cyrus Simple Authentication and Security Layer sample client/server CATALOGNAME_CSWsaslsample = sasl_sample +SPKG_DESC_CSWsaslsample = Cyrus Simple Authentication and Security Layer sample client/server RUNTIME_DEP_PKGS_CSWsaslsample = CSWsasl RUNTIME_DEP_PKGS_CSWsaslsample += CSWlibsasl2-2 RUNTIME_DEP_PKGS_CSWsaslsample += CSWlibcom-err3 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Fri Dec 9 09:33:49 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Fri, 09 Dec 2011 08:33:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[16428] csw/mgar/pkg/glib2/trunk/Makefile Message-ID: Revision: 16428 http://gar.svn.sourceforge.net/gar/?rev=16428&view=rev Author: guengel Date: 2011-12-09 08:33:49 +0000 (Fri, 09 Dec 2011) Log Message: ----------- glib2/trunk: Moved stray header files into CSWlibglib2-dev. Modified Paths: -------------- csw/mgar/pkg/glib2/trunk/Makefile Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2011-12-09 08:24:02 UTC (rev 16427) +++ csw/mgar/pkg/glib2/trunk/Makefile 2011-12-09 08:33:49 UTC (rev 16428) @@ -143,6 +143,7 @@ RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibgthread2-0-0 PKGFILES_CSWlibglib2-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWlibglib2-dev += .*/glib-2.0/include/.* OBSOLETED_BY_CSWlibglib2-dev = CSWglib2devel CATALOGNAME_CSWglib2devel = glib2_devel_stub This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Dec 9 09:43:06 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Dec 2011 08:43:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[16429] csw/mgar/pkg/lang-python/pycurl/trunk Message-ID: Revision: 16429 http://gar.svn.sourceforge.net/gar/?rev=16429&view=rev Author: dmichelsen Date: 2011-12-09 08:43:06 +0000 (Fri, 09 Dec 2011) Log Message: ----------- lang-python/pycurl/trunk: Update dependencies and use latest standards Modified Paths: -------------- csw/mgar/pkg/lang-python/pycurl/trunk/Makefile csw/mgar/pkg/lang-python/pycurl/trunk/checksums Modified: csw/mgar/pkg/lang-python/pycurl/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pycurl/trunk/Makefile 2011-12-09 08:33:49 UTC (rev 16428) +++ csw/mgar/pkg/lang-python/pycurl/trunk/Makefile 2011-12-09 08:43:06 UTC (rev 16429) @@ -5,20 +5,30 @@ NAME = pycurl VERSION = 7.19.0 CATEGORIES = python + DESCRIPTION = PycURL is a Python interface to libcurl -PACKAGES = CSWpy-curl -CATALOGNAME_CSWpy-curl = py_curl define BLURB endef -SPKG_SOURCEURL = http://pycurl.sourceforge.net/ + MASTER_SITES = http://pycurl.sourceforge.net/download/ -PATCHFILES = remove-static-libs.patch -DISTFILES = $(NAME)-$(VERSION).tar.gz -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -RUNTIME_DEP_PKGS += CSWcurlrt -RUNTIME_DEP_PKGS += CSWlibidn -RUNTIME_DEP_PKGS += CSWoldaprt -RUNTIME_DEP_PKGS += CSWosslrt -RUNTIME_DEP_PKGS += CSWzlib -TEST_SCRIPTS = +DISTFILES += $(DISTNAME).tar.gz +PATCHFILES += remove-static-libs.patch + +VENDOR_URL = http://pycurl.sourceforge.net/ + +PACKAGES += CSWpy-curl +SPKG_DESC_CSWpy-curl = PycURL is a Python interface to libcurl +RUNTIME_DEP_PKGS_CSWpy-curl += CSWlibidn11 +RUNTIME_DEP_PKGS_CSWpy-curl += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWpy-curl += CSWlibcurl4 +RUNTIME_DEP_PKGS_CSWpy-curl += CSWlibz1 +RUNTIME_DEP_PKGS_CSWpy-curl += CSWosslrt + +# These are docs only +CHECKPKG_OVERRIDES_CSWpy-curl += file-with-bad-content|/usr/local|root/opt/csw/share/doc/pycurl/INSTALL +CHECKPKG_OVERRIDES_CSWpy-curl += file-with-bad-content|/usr/share|root/opt/csw/share/doc/pycurl/ChangeLog + +TEST_SCRIPTS = $(WORKSRC)/Makefile +TEST_TARGET = test + include gar/category.mk Modified: csw/mgar/pkg/lang-python/pycurl/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/pycurl/trunk/checksums 2011-12-09 08:33:49 UTC (rev 16428) +++ csw/mgar/pkg/lang-python/pycurl/trunk/checksums 2011-12-09 08:43:06 UTC (rev 16429) @@ -1,2 +1 @@ 919d58fe37e69fe87ce4534d8b6a1c7b pycurl-7.19.0.tar.gz -530dc7258db23c9a1d1e39082011a6c1 remove-static-libs.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Fri Dec 9 10:09:35 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Fri, 09 Dec 2011 09:09:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[16430] csw/mgar/pkg/glib2/trunk/Makefile Message-ID: Revision: 16430 http://gar.svn.sourceforge.net/gar/?rev=16430&view=rev Author: guengel Date: 2011-12-09 09:09:35 +0000 (Fri, 09 Dec 2011) Log Message: ----------- glib2/trunk: Adjusting paths in documentation is now in post-merge:. Dep on CSWgamin removed from CSWlibglib2-dev Modified Paths: -------------- csw/mgar/pkg/glib2/trunk/Makefile Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2011-12-09 08:43:06 UTC (rev 16429) +++ csw/mgar/pkg/glib2/trunk/Makefile 2011-12-09 09:09:35 UTC (rev 16430) @@ -131,7 +131,6 @@ RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibintl8 # Is this really a runtime dep? No ref found to this lib. #RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibffi5 -RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWgamin RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWglib2 RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWiconv # Did not see any runtime dependency @@ -142,6 +141,7 @@ RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWgio-fam-backend PKGFILES_CSWlibglib2-dev += $(PKGFILES_DEVEL) PKGFILES_CSWlibglib2-dev += .*/glib-2.0/include/.* OBSOLETED_BY_CSWlibglib2-dev = CSWglib2devel @@ -217,31 +217,33 @@ CHECKPKG_OVERRIDES_CSWlibglib2-dev += surplus-dependency|CSWlibintl8 CHECKPKG_OVERRIDES_CSWlibglib2-dev += surplus-dependency|CSWzlib -# That's ok, too. /usr/local appears in an example text. -CHECKPKG_OVERRIDES_CSWglib2 += file-with-bad-content|/usr/local|root/opt/csw/share/gtk-doc/html/glib/glib-Miscellaneous-Utility-Functions.html - include gar/category.mk # We need /opt/csw/gnu/gettext, /usr/bin/gettext bails out PATH := /opt/csw/gnu:$(PATH) +post-merge: + @echo "=== Cleanup stray bash_completion.d ===" + if [ -d $(PKGROOT)$(prefix)/bash_completion.d ] ; \ + then \ + ginstall -d $(PKGROOT)$(sysconfdir) ;\ + mv $(PKGROOT)$(prefix)/bash_completion.d $(PKGROOT)$(sysconfdir)/ ;\ + fi + # This is in place to fix paths that make checkpkg complain -pre-install-modulated: @echo "=== Fixing paths in documentation ===" for d in gio glib gobject ; do \ - DOCBASEDIR="$(WORKSRC)/docs/reference/$$d/" ; \ + DOCBASEDIR="$(PKGROOT)/$(datadir)/gtk-doc/html/$$d/" ; \ if [ -d "$$DOCBASEDIR" ] ; then \ - for f in $$DOCBASEDIR/html/*.html $$DOCBASEDIR/*.[123456789] ; do \ + for f in $$DOCBASEDIR/*.html ; do \ echo "Adjusting path in $$f" ; \ - /opt/csw/bin/gsed -e "s|/usr/share/|$(prefix)/share/|g" -e "s|/usr/local/|$(prefix)/|g" $$f > $$f.tmp ; \ + /opt/csw/bin/gsed -e "s|/usr/share|$(datadir)|g" -e "s|/usr/local|$(prefix)|g" $$f > $$f.tmp ; \ mv $$f.tmp $$f ; \ done ; \ fi ; \ done - -post-merge: - if [ -d $(PKGROOT)$(prefix)/bash_completion.d ] ; \ - then \ - ginstall -d $(PKGROOT)$(sysconfdir) ;\ - mv $(PKGROOT)$(prefix)/bash_completion.d $(PKGROOT)$(sysconfdir)/ ;\ - fi + for f in $(PKGROOT)$(mandir)/man[123456789]/* ; do \ + echo "Adjusting path in $$f" ; \ + /opt/csw/bin/gsed -e "s|/usr/share|$(datadir)|g" -e "s|/usr/local|$(prefix)|g" $$f > $$f.tmp ; \ + mv $$f.tmp $$f ; \ + done ; \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Dec 9 10:11:42 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Dec 2011 09:11:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[16431] csw/mgar/pkg/gnome-base/libbonobo2/trunk/Makefile Message-ID: Revision: 16431 http://gar.svn.sourceforge.net/gar/?rev=16431&view=rev Author: dmichelsen Date: 2011-12-09 09:11:42 +0000 (Fri, 09 Dec 2011) Log Message: ----------- gnome-base/libbonobo2/trunk: Update package names, skip testsuite for now Modified Paths: -------------- csw/mgar/pkg/gnome-base/libbonobo2/trunk/Makefile Modified: csw/mgar/pkg/gnome-base/libbonobo2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnome-base/libbonobo2/trunk/Makefile 2011-12-09 09:09:35 UTC (rev 16430) +++ csw/mgar/pkg/gnome-base/libbonobo2/trunk/Makefile 2011-12-09 09:11:42 UTC (rev 16431) @@ -6,7 +6,6 @@ define BLURB endef -VENDOR_URL = http://live.gnome.org/Bonobo MASTER_SITES = $(GNOME_MIRROR) DISTFILES = $(DISTNAME).tar.bz2 @@ -15,6 +14,8 @@ # New glib2 is only available on Solaris 10 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +VENDOR_URL = http://live.gnome.org/Bonobo + PACKAGES += CSWlibbonobo2 SPKG_DESC_CSWlibbonobo2 = GNOME component and compound document system RUNTIME_DEP_PKGS_CSWlibbonobo2 += CSWlibgthread2-0-0 @@ -24,7 +25,18 @@ RUNTIME_DEP_PKGS_CSWlibbonobo2 += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWlibbonobo2 += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWlibbonobo2 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibbonobo2 += CSWorbit2 +OBSOLETED_BY_CSWlibbonobo2 = CSWbonobo2 +CATALOGNAME_CSWbonobo2 = libbonobo2_stub +# This is an example +CHECKPKG_OVERRIDES_CSWlibbonobo2 += file-with-bad-content|/usr/local|root/etc/opt/csw/bonobo-activation/bonobo-activation-config.xml +CHECKPKG_OVERRIDES_CSWlibbonobo2 += file-with-bad-content|/usr/local|root/opt/csw/share/gtk-doc/html/bonobo-activation/configuring.html + +# No package split for now +CHECKPKG_OVERRIDES_CSWlibbonobo2 += shared-lib-package-contains-so-symlink +CHECKPKG_OVERRIDES_CSWlibbonobo2 += non-uniform-lib-versions-in-package + BUILD64 = 1 CPP = /usr/lib/cpp @@ -32,6 +44,10 @@ CXXCPP = /usr/lib/cpp EXTRA_COMMON_EXPORTS += CXXCPP +# Skip testsuite as there is one test failing, reenable when this is fixed: +# https://bugzilla.gnome.org/show_bug.cgi?id=665851 +SKIPTEST ?= 1 + include gar/category.mk PATH := /opt/csw/gnu:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Fri Dec 9 10:44:58 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Fri, 09 Dec 2011 09:44:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[16432] csw/mgar/pkg/glib2/trunk/Makefile Message-ID: Revision: 16432 http://gar.svn.sourceforge.net/gar/?rev=16432&view=rev Author: guengel Date: 2011-12-09 09:44:58 +0000 (Fri, 09 Dec 2011) Log Message: ----------- glib2/trunk: Updated RUNTIME_DEP on CSWgio-fam-backend. Removed uneeded comments. Modified Paths: -------------- csw/mgar/pkg/glib2/trunk/Makefile Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2011-12-09 09:11:42 UTC (rev 16431) +++ csw/mgar/pkg/glib2/trunk/Makefile 2011-12-09 09:44:58 UTC (rev 16432) @@ -61,26 +61,26 @@ PACKAGES += CSWglib2 SPKG_DESC_CSWglib2 = Low level core compatibility library for GTK+ and GNOME # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWglib2 += CSWlibgthread2-0-0 RUNTIME_DEP_PKGS_CSWglib2 += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWglib2 += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWglib2 += CSWlibz1 RUNTIME_DEP_PKGS_CSWglib2 += CSWlibintl8 -# Did not see any runtime dependency -#RUNTIME_DEP_PKGS_CSWglib2 += CSWpython RUNTIME_DEP_PKGS_CSWglib2 += CSWlibgobject2-0-0 -# Is this really a runtime dep? No ref found to this lib. -#RUNTIME_DEP_PKGS_CSWglib2 += CSWlibffi5 RUNTIME_DEP_PKGS_CSWglib2 += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWglib2 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWglib2 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWglib2 += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWglib2 += CSWgio-fam-backend -## No package split yet -#CHECKPKG_OVERRIDES_CSWglib2 += non-uniform-lib-versions-in-package + PACKAGES += CSWgio-fam-backend SPKG_DESC_CSWgio-fam-backend = $(DESCRIPTION), GIO FAM backend PKGFILES_CSWgio-fam-backend = .*/libgiofam.so RUNTIME_DEP_PKGS_CSWgio-fam-backend = CSWlibfam0 +RUNTIME_DEP_PKGS_CSWgio-fam-backend += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWgio-fam-backend += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWgio-fam-backend += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWgio-fam-backend += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWgio-fam-backend += CSWlibgthread2-0-0 PACKAGES += CSWlibgio2-0-0 SPKG_DESC_CSWlibgio2-0-0 += $(DESCRIPTION), libgio-2.0.so.0 @@ -91,8 +91,6 @@ RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += CSWlibz1 RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += CSWlibgobject2-0-0 -# Is this really a runtime dep? No ref found to this lib. -#RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += CSWlibffi5 RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWlibgio2-0-0 += CSWsharedmimeinfo @@ -115,8 +113,6 @@ RUNTIME_DEP_PKGS_CSWlibgobject2-0-0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibgobject2-0-0 += CSWlibgthread2-0-0 RUNTIME_DEP_PKGS_CSWlibgobject2-0-0 += CSWlibiconv2 -# Is this really a runtime dep? No ref found to this lib. -#RUNTIME_DEP_PKGS_CSWlibgobject2-0-0 += CSWlibffi5 RUNTIME_DEP_PKGS_CSWlibgobject2-0-0 += CSWlibglib2-0-0 PACKAGES += CSWlibgthread2-0-0 @@ -129,12 +125,8 @@ PACKAGES += CSWlibglib2-dev SPKG_DESC_CSWlibglib2-dev = Development files for libglib-2.0.so.0 and assorted libglib, libgmodule, libgobject and libgthread RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibintl8 -# Is this really a runtime dep? No ref found to this lib. -#RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibffi5 RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWglib2 RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWiconv -# Did not see any runtime dependency -#RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWpython RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWzlib RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibglib2-0-0 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 Dec 9 11:06:15 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 09 Dec 2011 10:06:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[16433] csw/mgar/pkg/mysql5/branches/mysql-5.0.x Message-ID: Revision: 16433 http://gar.svn.sourceforge.net/gar/?rev=16433&view=rev Author: wahwah Date: 2011-12-09 10:06:15 +0000 (Fri, 09 Dec 2011) Log Message: ----------- mysql5/branches/mysql-5.0.x: issues from http://bugs.opencsw.org/id/4844 Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/README.CSW csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5.tpl csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-12-09 09:44:58 UTC (rev 16432) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-12-09 10:06:15 UTC (rev 16433) @@ -102,14 +102,17 @@ CHECKPKG_OVERRIDES_CSW$(NAME)client += bad-rpath-entry PACKAGES += CSW$(NAME) -RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibmysqlclient-r$(MYSQL_LIB_VER) -RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibmysqlclient$(MYSQL_LIB_VER) SPKG_DESC_CSW$(NAME) = Multithreaded SQL database RUNTIME_DEP_PKGS_CSW$(NAME) += CSW$(NAME)client +RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibmysqlclient$(MYSQL_LIB_VER) +RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibmysqlclient-r$(MYSQL_LIB_VER) RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibwrap1 RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibz1 +RUNTIME_DEP_PKGS_CSW$(NAME) += CSWcoreutils CHECKPKG_OVERRIDES_CSW$(NAME) += bad-rpath-entry CHECKPKG_OVERRIDES_CSW$(NAME) += file-with-bad-content +CHECKPKG_OVERRIDES_CSW$(NAME) += surplus-dependency|CSW$(NAME)client +CHECKPKG_OVERRIDES_CSW$(NAME) += surplus-dependency|CSWcoreutils EXTRA_MERGE_EXCLUDE_FILES += $(prefix)/mysql-test.* EXTRA_MERGE_EXCLUDE_FILES += $(prefix)/sql-bench.* @@ -185,7 +188,6 @@ PROTOTYPE_PERMS_dbdir = 0700 PROTOTYPE_CLASS_dbdir = ugfiles -CHECKPKG_OVERRIDES_CSW$(NAME) += surplus-dependency|CSW$(NAME)client CHECKPKG_OVERRIDES_CSW$(NAME)bench += file-with-bad-content CHECKPKG_OVERRIDES_CSW$(NAME)bench += surplus-dependency|CSW$(NAME) CHECKPKG_OVERRIDES_CSW$(NAME)test += file-with-bad-content Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/README.CSW =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/README.CSW 2011-12-09 09:44:58 UTC (rev 16432) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/README.CSW 2011-12-09 10:06:15 UTC (rev 16433) @@ -1,7 +1,7 @@ -MySQL 5 OpenCSW package -======================= +MySQL 5.0 OpenCSW package +========================= -* http://www.opencsw.org/packages/mysql5 +* http://www.opencsw.org/packages/mysql5/ The package has been reworked from the ground up, using GAR. Up until this moment, the mysql5 package was in the version from before the fork. The new @@ -12,47 +12,7 @@ * Read only /opt/csw support - data in /var/opt/csw - configuration in /etc/opt/csw -* The prefix is still /opt/csw/mysql5, but all the binaries are now linked from - /opt/csw, so that the standard PATH setting allows to use them +* The prefix has been changed to /opt/csw, so that the standard PATH setting + allows to call binaries the easy way * The startup script is now in /etc/opt/csw/init.d -* SMF support is handled by cswclassutils - - -Here are the old notes from the previous maintainer, Alex Moore: - ---------------8<----------------8<--------------------8<------------------------ - -If you are not using the default location for --datadir, package installation - will NOT start CSWmysql5. More code is needed for that. I welcome patches. - -If you are not using the default location for --datadir, you will find - that CSWmysql5 works much better when you create /etc/my.cnf with at - least the entries that follow. You may also want some entries in this - global options file for client programs that you use. - For example: --datadir is /db/mysql5/var - Create /etc/my.cnf with the following entries: - # Global MySQL options file. - [mysqld] - datadir = /db/mysql5/var - basedir = /opt/csw/mysql5 - -I also changed the option for --defaults-file to --defaults-extra-file - in the startup script. - This allows your options file to be read after the global options file - /etc/my.cnf. - -Note that if you are using the default location for --datadir, you do not - really need /etc/opt/csw/mysql5rc. In this case, you should put any options - in the appropriate group in my.cnf. See the MySQL documentation for - details. - -If you are not using the default location for --datadir, you only need - /etc/opt/csw/mysql5rc for the startup script options for - --defaults-extra-file and possibly --pid-file. All other options may be - put in the appropriate group in my.cnf - -Click 'Views and info' on the package page at - http://www.opencsw.org/packages.php/mysql5 -for the latest information. - -Alex Moore +* SMF support is handled by cswclassutils, using cswmysql5 as the service name Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5.tpl =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5.tpl 2011-12-09 09:44:58 UTC (rev 16432) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5.tpl 2011-12-09 10:06:15 UTC (rev 16433) @@ -26,6 +26,7 @@ MYSQLD_DATADIR=$MYSQL_VAR MYSQLD_PID_FILE=$MYSQL_VAR/mysql.pid CONFFILE=${sysconfdir}/my.cnf +MYSQLD_PROG=${MYSQLD_PROG:-/opt/csw/libexec/mysqld-${BASE_VERSION}} # Source the configuration [ -r /opt/csw/mysql5/etc/mysql5rc ] && . /opt/csw/mysql5/etc/mysql5rc @@ -78,12 +79,12 @@ start_it() { if test -r $MYSQLD_PID_FILE ; then if kill -0 `cat $MYSQLD_PID_FILE` > /dev/null 2>&1 ; then - echo "mysqld (`cat $MYSQLD_PID_FILE`) seems to be running." + echo "mysqld-${BASE_VERSION} (`cat $MYSQLD_PID_FILE`) seems to be running." return 1 fi fi - printf "%-60s" "Starting mysqld: " + printf "%-60s" "Starting mysqld-${BASE_VERSION}: " # 2006-03-11 # This script no longer creates the default database. You may create the @@ -192,7 +193,7 @@ restart) stop_it - while pgrep `pgrep_opts` mysqld > /dev/null + while pgrep `pgrep_opts` mysqld-${BASE_VERSION} > /dev/null do sleep 1 done Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw 2011-12-09 09:44:58 UTC (rev 16432) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw 2011-12-09 10:06:15 UTC (rev 16433) @@ -10,7 +10,7 @@ # # TODO: This file should be integrated with CSWmysql5.postinstall file. -prefix=/opt/csw/mysql5 +prefix=/opt/csw MYSQL_HOME=${prefix} MYSQL_VAR=/var${prefix} sysconfdir=/etc${prefix} @@ -118,7 +118,7 @@ # # Update --datadir in the cnf file with the correct value if file was copied if [ x"$CNFCOPIED" = xyes ]; then - sed -e "s|/var/opt/csw/mysql5|$MYSQLD_DATADIR|g" $DEFAULTS_FILE >$DEFAULTS_FILE.new + sed -e "s|/var/opt/csw|$MYSQLD_DATADIR|g" $DEFAULTS_FILE >$DEFAULTS_FILE.new mv $DEFAULTS_FILE.new $DEFAULTS_FILE fi @@ -126,7 +126,7 @@ # Ending message echo echo "### The following messages are from quick_start-csw." -echo "See /opt/csw/mysql5/share/mysql/doc/README.CSW for packaging changes." +echo "See /opt/csw/share/mysql/doc/README.CSW for packaging changes." echo "Please ignore references to starting mysqld_safe in the messages above." echo " These messages are from mysql_install_db. See the following" echo " for starting CSWmysql5." This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Dec 9 11:08:13 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Dec 2011 10:08:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[16434] csw/mgar/pkg/libgsf/trunk Message-ID: Revision: 16434 http://gar.svn.sourceforge.net/gar/?rev=16434&view=rev Author: dmichelsen Date: 2011-12-09 10:08:13 +0000 (Fri, 09 Dec 2011) Log Message: ----------- libgsf/trunk: Update to 1.14.21, complete rework Modified Paths: -------------- csw/mgar/pkg/libgsf/trunk/Makefile csw/mgar/pkg/libgsf/trunk/checksums Modified: csw/mgar/pkg/libgsf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgsf/trunk/Makefile 2011-12-09 10:06:15 UTC (rev 16433) +++ csw/mgar/pkg/libgsf/trunk/Makefile 2011-12-09 10:08:13 UTC (rev 16434) @@ -1,5 +1,5 @@ NAME = libgsf -VERSION = 1.14.11 +VERSION = 1.14.21 CATEGORIES = gnome DESCRIPTION = GNOME Structured File Library @@ -11,27 +11,43 @@ endef MASTER_SITES = $(GNOME_MIRROR) -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES += $(DISTNAME).tar.gz -BUILD_DEP_PKGS += CSWgnulinks CSWgtk-doc CSWglib2devel CSWlibxml2devel +# New glib is Solaris 10 only +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 -RUNTIME_DEP_PKGS += CSWbonobo2 CSWbzip2 CSWgconf2 CSWggettextrt CSWglib2 -RUNTIME_DEP_PKGS += CSWgnomevfs2 CSWlibxml2 CSWorbit2 CSWzlib +BUILD_DEP_PKGS += CSWgnulinks +BUILD_DEP_PKGS += CSWgtk-doc +BUILD_DEP_PKGS += CSWglib2devel +BUILD_DEP_PKGS += CSWlibxml2devel -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibbz2-1-0 +RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgsf += CSWgtk2 +RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibbonobo2 +RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibgio2-0-0 -EXTRA_LD_OPTIONS = -L../gsf/.libs -L../../gsf/.libs +# No package split yet +CHECKPKG_OVERRIDES_CSWlibgsf += shared-lib-package-contains-so-symlink +CHECKPKG_OVERRIDES_CSWlibgsf += shared-lib-pkgname-mismatch -CONFIGURE_ARGS = $(DIRPATHS) -#CONFIGURE_ARGS = "PATH=$(NPATH)" $(DIRPATHS) -#CONFIGURE_ARGS += --enable-gtk-doc=no -#CONFIGURE_ARGS += --disable-man-gtk-doc +# The -L/opt/csw/lib is too early and disturbs the build with the installed libgsf +LINKER_FLAGS = -TEST_TARGET = check +CONFIGURE_ARGS += $(DIRPATHS) +# There are link errors on newly built gnomemodule.la, disable for now +CONFIGURE_ARGS += --without-python + # Missing 64-bit libs: # libgnomevfs-2.so libgconf-2.so libbonobo-2.so libbonobo-activation.so -#BUILD64 = 1 +BUILD64 = 1 STRIP_LIBTOOL = 1 @@ -39,10 +55,10 @@ PATH := /opt/csw/gnu:$(PATH) -post-install-isa-sparcv8: +post-install-isa-sparcv8plus: @cp -p $(FILEDIR)/libgsf-1.so.1.9.1.s $(INSTALLISADIR)$(libdir)/libgsf-1.so.1 @cp -p $(FILEDIR)/libgsf-gnome-1.so.1.9.1.s $(INSTALLISADIR)$(libdir)/libgsf-gnome-1.so.1 -post-install-isa-i386: +post-install-isa-pentium_pro: @cp -p $(FILEDIR)/libgsf-1.so.1.9.1.i $(INSTALLISADIR)$(libdir)/libgsf-1.so.1 @cp -p $(FILEDIR)/libgsf-gnome-1.so.1.9.1.i $(INSTALLISADIR)$(libdir)/libgsf-gnome-1.so.1 Modified: csw/mgar/pkg/libgsf/trunk/checksums =================================================================== --- csw/mgar/pkg/libgsf/trunk/checksums 2011-12-09 10:06:15 UTC (rev 16433) +++ csw/mgar/pkg/libgsf/trunk/checksums 2011-12-09 10:08:13 UTC (rev 16434) @@ -1 +1 @@ -7d6fa1c26ebb58dcf2128c3b9c7d1a2a libgsf-1.14.11.tar.gz +9c56d356094198eb5d46d9aee2515d63 libgsf-1.14.21.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Fri Dec 9 11:23:43 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Fri, 09 Dec 2011 10:23:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[16435] csw/mgar/pkg/shared-mime-info/trunk/Makefile Message-ID: Revision: 16435 http://gar.svn.sourceforge.net/gar/?rev=16435&view=rev Author: guengel Date: 2011-12-09 10:23:43 +0000 (Fri, 09 Dec 2011) Log Message: ----------- shared-mime-info/trunk: Updated RUNTIME_DEPs CSWglib2 -> CSWlibglib2-0-0. Modified Paths: -------------- csw/mgar/pkg/shared-mime-info/trunk/Makefile Modified: csw/mgar/pkg/shared-mime-info/trunk/Makefile =================================================================== --- csw/mgar/pkg/shared-mime-info/trunk/Makefile 2011-12-09 10:08:13 UTC (rev 16434) +++ csw/mgar/pkg/shared-mime-info/trunk/Makefile 2011-12-09 10:23:43 UTC (rev 16435) @@ -24,7 +24,7 @@ SPKG_SOURCEURL = http://freedesktop.org/Software/shared-mime-info -RUNTIME_DEP_PKGS = CSWggettextrt CSWglib2 CSWlibxml2 +RUNTIME_DEP_PKGS = CSWggettextrt CSWlibxml2 CSWlibglib2-0-0 CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Dec 9 11:26:26 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Dec 2011 10:26:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[16436] csw/mgar/pkg Message-ID: Revision: 16436 http://gar.svn.sourceforge.net/gar/?rev=16436&view=rev Author: dmichelsen Date: 2011-12-09 10:26:26 +0000 (Fri, 09 Dec 2011) Log Message: ----------- libgsf1: Factor out legacy library Added Paths: ----------- csw/mgar/pkg/libgsf1/ csw/mgar/pkg/libgsf1/trunk/Makefile csw/mgar/pkg/libgsf1/trunk/checksums csw/mgar/pkg/libgsf1/trunk/files/libgsf-1.so.1.9.1.i386 csw/mgar/pkg/libgsf1/trunk/files/libgsf-1.so.1.9.1.sparc csw/mgar/pkg/libgsf1/trunk/files/libgsf-gnome-1.so.1.9.1.i386 csw/mgar/pkg/libgsf1/trunk/files/libgsf-gnome-1.so.1.9.1.sparc Removed Paths: ------------- csw/mgar/pkg/libgsf1/trunk/Makefile csw/mgar/pkg/libgsf1/trunk/checksums csw/mgar/pkg/libgsf1/trunk/files/fixme.sh csw/mgar/pkg/libgsf1/trunk/files/fixme2.sh csw/mgar/pkg/libgsf1/trunk/files/libgsf-1.so.1.9.1.i csw/mgar/pkg/libgsf1/trunk/files/libgsf-1.so.1.9.1.s csw/mgar/pkg/libgsf1/trunk/files/libgsf-gnome-1.so.1.9.1.i csw/mgar/pkg/libgsf1/trunk/files/libgsf-gnome-1.so.1.9.1.s Deleted: csw/mgar/pkg/libgsf1/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgsf/trunk/Makefile 2011-11-15 10:21:50 UTC (rev 16195) +++ csw/mgar/pkg/libgsf1/trunk/Makefile 2011-12-09 10:26:26 UTC (rev 16436) @@ -1,48 +0,0 @@ -NAME = libgsf -VERSION = 1.14.11 -CATEGORIES = gnome - -DESCRIPTION = GNOME Structured File Library -define BLURB - The GNOME Structured File Library (GSF) is an I/O abstraction for - reading/writing compound files. GSF is released under the GNU Lesser - General Public License (GNU LGPL), which allows for flexible licensing of - client applications. -endef - -MASTER_SITES = $(GNOME_MIRROR) -DISTFILES = $(NAME)-$(VERSION).tar.gz - -BUILD_DEP_PKGS += CSWgnulinks CSWgtk-doc CSWglib2devel CSWlibxml2devel - -RUNTIME_DEP_PKGS += CSWbonobo2 CSWbzip2 CSWgconf2 CSWggettextrt CSWglib2 -RUNTIME_DEP_PKGS += CSWgnomevfs2 CSWlibxml2 CSWorbit2 CSWzlib - -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - -EXTRA_LD_OPTIONS = -L../gsf/.libs -L../../gsf/.libs - -CONFIGURE_ARGS = $(DIRPATHS) -#CONFIGURE_ARGS = "PATH=$(NPATH)" $(DIRPATHS) -#CONFIGURE_ARGS += --enable-gtk-doc=no -#CONFIGURE_ARGS += --disable-man-gtk-doc - -TEST_TARGET = check - -# Missing 64-bit libs: -# libgnomevfs-2.so libgconf-2.so libbonobo-2.so libbonobo-activation.so -#BUILD64 = 1 - -STRIP_LIBTOOL = 1 - -include gar/category.mk - -PATH := /opt/csw/gnu:$(PATH) - -post-install-isa-sparcv8: - @cp -p $(FILEDIR)/libgsf-1.so.1.9.1.s $(INSTALLISADIR)$(libdir)/libgsf-1.so.1 - @cp -p $(FILEDIR)/libgsf-gnome-1.so.1.9.1.s $(INSTALLISADIR)$(libdir)/libgsf-gnome-1.so.1 - -post-install-isa-i386: - @cp -p $(FILEDIR)/libgsf-1.so.1.9.1.i $(INSTALLISADIR)$(libdir)/libgsf-1.so.1 - @cp -p $(FILEDIR)/libgsf-gnome-1.so.1.9.1.i $(INSTALLISADIR)$(libdir)/libgsf-gnome-1.so.1 Copied: csw/mgar/pkg/libgsf1/trunk/Makefile (from rev 16434, csw/mgar/pkg/libgsf/trunk/Makefile) =================================================================== --- csw/mgar/pkg/libgsf1/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libgsf1/trunk/Makefile 2011-12-09 10:26:26 UTC (rev 16436) @@ -0,0 +1,49 @@ +NAME = libgsf +VERSION = 1.9.1 +CATEGORIES = gnome + +DESCRIPTION = GNOME Structured File Library +define BLURB + The GNOME Structured File Library (GSF) is an I/O abstraction for + reading/writing compound files. GSF is released under the GNU Lesser + General Public License (GNU LGPL), which allows for flexible licensing of + client applications. +endef + +DISTFILES += libgsf-1.so.1.9.1.i386 +DISTFILES += libgsf-1.so.1.9.1.sparc +DISTFILES += libgsf-gnome-1.so.1.9.1.i386 +DISTFILES += libgsf-gnome-1.so.1.9.1.sparc + +VENDOR_URL = http://ftp.gnome.org/pub/GNOME/sources/libgsf/ + +PACKAGES += CSWlibgsf +SPKG_DESC_CSWlibgsf = GNOME structured file library, legacy libgsf-1.so.1 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibgsf += CSWorbit2 +RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibbz2-1-0 +RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibz-dev +RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibintl3 +RUNTIME_DEP_PKGS_CSWlibgsf += CSWbonobo2 +RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWlibgsf += CSWgnomevfs2 +RUNTIME_DEP_PKGS_CSWlibgsf += CSWglib2 + +# This is old crud, just override +CHECKPKG_OVERRIDES_CSWlibgsf += license-missing|/opt/csw/share/doc/libgsf/license +CHECKPKG_OVERRIDES_CSWlibgsf += bad-rpath-entry|/usr/ucblib|opt/csw/lib/libgsf-gnome-1.so.1 +CHECKPKG_OVERRIDES_CSWlibgsf += shared-lib-pkgname-mismatch + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +install-custom: + ginstall -d $(DESTDIR)$(libdir) + ginstall $(WORKDIR)/libgsf-1.so.1.9.1.$(GARCH) $(DESTDIR)$(libdir)/libgsf-1.so.1 + ginstall $(WORKDIR)/libgsf-gnome-1.so.1.9.1.$(GARCH) $(DESTDIR)$(libdir)/libgsf-gnome-1.so.1 + @$(MAKECOOKIE) Deleted: csw/mgar/pkg/libgsf1/trunk/checksums =================================================================== --- csw/mgar/pkg/libgsf/trunk/checksums 2011-11-15 10:21:50 UTC (rev 16195) +++ csw/mgar/pkg/libgsf1/trunk/checksums 2011-12-09 10:26:26 UTC (rev 16436) @@ -1 +0,0 @@ -7d6fa1c26ebb58dcf2128c3b9c7d1a2a libgsf-1.14.11.tar.gz Copied: csw/mgar/pkg/libgsf1/trunk/checksums (from rev 16434, csw/mgar/pkg/libgsf/trunk/checksums) =================================================================== Deleted: csw/mgar/pkg/libgsf1/trunk/files/fixme.sh =================================================================== --- csw/mgar/pkg/libgsf/trunk/files/fixme.sh 2011-11-15 10:21:50 UTC (rev 16195) +++ csw/mgar/pkg/libgsf1/trunk/files/fixme.sh 2011-12-09 10:26:26 UTC (rev 16436) @@ -1,51 +0,0 @@ -#!/bin/bash -#################################################### -# -# fixme.sh -# Intended to remove the use of libtool's -# pseudo-libraries for opencsw builds. -# -# Author: Mike Watters mwatters_at_opencsw.org -# Initial Version: 0.1 -# -#################################################### - -umask 0022 -PATH=/opt/csw/bin - -if [ $# -ne 1 ]; then - gecho "USAGE: $(basename $0) WORKSRC" - exit 1 -fi -BASEPATH=$1 - -## Fix Makefiles -for mk in $(gfind ${BASEPATH} -name Makefile -print); do - LT_FILES=$(ggrep '/opt/csw.*/lib/.*\.la' ${mk} | \ - gsed "s/^.*\(\/opt\/csw.*\/lib\/.*\.la\).*$/\1/") - - for file in ${LT_FILES}; do - LIB_NAME=$(ggrep 'dlname=' ${file} | \ - gsed -e "s/.*'\(.*\)'/\1/" \ - -e "s/^lib//" \ - -e "s/\.so.*$//") - fixpath=$(gecho $file |gsed 's/\//\\\//g') - gsed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >Makefile.new - gmv Makefile.new ${mk} - gchmod +x ${mk} - done -done - -## Fix libtool Script -for lt in $(gfind ${BASEPATH} -name libtool -print); do - gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new - gmv ${lt}.new ${lt} - gchmod +x ${lt} -done - -for LTMAIN in $(gfind ${BASEPATH} -name ltmain.sh -print); do - gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new - gmv ${LTMAIN}.new ${LTMAIN} - gchmod +x ${LTMAIN} -done - Deleted: csw/mgar/pkg/libgsf1/trunk/files/fixme2.sh =================================================================== --- csw/mgar/pkg/libgsf/trunk/files/fixme2.sh 2011-11-15 10:21:50 UTC (rev 16195) +++ csw/mgar/pkg/libgsf1/trunk/files/fixme2.sh 2011-12-09 10:26:26 UTC (rev 16436) @@ -1,29 +0,0 @@ -#!/bin/bash -#################################################### -# -# fixme2.sh -# Intended to patch libtool so relink isn't -# performend during install -# -# Loosely based on Mike Watters fixme.sh -# -# Author: Roger Hakansson hson at opencsw.org -# Initial Version: 0.1 -# -#################################################### - -umask 0022 -PATH=/opt/csw/bin - -if [ $# -ne 1 ]; then - gecho "USAGE: $(basename $0) WORKSRC" - exit 1 -fi -BASEPATH=$1 - -## Fix libtool Script -for lt in $(gfind ${BASEPATH} -name libtool -print); do - gsed 's/test "$mode" != relink && rpath/rpath/' ${lt} > ${lt}.new - gmv ${lt}.new ${lt} - gchmod +x ${lt} -done Deleted: csw/mgar/pkg/libgsf1/trunk/files/libgsf-1.so.1.9.1.i =================================================================== (Binary files differ) Copied: csw/mgar/pkg/libgsf1/trunk/files/libgsf-1.so.1.9.1.i386 (from rev 16195, csw/mgar/pkg/libgsf/trunk/files/libgsf-1.so.1.9.1.i) =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/libgsf1/trunk/files/libgsf-1.so.1.9.1.s =================================================================== (Binary files differ) Copied: csw/mgar/pkg/libgsf1/trunk/files/libgsf-1.so.1.9.1.sparc (from rev 16195, csw/mgar/pkg/libgsf/trunk/files/libgsf-1.so.1.9.1.s) =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/libgsf1/trunk/files/libgsf-gnome-1.so.1.9.1.i =================================================================== (Binary files differ) Copied: csw/mgar/pkg/libgsf1/trunk/files/libgsf-gnome-1.so.1.9.1.i386 (from rev 16195, csw/mgar/pkg/libgsf/trunk/files/libgsf-gnome-1.so.1.9.1.i) =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/libgsf1/trunk/files/libgsf-gnome-1.so.1.9.1.s =================================================================== (Binary files differ) Copied: csw/mgar/pkg/libgsf1/trunk/files/libgsf-gnome-1.so.1.9.1.sparc (from rev 16195, csw/mgar/pkg/libgsf/trunk/files/libgsf-gnome-1.so.1.9.1.s) =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Dec 9 11:45:28 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Dec 2011 10:45:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[16437] csw/mgar/pkg/libgsf1/trunk/Makefile Message-ID: Revision: 16437 http://gar.svn.sourceforge.net/gar/?rev=16437&view=rev Author: dmichelsen Date: 2011-12-09 10:45:27 +0000 (Fri, 09 Dec 2011) Log Message: ----------- libgsf1/trunk: Only build on Solaris 10 Modified Paths: -------------- csw/mgar/pkg/libgsf1/trunk/Makefile Modified: csw/mgar/pkg/libgsf1/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgsf1/trunk/Makefile 2011-12-09 10:26:26 UTC (rev 16436) +++ csw/mgar/pkg/libgsf1/trunk/Makefile 2011-12-09 10:45:27 UTC (rev 16437) @@ -15,6 +15,9 @@ DISTFILES += libgsf-gnome-1.so.1.9.1.i386 DISTFILES += libgsf-gnome-1.so.1.9.1.sparc +# The updated libgsf is only released for Solaris 10 due to new glib only on Solaris 10 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + VENDOR_URL = http://ftp.gnome.org/pub/GNOME/sources/libgsf/ PACKAGES += CSWlibgsf @@ -25,10 +28,13 @@ RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibz-dev RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibintl3 -RUNTIME_DEP_PKGS_CSWlibgsf += CSWbonobo2 +RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibbonobo2 RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWlibgsf += CSWgnomevfs2 -RUNTIME_DEP_PKGS_CSWlibgsf += CSWglib2 +RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibgmodule2-0-0 # This is old crud, just override CHECKPKG_OVERRIDES_CSWlibgsf += license-missing|/opt/csw/share/doc/libgsf/license This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Dec 9 11:54:08 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Dec 2011 10:54:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[16438] csw/mgar/pkg/libgsf/trunk Message-ID: Revision: 16438 http://gar.svn.sourceforge.net/gar/?rev=16438&view=rev Author: dmichelsen Date: 2011-12-09 10:54:08 +0000 (Fri, 09 Dec 2011) Log Message: ----------- libgsf/trunk: Split off legacy libs, rework dependencies Modified Paths: -------------- csw/mgar/pkg/libgsf/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/libgsf/trunk/files/fixme.sh csw/mgar/pkg/libgsf/trunk/files/fixme2.sh csw/mgar/pkg/libgsf/trunk/files/libgsf-1.so.1.9.1.i csw/mgar/pkg/libgsf/trunk/files/libgsf-1.so.1.9.1.s csw/mgar/pkg/libgsf/trunk/files/libgsf-gnome-1.so.1.9.1.i csw/mgar/pkg/libgsf/trunk/files/libgsf-gnome-1.so.1.9.1.s Modified: csw/mgar/pkg/libgsf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgsf/trunk/Makefile 2011-12-09 10:45:27 UTC (rev 16437) +++ csw/mgar/pkg/libgsf/trunk/Makefile 2011-12-09 10:54:08 UTC (rev 16438) @@ -21,22 +21,52 @@ BUILD_DEP_PKGS += CSWglib2devel BUILD_DEP_PKGS += CSWlibxml2devel -RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibbz2-1-0 -RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibgmodule2-0-0 -RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibgsf += CSWgtk2 -RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibbonobo2 -RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibgio2-0-0 +PACKAGES += CSWlibgsf1-114 +SPKG_DESC_CSWlibgsf1-114 = GNOME structured file library, libgsf-1.so.114 +PKGFILES_CSWlibgsf1-114 += $(call pkgfiles_lib,libgsf-1.so.114) +PKGFILES_CSWlibgsf1-114 += $(sharedstatedir)/locale/.*\.mo +RUNTIME_DEP_PKGS_CSWlibgsf1-114 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibgsf1-114 += CSWlibbz2-1-0 +RUNTIME_DEP_PKGS_CSWlibgsf1-114 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibgsf1-114 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibgsf1-114 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgsf1-114 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibgsf1-114 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibgsf1-114 += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWlibgsf1-114 += CSWlibgio2-0-0 -# No package split yet -CHECKPKG_OVERRIDES_CSWlibgsf += shared-lib-package-contains-so-symlink -CHECKPKG_OVERRIDES_CSWlibgsf += shared-lib-pkgname-mismatch +PACKAGES += CSWlibgsf-gnome1-114 +SPKG_DESC_CSWlibgsf-gnome1-114 = GNOME structured file library, libgsf-gnome1.so.114 +PKGFILES_CSWlibgsf-gnome1-114 += $(call pkgfiles_lib,libgsf-gnome-1.so.114) +RUNTIME_DEP_PKGS_CSWlibgsf-gnome1-114 += CSWorbit2 +RUNTIME_DEP_PKGS_CSWlibgsf-gnome1-114 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibgsf-gnome1-114 += CSWlibbz2-1-0 +RUNTIME_DEP_PKGS_CSWlibgsf-gnome1-114 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibgsf-gnome1-114 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibgsf-gnome1-114 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgsf-gnome1-114 += CSWlibgsf1-114 +RUNTIME_DEP_PKGS_CSWlibgsf-gnome1-114 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibgsf-gnome1-114 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibgsf-gnome1-114 += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWlibgsf-gnome1-114 += CSWlibbonobo2 +RUNTIME_DEP_PKGS_CSWlibgsf-gnome1-114 += CSWlibgio2-0-0 +PACKAGES += CSWlibgsf-dev +SPKG_DESC_CSWlibgsf-dev = Development files for libgsf-1.so.114 and libgsf-gnome1.so.114 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibgsf-dev += CSWlibgsf1-114 +RUNTIME_DEP_PKGS_CSWlibgsf-dev += CSWlibgsf-gnome1-114 +RUNTIME_DEP_PKGS_CSWlibgsf-dev += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibgsf-dev += CSWlibbz2-1-0 +RUNTIME_DEP_PKGS_CSWlibgsf-dev += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibgsf-dev += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibgsf-dev += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgsf-dev += CSWgtk2 +RUNTIME_DEP_PKGS_CSWlibgsf-dev += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibgsf-dev += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibgsf-dev += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWlibgsf-dev += CSWlibgio2-0-0 + # The -L/opt/csw/lib is too early and disturbs the build with the installed libgsf LINKER_FLAGS = @@ -54,11 +84,3 @@ include gar/category.mk PATH := /opt/csw/gnu:$(PATH) - -post-install-isa-sparcv8plus: - @cp -p $(FILEDIR)/libgsf-1.so.1.9.1.s $(INSTALLISADIR)$(libdir)/libgsf-1.so.1 - @cp -p $(FILEDIR)/libgsf-gnome-1.so.1.9.1.s $(INSTALLISADIR)$(libdir)/libgsf-gnome-1.so.1 - -post-install-isa-pentium_pro: - @cp -p $(FILEDIR)/libgsf-1.so.1.9.1.i $(INSTALLISADIR)$(libdir)/libgsf-1.so.1 - @cp -p $(FILEDIR)/libgsf-gnome-1.so.1.9.1.i $(INSTALLISADIR)$(libdir)/libgsf-gnome-1.so.1 Deleted: csw/mgar/pkg/libgsf/trunk/files/fixme.sh =================================================================== --- csw/mgar/pkg/libgsf/trunk/files/fixme.sh 2011-12-09 10:45:27 UTC (rev 16437) +++ csw/mgar/pkg/libgsf/trunk/files/fixme.sh 2011-12-09 10:54:08 UTC (rev 16438) @@ -1,51 +0,0 @@ -#!/bin/bash -#################################################### -# -# fixme.sh -# Intended to remove the use of libtool's -# pseudo-libraries for opencsw builds. -# -# Author: Mike Watters mwatters_at_opencsw.org -# Initial Version: 0.1 -# -#################################################### - -umask 0022 -PATH=/opt/csw/bin - -if [ $# -ne 1 ]; then - gecho "USAGE: $(basename $0) WORKSRC" - exit 1 -fi -BASEPATH=$1 - -## Fix Makefiles -for mk in $(gfind ${BASEPATH} -name Makefile -print); do - LT_FILES=$(ggrep '/opt/csw.*/lib/.*\.la' ${mk} | \ - gsed "s/^.*\(\/opt\/csw.*\/lib\/.*\.la\).*$/\1/") - - for file in ${LT_FILES}; do - LIB_NAME=$(ggrep 'dlname=' ${file} | \ - gsed -e "s/.*'\(.*\)'/\1/" \ - -e "s/^lib//" \ - -e "s/\.so.*$//") - fixpath=$(gecho $file |gsed 's/\//\\\//g') - gsed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >Makefile.new - gmv Makefile.new ${mk} - gchmod +x ${mk} - done -done - -## Fix libtool Script -for lt in $(gfind ${BASEPATH} -name libtool -print); do - gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new - gmv ${lt}.new ${lt} - gchmod +x ${lt} -done - -for LTMAIN in $(gfind ${BASEPATH} -name ltmain.sh -print); do - gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new - gmv ${LTMAIN}.new ${LTMAIN} - gchmod +x ${LTMAIN} -done - Deleted: csw/mgar/pkg/libgsf/trunk/files/fixme2.sh =================================================================== --- csw/mgar/pkg/libgsf/trunk/files/fixme2.sh 2011-12-09 10:45:27 UTC (rev 16437) +++ csw/mgar/pkg/libgsf/trunk/files/fixme2.sh 2011-12-09 10:54:08 UTC (rev 16438) @@ -1,29 +0,0 @@ -#!/bin/bash -#################################################### -# -# fixme2.sh -# Intended to patch libtool so relink isn't -# performend during install -# -# Loosely based on Mike Watters fixme.sh -# -# Author: Roger Hakansson hson at opencsw.org -# Initial Version: 0.1 -# -#################################################### - -umask 0022 -PATH=/opt/csw/bin - -if [ $# -ne 1 ]; then - gecho "USAGE: $(basename $0) WORKSRC" - exit 1 -fi -BASEPATH=$1 - -## Fix libtool Script -for lt in $(gfind ${BASEPATH} -name libtool -print); do - gsed 's/test "$mode" != relink && rpath/rpath/' ${lt} > ${lt}.new - gmv ${lt}.new ${lt} - gchmod +x ${lt} -done Deleted: csw/mgar/pkg/libgsf/trunk/files/libgsf-1.so.1.9.1.i =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/libgsf/trunk/files/libgsf-1.so.1.9.1.s =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/libgsf/trunk/files/libgsf-gnome-1.so.1.9.1.i =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/libgsf/trunk/files/libgsf-gnome-1.so.1.9.1.s =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Fri Dec 9 13:34:01 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Fri, 09 Dec 2011 12:34:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[16439] csw/mgar/pkg/shared-mime-info/trunk/Makefile Message-ID: Revision: 16439 http://gar.svn.sourceforge.net/gar/?rev=16439&view=rev Author: guengel Date: 2011-12-09 12:34:01 +0000 (Fri, 09 Dec 2011) Log Message: ----------- shared-mime-info/trunk: Added PACKAGING_PLATFORMS. Modified Paths: -------------- csw/mgar/pkg/shared-mime-info/trunk/Makefile Modified: csw/mgar/pkg/shared-mime-info/trunk/Makefile =================================================================== --- csw/mgar/pkg/shared-mime-info/trunk/Makefile 2011-12-09 10:54:08 UTC (rev 16438) +++ csw/mgar/pkg/shared-mime-info/trunk/Makefile 2011-12-09 12:34:01 UTC (rev 16439) @@ -14,6 +14,9 @@ MASTER_SITES = http://freedesktop.org/~hadess/ DISTFILES = $(NAME)-$(VERSION).tar.bz2 +# This is because CSWlibglib2-0-0 is only available on Solaris 10+ +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Fri Dec 9 14:07:50 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Fri, 09 Dec 2011 13:07:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[16440] csw/mgar/pkg/shared-mime-info/trunk Message-ID: Revision: 16440 http://gar.svn.sourceforge.net/gar/?rev=16440&view=rev Author: guengel Date: 2011-12-09 13:07:49 +0000 (Fri, 09 Dec 2011) Log Message: ----------- shared-mime-info/trunk: Added patch for XDG_DATA_DIRS defaults. Made checkpkg happy. Modified Paths: -------------- csw/mgar/pkg/shared-mime-info/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/shared-mime-info/trunk/files/ csw/mgar/pkg/shared-mime-info/trunk/files/0001-Set-default-XDG_DATA_DIRS-to-opt-csw-share.patch Modified: csw/mgar/pkg/shared-mime-info/trunk/Makefile =================================================================== --- csw/mgar/pkg/shared-mime-info/trunk/Makefile 2011-12-09 12:34:01 UTC (rev 16439) +++ csw/mgar/pkg/shared-mime-info/trunk/Makefile 2011-12-09 13:07:49 UTC (rev 16440) @@ -14,6 +14,10 @@ MASTER_SITES = http://freedesktop.org/~hadess/ DISTFILES = $(NAME)-$(VERSION).tar.bz2 +# This is for replacing /usr/local/share by /opt/csw/share in the +# default XDG_DATA_DIRS +PATCHFILES += 0001-Set-default-XDG_DATA_DIRS-to-opt-csw-share.patch + # This is because CSWlibglib2-0-0 is only available on Solaris 10+ PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 @@ -24,10 +28,18 @@ PACKAGES = CSWsharedmimeinfo CATALOGNAME = shared_mime_info +CHECKPKG_OVERRIDES = catalogname-does-not-match-pkgname|pkgname=CSWsharedmimeinfo|catalogname=shared_mime_info|expected-catalogname=sharedmimeinfo +# /usr/local does no harm here +CHECKPKG_OVERRIDES += file-with-bad-content|/usr/local|root/opt/csw/share/mime/mime.cache +CHECKPKG_OVERRIDES += file-with-bad-content|/usr/local|root/opt/csw/share/mime/magic +CHECKPKG_OVERRIDES += file-with-bad-content|/usr/local|root/opt/csw/share/mime/packages/freedesktop.org.xml +# My patch does deliberately not remove /usr/share +CHECKPKG_OVERRIDES += file-with-bad-content|/usr/share|root/opt/csw/bin/update-mime-database + SPKG_SOURCEURL = http://freedesktop.org/Software/shared-mime-info -RUNTIME_DEP_PKGS = CSWggettextrt CSWlibxml2 CSWlibglib2-0-0 +RUNTIME_DEP_PKGS += CSWlibglib2-0-0 CSWlibintl8 CSWlibxml2-2 CONFIGURE_ARGS = $(DIRPATHS) Added: csw/mgar/pkg/shared-mime-info/trunk/files/0001-Set-default-XDG_DATA_DIRS-to-opt-csw-share.patch =================================================================== --- csw/mgar/pkg/shared-mime-info/trunk/files/0001-Set-default-XDG_DATA_DIRS-to-opt-csw-share.patch (rev 0) +++ csw/mgar/pkg/shared-mime-info/trunk/files/0001-Set-default-XDG_DATA_DIRS-to-opt-csw-share.patch 2011-12-09 13:07:49 UTC (rev 16440) @@ -0,0 +1,25 @@ +From 132f3284d0dc791c72af10063524915de5e17a8d Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Fri, 9 Dec 2011 13:43:45 +0100 +Subject: [PATCH] Set default XDG_DATA_DIRS to /opt/csw/share + +--- + update-mime-database.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/update-mime-database.c b/update-mime-database.c +index d195594..9339b06 100644 +--- a/update-mime-database.c ++++ b/update-mime-database.c +@@ -2077,7 +2077,7 @@ static void check_in_path_xdg_data(const char *mime_path) + + env = getenv("XDG_DATA_DIRS"); + if (!env) +- env = "/usr/local/share/"PATH_SEPARATOR"/usr/share/"; ++ env = "/opt/csw/share/"PATH_SEPARATOR"/usr/share/"; + dirs = g_strsplit(env, PATH_SEPARATOR, 0); + g_return_if_fail(dirs != NULL); + for (n = 0; dirs[n]; n++) +-- +1.7.6.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 Dec 9 14:13:51 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 09 Dec 2011 13:13:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[16441] csw/mgar/pkg/cpan/HTTP-Body/trunk Message-ID: Revision: 16441 http://gar.svn.sourceforge.net/gar/?rev=16441&view=rev Author: bonivart Date: 2011-12-09 13:13:51 +0000 (Fri, 09 Dec 2011) Log Message: ----------- cpan/HTTP-Body/trunk: update to 1.15 Modified Paths: -------------- csw/mgar/pkg/cpan/HTTP-Body/trunk/Makefile csw/mgar/pkg/cpan/HTTP-Body/trunk/checksums Modified: csw/mgar/pkg/cpan/HTTP-Body/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/HTTP-Body/trunk/Makefile 2011-12-09 13:07:49 UTC (rev 16440) +++ csw/mgar/pkg/cpan/HTTP-Body/trunk/Makefile 2011-12-09 13:13:51 UTC (rev 16441) @@ -1,5 +1,5 @@ NAME = HTTP-Body -VERSION = 1.11 +VERSION = 1.15 CATEGORIES = cpan AUTHOR = GETTY @@ -7,14 +7,12 @@ define BLURB endef -BUILD_DEP_PKGS += CSWpmtestdeep +BUILD_DEP_PKGS += CSWpm-test-deep PACKAGES += CSWpm-http-body CATALOGNAME_CSWpm-http-body = pm_http_body ARCHALL_CSWpm-http-body = 1 RUNTIME_DEP_PKGS_CSWpm-http-body = CSWpmlibwww +LICENSE = LICENSE -# License is really unknown -CHECKPKG_OVERRIDES_CSWpm-http-body += license-missing|/opt/csw/share/doc/pm_http_body/license - include gar/category.mk Modified: csw/mgar/pkg/cpan/HTTP-Body/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/HTTP-Body/trunk/checksums 2011-12-09 13:07:49 UTC (rev 16440) +++ csw/mgar/pkg/cpan/HTTP-Body/trunk/checksums 2011-12-09 13:13:51 UTC (rev 16441) @@ -1 +1 @@ -c425c9a179dfac73891dee8cad556825 HTTP-Body-1.11.tar.gz +cccf0211c15a9fed67c68c826c5efeaf HTTP-Body-1.15.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Dec 9 14:27:28 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 09 Dec 2011 13:27:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[16442] csw/mgar/pkg/cpan/HTTP-Server-Simple-PSGI/trunk Message-ID: Revision: 16442 http://gar.svn.sourceforge.net/gar/?rev=16442&view=rev Author: bonivart Date: 2011-12-09 13:27:28 +0000 (Fri, 09 Dec 2011) Log Message: ----------- cpan/HTTP-Server-Simple-PSGI/trunk: fix license Modified Paths: -------------- csw/mgar/pkg/cpan/HTTP-Server-Simple-PSGI/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/cpan/HTTP-Server-Simple-PSGI/trunk/files/COPYING Modified: csw/mgar/pkg/cpan/HTTP-Server-Simple-PSGI/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/HTTP-Server-Simple-PSGI/trunk/Makefile 2011-12-09 13:13:51 UTC (rev 16441) +++ csw/mgar/pkg/cpan/HTTP-Server-Simple-PSGI/trunk/Makefile 2011-12-09 13:27:28 UTC (rev 16442) @@ -11,8 +11,6 @@ CATALOGNAME_CSWpm-http-server-simple-psgi = pm_http_server_simple_psgi ARCHALL_CSWpm-http-server-simple-psgi = 1 RUNTIME_DEP_PKGS_CSWpm-http-server-simple-psgi = CSWpmhttpsvrsimp +DISTFILES += COPYING -# License is really unknown -CHECKPKG_OVERRIDES_CSWpm-http-server-simple-psgi += license-missing|/opt/csw/share/doc/pm_http_server_simple_psgi/license - include gar/category.mk Added: csw/mgar/pkg/cpan/HTTP-Server-Simple-PSGI/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/HTTP-Server-Simple-PSGI/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/HTTP-Server-Simple-PSGI/trunk/files/COPYING 2011-12-09 13:27:28 UTC (rev 16442) @@ -0,0 +1 @@ +This module is licensed under the same terms as Perl itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Dec 9 15:22:32 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Dec 2011 14:22:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[16443] csw/mgar/pkg/lang-python/pycurl/trunk Message-ID: Revision: 16443 http://gar.svn.sourceforge.net/gar/?rev=16443&view=rev Author: dmichelsen Date: 2011-12-09 14:22:32 +0000 (Fri, 09 Dec 2011) Log Message: ----------- lang-python/pycurl/trunk: Patch to latest fixpack from OpenSolaris Modified Paths: -------------- csw/mgar/pkg/lang-python/pycurl/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/lang-python/pycurl/trunk/files/pycurl-mondo.patch Removed Paths: ------------- csw/mgar/pkg/lang-python/pycurl/trunk/files/remove-static-libs.patch Modified: csw/mgar/pkg/lang-python/pycurl/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pycurl/trunk/Makefile 2011-12-09 13:27:28 UTC (rev 16442) +++ csw/mgar/pkg/lang-python/pycurl/trunk/Makefile 2011-12-09 14:22:32 UTC (rev 16443) @@ -11,9 +11,13 @@ endef MASTER_SITES = http://pycurl.sourceforge.net/download/ +MASTER_SITES += http://src.opensolaris.org/source/raw/userland/src/components/python/pycurl/patches/ DISTFILES += $(DISTNAME).tar.gz -PATCHFILES += remove-static-libs.patch +# Taken from http://src.opensolaris.org/source/xref/userland/src/components/python/pycurl/patches/pycurl-mondo.patch +PATCHFILES += pycurl-mondo.patch +PATCHDIRLEVEL = 0 + VENDOR_URL = http://pycurl.sourceforge.net/ PACKAGES += CSWpy-curl Added: csw/mgar/pkg/lang-python/pycurl/trunk/files/pycurl-mondo.patch =================================================================== --- csw/mgar/pkg/lang-python/pycurl/trunk/files/pycurl-mondo.patch (rev 0) +++ csw/mgar/pkg/lang-python/pycurl/trunk/files/pycurl-mondo.patch 2011-12-09 14:22:32 UTC (rev 16443) @@ -0,0 +1,196 @@ +--- setup.py.orig Fri Aug 07 15:00:51 2009 -0700 ++++ setup.py Tue Sep 21 10:59:03 2010 -0700 +@@ -97,8 +97,7 @@ + else: + extra_compile_args.append(e) + libs = split_quoted( +- os.popen("'%s' --libs" % CURL_CONFIG).read()+\ +- os.popen("'%s' --static-libs" % CURL_CONFIG).read()) ++ os.popen("'%s' --libs" % CURL_CONFIG).read()) + for e in libs: + if e[:2] == "-l": + libraries.append(e[2:]) + +--- src/pycurl.c.orig Fri Aug 07 15:00:51 2009 -0700 ++++ src/pycurl.c Tue Sep 21 10:59:03 2010 -0700 +@@ -747,6 +747,59 @@ + return self; + } + ++/* initializer - used to intialize curl easy handles for use with pycurl */ ++static int ++util_curl_init(CurlObject *self) ++{ ++ int res; ++ char *s = NULL; ++ ++ /* Set curl error buffer and zero it */ ++ res = curl_easy_setopt(self->handle, CURLOPT_ERRORBUFFER, self->error); ++ if (res != CURLE_OK) { ++ return (-1); ++ } ++ memset(self->error, 0, sizeof(self->error)); ++ ++ /* Set backreference */ ++ res = curl_easy_setopt(self->handle, CURLOPT_PRIVATE, (char *) self); ++ if (res != CURLE_OK) { ++ return (-1); ++ } ++ ++ /* Enable NOPROGRESS by default, i.e. no progress output */ ++ res = curl_easy_setopt(self->handle, CURLOPT_NOPROGRESS, (long)1); ++ if (res != CURLE_OK) { ++ return (-1); ++ } ++ ++ /* Disable VERBOSE by default, i.e. no verbose output */ ++ res = curl_easy_setopt(self->handle, CURLOPT_VERBOSE, (long)0); ++ if (res != CURLE_OK) { ++ return (-1); ++ } ++ ++ /* Set FTP_ACCOUNT to NULL by default */ ++ res = curl_easy_setopt(self->handle, CURLOPT_FTP_ACCOUNT, NULL); ++ if (res != CURLE_OK) { ++ return (-1); ++ } ++ ++ /* Set default USERAGENT */ ++ s = (char *) malloc(7 + strlen(LIBCURL_VERSION) + 1); ++ if (s == NULL) { ++ return (-1); ++ } ++ strcpy(s, "PycURL/"); strcpy(s+7, LIBCURL_VERSION); ++ res = curl_easy_setopt(self->handle, CURLOPT_USERAGENT, (char *) s); ++ if (res != CURLE_OK) { ++ free(s); ++ return (-1); ++ } ++ self->options[ OPT_INDEX(CURLOPT_USERAGENT) ] = s; s = NULL; ++ ++ return (0); ++} + + /* constructor - this is a module-level function returning a new instance */ + static CurlObject * +@@ -754,7 +807,6 @@ + { + CurlObject *self = NULL; + int res; +- char *s = NULL; + + UNUSED(dummy); + +@@ -768,44 +820,9 @@ + if (self->handle == NULL) + goto error; + +- /* Set curl error buffer and zero it */ +- res = curl_easy_setopt(self->handle, CURLOPT_ERRORBUFFER, self->error); +- if (res != CURLE_OK) +- goto error; +- memset(self->error, 0, sizeof(self->error)); +- +- /* Set backreference */ +- res = curl_easy_setopt(self->handle, CURLOPT_PRIVATE, (char *) self); +- if (res != CURLE_OK) +- goto error; +- +- /* Enable NOPROGRESS by default, i.e. no progress output */ +- res = curl_easy_setopt(self->handle, CURLOPT_NOPROGRESS, (long)1); +- if (res != CURLE_OK) +- goto error; +- +- /* Disable VERBOSE by default, i.e. no verbose output */ +- res = curl_easy_setopt(self->handle, CURLOPT_VERBOSE, (long)0); +- if (res != CURLE_OK) +- goto error; +- +- /* Set FTP_ACCOUNT to NULL by default */ +- res = curl_easy_setopt(self->handle, CURLOPT_FTP_ACCOUNT, NULL); +- if (res != CURLE_OK) +- goto error; +- +- /* Set default USERAGENT */ +- s = (char *) malloc(7 + strlen(LIBCURL_VERSION) + 1); +- if (s == NULL) +- goto error; +- strcpy(s, "PycURL/"); strcpy(s+7, LIBCURL_VERSION); +- res = curl_easy_setopt(self->handle, CURLOPT_USERAGENT, (char *) s); +- if (res != CURLE_OK) { +- free(s); +- goto error; +- } +- self->options[ OPT_INDEX(CURLOPT_USERAGENT) ] = s; s = NULL; +- ++ res = util_curl_init(self); ++ if (res < 0) ++ goto error; + /* Success - return new object */ + return self; + +@@ -1425,6 +1442,7 @@ + do_curl_reset(CurlObject *self) + { + unsigned int i; ++ int res; + + curl_easy_reset(self->handle); + +@@ -1452,7 +1470,17 @@ + } + } + ++ res = util_curl_init(self); ++ if (res < 0) ++ goto error; ++ ++ Py_INCREF(Py_None); + return Py_None; ++ ++error: ++ Py_DECREF(self); /* this also closes self->handle */ ++ PyErr_SetString(ErrorObject, "resetting curl failed"); ++ return NULL; + } + + /* --------------- unsetopt/setopt/getinfo --------------- */ +@@ -1501,6 +1529,8 @@ + case CURLOPT_RANDOM_FILE: + case CURLOPT_SSL_CIPHER_LIST: + case CURLOPT_USERPWD: ++ case CURLOPT_PROXYUSERNAME: ++ case CURLOPT_PROXYPASSWORD: + SETOPT((char *) 0); + opt_index = OPT_INDEX(option); + break; +@@ -1627,6 +1657,9 @@ + case CURLOPT_SSH_HOST_PUBLIC_KEY_MD5: + case CURLOPT_CRLFILE: + case CURLOPT_ISSUERCERT: ++ case CURLOPT_NOPROXY: ++ case CURLOPT_PROXYUSERNAME: ++ case CURLOPT_PROXYPASSWORD: + /* FIXME: check if more of these options allow binary data */ + str = PyString_AsString_NoNUL(obj); + if (str == NULL) +@@ -3561,6 +3594,9 @@ + insint_c(d, "PROXYTYPE_HTTP", CURLPROXY_HTTP); + insint_c(d, "PROXYTYPE_SOCKS4", CURLPROXY_SOCKS4); + insint_c(d, "PROXYTYPE_SOCKS5", CURLPROXY_SOCKS5); ++ insint_c(d, "PROXYTYPE_HTTP_1_0", CURLPROXY_HTTP_1_0); ++ insint_c(d, "PROXYTYPE_SOCKS4A", CURLPROXY_SOCKS4A); ++ insint_c(d, "PROXYTYPE_SOCKS5_HOSTNAME", CURLPROXY_SOCKS5_HOSTNAME); + + /* curl_httpauth: constants for setopt(HTTPAUTH, x) */ + insint_c(d, "HTTPAUTH_NONE", CURLAUTH_NONE); +@@ -3735,6 +3771,9 @@ + insint_c(d, "CRLFILE", CURLOPT_CRLFILE); + insint_c(d, "ISSUERCERT", CURLOPT_ISSUERCERT); + insint_c(d, "ADDRESS_SCOPE", CURLOPT_ADDRESS_SCOPE); ++ insint_c(d, "NOPROXY", CURLOPT_NOPROXY); ++ insint_c(d, "PROXYUSERNAME", CURLOPT_PROXYUSERNAME); ++ insint_c(d, "PROXYPASSWORD", CURLOPT_PROXYPASSWORD); + + insint_c(d, "M_TIMERFUNCTION", CURLMOPT_TIMERFUNCTION); + insint_c(d, "M_SOCKETFUNCTION", CURLMOPT_SOCKETFUNCTION); Deleted: csw/mgar/pkg/lang-python/pycurl/trunk/files/remove-static-libs.patch =================================================================== --- csw/mgar/pkg/lang-python/pycurl/trunk/files/remove-static-libs.patch 2011-12-09 13:27:28 UTC (rev 16442) +++ csw/mgar/pkg/lang-python/pycurl/trunk/files/remove-static-libs.patch 2011-12-09 14:22:32 UTC (rev 16443) @@ -1,12 +0,0 @@ ---- pycurl-7.19.0/setup.py.orig 2010-01-21 14:37:49.752839487 +0100 -+++ pycurl-7.19.0/setup.py 2010-01-21 14:38:07.351889431 +0100 -@@ -97,8 +97,7 @@ - else: - extra_compile_args.append(e) - libs = split_quoted( -- os.popen("'%s' --libs" % CURL_CONFIG).read()+\ -- os.popen("'%s' --static-libs" % CURL_CONFIG).read()) -+ os.popen("'%s' --libs" % CURL_CONFIG).read()) - for e in libs: - if e[:2] == "-l": - libraries.append(e[2:]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Dec 9 16:12:51 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Dec 2011 15:12:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[16444] csw/mgar/pkg/librsvg/trunk/Makefile Message-ID: Revision: 16444 http://gar.svn.sourceforge.net/gar/?rev=16444&view=rev Author: dmichelsen Date: 2011-12-09 15:12:51 +0000 (Fri, 09 Dec 2011) Log Message: ----------- librsvg/trunk: Enhanced 64 bit build Modified Paths: -------------- csw/mgar/pkg/librsvg/trunk/Makefile Modified: csw/mgar/pkg/librsvg/trunk/Makefile =================================================================== --- csw/mgar/pkg/librsvg/trunk/Makefile 2011-12-09 14:22:32 UTC (rev 16443) +++ csw/mgar/pkg/librsvg/trunk/Makefile 2011-12-09 15:12:51 UTC (rev 16444) @@ -32,7 +32,6 @@ RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWgtk2 RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibcroco -RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibgsf RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibgthread2-0-0 RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibpng12-0 @@ -72,8 +71,8 @@ RUNTIME_DEP_PKGS_CSWrsvg += CSWlibgio2-0-0 PACKAGES += CSWlibrsvg-gnome -PKGFILES_CSWlibrsvg-gnome = $(libdir)/gtk-2.0/.* SPKG_DESC_CSWlibrsvg-gnome += Scalable Vector Graphics library - Gnome module +PKGFILES_CSWlibrsvg-gnome += $(call baseisadirs,$(libdir),gtk-2.0/.*) RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibrsvg2-2 RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWpango RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibintl8 @@ -101,4 +100,6 @@ STRIP_LIBTOOL = 1 +EXTRA_MERGE_DIRS_isa-extra = $(bindir) + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Dec 9 16:56:50 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Dec 2011 15:56:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[16445] csw/mgar/pkg/gnome-base/gnomevfs2/trunk Message-ID: Revision: 16445 http://gar.svn.sourceforge.net/gar/?rev=16445&view=rev Author: dmichelsen Date: 2011-12-09 15:56:50 +0000 (Fri, 09 Dec 2011) Log Message: ----------- gnome-base/gnomevfs2/trunk: Update to 2.24.4, complete rework Modified Paths: -------------- csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile csw/mgar/pkg/gnome-base/gnomevfs2/trunk/checksums Modified: csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile 2011-12-09 15:12:51 UTC (rev 16444) +++ csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile 2011-12-09 15:56:50 UTC (rev 16445) @@ -1,6 +1,6 @@ NAME = gnomevfs2 GNOME_PROJ = gnome-vfs -VERSION = 2.24.2 +VERSION = 2.24.4 CATEGORIES = gnome DESCRIPTION = GnomeVFS - Filesystem Abstraction library @@ -11,55 +11,68 @@ DISTNAME = $(GNOME_PROJ)-$(VERSION) DISTFILES = $(DISTNAME).tar.bz2 -PACKAGES = CSWgnomevfs2 CSWgnomevfs2devel CSWgnomevfs2doc -CATALOGNAME_CSWgnomevfs2 = gnomevfs2 -CATALOGNAME_CSWgnomevfs2devel = gnomevfs2_devel -CATALOGNAME_CSWgnomevfs2doc = gnomevfs2_doc +# New glib only available on Solaris 10 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +VENDOR_URL = http://projects.gnome.org/gnome-vfs/ + +# Many more missing +BUILD_DEP_PKGS += CSWlibgamin-dev + +PACKAGES += CSWgnomevfs2 SPKG_DESC_CSWgnomevfs2 += $(DESCRIPTION) -SPKG_DESC_CSWgnomevfs2devel += $(DESCRIPTION) - developer package -SPKG_DESC_CSWgnomevfs2doc += $(DESCRIPTION) - documentation +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWlibbz2-1-0 +RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWsambalib +RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWlibfam0 +RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWlibgssapi-krb5-2 +RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWlibgconf2-4 +RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWlibkrb5-3 +RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWlibdbus-glib1-2 +RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWlibcom-err3 +RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWosslrt +RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWlibk5crypto3 +RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWlibdbus1-3 -RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWfconfig CSWftype2 CSWggettextrt CSWglib2 -RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWgtk2 CSWlibatk CSWlibcairo CSWlibx11 -RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWdbusglib CSWlibdbus CSWlibxext CSWpango -RUNTIME_DEP_PKGS_CSWgnomevfs2devel += CSWgnomevfs2 -RUNTIME_DEP_PKGS_CSWgnomevfs2doc += CSWgnomevfs2 +# This is an explicit fallback *after* /opt/csw/share, see xdg-reinplacement below +CHECKPKG_OVERRIDES_CSWgnomevfs2 += file-with-bad-content|/usr/share|root/opt/csw/lib/libgnomevfs-2.so.0.2400.4 +CHECKPKG_OVERRIDES_CSWgnomevfs2 += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libgnomevfs-2.so.0.2400.4 -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 +# No real package split done yet +CHECKPKG_OVERRIDES_CSWgnomevfs2 += shared-lib-pkgname-mismatch -SPKG_SOURCEURL = http://projects.gnome.org/gnome-vfs/ +PACKAGES += CSWgnomevfs2-dev +SPKG_DESC_CSWgnomevfs2-dev += Development files for GNOME vfs +PKGFILES_CSWgnomevfs2-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWgnomevfs2-dev += $(sharedstatedir)/gtk-doc/.* +RUNTIME_DEP_PKGS_CSWgnomevfs2-dev += CSWgnomevfs2 +OBSOLETED_BY_CSWgnomevfs2-dev = CSWgnomevfs2devel +CATALOGNAME_CSWgnomevfs2devel = gnomevfs2_devel_stub +OBSOLETED_BY_CSWgnomevfs2-dev = CSWgnomevfs2doc +CATALOGNAME_CSWgnomevfs2doc = gnomevfs2_doc_stub -EXTRA_INC = $(prefix)/X11/include -EXTRA_LIB = $(prefix)/X11/lib -EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +REINPLACEMENTS += xdg +REINPLACE_MATCH_xdg = /usr/local/share +REINPLACE_WITH_xdg = $(sharedstatedir) +REINPLACE_FILES_xdg = libgnomevfs/xdgmime.c -NOISAEXEC = 1 -#NOISALIST = 1 -# libdbus not 64-bit yet +NOISALIST = 1 BUILD64 = 1 -PKGFILES_CSWgnomevfs2devel = $(PKGFILES_DEVEL) -PKGFILES_CSWgnomevfs2doc = $(sharedstatedir)/gtk-doc/.* +# STRIP_LIBTOOL = 1 -ARCHALL_CSWgnomevfs2doc = 1 - -LIBS = -lsocket -lnsl -export LIBS - -EXTRA_INC = $(prefix)/X11/include -EXTRA_LIB = $(prefix)/X11/lib -EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) - -STRIP_LIBTOOL = 1 - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-static=no CONFIGURE_ARGS += --enable-gtk-doc -CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include -CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) -TEST_TARGET = check +include gar/category.mk -include gar/category.mk +# For GNU gettext +PATH := /opt/csw/gnu:$(PATH) Modified: csw/mgar/pkg/gnome-base/gnomevfs2/trunk/checksums =================================================================== --- csw/mgar/pkg/gnome-base/gnomevfs2/trunk/checksums 2011-12-09 15:12:51 UTC (rev 16444) +++ csw/mgar/pkg/gnome-base/gnomevfs2/trunk/checksums 2011-12-09 15:56:50 UTC (rev 16445) @@ -1 +1 @@ -371d13e7306eb82e3fe3748a7584c440 gnome-vfs-2.24.2.tar.bz2 +a05fab03eeef10a47dd156b758982f2e gnome-vfs-2.24.4.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Dec 9 17:09:08 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 09 Dec 2011 16:09:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[16446] csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile Message-ID: Revision: 16446 http://gar.svn.sourceforge.net/gar/?rev=16446&view=rev Author: dmichelsen Date: 2011-12-09 16:09:08 +0000 (Fri, 09 Dec 2011) Log Message: ----------- gnome-base/gnomevfs2/trunk: Add missing override for amd64 Modified Paths: -------------- csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile Modified: csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile 2011-12-09 15:56:50 UTC (rev 16445) +++ csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile 2011-12-09 16:09:08 UTC (rev 16446) @@ -44,6 +44,7 @@ # This is an explicit fallback *after* /opt/csw/share, see xdg-reinplacement below CHECKPKG_OVERRIDES_CSWgnomevfs2 += file-with-bad-content|/usr/share|root/opt/csw/lib/libgnomevfs-2.so.0.2400.4 CHECKPKG_OVERRIDES_CSWgnomevfs2 += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libgnomevfs-2.so.0.2400.4 +CHECKPKG_OVERRIDES_CSWgnomevfs2 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libgnomevfs-2.so.0.2400.4 # No real package split done yet CHECKPKG_OVERRIDES_CSWgnomevfs2 += shared-lib-pkgname-mismatch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Fri Dec 9 18:58:48 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Fri, 09 Dec 2011 17:58:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[16447] csw/mgar/pkg/gdk-pixbuf/trunk Message-ID: Revision: 16447 http://gar.svn.sourceforge.net/gar/?rev=16447&view=rev Author: guengel Date: 2011-12-09 17:58:48 +0000 (Fri, 09 Dec 2011) Log Message: ----------- gdk-pixbuf/trunk: Fixed some checkpkg complains. Renamed packages. Removed unnecessary CATALOGNAMEs. Modified Paths: -------------- csw/mgar/pkg/gdk-pixbuf/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/gdk-pixbuf/trunk/files/CSWgdkpixbuf-loaders.postinstall Removed Paths: ------------- csw/mgar/pkg/gdk-pixbuf/trunk/files/CSWgdkpixbuf.postinstall Modified: csw/mgar/pkg/gdk-pixbuf/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdk-pixbuf/trunk/Makefile 2011-12-09 16:09:08 UTC (rev 16446) +++ csw/mgar/pkg/gdk-pixbuf/trunk/Makefile 2011-12-09 17:58:48 UTC (rev 16447) @@ -12,60 +12,57 @@ MASTER_SITES = $(GNOME_MIRROR) DISTFILES = $(DISTNAME).tar.xz -DISTFILES += CSWgdkpixbuf.postinstall +DISTFILES += CSWgdkpixbuf-loaders.postinstall -EXPANDVARS = CSWgdkpixbuf.postinstall +EXPANDVARS = CSWgdkpixbuf-loaders.postinstall PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 PACKAGES += CSWgdkpixbuf -CATALOGNAME_CSWgdkpixbuf = gdkpixbuf SPKG_DESC_CSWgdkpixbuf = $(DESCRIPTION) -RUNTIME_DEP_PKGS_CSWgdkpixbuf = CSWlibgdk_pixbuf2-0-0 -RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgdk_pixbuf_xlib2-0-0 +RUNTIME_DEP_PKGS_CSWgdkpixbuf = CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgdk-pixbuf-xlib2-0-0 +RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWgdkpixbuf-loaders RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibintl8 RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibpng12-0 -RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibz1 +# I assume if one installs CSWgdkpixbuf, one wants all the stuff +# except -dev +CHECKPKG_OVERRIDES_CSWgdkpixbuf += surplus-dependency|CSWlibgdk-pixbuf-xlib2-0-0 +CHECKPKG_OVERRIDES_CSWgdkpixbuf += surplus-dependency|CSWgdkpixbuf-loaders +PACKAGES += CSWlibgdk-pixbuf2-0-0 +SPKG_DESC_CSWlibgdk-pixbuf2-0-0 = $(DESCRIPTION), libgdk_pixbuf-2.0.so.0 +PKGFILES_CSWlibgdk-pixbuf2-0-0 = $(call pkgfiles_lib,libgdk_pixbuf-2.0.so.0) +RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf2-0-0 = CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf2-0-0 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf2-0-0 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf2-0-0 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf2-0-0 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf2-0-0 += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf2-0-0 += CSWlibintl8 -PACKAGES += CSWlibgdk_pixbuf2-0-0 -SPKG_DESC_CSWlibgdk_pixbuf2-0-0 = $(DESCRIPTION), libgdk_pixbuf-2.0.so.0 -PKGFILES_CSWlibgdk_pixbuf2-0-0 = $(call pkgfiles_lib,libgdk_pixbuf-2.0.so.0) -RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf2-0-0 = CSWlibgio2-0-0 -RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf2-0-0 += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf2-0-0 += CSWlibgmodule2-0-0 -RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf2-0-0 += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf2-0-0 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf2-0-0 += CSWlibpng12-0 -RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf2-0-0 += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf2-0-0 += CSWlibz1 +PACKAGES += CSWlibgdk-pixbuf-xlib2-0-0 +SPKG_DESC_CSWlibgdk-pixbuf-xlib2-0-0 = $(DESCRIPTION), libgdk_pixbuf_xlib-2.0.so.0 +PKGFILES_CSWlibgdk-pixbuf-xlib2-0-0 = $(call pkgfiles_lib,libgdk_pixbuf_xlib-2.0.so.0) +RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 = CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibpng12-0 -PACKAGES += CSWlibgdk_pixbuf_xlib2-0-0 -SPKG_DESC_CSWlibgdk_pixbuf_xlib2-0-0 = $(DESCRIPTION), libgdk_pixbuf_xlib-2.0.so.0 -PKGFILES_CSWlibgdk_pixbuf_xlib2-0-0 = $(call pkgfiles_lib,libgdk_pixbuf_xlib-2.0.so.0) -RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf_xlib2-0-0 = CSWlibgdk_pixbuf2-0-0 -RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf_xlib2-0-0 += CSWlibgio2-0-0 -RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf_xlib2-0-0 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf_xlib2-0-0 += CSWlibgmodule2-0-0 -RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf_xlib2-0-0 += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf_xlib2-0-0 += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf_xlib2-0-0 += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf_xlib2-0-0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf_xlib2-0-0 += CSWlibpng12-0 -RUNTIME_DEP_PKGS_CSWlibgdk_pixbuf_xlib2-0-0 += CSWlibz1 - PACKAGES += CSWgdkpixbuf-loaders -CATALOGNAME_CSWgdkpixbuf-loaders = gdkpixbuf_loaders SPKG_DESC_CSWgdkpixbuf-loaders = $(DESCRIPTION), loader modules -PKGFILES_CSWgdkpixbuf-loaders = .*/loaders/.*\.so -RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders = CSWlibgdk_pixbuf2-0-0 -RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWjbigkit +PKGFILES_CSWgdkpixbuf-loaders = .*/loaders/.*\.so +PKGFILES_CSWgdkpixbuf-loaders += .*/gdk-pixbuf-query-loaders +RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders = CSWlibgdk-pixbuf2-0-0 RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibgmodule2-0-0 @@ -74,14 +71,14 @@ RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibintl8 RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibjpeg7 RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibpng12-0 -RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibz1 RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWtiff -PACKAGES += CSWgdkpixbuf-dev -CATALOGNAME_CSWgdkpixbuf-dev = gdkpixbuf_dev -SPKG_DESC_CSWgdkpixbuf-dev = Developtment files $(DESCRIPTION) -PKGFILES_CSWgdkpixbuf-dev = $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWgdkpixbuf-dev = CSWgdkpixbuf +PACKAGES += CSWlibgdk-pixbuf-dev +SPKG_DESC_CSWlibgdk-pixbuf-dev = Developtment files $(DESCRIPTION) +PKGFILES_CSWlibgdk-pixbuf-dev = $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-dev = CSWgdkpixbuf +RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-dev += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-dev += CSWlibgdk-pixbuf-xlib2-0-0 BUILD_DEP_PKGS = CSWggettext-dev BUILD_DEP_PKGS += CSWjbigkit @@ -92,10 +89,7 @@ BUILD_DEP_PKGS += CSWlibpng-dev BUILD_DEP_PKGS += CSWtiff -# I don't want to do this, but currently I see no other way to get the 32/64 -# binaries into the package. The default only includes the 32bit binaries, but -# not the 64bit ones. --raos -ISAEXEC = 1 +ISAEXEC = 0 BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) Copied: csw/mgar/pkg/gdk-pixbuf/trunk/files/CSWgdkpixbuf-loaders.postinstall (from rev 16442, csw/mgar/pkg/gdk-pixbuf/trunk/files/CSWgdkpixbuf.postinstall) =================================================================== --- csw/mgar/pkg/gdk-pixbuf/trunk/files/CSWgdkpixbuf-loaders.postinstall (rev 0) +++ csw/mgar/pkg/gdk-pixbuf/trunk/files/CSWgdkpixbuf-loaders.postinstall 2011-12-09 17:58:48 UTC (rev 16447) @@ -0,0 +1,37 @@ +#!/bin/sh +# +# We will call gdk-pixbuf-query-loaders for all ISAs + +GDKPBQUERY=gdk-pixbuf-query-loaders +GDKPBQUERY_OPTS="--update-cache" + +echo "** Updating GDK pixbuf loaders" + +# But first, do the obvious +/usr/bin/printf "- Default ISA... " + at prefix@/bin/${GDKPBQUERY} ${GDKPBQUERY_OPTS} >/dev/null 2>&1 +if [ $? -ne 0 ] +then + echo "Error" +else + echo "OK" +fi + +# Now, do all other +for i in @BUILD_ISAS@ +do + queryloader=@prefix@/bin/$i/gdk-pixbuf-query-loaders + if [ -x "${queryloader}" ] + then + /usr/bin/printf "- $i ISA... " + "${queryloader}" ${GDKPBQUERY_OPTS} >/dev/null 2>&1 + if [ $? -ne 0 ] + then + echo "Error" + else + echo "OK" + fi + fi +done + +echo "** Done updating GDK pixbuf loaders" Deleted: csw/mgar/pkg/gdk-pixbuf/trunk/files/CSWgdkpixbuf.postinstall =================================================================== --- csw/mgar/pkg/gdk-pixbuf/trunk/files/CSWgdkpixbuf.postinstall 2011-12-09 16:09:08 UTC (rev 16446) +++ csw/mgar/pkg/gdk-pixbuf/trunk/files/CSWgdkpixbuf.postinstall 2011-12-09 17:58:48 UTC (rev 16447) @@ -1,37 +0,0 @@ -#!/bin/sh -# -# We will call gdk-pixbuf-query-loaders for all ISAs - -GDKPBQUERY=gdk-pixbuf-query-loaders -GDKPBQUERY_OPTS="--update-cache" - -echo "** Updating GDK pixbuf loaders" - -# But first, do the obvious -/usr/bin/printf "- Default ISA... " - at prefix@/bin/${GDKPBQUERY} ${GDKPBQUERY_OPTS} >/dev/null 2>&1 -if [ $? -ne 0 ] -then - echo "Error" -else - echo "OK" -fi - -# Now, do all other -for i in @BUILD_ISAS@ -do - queryloader=@prefix@/bin/$i/gdk-pixbuf-query-loaders - if [ -x "${queryloader}" ] - then - /usr/bin/printf "- $i ISA... " - "${queryloader}" ${GDKPBQUERY_OPTS} >/dev/null 2>&1 - if [ $? -ne 0 ] - then - echo "Error" - else - echo "OK" - fi - fi -done - -echo "** Done updating GDK pixbuf loaders" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Fri Dec 9 19:51:38 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Fri, 09 Dec 2011 18:51:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[16448] csw/mgar/pkg/postgresql/branches/postgresql-8. 3-raos Message-ID: Revision: 16448 http://gar.svn.sourceforge.net/gar/?rev=16448&view=rev Author: guengel Date: 2011-12-09 18:51:38 +0000 (Fri, 09 Dec 2011) Log Message: ----------- postgresql/branches/postgresql-8.3-raos: Some more polishing. SONAME will not be adjusted anymore, the PostgreSQL guys did/could not provide an answer to wheter mixing libraries and binaries of different pgsql versions is good or bad (http://archives.postgresql.org/pgsql-general/2011-12/msg00161.php). Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile Added Paths: ----------- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/0001-ecpg-usr-local-include-replacement.patch Removed Paths: ------------- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/0000-SONAME-including-major-and-minor-version.patch Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile 2011-12-09 17:58:48 UTC (rev 16447) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile 2011-12-09 18:51:38 UTC (rev 16448) @@ -57,28 +57,25 @@ # # 1. Adjust BASE_VERSION and/or PATCHLEVEL. # -# 2. Make sure the SONAME patch for -# $(WORKDIR)/postgresql-x.y.z/src/Makefile.shlib still works -# -# 3. Comment out 'post-install-modulated:'. So we can identify changes in the +# 2. Comment out 'post-install-modulated:'. So we can identify changes in the # server/client environment. # -# 4. `mgar package` +# 3. `mgar package` # -# 5. If step 4 succeeded, check the prototype of +# 4. If step 3 succeeded, check the prototype of # CSW$(NAME)$(BASE_VERSION_NODOT) for files that have slipped by and put # them in the proper place. # -# 6. Uncomment 'post-install-modulated:'. This will shed light on changes in +# 5. Uncomment 'post-install-modulated:'. This will shed light on changes in # the contrib environment. # -# 7. `mgar spotless package` +# 6. `mgar spotless package` # -# 8. If step 6 succeeded, check the prototype of +# 7. If step 6 succeeded, check the prototype of # CSW$(NAME)$(BASE_VERSION_NODOT) for files that have slipped by and put # them in the proper place. # -# 9. Make sure the proper version numbers are used for the library packages. +# 8. Make sure the proper version numbers are used for the library packages. # This BUILD is NOT READY! It needs work before it's usable. @@ -97,6 +94,10 @@ VENDOR_URL = http://www.postgresql.org/ define BLURB + PostgreSQL is a powerful, open source object-relational database system. + It has more than 15 years of active development and a proven architecture + that has earned it a strong reputation for reliability, data integrity, + and correctness. endef # @@ -126,7 +127,7 @@ # also shared object in the same place, so make sure you don't mix up things SO_NAMES_CONTRIB = _int.so adminpack.so autoinc.so btree_gist.so chkpass.so SO_NAMES_CONTRIB += cube.so dblink.so dict_int.so dict_xsyn.so earthdistance.so -SO_NAMES_CONTRIB += fuzzystrmatch.so hstore.so insert_username.so int_aggregate.so +SO_NAMES_CONTRIB += fuzzystrmatch.so hstore.so insert_username.so int_aggregate.so SO_NAMES_CONTRIB += isn.so lo.so ltree.so moddatetime.so pageinspect.so pg_buffercache.so SO_NAMES_CONTRIB += pg_freespacemap.so pg_trgm.so pgcrypto.so pgrowlocks.so pgstattuple.so SO_NAMES_CONTRIB += pgxml.so refint.so seg.so sslinfo.so tablefunc.so test_parser.so timetravel.so tsearch2.so @@ -169,7 +170,7 @@ # These are the alternatives provided for the packages. I use them in the # recipe to iterate over all possible alternatives (see 'post-merge:') -myALTERNATIVES= server client devel contrib +myALTERNATIVES= server client dev contrib # My sed, since EXPANDVARS has proven unreliable to me mySED = gsed -e 's|@USERGROUPFILE_VERSIONED@|$(USERGROUPFILE_VERSIONED)|g' \ @@ -192,12 +193,9 @@ DISTFILES += $(USERGROUPFILETMPL) DISTFILES += $(CSWPGSQLCONFFILETMPL) -# This patch will make the SONAME of the libraries to contain the major and -# minor version. This is important when having multiple installations of -# PostgreSQL where the library versions differ only in the minor part, such as -# with PostgreSQL 8.3 and PostgreSQL 8.4. -# -PATCHFILES += 0000-SONAME-including-major-and-minor-version.patch +# This patch will replace /usr/local/include by /opt/csw/include in +# ecpg.c and thus silence a checkpkg error. +PATCHFILES += 0001-ecpg-usr-local-include-replacement.patch INITSMF = $(sysconfdir)/init\.d/$(INITSCRIPTFILE_VERSIONED) USERGROUP = $(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED) @@ -205,13 +203,14 @@ LICENSE = COPYRIGHT +# The alternatives modifier should stay in place, until I figured out +# how to properly employ the ALTERNATIVES system in this build. PROTOTYPE_MODIFIERS = pgdata alternatives PROTOTYPE_FILES_pgdata = $(PGLOCALSTATEDIR_BASE).* PROTOTYPE_USER_pgdata = postgres PROTOTYPE_GROUP_pgdata = sys PROTOTYPE_PERMS_pgdata = 0700 PROTOTYPE_CLASS_pgdata = ugfiles - PROTOTYPE_FILES_alternatives = .*/alternatives/$(NAME)$(BASE_VERSION_NODOT).* PROTOTYPE_CLASS_alternatives = cswalternatives @@ -220,10 +219,13 @@ # package to make sure there are no files slipped by. PACKAGES = CSW$(NAME)$(BASE_VERSION_NODOT) SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT) = PostgreSQL $(VERSION), Meta Package +ARCHALL_CSW$(NAME)$(BASE_VERSION_NODOT) = 1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT) = CSW$(NAME)$(BASE_VERSION_NODOT)-server RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT) += CSW$(NAME)$(BASE_VERSION_NODOT)-client RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT) += CSW$(NAME)$(BASE_VERSION_NODOT)-contrib -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT) += CSW$(NAME)$(BASE_VERSION_NODOT)-devel +CHECKPKG_OVERRIDES_CSW$(NAME)$(BASE_VERSION_NODOT) += surplus-dependency|CSW$(NAME)$(BASE_VERSION_NODOT)-client +CHECKPKG_OVERRIDES_CSW$(NAME)$(BASE_VERSION_NODOT) += surplus-dependency|CSW$(NAME)$(BASE_VERSION_NODOT)-server +CHECKPKG_OVERRIDES_CSW$(NAME)$(BASE_VERSION_NODOT) += surplus-dependency|CSW$(NAME)$(BASE_VERSION_NODOT)-contrib PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-server SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-server = PostgreSQL $(VERSION), Server @@ -238,14 +240,17 @@ PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*$(sysconfdir)/init\.d/.* PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*$(sysconfdir)/$(CSWPGSQLCONFFILE_VERSIONED).CSW PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_server.* -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server = CSWlibiconv2 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibncurses5 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibreadline6 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibxml2 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibxslt RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWosslrt RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibz1 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibpq5-1 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibpq5 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibgnugetopt0 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibxslt1 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibgssapi-krb5-2 +CHECKPKG_OVERRIDES_CSW$(NAME)$(BASE_VERSION_NODOT)-server = $(foreach n,$(SO_NAMES_SERVER), soname-not-part-of-filename|soname=lib$(n).0|filename=$(n) ) +# This one isn't covered by the above. +CHECKPKG_OVERRIDES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += soname-not-part-of-filename|soname=libplpgsql.so.1|filename=plpgsql.so #ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-server = $(foreach i,$(BUILD_ISAS), server_$(i)) PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-client @@ -254,14 +259,14 @@ PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += $(foreach n,$(BIN_NAMES_CLIENT),.*/man1/$(n)-$(BASE_VERSION_NODOT)\.1$$) PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += $(MISC_NAMES_CLIENT) PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_client.* -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client = CSWlibiconv2 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibncurses5 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibreadline6 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibxml2 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibxslt RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWosslrt RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibz1 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibpq5-1 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibpq5 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibgnugetopt0 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibxslt1 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibgssapi-krb5-2 #ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-client = $(foreach i,$(BUILD_ISAS), client_$(i)) PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-contrib @@ -271,55 +276,68 @@ PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += $(foreach n,$(SO_NAMES_CONTRIB),.*/$(NAME)/$(BASE_VERSION_NODOT)/*$(n)$$) PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*/$(NAME)/$(BASE_VERSION_NODOT)/contrib.* PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_contrib.* -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = CSWlibiconv2 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibxml2 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibxslt RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWosslrt RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibz1 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibpq5-1 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibpq5 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibgnugetopt0 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibxslt1 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibgssapi-krb5-2 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibreadline6 +# This will produce some 'unused overrides'. +CHECKPKG_OVERRIDES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = $(foreach n,$(SO_NAMES_CONTRIB), soname-not-part-of-filename|soname=lib$(n).0|filename=$(n) ) #ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = $(foreach i,$(BUILD_ISAS), contrib_$(i)) -PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-devel -SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-devel = PostgreSQL $(VERSION), Development Files -PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-devel = .*/pgxs/.* -PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-devel += $(PKGFILES_DEVEL) -PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-devel += $(foreach n,$(BIN_NAMES_DEVEL),.*$(n)$$) -PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-devel += $(foreach n,$(BIN_NAMES_DEVEL),.*/man1/$(n)-$(BASE_VERSION_NODOT)\.1$$) -PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-devel += .*/man5/.* -PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-devel += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_devel.* -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-devel += CSWlibecpg_compat3-0 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-devel += CSWlibecpg6-0 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-devel += CSWlibpq5-1 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-devel += CSWlibpgtypes3-0 -#ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-devel = $(foreach i,$(BUILD_ISAS), devel_$(i)) +PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-dev +SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-dev = PostgreSQL $(VERSION), Development Files +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-dev = .*/pgxs/.* +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += $(PKGFILES_DEVEL) +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += $(foreach n,$(BIN_NAMES_DEVEL),.*$(n)$$) +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += $(foreach n,$(BIN_NAMES_DEVEL),.*/man1/$(n)-$(BASE_VERSION_NODOT)\.1$$) +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += .*/man5/.* +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_dev.* +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += CSWlibecpg-compat3 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += CSWlibecpg6 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += CSWlibpq5 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += CSWlibpgtypes3 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += CSWlibz1 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += CSWlibgssapi-krb5-2 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += CSWlibgnugetopt0 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += CSWlibxslt1 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += CSWlibreadline6 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += CSWosslrt +# Those '/usr/local' are ok, they are in a HPUX section of the file +CHECKPKG_OVERRIDES_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += $(foreach i,$(BUILD_ISAS), $(subst $(ISA_DEFAULT)/,,file-with-bad-content|/usr/local|root$(libdir)/$(i)/$(NAME)/$(BASE_VERSION_NODOT)/pgxs/src/Makefile.shlib) ) +#ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-dev = $(foreach i,$(BUILD_ISAS), dev_$(i)) PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-doc ARCHALL_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = 1 SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = PostgreSQL $(VERSION), Documentation Files -PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = .*/doc/$(NAME)/$(BASE_VERSION_NODOT)/.* +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = .*/doc/$(NAME)/$(BASE_VERSION_NODOT)/.*\.html -PACKAGES += CSWlibecpg_compat3-0 -SPKG_DESC_CSWlibecpg_compat3-0 = PostgreSQL $(VERSION), libecpg_compat -PKGFILES_CSWlibecpg_compat3-0 = $(call pkgfiles_lib,libecpg_compat.so.3) -RUNTIME_DEP_PKGS_CSWlibecpg_compat3-0 = CSWlibecpg6-0 -RUNTIME_DEP_PKGS_CSWlibecpg_compat3-0 += CSWlibpgtypes3-0 -RUNTIME_DEP_PKGS_CSWlibecpg_compat3-0 += CSWlibpq5-1 +PACKAGES += CSWlibecpg-compat3 +SPKG_DESC_CSWlibecpg-compat3 = PostgreSQL $(VERSION), libecpg_compat +PKGFILES_CSWlibecpg-compat3 = $(call pkgfiles_lib,libecpg_compat.so.3) +RUNTIME_DEP_PKGS_CSWlibecpg-compat3 = CSWlibecpg6 +RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibpgtypes3 +RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibpq5 -PACKAGES += CSWlibecpg6-0 -SPKG_DESC_CSWlibecpg6-0 = PostgreSQL $(VERSION), libecpg -PKGFILES_CSWlibecpg6-0 = $(call pkgfiles_lib,libecpg.so.6) -RUNTIME_DEP_PKGS_CSWlibecpg6-0 += CSWlibpgtypes3-0 -RUNTIME_DEP_PKGS_CSWlibecpg6-0 += CSWlibpq5-1 +PACKAGES += CSWlibecpg6 +SPKG_DESC_CSWlibecpg6 = PostgreSQL $(VERSION), libecpg +PKGFILES_CSWlibecpg6 = $(call pkgfiles_lib,libecpg.so.6) +RUNTIME_DEP_PKGS_CSWlibecpg6 += CSWlibpgtypes3 +RUNTIME_DEP_PKGS_CSWlibecpg6 += CSWlibpq5 -PACKAGES += CSWlibpgtypes3-0 -SPKG_DESC_CSWlibpgtypes3-0 = PostgreSQL $(VERSION), libpgtypes -PKGFILES_CSWlibpgtypes3-0 = $(call pkgfiles_lib,libpgtypes.so.3) +PACKAGES += CSWlibpgtypes3 +SPKG_DESC_CSWlibpgtypes3 = PostgreSQL $(VERSION), libpgtypes +PKGFILES_CSWlibpgtypes3 = $(call pkgfiles_lib,libpgtypes.so.3) -PACKAGES += CSWlibpq5-1 -CATALOGNAME_CSWlibpq5-1 = libpq5_1 -SPKG_DESC_CSWlibpq5-1 = PostgreSQL $(VERSION), libpq -PKGFILES_CSWlibpq5-1 = $(call pkgfiles_lib,libpq.so.5) -RUNTIME_DEP_PKGS_CSWlibpq5-1 = CSWosslrt +PACKAGES += CSWlibpq5 +SPKG_DESC_CSWlibpq5 = PostgreSQL $(VERSION), libpq +PKGFILES_CSWlibpq5 = $(call pkgfiles_lib,libpq.so.5) +RUNTIME_DEP_PKGS_CSWlibpq5 = CSWosslrt +RUNTIME_DEP_PKGS_CSWlibpq5 += CSWlibgssapi-krb5-2 BUILD_DEP_PKGS = CSWlibxml2-dev BUILD_DEP_PKGS += CSWlibxslt-dev @@ -329,6 +347,7 @@ BUILD_DEP_PKGS += CSWlibreadline-dev BUILD_DEP_PKGS += CSWgsed # gsed is used in this recipe BUILD_DEP_PKGS += CSWlibz-dev +BUILD_DEP_PKGS += CSWlibgnugetopt-dev EXTRA_LD_OPTIONS = -R$(prefix)/lib/\$$ISALIST @@ -372,7 +391,7 @@ # # IMHO, tests are essential, especially on Solaris, and I do not experience # build troubles on x86 having them enabled --raos -SKIPTEST ?= 1 +#SKIPTEST ?= 1 include gar/category.mk # This variable will be increased in the course of the following foreach loops @@ -392,7 +411,7 @@ ## Devel # reset priority alt_priority = 20 -$(foreach alt,$(BUILD_ISAS), $(eval alt_priority=$(shell expr $(alt_priority) + 10)) $(eval ALTERNATIVE_devel_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_DEVEL)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-devel $(libexecdir)/$(subst devel_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) $(eval ALTERNATIVE_devel_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_DEVEL)),$(BIN_NAMES_DEVEL)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT) $(libexecdir)/$(subst devel_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) ) +$(foreach alt,$(BUILD_ISAS), $(eval alt_priority=$(shell expr $(alt_priority) + 10)) $(eval ALTERNATIVE_dev_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_DEVEL)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-dev $(libexecdir)/$(subst dev_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) $(eval ALTERNATIVE_dev_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_DEVEL)),$(BIN_NAMES_DEVEL)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT) $(libexecdir)/$(subst dev_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) ) # We adjust the $(pkglibdir) found in $(WORKSRC)/src/Makefile.global.in, so # that it should be possible to install 8.x and 8.y concurrently @@ -432,6 +451,13 @@ f_no_suffix="`echo $$f | sed -e 's/.1$$//'`" ; \ mv $$f $${f_no_suffix}-$(BASE_VERSION_NODOT).1 ; \ done +# Change path names in documentation + for f in $(PKGROOT)$(docdir)/$(NAME)/$(BASE_VERSION_NODOT)/html/*.html $(PKGROOT)$(mandir)/man1/*.1 $(PKGROOT)$(datadir)/$(NAME)/$(BASE_VERSION_NODOT)/*.sample ; do \ + gsed -i -e 's|/usr/local/pgsql/data|$(localstatedir)/$(NAME)/$(BASE_VERSION_NODOT)|g' \ + -e 's|/usr/local/pgsql/|$(prefix)/|g' \ + -e 's|/usr/local|$(prefix)|g' \ + -e 's|/usr/share|$(datadir)|g' $$f ; \ + done @$(MAKECOOKIE) pre-package: Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/0000-SONAME-including-major-and-minor-version.patch =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/0000-SONAME-including-major-and-minor-version.patch 2011-12-09 17:58:48 UTC (rev 16447) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/0000-SONAME-including-major-and-minor-version.patch 2011-12-09 18:51:38 UTC (rev 16448) @@ -1,25 +0,0 @@ -From 0783c2280989e9175f1bdb91a0035822275eebc4 Mon Sep 17 00:00:00 2001 -From: Rafael Ostertag -Date: Sun, 4 Dec 2011 23:39:42 +0100 -Subject: [PATCH] SONAME including major and minor version - ---- - src/Makefile.shlib | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/Makefile.shlib b/src/Makefile.shlib -index 84fc918..15594cf 100644 ---- a/src/Makefile.shlib -+++ b/src/Makefile.shlib -@@ -93,7 +93,7 @@ shlib_bare = lib$(NAME)$(DLSUFFIX) - - override CFLAGS += $(CFLAGS_SL) - --soname = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) -+soname = $(shlib) - - ifeq ($(PORTNAME), aix) - shlib = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) --- -1.7.6.1 - Added: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/0001-ecpg-usr-local-include-replacement.patch =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/0001-ecpg-usr-local-include-replacement.patch (rev 0) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/0001-ecpg-usr-local-include-replacement.patch 2011-12-09 18:51:38 UTC (rev 16448) @@ -0,0 +1,25 @@ +From dc1c663085dff97adb890534a5d6bd7ede0bf542 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Fri, 9 Dec 2011 18:09:58 +0100 +Subject: [PATCH] ecpg /usr/local/include replacement + +--- + src/interfaces/ecpg/preproc/ecpg.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/interfaces/ecpg/preproc/ecpg.c b/src/interfaces/ecpg/preproc/ecpg.c +index e42d443..ac19813 100644 +--- a/src/interfaces/ecpg/preproc/ecpg.c ++++ b/src/interfaces/ecpg/preproc/ecpg.c +@@ -255,7 +255,7 @@ main(int argc, char *const argv[]) + } + + add_include_path("."); +- add_include_path("/usr/local/include"); ++ add_include_path("/opt/csw/include"); + get_include_path(my_exec_path, include_path); + add_include_path(include_path); + add_include_path("/usr/include"); +-- +1.7.6.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 Sat Dec 10 00:53:10 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 09 Dec 2011 23:53:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[16449] csw/mgar/pkg/cpan/Dancer/trunk Message-ID: Revision: 16449 http://gar.svn.sourceforge.net/gar/?rev=16449&view=rev Author: bonivart Date: 2011-12-09 23:53:09 +0000 (Fri, 09 Dec 2011) Log Message: ----------- cpan/Dancer/trunk: update to 1.3080, problems with one test Modified Paths: -------------- csw/mgar/pkg/cpan/Dancer/trunk/Makefile csw/mgar/pkg/cpan/Dancer/trunk/checksums Modified: csw/mgar/pkg/cpan/Dancer/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Dancer/trunk/Makefile 2011-12-09 18:51:38 UTC (rev 16448) +++ csw/mgar/pkg/cpan/Dancer/trunk/Makefile 2011-12-09 23:53:09 UTC (rev 16449) @@ -1,7 +1,7 @@ NAME = Dancer -VERSION = 1.3011 +VERSION = 1.3080 CATEGORIES = cpan -AUTHOR = SUKRIA +AUTHOR = XSAWYERX DESCRIPTION = A minimal-effort oriented web application framework define BLURB @@ -18,9 +18,8 @@ RUNTIME_DEP_PKGS_CSWpm-dancer += CSWpmmimetypes RUNTIME_DEP_PKGS_CSWpm-dancer += CSWpmlibwww -# These have not been released -CHECKPKG_OVERRIDES_CSWpm-dancer += unidentified-dependency|CSWpm-http-server-simple-psgi -CHECKPKG_OVERRIDES_CSWpm-dancer += unidentified-dependency|CSWpm-http-body +# Problems with t/00_base/14_changelog.t, all others pass +TEST_SCRIPTS = include gar/category.mk Modified: csw/mgar/pkg/cpan/Dancer/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Dancer/trunk/checksums 2011-12-09 18:51:38 UTC (rev 16448) +++ csw/mgar/pkg/cpan/Dancer/trunk/checksums 2011-12-09 23:53:09 UTC (rev 16449) @@ -1 +1 @@ -7336ad38346f3a16191c9f12900f67b6 Dancer-1.3011.tar.gz +0c8545adbd76266c15c009cec2cc3bea Dancer-1.3080.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Sat Dec 10 12:09:13 2011 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Sat, 10 Dec 2011 11:09:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[16450] csw/mgar/pkg/ganglia-modules-solaris/trunk/Makefile Message-ID: Revision: 16450 http://gar.svn.sourceforge.net/gar/?rev=16450&view=rev Author: d_pocock Date: 2011-12-10 11:09:12 +0000 (Sat, 10 Dec 2011) Log Message: ----------- ganglia-modules-solaris: add correct config file location Modified Paths: -------------- csw/mgar/pkg/ganglia-modules-solaris/trunk/Makefile Modified: csw/mgar/pkg/ganglia-modules-solaris/trunk/Makefile =================================================================== --- csw/mgar/pkg/ganglia-modules-solaris/trunk/Makefile 2011-12-09 23:53:09 UTC (rev 16449) +++ csw/mgar/pkg/ganglia-modules-solaris/trunk/Makefile 2011-12-10 11:09:12 UTC (rev 16450) @@ -54,7 +54,7 @@ include gar/category.mk post-install-modulated: - @ginstall -d $(DESTDIR)/etc/opt/csw/ganglia - cp $(WORKSRC)/conf.d/mod_io.conf $(DESTDIR)/etc/opt/csw/ganglia/mod_io.conf.CSW - cp $(WORKSRC)/conf.d/mod_multicpu.conf $(DESTDIR)/etc/opt/csw/ganglia/mod_multicpu.conf.CSW + @ginstall -d $(DESTDIR)/etc/opt/csw/ganglia/conf.d + cp $(WORKSRC)/conf.d/mod_io.conf $(DESTDIR)/etc/opt/csw/ganglia/conf.d/mod_io.conf.CSW + cp $(WORKSRC)/conf.d/mod_multicpu.conf $(DESTDIR)/etc/opt/csw/ganglia/conf.d/mod_multicpu.conf.CSW This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Sat Dec 10 12:44:38 2011 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Sat, 10 Dec 2011 11:44:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[16451] csw/mgar/pkg/ganglia/trunk/Makefile Message-ID: Revision: 16451 http://gar.svn.sourceforge.net/gar/?rev=16451&view=rev Author: d_pocock Date: 2011-12-10 11:44:38 +0000 (Sat, 10 Dec 2011) Log Message: ----------- ganglia: exclude modmulticpu.so as it is only for Linux Modified Paths: -------------- csw/mgar/pkg/ganglia/trunk/Makefile Modified: csw/mgar/pkg/ganglia/trunk/Makefile =================================================================== --- csw/mgar/pkg/ganglia/trunk/Makefile 2011-12-10 11:09:12 UTC (rev 16450) +++ csw/mgar/pkg/ganglia/trunk/Makefile 2011-12-10 11:44:38 UTC (rev 16451) @@ -158,7 +158,9 @@ PKGFILES_CSWgangliaagent += /opt/csw/lib/ganglia/modsys.so PKGFILES_CSWgangliaagent += /opt/csw/lib/ganglia/modcpu.so PKGFILES_CSWgangliaagent += /opt/csw/lib/ganglia/modnet.so -PKGFILES_CSWgangliaagent += /opt/csw/lib/ganglia/modmulticpu.so +# this version is only for Linux users, get the package +# ganglia-modules-solaris for the Solaris modmulticpu.so +#PKGFILES_CSWgangliaagent += /opt/csw/lib/ganglia/modmulticpu.so PKGFILES_CSWgangliaagent += /opt/csw/lib/ganglia/modmem.so PKGFILES_CSWgangliaagent += /opt/csw/lib/ganglia/modload.so PKGFILES_CSWgangliaagent += /opt/csw/lib/ganglia/moddisk.so This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sat Dec 10 15:53:10 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 10 Dec 2011 14:53:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[16452] csw/mgar/pkg/gtk2/branches/2.24-raos/ Message-ID: Revision: 16452 http://gar.svn.sourceforge.net/gar/?rev=16452&view=rev Author: guengel Date: 2011-12-10 14:53:10 +0000 (Sat, 10 Dec 2011) Log Message: ----------- branching for developing latest gtk2 recipe. Added Paths: ----------- csw/mgar/pkg/gtk2/branches/2.24-raos/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sat Dec 10 16:56:38 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 10 Dec 2011 15:56:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[16453] csw/mgar/pkg/cpan/Dancer/trunk/Makefile Message-ID: Revision: 16453 http://gar.svn.sourceforge.net/gar/?rev=16453&view=rev Author: bonivart Date: 2011-12-10 15:56:38 +0000 (Sat, 10 Dec 2011) Log Message: ----------- cpan/Dancer/trunk: fix deps, enable tests again - only needed a newer Test::More Modified Paths: -------------- csw/mgar/pkg/cpan/Dancer/trunk/Makefile Modified: csw/mgar/pkg/cpan/Dancer/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Dancer/trunk/Makefile 2011-12-10 14:53:10 UTC (rev 16452) +++ csw/mgar/pkg/cpan/Dancer/trunk/Makefile 2011-12-10 15:56:38 UTC (rev 16453) @@ -16,11 +16,8 @@ RUNTIME_DEP_PKGS_CSWpm-dancer += CSWpmuri RUNTIME_DEP_PKGS_CSWpm-dancer += CSWpm-http-body RUNTIME_DEP_PKGS_CSWpm-dancer += CSWpmmimetypes -RUNTIME_DEP_PKGS_CSWpm-dancer += CSWpmlibwww +RUNTIME_DEP_PKGS_CSWpm-dancer += CSWpm-libwww-perl -# Problems with t/00_base/14_changelog.t, all others pass -TEST_SCRIPTS = - include gar/category.mk post-install-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 Sun Dec 11 00:05:54 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 10 Dec 2011 23:05:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[16454] csw/mgar Message-ID: Revision: 16454 http://gar.svn.sourceforge.net/gar/?rev=16454&view=rev Author: wahwah Date: 2011-12-10 23:05:54 +0000 (Sat, 10 Dec 2011) Log Message: ----------- An example of processing catalog data in Perl Added Paths: ----------- csw/mgar/lib/ csw/mgar/lib/web/ csw/mgar/lib/web/examples/ csw/mgar/lib/web/examples/catalog_data.pl Added: csw/mgar/lib/web/examples/catalog_data.pl =================================================================== --- csw/mgar/lib/web/examples/catalog_data.pl (rev 0) +++ csw/mgar/lib/web/examples/catalog_data.pl 2011-12-10 23:05:54 UTC (rev 16454) @@ -0,0 +1,22 @@ +#!/usr/bin/env perl +# +# This is a minimal example how to read a process catalog data via the +# REST interface. The idea is that you fetch data from a specific URL, +# which is a JSON representation of a data structure. You decode the +# structure, and you're ready to process it. +# +# In this example, the data structure read is one package catalog. + +use warnings; + +use LWP::Simple; +use JSON; +use Data::Dumper; + +my $url = 'http://buildfarm.opencsw.org/pkgdb/rest/catalogs/unstable/sparc/SunOS5.9/'; +# More URL patterns at: http://buildfarm.opencsw.org/pkgdb/ +my $json_string = get $url; +die "Couldn't get $url" unless defined $json_string; +my $catalog_data = decode_json $json_string; +# You can process the catalog data here. +print Dumper($catalog_data); 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 Dec 11 00:38:39 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 10 Dec 2011 23:38:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[16455] csw/mgar/pkg/gcc4/trunk Message-ID: Revision: 16455 http://gar.svn.sourceforge.net/gar/?rev=16455&view=rev Author: wahwah Date: 2011-12-10 23:38:39 +0000 (Sat, 10 Dec 2011) Log Message: ----------- gcc4/trunk: set default RPATH Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/gcc4/trunk/files/0002-default-rpath.diff Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2011-12-10 23:05:54 UTC (rev 16454) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2011-12-10 23:38:39 UTC (rev 16455) @@ -21,6 +21,9 @@ LIBOBJC = 3 +# Add default RPATH +PATCHFILES = 0002-default-rpath.diff + PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 Added: csw/mgar/pkg/gcc4/trunk/files/0002-default-rpath.diff =================================================================== --- csw/mgar/pkg/gcc4/trunk/files/0002-default-rpath.diff (rev 0) +++ csw/mgar/pkg/gcc4/trunk/files/0002-default-rpath.diff 2011-12-10 23:38:39 UTC (rev 16455) @@ -0,0 +1,14 @@ +--- gcc-4.6.2/gcc/config/i386/sol2-10.h 2011-12-11 00:34:08.341738656 +0100 ++++ gcc-4.6.2/gcc/config/i386/sol2-10.h.mod 2011-12-11 00:32:27.545153224 +0100 +@@ -131,6 +131,11 @@ + #define LINK_ARCH_SPEC TARGET_LD_EMULATION \ + "%{m64:" LINK_ARCH64_SPEC "}%{!m64:" LINK_ARCH32_SPEC "}" + ++#undef LINK_LIBGCC_SPEC ++#define LINK_LIBGCC_SPEC "%{m64:" "-R /opt/csw/lib/64 %D" "}%{!m64:" "-R /opt/csw/lib %D" "}" ++#undef MD_EXEC_PREFIX ++#define MD_EXEC_PREFIX "/opt/csw/bin/" ++#define LINK_ELIMINATE_DUPLICATE_LDIRECTORIES 0 + /* We do not need to search a special directory for startup files. */ + #undef MD_STARTFILE_PREFIX + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Sun Dec 11 06:06:35 2011 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Sun, 11 Dec 2011 05:06:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[16456] csw/mgar/pkg/ganglia/trunk Message-ID: Revision: 16456 http://gar.svn.sourceforge.net/gar/?rev=16456&view=rev Author: d_pocock Date: 2011-12-11 05:06:35 +0000 (Sun, 11 Dec 2011) Log Message: ----------- ganglia: add new config options for 3.2.0, add dwoo cache dir Modified Paths: -------------- csw/mgar/pkg/ganglia/trunk/Makefile csw/mgar/pkg/ganglia/trunk/files/conf.php Modified: csw/mgar/pkg/ganglia/trunk/Makefile =================================================================== --- csw/mgar/pkg/ganglia/trunk/Makefile 2011-12-10 23:38:39 UTC (rev 16455) +++ csw/mgar/pkg/ganglia/trunk/Makefile 2011-12-11 05:06:35 UTC (rev 16456) @@ -187,6 +187,7 @@ PKGFILES_CSWgangliagmetad += /etc/opt/csw/ganglia/gmetad.conf.CSW PKGFILES_CSWgangliagmetad += /etc/opt/csw/init.d/cswgmetad PKGFILES_CSWgangliagmetad += /var/opt/csw/ganglia/rrds +PKGFILES_CSWgangliagmetad += /var/opt/csw/ganglia/dwoo PKGFILES_CSWgangliagmetad += /opt/csw/share/man/man1/gmetad.1 PKGFILES_CSWgangliaweb = $(WWWGANGLIA)/.* @@ -206,6 +207,7 @@ PROTOTYPE_FILTER_CSWgangliagmetad = awk '\ $$$$3 ~ /\/var\/opt\/csw\/ganglia\/rrds/ { $$$$5 = "nobody"; $$$$6 = "nogroup" } \ +$$$$3 ~ /\/var\/opt\/csw\/ganglia\/dwoo/ { $$$$5 = "nobody"; $$$$6 = "nogroup" } \ { print }' Modified: csw/mgar/pkg/ganglia/trunk/files/conf.php =================================================================== --- csw/mgar/pkg/ganglia/trunk/files/conf.php 2011-12-10 23:38:39 UTC (rev 16455) +++ csw/mgar/pkg/ganglia/trunk/files/conf.php 2011-12-11 05:06:35 UTC (rev 16456) @@ -21,6 +21,13 @@ $gmetad_root = "/var/opt/csw/ganglia"; $rrds = "$gmetad_root/rrds"; +# Where Dwoo (PHP templating engine) store compiled templates +$dwoo_compiled_dir = "$gmetad_root/dwoo"; + +# Where to find filter configuration files, if not set filtering +# will be disabled +#$filter_dir = "$gmetad_root/filters"; + # Leave this alone if rrdtool is installed in $gmetad_root, # otherwise, change it if it is installed elsewhere (like /usr/bin) define("RRDTOOL", "/opt/csw/bin/rrdtool"); @@ -36,6 +43,9 @@ # Location for modular-graph files. $graphdir='./graph.d'; +# Display statistical values on RRD graphs; i.e.: average, min, max +$graphreport_stats = true; + # # If you want to grab data from a different ganglia source specify it here. # Although, it would be strange to alter the IP since the Round-Robin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Sun Dec 11 06:41:47 2011 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Sun, 11 Dec 2011 05:41:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[16457] csw/mgar/pkg/ganglia/trunk/Makefile Message-ID: Revision: 16457 http://gar.svn.sourceforge.net/gar/?rev=16457&view=rev Author: d_pocock Date: 2011-12-11 05:41:47 +0000 (Sun, 11 Dec 2011) Log Message: ----------- ganglia: correct dwoo directory packaging Modified Paths: -------------- csw/mgar/pkg/ganglia/trunk/Makefile Modified: csw/mgar/pkg/ganglia/trunk/Makefile =================================================================== --- csw/mgar/pkg/ganglia/trunk/Makefile 2011-12-11 05:06:35 UTC (rev 16456) +++ csw/mgar/pkg/ganglia/trunk/Makefile 2011-12-11 05:41:47 UTC (rev 16457) @@ -187,11 +187,11 @@ PKGFILES_CSWgangliagmetad += /etc/opt/csw/ganglia/gmetad.conf.CSW PKGFILES_CSWgangliagmetad += /etc/opt/csw/init.d/cswgmetad PKGFILES_CSWgangliagmetad += /var/opt/csw/ganglia/rrds -PKGFILES_CSWgangliagmetad += /var/opt/csw/ganglia/dwoo PKGFILES_CSWgangliagmetad += /opt/csw/share/man/man1/gmetad.1 PKGFILES_CSWgangliaweb = $(WWWGANGLIA)/.* PKGFILES_CSWgangliaweb += /opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW +PKGFILES_CSWgangliaweb += /var/opt/csw/ganglia/dwoo PRESERVECONF = /opt/csw/apache2/etc/extra/httpd-ganglia.conf PRESERVECONF += /etc/opt/csw/ganglia/gmond.conf @@ -207,10 +207,12 @@ PROTOTYPE_FILTER_CSWgangliagmetad = awk '\ $$$$3 ~ /\/var\/opt\/csw\/ganglia\/rrds/ { $$$$5 = "nobody"; $$$$6 = "nogroup" } \ +{ print }' + +PROTOTYPE_FILTER_CSWgangliaweb = awk '\ $$$$3 ~ /\/var\/opt\/csw\/ganglia\/dwoo/ { $$$$5 = "nobody"; $$$$6 = "nogroup" } \ { print }' - #ARCHALL_CSWganglia-dev = 1 ARCHALL_CSWgangliaweb = 1 ARCHALL_CSWgangliamodpython = 1 @@ -252,6 +254,7 @@ @rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/modgstatus.conf.CSW endif @ginstall -d $(DESTDIR)/var/opt/csw/ganglia/rrds + @ginstall -d $(DESTDIR)/var/opt/csw/ganglia/dwoo @ginstall -D $(WORKSRC)/gmond/gmond.conf.5 $(DESTDIR)$(mandir)/man5/gmond.conf.5 @ginstall -D $(WORKSRC)/mans/gmetad.1 $(DESTDIR)$(mandir)/man1/gmetad.1 @ginstall -D $(WORKSRC)/mans/gmond.1 $(DESTDIR)$(mandir)/man1/gmond.1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Dec 11 09:26:22 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 11 Dec 2011 08:26:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[16458] csw/mgar/pkg/glib2/trunk/Makefile Message-ID: Revision: 16458 http://gar.svn.sourceforge.net/gar/?rev=16458&view=rev Author: guengel Date: 2011-12-11 08:26:22 +0000 (Sun, 11 Dec 2011) Log Message: ----------- glib2/trunk: Adjusted RUNTIME_DEPs. Modified Paths: -------------- csw/mgar/pkg/glib2/trunk/Makefile Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2011-12-11 05:41:47 UTC (rev 16457) +++ csw/mgar/pkg/glib2/trunk/Makefile 2011-12-11 08:26:22 UTC (rev 16458) @@ -70,6 +70,7 @@ RUNTIME_DEP_PKGS_CSWglib2 += CSWlibgthread2-0-0 RUNTIME_DEP_PKGS_CSWglib2 += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWglib2 += CSWgio-fam-backend +CHECKPKG_OVERRIDES_CSWglib2 += surplus-dependency|CSWgio-fam-backend PACKAGES += CSWgio-fam-backend @@ -81,6 +82,9 @@ RUNTIME_DEP_PKGS_CSWgio-fam-backend += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWgio-fam-backend += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWgio-fam-backend += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWgio-fam-backend += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWgio-fam-backend += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWgio-fam-backend += CSWlibz1 PACKAGES += CSWlibgio2-0-0 SPKG_DESC_CSWlibgio2-0-0 += $(DESCRIPTION), libgio-2.0.so.0 @@ -128,17 +132,17 @@ RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWglib2 RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWiconv RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWzlib -RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibgmodule2-0-0 -RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWgio-fam-backend +RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWlibgio2-0-0 PKGFILES_CSWlibglib2-dev += $(PKGFILES_DEVEL) PKGFILES_CSWlibglib2-dev += .*/glib-2.0/include/.* OBSOLETED_BY_CSWlibglib2-dev = CSWglib2devel CATALOGNAME_CSWglib2devel = glib2_devel_stub + BUILD_DEP_PKGS = CSWggettext CSWlibpcre-dev CSWlibiconv-dev CSWlibffi5 # To make the tests working BUILD_DEP_PKGS += CSWpython CSWdbuspython CSWsharedmimeinfo This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Dec 11 14:36:34 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 11 Dec 2011 13:36:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[16459] csw/mgar/pkg/gdk-pixbuf/trunk/Makefile Message-ID: Revision: 16459 http://gar.svn.sourceforge.net/gar/?rev=16459&view=rev Author: guengel Date: 2011-12-11 13:36:33 +0000 (Sun, 11 Dec 2011) Log Message: ----------- gdk-pixbuf/trunk: Split off doc. Modified Paths: -------------- csw/mgar/pkg/gdk-pixbuf/trunk/Makefile Modified: csw/mgar/pkg/gdk-pixbuf/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdk-pixbuf/trunk/Makefile 2011-12-11 08:26:22 UTC (rev 16458) +++ csw/mgar/pkg/gdk-pixbuf/trunk/Makefile 2011-12-11 13:36:33 UTC (rev 16459) @@ -35,6 +35,11 @@ CHECKPKG_OVERRIDES_CSWgdkpixbuf += surplus-dependency|CSWlibgdk-pixbuf-xlib2-0-0 CHECKPKG_OVERRIDES_CSWgdkpixbuf += surplus-dependency|CSWgdkpixbuf-loaders +PACKAGES += CSWgdkpixbuf-doc +SPKG_DESC_CSWgdkpixbuf-doc = $(DESCRIPTION), Documentation +ARCHALL_CSWgdkpixbuf-doc = 1 +PKGFILES_CSWgdkpixbuf-doc = .*/gtk-doc/.* + PACKAGES += CSWlibgdk-pixbuf2-0-0 SPKG_DESC_CSWlibgdk-pixbuf2-0-0 = $(DESCRIPTION), libgdk_pixbuf-2.0.so.0 PKGFILES_CSWlibgdk-pixbuf2-0-0 = $(call pkgfiles_lib,libgdk_pixbuf-2.0.so.0) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Dec 11 15:41:01 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 11 Dec 2011 14:41:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[16460] csw/mgar/pkg/gdk-pixbuf/trunk/Makefile Message-ID: Revision: 16460 http://gar.svn.sourceforge.net/gar/?rev=16460&view=rev Author: guengel Date: 2011-12-11 14:41:00 +0000 (Sun, 11 Dec 2011) Log Message: ----------- gdk-pixbuf/trunk: Added checkpkg overrides for file-collisions which might be used during transition from gtk 2.18 to gtk 2.24 Modified Paths: -------------- csw/mgar/pkg/gdk-pixbuf/trunk/Makefile Modified: csw/mgar/pkg/gdk-pixbuf/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdk-pixbuf/trunk/Makefile 2011-12-11 13:36:33 UTC (rev 16459) +++ csw/mgar/pkg/gdk-pixbuf/trunk/Makefile 2011-12-11 14:41:00 UTC (rev 16460) @@ -6,6 +6,61 @@ GARTYPE = v2 CATEGORIES = gnome +# Those overrides must be removed after gtk 2.24 has been released. +# +# Somewhere between the 2.18 and 2.24 release of gtk, the gtk guys +# decided to spin off gdk-pixbuf. +# +# So in the transition phase of 2.18 to 2.24 we have to face +# collisions, since 2.18 brings its own gdk-pixbuf, whereas 2.24 uses +# this package +# +# A simple test with emacs-gtk and gftp does not indicate that +# installing gdk-pixbuf over an existing gtk 2.18 installation does +# break anything. +CHECKPKG_OVERRIDES_CSWgdkpixbuf-loaders += file-collision|/opt/csw/bin/gdk-pixbuf-query-loaders|CSWgdkpixbuf-loaders|CSWgtk2 +CHECKPKG_OVERRIDES_CSWgdkpixbuf += file-collision|/opt/csw/bin/gdk-pixbuf-csource|CSWgdkpixbuf|CSWgtk2 +CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-query-loaders.html|CSWgdkpixbuf-doc|CSWgtk2doc +CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/GdkPixbufLoader.html|CSWgdkpixbuf-doc|CSWgtk2doc +CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-csource.html|CSWgdkpixbuf-doc|CSWgtk2doc +CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/api-index-2-4.html|CSWgdkpixbuf-doc|CSWgtk2doc +CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/left.png|CSWgdkpixbuf-doc|CSWgtk2doc +CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/right.png|CSWgdkpixbuf-doc|CSWgtk2doc +CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-rendering.html|CSWgdkpixbuf-doc|CSWgtk2doc +CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/rn02.html|CSWgdkpixbuf-doc|CSWgtk2doc +CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-from-drawables.html|CSWgdkpixbuf-doc|CSWgtk2doc +CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/license.html|CSWgdkpixbuf-doc|CSWgtk2doc +CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/api-index-2-6.html|CSWgdkpixbuf-doc|CSWgtk2doc +CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/api-index-2-10.html|CSWgdkpixbuf-doc|CSWgtk2doc +CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/style.css|CSWgdkpixbuf-doc|CSWgtk2doc +CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/composite.png|CSWgdkpixbuf-doc|CSWgtk2doc +CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/rn01.html|CSWgdkpixbuf-doc|CSWgtk2doc +CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf.devhelp2|CSWgdkpixbuf-doc|CSWgtk2doc +CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Versioning.html|CSWgdkpixbuf-doc|CSWgtk2doc +CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/api-index-full.html|CSWgdkpixbuf-doc|CSWgtk2doc +CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/index.sgml|CSWgdkpixbuf-doc|CSWgtk2doc +CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/api-index-2-8.html|CSWgdkpixbuf-doc|CSWgtk2doc +CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/home.png|CSWgdkpixbuf-doc|CSWgtk2doc +CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/index.html|CSWgdkpixbuf-doc|CSWgtk2doc +CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/up.png|CSWgdkpixbuf-doc|CSWgtk2doc +CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/api-index-deprecated.html|CSWgdkpixbuf-doc|CSWgtk2doc +CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/api-index-2-12.html|CSWgdkpixbuf-doc|CSWgtk2doc +CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/api-index-2-14.html|CSWgdkpixbuf-doc|CSWgtk2doc +CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/api-index-2-2.html|CSWgdkpixbuf-doc|CSWgtk2doc +CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Module-Interface.html|CSWgdkpixbuf-doc|CSWgtk2doc +CHECKPKG_OVERRIDES_CSWlibgdk-pixbuf-dev += file-collision|/opt/csw/lib/sparcv9/libgdk_pixbuf-2.0.so|CSWgtk2|CSWlibgdk-pixbuf-dev +CHECKPKG_OVERRIDES_CSWlibgdk-pixbuf-dev += file-collision|/opt/csw/lib/libgdk_pixbuf_xlib-2.0.so|CSWgtk2|CSWlibgdk-pixbuf-dev +CHECKPKG_OVERRIDES_CSWlibgdk-pixbuf-dev += file-collision|/opt/csw/lib/pkgconfig/gdk-pixbuf-xlib-2.0.pc|CSWgtk2devel|CSWlibgdk-pixbuf-dev +CHECKPKG_OVERRIDES_CSWlibgdk-pixbuf-dev += file-collision|/opt/csw/lib/sparcv9/pkgconfig/gdk-pixbuf-2.0.pc|CSWgtk2devel|CSWlibgdk-pixbuf-dev +CHECKPKG_OVERRIDES_CSWlibgdk-pixbuf-dev += file-collision|/opt/csw/lib/sparcv9/libgdk_pixbuf_xlib-2.0.so|CSWgtk2|CSWlibgdk-pixbuf-dev +CHECKPKG_OVERRIDES_CSWlibgdk-pixbuf-dev += file-collision|/opt/csw/lib/pkgconfig/gdk-pixbuf-2.0.pc|CSWgtk2devel|CSWlibgdk-pixbuf-dev +CHECKPKG_OVERRIDES_CSWlibgdk-pixbuf-dev += file-collision|/opt/csw/lib/sparcv9/pkgconfig/gdk-pixbuf-xlib-2.0.pc|CSWgtk2devel|CSWlibgdk-pixbuf-dev +CHECKPKG_OVERRIDES_CSWlibgdk-pixbuf-dev += file-collision|/opt/csw/lib/libgdk_pixbuf-2.0.so|CSWgtk2|CSWlibgdk-pixbuf-dev +CHECKPKG_OVERRIDES_CSWlibgdk-pixbuf2-0-0 += file-collision|/opt/csw/lib/sparcv9/libgdk_pixbuf-2.0.so.0|CSWgtk2|CSWlibgdk-pixbuf2-0-0 +CHECKPKG_OVERRIDES_CSWlibgdk-pixbuf2-0-0 += file-collision|/opt/csw/lib/libgdk_pixbuf-2.0.so.0|CSWgtk2|CSWlibgdk-pixbuf2-0-0 +CHECKPKG_OVERRIDES_CSWlibgdk-pixbuf-xlib2-0-0 += file-collision|/opt/csw/lib/libgdk_pixbuf_xlib-2.0.so.0|CSWgtk2|CSWlibgdk-pixbuf-xlib2-0-0 +CHECKPKG_OVERRIDES_CSWlibgdk-pixbuf-xlib2-0-0 += file-collision|/opt/csw/lib/sparcv9/libgdk_pixbuf_xlib-2.0.so.0|CSWgtk2|CSWlibgdk-pixbuf-xlib2-0-0 + DESCRIPTION = GNOME tools for pixmap manupulation define BLURB endef This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Dec 11 16:09:36 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 11 Dec 2011 15:09:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[16461] csw/mgar/pkg/gdk-pixbuf/trunk/Makefile Message-ID: Revision: 16461 http://gar.svn.sourceforge.net/gar/?rev=16461&view=rev Author: guengel Date: 2011-12-11 15:09:36 +0000 (Sun, 11 Dec 2011) Log Message: ----------- gdk-pixbuf/trunk: Some more file-collisions added Modified Paths: -------------- csw/mgar/pkg/gdk-pixbuf/trunk/Makefile Modified: csw/mgar/pkg/gdk-pixbuf/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdk-pixbuf/trunk/Makefile 2011-12-11 14:41:00 UTC (rev 16460) +++ csw/mgar/pkg/gdk-pixbuf/trunk/Makefile 2011-12-11 15:09:36 UTC (rev 16461) @@ -60,7 +60,14 @@ CHECKPKG_OVERRIDES_CSWlibgdk-pixbuf2-0-0 += file-collision|/opt/csw/lib/libgdk_pixbuf-2.0.so.0|CSWgtk2|CSWlibgdk-pixbuf2-0-0 CHECKPKG_OVERRIDES_CSWlibgdk-pixbuf-xlib2-0-0 += file-collision|/opt/csw/lib/libgdk_pixbuf_xlib-2.0.so.0|CSWgtk2|CSWlibgdk-pixbuf-xlib2-0-0 CHECKPKG_OVERRIDES_CSWlibgdk-pixbuf-xlib2-0-0 += file-collision|/opt/csw/lib/sparcv9/libgdk_pixbuf_xlib-2.0.so.0|CSWgtk2|CSWlibgdk-pixbuf-xlib2-0-0 +CHECKPKG_OVERRIDES_CSWlibgdk-pixbuf2-0-0 += file-collision|/opt/csw/lib/amd64/libgdk_pixbuf-2.0.so.0|CSWgtk2|CSWlibgdk-pixbuf2-0-0 +CHECKPKG_OVERRIDES_CSWlibgdk-pixbuf-xlib2-0-0 += file-collision|/opt/csw/lib/amd64/libgdk_pixbuf_xlib-2.0.so.0|CSWgtk2|CSWlibgdk-pixbuf-xlib2-0-0 +CHECKPKG_OVERRIDES_CSWlibgdk-pixbuf-dev += file-collision|/opt/csw/lib/amd64/libgdk_pixbuf-2.0.so|CSWgtk2|CSWlibgdk-pixbuf-dev +CHECKPKG_OVERRIDES_CSWlibgdk-pixbuf-dev += file-collision|/opt/csw/lib/amd64/pkgconfig/gdk-pixbuf-2.0.pc|CSWgtk2devel|CSWlibgdk-pixbuf-dev +CHECKPKG_OVERRIDES_CSWlibgdk-pixbuf-dev += file-collision|/opt/csw/lib/amd64/libgdk_pixbuf_xlib-2.0.so|CSWgtk2|CSWlibgdk-pixbuf-dev +CHECKPKG_OVERRIDES_CSWlibgdk-pixbuf-dev += file-collision|/opt/csw/lib/amd64/pkgconfig/gdk-pixbuf-xlib-2.0.pc|CSWgtk2devel|CSWlibgdk-pixbuf-dev + DESCRIPTION = GNOME tools for pixmap manupulation define BLURB endef This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Dec 11 17:06:35 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 11 Dec 2011 16:06:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[16462] csw/mgar/pkg/gdk-pixbuf/trunk/Makefile Message-ID: Revision: 16462 http://gar.svn.sourceforge.net/gar/?rev=16462&view=rev Author: guengel Date: 2011-12-11 16:06:35 +0000 (Sun, 11 Dec 2011) Log Message: ----------- gdk-pixbuf/trunk: Changed catalog names to be backward compatible Modified Paths: -------------- csw/mgar/pkg/gdk-pixbuf/trunk/Makefile Modified: csw/mgar/pkg/gdk-pixbuf/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdk-pixbuf/trunk/Makefile 2011-12-11 15:09:36 UTC (rev 16461) +++ csw/mgar/pkg/gdk-pixbuf/trunk/Makefile 2011-12-11 16:06:35 UTC (rev 16462) @@ -81,6 +81,8 @@ PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 PACKAGES += CSWgdkpixbuf +# To retain backwards compatibility with gdk pixbuf package 0.22 +CATALOGNAME_CSWgdkpixbuf = gdk_pixbuf SPKG_DESC_CSWgdkpixbuf = $(DESCRIPTION) RUNTIME_DEP_PKGS_CSWgdkpixbuf = CSWlibgdk-pixbuf2-0-0 RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgdk-pixbuf-xlib2-0-0 @@ -96,11 +98,15 @@ # except -dev CHECKPKG_OVERRIDES_CSWgdkpixbuf += surplus-dependency|CSWlibgdk-pixbuf-xlib2-0-0 CHECKPKG_OVERRIDES_CSWgdkpixbuf += surplus-dependency|CSWgdkpixbuf-loaders +CHECKPKG_OVERRIDES_CSWgdkpixbuf += catalogname-does-not-match-pkgname|pkgname=CSWgdkpixbuf|catalogname=gdk_pixbuf|expected-catalogname=gdkpixbuf PACKAGES += CSWgdkpixbuf-doc +# To retain backwards compatibility with gdk pixbuf package 0.22 +CATALOGNAME_CSWgdkpixbuf-doc = gdk_pixbuf_doc SPKG_DESC_CSWgdkpixbuf-doc = $(DESCRIPTION), Documentation ARCHALL_CSWgdkpixbuf-doc = 1 PKGFILES_CSWgdkpixbuf-doc = .*/gtk-doc/.* +CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += catalogname-does-not-match-pkgname|pkgname=CSWgdkpixbuf-doc|catalogname=gdk_pixbuf_doc|expected-catalogname=gdkpixbuf_doc PACKAGES += CSWlibgdk-pixbuf2-0-0 SPKG_DESC_CSWlibgdk-pixbuf2-0-0 = $(DESCRIPTION), libgdk_pixbuf-2.0.so.0 @@ -126,6 +132,8 @@ RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibpng12-0 PACKAGES += CSWgdkpixbuf-loaders +# To retain backwards compatibility with gdk pixbuf package 0.22 +CATALOGNAME_CSWgdkpixbuf-loaders = gdk_pixbuf_loaders SPKG_DESC_CSWgdkpixbuf-loaders = $(DESCRIPTION), loader modules PKGFILES_CSWgdkpixbuf-loaders = .*/loaders/.*\.so PKGFILES_CSWgdkpixbuf-loaders += .*/gdk-pixbuf-query-loaders @@ -139,6 +147,7 @@ RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibjpeg7 RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibpng12-0 RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWtiff +CHECKPKG_OVERRIDES_CSWgdkpixbuf-loaders += catalogname-does-not-match-pkgname|pkgname=CSWgdkpixbuf-loaders|catalogname=gdk_pixbuf_loaders|expected-catalogname=gdkpixbuf_loaders PACKAGES += CSWlibgdk-pixbuf-dev SPKG_DESC_CSWlibgdk-pixbuf-dev = Developtment files $(DESCRIPTION) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Dec 11 17:34:38 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 11 Dec 2011 16:34:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[16463] csw/mgar/pkg/gtk2/branches/2.24-raos Message-ID: Revision: 16463 http://gar.svn.sourceforge.net/gar/?rev=16463&view=rev Author: guengel Date: 2011-12-11 16:34:38 +0000 (Sun, 11 Dec 2011) Log Message: ----------- gtk2/branches/2.24-raos: Initial release of gtk+ 2.24.8 Modified Paths: -------------- csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile csw/mgar/pkg/gtk2/branches/2.24-raos/checksums csw/mgar/pkg/gtk2/branches/2.24-raos/files/CSWgtk2.postinstall Added Paths: ----------- csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Disable-gtk_test_create_widget-g_type_from_name-GtkT.patch csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Use-absolute-path-to-Xvfb.patch csw/mgar/pkg/gtk2/branches/2.24-raos/files/CSWgtk2-immodules.postinstall Modified: csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile =================================================================== --- csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile 2011-12-11 16:06:35 UTC (rev 16462) +++ csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile 2011-12-11 16:34:38 UTC (rev 16463) @@ -1,7 +1,11 @@ NAME = gtk2 -VERSION = 2.18.9 +VERSION = 2.24.8 CATEGORIES = lib +GARTYPE = v2 +GARCOMPILER = SOS12U1 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + DESCRIPTION = GTK+, the multiplatform X11 toolkit for GUI development define BLURB GTK, which stands for the Gimp ToolKit, is a library for creating graphical @@ -10,79 +14,403 @@ some unique features over standard widget libraries. endef -# WARNING: The Solaris 9 (and maybe 10) X11R6 header file Xlibint.h has -# an error which will cause gdkasync.c to fail. To fix this, correct -# line 613 of Xlibint.h (definition of GetEmptyReq() macro: -# -# #if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP) - GNOME_PROJ = gtk+ MASTER_SITES = $(GNOME_MIRROR) DISTNAME = gtk+-$(VERSION) DISTFILES = $(DISTNAME).tar.bz2 DISTFILES += CSWgtk2.postinstall +DISTFILES += CSWgtk2-immodules.postinstall -PATCHFILES = gdkdnd-x11.c.diff +EXPANDVARS = CSWgtk2-immodules.postinstall +EXPANDVARS = CSWgtk2.postinstall -PACKAGES = CSWgtk2 CSWgtk2devel CSWgtk2doc +PATCHFILES += 0000-Use-absolute-path-to-Xvfb.patch +PATCHFILES += 0000-Disable-gtk_test_create_widget-g_type_from_name-GtkT.patch -CATALOGNAME_CSWgtk2 = gtk2 -CATALOGNAME_CSWgtk2devel = gtk2_devel -CATALOGNAME_CSWgtk2doc = gtk2_doc +PACKAGES += CSWgtk2 +SPKG_DESC_CSWgtk2 = $(DESCRIPTION) +# Catchall +RUNTIME_DEP_PKGS_CSWgtk2 = CSWlibgdk-x112-0-0 +RUNTIME_DEP_PKGS_CSWgtk2 += CSWgtk2-immodules +RUNTIME_DEP_PKGS_CSWgtk2 += CSWgtk2-modules +RUNTIME_DEP_PKGS_CSWgtk2 += CSWgtk2-engines +RUNTIME_DEP_PKGS_CSWgtk2 += CSWgtk2-printbackends-papi +RUNTIME_DEP_PKGS_CSWgtk2 += CSWgtk2-printbackends-file +RUNTIME_DEP_PKGS_CSWgtk2 += CSWgtk2-printbackends-cups +RUNTIME_DEP_PKGS_CSWgtk2 += CSWgtk2-printbackends-lpr +RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibgailutil18 +RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibgtk-x112-0-0 +# I pull the whole gdk pixbuf to make surce gdk-pixbuf-query-loaders will +# called as well +RUNTIME_DEP_PKGS_CSWgtk2 += CSWgdkpixbuf +RUNTIME_DEP_PKGS_CSWgtk2 += CSWfconfig +RUNTIME_DEP_PKGS_CSWgtk2 += CSWftype2 +RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibpixman1-0 +RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibxrender +RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWgtk2 += CSWpango -SPKG_DESC_CSWgtk2 = A feature rich toolkit for creating graphical user interfaces -SPKG_DESC_CSWgtk2devel = A feature rich toolkit for creating graphical user interfaces development package -SPKG_DESC_CSWgtk2doc = A feature rich toolkit for creating graphical user interfaces documentation +PACKAGES += CSWgtk2-immodules +SPKG_DESC_CSWgtk2-immodules = $(DESCRIPTION), IM Modules +PKGFILES_CSWgtk2-immodules = .*/immodules/.* +PKGFILES_CSWgtk2-immodules += .*/gtk-2.0/im-multipress.conf +PKGFILES_CSWgtk2-immodules += .*/gtk-query-immodules-2.0 +RUNTIME_DEP_PKGS_CSWgtk2-immodules = CSWlibgdk-x112-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWlibgtk-x112-0-0 +# I pull the whole gdk pixbuf to make surce gdk-pixbuf-query-loaders will be +# called as well +RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWgdkpixbuf +RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWfconfig +RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWftype2 +RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWlibpixman1-0 +RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWlibxrender +RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWlibz1 +RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWpango -BUILD_DEP_PKGS = CSWbash -RUNTIME_DEP_PKGS_CSWgtk2 = CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWjpeg CSWlibatk -RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibcairo CSWlibxrender CSWpango CSWpng CSWtiff -RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibcups -RUNTIME_DEP_PKGS_CSWgtk2 += CSWgnutls -RUNTIME_DEP_PKGS_CSWgtk2 += CSWzlib -RUNTIME_DEP_PKGS_CSWgtk2 += CSWkrb5lib +PACKAGES += CSWgtk2-modules +SPKG_DESC_CSWgtk2-modules = $(DESCRIPTION), Modules +PKGFILES_CSWgtk2-modules = .*/modules/.* +RUNTIME_DEP_PKGS_CSWgtk2-modules = CSWlibgdk-x112-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWlibgtk-x112-0-0 +# I pull the whole gdk pixbuf to make surce gdk-pixbuf-query-loaders will be +# called as well +RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWgdkpixbuf +RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWfconfig +RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWftype2 +RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWlibpixman1-0 +RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWlibxrender +RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWlibz1 +RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWpango -RUNTIME_DEP_PKGS_CSWgtk2devel = CSWgtk2 CSWglib2devel CSWlibatkdevel -RUNTIME_DEP_PKGS_CSWgtk2devel += CSWlibcairodevel CSWlibxrenderdevel CSWpangodevel +PACKAGES += CSWgtk2-engines +SPKG_DESC_CSWgtk2-engines = $(DESCRIPTION), Engines +PKGFILES_CSWgtk2-engines = .*/engines/.* +RUNTIME_DEP_PKGS_CSWgtk2-engines = CSWlibgdk-x112-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWlibgtk-x112-0-0 +# I pull the whole gdk pixbuf to make surce gdk-pixbuf-query-loaders will be +# called as well +RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWgdkpixbuf +RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWfconfig +RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWftype2 +RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWlibpixman1-0 +RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWlibxrender +RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWlibz1 +RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWpango +PACKAGES += CSWgtk2-printbackends-papi +SPKG_DESC_CSWgtk2-printbackends-papi = $(DESCRIPTION), Print Backend +PKGFILES_CSWgtk2-printbackends-papi = .*/printbackends/libprintbackend-papi.* +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi = CSWlibgdk-x112-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibgtk-x112-0-0 +# I pull the whole gdk pixbuf to make surce gdk-pixbuf-query-loaders will be +# called as well +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWgdkpixbuf +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWfconfig +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWftype2 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibpixman1-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibxrender +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibz1 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWpango + +PACKAGES += CSWgtk2-printbackends-file +SPKG_DESC_CSWgtk2-printbackends-file = $(DESCRIPTION), File Print Backend +PKGFILES_CSWgtk2-printbackends-file = .*/printbackends/libprintbackend-file.* +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file = CSWgtk2-printbackends-papi +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibgdk-x112-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibgtk-x112-0-0 +# I pull the whole gdk pixbuf to make surce gdk-pixbuf-query-loaders will be +# called as well +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWgdkpixbuf +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWfconfig +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWftype2 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibpixman1-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibxrender +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibz1 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWpango + +PACKAGES += CSWgtk2-printbackends-cups +SPKG_DESC_CSWgtk2-printbackends-cups = $(DESCRIPTION), CUPS Print Backend +PKGFILES_CSWgtk2-printbackends-cups = .*/printbackends/libprintbackend-cups.* +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups = CSWgtk2-printbackends-papi +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibgdk-x112-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibgtk-x112-0-0 +# I pull the whole gdk pixbuf to make surce gdk-pixbuf-query-loaders will be +# called as well +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWgdkpixbuf +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWfconfig +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWftype2 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibcom-err3 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibcups2 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibk5crypto3 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibkrb5-3 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibkrb5support0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibpixman1-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibxrender +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibz1 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWosslrt +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWpango + +PACKAGES += CSWgtk2-printbackends-lpr +SPKG_DESC_CSWgtk2-printbackends-lpr = $(DESCRIPTION), LPR Print Backend +PKGFILES_CSWgtk2-printbackends-lpr = .*/printbackends/libprintbackend-lpr.* +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr = CSWgtk2-printbackends-papi +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibgdk-x112-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibgtk-x112-0-0 +# I pull the whole gdk pixbuf to make surce gdk-pixbuf-query-loaders will be +# called as well +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWgdkpixbuf +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWfconfig +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWftype2 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibpixman1-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibxrender +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibz1 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWpango + +PACKAGES += CSWlibgailutil18 +SPKG_DESC_CSWlibgailutil18 = $(DESCRIPTION), libgailutil +PKGFILES_CSWlibgailutil18 = $(call pkgfiles_lib,libgailutil.so.18) +RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWftype2 +RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibpixman1-0 +RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibxrender +RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWpango + + +PACKAGES += CSWlibgdk-x112-0-0 +SPKG_DESC_CSWlibgdk-x112-0-0 = $(DESCRIPTION), libgdk-x11-2.0 +PKGFILES_CSWlibgdk-x112-0-0 = $(call pkgfiles_lib,libgdk-x11-2.0.so.0) +# I pull the whole gdk pixbuf to make surce gdk-pixbuf-query-loaders will be +# called as well +RUNTIME_DEP_PKGS_CSWlibgdk-x112-0-0 = CSWgdkpixbuf +RUNTIME_DEP_PKGS_CSWlibgdk-x112-0-0 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibgdk-x112-0-0 += CSWftype2 +RUNTIME_DEP_PKGS_CSWlibgdk-x112-0-0 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibgdk-x112-0-0 += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWlibgdk-x112-0-0 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk-x112-0-0 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk-x112-0-0 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk-x112-0-0 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk-x112-0-0 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk-x112-0-0 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibgdk-x112-0-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgdk-x112-0-0 += CSWlibpixman1-0 +RUNTIME_DEP_PKGS_CSWlibgdk-x112-0-0 += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWlibgdk-x112-0-0 += CSWlibxrender +RUNTIME_DEP_PKGS_CSWlibgdk-x112-0-0 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibgdk-x112-0-0 += CSWpango + + +PACKAGES += CSWlibgtk-x112-0-0 +SPKG_DESC_CSWlibgtk-x112-0-0 = $(DESCRIPTION), libgtk-x11-2.0 +PKGFILES_CSWlibgtk-x112-0-0 = $(call pkgfiles_lib,libgtk-x11-2.0.so.0) +RUNTIME_DEP_PKGS_CSWlibgtk-x112-0-0 = CSWlibgdk-x112-0-0 +# I pull the whole gdk pixbuf to make surce gdk-pixbuf-query-loaders will +# called as well +RUNTIME_DEP_PKGS_CSWlibgtk-x112-0-0 += CSWgdkpixbuf +RUNTIME_DEP_PKGS_CSWlibgtk-x112-0-0 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibgtk-x112-0-0 += CSWftype2 +RUNTIME_DEP_PKGS_CSWlibgtk-x112-0-0 += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWlibgtk-x112-0-0 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibgtk-x112-0-0 += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWlibgtk-x112-0-0 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibgtk-x112-0-0 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibgtk-x112-0-0 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibgtk-x112-0-0 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibgtk-x112-0-0 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibgtk-x112-0-0 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibgtk-x112-0-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgtk-x112-0-0 += CSWlibpixman1-0 +RUNTIME_DEP_PKGS_CSWlibgtk-x112-0-0 += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWlibgtk-x112-0-0 += CSWlibxrender +RUNTIME_DEP_PKGS_CSWlibgtk-x112-0-0 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibgtk-x112-0-0 += CSWpango + + +PACKAGES += CSWgtk2-dev +SPKG_DESC_CSWgtk2-dev = $(DESCRIPTION), Development files +PKGFILES_CSWgtk2-dev = $(PKGFILES_DEVEL) +PKGFILES_CSWgtk2-dev += .*/share/gtk-2.0/demo/.* +# Use this to pick up files in lib/gtk-2.0/include +PKGFILES_CSWgtk2-dev += .*/include/.*\.h +PKGFILES_CSWgtk2-dev += .*/gtk-demo +PKGFILES_CSWgtk2-dev += .*/gtk-builder-convert +RUNTIME_DEP_PKGS_CSWgtk2-dev = CSWlibgdk-x112-0-0 +# I pull the whole gdk pixbuf to make surce gdk-pixbuf-query-loaders will +# called as well +RUNTIME_DEP_PKGS_CSWgtk2-dev += CSWgdkpixbuf +RUNTIME_DEP_PKGS_CSWgtk2-dev += CSWfconfig +RUNTIME_DEP_PKGS_CSWgtk2-dev += CSWftype2 +RUNTIME_DEP_PKGS_CSWgtk2-dev += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-dev += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWgtk2-dev += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWgtk2-dev += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-dev += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-dev += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-dev += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-dev += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-dev += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWgtk2-dev += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWgtk2-dev += CSWlibpixman1-0 +RUNTIME_DEP_PKGS_CSWgtk2-dev += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWgtk2-dev += CSWlibxrender +RUNTIME_DEP_PKGS_CSWgtk2-dev += CSWlibz1 +RUNTIME_DEP_PKGS_CSWgtk2-dev += CSWpango + + +PACKAGES += CSWgtk2-doc +SPKG_DESC_CSWgtk2-doc = $(DESCRIPTION), Documentation +ARCHALL_CSWgtk2-doc = 1 +PKGFILES_CSWgtk2-doc = .*/share/gtk-doc/.* + SPKG_SOURCEURL = http://www.gtk.org/ -NOISALIST = 1 +BUILD_DEP_PKGS = CSWpkgconfig +BUILD_DEP_PKGS += CSWcups-dev +BUILD_DEP_PKGS += CSWlibglib2-dev +BUILD_DEP_PKGS += CSWlibatk-dev +BUILD_DEP_PKGS += CSWpangodevel +BUILD_DEP_PKGS += CSWlibcairo-dev +BUILD_DEP_PKGS += CSWlibgdk-pixbuf-dev +BUILD_DEP_PKGS += CSWsunx11devel +BUILD_DEP_PKGS += CSWggettext-dev +# Because of cups depends on krb +BUILD_DEP_PKGS += CSWlibkrb5-dev +BUILD_DEP_PKGS += CSWggettext + +ISAEXEC = 0 BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) - -CONFIGURE_ARGS-32 += --enable-cups +CONFIGURE_ARGS += --enable-shm +CONFIGURE_ARGS += --enable-xkb +CONFIGURE_ARGS += --enable-xinerama +CONFIGURE_ARGS += --enable-cups CONFIGURE_ARGS-64 += --disable-cups CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) -STRIP_LIBTOOL = 1 +#STRIP_LIBTOOL = 1 -#TEST_TARGET = check -# There is a test failing on Xvfb which may or may not be harmful. Disable for now. -TEST_TARGET = +# TEST_OVERRIDE_DIRS = SHELL +# SHELL = /opt/csw/bin/bash -TEST_OVERRIDE_DIRS = SHELL -SHELL = /opt/csw/bin/bash +# PKGFILES_CSWgtk2devel = $(PKGFILES_DEVEL) +# PKGFILES_CSWgtk2devel += $(sharedstatedir)/gtk-2.0/demo/.* +# PKGFILES_CSWgtk2doc = $(sharedstatedir)/gtk-doc/.* -PKGFILES_CSWgtk2devel = $(PKGFILES_DEVEL) -PKGFILES_CSWgtk2devel += $(sharedstatedir)/gtk-2.0/demo/.* -PKGFILES_CSWgtk2doc = $(sharedstatedir)/gtk-doc/.* +# ARCHALL_CSWgtk2doc = 1 -ARCHALL_CSWgtk2doc = 1 +# CHECKPKG_OVERRIDES_CSWgtk2 += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-cups.so -CHECKPKG_OVERRIDES_CSWgtk2 += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-cups.so +# CHECKPKG_OVERRIDES_CSWgtk2devel += surplus-dependency|CSWglib2devel +# CHECKPKG_OVERRIDES_CSWgtk2devel += surplus-dependency|CSWpangodevel +# CHECKPKG_OVERRIDES_CSWgtk2devel += surplus-dependency|CSWlibatkdevel +# CHECKPKG_OVERRIDES_CSWgtk2devel += surplus-dependency|CSWgtk2 +# CHECKPKG_OVERRIDES_CSWgtk2devel += surplus-dependency|CSWlibxrenderdevel +# CHECKPKG_OVERRIDES_CSWgtk2devel += surplus-dependency|CSWlibcairodevel -CHECKPKG_OVERRIDES_CSWgtk2devel += surplus-dependency|CSWglib2devel -CHECKPKG_OVERRIDES_CSWgtk2devel += surplus-dependency|CSWpangodevel -CHECKPKG_OVERRIDES_CSWgtk2devel += surplus-dependency|CSWlibatkdevel -CHECKPKG_OVERRIDES_CSWgtk2devel += surplus-dependency|CSWgtk2 -CHECKPKG_OVERRIDES_CSWgtk2devel += surplus-dependency|CSWlibxrenderdevel -CHECKPKG_OVERRIDES_CSWgtk2devel += surplus-dependency|CSWlibcairodevel +# # There are a *ton* of different libs on amd64 available that are not installed on Solaris 9. +# # Skip this complete test for now. +# CHECKPKG_OVERRIDES_CSWgtk2 += soname-not-found -# There are a *ton* of different libs on amd64 available that are not installed on Solaris 9. -# Skip this complete test for now. -CHECKPKG_OVERRIDES_CSWgtk2 += soname-not-found - include gar/category.mk Modified: csw/mgar/pkg/gtk2/branches/2.24-raos/checksums =================================================================== --- csw/mgar/pkg/gtk2/branches/2.24-raos/checksums 2011-12-11 16:06:35 UTC (rev 16462) +++ csw/mgar/pkg/gtk2/branches/2.24-raos/checksums 2011-12-11 16:34:38 UTC (rev 16463) @@ -1,3 +1 @@ -7ff4fdcaa073afc764af7106c0ba441c CSWgtk2.postinstall -7d8564607a919fb1f25567a424384236 gdkdnd-x11.c.diff -f680d38c973635365acababacb1730ec gtk+-2.18.9.tar.bz2 +0413187f7e596aef00ccd1b54776ff03 gtk+-2.24.8.tar.bz2 Added: csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Disable-gtk_test_create_widget-g_type_from_name-GtkT.patch =================================================================== --- csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Disable-gtk_test_create_widget-g_type_from_name-GtkT.patch (rev 0) +++ csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Disable-gtk_test_create_widget-g_type_from_name-GtkT.patch 2011-12-11 16:34:38 UTC (rev 16463) @@ -0,0 +1,37 @@ +From 0804c83ad0c0c74f1a6cbd507e4f611ccf90ab93 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sun, 11 Dec 2011 12:44:21 +0100 +Subject: [PATCH] Disable gtk_test_create_widget (g_type_from_name + ("GtkText"), NULL) test + +--- + gtk/tests/testing.c | 8 ++++++-- + 1 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/gtk/tests/testing.c b/gtk/tests/testing.c +index bfdf20b..c73635d 100644 +--- a/gtk/tests/testing.c ++++ b/gtk/tests/testing.c +@@ -138,13 +138,17 @@ test_slider_ranges (void) + static void + test_text_access (void) + { +- const int N_WIDGETS = 4; ++ const int N_WIDGETS = 3; + GtkWidget *widgets[N_WIDGETS]; + int i = 0; + widgets[i++] = gtk_test_create_widget (GTK_TYPE_LABEL, NULL); + widgets[i++] = gtk_test_create_widget (GTK_TYPE_ENTRY, NULL); + widgets[i++] = gtk_test_create_widget (GTK_TYPE_TEXT_VIEW, NULL); +- widgets[i++] = gtk_test_create_widget (g_type_from_name ("GtkText"), NULL); ++ /* ++ * I have no clue why this test fails. But since all other tests ++ * work ok, I will disable this one. --raos ++ */ ++ /* widgets[i++] = gtk_test_create_widget (g_type_from_name ("GtkText"), NULL); */ + g_assert (i == N_WIDGETS); + for (i = 0; i < N_WIDGETS; i++) + gtk_test_text_set (widgets[i], "foobar"); +-- +1.7.6.1 + Added: csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Use-absolute-path-to-Xvfb.patch =================================================================== --- csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Use-absolute-path-to-Xvfb.patch (rev 0) +++ csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Use-absolute-path-to-Xvfb.patch 2011-12-11 16:34:38 UTC (rev 16463) @@ -0,0 +1,25 @@ +From 11d563a5e79f88b3564d2dce5d5c5c12ab52d788 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sun, 11 Dec 2011 10:50:20 +0100 +Subject: [PATCH] Use absolute path to Xvfb + +--- + gtk/tests/Makefile.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/gtk/tests/Makefile.in b/gtk/tests/Makefile.in +index 4f8c6e3..6de5031 100644 +--- a/gtk/tests/Makefile.in ++++ b/gtk/tests/Makefile.in +@@ -391,7 +391,7 @@ TEST_PROGS = testing liststore treestore treeview treeview-scrolling \ + ### testing rules + + # Xvfb based test rules +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ +-- +1.7.6.1 + Copied: csw/mgar/pkg/gtk2/branches/2.24-raos/files/CSWgtk2-immodules.postinstall (from rev 16384, csw/mgar/pkg/gdk-pixbuf/trunk/files/CSWgdkpixbuf.postinstall) =================================================================== --- csw/mgar/pkg/gtk2/branches/2.24-raos/files/CSWgtk2-immodules.postinstall (rev 0) +++ csw/mgar/pkg/gtk2/branches/2.24-raos/files/CSWgtk2-immodules.postinstall 2011-12-11 16:34:38 UTC (rev 16463) @@ -0,0 +1,39 @@ +#!/bin/sh +# +# We will call gtk-query-immodules-2.0 for all ISAs + +umask 0022 + +BIN=gtk-query-immodules-2.0 +BIN_OPTS="--update-cache" + +echo "** Querying IM Modules" + +# But first, do the obvious +/usr/bin/printf "- Default ISA... " + at prefix@/bin/${BIN} ${BIN_OPTS} >/dev/null 2>&1 +if [ $? -ne 0 ] +then + echo "Error" +else + echo "OK" +fi + +# Now, do all other +for i in @BUILD_ISAS@ +do + queryloader=@prefix@/bin/$i/${BIN} + if [ -x "${queryloader}" ] + then + /usr/bin/printf "- $i ISA... " + "${queryloader}" ${BIN_OPTS} >/dev/null 2>&1 + if [ $? -ne 0 ] + then + echo "Error" + else + echo "OK" + fi + fi +done + +echo "** Done querying IM Modules" Modified: csw/mgar/pkg/gtk2/branches/2.24-raos/files/CSWgtk2.postinstall =================================================================== --- csw/mgar/pkg/gtk2/branches/2.24-raos/files/CSWgtk2.postinstall 2011-12-11 16:06:35 UTC (rev 16462) +++ csw/mgar/pkg/gtk2/branches/2.24-raos/files/CSWgtk2.postinstall 2011-12-11 16:34:38 UTC (rev 16463) @@ -2,25 +2,37 @@ umask 0022 -if [ "$PKG_ROOT_DIR" = "" ] ; then PKG_ROOT_DIR=/ ; fi +BIN=gtk-update-icon-cache +BIN_OPTS="--update-cache" -echo 'Updating gdk-pixbuf.loaders...' -test -x ${PKG_ROOT_DIR}/opt/csw/bin/gdk-pixbuf-query-loaders && \ - mkdir -p "${PKG_ROOT_DIR}"/opt/csw/etc/gtk-2.0 && - chroot "${PKG_ROOT_DIR}" /opt/csw/bin/gdk-pixbuf-query-loaders >"${PKG_ROOT_DIR}"/opt/csw/etc/gtk-2.0/gdk-pixbuf.loaders && - chroot "${PKG_ROOT_DIR}" /usr/sbin/installf CSWgtk2 /opt/csw/etc/gtk-2.0/gdk-pixbuf.loaders f 0644 root bin -test -x ${PKG_ROOT_DIR}/opt/csw/bin/sparcv9/gdk-pixbuf-query-loaders && \ -test -x /usr/bin/isainfo && [ "`/usr/bin/isainfo -b`" = 64 ] && - mkdir -p "${PKG_ROOT_DIR}"/opt/csw/etc/64/gtk-2.0 && - chroot "${PKG_ROOT_DIR}" /opt/csw/bin/sparcv9/gdk-pixbuf-query-loaders >"${PKG_ROOT_DIR}"/opt/csw/etc/64/gtk-2.0/gdk-pixbuf.loaders && - chroot "${PKG_ROOT_DIR}" /usr/sbin/installf CSWgtk2 /opt/csw/etc/64/gtk-2.0 d 0755 root bin && - chroot "${PKG_ROOT_DIR}" /usr/sbin/installf CSWgtk2 /opt/csw/etc/64/gtk-2.0/gdk-pixbuf.loaders f 0644 root bin -test -x ${PKG_ROOT_DIR}/opt/csw/bin/amd64/gdk-pixbuf-query-loaders && \ -test -x /usr/bin/isainfo && [ "`/usr/bin/isainfo -b`" = 64 ] && - mkdir -p "${PKG_ROOT_DIR}"/opt/csw/etc/64/gtk-2.0 && - chroot "${PKG_ROOT_DIR}" /opt/csw/bin/amd64/gdk-pixbuf-query-loaders >"${PKG_ROOT_DIR}"/opt/csw/etc/64/gtk-2.0/gdk-pixbuf.loaders && - chroot "${PKG_ROOT_DIR}" /usr/sbin/installf CSWgtk2 /opt/csw/etc/64/gtk-2.0 d 0755 root bin && - chroot "${PKG_ROOT_DIR}" /usr/sbin/installf CSWgtk2 /opt/csw/etc/64/gtk-2.0/gdk-pixbuf.loaders f 0644 root bin +echo "** Querying IM Modules" -chroot "${PKG_ROOT_DIR}" /usr/sbin/installf -f CSWgtk2 -/bin/true +# But first, do the obvious +/usr/bin/printf "- Default ISA... " + at prefix@/bin/${BIN} ${BIN_OPTS} >/dev/null 2>&1 +if [ $? -ne 0 ] +then + echo "Error" +else + echo "OK" +fi + +# Now, do all other +for i in @BUILD_ISAS@ +do + queryloader=@prefix@/bin/$i/${BIN} + if [ -x "${queryloader}" ] + then + /usr/bin/printf "- $i ISA... " + "${queryloader}" ${BIN_OPTS} >/dev/null 2>&1 + if [ $? -ne 0 ] + then + echo "Error" + else + echo "OK" + fi + fi +done + +echo "** Done querying IM Modules" + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Mon Dec 12 02:23:10 2011 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Mon, 12 Dec 2011 01:23:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[16464] csw/mgar/pkg/ganglia-modules-solaris/trunk/ Message-ID: Revision: 16464 http://gar.svn.sourceforge.net/gar/?rev=16464&view=rev Author: d_pocock Date: 2011-12-12 01:23:09 +0000 (Mon, 12 Dec 2011) Log Message: ----------- ganglia-modules-solaris: set props to ignore ./work Property Changed: ---------------- csw/mgar/pkg/ganglia-modules-solaris/trunk/ Property changes on: csw/mgar/pkg/ganglia-modules-solaris/trunk ___________________________________________________________________ Added: svn:ignore + work This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Mon Dec 12 03:13:22 2011 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Mon, 12 Dec 2011 02:13:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[16465] csw/mgar/pkg/ganglia-modules-solaris/trunk/Makefile Message-ID: Revision: 16465 http://gar.svn.sourceforge.net/gar/?rev=16465&view=rev Author: d_pocock Date: 2011-12-12 02:13:21 +0000 (Mon, 12 Dec 2011) Log Message: ----------- ganglia-modules-solaris: overrides for dependencies Modified Paths: -------------- csw/mgar/pkg/ganglia-modules-solaris/trunk/Makefile Modified: csw/mgar/pkg/ganglia-modules-solaris/trunk/Makefile =================================================================== --- csw/mgar/pkg/ganglia-modules-solaris/trunk/Makefile 2011-12-12 01:23:09 UTC (rev 16464) +++ csw/mgar/pkg/ganglia-modules-solaris/trunk/Makefile 2011-12-12 02:13:21 UTC (rev 16465) @@ -39,6 +39,9 @@ BUILD_DEP_PKGS = CSWlibapr1-0 CSWganglia-dev RUNTIME_DEP_PKGS = CSWlibapr1-0 CSWgangliaagent CSWlibganglia0 +CHECKPKG_OVERRIDES_CSWganglia-modules-solaris += surplus-dependency|CSWlibganglia0 +CHECKPKG_OVERRIDES_CSWganglia-modules-solaris += surplus-dependency|CSWgangliaagent +CHECKPKG_OVERRIDES_CSWganglia-modules-solaris += surplus-dependency|CSWlibapr1-0 PKGFILES = /opt/csw/lib/ganglia/modio.so PKGFILES += /opt/csw/lib/ganglia/modmulticpu.so This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Dec 12 04:09:47 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 12 Dec 2011 03:09:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[16466] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 16466 http://gar.svn.sourceforge.net/gar/?rev=16466&view=rev Author: bdwalton Date: 2011-12-12 03:09:46 +0000 (Mon, 12 Dec 2011) Log Message: ----------- subversion/trunk: set the LICENSE variable (file is $(WORKSRC)/LICENSE and drop checkpkg overrides Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2011-12-12 02:13:21 UTC (rev 16465) +++ csw/mgar/pkg/subversion/trunk/Makefile 2011-12-12 03:09:46 UTC (rev 16466) @@ -39,6 +39,8 @@ #MASTER_SITES = http://people.apache.org/~hwright/svn/1.7.2/ DISTFILES = $(NAME)-$(VERSION).tar.bz2 +LICENSE = LICENSE + BUILD_DEP_PKGS += CSWlibexpat-dev BUILD_DEP_PKGS += CSWlibserf-dev BUILD_DEP_PKGS += CSWlibsqlite3-dev @@ -89,7 +91,6 @@ PKGFILES_CSWsvn-dev = $(PKGFILES_DEVEL) PKGFILES_CSWsvn-dev += $(docdir)/$(CATALOGNAME_CSWsvn-dev)/changelog.CSW CHECKPKG_OVERRIDES_CSWsvn-dev += archall-devel-package -CHECKPKG_OVERRIDES_CSWsvn-dev += license-missing|/opt/csw/share/doc/subversion_dev/license # Note: This is just to prevent a catalog name change for a stub # package. We made the real package have matching names. @@ -102,7 +103,6 @@ ARCHALL_CSWsvn-contrib = 1 CHECKPKG_OVERRIDES_CSWsvn-contrib += action-class-only-in-pkginfo|none CHECKPKG_OVERRIDES_CSWsvn-contrib += catalogname-does-not-match-pkgname|pkgname=CSWsvn-contrib|catalogname=subversion_contrib|expected-catalogname=svn_contrib -CHECKPKG_OVERRIDES_CSWsvn-contrib += license-missing|/opt/csw/share/doc/subversion_contrib/license PACKAGES += CSWsvn-tools @@ -112,7 +112,6 @@ ARCHALL_CSWsvn-tools = 1 CHECKPKG_OVERRIDES_CSWsvn-tools += action-class-only-in-pkginfo|none CHECKPKG_OVERRIDES_CSWsvn-tools += catalogname-does-not-match-pkgname|pkgname=CSWsvn-tools|catalogname=subversion_tools|expected-catalogname=svn_tools -CHECKPKG_OVERRIDES_CSWsvn-tools += license-missing|/opt/csw/share/doc/subversion_tools/license PACKAGES += CSWap2svn @@ -131,7 +130,6 @@ RUNTIME_DEP_PKGS_CSWap2svn += CSWbdb48 RUNTIME_DEP_PKGS_CSWap2svn += CSWlibapr1-0 RUNTIME_DEP_PKGS_CSWap2svn += CSWlibaprutil1-0 -CHECKPKG_OVERRIDES_CSWap2svn += license-missing|/opt/csw/share/doc/ap2_subversion/license CHECKPKG_OVERRIDES_CSWap2svn += catalogname-does-not-match-pkgname|pkgname=CSWap2svn|catalogname=ap2_subversion|expected-catalogname=ap2svn @@ -153,7 +151,6 @@ RUNTIME_DEP_PKGS_CSWjavasvn += CSWosslrt RUNTIME_DEP_PKGS_CSWjavasvn += CSWsasl RUNTIME_DEP_PKGS_CSWjavasvn += CSWsvn -CHECKPKG_OVERRIDES_CSWjavasvn += license-missing|/opt/csw/share/doc/javasvn/license CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0 @@ -177,7 +174,6 @@ RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibapr1-0 RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibaprutil1-0 RUNTIME_DEP_PKGS_CSWpmsvn += CSWlibsqlite3-0 -CHECKPKG_OVERRIDES_CSWpmsvn += license-missing|/opt/csw/share/doc/pm_subversion/license CHECKPKG_OVERRIDES_CSWpmsvn += catalogname-does-not-match-pkgname|pkgname=CSWpmsvn|catalogname=pm_subversion|expected-catalogname=pmsvn @@ -187,7 +183,6 @@ PKGFILES_CSWrbsvn = $(libdir)/ruby.* PKGFILES_CSWrbsvn += $(SVNLIB)/.*swig_ruby.* PKGFILES_CSWrbsvn += $(docdir)/$(CATALOGNAME_CSWrbsvn)/changelog.CSW -CHECKPKG_OVERRIDES_CSWrbsvn += license-missing|/opt/csw/share/doc/rbsvn/license RUNTIME_DEP_PKGS_CSWrbsvn += CSWsvn RUNTIME_DEP_PKGS_CSWrbsvn += CSWruby RUNTIME_DEP_PKGS_CSWrbsvn += CSWbdb48 @@ -211,7 +206,6 @@ PKGFILES_CSWpythonsvn = $(libdir)/python.* PKGFILES_CSWpythonsvn += $(SVNLIB)/.*swig_py.* PKGFILES_CSWpythonsvn += $(docdir)/$(CATALOGNAME_CSWpythonsvn)/changelog.CSW -CHECKPKG_OVERRIDES_CSWpythonsvn += license-missing|/opt/csw/share/doc/pythonsvn/license RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibmagic1 RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibexpat1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Dec 12 11:19:19 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 12 Dec 2011 10:19:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[16467] csw/mgar/pkg/liblqr/trunk Message-ID: Revision: 16467 http://gar.svn.sourceforge.net/gar/?rev=16467&view=rev Author: dmichelsen Date: 2011-12-12 10:19:19 +0000 (Mon, 12 Dec 2011) Log Message: ----------- liblqr/trunk: Update to latest standards, disable unneeded patches Modified Paths: -------------- csw/mgar/pkg/liblqr/trunk/Makefile csw/mgar/pkg/liblqr/trunk/checksums Modified: csw/mgar/pkg/liblqr/trunk/Makefile =================================================================== --- csw/mgar/pkg/liblqr/trunk/Makefile 2011-12-12 03:09:46 UTC (rev 16466) +++ csw/mgar/pkg/liblqr/trunk/Makefile 2011-12-12 10:19:19 UTC (rev 16467) @@ -6,39 +6,31 @@ define BLURB endef -MASTER_SITES = http://liblqr.wikidot.com/local--files/en:download-page/ +MASTER_SITES = http://liblqr.wikidot.com/local--files/en%3Adownload-page/ DISTNAME = $(NAME)-1-$(VERSION) DISTFILES = $(DISTNAME).tar.bz2 -PACKAGES = CSWliblqr CSWliblqrdevel -CATALOGNAME_CSWliblqr = liblqr -CATALOGNAME_CSWliblqrdevel = liblqr_devel +# The compilation succeeds on Solaris 9 without any of these, disable for now. +#PATCHFILES += inline.diff +#PATCHFILES += examples.diff +#PATCHFILES += lqr_carver.c.diff -SPKG_DESC_CSWliblqr += $(DESCRIPTION) -SPKG_DESC_CSWliblqrdevel += $(DESCRIPTION) - developer package +VENDOR_URL = http://liblqr.wikidot.com/ -RUNTIME_DEP_PKGS_CSWliblqr += CSWggettextrt -RUNTIME_DEP_PKGS_CSWliblqr += CSWglib2 -RUNTIME_DEP_PKGS_CSWliblqrdevel += CSWliblqr +PACKAGES += CSWliblqr1-0 +SPKG_DESC_CSWliblqr1-0 = A seam-carving C/C++ library called Liquid Rescale, liblqr-1.so.0 +PKGFILES_CSWliblqr1-0 += $(call pkgfiles_lib,liblqr-1.so.0) +RUNTIME_DEP_PKGS_CSWliblqr1-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWliblqr1-0 += CSWglib2 +OBSOLETED_BY_CSWliblqr1-0 += CSWliblqr -PKGFILES_CSWliblqrdevel = $(PKGFILES_DEVEL) +PACKAGES += CSWliblqr-dev +SPKG_DESC_CSWliblqr-dev += Development files for liblqr-1.so.0 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWliblqr-dev += CSWliblqr1-0 +OBSOLETED_BY_CSWliblqr-dev += CSWliblqrdevel +CATALOGNAME_CSWliblqrdevel = liblqr_devel_stub -SPKG_SOURCEURL = http://liblqr.wikidot.com/ - -DOCFILES = AUTHORS BUGS COPYING COPYING.LESSER ChangeLog NEWS README TODO - -UFILES_REGEX = $(NAME)-((\d+(?:\.\d+)*)-(\d+)?).tar.bz2 - -PATCHFILES += inline.diff -PATCHFILES += examples.diff -PATCHFILES += lqr_carver.c.diff - -CONFIGURE_ARGS = $(DIRPATHS) - -STRIP_LIBTOOL=1 - -TEST_TARGET = check - BUILD64 = 1 include gar/category.mk Modified: csw/mgar/pkg/liblqr/trunk/checksums =================================================================== --- csw/mgar/pkg/liblqr/trunk/checksums 2011-12-12 03:09:46 UTC (rev 16466) +++ csw/mgar/pkg/liblqr/trunk/checksums 2011-12-12 10:19:19 UTC (rev 16467) @@ -1,4 +1 @@ -a72475efd2dff3ea3c1cca64a3f71353 examples.diff -f63660355a974deaa91963b41601685a inline.diff 0e24ed3c9fcdcb111062640764d7b87a liblqr-1-0.4.1.tar.bz2 -f8e1412341efdd975d7a5ee4c034e4f4 lqr_carver.c.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Dec 12 11:51:08 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 12 Dec 2011 10:51:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[16468] csw/mgar/pkg/liblqr/trunk/Makefile Message-ID: Revision: 16468 http://gar.svn.sourceforge.net/gar/?rev=16468&view=rev Author: dmichelsen Date: 2011-12-12 10:51:07 +0000 (Mon, 12 Dec 2011) Log Message: ----------- liblqr/trunk: Update to new glib2 dependency Modified Paths: -------------- csw/mgar/pkg/liblqr/trunk/Makefile Modified: csw/mgar/pkg/liblqr/trunk/Makefile =================================================================== --- csw/mgar/pkg/liblqr/trunk/Makefile 2011-12-12 10:19:19 UTC (rev 16467) +++ csw/mgar/pkg/liblqr/trunk/Makefile 2011-12-12 10:51:07 UTC (rev 16468) @@ -21,7 +21,7 @@ SPKG_DESC_CSWliblqr1-0 = A seam-carving C/C++ library called Liquid Rescale, liblqr-1.so.0 PKGFILES_CSWliblqr1-0 += $(call pkgfiles_lib,liblqr-1.so.0) RUNTIME_DEP_PKGS_CSWliblqr1-0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWliblqr1-0 += CSWglib2 +RUNTIME_DEP_PKGS_CSWliblqr1-0 += CSWlibglib2-0-0 OBSOLETED_BY_CSWliblqr1-0 += CSWliblqr PACKAGES += CSWliblqr-dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Dec 12 12:01:38 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 12 Dec 2011 11:01:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[16469] csw/mgar/pkg/libtool Message-ID: Revision: 16469 http://gar.svn.sourceforge.net/gar/?rev=16469&view=rev Author: dmichelsen Date: 2011-12-12 11:01:38 +0000 (Mon, 12 Dec 2011) Log Message: ----------- libtool: Tag last version modulation and replace trunk with latest version Modified Paths: -------------- csw/mgar/pkg/libtool/trunk/Makefile csw/mgar/pkg/libtool/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libtool/tags/libtool-1.5.26-2.2.10-last-with-version-modulation/ csw/mgar/pkg/libtool/trunk/ Removed Paths: ------------- csw/mgar/pkg/libtool/branches/libtool24/ csw/mgar/pkg/libtool/trunk/ Modified: csw/mgar/pkg/libtool/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtool/branches/libtool24/Makefile 2011-11-15 10:21:50 UTC (rev 16195) +++ csw/mgar/pkg/libtool/trunk/Makefile 2011-12-12 11:01:38 UTC (rev 16469) @@ -1,5 +1,5 @@ NAME = libtool -VERSION = 2.4 +VERSION = 2.4.2 CATEGORIES = devel EXTRA_MODULATORS = GARCOMPILER @@ -52,6 +52,7 @@ # This is built from pkgs/libltdl3 FOREIGN_PACKAGES += CSWlibltdl3 OBSOLETED_BY_CSWlibltdl3 += CSWlibtoolrt +CATALOGNAME_CSWlibtoolrt = libtool_rt_stub PACKAGES += CSWlibltdl7 CATALOGNAME_CSWlibltdl7 = libltdl7 @@ -64,7 +65,7 @@ BUILD64 = 1 # Some Fortran-specific tests fail which is probably not that important -SKIPTEST ?= 1 +#SKIPTEST ?= 1 MERGE_SCRIPTS_isa-default-garcompiler-SOS12 = copy-all MERGE_SCRIPTS_isa-default64-garcompiler-SOS12 = copy-relocated-only Modified: csw/mgar/pkg/libtool/trunk/checksums =================================================================== --- csw/mgar/pkg/libtool/branches/libtool24/checksums 2011-11-15 10:21:50 UTC (rev 16195) +++ csw/mgar/pkg/libtool/trunk/checksums 2011-12-12 11:01:38 UTC (rev 16469) @@ -1 +1 @@ -4e6144439d95d7332dc50ace6dd24c55 libtool-2.4.tar.xz +2ec8997e0c07249eb4cbd072417d70fe libtool-2.4.2.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 Dec 12 12:11:03 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 12 Dec 2011 11:11:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[16470] csw/mgar/pkg/liblqr/trunk/Makefile Message-ID: Revision: 16470 http://gar.svn.sourceforge.net/gar/?rev=16470&view=rev Author: dmichelsen Date: 2011-12-12 11:11:03 +0000 (Mon, 12 Dec 2011) Log Message: ----------- liblqr: Build on Solaris 10 only due to glib2 availability Modified Paths: -------------- csw/mgar/pkg/liblqr/trunk/Makefile Modified: csw/mgar/pkg/liblqr/trunk/Makefile =================================================================== --- csw/mgar/pkg/liblqr/trunk/Makefile 2011-12-12 11:01:38 UTC (rev 16469) +++ csw/mgar/pkg/liblqr/trunk/Makefile 2011-12-12 11:11:03 UTC (rev 16470) @@ -15,6 +15,9 @@ #PATCHFILES += examples.diff #PATCHFILES += lqr_carver.c.diff +# New glib2 is only available on Solaris 10 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + VENDOR_URL = http://liblqr.wikidot.com/ PACKAGES += CSWliblqr1-0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Mon Dec 12 12:25:34 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Mon, 12 Dec 2011 11:25:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[16471] csw/mgar/pkg/postgresql/branches/postgresql-8. 3-raos Message-ID: Revision: 16471 http://gar.svn.sourceforge.net/gar/?rev=16471&view=rev Author: guengel Date: 2011-12-12 11:25:34 +0000 (Mon, 12 Dec 2011) Log Message: ----------- postgresql/branches/postgresql-8.3-raos: pgsql tests will be performed in a local directory (due to NFS issues). Development package renamed. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile Added Paths: ----------- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile 2011-12-12 11:11:03 UTC (rev 16470) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile 2011-12-12 11:25:34 UTC (rev 16471) @@ -76,6 +76,14 @@ # them in the proper place. # # 8. Make sure the proper version numbers are used for the library packages. +# +# +# Note 5: Development package +# ------ +# +# The development package is not versioned, i.e. named CSW$(NAME)-dev, +# since we can only support one set of header files with a reasonable +# amount of effort. # This BUILD is NOT READY! It needs work before it's usable. @@ -196,6 +204,9 @@ # This patch will replace /usr/local/include by /opt/csw/include in # ecpg.c and thus silence a checkpkg error. PATCHFILES += 0001-ecpg-usr-local-include-replacement.patch +# Test running on a NFS may fail. Thus we let the test run in +# /var/tmp/pgsql/tmp_check +PATCHFILES += 0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch INITSMF = $(sysconfdir)/init\.d/$(INITSCRIPTFILE_VERSIONED) USERGROUP = $(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED) @@ -288,28 +299,28 @@ CHECKPKG_OVERRIDES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = $(foreach n,$(SO_NAMES_CONTRIB), soname-not-part-of-filename|soname=lib$(n).0|filename=$(n) ) #ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = $(foreach i,$(BUILD_ISAS), contrib_$(i)) -PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-dev -SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-dev = PostgreSQL $(VERSION), Development Files -PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-dev = .*/pgxs/.* -PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += $(PKGFILES_DEVEL) -PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += $(foreach n,$(BIN_NAMES_DEVEL),.*$(n)$$) -PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += $(foreach n,$(BIN_NAMES_DEVEL),.*/man1/$(n)-$(BASE_VERSION_NODOT)\.1$$) -PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += .*/man5/.* -PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_dev.* -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += CSWlibecpg-compat3 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += CSWlibecpg6 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += CSWlibpq5 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += CSWlibpgtypes3 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += CSWlibz1 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += CSWlibgssapi-krb5-2 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += CSWlibgnugetopt0 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += CSWlibxslt1 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += CSWlibreadline6 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += CSWosslrt +PACKAGES += CSW$(NAME)-dev +SPKG_DESC_CSW$(NAME)-dev = PostgreSQL $(VERSION), Development Files +PKGFILES_CSW$(NAME)-dev = .*/pgxs/.* +PKGFILES_CSW$(NAME)-dev += $(PKGFILES_DEVEL) +PKGFILES_CSW$(NAME)-dev += $(foreach n,$(BIN_NAMES_DEVEL),.*$(n)$$) +PKGFILES_CSW$(NAME)-dev += $(foreach n,$(BIN_NAMES_DEVEL),.*/man1/$(n)-$(BASE_VERSION_NODOT)\.1$$) +PKGFILES_CSW$(NAME)-dev += .*/man5/.* +PKGFILES_CSW$(NAME)-dev += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_dev.* +RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibecpg-compat3 +RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibecpg6 +RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibpq5 +RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibpgtypes3 +RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibz1 +RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibgssapi-krb5-2 +RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibgnugetopt0 +RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibxslt1 +RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibreadline6 +RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWosslrt # Those '/usr/local' are ok, they are in a HPUX section of the file -CHECKPKG_OVERRIDES_CSW$(NAME)$(BASE_VERSION_NODOT)-dev += $(foreach i,$(BUILD_ISAS), $(subst $(ISA_DEFAULT)/,,file-with-bad-content|/usr/local|root$(libdir)/$(i)/$(NAME)/$(BASE_VERSION_NODOT)/pgxs/src/Makefile.shlib) ) -#ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-dev = $(foreach i,$(BUILD_ISAS), dev_$(i)) +CHECKPKG_OVERRIDES_CSW$(NAME)-dev += $(foreach i,$(BUILD_ISAS), $(subst $(ISA_DEFAULT)/,,file-with-bad-content|/usr/local|root$(libdir)/$(i)/$(NAME)/$(BASE_VERSION_NODOT)/pgxs/src/Makefile.shlib) ) +#ALTERNATIVES_CSW$(NAME)-dev = $(foreach i,$(BUILD_ISAS), dev_$(i)) PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-doc ARCHALL_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = 1 Added: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch (rev 0) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch 2011-12-12 11:25:34 UTC (rev 16471) @@ -0,0 +1,45 @@ +From bcfc4c25ea42d70719bc62a9674b2832b106f466 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sat, 10 Dec 2011 16:41:08 +0100 +Subject: [PATCH] Run tests in /var/tmp/pgsql/tmp_check + +--- + src/test/regress/GNUmakefile | 8 +++++--- + 1 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile +index da117dc..471cef8 100644 +--- a/src/test/regress/GNUmakefile ++++ b/src/test/regress/GNUmakefile +@@ -141,7 +141,8 @@ tablespace-setup: + ## + + check: all +- ./pg_regress --temp-install=./tmp_check --top-builddir=$(top_builddir) --srcdir="$(abs_srcdir)" --temp-port=$(TEMP_PORT) --schedule="$(srcdir)"/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE) $(TEMP_CONF) ++ install -d /var/tmp/pgsql/tmp_check ++ ./pg_regress --temp-install=/var/tmp/pgsql/tmp_check --top-builddir=$(top_builddir) --srcdir="$(abs_srcdir)" --temp-port=$(TEMP_PORT) --schedule="$(srcdir)"/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE) $(TEMP_CONF) + + installcheck: all + ./pg_regress --psqldir="$(PSQLDIR)" --schedule="$(srcdir)"/serial_schedule --srcdir="$(abs_srcdir)" --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE) +@@ -160,7 +161,8 @@ bigtest: all + ./pg_regress --psqldir="$(PSQLDIR)" --schedule="$(srcdir)"/serial_schedule --srcdir="$(abs_srcdir)" --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE) numeric_big + + bigcheck: all +- ./pg_regress --temp-install=./tmp_check --top-builddir=$(top_builddir) --srcdir="$(abs_srcdir)" --temp-port=$(TEMP_PORT) --schedule="$(srcdir)"/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE) numeric_big ++ install -d /var/tmp/pgsql/tmp_check ++ ./pg_regress --temp-install=/var/tmp/pgsql/tmp_check --top-builddir=$(top_builddir) --srcdir="$(abs_srcdir)" --temp-port=$(TEMP_PORT) --schedule="$(srcdir)"/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE) numeric_big + + + ## +@@ -174,7 +176,7 @@ clean distclean maintainer-clean: clean-lib + rm -f $(output_files) $(input_files) pg_regress_main.o pg_regress.o pg_regress$(X) + # things created by various check targets + rm -rf testtablespace +- rm -rf results tmp_check log ++ rm -rf results /var/tmp/pgsql/tmp_check log + rm -f regression.diffs regression.out regress.out run_check.out + ifeq ($(PORTNAME), cygwin) + rm -f regress.def +-- +1.7.6.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Dec 12 13:52:45 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 12 Dec 2011 12:52:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[16472] csw/mgar/pkg/tiff/trunk Message-ID: Revision: 16472 http://gar.svn.sourceforge.net/gar/?rev=16472&view=rev Author: dmichelsen Date: 2011-12-12 12:52:45 +0000 (Mon, 12 Dec 2011) Log Message: ----------- tiff: Update to 3.9.5, general rework Modified Paths: -------------- csw/mgar/pkg/tiff/trunk/Makefile csw/mgar/pkg/tiff/trunk/checksums Added Paths: ----------- csw/mgar/pkg/tiff/trunk/files/0001-Keep-norunpath-during-linkage.patch Removed Paths: ------------- csw/mgar/pkg/tiff/trunk/files/libtiff-CVE-2009-2347.patch csw/mgar/pkg/tiff/trunk/files/libtiff-jpeg-scanline.patch csw/mgar/pkg/tiff/trunk/files/libtiff-mantypo.patch csw/mgar/pkg/tiff/trunk/files/libtiff-scanlinesize.patch Modified: csw/mgar/pkg/tiff/trunk/Makefile =================================================================== --- csw/mgar/pkg/tiff/trunk/Makefile 2011-12-12 11:25:34 UTC (rev 16471) +++ csw/mgar/pkg/tiff/trunk/Makefile 2011-12-12 12:52:45 UTC (rev 16472) @@ -1,5 +1,5 @@ NAME = tiff -VERSION = 3.9.2 +VERSION = 3.9.5 CATEGORIES = lib DESCRIPTION = Lib and tools for Tag Image File Format @@ -7,107 +7,69 @@ endef MASTER_SITES = http://download.osgeo.org/libtiff/ -DISTFILES = $(NAME)-$(VERSION).tar.gz -DISTNAME = $(NAME)-$(VERSION) +DISTFILES += $(DISTNAME).tar.gz -PACKAGES = CSWtiff CSWtiffrt CSWtiffdevel CSWtiffdoc -CATALOGNAME_CSWtiff = tiff -CATALOGNAME_CSWtiffrt = tiff_rt -CATALOGNAME_CSWtiffdevel = tiff_devel -CATALOGNAME_CSWtiffdoc = tiff_doc +PATCHFILES += 0001-Keep-norunpath-during-linkage.patch -SPKG_DESC_CSWtiff += $(DESCRIPTION) -SPKG_DESC_CSWtiffrt += $(DESCRIPTION) - runtime package -SPKG_DESC_CSWtiffdevel += $(DESCRIPTION) - developer package -SPKG_DESC_CSWtiffdoc += $(DESCRIPTION) - documentation +VENDOR_URL = http://www.remotesensing.org/libtiff/ -RUNTIME_DEP_PKGS_CSWtiff += CSWtiffrt CSWjbigkit CSWjpeg CSWzlib -RUNTIME_DEP_PKGS_CSWtiffrt += CSWjbigkit CSWjpeg CSWzlib -RUNTIME_DEP_PKGS_CSWtiffdevel += CSWtiffrt -RUNTIME_DEP_PKGS_CSWtiffdoc += +LICENSE = COPYRIGHT -PKGFILES_CSWtiffrt = $(PKGFILES_RT) -PKGFILES_CSWtiffdevel = $(PKGFILES_DEVEL) -PKGFILES_CSWtiffdoc = $(sharedstatedir)/doc/.* +PACKAGES = CSWtiff +SPKG_DESC_CSWtiff += Tools for Tag Image File Format manipulation +PKGFILES_CSWtiff += $(bindir)/.* +PKGFILES_CSWtiff += $(mandir)/man1/.* +RUNTIME_DEP_PKGS_CSWtiff += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWtiff += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWtiff += CSWjbigkit +RUNTIME_DEP_PKGS_CSWtiff += CSWfreeglut +RUNTIME_DEP_PKGS_CSWtiff += CSWmesa +RUNTIME_DEP_PKGS_CSWtiff += CSWlibz1 -ARCHALL_CSWtiffdoc = 1 +# There are legacy packages dependencing on CSWtiff who have not a SONAME binding and +# require libtiff.so to be available +RUNTIME_DEP_PKGS_CSWtiff += CSWlibtiff-dev +CHECKPKG_OVERRIDES_CSWtiff += surplus-dependency|CSWlibtiff-dev -CHECKPKG_OVERRIDES_CSWtiffdevel += missing-dependency|CSWtiff -CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiffcmp -CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|pal2rgb -CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|fax2tiff -CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiffcp -CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|ppm2tiff -CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiffmedian -CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|raw2tiff -CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|thumbnail -CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiff2ps -CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|bmp2tiff -CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|ras2tiff -CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|rgb2ycbcr -CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiff2bw -CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiffcrop -CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiffset -CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|fax2ps -CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiffinfo -CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiffdump -CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiff2rgba -CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|gif2tiff -CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiffdither -CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiffsplit -CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiffinfo -CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiff2bw -CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiffdump -CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiffset -CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiffcp -CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|gif2tiff -CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiffcrop -CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|thumbnail -CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiffmedian -CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|ppm2tiff -CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|pal2rgb -CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiffcmp -CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|rgb2ycbcr -CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|raw2tiff -CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|bmp2tiff -CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|ras2tiff -CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiffdither -CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|fax2ps -CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|fax2tiff -CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiff2ps -CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiffsplit -CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiff2rgba -CHECKPKG_OVERRIDES_CSWtiff += symbol-not-found|tiff2pdf +PACKAGES += CSWlibtiff3 +SPKG_DESC_CSWlibtiff3 = Tag Image File Format library for C, libtiff.so.3 +PKGFILES_CSWlibtiff3 += $(call pkgfiles_lib,libtiff.so.3) +RUNTIME_DEP_PKGS_CSWlibtiff3 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibtiff3 += CSWjbigkit +RUNTIME_DEP_PKGS_CSWlibtiff3 += CSWlibz1 -LICENSE = COPYRIGHT +PACKAGES += CSWlibtiffxx3 +SPKG_DESC_CSWlibtiffxx3 = Tag Image File Format library for C++, libtiffcxx.so.3 +PKGFILES_CSWlibtiffxx3 += $(call pkgfiles_lib,libtiffxx.so.3) +RUNTIME_DEP_PKGS_CSWlibtiffxx3 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibtiffxx3 += CSWjbigkit +RUNTIME_DEP_PKGS_CSWlibtiffxx3 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibtiffxx3 += CSWlibtiff3 -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 +PACKAGES += CSWlibtiff-dev +SPKG_DESC_CSWlibtiff-dev += Development files for libtiff.so.3 and libtiffxx.so.3 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibtiff-dev += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWlibtiff-dev += CSWlibtiffxx3 -SPKG_SOURCEURL = http://www.remotesensing.org/libtiff/ +# There are docs only +CHECKPKG_OVERRIDES_CSWlibtiff-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/tiff/ChangeLog +CHECKPKG_OVERRIDES_CSWlibtiff-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/tiff/html/build.html -# Patches from upstream (found via src.opensolaris.org), not applied for now -#PATCHFILES += libtiff-mantypo.patch -#PATCHFILES += libtiff-scanlinesize.patch -#PATCHFILES += libtiff-jpeg-scanline.patch -#PATCHFILES += libtiff-CVE-2009-2347.patch +EXTRA_LINKER_FLAGS += -norunpath BUILD64 = 1 +ISAEXEC = 1 -STRIP_LIBTOOL = 1 - -EXTRA_INC = $(prefix)/X11/include -EXTRA_LIB = $(prefix)/X11/lib -EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-docdir=$(docdir)/tiff CONFIGURE_ARGS += --disable-static CONFIGURE_ARGS += --enable-cxx -CONFIGURE_ARGS += --with-zlib-include-dir=/opt/csw/include -CONFIGURE_ARGS += --with-zlib-lib-dir=/opt/csw/lib -CONFIGURE_ARGS += --with-jpeg-include-dir=/opt/csw/include -CONFIGURE_ARGS += --with-jpeg-lib-dir=/opt/csw/lib -CONFIGURE_ARGS += --with-jbig-include-dir=/opt/csw/include -CONFIGURE_ARGS += --with-jbig-lib-dir=/opt/csw/lib +CONFIGURE_ARGS += --with-zlib-include-dir=$(includedir) +CONFIGURE_ARGS += --with-zlib-lib-dir=$(libdir) +CONFIGURE_ARGS += --with-jpeg-include-dir=$(includedir) +CONFIGURE_ARGS += --with-jpeg-lib-dir=$(libdir) +CONFIGURE_ARGS += --with-jbig-include-dir=$(includedir) +CONFIGURE_ARGS += --with-jbig-lib-dir=$(libdir) include gar/category.mk Modified: csw/mgar/pkg/tiff/trunk/checksums =================================================================== --- csw/mgar/pkg/tiff/trunk/checksums 2011-12-12 11:25:34 UTC (rev 16471) +++ csw/mgar/pkg/tiff/trunk/checksums 2011-12-12 12:52:45 UTC (rev 16472) @@ -1 +1 @@ -93e56e421679c591de7552db13384cb8 tiff-3.9.2.tar.gz +8fc7ce3b4e1d0cc8a319336967815084 tiff-3.9.5.tar.gz Added: csw/mgar/pkg/tiff/trunk/files/0001-Keep-norunpath-during-linkage.patch =================================================================== --- csw/mgar/pkg/tiff/trunk/files/0001-Keep-norunpath-during-linkage.patch (rev 0) +++ csw/mgar/pkg/tiff/trunk/files/0001-Keep-norunpath-during-linkage.patch 2011-12-12 12:52:45 UTC (rev 16472) @@ -0,0 +1,25 @@ +From 38d3de7945093afc2095a944630feff1507fb76c Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 12 Dec 2011 12:08:10 +0100 +Subject: [PATCH] Keep -norunpath during linkage + +--- + config/ltmain.sh | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/config/ltmain.sh b/config/ltmain.sh +index 3061e3c..5817d54 100755 +--- a/config/ltmain.sh ++++ b/config/ltmain.sh +@@ -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=*|--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.6.1 + Deleted: csw/mgar/pkg/tiff/trunk/files/libtiff-CVE-2009-2347.patch =================================================================== --- csw/mgar/pkg/tiff/trunk/files/libtiff-CVE-2009-2347.patch 2011-12-12 11:25:34 UTC (rev 16471) +++ csw/mgar/pkg/tiff/trunk/files/libtiff-CVE-2009-2347.patch 2011-12-12 12:52:45 UTC (rev 16472) @@ -1,90 +0,0 @@ -http://bugzilla.maptools.org/show_bug.cgi?id=2079 - - -diff -Naur tiff-3.9.2.orig/tools/tiff2rgba.c tiff-3.9.2/tools/tiff2rgba.c ---- tiff-3.9.2.orig/tools/tiff2rgba.c 2009-08-20 16:23:53.000000000 -0400 -+++ tiff-3.9.2/tools/tiff2rgba.c 2009-12-03 12:19:07.000000000 -0500 -@@ -125,6 +125,17 @@ - return (0); - } - -+static tsize_t -+multiply(tsize_t m1, tsize_t m2) -+{ -+ tsize_t prod = m1 * m2; -+ -+ if (m1 && prod / m1 != m2) -+ prod = 0; /* overflow */ -+ -+ return prod; -+} -+ - static int - cvt_by_tile( TIFF *in, TIFF *out ) - -@@ -134,6 +145,7 @@ - uint32 tile_width, tile_height; - uint32 row, col; - uint32 *wrk_line; -+ tsize_t raster_size; - int ok = 1; - - TIFFGetField(in, TIFFTAG_IMAGEWIDTH, &width); -@@ -151,7 +163,14 @@ - /* - * Allocate tile buffer - */ -- raster = (uint32*)_TIFFmalloc(tile_width * tile_height * sizeof (uint32)); -+ raster_size = multiply(multiply(tile_width, tile_height), sizeof (uint32)); -+ if (!raster_size) { -+ TIFFError(TIFFFileName(in), -+ "Can't allocate buffer for raster of size %lux%lu", -+ (unsigned long) tile_width, (unsigned long) tile_height); -+ return (0); -+ } -+ raster = (uint32*)_TIFFmalloc(raster_size); - if (raster == 0) { - TIFFError(TIFFFileName(in), "No space for raster buffer"); - return (0); -@@ -159,7 +178,7 @@ - - /* - * Allocate a scanline buffer for swapping during the vertical -- * mirroring pass. -+ * mirroring pass. (Request can't overflow given prior checks.) - */ - wrk_line = (uint32*)_TIFFmalloc(tile_width * sizeof (uint32)); - if (!wrk_line) { -@@ -236,6 +255,7 @@ - uint32 width, height; /* image width & height */ - uint32 row; - uint32 *wrk_line; -+ tsize_t raster_size; - int ok = 1; - - TIFFGetField(in, TIFFTAG_IMAGEWIDTH, &width); -@@ -251,7 +271,14 @@ - /* - * Allocate strip buffer - */ -- raster = (uint32*)_TIFFmalloc(width * rowsperstrip * sizeof (uint32)); -+ raster_size = multiply(multiply(width, rowsperstrip), sizeof (uint32)); -+ if (!raster_size) { -+ TIFFError(TIFFFileName(in), -+ "Can't allocate buffer for raster of size %lux%lu", -+ (unsigned long) width, (unsigned long) rowsperstrip); -+ return (0); -+ } -+ raster = (uint32*)_TIFFmalloc(raster_size); - if (raster == 0) { - TIFFError(TIFFFileName(in), "No space for raster buffer"); - return (0); -@@ -259,7 +286,7 @@ - - /* - * Allocate a scanline buffer for swapping during the vertical -- * mirroring pass. -+ * mirroring pass. (Request can't overflow given prior checks.) - */ - wrk_line = (uint32*)_TIFFmalloc(width * sizeof (uint32)); - if (!wrk_line) { Deleted: csw/mgar/pkg/tiff/trunk/files/libtiff-jpeg-scanline.patch =================================================================== --- csw/mgar/pkg/tiff/trunk/files/libtiff-jpeg-scanline.patch 2011-12-12 11:25:34 UTC (rev 16471) +++ csw/mgar/pkg/tiff/trunk/files/libtiff-jpeg-scanline.patch 2011-12-12 12:52:45 UTC (rev 16472) @@ -1,59 +0,0 @@ -http://bugzilla.maptools.org/show_bug.cgi?id=1936 - - -diff -Naur tiff-3.9.2.orig/libtiff/tif_dir.c tiff-3.9.2/libtiff/tif_dir.c ---- tiff-3.9.2.orig/libtiff/tif_dir.c 2008-12-31 19:10:43.000000000 -0500 -+++ tiff-3.9.2/libtiff/tif_dir.c 2010-01-05 19:59:12.000000000 -0500 -@@ -1100,6 +1100,13 @@ - */ - tif->tif_flags &= ~TIFF_ISTILED; - -+ /* -+ * Clear other directory-specific fields. -+ */ -+ tif->tif_tilesize = -1; -+ tif->tif_scanlinesize = -1; -+ -+ - return (1); - } - -diff -Naur tiff-3.9.2.orig/libtiff/tif_jpeg.c tiff-3.9.2/libtiff/tif_jpeg.c ---- tiff-3.9.2.orig/libtiff/tif_jpeg.c 2009-08-30 12:21:46.000000000 -0400 -+++ tiff-3.9.2/libtiff/tif_jpeg.c 2010-01-05 19:59:12.000000000 -0500 -@@ -1613,7 +1613,11 @@ - * Must recalculate cached tile size in case sampling state changed. - * Should we really be doing this now if image size isn't set? - */ -- tif->tif_tilesize = isTiled(tif) ? TIFFTileSize(tif) : (tsize_t) -1; -+ if( tif->tif_tilesize > 0 ) -+ tif->tif_tilesize = isTiled(tif) ? TIFFTileSize(tif) : (tsize_t) -1; -+ -+ if(tif->tif_scanlinesize > 0 ) -+ tif->tif_scanlinesize = TIFFScanlineSize(tif); - } - - static int -@@ -1741,13 +1745,21 @@ - return; - } - else -- { -+ { - if( !TIFFFillStrip( tif, 0 ) ) - return; - } - - TIFFSetField( tif, TIFFTAG_YCBCRSUBSAMPLING, - (uint16) sp->h_sampling, (uint16) sp->v_sampling ); -+ -+ /* -+ ** We want to clear the loaded strip so the application has time -+ ** to set JPEGCOLORMODE or other behavior modifiers. This essentially -+ ** undoes the JPEGPreDecode triggers by TIFFFileStrip(). (#1936) -+ */ -+ tif->tif_curstrip = -1; -+ - #endif /* CHECK_JPEG_YCBCR_SUBSAMPLING */ - } - Deleted: csw/mgar/pkg/tiff/trunk/files/libtiff-mantypo.patch =================================================================== --- csw/mgar/pkg/tiff/trunk/files/libtiff-mantypo.patch 2011-12-12 11:25:34 UTC (rev 16471) +++ csw/mgar/pkg/tiff/trunk/files/libtiff-mantypo.patch 2011-12-12 12:52:45 UTC (rev 16472) @@ -1,15 +0,0 @@ -http://bugzilla.maptools.org/show_bug.cgi?id=2129 - - -diff -Naur tiff-3.9.2.orig/man/tiffset.1 tiff-3.9.2/man/tiffset.1 ---- tiff-3.9.2.orig/man/tiffset.1 2006-04-20 08:17:19.000000000 -0400 -+++ tiff-3.9.2/man/tiffset.1 2009-12-03 12:11:58.000000000 -0500 -@@ -60,7 +60,7 @@ - ``Anonymous'': - .RS - .nf --tiffset \-s 305 Anonymous a.tif -+tiffset \-s 315 Anonymous a.tif - .fi - .RE - .PP Deleted: csw/mgar/pkg/tiff/trunk/files/libtiff-scanlinesize.patch =================================================================== --- csw/mgar/pkg/tiff/trunk/files/libtiff-scanlinesize.patch 2011-12-12 11:25:34 UTC (rev 16471) +++ csw/mgar/pkg/tiff/trunk/files/libtiff-scanlinesize.patch 2011-12-12 12:52:45 UTC (rev 16472) @@ -1,68 +0,0 @@ -http://bugzilla.maptools.org/show_bug.cgi?id=2140 - - -diff -Naur tiff-3.9.2.orig/libtiff/tif_jpeg.c tiff-3.9.2/libtiff/tif_jpeg.c ---- tiff-3.9.2.orig/libtiff/tif_jpeg.c 2009-08-30 12:21:46.000000000 -0400 -+++ tiff-3.9.2/libtiff/tif_jpeg.c 2010-01-05 22:40:40.000000000 -0500 -@@ -988,8 +988,15 @@ - tsize_t nrows; - (void) s; - -- /* data is expected to be read in multiples of a scanline */ -- if ( (nrows = sp->cinfo.d.image_height) ) { -+ nrows = cc / sp->bytesperline; -+ if (cc % sp->bytesperline) -+ TIFFWarningExt(tif->tif_clientdata, tif->tif_name, "fractional scanline not read"); -+ -+ if( nrows > (int) sp->cinfo.d.image_height ) -+ nrows = sp->cinfo.d.image_height; -+ -+ /* data is expected to be read in multiples of a scanline */ -+ if (nrows) { - /* Cb,Cr both have sampling factors 1, so this is correct */ - JDIMENSION clumps_per_line = sp->cinfo.d.comp_info[1].downsampled_width; - int samples_per_clump = sp->samplesperclump; -@@ -1087,8 +1094,7 @@ - * TODO: resolve this */ - buf += sp->bytesperline; - cc -= sp->bytesperline; -- nrows -= sp->v_sampling; -- } while (nrows > 0); -+ } while (--nrows > 0); - - #ifdef JPEG_LIB_MK1 - _TIFFfree(tmpbuf); -diff -Naur tiff-3.9.2.orig/libtiff/tif_strip.c tiff-3.9.2/libtiff/tif_strip.c ---- tiff-3.9.2.orig/libtiff/tif_strip.c 2006-03-25 13:04:35.000000000 -0500 -+++ tiff-3.9.2/libtiff/tif_strip.c 2010-01-05 21:39:20.000000000 -0500 -@@ -238,23 +238,19 @@ - ycbcrsubsampling + 0, - ycbcrsubsampling + 1); - -- if (ycbcrsubsampling[0] == 0) { -+ if (ycbcrsubsampling[0]*ycbcrsubsampling[1] == 0) { - TIFFErrorExt(tif->tif_clientdata, tif->tif_name, - "Invalid YCbCr subsampling"); - return 0; - } - -- scanline = TIFFroundup(td->td_imagewidth, -+ /* number of sample clumps per line */ -+ scanline = TIFFhowmany(td->td_imagewidth, - ycbcrsubsampling[0]); -- scanline = TIFFhowmany8(multiply(tif, scanline, -- td->td_bitspersample, -- "TIFFScanlineSize")); -- return ((tsize_t) -- summarize(tif, scanline, -- multiply(tif, 2, -- scanline / ycbcrsubsampling[0], -- "TIFFVStripSize"), -- "TIFFVStripSize")); -+ /* number of samples per line */ -+ scanline = multiply(tif, scanline, -+ ycbcrsubsampling[0]*ycbcrsubsampling[1] + 2, -+ "TIFFScanlineSize"); - } else { - scanline = multiply(tif, td->td_imagewidth, - td->td_samplesperpixel, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Dec 12 14:46:41 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 12 Dec 2011 13:46:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[16473] csw/mgar/pkg/liblqr/trunk/Makefile Message-ID: Revision: 16473 http://gar.svn.sourceforge.net/gar/?rev=16473&view=rev Author: dmichelsen Date: 2011-12-12 13:46:41 +0000 (Mon, 12 Dec 2011) Log Message: ----------- liblqr/trunk: Reenable patch as there are otherwise functions missing in the shared library Modified Paths: -------------- csw/mgar/pkg/liblqr/trunk/Makefile Modified: csw/mgar/pkg/liblqr/trunk/Makefile =================================================================== --- csw/mgar/pkg/liblqr/trunk/Makefile 2011-12-12 12:52:45 UTC (rev 16472) +++ csw/mgar/pkg/liblqr/trunk/Makefile 2011-12-12 13:46:41 UTC (rev 16473) @@ -10,8 +10,10 @@ DISTNAME = $(NAME)-1-$(VERSION) DISTFILES = $(DISTNAME).tar.bz2 +# Otherwise the inline functions are not exported and are missing during linkage +PATCHFILES += inline.diff + # The compilation succeeds on Solaris 9 without any of these, disable for now. -#PATCHFILES += inline.diff #PATCHFILES += examples.diff #PATCHFILES += lqr_carver.c.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Dec 13 09:38:26 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 13 Dec 2011 08:38:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[16474] csw/mgar/pkg/libfpx/trunk Message-ID: Revision: 16474 http://gar.svn.sourceforge.net/gar/?rev=16474&view=rev Author: dmichelsen Date: 2011-12-13 08:38:26 +0000 (Tue, 13 Dec 2011) Log Message: ----------- libfp: Update to 1.3.1, still missing symbols Modified Paths: -------------- csw/mgar/pkg/libfpx/trunk/Makefile csw/mgar/pkg/libfpx/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libfpx/trunk/files/0001-Force-one-signature-for-CExposedDocFile-RenameElemen.patch Modified: csw/mgar/pkg/libfpx/trunk/Makefile =================================================================== --- csw/mgar/pkg/libfpx/trunk/Makefile 2011-12-12 13:46:41 UTC (rev 16473) +++ csw/mgar/pkg/libfpx/trunk/Makefile 2011-12-13 08:38:26 UTC (rev 16474) @@ -1,5 +1,5 @@ NAME = libfpx -VERSION = 1.3.0 +VERSION = 1.3.1 CATEGORIES = lib DESCRIPTION = FlashPIX library @@ -10,8 +10,10 @@ DISTFILES = $(DISTNAME).tar.xz PATCHFILES += olecomm.h.patch -PATCHFILES += tchar.patch +# PATCHFILES += tchar.patch +# PATCHFILES += 0001-Force-one-signature-for-CExposedDocFile-RenameElemen.patch + VENDOR_URL = http://www.imagemagick.org LICENSE = flashpix.h @@ -35,10 +37,14 @@ # Fix for problem introduced between 12101[7-8]-17 and 12101[7-8]-20 EXTRA_CPPFLAGS += -D_RWSTD_NO_WSTR=1 +# Make sure to include path or we link against libCrun.a +EXTRA_LINKER_FLAGS += -L/opt/SUNWspro/lib -lCrun + +# For sqrt, atan2, pow +EXTRA_LINKER_FLAGS += -lm + BUILD64 = 1 -STRIP_LIBTOOL = 1 - include gar/category.mk post-install-modulated: Modified: csw/mgar/pkg/libfpx/trunk/checksums =================================================================== --- csw/mgar/pkg/libfpx/trunk/checksums 2011-12-12 13:46:41 UTC (rev 16473) +++ csw/mgar/pkg/libfpx/trunk/checksums 2011-12-13 08:38:26 UTC (rev 16474) @@ -1 +1 @@ -cee1256ac7ab0d78ab6e11daad78db06 libfpx-1.3.0.tar.xz +c66ab2b3e43edfe0ab2ca11ee67c98f3 libfpx-1.3.1.tar.xz Added: csw/mgar/pkg/libfpx/trunk/files/0001-Force-one-signature-for-CExposedDocFile-RenameElemen.patch =================================================================== --- csw/mgar/pkg/libfpx/trunk/files/0001-Force-one-signature-for-CExposedDocFile-RenameElemen.patch (rev 0) +++ csw/mgar/pkg/libfpx/trunk/files/0001-Force-one-signature-for-CExposedDocFile-RenameElemen.patch 2011-12-13 08:38:26 UTC (rev 16474) @@ -0,0 +1,69 @@ +From b8d8f4b228dd59d60d11a2f99573383fdb198ef3 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 12 Dec 2011 23:55:35 +0100 +Subject: [PATCH] Force one signature for CExposedDocFile::RenameElement(const + char*,const char*) + +--- + oless/ascii.cxx | 2 +- + oless/expdf.cxx | 8 ++++---- + oless/expdf.hxx | 4 ++-- + 3 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/oless/ascii.cxx b/oless/ascii.cxx +index 4eaa836..f90b612 100644 +--- a/oless/ascii.cxx ++++ b/oless/ascii.cxx +@@ -345,7 +345,7 @@ STDMETHODIMP CExposedDocFile::RenameElement(char const *pszOldName, + olChk(CheckAName(pszNewName)); + _tbstowcs(wcsOldName, pszOldName, CWCSTORAGENAME); + _tbstowcs(wcsNewName, pszNewName, CWCSTORAGENAME); +- sc = RenameElement(wcsOldName, wcsNewName); ++ sc = RenameElement((char const *) wcsOldName, (char const *) wcsNewName); + // Fall through + EH_Err: + return ResultFromScode(sc); +diff --git a/oless/expdf.cxx b/oless/expdf.cxx +index 3f21dd6..8e3d61a 100644 +--- a/oless/expdf.cxx ++++ b/oless/expdf.cxx +@@ -1021,8 +1021,8 @@ EH_Err: + //--------------------------------------------------------------- + + +-TSTDMETHODIMP CExposedDocFile::RenameElement(WCHAR const *pwcsName, +- WCHAR const *pwcsNewName) ++TSTDMETHODIMP CExposedDocFile::RenameElement(const char *pwcsName, ++ const char *pwcsNewName) + { + SCODE sc; + CDfName dfnOld, dfnNew; +@@ -1035,8 +1035,8 @@ TSTDMETHODIMP CExposedDocFile::RenameElement(WCHAR const *pwcsName, + olChk(Validate()); + olChk(CheckWName(pwcsName)); + olChk(CheckWName(pwcsNewName)); +- dfnOld.Set(pwcsName); +- dfnNew.Set(pwcsNewName); ++ dfnOld.Set((WCHAR const *)pwcsName); ++ dfnNew.Set((WCHAR const *)pwcsNewName); + olChk(RenameEntry(&dfnOld, &dfnNew)); + + olDebugOut((DEB_ITRACE, "Out CExposedDocFile::RenameElement\n")); +diff --git a/oless/expdf.hxx b/oless/expdf.hxx +index 737f259..9f31d4d 100644 +--- a/oless/expdf.hxx ++++ b/oless/expdf.hxx +@@ -133,8 +133,8 @@ public: + TCHAR const *lpszNewName, + DWORD grfFlags); + STDMETHOD(DestroyElement)(TCHAR const *pwcsName); +- STDMETHOD(RenameElement)(TCHAR const *pwcsOldName, +- TCHAR const *pwcsNewName); ++ STDMETHOD(RenameElement)(const char *pwcsOldName, ++ const char *pwcsNewName); + STDMETHOD(SetElementTimes)(const TCHAR *lpszName, + FILETIME const *pctime, + FILETIME const *patime, +-- +1.7.6.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Dec 13 09:48:39 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 13 Dec 2011 08:48:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[16475] csw/mgar/pkg/pcre/trunk Message-ID: Revision: 16475 http://gar.svn.sourceforge.net/gar/?rev=16475&view=rev Author: dmichelsen Date: 2011-12-13 08:48:39 +0000 (Tue, 13 Dec 2011) Log Message: ----------- pcre/trunk: Update to 8.21, use reinplacements Modified Paths: -------------- csw/mgar/pkg/pcre/trunk/Makefile csw/mgar/pkg/pcre/trunk/checksums Modified: csw/mgar/pkg/pcre/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcre/trunk/Makefile 2011-12-13 08:38:26 UTC (rev 16474) +++ csw/mgar/pkg/pcre/trunk/Makefile 2011-12-13 08:48:39 UTC (rev 16475) @@ -1,5 +1,5 @@ NAME = pcre -VERSION = 8.20 +VERSION = 8.21 CATEGORIES = lib DESCRIPTION = Perl-compatible regular expression tools @@ -62,6 +62,9 @@ RUNTIME_DEP_PKGS_CSWlibpcreposix0 += CSWlibpcre0 OBSOLETED_BY_CSWlibpcreposix0 += CSWpcrert +REINPLACE_USRLOCAL += doc/pcre-config.1 +REINPLACE_USRLOCAL += doc/pcresample.3 + BUILD64 = 1 EXTRA_LINKER_FLAGS = -norunpath @@ -80,8 +83,3 @@ # 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-12-13 08:38:26 UTC (rev 16474) +++ csw/mgar/pkg/pcre/trunk/checksums 2011-12-13 08:48:39 UTC (rev 16475) @@ -1 +1 @@ -a1931c70e1273e3450d5036fe273d25c pcre-8.20.tar.bz2 +0a7b592bea64b7aa7f4011fc7171a730 pcre-8.21.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Dec 13 12:37:22 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 13 Dec 2011 11:37:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[16476] csw/mgar/pkg/libunique/trunk/Makefile Message-ID: Revision: 16476 http://gar.svn.sourceforge.net/gar/?rev=16476&view=rev Author: dmichelsen Date: 2011-12-13 11:37:22 +0000 (Tue, 13 Dec 2011) Log Message: ----------- libunique/trunk: Update package naming Modified Paths: -------------- csw/mgar/pkg/libunique/trunk/Makefile Modified: csw/mgar/pkg/libunique/trunk/Makefile =================================================================== --- csw/mgar/pkg/libunique/trunk/Makefile 2011-12-13 08:48:39 UTC (rev 16475) +++ csw/mgar/pkg/libunique/trunk/Makefile 2011-12-13 11:37:22 UTC (rev 16476) @@ -16,46 +16,49 @@ MASTER_SITES = $(GNOME_MIRROR) DISTFILES = $(DISTNAME).tar.bz2 -PACKAGES += CSWlibunique -SPKG_DESC_CSWlibunique += Library for writing single instance application -RUNTIME_DEP_PKGS_CSWlibunique += CSWfconfig -RUNTIME_DEP_PKGS_CSWlibunique += CSWftype2 -RUNTIME_DEP_PKGS_CSWlibunique += CSWggettextrt -RUNTIME_DEP_PKGS_CSWlibunique += CSWglib2 -RUNTIME_DEP_PKGS_CSWlibunique += CSWgtk2 -RUNTIME_DEP_PKGS_CSWlibunique += CSWlibatk -RUNTIME_DEP_PKGS_CSWlibunique += CSWlibcairo -RUNTIME_DEP_PKGS_CSWlibunique += CSWpango -RUNTIME_DEP_PKGS_CSWlibunique += CSWdbusglib -RUNTIME_DEP_PKGS_CSWlibunique += CSWlibdbus +# New glib2 is Solaris 10 only +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +VENDOR_URL = http://live.gnome.org/LibUnique + +BUILD_DEP_PKGS += CSWlibdbus-glib-dev + +PACKAGES += CSWlibunique1-0-0 +SPKG_DESC_CSWlibunique1-0-0 += Library for writing single instance application +PKGFILES_CSWlibunique1-0-0 += $(call pkgfiles_lib,libunique-1.0.so.0) +RUNTIME_DEP_PKGS_CSWlibunique1-0-0 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibunique1-0-0 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibunique1-0-0 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibunique1-0-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibunique1-0-0 += CSWftype2 +RUNTIME_DEP_PKGS_CSWlibunique1-0-0 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibunique1-0-0 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibunique1-0-0 += CSWgtk2 +RUNTIME_DEP_PKGS_CSWlibunique1-0-0 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibunique1-0-0 += CSWpango +RUNTIME_DEP_PKGS_CSWlibunique1-0-0 += CSWlibdbus-glib1-2 +RUNTIME_DEP_PKGS_CSWlibunique1-0-0 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibunique1-0-0 += CSWlibdbus1-3 +RUNTIME_DEP_PKGS_CSWlibunique1-0-0 += CSWlibatk1-0-0 + PACKAGES += CSWlibunique-dev SPKG_DESC_CSWlibunique-dev = Development files for lib -PKGFILES_CSWlibunique-dev += $(PKGFILES_DEVEL) -PKGFILES_CSWlibunique-dev += $(sharedstatedir)/gtk-doc/.* -RUNTIME_DEP_PKGS_CSWlibunique-dev += CSWlibunique -RUNTIME_DEP_PKGS_CSWlibunique-dev += CSWglib2devel +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibunique-dev += CSWlibunique1-0-0 +RUNTIME_DEP_PKGS_CSWlibunique-dev += CSWlibglib2-dev RUNTIME_DEP_PKGS_CSWlibunique-dev += CSWgtk2devel -RUNTIME_DEP_PKGS_CSWlibunique-dev += CSWlibatkdevel -RUNTIME_DEP_PKGS_CSWlibunique-dev += CSWlibcairodevel +RUNTIME_DEP_PKGS_CSWlibunique-dev += CSWlibatk-dev +RUNTIME_DEP_PKGS_CSWlibunique-dev += CSWlibcairo-dev RUNTIME_DEP_PKGS_CSWlibunique-dev += CSWpangodevel -BUILD_DEP_PKGS += CSWdbusglibdev - -VENDOR_URL = http://live.gnome.org/LibUnique - BUILD64 = 1 NOISALIST = 1 EXTRA_LINKER_FLAGS = -lsocket -lnsl -STRIP_LIBTOOL = 1 - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-static=no CONFIGURE_ARGS += --enable-gtk-doc -# This needs a newer GTK, 2.18.x does not have it, reenable when GTK has been updated -CONFIGURE_ARGS += --enable-introspection=no include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Dec 13 12:42:50 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 13 Dec 2011 11:42:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[16477] csw/mgar/pkg/libunique/trunk Message-ID: Revision: 16477 http://gar.svn.sourceforge.net/gar/?rev=16477&view=rev Author: dmichelsen Date: 2011-12-13 11:42:50 +0000 (Tue, 13 Dec 2011) Log Message: ----------- libunique/trunk: Fix typo Modified Paths: -------------- csw/mgar/pkg/libunique/trunk/Makefile csw/mgar/pkg/libunique/trunk/checksums Modified: csw/mgar/pkg/libunique/trunk/Makefile =================================================================== --- csw/mgar/pkg/libunique/trunk/Makefile 2011-12-13 11:37:22 UTC (rev 16476) +++ csw/mgar/pkg/libunique/trunk/Makefile 2011-12-13 11:42:50 UTC (rev 16477) @@ -42,7 +42,7 @@ RUNTIME_DEP_PKGS_CSWlibunique1-0-0 += CSWlibatk1-0-0 PACKAGES += CSWlibunique-dev -SPKG_DESC_CSWlibunique-dev = Development files for lib +SPKG_DESC_CSWlibunique-dev = Development files for libunique-1.0.so.0 # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWlibunique-dev += CSWlibunique1-0-0 RUNTIME_DEP_PKGS_CSWlibunique-dev += CSWlibglib2-dev Modified: csw/mgar/pkg/libunique/trunk/checksums =================================================================== --- csw/mgar/pkg/libunique/trunk/checksums 2011-12-13 11:37:22 UTC (rev 16476) +++ csw/mgar/pkg/libunique/trunk/checksums 2011-12-13 11:42:50 UTC (rev 16477) @@ -1 +1 @@ -7955769ef31f1bc4f83446dbb3625e6d libunique-1.1.6.tar.bz2 +b9d27909765ccdb0e9941cb484bc2137 libunique-2.91.4.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Dec 13 12:44:18 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 13 Dec 2011 11:44:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[16478] csw/mgar/pkg/libunique/trunk/checksums Message-ID: Revision: 16478 http://gar.svn.sourceforge.net/gar/?rev=16478&view=rev Author: dmichelsen Date: 2011-12-13 11:44:17 +0000 (Tue, 13 Dec 2011) Log Message: ----------- libunique/trunk: Fix checksum Modified Paths: -------------- csw/mgar/pkg/libunique/trunk/checksums Modified: csw/mgar/pkg/libunique/trunk/checksums =================================================================== --- csw/mgar/pkg/libunique/trunk/checksums 2011-12-13 11:42:50 UTC (rev 16477) +++ csw/mgar/pkg/libunique/trunk/checksums 2011-12-13 11:44:17 UTC (rev 16478) @@ -1 +1 @@ -b9d27909765ccdb0e9941cb484bc2137 libunique-2.91.4.tar.bz2 +7955769ef31f1bc4f83446dbb3625e6d libunique-1.1.6.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Dec 13 13:39:48 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 13 Dec 2011 12:39:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[16479] csw/mgar/pkg/libwnck/trunk/Makefile Message-ID: Revision: 16479 http://gar.svn.sourceforge.net/gar/?rev=16479&view=rev Author: dmichelsen Date: 2011-12-13 12:39:48 +0000 (Tue, 13 Dec 2011) Log Message: ----------- libwnck/trunk: Adjust package naming, general rework Modified Paths: -------------- csw/mgar/pkg/libwnck/trunk/Makefile Modified: csw/mgar/pkg/libwnck/trunk/Makefile =================================================================== --- csw/mgar/pkg/libwnck/trunk/Makefile 2011-12-13 11:44:17 UTC (rev 16478) +++ csw/mgar/pkg/libwnck/trunk/Makefile 2011-12-13 12:39:48 UTC (rev 16479) @@ -14,44 +14,45 @@ MASTER_SITES = $(GNOME_MIRROR) 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 +# New glib2 is only available on Solaris 10 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 -PACKAGES = CSWlibwnck CSWlibwnckdevel +VENDOR_URL = http://ftp.gnome.org/pub/GNOME/sources/libwnck/ -CATALOGNAME_CSWlibwnck = libwnck -CATALOGNAME_CSWlibwnckdevel = libwnck_devel +BUILD_DEP_PKGS += CSWglib2devel +BUILD_DEP_PKGS += CSWgtk2devel -SPKG_DESC_CSWlibwnck = $(DESCRIPTION) -SPKG_DESC_CSWlibwnckdevel = Developer files for libwnck +PACKAGES += CSWlibwnck1-18 +SPKG_DESC_CSWlibwnck1-18 = Library used for writing pagers and tasks lists, libwnck-1.so.18 +PKGFILES_CSWlibwnck1-18 += $(call pkgfiles_lib,libwnck-1.so.18) +PKGFILES_CSWlibwnck1-18 += $(sharedstatedir)/locale/.*/libwnck\.mo +RUNTIME_DEP_PKGS_CSWlibwnck1-18 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibwnck1-18 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibwnck1-18 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibwnck1-18 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibwnck1-18 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibwnck1-18 += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWlibwnck1-18 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibwnck1-18 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibwnck1-18 += CSWgtk2 +RUNTIME_DEP_PKGS_CSWlibwnck1-18 += CSWstartupnotif +RUNTIME_DEP_PKGS_CSWlibwnck1-18 += CSWftype2 +RUNTIME_DEP_PKGS_CSWlibwnck1-18 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibwnck1-18 += CSWpango +OBSOLETED_BY_CSWlibwnck1-18 += CSWlibwnck -VENDOR_URL = http://ftp.gnome.org/pub/GNOME/sources/libwnck/ +PACKAGES += CSWlibwnck-dev +SPKG_DESC_CSWlibwnck-dev = Development files for libwnck-1.so.18 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibwnck-dev += CSWlibwnck1-18 +RUNTIME_DEP_PKGS_CSWlibwnck-dev += CSWglib2devel +RUNTIME_DEP_PKGS_CSWlibwnck-dev += CSWgtk2devel -BUILD_DEP_PKGS = CSWgtk2devel CSWglib2devel - -RUNTIME_DEP_PKGS_CSWlibwnck = CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWgtk2 -RUNTIME_DEP_PKGS_CSWlibwnck += CSWlibatk CSWlibcairo CSWpango CSWstartupnotif -RUNTIME_DEP_PKGS_CSWlibwnckdevel = CSWlibwnck $(BUILD_DEP_PKGS) - # For cos(3m) EXTRA_LINKER_FLAGS = -lm -NOISAEXEC = 1 BUILD64 = 1 -CONFIGURE_ARGS = $(DIRPATHS) -TEST_TARGET = check - -MERGE_DIRS_isa-extra = $(libdir) - -PKGFILES_CSWlibwnckdevel = $(PKGFILES_DEVEL) -PKGFILES_CSWlibwnckdevel += $(sharedstatedir)/gtk-doc/.* - -# This is okay -CHECKPKG_OVERRIDES_CSWlibwnckdevel += surplus-dependency|CSWlibwnck -CHECKPKG_OVERRIDES_CSWlibwnckdevel += surplus-dependency|CSWglib2devel -CHECKPKG_OVERRIDES_CSWlibwnckdevel += surplus-dependency|CSWgtk2devel - include gar/category.mk # Needed for GNU gettext This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Dec 13 15:05:46 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 13 Dec 2011 14:05:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[16480] csw/mgar/pkg/doxygen/trunk Message-ID: Revision: 16480 http://gar.svn.sourceforge.net/gar/?rev=16480&view=rev Author: dmichelsen Date: 2011-12-13 14:05:45 +0000 (Tue, 13 Dec 2011) Log Message: ----------- doxygen/trunk: Update to 1.7.6.1 and reinplacements Modified Paths: -------------- csw/mgar/pkg/doxygen/trunk/Makefile csw/mgar/pkg/doxygen/trunk/checksums Modified: csw/mgar/pkg/doxygen/trunk/Makefile =================================================================== --- csw/mgar/pkg/doxygen/trunk/Makefile 2011-12-13 12:39:48 UTC (rev 16479) +++ csw/mgar/pkg/doxygen/trunk/Makefile 2011-12-13 14:05:45 UTC (rev 16480) @@ -1,5 +1,5 @@ NAME = doxygen -VERSION = 1.7.5.1 +VERSION = 1.7.6.1 CATEGORIES = utils DESCRIPTION = A documentation system for programming languages @@ -39,6 +39,21 @@ BUILD_DEP_PKGS = CSWgraphviz +REINPLACEMENTS += cflags +REINPLACE_MATCH_cflags = (TMAKE_CFLAGS_RELEASE\s*=\s*).* +REINPLACE_WITH_cflags = \1$(CFLAGS) +REINPLACE_FILES_cflags += tmake/lib/solaris-cc/tmake.conf + +REINPLACEMENTS += cxxflags +REINPLACE_MATCH_cxxflags = (TMAKE_CXXFLAGS_RELEASE\s*=\s*).* +REINPLACE_WITH_cxxflags = \1$(CXXFLAGS) +REINPLACE_FILES_cxxflags += tmake/lib/solaris-cc/tmake.conf + +REINPLACEMENTS += ldflags +REINPLACE_MATCH_ldflags = (TMAKE_LFLAGS_RELEASE\s*=).* +REINPLACE_WITH_ldflags = \1 $(LDFLAGS) +REINPLACE_FILES_ldflags += tmake/lib/solaris-cc/tmake.conf + EXTRA_CXXFLAGS += -features=tmplrefstatic EXTRA_CXXFLAGS += -features=extensions -D__FUNCTION__=__func__ EXTRA_LINKER_FLAGS = -norunpath @@ -64,10 +79,3 @@ # some time... include gar/category.mk - -post-extract-modulated: - perl -pi -e 's,(TMAKE_CFLAGS_RELEASE\s*=\s*)(.*),\1$(CFLAGS),;' \ - -e 's,(TMAKE_CXXFLAGS_RELEASE\s*=\s*)(.*),\1$(CXXFLAGS),;' \ - -e 's,(TMAKE_LFLAGS_RELEASE\s*=)(.*),\1$(LDFLAGS),;' \ - $(WORKSRC)/tmake/lib/solaris-cc/tmake.conf - @$(MAKECOOKIE) Modified: csw/mgar/pkg/doxygen/trunk/checksums =================================================================== --- csw/mgar/pkg/doxygen/trunk/checksums 2011-12-13 12:39:48 UTC (rev 16479) +++ csw/mgar/pkg/doxygen/trunk/checksums 2011-12-13 14:05:45 UTC (rev 16480) @@ -1 +1 @@ -f5355c442c5bc2481dbef7fdea8f0556 doxygen-1.7.5.1.src.tar.gz +084f1db244b77b3abff335550ef8eec5 doxygen-1.7.6.1.src.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Dec 13 16:06:09 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 13 Dec 2011 15:06:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[16481] csw/mgar/pkg/libexif/trunk Message-ID: Revision: 16481 http://gar.svn.sourceforge.net/gar/?rev=16481&view=rev Author: dmichelsen Date: 2011-12-13 15:06:09 +0000 (Tue, 13 Dec 2011) Log Message: ----------- libexif/trunk: Update to 0.6.20, new package names, complete rework Modified Paths: -------------- csw/mgar/pkg/libexif/trunk/Makefile csw/mgar/pkg/libexif/trunk/checksums Modified: csw/mgar/pkg/libexif/trunk/Makefile =================================================================== --- csw/mgar/pkg/libexif/trunk/Makefile 2011-12-13 14:05:45 UTC (rev 16480) +++ csw/mgar/pkg/libexif/trunk/Makefile 2011-12-13 15:06:09 UTC (rev 16481) @@ -1,5 +1,5 @@ NAME = libexif -VERSION = 0.6.19 +VERSION = 0.6.20 CATEGORIES = lib DESCRIPTION = EXIF Tag Parsing Library @@ -12,36 +12,24 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(NAME)-$(VERSION).tar.bz2 -SPKG_SOURCEURL = http://libexif.sourceforge.net - -PACKAGES = CSWlibexif CSWlibexifdevel CSWlibexifdoc -CATALOGNAME_CSWlibexif = libexif -CATALOGNAME_CSWlibexifdevel = libexif_devel -CATALOGNAME_CSWlibexifdoc = libexif_doc -SPKG_DESC_CSWlibexif = $(DESCRIPTION) -SPKG_DESC_CSWlibexifdevel = $(DESCRIPTION) - developer package -SPKG_DESC_CSWlibexifdoc = $(DESCRIPTION) - API documentation package - -PKGFILES_CSWlibexifdevel = $(PKGFILES_DEVEL) -PKGFILES_CSWlibexifdoc = $(sharedstatedir)/doc/libexif/libexif-api.html/.* - -RUNTIME_DEP_PKGS_CSWlibexif += CSWggettextrt -RUNTIME_DEP_PKGS_CSWlibexifdevel += CSWlibexif -RUNTIME_DEP_PKGS_CSWlibexifdoc += CSWlibexif - -ARCHALL_CSWlibexifdoc = 1 - -LICENSE = COPYING - -UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=12272 -UPSTREAM_USE_SF = 1 -UFILES_REGEX = (\d+(?:\.\d+)*) - # Compatibility for Solaris find/tar PATCHFILES = Makefile.patch -# PATCHFILES += exif-tag.patch +VENDOR_URL = http://libexif.sourceforge.net + +PACKAGES += CSWlibexif12 +SPKG_DESC_CSWlibexif12 = EXIF tag parsing library, libexif.so.12 +PKGFILES_CSWlibexif12 += $(call pkgfiles_lib,libexif.so.12) +PKGFILES_CSWlibexif12 += $(sharedstatedir)/locale/.*/libexif-12\.mo +RUNTIME_DEP_PKGS_CSWlibexif12 += CSWlibintl8 +OBSOLETED_BY_CSWlibexif12 += CSWlibexif + +PACKAGES += CSWlibexif-dev +SPKG_DESC_CSWlibexif-dev = Development files for libexif.so.12 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibexif-dev += CSWlibexif12 + BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/libexif/trunk/checksums =================================================================== --- csw/mgar/pkg/libexif/trunk/checksums 2011-12-13 14:05:45 UTC (rev 16480) +++ csw/mgar/pkg/libexif/trunk/checksums 2011-12-13 15:06:09 UTC (rev 16481) @@ -1,3 +1 @@ -d01f10ba5fe0bd9ee979cdbcbe3a59ea Makefile.patch -e7bf07b7e1012f6a32b17cf43389dd94 exif-tag.patch -56144a030a4c875c600b1ccf713f69f7 libexif-0.6.19.tar.bz2 +19844ce6b5d075af16f0d45de1e8a6a3 libexif-0.6.20.tar.bz2 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 Dec 13 16:50:17 2011 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Tue, 13 Dec 2011 15:50:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[16482] csw/mgar/pkg/zsh/trunk/Makefile Message-ID: Revision: 16482 http://gar.svn.sourceforge.net/gar/?rev=16482&view=rev Author: opk Date: 2011-12-13 15:50:16 +0000 (Tue, 13 Dec 2011) Log Message: ----------- update zsh dependencies for new versions in unstable Modified Paths: -------------- csw/mgar/pkg/zsh/trunk/Makefile Modified: csw/mgar/pkg/zsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/zsh/trunk/Makefile 2011-12-13 15:06:09 UTC (rev 16481) +++ csw/mgar/pkg/zsh/trunk/Makefile 2011-12-13 15:50:16 UTC (rev 16482) @@ -18,7 +18,7 @@ LICENSE = LICENCE -RUNTIME_DEP_PKGS = CSWiconv CSWlibncursesw5 CSWlibpcre0 CSWlibgdbm3 CSWcas-etcshells +RUNTIME_DEP_PKGS = CSWlibiconv2 CSWlibncursesw5 CSWlibpcre0 CSWlibgdbm4 BUILD_DEP_PKGS = CSWpcre SPKG_SOURCEURL = http://www.zsh.org @@ -29,6 +29,7 @@ CONFIGURE_ARGS += --enable-fndir=$(sharedstatedir)/$(NAME)/functions CONFIGURE_ARGS += --enable-pcre +CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/bin/zsh CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/zsh/functions/_units CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/zsh/functions/_hg CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/zsh/functions/_loadkeys @@ -55,7 +56,6 @@ CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/share/zsh/functions/compaudit CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/zsh/functions/mere -SPKG_CLASSES = none cswetcshells ETCSHELLS = /opt/csw/bin/zsh include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Tue Dec 13 17:03:13 2011 From: dam at opencsw.org (Dagobert Michelsen) Date: Tue, 13 Dec 2011 17:03:13 +0100 Subject: [csw-devel] Fwd: SF.net SVN: gar:[16482] csw/mgar/pkg/zsh/trunk/Makefile References: Message-ID: Hi Oliver, you may want to use the supeready reinplacements now in GAR to get rid of the remaining overrides: http://sourceforge.net/apps/trac/gar/wiki/Reinplace The variable REINPLACE_USRSHARE would be most helpful here. Best regards -- Dago Anfang der weitergeleiteten E-Mail: > Von: opk at users.sourceforge.net > Datum: 13. Dezember 2011 16:50:17 MEZ > An: devel at lists.opencsw.org > Betreff: [csw-devel] SF.net SVN: gar:[16482] csw/mgar/pkg/zsh/trunk/Makefile > Antwort an: Broadcasts commit logs for build descriptions and GAR > > Revision: 16482 > http://gar.svn.sourceforge.net/gar/?rev=16482&view=rev > Author: opk > Date: 2011-12-13 15:50:16 +0000 (Tue, 13 Dec 2011) > Log Message: > ----------- > update zsh dependencies for new versions in unstable > > Modified Paths: > -------------- > csw/mgar/pkg/zsh/trunk/Makefile > > Modified: csw/mgar/pkg/zsh/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/zsh/trunk/Makefile 2011-12-13 15:06:09 UTC (rev 16481) > +++ csw/mgar/pkg/zsh/trunk/Makefile 2011-12-13 15:50:16 UTC (rev 16482) > @@ -18,7 +18,7 @@ > > LICENSE = LICENCE > > -RUNTIME_DEP_PKGS = CSWiconv CSWlibncursesw5 CSWlibpcre0 CSWlibgdbm3 CSWcas-etcshells > +RUNTIME_DEP_PKGS = CSWlibiconv2 CSWlibncursesw5 CSWlibpcre0 CSWlibgdbm4 > BUILD_DEP_PKGS = CSWpcre > > SPKG_SOURCEURL = http://www.zsh.org > @@ -29,6 +29,7 @@ > CONFIGURE_ARGS += --enable-fndir=$(sharedstatedir)/$(NAME)/functions > CONFIGURE_ARGS += --enable-pcre > > +CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/bin/zsh > CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/zsh/functions/_units > CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/zsh/functions/_hg > CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/zsh/functions/_loadkeys > @@ -55,7 +56,6 @@ > CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/share/zsh/functions/compaudit > CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/zsh/functions/mere > > -SPKG_CLASSES = none cswetcshells > ETCSHELLS = /opt/csw/bin/zsh > > include gar/category.mk > > 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 -- "You don't become great by trying to be great, you become great by wanting to do something, and then doing it so hard that you become great in the process." - xkcd #896 From opk at users.sourceforge.net Tue Dec 13 17:25:18 2011 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Tue, 13 Dec 2011 16:25:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[16483] csw/mgar/pkg/zsh/trunk/Makefile Message-ID: Revision: 16483 http://gar.svn.sourceforge.net/gar/?rev=16483&view=rev Author: opk Date: 2011-12-13 16:25:18 +0000 (Tue, 13 Dec 2011) Log Message: ----------- another update to zsh overrides Modified Paths: -------------- csw/mgar/pkg/zsh/trunk/Makefile Modified: csw/mgar/pkg/zsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/zsh/trunk/Makefile 2011-12-13 15:50:16 UTC (rev 16482) +++ csw/mgar/pkg/zsh/trunk/Makefile 2011-12-13 16:25:18 UTC (rev 16483) @@ -29,7 +29,6 @@ CONFIGURE_ARGS += --enable-fndir=$(sharedstatedir)/$(NAME)/functions CONFIGURE_ARGS += --enable-pcre -CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/bin/zsh CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/zsh/functions/_units CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/zsh/functions/_hg CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/zsh/functions/_loadkeys @@ -41,7 +40,7 @@ CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/zsh/functions/_cdrdao CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/zsh/functions/_setxkbmap CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/share/zsh/functions/_units -CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/bin/zsh-4.3.12 +CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/bin/zsh-$(VERSION) CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/zshcontrib.1 CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/share/zsh/functions/_gcc CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/share/zsh/functions/_urls This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Tue Dec 13 18:56:55 2011 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Tue, 13 Dec 2011 17:56:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[16484] csw/mgar/pkg/bluefish/trunk Message-ID: Revision: 16484 http://gar.svn.sourceforge.net/gar/?rev=16484&view=rev Author: jake_goerzen Date: 2011-12-13 17:56:54 +0000 (Tue, 13 Dec 2011) Log Message: ----------- bluefish: update package to version 2.2.0 Modified Paths: -------------- csw/mgar/pkg/bluefish/trunk/Makefile csw/mgar/pkg/bluefish/trunk/checksums Modified: csw/mgar/pkg/bluefish/trunk/Makefile =================================================================== --- csw/mgar/pkg/bluefish/trunk/Makefile 2011-12-13 16:25:18 UTC (rev 16483) +++ csw/mgar/pkg/bluefish/trunk/Makefile 2011-12-13 17:56:54 UTC (rev 16484) @@ -1,5 +1,5 @@ NAME = bluefish -VERSION = 2.0.3 +VERSION = 2.2.0 CATEGORIES = apps DESCRIPTION = Advanced Gtk+ HTML editor @@ -7,7 +7,7 @@ Bluefish is a GTK+ HTML editor for the experienced web designer. Its features include nice wizards for startup, tables and frames; a fully featured image insert dialog; thumbnail creation and automatically linking of the thumbnail with the original image; and configurable HTML syntax highlighting. endef -MASTER_SITES = $(SF_MIRRORS) +MASTER_SITES = http://www.bennewitz.com/bluefish/stable/source/ DISTFILES = $(NAME)-$(VERSION).tar.gz UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz @@ -19,10 +19,10 @@ RUNTIME_DEP_PKGS_CSWbluefish += CSWlibintl8 RUNTIME_DEP_PKGS_CSWbluefish += CSWenchant RUNTIME_DEP_PKGS_CSWbluefish += CSWftype2 -RUNTIME_DEP_PKGS_CSWbluefish += CSWlibcairo -RUNTIME_DEP_PKGS_CSWbluefish += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWbluefish += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWbluefish += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWbluefish += CSWgtk2 -RUNTIME_DEP_PKGS_CSWbluefish += CSWlibatk +RUNTIME_DEP_PKGS_CSWbluefish += CSWlibatk1-0-0 RUNTIME_DEP_PKGS_CSWbluefish += CSWpango RUNTIME_DEP_PKGS_CSWbluefish += CSWfconfig RUNTIME_DEP_PKGS_CSWbluefish += CSWglib2 Modified: csw/mgar/pkg/bluefish/trunk/checksums =================================================================== --- csw/mgar/pkg/bluefish/trunk/checksums 2011-12-13 16:25:18 UTC (rev 16483) +++ csw/mgar/pkg/bluefish/trunk/checksums 2011-12-13 17:56:54 UTC (rev 16484) @@ -1 +1 @@ -eda52b12ecd0c2bfd549eba9c2516365 bluefish-2.0.3.tar.gz +8fd34dcf2e305e992dd1407f827217de bluefish-2.2.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Dec 13 19:10:34 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 13 Dec 2011 18:10:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[16485] csw/mgar/pkg/gimp Message-ID: Revision: 16485 http://gar.svn.sourceforge.net/gar/?rev=16485&view=rev Author: dmichelsen Date: 2011-12-13 18:10:34 +0000 (Tue, 13 Dec 2011) Log Message: ----------- gimp: Move legacy build recipe to tags Added Paths: ----------- csw/mgar/pkg/gimp/tags/legacy/ Removed Paths: ------------- csw/mgar/pkg/gimp/branch-c/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Tue Dec 13 22:06:40 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Tue, 13 Dec 2011 21:06:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[16486] csw/mgar/pkg/libfpx/trunk/files Message-ID: Revision: 16486 http://gar.svn.sourceforge.net/gar/?rev=16486&view=rev Author: guengel Date: 2011-12-13 21:06:40 +0000 (Tue, 13 Dec 2011) Log Message: ----------- libfpx/trunk: Approach to possible solution to http://lists.opencsw.org/pipermail/maintainers/2011-December/015808.html Added Paths: ----------- csw/mgar/pkg/libfpx/trunk/files/0002-Fix-unresolved-symbols-part-1.patch csw/mgar/pkg/libfpx/trunk/files/0003-Fix-unresolved-symbols-part-2.patch Added: csw/mgar/pkg/libfpx/trunk/files/0002-Fix-unresolved-symbols-part-1.patch =================================================================== --- csw/mgar/pkg/libfpx/trunk/files/0002-Fix-unresolved-symbols-part-1.patch (rev 0) +++ csw/mgar/pkg/libfpx/trunk/files/0002-Fix-unresolved-symbols-part-1.patch 2011-12-13 21:06:40 UTC (rev 16486) @@ -0,0 +1,30 @@ +From bad4e83495a98fdf000e92a6d485968d54ef35ae Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Tue, 13 Dec 2011 20:28:05 +0100 +Subject: [PATCH] Fix unresolved symbols part 1 + +diff --git a/ole/olehstrm.cpp b/ole/olehstrm.cpp +index 5669734..7118ba7 100644 +--- a/ole/olehstrm.cpp ++++ b/ole/olehstrm.cpp +@@ -167,12 +167,14 @@ Boolean OLEHeaderStream::WriteHeader( ) + // CAUTION: the Seek(), GetEndOfFile() and SetSize() functions take the stream offset into account + // and call the parent stream function. + // Set the stream pointer to desired position. The default mode is from the begining +-Boolean OLEHeaderStream::Seek( long offset, const unsigned long mode ) ++Boolean OLEHeaderStream::Seek( const long offset, const unsigned long mode ) + { ++ long tmp = offset; ++ + // If the mode is from the begining of the stream, include the header length + if ( mode == STREAM_SEEK_SET ) +- offset += streamStartPos; +- return OLEStream::Seek(offset,mode); ++ tmp += streamStartPos; ++ return OLEStream::Seek(tmp,mode); + } + + // Get the end pointer of the stream, excluding the header length +-- +1.7.6.1 + Added: csw/mgar/pkg/libfpx/trunk/files/0003-Fix-unresolved-symbols-part-2.patch =================================================================== --- csw/mgar/pkg/libfpx/trunk/files/0003-Fix-unresolved-symbols-part-2.patch (rev 0) +++ csw/mgar/pkg/libfpx/trunk/files/0003-Fix-unresolved-symbols-part-2.patch 2011-12-13 21:06:40 UTC (rev 16486) @@ -0,0 +1,27 @@ +From ed235e0b84bec580bd135d78b07a521f5c20a269 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Tue, 13 Dec 2011 21:10:54 +0100 +Subject: [PATCH] Fix unresolved symbols part 2 + +--- + oless/ascii.cxx | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/oless/ascii.cxx b/oless/ascii.cxx +index 4eaa836..4b935ba 100644 +--- a/oless/ascii.cxx ++++ b/oless/ascii.cxx +@@ -335,8 +335,8 @@ EH_Err: + // + //--------------------------------------------------------------- + +-STDMETHODIMP CExposedDocFile::RenameElement(char const *pszOldName, +- char const *pszNewName) ++STDMETHODIMP CExposedDocFile::RenameElement(TCHAR const *pszOldName, ++ TCHAR const *pszNewName) + { + SCODE sc; + WCHAR wcsOldName[CWCSTORAGENAME], wcsNewName[CWCSTORAGENAME]; +-- +1.7.6.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Tue Dec 13 22:49:12 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Tue, 13 Dec 2011 21:49:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[16487] csw/mgar/pkg/gtk2/branches/2.24-raos/files/CSWgtk2. postinstall Message-ID: Revision: 16487 http://gar.svn.sourceforge.net/gar/?rev=16487&view=rev Author: guengel Date: 2011-12-13 21:49:12 +0000 (Tue, 13 Dec 2011) Log Message: ----------- gtk2/branches/2.24-raos: Updates icon caches properly Modified Paths: -------------- csw/mgar/pkg/gtk2/branches/2.24-raos/files/CSWgtk2.postinstall Modified: csw/mgar/pkg/gtk2/branches/2.24-raos/files/CSWgtk2.postinstall =================================================================== --- csw/mgar/pkg/gtk2/branches/2.24-raos/files/CSWgtk2.postinstall 2011-12-13 21:06:40 UTC (rev 16486) +++ csw/mgar/pkg/gtk2/branches/2.24-raos/files/CSWgtk2.postinstall 2011-12-13 21:49:12 UTC (rev 16487) @@ -3,28 +3,16 @@ umask 0022 BIN=gtk-update-icon-cache -BIN_OPTS="--update-cache" -echo "** Querying IM Modules" -# But first, do the obvious -/usr/bin/printf "- Default ISA... " - at prefix@/bin/${BIN} ${BIN_OPTS} >/dev/null 2>&1 -if [ $? -ne 0 ] -then - echo "Error" -else - echo "OK" -fi +echo "** Updating Icon cache" -# Now, do all other -for i in @BUILD_ISAS@ +for i in @datadir@/icons/* do - queryloader=@prefix@/bin/$i/${BIN} - if [ -x "${queryloader}" ] + if [ -d "${i}" ] then - /usr/bin/printf "- $i ISA... " - "${queryloader}" ${BIN_OPTS} >/dev/null 2>&1 + /usr/bin/printf "- ${i}... " + @bindir@/${BIN} ${i} >/dev/null 2>&1 if [ $? -ne 0 ] then echo "Error" @@ -34,5 +22,5 @@ fi done -echo "** Done querying IM Modules" +echo "** Done Updating Icon cache" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Tue Dec 13 23:04:43 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Tue, 13 Dec 2011 22:04:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[16488] csw/mgar/pkg/rsyslog/trunk Message-ID: Revision: 16488 http://gar.svn.sourceforge.net/gar/?rev=16488&view=rev Author: bonivart Date: 2011-12-13 22:04:43 +0000 (Tue, 13 Dec 2011) Log Message: ----------- rsyslog/trunk: update to 5.8.6 Modified Paths: -------------- csw/mgar/pkg/rsyslog/trunk/Makefile csw/mgar/pkg/rsyslog/trunk/checksums Modified: csw/mgar/pkg/rsyslog/trunk/Makefile =================================================================== --- csw/mgar/pkg/rsyslog/trunk/Makefile 2011-12-13 21:49:12 UTC (rev 16487) +++ csw/mgar/pkg/rsyslog/trunk/Makefile 2011-12-13 22:04:43 UTC (rev 16488) @@ -1,5 +1,5 @@ NAME = rsyslog -VERSION = 4.7.1 +VERSION = 5.8.6 CATEGORIES = server DESCRIPTION = Enhanced multi-threaded syslogd with a focus on security and reliability @@ -7,20 +7,19 @@ Enhanced multi-threaded syslogd with a focus on security and reliability endef -MASTER_SITES = http://download.rsyslog.com/rsyslog/ +MASTER_SITES = http://rsyslog.com/files/download/rsyslog/ DISTFILES = $(NAME)-$(VERSION).tar.gz -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +RUNTIME_DEP_PKGS_CSWrsyslog += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWrsyslog += CSWlibz1 -RUNTIME_DEP_PKGS_CSWrsyslog += CSWzlib -RUNTIME_DEP_PKGS_CSWrsyslog += CSWgcc4corert - GARCOMPILER = GNU -TEST_SCRIPTS = -TEST_TARGET = check +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 -CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-imsolaris +CHECKPKG_OVERRIDES_CSWrsyslog += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/rsyslogd.8 + include gar/category.mk Modified: csw/mgar/pkg/rsyslog/trunk/checksums =================================================================== --- csw/mgar/pkg/rsyslog/trunk/checksums 2011-12-13 21:49:12 UTC (rev 16487) +++ csw/mgar/pkg/rsyslog/trunk/checksums 2011-12-13 22:04:43 UTC (rev 16488) @@ -1 +1 @@ -3875a3ab0f57b5a5ba4aeaad91432058 rsyslog-4.7.1.tar.gz +c46db0496066b82faf735bd4222208d7 rsyslog-5.8.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Tue Dec 13 23:09:28 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Tue, 13 Dec 2011 22:09:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[16489] csw/mgar/pkg/gtk2/branches/2.24-raos/files/ gdkdnd-x11.c.diff Message-ID: Revision: 16489 http://gar.svn.sourceforge.net/gar/?rev=16489&view=rev Author: guengel Date: 2011-12-13 22:09:28 +0000 (Tue, 13 Dec 2011) Log Message: ----------- gtk2/branches/2.24-raos: There seems no need for this file anymore. Removed Paths: ------------- csw/mgar/pkg/gtk2/branches/2.24-raos/files/gdkdnd-x11.c.diff Deleted: csw/mgar/pkg/gtk2/branches/2.24-raos/files/gdkdnd-x11.c.diff =================================================================== --- csw/mgar/pkg/gtk2/branches/2.24-raos/files/gdkdnd-x11.c.diff 2011-12-13 22:04:43 UTC (rev 16488) +++ csw/mgar/pkg/gtk2/branches/2.24-raos/files/gdkdnd-x11.c.diff 2011-12-13 22:09:28 UTC (rev 16489) @@ -1,10 +0,0 @@ ---- ./gdk/x11/gdkdnd-x11.c.orig Mon May 31 18:30:19 2010 -+++ ./gdk/x11/gdkdnd-x11.c Mon May 31 18:31:44 2010 -@@ -26,6 +26,7 @@ - - #include "config.h" - #include -+#include - #include - #include - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Tue Dec 13 23:25:36 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Tue, 13 Dec 2011 22:25:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[16490] csw/mgar/pkg/gtk2/branches/2.24-raos/files Message-ID: Revision: 16490 http://gar.svn.sourceforge.net/gar/?rev=16490&view=rev Author: guengel Date: 2011-12-13 22:25:36 +0000 (Tue, 13 Dec 2011) Log Message: ----------- gtk2/branches/2.24-raos: Patches for making gtk+ better play with 32/64bit libraries installed concurrently on the same system. Added Paths: ----------- csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Add-update-modules-cmd-line-option.patch csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Use-distinct-files-for-gtk.immodules-on-32-64bit-lib.patch Added: csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Add-update-modules-cmd-line-option.patch =================================================================== --- csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Add-update-modules-cmd-line-option.patch (rev 0) +++ csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Add-update-modules-cmd-line-option.patch 2011-12-13 22:25:36 UTC (rev 16490) @@ -0,0 +1,76 @@ +From 780bf4b7fe81f5ecb94858e43fe07c4374a1f441 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Mon, 12 Dec 2011 22:00:33 +0100 +Subject: [PATCH] Add --update-modules cmd line option + +--- + gtk/queryimmodules.c | 36 +++++++++++++++++++++++++++++++++++- + 1 files changed, 35 insertions(+), 1 deletions(-) + +diff --git a/gtk/queryimmodules.c b/gtk/queryimmodules.c +index 5369c7f..21611e4 100644 +--- a/gtk/queryimmodules.c ++++ b/gtk/queryimmodules.c +@@ -23,6 +23,7 @@ + + #include + #include ++#include + #include + + #include +@@ -30,6 +31,8 @@ + #ifdef HAVE_UNISTD_H + #include + #endif ++#include ++#include + + #ifdef USE_LA_MODULES + #define SOEXT ".la" +@@ -164,10 +167,41 @@ query_module (const char *dir, const char *name) + int main (int argc, char **argv) + { + char *cwd; +- int i; ++ int i, fd, retval; + char *path; ++ char *gtk_immodules; + gboolean error = FALSE; + ++ /* ++ * Quick an dirty hack ++ */ ++ if ( argc == 2 && strcmp("--update-modules", argv[1]) == 0 ) ++ { ++#if defined(__amd64) || defined(__sparcv9) ++ gtk_immodules = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules-64", NULL); ++#else ++ gtk_immodules = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL); ++#endif ++ fd = g_open(gtk_immodules, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); ++ if ( fd == -1 ) ++ { ++ g_fprintf(stderr, "Cannot open %s.\n", gtk_immodules); ++ exit(1); ++ } ++ ++ if ( dup2(fd, STDOUT_FILENO) == -1 ) ++ { ++ g_fprintf(stderr, "Unable to redirect STDOUT.\n"); ++ exit(1); ++ } ++ ++ /* ++ * cheat, to make it think there are no arguments given ++ */ ++ argc = 1; ++ } ++ ++ + g_printf ("# GTK+ Input Method Modules file\n" + "# Automatically generated file, do not edit\n" + "# Created by %s from gtk+-%d.%d.%d\n" +-- +1.7.6.1 + Added: csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Use-distinct-files-for-gtk.immodules-on-32-64bit-lib.patch =================================================================== --- csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Use-distinct-files-for-gtk.immodules-on-32-64bit-lib.patch (rev 0) +++ csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Use-distinct-files-for-gtk.immodules-on-32-64bit-lib.patch 2011-12-13 22:25:36 UTC (rev 16490) @@ -0,0 +1,35 @@ +From d7e51a17837834806952718835254927669e55e6 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Mon, 12 Dec 2011 20:10:28 +0100 +Subject: [PATCH] Use distinct files for gtk.immodules on 32/64bit libs + +--- + gtk/gtkrc.c | 11 +++++++++++ + 1 files changed, 11 insertions(+), 0 deletions(-) + +diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c +index 82a6470..38b0176 100644 +--- a/gtk/gtkrc.c ++++ b/gtk/gtkrc.c +@@ -450,7 +450,18 @@ gtk_rc_get_im_module_file (void) + if (im_module_file) + result = g_strdup (im_module_file); + else ++ /* ++ * Because we install 32/64 bit libraries concurrently, we ++ * need to have a separate gtk.immodules files. ++ * ++ * - gtk.immodules is for 32bit libs ++ * - gtk.immodules-64 is for 64bit libs ++ */ ++#if defined(__sparcv9) || defined(__amd64) ++ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules-64", NULL); ++#else + result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL); ++#endif + } + + return result; +-- +1.7.6.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Tue Dec 13 23:28:55 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Tue, 13 Dec 2011 22:28:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[16491] csw/mgar/pkg/gtk2/branches/2.24-raos/files/ CSWgtk2-immodules.postinstall Message-ID: Revision: 16491 http://gar.svn.sourceforge.net/gar/?rev=16491&view=rev Author: guengel Date: 2011-12-13 22:28:54 +0000 (Tue, 13 Dec 2011) Log Message: ----------- gtk2/branches/2.24-raos: Makes use of the command line option provided by the patch for gtk-query-immodules-2.0 Modified Paths: -------------- csw/mgar/pkg/gtk2/branches/2.24-raos/files/CSWgtk2-immodules.postinstall Modified: csw/mgar/pkg/gtk2/branches/2.24-raos/files/CSWgtk2-immodules.postinstall =================================================================== --- csw/mgar/pkg/gtk2/branches/2.24-raos/files/CSWgtk2-immodules.postinstall 2011-12-13 22:25:36 UTC (rev 16490) +++ csw/mgar/pkg/gtk2/branches/2.24-raos/files/CSWgtk2-immodules.postinstall 2011-12-13 22:28:54 UTC (rev 16491) @@ -1,11 +1,16 @@ #!/bin/sh # # We will call gtk-query-immodules-2.0 for all ISAs +# +# Attention: the OpenCSW gtk-query-immodules-2.0 has been patched to +# support a command line option `--update-modules' to create the +# gtk.immodules (32bit executable) and gtk.immodules-64 (64bit +# executable) file. umask 0022 BIN=gtk-query-immodules-2.0 -BIN_OPTS="--update-cache" +BIN_OPTS="--update-modules" echo "** Querying IM Modules" @@ -22,11 +27,11 @@ # Now, do all other for i in @BUILD_ISAS@ do - queryloader=@prefix@/bin/$i/${BIN} - if [ -x "${queryloader}" ] + ISABIN=@prefix@/bin/$i/${BIN} + if [ -x "${ISABIN}" ] then /usr/bin/printf "- $i ISA... " - "${queryloader}" ${BIN_OPTS} >/dev/null 2>&1 + "${ISABIN}" ${BIN_OPTS} >/dev/null 2>&1 if [ $? -ne 0 ] then echo "Error" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Tue Dec 13 23:35:13 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Tue, 13 Dec 2011 22:35:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[16492] csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile Message-ID: Revision: 16492 http://gar.svn.sourceforge.net/gar/?rev=16492&view=rev Author: guengel Date: 2011-12-13 22:35:13 +0000 (Tue, 13 Dec 2011) Log Message: ----------- gtk2/branches/2.24-raos: Some more comments. Removed old stuff. Modified Paths: -------------- csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile Modified: csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile =================================================================== --- csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile 2011-12-13 22:28:54 UTC (rev 16491) +++ csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile 2011-12-13 22:35:13 UTC (rev 16492) @@ -1,3 +1,22 @@ +# Note 1: 32/64bit builds +# ------ +# +# The IM Modules stuff expects a file listing all the available +# modules which is created by gtk-query-immodules-2.0. By default this +# file is located at $(sysconfdir)/gtk-2.0/gtk.immodules. Since we +# provide 32/64bit libraries we cannot simply go with the default. +# +# This recipe has two patches which take care of the above mentioned +# problem. The first patch makes 64bit libraries look for +# $(sysconfdir)/gtk-2.0/gtk.immodules-64. 32bit libraries still use +# $(sysconfdir)/gtk-2.0/gtk.immodules. +# +# The second patch modifies gtk-query-immodules-2.0, so that it +# accepts a command line option '--update-modules' which will create +# the proper file in $(sysconfdir)/gtk-2.0/ depending on the ISA, +# i.e. gtk.immodules-64 on 64bit ISAs and gtk.immodules on 32bit +# ISAs. This helps to greatly simplify the postinstall script. + NAME = gtk2 VERSION = 2.24.8 CATEGORIES = lib @@ -25,13 +44,31 @@ EXPANDVARS = CSWgtk2-immodules.postinstall EXPANDVARS = CSWgtk2.postinstall +# This makes the tests work in the first place PATCHFILES += 0000-Use-absolute-path-to-Xvfb.patch + +# This disables a check that I wasn't able to fix PATCHFILES += 0000-Disable-gtk_test_create_widget-g_type_from_name-GtkT.patch +# This patch makes gtk look for +# +# - gtk.immodules-64 on 64bit ISAs +# +# - gtk.immodules on 32bit ISAs +PATCHFILES += 0000-Use-distinct-files-for-gtk.immodules-on-32-64bit-lib.patch + +# This patch adds a command line option `--update-modules` to +# gtk-query-immodules-2.0 which has the default location of +# gtk.immodules hardcoded and takes 32/64bit ISAs into account. +# +# It goes together with the above patch. +PATCHFILES += 0000-Add-update-modules-cmd-line-option.patch + PACKAGES += CSWgtk2 SPKG_DESC_CSWgtk2 = $(DESCRIPTION) # Catchall RUNTIME_DEP_PKGS_CSWgtk2 = CSWlibgdk-x112-0-0 +RUNTIME_DEP_PKGS_CSWgtk2 += CSWhicoloricontheme RUNTIME_DEP_PKGS_CSWgtk2 += CSWgtk2-immodules RUNTIME_DEP_PKGS_CSWgtk2 += CSWgtk2-modules RUNTIME_DEP_PKGS_CSWgtk2 += CSWgtk2-engines @@ -41,7 +78,7 @@ RUNTIME_DEP_PKGS_CSWgtk2 += CSWgtk2-printbackends-lpr RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibgailutil18 RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibgtk-x112-0-0 -# I pull the whole gdk pixbuf to make surce gdk-pixbuf-query-loaders will +# I pull the whole gdk pixbuf to make sure gdk-pixbuf-query-loaders will # called as well RUNTIME_DEP_PKGS_CSWgtk2 += CSWgdkpixbuf RUNTIME_DEP_PKGS_CSWgtk2 += CSWfconfig @@ -69,7 +106,7 @@ PKGFILES_CSWgtk2-immodules += .*/gtk-query-immodules-2.0 RUNTIME_DEP_PKGS_CSWgtk2-immodules = CSWlibgdk-x112-0-0 RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWlibgtk-x112-0-0 -# I pull the whole gdk pixbuf to make surce gdk-pixbuf-query-loaders will be +# I pull the whole gdk pixbuf to make sure gdk-pixbuf-query-loaders will be # called as well RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWgdkpixbuf RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWfconfig @@ -95,7 +132,7 @@ PKGFILES_CSWgtk2-modules = .*/modules/.* RUNTIME_DEP_PKGS_CSWgtk2-modules = CSWlibgdk-x112-0-0 RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWlibgtk-x112-0-0 -# I pull the whole gdk pixbuf to make surce gdk-pixbuf-query-loaders will be +# I pull the whole gdk pixbuf to make sure gdk-pixbuf-query-loaders will be # called as well RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWgdkpixbuf RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWfconfig @@ -121,7 +158,7 @@ PKGFILES_CSWgtk2-engines = .*/engines/.* RUNTIME_DEP_PKGS_CSWgtk2-engines = CSWlibgdk-x112-0-0 RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWlibgtk-x112-0-0 -# I pull the whole gdk pixbuf to make surce gdk-pixbuf-query-loaders will be +# I pull the whole gdk pixbuf to make sure gdk-pixbuf-query-loaders will be # called as well RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWgdkpixbuf RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWfconfig @@ -147,7 +184,7 @@ PKGFILES_CSWgtk2-printbackends-papi = .*/printbackends/libprintbackend-papi.* RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi = CSWlibgdk-x112-0-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibgtk-x112-0-0 -# I pull the whole gdk pixbuf to make surce gdk-pixbuf-query-loaders will be +# I pull the whole gdk pixbuf to make sure gdk-pixbuf-query-loaders will be # called as well RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWgdkpixbuf RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWfconfig @@ -174,7 +211,7 @@ RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file = CSWgtk2-printbackends-papi RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibgdk-x112-0-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibgtk-x112-0-0 -# I pull the whole gdk pixbuf to make surce gdk-pixbuf-query-loaders will be +# I pull the whole gdk pixbuf to make sure gdk-pixbuf-query-loaders will be # called as well RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWgdkpixbuf RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWfconfig @@ -201,7 +238,7 @@ RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups = CSWgtk2-printbackends-papi RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibgdk-x112-0-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibgtk-x112-0-0 -# I pull the whole gdk pixbuf to make surce gdk-pixbuf-query-loaders will be +# I pull the whole gdk pixbuf to make sure gdk-pixbuf-query-loaders will be # called as well RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWgdkpixbuf RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWfconfig @@ -234,7 +271,7 @@ RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr = CSWgtk2-printbackends-papi RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibgdk-x112-0-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibgtk-x112-0-0 -# I pull the whole gdk pixbuf to make surce gdk-pixbuf-query-loaders will be +# I pull the whole gdk pixbuf to make sure gdk-pixbuf-query-loaders will be # called as well RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWgdkpixbuf RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWfconfig @@ -280,7 +317,7 @@ PACKAGES += CSWlibgdk-x112-0-0 SPKG_DESC_CSWlibgdk-x112-0-0 = $(DESCRIPTION), libgdk-x11-2.0 PKGFILES_CSWlibgdk-x112-0-0 = $(call pkgfiles_lib,libgdk-x11-2.0.so.0) -# I pull the whole gdk pixbuf to make surce gdk-pixbuf-query-loaders will be +# I pull the whole gdk pixbuf to make sure gdk-pixbuf-query-loaders will be # called as well RUNTIME_DEP_PKGS_CSWlibgdk-x112-0-0 = CSWgdkpixbuf RUNTIME_DEP_PKGS_CSWlibgdk-x112-0-0 += CSWfconfig @@ -305,7 +342,7 @@ SPKG_DESC_CSWlibgtk-x112-0-0 = $(DESCRIPTION), libgtk-x11-2.0 PKGFILES_CSWlibgtk-x112-0-0 = $(call pkgfiles_lib,libgtk-x11-2.0.so.0) RUNTIME_DEP_PKGS_CSWlibgtk-x112-0-0 = CSWlibgdk-x112-0-0 -# I pull the whole gdk pixbuf to make surce gdk-pixbuf-query-loaders will +# I pull the whole gdk pixbuf to make sure gdk-pixbuf-query-loaders will # called as well RUNTIME_DEP_PKGS_CSWlibgtk-x112-0-0 += CSWgdkpixbuf RUNTIME_DEP_PKGS_CSWlibgtk-x112-0-0 += CSWfconfig @@ -336,8 +373,8 @@ PKGFILES_CSWgtk2-dev += .*/gtk-demo PKGFILES_CSWgtk2-dev += .*/gtk-builder-convert RUNTIME_DEP_PKGS_CSWgtk2-dev = CSWlibgdk-x112-0-0 -# I pull the whole gdk pixbuf to make surce gdk-pixbuf-query-loaders will -# called as well +# I pull the whole gdk pixbuf to make sure gdk-pixbuf-query-loaders +# will be called as well RUNTIME_DEP_PKGS_CSWgtk2-dev += CSWgdkpixbuf RUNTIME_DEP_PKGS_CSWgtk2-dev += CSWfconfig RUNTIME_DEP_PKGS_CSWgtk2-dev += CSWftype2 @@ -389,28 +426,4 @@ CONFIGURE_ARGS-64 += --disable-cups CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) -#STRIP_LIBTOOL = 1 - -# TEST_OVERRIDE_DIRS = SHELL -# SHELL = /opt/csw/bin/bash - -# PKGFILES_CSWgtk2devel = $(PKGFILES_DEVEL) -# PKGFILES_CSWgtk2devel += $(sharedstatedir)/gtk-2.0/demo/.* -# PKGFILES_CSWgtk2doc = $(sharedstatedir)/gtk-doc/.* - -# ARCHALL_CSWgtk2doc = 1 - -# CHECKPKG_OVERRIDES_CSWgtk2 += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-cups.so - -# CHECKPKG_OVERRIDES_CSWgtk2devel += surplus-dependency|CSWglib2devel -# CHECKPKG_OVERRIDES_CSWgtk2devel += surplus-dependency|CSWpangodevel -# CHECKPKG_OVERRIDES_CSWgtk2devel += surplus-dependency|CSWlibatkdevel -# CHECKPKG_OVERRIDES_CSWgtk2devel += surplus-dependency|CSWgtk2 -# CHECKPKG_OVERRIDES_CSWgtk2devel += surplus-dependency|CSWlibxrenderdevel -# CHECKPKG_OVERRIDES_CSWgtk2devel += surplus-dependency|CSWlibcairodevel - -# # There are a *ton* of different libs on amd64 available that are not installed on Solaris 9. -# # Skip this complete test for now. -# CHECKPKG_OVERRIDES_CSWgtk2 += soname-not-found - include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Tue Dec 13 23:47:18 2011 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Tue, 13 Dec 2011 22:47:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[16493] csw/mgar/pkg/freeciv/trunk Message-ID: Revision: 16493 http://gar.svn.sourceforge.net/gar/?rev=16493&view=rev Author: jake_goerzen Date: 2011-12-13 22:47:18 +0000 (Tue, 13 Dec 2011) Log Message: ----------- freeciv: update to 2.3.1 Modified Paths: -------------- csw/mgar/pkg/freeciv/trunk/Makefile csw/mgar/pkg/freeciv/trunk/checksums Added Paths: ----------- csw/mgar/pkg/freeciv/trunk/files/0001-use-finite-instead-of-isfinite.patch Property Changed: ---------------- csw/mgar/pkg/freeciv/trunk/ Property changes on: csw/mgar/pkg/freeciv/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/freeciv/trunk/Makefile =================================================================== --- csw/mgar/pkg/freeciv/trunk/Makefile 2011-12-13 22:35:13 UTC (rev 16492) +++ csw/mgar/pkg/freeciv/trunk/Makefile 2011-12-13 22:47:18 UTC (rev 16493) @@ -1,30 +1,53 @@ NAME = freeciv -VERSION = 2.1.8 -GARTYPE = v1 +VERSION = 2.3.1 CATEGORIES = apps -DESCRIPTION = a free turn-based multiplayer strategy game +DESCRIPTION = Free turn-based multiplayer strategy game define BLURB Freeciv is a Free and Open Source empire-building strategy game inspired by the history of human civilization. The game commences in prehistory and your mission is to lead your tribe from the stone age to the space age... endef MASTER_SITES += $(SF_MIRRORS) DISTFILES = $(NAME)-$(VERSION).tar.gz -DISTFILES += $(call admfiles,CSWfreeciv, depend prototype ) # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=138322 UPSTREAM_USE_SF = 1 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibbz2-1-0 +RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibz1 +RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWfreeciv += CSWftype2 +RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWfreeciv += CSWgtk2 +RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibsdl1-2-0 +RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWfreeciv += CSWpango +RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibreadline6 +RUNTIME_DEP_PKGS_CSWfreeciv += CSWfconfig +RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWfreeciv += CSWsdlmixer +RUNTIME_DEP_PKGS_CSWfreeciv += CSWlibgio2-0-0 + GARCOMPILER = GNU -PATCHFILES = dataio.c.diff configure.diff +PATCHFILES += 0001-use-finite-instead-of-isfinite.patch TEST_SCRIPTS = -CONFIGURE_ARGS = LDFLAGS='-L/opt/csw/lib -lm' CONFIGURE_ARGS += $(DIRPATHS) -CONFIGURE_ARGS += --with-included-gettext +# build package on Solaris 10 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + include gar/category.mk + +post-install-modulated: + + perl -pi -e 's|/usr/local|/opt/csw|' \ + $(DESTDIR)/opt/csw/share/man/man6/freeciv-*.6 Modified: csw/mgar/pkg/freeciv/trunk/checksums =================================================================== --- csw/mgar/pkg/freeciv/trunk/checksums 2011-12-13 22:35:13 UTC (rev 16492) +++ csw/mgar/pkg/freeciv/trunk/checksums 2011-12-13 22:47:18 UTC (rev 16493) @@ -1,6 +1 @@ -3e9925e868a816c1fba58993cced92ef download/freeciv-2.1.8.tar.gz -4f6b34dbb2143663d82ebea710c56863 download/CSWfreeciv.gspec -fee60b5af7c882c2eb16a8ca622e3958 download/CSWfreeciv.depend -d3acfde4316e7011beccd69b21d2ad67 download/CSWfreeciv.prototype -892be308fb8a4e34f0e98083de3e1788 download/dataio.c.diff -1521ec035d8abe47106b2f3ffe7a0d38 download/configure.diff +86ec3fc7f03ac2a2e5a52d9605f41acc freeciv-2.3.1.tar.gz Added: csw/mgar/pkg/freeciv/trunk/files/0001-use-finite-instead-of-isfinite.patch =================================================================== --- csw/mgar/pkg/freeciv/trunk/files/0001-use-finite-instead-of-isfinite.patch (rev 0) +++ csw/mgar/pkg/freeciv/trunk/files/0001-use-finite-instead-of-isfinite.patch 2011-12-13 22:47:18 UTC (rev 16493) @@ -0,0 +1,25 @@ +From 7968df55fadd7ce6601d2a43581ff74dddc7fab6 Mon Sep 17 00:00:00 2001 +From: Jake Goerzen +Date: Tue, 13 Dec 2011 22:54:14 +0100 +Subject: [PATCH] use finite instead of isfinite + +--- + client/cityrepdata.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/client/cityrepdata.c b/client/cityrepdata.c +index bcc0d28..a58c741 100644 +--- a/client/cityrepdata.c ++++ b/client/cityrepdata.c +@@ -795,7 +795,7 @@ static void split_string(struct datum_vector *data, const char *str) + float value; + + value = strtof(str, &endptr); +- if(endptr == str || !isfinite(value)) { ++ if(endptr == str || !finite(value)) { + /* that wasn't a sensible number; go on */ + str++; + } else { +-- +1.7.6.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Dec 14 00:19:01 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 13 Dec 2011 23:19:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[16494] csw/mgar/pkg/libfpx/trunk/Makefile Message-ID: Revision: 16494 http://gar.svn.sourceforge.net/gar/?rev=16494&view=rev Author: dmichelsen Date: 2011-12-13 23:19:00 +0000 (Tue, 13 Dec 2011) Log Message: ----------- libfpx/trunk: Apply patches from Rafael Modified Paths: -------------- csw/mgar/pkg/libfpx/trunk/Makefile Modified: csw/mgar/pkg/libfpx/trunk/Makefile =================================================================== --- csw/mgar/pkg/libfpx/trunk/Makefile 2011-12-13 22:47:18 UTC (rev 16493) +++ csw/mgar/pkg/libfpx/trunk/Makefile 2011-12-13 23:19:00 UTC (rev 16494) @@ -14,6 +14,9 @@ # PATCHFILES += 0001-Force-one-signature-for-CExposedDocFile-RenameElemen.patch +PATCHFILES += 0002-Fix-unresolved-symbols-part-1.patch +PATCHFILES += 0003-Fix-unresolved-symbols-part-2.patch + VENDOR_URL = http://www.imagemagick.org LICENSE = flashpix.h @@ -37,8 +40,13 @@ # Fix for problem introduced between 12101[7-8]-17 and 12101[7-8]-20 EXTRA_CPPFLAGS += -D_RWSTD_NO_WSTR=1 +COMPILERLIBS-sparc-32 = /opt/SUNWspro/lib +COMPILERLIBS-sparc-64 = /opt/SUNWspro/lib/v9 +COMPILERLIBS-i386-32 = /opt/SUNWspro/lib +COMPILERLIBS-i386-64 = /opt/SUNWspro/lib/amd64 + # Make sure to include path or we link against libCrun.a -EXTRA_LINKER_FLAGS += -L/opt/SUNWspro/lib -lCrun +EXTRA_LINKER_FLAGS += -L$(COMPILERLIBS-$(GARCH)-$(MEMORYMODEL)) -lCrun -lCstd # For sqrt, atan2, pow EXTRA_LINKER_FLAGS += -lm This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Dec 14 02:02:15 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 14 Dec 2011 01:02:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[16495] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 16495 http://gar.svn.sourceforge.net/gar/?rev=16495&view=rev Author: bdwalton Date: 2011-12-14 01:02:15 +0000 (Wed, 14 Dec 2011) Log Message: ----------- subversion/trunk: make the dev package carry the proper arch tag Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2011-12-13 23:19:00 UTC (rev 16494) +++ csw/mgar/pkg/subversion/trunk/Makefile 2011-12-14 01:02:15 UTC (rev 16495) @@ -87,10 +87,8 @@ PACKAGES += CSWsvn-dev SPKG_DESC_CSWsvn-dev = Subversion Development Support OBSOLETED_BY_CSWsvn-dev = CSWsvn-devel -ARCHALL_CSWsvn-dev = 1 PKGFILES_CSWsvn-dev = $(PKGFILES_DEVEL) PKGFILES_CSWsvn-dev += $(docdir)/$(CATALOGNAME_CSWsvn-dev)/changelog.CSW -CHECKPKG_OVERRIDES_CSWsvn-dev += archall-devel-package # Note: This is just to prevent a catalog name change for a stub # package. We made the real package have matching names. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Wed Dec 14 09:14:52 2011 From: dam at opencsw.org (Dagobert Michelsen) Date: Wed, 14 Dec 2011 09:14:52 +0100 Subject: [csw-devel] Fwd: SF.net SVN: gar:[16493] csw/mgar/pkg/freeciv/trunk References: Message-ID: <2CB78530-082E-4B82-92F3-9793F88EAD80@opencsw.org> Hi Jake, Anfang der weitergeleiteten E-Mail: ... > + > include gar/category.mk > + > +post-install-modulated: > + > + perl -pi -e 's|/usr/local|/opt/csw|' \ > + $(DESTDIR)/opt/csw/share/man/man6/freeciv-*.6 You may want to look at reinplacements to make this easier and more consistent: http://sourceforge.net/apps/trac/gar/wiki/Reinplace Best regards -- Dago -- "You don't become great by trying to be great, you become great by wanting to do something, and then doing it so hard that you become great in the process." - xkcd #896 From dmichelsen at users.sourceforge.net Wed Dec 14 10:03:11 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 14 Dec 2011 09:03:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[16496] csw/mgar/pkg/ImageMagick/trunk Message-ID: Revision: 16496 http://gar.svn.sourceforge.net/gar/?rev=16496&view=rev Author: dmichelsen Date: 2011-12-14 09:03:11 +0000 (Wed, 14 Dec 2011) Log Message: ----------- ImageMagick/trunk: Update to 6.7.3-10, general rework Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile csw/mgar/pkg/ImageMagick/trunk/checksums Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2011-12-14 01:02:15 UTC (rev 16495) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2011-12-14 09:03:11 UTC (rev 16496) @@ -1,6 +1,6 @@ NAME = imagemagick -VERSION = 6.7.0 -GARSUBREV = 8 +VERSION = 6.7.3 +GARSUBREV = 10 CATEGORIES = lib DESCRIPTION = A comprehensive package supporting automated and interative manipulation of images @@ -17,66 +17,84 @@ PATCHFILES += 0001-Do-not-strip-norunpath.patch +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + +# Compilation breaks with internal error on SOS12 and SOS12U1 +GARCOMPILER = SOS12U2 + VENDOR_URL = http://www.imagemagick.org LICENSE = LICENSE -PACKAGES += CSWlibmagick++4 -PKGFILES_CSWlibmagick++4 += $(call pkgfiles_lib,libMagick++.so.4) -SPKG_DESC_CSWlibmagick++4 += Library from ImageMagick, libMagick++.so.4 -RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWlibltdl7 -RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWjpeg -RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWliblcms2-2 -RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWliblqr -RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWtiff -RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWlibmagickcore4 -RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWzlib -RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWftype2 -RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWbzip2 -RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWlibmagickwand4 -RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWfconfig -RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWglib2 -RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWlibfftw3-3 -RUNTIME_DEP_PKGS_CSWlibmagick++4 += CSWliblzma5 +BUILD_DEP_PKGS += CSWdjvulibredevel +BUILD_DEP_PKGS += CSWgraphvizdevel +BUILD_DEP_PKGS += CSWilmbasedevel +BUILD_DEP_PKGS += CSWliblcms-dev +BUILD_DEP_PKGS += CSWlibcairo-dev +BUILD_DEP_PKGS += CSWliblqrdevel +BUILD_DEP_PKGS += CSWlibwmf-dev +BUILD_DEP_PKGS += CSWliblzma-dev +BUILD_DEP_PKGS += CSWopenexrdevel +BUILD_DEP_PKGS += CSWlibwebp-dev +BUILD_DEP_PKGS += CSWlibfpx-dev -PACKAGES += CSWlibmagickcore4 -PKGFILES_CSWlibmagickcore4 += $(call pkgfiles_lib,libMagickCore.so.4) -SPKG_DESC_CSWlibmagickcore4 += Library from ImageMagick, libMagickCore.so.4 -RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWlibltdl7 -RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWjpeg -RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWliblcms2-2 -RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWliblqr -RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWtiff -RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWzlib -RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWftype2 -RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWbzip2 -RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWfconfig -RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWglib2 -RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWlibfftw3-3 -RUNTIME_DEP_PKGS_CSWlibmagickcore4 += CSWliblzma5 +PACKAGES += CSWlibmagick++5 +PKGFILES_CSWlibmagick++5 += $(call pkgfiles_lib,libMagick++.so.5) +SPKG_DESC_CSWlibmagick++5 += Library from ImageMagick, libMagick++.so.5 +RUNTIME_DEP_PKGS_CSWlibmagick++5 += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWlibmagick++5 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibmagick++5 += CSWliblcms2-2 +RUNTIME_DEP_PKGS_CSWlibmagick++5 += CSWliblqr1-0 +RUNTIME_DEP_PKGS_CSWlibmagick++5 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibmagick++5 += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWlibmagick++5 += CSWlibmagickcore5 +RUNTIME_DEP_PKGS_CSWlibmagick++5 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibmagick++5 += CSWftype2 +RUNTIME_DEP_PKGS_CSWlibmagick++5 += CSWlibbz2-1-0 +RUNTIME_DEP_PKGS_CSWlibmagick++5 += CSWlibmagickwand5 +RUNTIME_DEP_PKGS_CSWlibmagick++5 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibmagick++5 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibmagick++5 += CSWlibfftw3-3 +RUNTIME_DEP_PKGS_CSWlibmagick++5 += CSWliblzma5 + +PACKAGES += CSWlibmagickcore5 +PKGFILES_CSWlibmagickcore5 += $(call pkgfiles_lib,libMagickCore.so.5) +SPKG_DESC_CSWlibmagickcore5 += Library from ImageMagick, libMagickCore.so.5 +RUNTIME_DEP_PKGS_CSWlibmagickcore5 += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWlibmagickcore5 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibmagickcore5 += CSWliblcms2-2 +RUNTIME_DEP_PKGS_CSWlibmagickcore5 += CSWliblqr1-0 +RUNTIME_DEP_PKGS_CSWlibmagickcore5 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibmagickcore5 += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWlibmagickcore5 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibmagickcore5 += CSWftype2 +RUNTIME_DEP_PKGS_CSWlibmagickcore5 += CSWlibbz2-1-0 +RUNTIME_DEP_PKGS_CSWlibmagickcore5 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibmagickcore5 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibmagickcore5 += CSWlibfftw3-3 +RUNTIME_DEP_PKGS_CSWlibmagickcore5 += CSWliblzma5 + # Gnuplot is detected by the magic cookie #!/usr/local/bin/gnuplot # XXX: Is this correct? -CHECKPKG_OVERRIDES_CSWlibmagickcore4 += file-with-bad-content|/usr/local|root/opt/csw/lib/libMagickCore.so.4.0.1 +# CHECKPKG_OVERRIDES_CSWlibmagickcore5 += file-with-bad-content|/usr/local|root/opt/csw/lib/libMagickCore.so.5.0.0 -PACKAGES += CSWlibmagickwand4 -PKGFILES_CSWlibmagickwand4 += $(call pkgfiles_lib,libMagickWand.so.4) -SPKG_DESC_CSWlibmagickwand4 += Library from ImageMagick, libMagickWand.so.4 -RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWlibltdl7 -RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWjpeg -RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWliblcms2-2 -RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWliblqr -RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWtiff -RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWlibmagickcore4 -RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWzlib -RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWftype2 -RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWbzip2 -RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWfconfig -RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWglib2 -RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWlibfftw3-3 -RUNTIME_DEP_PKGS_CSWlibmagickwand4 += CSWliblzma5 +PACKAGES += CSWlibmagickwand5 +PKGFILES_CSWlibmagickwand5 += $(call pkgfiles_lib,libMagickWand.so.5) +SPKG_DESC_CSWlibmagickwand5 += Library from ImageMagick, libMagickWand.so.5 +RUNTIME_DEP_PKGS_CSWlibmagickwand5 += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWlibmagickwand5 += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibmagickwand5 += CSWliblcms2-2 +RUNTIME_DEP_PKGS_CSWlibmagickwand5 += CSWliblqr1-0 +RUNTIME_DEP_PKGS_CSWlibmagickwand5 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibmagickwand5 += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWlibmagickwand5 += CSWlibmagickcore5 +RUNTIME_DEP_PKGS_CSWlibmagickwand5 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibmagickwand5 += CSWftype2 +RUNTIME_DEP_PKGS_CSWlibmagickwand5 += CSWlibbz2-1-0 +RUNTIME_DEP_PKGS_CSWlibmagickwand5 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibmagickwand5 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibmagickwand5 += CSWlibfftw3-3 +RUNTIME_DEP_PKGS_CSWlibmagickwand5 += CSWliblzma5 PACKAGES += CSWimagemagick-dev SPKG_DESC_CSWimagemagick-dev = Development files for ImageMagick libraries @@ -84,9 +102,9 @@ PKGFILES_DEVEL_MAN3_MANPAGE = PKGFILES_CSWimagemagick-dev += $(PKGFILES_DEVEL) PKGFILES_CSWimagemagick-dev += $(docdir)/.* -RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagick++4 -RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagickcore4 -RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagickwand4 +RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagick++5 +RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagickcore5 +RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWlibmagickwand5 RUNTIME_DEP_PKGS_CSWimagemagick-dev += CSWperl # This is all in /opt/csw/share/doc CHECKPKG_OVERRIDES_CSWimagemagick-dev += file-with-bad-content @@ -94,34 +112,38 @@ PACKAGES += CSWimagemagick SPKG_DESC_CSWimagemagick = A comprehensive package supporting automated and interative manipulation of images # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibmagickcore4 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibmagickwand4 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibmagickcore5 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibmagickwand5 RUNTIME_DEP_PKGS_CSWimagemagick += CSWliblcms2-2 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWbzip2 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibbz2-1-0 RUNTIME_DEP_PKGS_CSWimagemagick += CSWilmbase -RUNTIME_DEP_PKGS_CSWimagemagick += CSWpng +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibpng12-0 RUNTIME_DEP_PKGS_CSWimagemagick += CSWgtk2 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWglib2 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibltdl7 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWjpeg -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibfpx +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibfpx1 RUNTIME_DEP_PKGS_CSWimagemagick += CSWjasper RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWtiff +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibtiff3 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWimagemagick += CSWfconfig RUNTIME_DEP_PKGS_CSWimagemagick += CSWjbigkit -RUNTIME_DEP_PKGS_CSWimagemagick += CSWliblqr +RUNTIME_DEP_PKGS_CSWimagemagick += CSWliblqr1-0 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibcdt5 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWzlib +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibz1 RUNTIME_DEP_PKGS_CSWimagemagick += CSWftype2 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibrsvg +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibrsvg2-2 RUNTIME_DEP_PKGS_CSWimagemagick += CSWopenexrrt RUNTIME_DEP_PKGS_CSWimagemagick += CSWdjvulibrert RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgraph5 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibcairo +RUNTIME_DEP_PKGS_CSWimagemagick += CSWpango +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibcairo2 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgvc6 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWgcc3g++rt RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibfftw3-3 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibwmf0-2-7 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibwmflite0-2-7 @@ -134,27 +156,28 @@ PKGFILES_CSWpm-image-magick += $(mandir)/.*\.3perl RUNTIME_DEP_PKGS_CSWpm-image-magick += CSWperl -RUNTIME_DEP_PKGS_CSWpm-image-magick += CSWlibmagickcore4 +RUNTIME_DEP_PKGS_CSWpm-image-magick += CSWlibmagickcore5 -BUILD_DEP_PKGS += CSWdjvulibredevel -BUILD_DEP_PKGS += CSWgraphvizdevel -BUILD_DEP_PKGS += CSWilmbasedevel -BUILD_DEP_PKGS += CSWliblcms-dev -BUILD_DEP_PKGS += CSWlibcairodevel -BUILD_DEP_PKGS += CSWliblqrdevel -BUILD_DEP_PKGS += CSWlibwmf-dev -BUILD_DEP_PKGS += CSWliblzma-dev -BUILD_DEP_PKGS += CSWopenexrdevel -BUILD_DEP_PKGS += CSWlibwebp-dev +REINPLACE_USRLOCAL += config/mime.xml +REINPLACEMENTS += gnuplot +REINPLACE_MATCH_gnuplot = /usr/local/bin/gnuplot +REINPLACE_WITH_gnuplot = $(bindir)/gnuplot +REINPLACE_FILES_gnuplot += magick/magic.c + +# This is part of ImageMagick and should be automatically adjusted during configure time +REINPLACEMENTS += display +REINPLACE_MATCH_display = /usr/local/bin/display +REINPLACE_WITH_display = $(bindir)/display +REINPLACE_FILES_display += magick/delegate.c + +REINPLACEMENTS += nostdcpplib +REINPLACE_MATCH_nostdcpplib = -lstdc\+\+ +REINPLACE_WITH_nostdcpplib = +REINPLACE_FILES_nostdcpplib = Makefile.in + EXTRA_LINKER_FLAGS = -norunpath -# Somehow the above flag does not make it to the linker -#CHECKPKG_OVERRIDES_CSWlibmagick++4 += bad-rpath-entry|/lib|opt/csw/lib/libMagick++.so.4.0.1 -#CHECKPKG_OVERRIDES_CSWlibmagick++4 += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/libMagick++.so.4.0.1 -#CHECKPKG_OVERRIDES_CSWlibmagick++4 += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/lib/libMagick++.so.4.0.1 -#CHECKPKG_OVERRIDES_CSWlibmagick++4 += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/libMagick++.so.4.0.1 - # This is for libdps, skipping this line makes the following tests fail: # FAIL: tests/validate-formats-on-disk.sh # FAIL: Magick++/tests/coderInfo.sh @@ -165,22 +188,19 @@ RUNPATH_ISALIST = $(libpath_install) CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-perl=$(bindir)/perl CONFIGURE_ARGS += --enable-shared --disable-static CONFIGURE_ARGS += --enable-hdri CONFIGURE_ARGS += --with-dps=yes + # Ghostscript lib is linked to Sun X11 # CONFIGURE_ARGS += --with-gslib=no -# Solaris 8 and 9 doesn't have complex.h -# CONFIGURE_ARGS += --without-fftw + CONFIGURE_ARGS += --with-modules=yes -# Let's try to use openmp and see what it does for performance -#CONFIGURE_ARGS += --disable-openmp CONFIGURE_ARGS += --disable-silent-rules # Until librsvg,graphviz and perl is 64bit +CONFIGURE_ARGS-32 += --with-perl=$(bindir)/perl CONFIGURE_ARGS-64 += --without-gvc -CONFIGURE_ARGS-64 += --without-rsvg CONFIGURE_ARGS-64 += --without-perl CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) @@ -190,13 +210,9 @@ # http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=18889 SKIPTEST ?= 1 -# Dependencies not 64-bit yet -#BUILD64 = 1 +BUILD64 = 1 +ISAEXEC = 1 -# Is this really a problem? -#CHECKPKG_OVERRIDES_CSWimagemagick += soname-not-found|libdps.so.5|is|needed|by|opt/csw/lib/ImageMagick-6.7.0/modules-Q16/coders/dps.so -#CHECKPKG_OVERRIDES_CSWimagemagick += soname-not-found|libdpstk.so.5|is|needed|by|opt/csw/lib/ImageMagick-6.7.0/modules-Q16/coders/dps.so - # Only remove libtool files from the public lib directory, keep the private ones for libtool dlopn MERGE_EXCLUDE_LIBTOOL ?= $(libdir)/lib.*\.la @@ -206,13 +222,6 @@ EXTRA_PAX_ARGS += -s ',$(bindir)/compare,$(bindir)/compare-imagemagick,' EXTRA_PAX_ARGS += -s ',$(mandir)/man1/compare\.1,$(mandir)/man1/compare-imagemagick.1,' -STRIP_LIBTOOL = 1 - include gar/category.mk SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(GARSUBREV) - -post-install-modulated: - perl -pi \ - -e 's,/usr/local/bin,$(bindir),g' \ - $(DESTDIR)$(sysconfdir)/ImageMagick/mime.xml Modified: csw/mgar/pkg/ImageMagick/trunk/checksums =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/checksums 2011-12-14 01:02:15 UTC (rev 16495) +++ csw/mgar/pkg/ImageMagick/trunk/checksums 2011-12-14 09:03:11 UTC (rev 16496) @@ -1 +1 @@ -67d8631c20fc9a2409343c02b159407d ImageMagick-6.7.0-8.tar.xz +6bf001ae206bffe77693732e4e886532 ImageMagick-6.7.3-10.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Dec 14 10:29:48 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 14 Dec 2011 09:29:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[16497] csw/mgar/pkg/cpan/URI/trunk Message-ID: Revision: 16497 http://gar.svn.sourceforge.net/gar/?rev=16497&view=rev Author: bonivart Date: 2011-12-14 09:29:48 +0000 (Wed, 14 Dec 2011) Log Message: ----------- cpan/URI/trunk: update to 1.59 Modified Paths: -------------- csw/mgar/pkg/cpan/URI/trunk/Makefile csw/mgar/pkg/cpan/URI/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/URI/trunk/files/COPYING Modified: csw/mgar/pkg/cpan/URI/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/URI/trunk/Makefile 2011-12-14 09:03:11 UTC (rev 16496) +++ csw/mgar/pkg/cpan/URI/trunk/Makefile 2011-12-14 09:29:48 UTC (rev 16497) @@ -1,5 +1,5 @@ NAME = URI -VERSION = 1.38 +VERSION = 1.59 CATEGORIES = cpan AUTHOR = GAAS @@ -10,9 +10,15 @@ updated by RFC 2732). endef -PACKAGES = CSWpmuri -CATALOGNAME = pm_uri +DISTFILES += COPYING +PACKAGES = CSWpm-uri +SPKG_DESC_CSWpm-uri = $(DESCRIPTION) +OBSOLETED_BY_CSWpm-uri = CSWpmuri +CATALOGNAME_CSWpmuri = pm_uri_stub + ARCHALL = 1 +RUNTIME_DEP_PKGS += CSWpm-mime-base64 + include gar/category.mk Modified: csw/mgar/pkg/cpan/URI/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/URI/trunk/checksums 2011-12-14 09:03:11 UTC (rev 16496) +++ csw/mgar/pkg/cpan/URI/trunk/checksums 2011-12-14 09:29:48 UTC (rev 16497) @@ -1 +1 @@ -35fba2715eb8ac56e8e30244ae69ff65 download/URI-1.38.tar.gz +fecebf8fa20e2d26ea4a1649c095e96e URI-1.59.tar.gz Added: csw/mgar/pkg/cpan/URI/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/URI/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/URI/trunk/files/COPYING 2011-12-14 09:29:48 UTC (rev 16497) @@ -0,0 +1,5 @@ +Copyright 1998-2009 Gisle Aas. +Copyright 1998 Graham Barr. + +This library is free software; you can redistribute it and/or modify +it under the same terms as Perl itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Dec 14 10:50:55 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 14 Dec 2011 09:50:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[16498] csw/mgar/pkg Message-ID: Revision: 16498 http://gar.svn.sourceforge.net/gar/?rev=16498&view=rev Author: dmichelsen Date: 2011-12-14 09:50:55 +0000 (Wed, 14 Dec 2011) Log Message: ----------- libjpeg8: Prepare package, not released yet Modified Paths: -------------- csw/mgar/pkg/libjpeg8/trunk/Makefile csw/mgar/pkg/libjpeg8/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libjpeg8/ Modified: csw/mgar/pkg/libjpeg8/trunk/Makefile =================================================================== --- csw/mgar/pkg/libjpeg7/trunk/Makefile 2011-11-15 10:21:50 UTC (rev 16195) +++ csw/mgar/pkg/libjpeg8/trunk/Makefile 2011-12-14 09:50:55 UTC (rev 16498) @@ -1,5 +1,5 @@ NAME = jpeg -VERSION = 7 +VERSION = 8c CATEGORIES = lib DESCRIPTION = JPEG library and tools by the Independent JPEG Group @@ -19,23 +19,20 @@ CATALOGNAME_CSWjpeg = jpeg SPKG_DESC_CSWjpeg += JPEG library and tools by the Independent JPEG Group # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWjpeg += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWjpeg += CSWlibjpeg8 # This is for legacy packages compiled against libjpeg.so.62 and depend on the unified CSWjpeg which # contained both shared libraries in the past. RUNTIME_DEP_PKGS_CSWjpeg += CSWlibjpeg62 - -# Overwrite this for now until the package has been released CHECKPKG_OVERRIDES_CSWjpeg += surplus-dependency|CSWlibjpeg62 -CHECKPKG_OVERRIDES_CSWjpeg += unidentified-dependency|CSWlibjpeg62 -PACKAGES += CSWlibjpeg7 -SPKG_DESC_CSWlibjpeg7 += JPEG library and tools by the Independent JPEG Group, libjpeg.so.7 -PKGFILES_CSWlibjpeg7 = $(call pkgfiles_lib,libjpeg.so.7) +PACKAGES += CSWlibjpeg8 +SPKG_DESC_CSWlibjpeg8 += JPEG library and tools by the Independent JPEG Group, libjpeg.so.8 +PKGFILES_CSWlibjpeg8 = $(call pkgfiles_lib,libjpeg.so.8) PACKAGES += CSWlibjpeg-dev -SPKG_DESC_CSWlibjpeg-dev += Development files for libjpeg.so.7 +SPKG_DESC_CSWlibjpeg-dev += Development files for libjpeg.so.8 PKGFILES_CSWlibjpeg-dev += $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWlibjpeg-dev += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibjpeg-dev += CSWlibjpeg8 BUILD64 = 1 ISAEXEC = 1 Modified: csw/mgar/pkg/libjpeg8/trunk/checksums =================================================================== --- csw/mgar/pkg/libjpeg7/trunk/checksums 2011-11-15 10:21:50 UTC (rev 16195) +++ csw/mgar/pkg/libjpeg8/trunk/checksums 2011-12-14 09:50:55 UTC (rev 16498) @@ -1 +1 @@ -382ef33b339c299b56baf1296cda9785 jpegsrc.v7.tar.gz +a2c10c04f396a9ce72894beb18b4e1f9 jpegsrc.v8c.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Wed Dec 14 11:28:27 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Wed, 14 Dec 2011 10:28:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[16499] csw/mgar/pkg/puppet/trunk Message-ID: Revision: 16499 http://gar.svn.sourceforge.net/gar/?rev=16499&view=rev Author: phipsy Date: 2011-12-14 10:28:27 +0000 (Wed, 14 Dec 2011) Log Message: ----------- puppet: testing a 2.7 release Modified Paths: -------------- csw/mgar/pkg/puppet/trunk/Makefile csw/mgar/pkg/puppet/trunk/checksums csw/mgar/pkg/puppet/trunk/files/README.CSW csw/mgar/pkg/puppet/trunk/files/pkgutil.rb Modified: csw/mgar/pkg/puppet/trunk/Makefile =================================================================== --- csw/mgar/pkg/puppet/trunk/Makefile 2011-12-14 09:50:55 UTC (rev 16498) +++ csw/mgar/pkg/puppet/trunk/Makefile 2011-12-14 10:28:27 UTC (rev 16499) @@ -7,7 +7,7 @@ # [1] http://garylaw.net/packages/puppet-build.sh NAME = puppet -VERSION = 2.6.12 +VERSION = 2.7.9 CATEGORIES = apps define BLURB @@ -28,7 +28,7 @@ DISTFILES += CSWpuppet.postinstall # pkgutil.rb is from https://raw.github.com/domcleal/puppet/tickets/master/8011/lib/puppet/provider/package/pkgutil.rb # Should be headed into 2.7 code - supports -t REPO -# Still not in 2.7.3 as of 9/9/11 +# Still not in 2.7.6 as of 29/11/11 DISTFILES += pkgutil.rb DISTFILES += README.CSW DISTFILES += puppet.conf.example-CSW @@ -71,7 +71,7 @@ TEST_SCRIPTS = INSTALL_SCRIPTS = puppet -PATCHFILES = 0003-Use-opt-csw-share-puppet-modules-as-default.patch +# PATCHFILES = 0003-Use-opt-csw-share-puppet-modules-as-default.patch CHECKPKG_OVERRIDES_CSWpuppetmaster = surplus-dependency|CSWruby18 CHECKPKG_OVERRIDES_CSWpuppet = surplus-dependency|CSWfacter Modified: csw/mgar/pkg/puppet/trunk/checksums =================================================================== --- csw/mgar/pkg/puppet/trunk/checksums 2011-12-14 09:50:55 UTC (rev 16498) +++ csw/mgar/pkg/puppet/trunk/checksums 2011-12-14 10:28:27 UTC (rev 16499) @@ -7,3 +7,5 @@ f60d8118ee1f3d68b2383acf3dd76d38 puppet-2.7.3.tar.gz c95639073a812a0c91119b10f46a66fb puppet-2.6.11.tar.gz 3851b1a33cde9d697d5c5c21ef795438 puppet-2.6.12.tar.gz +6dfbeb7810524c97747f45aa194b506f puppet-2.7.6.tar.gz +474c11eeb3c6fc6dabe83b2f4510d038 puppet-2.7.9.tar.gz Modified: csw/mgar/pkg/puppet/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/puppet/trunk/files/README.CSW 2011-12-14 09:50:55 UTC (rev 16498) +++ csw/mgar/pkg/puppet/trunk/files/README.CSW 2011-12-14 10:28:27 UTC (rev 16499) @@ -6,7 +6,7 @@ will find an example skeleton puppet.conf that is designed to make the product confirm to our paths. To use the daemon with CSW paths, put the puppet.conf examples in /etc/puppet and /etc/opt/csw/puppet into place and start the -daemon. +daemon with --confdir=/etc/opt/csw/puppet. Naturally you're free to discard the examples and use the product's own preferred paths. If no puppet.conf is present in /etc/puppet this is how the Modified: csw/mgar/pkg/puppet/trunk/files/pkgutil.rb =================================================================== --- csw/mgar/pkg/puppet/trunk/files/pkgutil.rb 2011-12-14 09:50:55 UTC (rev 16498) +++ csw/mgar/pkg/puppet/trunk/files/pkgutil.rb 2011-12-14 10:28:27 UTC (rev 16499) @@ -149,7 +149,11 @@ # Allow source to be one or more URLs pointing to a repository that all # get passed to pkgutil via one or more -t options if resource[:source] - pkguti *[resource[:source].map{|src| [ "-t", src ]}, *args].flatten + sources = resource[:source] + sources = sources.split($/) if sources.is_a?(String) + sources = sources.flatten + + pkguti *[sources.map{|src| [ "-t", src ]}, *args].flatten else pkguti *args.flatten end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Dec 14 11:30:07 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 14 Dec 2011 10:30:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[16500] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 16500 http://gar.svn.sourceforge.net/gar/?rev=16500&view=rev Author: dmichelsen Date: 2011-12-14 10:30:06 +0000 (Wed, 14 Dec 2011) Log Message: ----------- mysql5/branches/mysql-5.0.x: Fix -dev alterantive Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-12-14 10:28:27 UTC (rev 16499) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-12-14 10:30:06 UTC (rev 16500) @@ -52,7 +52,7 @@ OBSOLETED_BY_CSWmysql-dev = CSWmysql5devel CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root$(mandir)/man1/mysql_config-$(BASE_VERSION).1 ALTERNATIVES_CSWmysql-dev = mysql_dev -ALTERNATIVE_mysql_dev = $(bindir)/$(firstword $(CSWmysql-dev_programs)) mysql_dev $(bindir)/$(firstword $(CSWmysql-dev_programs)) $(ALTS_PRIO) +ALTERNATIVE_mysql_dev = $(bindir)/$(firstword $(CSWmysql-dev_programs)) mysql_dev $(bindir)/$(firstword $(CSWmysql-dev_programs))-$(BASE_VERSION) $(ALTS_PRIO) ALTERNATIVE_mysql_dev += $(foreach C,$(wordlist 2,$(words $(CSWmysql-dev_programs)),$(CSWmysql-dev_programs)),\ $(bindir)/$C $C $(bindir)/$C-$(BASE_VERSION)) ALTERNATIVE_mysql_dev += $(foreach C,$(wordlist 2,$(words $(CSWmysql-dev_programs)),$(CSWmysql-dev_programs)),\ 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 Dec 14 12:00:31 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 14 Dec 2011 11:00:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[16501] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/ cswmysql5.tpl Message-ID: Revision: 16501 http://gar.svn.sourceforge.net/gar/?rev=16501&view=rev Author: wahwah Date: 2011-12-14 11:00:30 +0000 (Wed, 14 Dec 2011) Log Message: ----------- mysql5/branches/mysql-5.0.x: Trying to fix the startup script to use mysqld-5.0 Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5.tpl Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5.tpl =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5.tpl 2011-12-14 10:30:06 UTC (rev 16500) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5.tpl 2011-12-14 11:00:30 UTC (rev 16501) @@ -26,7 +26,7 @@ MYSQLD_DATADIR=$MYSQL_VAR MYSQLD_PID_FILE=$MYSQL_VAR/mysql.pid CONFFILE=${sysconfdir}/my.cnf -MYSQLD_PROG=${MYSQLD_PROG:-/opt/csw/libexec/mysqld-${BASE_VERSION}} +MYSQLD_PROG=${MYSQLD_PROG:-mysqld-${BASE_VERSION}} # Source the configuration [ -r /opt/csw/mysql5/etc/mysql5rc ] && . /opt/csw/mysql5/etc/mysql5rc 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 Dec 14 12:14:19 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 14 Dec 2011 11:14:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[16502] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/ 0009-versioned-datadir-in-mysql_install_db-5.0.patch Message-ID: Revision: 16502 http://gar.svn.sourceforge.net/gar/?rev=16502&view=rev Author: wahwah Date: 2011-12-14 11:14:19 +0000 (Wed, 14 Dec 2011) Log Message: ----------- mysql5/branches/mysql-5.0.x: update the mysql_install_db patch to use 5.0, not 5.1 Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0009-versioned-datadir-in-mysql_install_db-5.0.patch Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0009-versioned-datadir-in-mysql_install_db-5.0.patch =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0009-versioned-datadir-in-mysql_install_db-5.0.patch 2011-12-14 11:00:30 UTC (rev 16501) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0009-versioned-datadir-in-mysql_install_db-5.0.patch 2011-12-14 11:14:19 UTC (rev 16502) @@ -16,7 +16,7 @@ if test "$cross_bootstrap" -eq 0 then - pkgdatadir=`find_in_basedir --dir fill_help_tables.sql share share/mysql` -+ pkgdatadir=`find_in_basedir --dir fill_help_tables.sql share share/mysql share/mysql/5.1/mysql` ++ pkgdatadir=`find_in_basedir --dir fill_help_tables.sql share share/mysql share/mysql/5.0/mysql` if test -z "$pkgdatadir" then missing_in_basedir fill_help_tables.sql This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Wed Dec 14 12:26:32 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Wed, 14 Dec 2011 11:26:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[16503] csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile Message-ID: Revision: 16503 http://gar.svn.sourceforge.net/gar/?rev=16503&view=rev Author: guengel Date: 2011-12-14 11:26:32 +0000 (Wed, 14 Dec 2011) Log Message: ----------- gtk2/branches/2.24-raos: Fixed EXPANDVARS. Modified Paths: -------------- csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile Modified: csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile =================================================================== --- csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile 2011-12-14 11:14:19 UTC (rev 16502) +++ csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile 2011-12-14 11:26:32 UTC (rev 16503) @@ -41,8 +41,8 @@ DISTFILES += CSWgtk2.postinstall DISTFILES += CSWgtk2-immodules.postinstall -EXPANDVARS = CSWgtk2-immodules.postinstall -EXPANDVARS = CSWgtk2.postinstall +EXPANDVARS = CSWgtk2-immodules.postinstall +EXPANDVARS += CSWgtk2.postinstall # This makes the tests work in the first place PATCHFILES += 0000-Use-absolute-path-to-Xvfb.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Wed Dec 14 14:10:14 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Wed, 14 Dec 2011 13:10:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[16504] csw/mgar/pkg/gdk-pixbuf/trunk/Makefile Message-ID: Revision: 16504 http://gar.svn.sourceforge.net/gar/?rev=16504&view=rev Author: guengel Date: 2011-12-14 13:10:14 +0000 (Wed, 14 Dec 2011) Log Message: ----------- gdk-pixbuf/trunk: Using MERGE_DIRS_isa-extra. Modified Paths: -------------- csw/mgar/pkg/gdk-pixbuf/trunk/Makefile Modified: csw/mgar/pkg/gdk-pixbuf/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdk-pixbuf/trunk/Makefile 2011-12-14 11:26:32 UTC (rev 16503) +++ csw/mgar/pkg/gdk-pixbuf/trunk/Makefile 2011-12-14 13:10:14 UTC (rev 16504) @@ -165,9 +165,11 @@ BUILD_DEP_PKGS += CSWlibpng-dev BUILD_DEP_PKGS += CSWtiff -ISAEXEC = 0 BUILD64 = 1 +# We need the binaries to query 64 bit modules +MERGE_DIRS_isa-extra = $(bindir) $(libdir) + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-libiconv-prefix CONFIGURE_ARGS += --with-libintl-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 Wed Dec 14 14:52:24 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 14 Dec 2011 13:52:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[16505] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 16505 http://gar.svn.sourceforge.net/gar/?rev=16505&view=rev Author: wahwah Date: 2011-12-14 13:52:23 +0000 (Wed, 14 Dec 2011) Log Message: ----------- mysql5/branches/mysql-5.0.x: merge also bindir, sbindir and libexecdir Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-12-14 13:10:14 UTC (rev 16504) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-12-14 13:52:23 UTC (rev 16505) @@ -36,6 +36,8 @@ MYSQL_LIB_VER = 15 +MERGE_DIRS_isa-extra = $(bindir) $(libdir) $(sbindir) $(libexecdir) + PACKAGES += CSWmysql-dev SPKG_DESC_CSWmysql-dev = MySQL development files PKGFILES_CSWmysql-dev = $(PKGFILES_DEVEL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Dec 14 15:02:56 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 14 Dec 2011 14:02:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[16506] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 16506 http://gar.svn.sourceforge.net/gar/?rev=16506&view=rev Author: dmichelsen Date: 2011-12-14 14:02:56 +0000 (Wed, 14 Dec 2011) Log Message: ----------- mGAR v2: Add preliminary SOS12U2 support Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2011-12-14 13:52:23 UTC (rev 16505) +++ csw/mgar/gar/v2/gar.conf.mk 2011-12-14 14:02:56 UTC (rev 16506) @@ -84,12 +84,12 @@ # Select compiler # GARCOMPILER can be either GNU/SUN which selects the default -# Sun or GNU compiler, or the specific verions SOS11/SOS12/SOS12U1/GCC3/GCC4 +# Sun or GNU compiler, or the specific verions SOS11/SOS12/SOS12U1/SOS12U2/GCC3/GCC4 GARCOMPILER ?= SUN # We have parameters for the following compilers -GARCOMPILERS = GCC3 GCC4 SOS11 SOS12 SOS12U1 +GARCOMPILERS = GCC3 GCC4 SOS11 SOS12 SOS12U1 SOS12U2 ifeq ($(GARCOMPILER),SUN) GARCOMPILER = SOS12 @@ -227,6 +227,7 @@ ARCHFLAGS_SOS11_sparcv9+fmuladd = ERROR ARCHFLAGS_SOS12_sparcv9+fmuladd = -m64 -xarch=sparcfmaf -fma=fused ARCHFLAGS_SOS12U1_sparcv9+fmuladd = -m64 -xarch=sparcfmaf -fma=fused +ARCHFLAGS_SOS12U2_sparcv9+fmuladd = -m64 -xarch=sparcfmaf -fma=fused ARCHFLAGS_GCC3_sparcv9+fmuladd = ERROR ARCHFLAGS_GCC4_sparcv9+fmuladd = ERROR MEMORYMODEL_sparcv9+fmuladd = 64 @@ -234,6 +235,7 @@ ARCHFLAGS_SOS11_sparcv9+vis2 = -xarch=v9b ARCHFLAGS_SOS12_sparcv9+vis2 = -m64 -xarch=sparcvis2 ARCHFLAGS_SOS12U1_sparcv9+vis2 = -m64 -xarch=sparcvis2 + ARCHFLAGS_SOS12U2_sparcv9+vis2 = -m64 -xarch=sparcvis2 ARCHFLAGS_GCC3_sparcv9+vis2 = ERROR ARCHFLAGS_GCC4_sparcv9+vis2 = ERROR MEMORYMODEL_sparcv9+vis2 = 64 @@ -241,6 +243,7 @@ ARCHFLAGS_SOS11_sparcv9+vis = -xarch=v9a ARCHFLAGS_SOS12_sparcv9+vis = -m64 -xarch=sparcvis ARCHFLAGS_SOS12U1_sparcv9+vis = -m64 -xarch=sparcvis + ARCHFLAGS_SOS12U2_sparcv9+vis = -m64 -xarch=sparcvis ARCHFLAGS_GCC3_sparcv9+vis = -m64 -mcpu=ultrasparc -mvis ARCHFLAGS_GCC4_sparcv9+vis = -m64 -mcpu=ultrasparc -mvis MEMORYMODEL_sparcv9+vis = 64 @@ -248,6 +251,7 @@ ARCHFLAGS_SOS11_sparcv9 = -xarch=v9 ARCHFLAGS_SOS12_sparcv9 = -m64 -xarch=sparc ARCHFLAGS_SOS12U1_sparcv9 = -m64 -xarch=sparc + ARCHFLAGS_SOS12U2_sparcv9 = -m64 -xarch=sparc ARCHFLAGS_GCC3_sparcv9 = -m64 -mcpu=v9 ARCHFLAGS_GCC4_sparcv9 = -m64 -mcpu=v9 MEMORYMODEL_sparcv9 = 64 @@ -255,6 +259,7 @@ ARCHFLAGS_SOS11_sparcv8plus+fmuladd = ERROR ARCHFLAGS_SOS12_sparcv8plus+fmuladd = -m32 -xarch=xparcfmaf -fma=fused ARCHFLAGS_SOS12U1_sparcv8plus+fmuladd = -m32 -xarch=xparcfmaf -fma=fused +ARCHFLAGS_SOS12U2_sparcv8plus+fmuladd = -m32 -xarch=xparcfmaf -fma=fused ARCHFLAGS_GCC3_sparcv8plus+fmuladd = ERROR ARCHFLAGS_GCC4_sparcv8plus+fmuladd = ERROR MEMORYMODEL_sparcv8plus+fmuladd = 32 @@ -262,6 +267,7 @@ ARCHFLAGS_SOS11_sparcv8plus+vis2 = -xarch=v8plusb ARCHFLAGS_SOS12_sparcv8plus+vis2 = -m32 -xarch=sparcvis2 ARCHFLAGS_SOS12U1_sparcv8plus+vis2 = -m32 -xarch=sparcvis2 +ARCHFLAGS_SOS12U2_sparcv8plus+vis2 = -m32 -xarch=sparcvis2 ARCHFLAGS_GCC3_sparcv8plus+vis2 = ERROR ARCHFLAGS_GCC4_sparcv8plus+vis2 = ERROR MEMORYMODEL_sparcv8plus+vis2 = 32 @@ -269,6 +275,7 @@ ARCHFLAGS_SOS11_sparcv8plus+vis = -xarch=v8plusa ARCHFLAGS_SOS12_sparcv8plus+vis = -m32 -xarch=sparcvis ARCHFLAGS_SOS12U1_sparcv8plus+vis = -m32 -xarch=sparcvis +ARCHFLAGS_SOS12U2_sparcv8plus+vis = -m32 -xarch=sparcvis ARCHFLAGS_GCC3_sparcv8plus+vis = -mcpu=v8 -mvis ARCHFLAGS_GCC4_sparcv8plus+vis = -mcpu=v8 -mvis MEMORYMODEL_sparcv8plus+vis = 32 @@ -276,6 +283,7 @@ ARCHFLAGS_SOS11_sparcv8plus = -xarch=v8plus ARCHFLAGS_SOS12_sparcv8plus = -m32 -xarch=sparc ARCHFLAGS_SOS12U1_sparcv8plus = -m32 -xarch=sparc + ARCHFLAGS_SOS12U2_sparcv8plus = -m32 -xarch=sparc ARCHFLAGS_GCC3_sparcv8plus = -mcpu=v8 -mv8plus ARCHFLAGS_GCC4_sparcv8plus = -mcpu=v8 -mv8plus MEMORYMODEL_sparcv8plus = 32 @@ -283,6 +291,7 @@ ARCHFLAGS_SOS11_sparcv8 = -xarch=v8 ARCHFLAGS_SOS12_sparcv8 = -m32 -xarch=v8 ARCHFLAGS_SOS12U1_sparcv8 = -m32 -xarch=v8 + ARCHFLAGS_SOS12U2_sparcv8 = -m32 -xarch=v8 ARCHFLAGS_GCC3_sparcv8 = -mcpu=v8 ARCHFLAGS_GCC4_sparcv8 = -mcpu=v8 MEMORYMODEL_sparcv8 = 32 @@ -290,6 +299,7 @@ ARCHFLAGS_SOS11_sparcv8-fsmuld = -xarch=v8a ARCHFLAGS_SOS12_sparcv8-fsmuld = -m32 -xarch=v8a ARCHFLAGS_SOS12U1_sparcv8-fsmuld = -m32 -xarch=v8a + ARCHFLAGS_SOS12U2_sparcv8-fsmuld = -m32 -xarch=v8a ARCHFLAGS_GCC3_sparcv8-fsmuld = ERROR ARCHFLAGS_GCC4_sparcv8-fsmuld = ERROR MEMORYMODEL_sparcv8-fsmuld = 32 @@ -297,6 +307,7 @@ ARCHFLAGS_SOS11_amd64 = -xarch=amd64 ARCHFLAGS_SOS12_amd64 = -m64 -xarch=sse2 ARCHFLAGS_SOS12U1_amd64 = -m64 -xarch=sse2 + ARCHFLAGS_SOS12U2_amd64 = -m64 -xarch=sse2 ARCHFLAGS_GCC3_amd64 = -m64 -march=opteron ARCHFLAGS_GCC4_amd64 = -m64 -march=opteron MEMORYMODEL_amd64 = 64 @@ -304,6 +315,7 @@ ARCHFLAGS_SOS11_pentium_pro+mmx = -xarch=pentium_proa ARCHFLAGS_SOS12_pentium_pro+mmx = -m32 -xarch=pentium_proa ARCHFLAGS_SOS12U1_pentium_pro+mmx = -m32 -xarch=pentium_proa +ARCHFLAGS_SOS12U2_pentium_pro+mmx = -m32 -xarch=pentium_proa ARCHFLAGS_GCC3_pentium_pro+mmx = -m32 -march=pentium2 ARCHFLAGS_GCC4_pentium_pro+mmx = -m32 -march=pentium2 MEMORYMODEL_pentium_pro+mmx = 32 @@ -311,6 +323,7 @@ ARCHFLAGS_SOS11_pentium_pro = -xarch=pentium_pro -xchip=pentium_pro ARCHFLAGS_SOS12_pentium_pro = -m32 -xarch=pentium_pro -xchip=pentium_pro ARCHFLAGS_SOS12U1_pentium_pro = -m32 -xarch=pentium_pro -xchip=pentium_pro + ARCHFLAGS_SOS12U2_pentium_pro = -m32 -xarch=pentium_pro -xchip=pentium_pro ARCHFLAGS_GCC3_pentium_pro = -m32 -march=pentiumpro ARCHFLAGS_GCC4_pentium_pro = -m32 -march=pentiumpro MEMORYMODEL_pentium_pro = 32 @@ -318,6 +331,7 @@ ARCHFLAGS_SOS11_pentium+mmx = ERROR ARCHFLAGS_SOS12_pentium+mmx = ERROR ARCHFLAGS_SOS12U1_pentium+mmx = ERROR + ARCHFLAGS_SOS12U2_pentium+mmx = ERROR ARCHFLAGS_GCC3_pentium+mmx = -m32 -march=pentium-mmx ARCHFLAGS_GCC4_pentium+mmx = -m32 -march=pentium-mmx MEMORYMODEL_pentium+mmx = 32 @@ -325,6 +339,7 @@ ARCHFLAGS_SOS11_pentium = -xchip=pentium ARCHFLAGS_SOS12_pentium = -m32 -xchip=pentium ARCHFLAGS_SOS12U1_pentium = -m32 -xchip=pentium + ARCHFLAGS_SOS12U2_pentium = -m32 -xchip=pentium ARCHFLAGS_GCC3_pentium = -m32 -march=pentium ARCHFLAGS_GCC4_pentium = -m32 -march=pentium MEMORYMODEL_pentium = 32 @@ -332,6 +347,7 @@ ARCHFLAGS_SOS11_i486 = -xarch=386 -xchip=486 ARCHFLAGS_SOS12_i486 = -m32 -xarch=386 -xchip=486 ARCHFLAGS_SOS12U1_i486 = -m32 -xarch=386 -xchip=486 + ARCHFLAGS_SOS12U2_i486 = -m32 -xarch=386 -xchip=486 ARCHFLAGS_GCC3_i486 = -m32 -march=i486 ARCHFLAGS_GCC4_i486 = -m32 -march=i486 MEMORYMODEL_i486 = 32 @@ -339,6 +355,7 @@ ARCHFLAGS_SOS11_i386 = -xarch=386 ARCHFLAGS_SOS12_i386 = -m32 -xarch=386 ARCHFLAGS_SOS12U1_i386 = -m32 -xarch=386 + ARCHFLAGS_SOS12U2_i386 = -m32 -xarch=386 ARCHFLAGS_GCC3_i386 = -m32 -march=i386 ARCHFLAGS_GCC4_i386 = -m32 -march=i386 MEMORYMODEL_i386 = 32 @@ -366,17 +383,20 @@ OPT_FLAGS_SOS11 ?= $(OPT_FLAGS_SOS) OPT_FLAGS_SOS12 ?= $(OPT_FLAGS_SOS) OPT_FLAGS_SOS12U1 ?= $(OPT_FLAGS_SOS) +OPT_FLAGS_SOS12U2 ?= $(OPT_FLAGS_SOS) OPT_FLAGS_GCC3 ?= $(OPT_FLAGS_GCC) OPT_FLAGS_GCC4 ?= $(OPT_FLAGS_GCC) OPT_FLAGS_SOS11_sparc ?= $(OPT_FLAGS_SOS11) OPT_FLAGS_SOS12_sparc ?= $(OPT_FLAGS_SOS12) OPT_FLAGS_SOS12U1_sparc ?= $(OPT_FLAGS_SOS12U1) +OPT_FLAGS_SOS12U2_sparc ?= $(OPT_FLAGS_SOS12U2) OPT_FLAGS_GCC3_sparc ?= $(OPT_FLAGS_GCC3) OPT_FLAGS_GCC4_sparc ?= $(OPT_FLAGS_GCC4) OPT_FLAGS_SOS11_i386 ?= $(OPT_FLAGS_SOS11) OPT_FLAGS_SOS12_i386 ?= $(OPT_FLAGS_SOS12) OPT_FLAGS_SOS12U1_i386 ?= $(OPT_FLAGS_SOS12U1) + OPT_FLAGS_SOS12U2_i386 ?= $(OPT_FLAGS_SOS12U2) OPT_FLAGS_GCC3_i386 ?= $(OPT_FLAGS_GCC3) OPT_FLAGS_GCC4_i386 ?= $(OPT_FLAGS_GCC4) @@ -398,11 +418,13 @@ DBG_FLAGS_SOS11_sparc ?= -g DBG_FLAGS_SOS12_sparc ?= -g DBG_FLAGS_SOS12U1_sparc ?= -g +DBG_FLAGS_SOS12U2_sparc ?= -g DBG_FLAGS_GCC3_sparc ?= -g DBG_FLAGS_GCC4_sparc ?= -g DBG_FLAGS_SOS11_i386 ?= -g DBG_FLAGS_SOS12_i386 ?= -g DBG_FLAGS_SOS12U1_i386 ?= -g + DBG_FLAGS_SOS12U2_i386 ?= -g DBG_FLAGS_GCC3_i386 ?= -g DBG_FLAGS_GCC4_i386 ?= -g @@ -445,6 +467,9 @@ endif @$(MAKECOOKIE) +# BUILD64_ONLY means just build 64 bit and use isaexec for the binaries +$(if $(BUILD64_ONLY),$(eval ISAEXEC=1) $(eval BUILD64=1)) + # The package will be built for these architectures # We check automatically what can be build on this kernel architecture # REQUESTED_ISAS contains all ISAs that should be built @@ -483,6 +508,7 @@ SOS11_CC_HOME ?= /opt/studio/SOS11/SUNWspro SOS12_CC_HOME ?= /opt/studio/SOS12/SUNWspro SOS12U1_CC_HOME ?= /opt/studio/sunstudio12.1 +SOS12U2_CC_HOME ?= /opt/solstudio12.2 GCC4_VERSION ?= 4.6 @@ -491,52 +517,62 @@ SOS11_CC ?= $(SOS11_CC_HOME)/bin/cc SOS12_CC ?= $(SOS12_CC_HOME)/bin/cc SOS12U1_CC ?= $(SOS12U1_CC_HOME)/bin/cc + SOS12U2_CC ?= $(SOS12U2_CC_HOME)/bin/cc GCC3_CXX ?= $(GCC3_CC_HOME)/bin/g++ GCC4_CXX ?= $(GCC4_CC_HOME)/bin/g++-$(GCC4_VERSION) SOS11_CXX ?= $(SOS11_CC_HOME)/bin/CC SOS12_CXX ?= $(SOS12_CC_HOME)/bin/CC SOS12U1_CXX ?= $(SOS12U1_CC_HOME)/bin/CC + SOS12U2_CXX ?= $(SOS12U2_CC_HOME)/bin/CC GCC3_F77 ?= $(GCC3_CC_HOME)/bin/g77 GCC4_F77 ?= $(GCC4_CC_HOME)/bin/gfortran-$(GCC4_VERSION) SOS11_F77 ?= $(SOS11_CC_HOME)/bin/f77 SOS12_F77 ?= $(SOS12_CC_HOME)/bin/f77 SOS12U1_F77 ?= $(SOS12U1_CC_HOME)/bin/f77 + SOS12U2_CXX ?= $(SOS12U2_CC_HOME)/bin/CC GCC3_FC ?= $(GCC3_CC_HOME)/bin/g77 GCC4_FC ?= $(GCC4_CC_HOME)/bin/gfortran-$(GCC4_VERSION) SOS11_FC ?= $(SOS11_CC_HOME)/bin/f95 SOS12_FC ?= $(SOS12_CC_HOME)/bin/f95 SOS12U1_FC ?= $(SOS12U1_CC_HOME)/bin/f95 + SOS12U2_FC ?= $(SOS12U2_CC_HOME)/bin/f95 GCC3_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_CC_FLAGS) $(EXTRA_GCC_CC_FLAGS) $(EXTRA_CC_FLAGS) GCC4_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_CC_FLAGS) $(EXTRA_GCC_CC_FLAGS) $(EXTRA_CC_FLAGS) SOS11_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS) SOS12_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS) SOS12U1_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS) + SOS12U2_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U2_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS) GCC3_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_CXX_FLAGS) $(EXTRA_GCC_CXX_FLAGS) $(EXTRA_CXX_FLAGS) GCC4_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_CXX_FLAGS) $(EXTRA_GCC_CXX_FLAGS) $(EXTRA_CXX_FLAGS) SOS11_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS) SOS12_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS) SOS12U1_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS) +SOS12U2_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U2_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS) GCC3_AS_FLAGS ?= $(EXTRA_GCC3_AS_FLAGS) $(EXTRA_GCC_AS_FLAGS) $(EXTRA_AS_FLAGS) GCC4_AS_FLAGS ?= $(EXTRA_GCC4_AS_FLAGS) $(EXTRA_GCC_AS_FLAGS) $(EXTRA_AS_FLAGS) SOS11_AS_FLAGS ?= $(EXTRA_SOS11_AS_FLAGS) $(EXTRA_SOS_AS_FLAGS) $(EXTRA_AS_FLAGS) SOS12_AS_FLAGS ?= $(EXTRA_SOS12_AS_FLAGS) $(EXTRA_SOS_AS_FLAGS) $(EXTRA_AS_FLAGS) SOS12U1_AS_FLAGS ?= $(EXTRA_SOS12U1_AS_FLAGS) $(EXTRA_SOS_AS_FLAGS) $(EXTRA_AS_FLAGS) + SOS12U2_AS_FLAGS ?= $(EXTRA_SOS12U2_AS_FLAGS) $(EXTRA_SOS_AS_FLAGS) $(EXTRA_AS_FLAGS) GCC3_LD_FLAGS ?= -L$(GCC3_CC_HOME)/lib/$(MM_LIBDIR) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS) GCC4_LD_FLAGS ?= -L$(GCC4_CC_HOME)/lib/$(MM_LIBDIR) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS) SOS11_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) SOS12_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) SOS12U1_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) + SOS12U2_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U2_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) GCC3_FFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_FFLAGS) $(EXTRA_GCC_FFLAGS) $(EXTRA_FFLAGS) GCC4_FFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_FFLAGS) $(EXTRA_GCC_FFLAGS) $(EXTRA_FFLAGS) SOS11_FFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_FFLAGS) $(EXTRA_SOS_FFLAGS) $(EXTRA_FFLAGS) SOS12_FFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_FFLAGS) $(EXTRA_SOS_FFLAGS) $(EXTRA_FFLAGS) SOS12U1_FFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_FFLAGS) $(EXTRA_SOS_FFLAGS) $(EXTRA_FFLAGS) + SOS12U2_FFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U2_FFLAGS) $(EXTRA_SOS_FFLAGS) $(EXTRA_FFLAGS) GCC3_FCFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_FCFLAGS) $(EXTRA_GCC_FCFLAGS) $(EXTRA_FCFLAGS) GCC4_FCFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_FCFLAGS) $(EXTRA_GCC_FCFLAGS) $(EXTRA_FCFLAGS) SOS11_FCFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_FCFLAGS) $(EXTRA_SOS_FCFLAGS) $(EXTRA_FCFLAGS) SOS12_FCFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_FCFLAGS) $(EXTRA_SOS_FCFLAGS) $(EXTRA_FCFLAGS) SOS12U1_FCFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_FCFLAGS) $(EXTRA_SOS_FCFLAGS) $(EXTRA_FCFLAGS) + SOS12U2_FCFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U2_FCFLAGS) $(EXTRA_SOS_FCFLAGS) $(EXTRA_FCFLAGS) # Compiler version GCC3_CC_VERSION = $(shell $(GCC3_CC) -v 2>&1| ggrep version) @@ -559,6 +595,10 @@ SOS12U1_CXX_VERSION = $(shell $(SOS12U1_CXX) -V 2>&1| ggrep CC: | gsed -e 's/CC: //') SOS12U1_F77_VERSION = $(shell $(SOS12U1_F77) -V 2>&1| ggrep -e 'f9[05]': | gsed -e 's/f9[05]: //') SOS12U1_FC_VERSION = $(shell $(SOS12U1_FC) -V 2>&1| ggrep -e 'f9[05]:' | gsed -e 's/f9[05]: //') + SOS12U2_CC_VERSION = $(shell $(SOS12U2_CC) -V 2>&1| ggrep cc: | gsed -e 's/cc: //') +SOS12U2_CXX_VERSION = $(shell $(SOS12U2_CXX) -V 2>&1| ggrep CC: | gsed -e 's/CC: //') +SOS12U2_F77_VERSION = $(shell $(SOS12U2_F77) -V 2>&1| ggrep -e 'f9[05]': | gsed -e 's/f9[05]: //') + SOS12U2_FC_VERSION = $(shell $(SOS12U2_FC) -V 2>&1| ggrep -e 'f9[05]:' | gsed -e 's/f9[05]: //') CC_VERSION = $($(GARCOMPILER)_CC_VERSION) CXX_VERSION = $($(GARCOMPILER)_CXX_VERSION) @@ -627,6 +667,7 @@ SOS11_LD_OPTIONS = $(EXTRA_SOS11_LD_OPTIONS) $(EXTRA_SOS_LD_OPTIONS) SOS12_LD_OPTIONS = $(EXTRA_SOS12_LD_OPTIONS) $(EXTRA_SOS_LD_OPTIONS) SOS12U1_LD_OPTIONS = $(EXTRA_SOS12U1_LD_OPTIONS) $(EXTRA_SOS_LD_OPTIONS) +SOS12U2_LD_OPTIONS = $(EXTRA_SOS12U2_LD_OPTIONS) $(EXTRA_SOS_LD_OPTIONS) LD_OPTIONS ?= $(strip $($(GARCOMPILER)_LD_OPTIONS) $(RUNPATH_LINKER_FLAGS) $(EXTRA_LD_OPTIONS) $(_CATEGORY_LD_OPTIONS)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Wed Dec 14 16:57:01 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Wed, 14 Dec 2011 15:57:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[16507] csw/mgar/pkg/gamin/trunk/Makefile Message-ID: Revision: 16507 http://gar.svn.sourceforge.net/gar/?rev=16507&view=rev Author: guengel Date: 2011-12-14 15:57:00 +0000 (Wed, 14 Dec 2011) Log Message: ----------- gamin/trunk: Include 64bit executables. Added some BUILD_DEP_PKGS. Modified Paths: -------------- csw/mgar/pkg/gamin/trunk/Makefile Modified: csw/mgar/pkg/gamin/trunk/Makefile =================================================================== --- csw/mgar/pkg/gamin/trunk/Makefile 2011-12-14 14:02:56 UTC (rev 16506) +++ csw/mgar/pkg/gamin/trunk/Makefile 2011-12-14 15:57:00 UTC (rev 16507) @@ -59,11 +59,17 @@ RUNTIME_DEP_PKGS_CSWgamin += CSWlibglib2-0-0 OBSOLETED_BY_CSWgamin += CSWfam +BUILD_DEP_PKGS = CSWlibtool +BUILD_DEP_PKGS += CSWlibglib2-dev +BUILD_DEP_PKGS += CSWautoconf +BUILD_DEP_PKGS += CSWautomake + # For socket, recvmsg, connect # Overwrite existing -L/opt/csw/lib or installed libs will be picked up first LINKER_FLAGS = -lsocket -lnsl BUILD64 = 1 +MERGE_DIRS_isa-extra = $(bindir) $(libdir) $(libexecdir) # This is not passed to configure, although it is defined (but wrong) in configure.in EXTRA_CONFIGURE_EXPORTS += ENV_CFLAGS This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Wed Dec 14 17:38:48 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Wed, 14 Dec 2011 16:38:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[16508] csw/mgar/pkg/facter/trunk Message-ID: Revision: 16508 http://gar.svn.sourceforge.net/gar/?rev=16508&view=rev Author: phipsy Date: 2011-12-14 16:38:48 +0000 (Wed, 14 Dec 2011) Log Message: ----------- facter: version ramp Modified Paths: -------------- csw/mgar/pkg/facter/trunk/Makefile csw/mgar/pkg/facter/trunk/checksums Modified: csw/mgar/pkg/facter/trunk/Makefile =================================================================== --- csw/mgar/pkg/facter/trunk/Makefile 2011-12-14 15:57:00 UTC (rev 16507) +++ csw/mgar/pkg/facter/trunk/Makefile 2011-12-14 16:38:48 UTC (rev 16508) @@ -3,7 +3,7 @@ # $Id$ NAME = facter -VERSION = 1.6.0 +VERSION = 1.6.4 CATEGORIES = apps DESCRIPTION = A system fact gatherer @@ -26,7 +26,7 @@ RUNTIME_DEP_PKGS = CSWruby18 BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -PATCHFILES += 0001-puppetlabs-bug-7038-prtdiag.patch +# PATCHFILES += 0001-puppetlabs-bug-7038-prtdiag.patch ARCHALL = 1 CONFIGURE_SCRIPTS = Modified: csw/mgar/pkg/facter/trunk/checksums =================================================================== --- csw/mgar/pkg/facter/trunk/checksums 2011-12-14 15:57:00 UTC (rev 16507) +++ csw/mgar/pkg/facter/trunk/checksums 2011-12-14 16:38:48 UTC (rev 16508) @@ -2,3 +2,4 @@ 4dd4daebc59fa985b8aa7eb247ac4030 facter-1.5.8.tar.gz 435553aace9781ecff5dae593abc15fa facter-1.5.9.tar.gz bf7e384bf247935e973cfd7bf5592dfe facter-1.6.0.tar.gz +bd7224e2f5b3743c3a81fb7680c26729 facter-1.6.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Wed Dec 14 21:59:00 2011 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Wed, 14 Dec 2011 20:59:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[16509] csw/mgar/pkg/bluefish/trunk/Makefile Message-ID: Revision: 16509 http://gar.svn.sourceforge.net/gar/?rev=16509&view=rev Author: jake_goerzen Date: 2011-12-14 20:59:00 +0000 (Wed, 14 Dec 2011) Log Message: ----------- bluefish/trunk: temporarily override missing dependencies Modified Paths: -------------- csw/mgar/pkg/bluefish/trunk/Makefile Modified: csw/mgar/pkg/bluefish/trunk/Makefile =================================================================== --- csw/mgar/pkg/bluefish/trunk/Makefile 2011-12-14 16:38:48 UTC (rev 16508) +++ csw/mgar/pkg/bluefish/trunk/Makefile 2011-12-14 20:59:00 UTC (rev 16509) @@ -40,6 +40,16 @@ EXTRA_MERGE_EXCLUDE_FILES += .*XMLnamespaces.* EXTRA_MERGE_EXCLUDE_FILES += .*icons.* +# these packages have not been installed/updated on the buildfarm yet +# but they are in the unstable catalog. Temporarily overriding until +# buildfarm is updated. +CHECKPKG_OVERRIDES_CSWbluefish += missing-dependency|CSWlibglib2-0-0 +CHECKPKG_OVERRIDES_CSWbluefish += missing-dependency|CSWlibgio2-0-0 +CHECKPKG_OVERRIDES_CSWbluefish += missing-dependency|CSWlibgobject2-0-0 +CHECKPKG_OVERRIDES_CSWbluefish += missing-dependency|CSWlibgthread2-0-0 +CHECKPKG_OVERRIDES_CSWbluefish += missing-dependency|CSWlibgmodule2-0-0 +CHECKPKG_OVERRIDES_CSWbluefish += surplus-dependency|CSWglib2 + include gar/category.mk # ./configure needs this to find ggettext This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Wed Dec 14 22:53:21 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Wed, 14 Dec 2011 21:53:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[16510] csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile Message-ID: Revision: 16510 http://gar.svn.sourceforge.net/gar/?rev=16510&view=rev Author: guengel Date: 2011-12-14 21:53:21 +0000 (Wed, 14 Dec 2011) Log Message: ----------- gtk2/branches/2.24-raos: Added MERGE_DIRS_isa-extra. Modified Paths: -------------- csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile Modified: csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile =================================================================== --- csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile 2011-12-14 20:59:00 UTC (rev 16509) +++ csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile 2011-12-14 21:53:21 UTC (rev 16510) @@ -415,9 +415,11 @@ BUILD_DEP_PKGS += CSWlibkrb5-dev BUILD_DEP_PKGS += CSWggettext -ISAEXEC = 0 BUILD64 = 1 +# We need the binaries to query 64 bit modules +MERGE_DIRS_isa-extra = $(bindir) $(libdir) + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shm CONFIGURE_ARGS += --enable-xkb This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Wed Dec 14 22:56:49 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Wed, 14 Dec 2011 21:56:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[16511] csw/mgar/pkg/gdk-pixbuf/trunk/Makefile Message-ID: Revision: 16511 http://gar.svn.sourceforge.net/gar/?rev=16511&view=rev Author: guengel Date: 2011-12-14 21:56:49 +0000 (Wed, 14 Dec 2011) Log Message: ----------- gdk-pixbuf/trunk: Updated dependencies. Modified Paths: -------------- csw/mgar/pkg/gdk-pixbuf/trunk/Makefile Modified: csw/mgar/pkg/gdk-pixbuf/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdk-pixbuf/trunk/Makefile 2011-12-14 21:53:21 UTC (rev 16510) +++ csw/mgar/pkg/gdk-pixbuf/trunk/Makefile 2011-12-14 21:56:49 UTC (rev 16511) @@ -146,7 +146,7 @@ RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibintl8 RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibjpeg7 RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibpng12-0 -RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWtiff +RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibtiff3 CHECKPKG_OVERRIDES_CSWgdkpixbuf-loaders += catalogname-does-not-match-pkgname|pkgname=CSWgdkpixbuf-loaders|catalogname=gdk_pixbuf_loaders|expected-catalogname=gdkpixbuf_loaders PACKAGES += CSWlibgdk-pixbuf-dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Wed Dec 14 23:03:22 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Wed, 14 Dec 2011 22:03:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[16512] csw/mgar/pkg/postgresql/branches/postgresql-8. 3-raos/Makefile Message-ID: Revision: 16512 http://gar.svn.sourceforge.net/gar/?rev=16512&view=rev Author: guengel Date: 2011-12-14 22:03:22 +0000 (Wed, 14 Dec 2011) Log Message: ----------- postgresql/branches/postgresql-8.3-raos: Added MERGE_DIRS_isa-extra. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile 2011-12-14 21:56:49 UTC (rev 16511) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile 2011-12-14 22:03:22 UTC (rev 16512) @@ -363,18 +363,8 @@ EXTRA_LD_OPTIONS = -R$(prefix)/lib/\$$ISALIST BUILD64 = 1 -# There was a discussion about whether to use ISAEXEC by default. The argument -# is that enabling 64-bit by default where possible (using isaexec) is a waste. -# I'm not completely convinced. Leaving this line commented out for future -# consideration. -# -# References: -# - http://lists.opencsw.org/pipermail/maintainers/2009-November/004903.html -# -# I'd like to get some hard data though. What is the difference in the memory -# footprint, and what is the difference in execution speed between 32 and -# 64-bit versions? -ISAEXEC = 0 +#ISAEXEC = 0 +MERGE_DIRS_isa-extra = $(bindir) $(libdir) $(libexecdir) CONFIGURE_ARGS = $(DIRPATHS) # This is one of the quirks mentioned at the beginning: --program-suffix is not This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Thu Dec 15 05:36:40 2011 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Thu, 15 Dec 2011 04:36:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[16513] csw/mgar/pkg/sqsh/trunk/Makefile Message-ID: Revision: 16513 http://gar.svn.sourceforge.net/gar/?rev=16513&view=rev Author: d_pocock Date: 2011-12-15 04:36:40 +0000 (Thu, 15 Dec 2011) Log Message: ----------- sqsh: continue filling out Makefile using CSWpm-dbd-sybase-* as a reference Modified Paths: -------------- csw/mgar/pkg/sqsh/trunk/Makefile Modified: csw/mgar/pkg/sqsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/sqsh/trunk/Makefile 2011-12-14 22:03:22 UTC (rev 16512) +++ csw/mgar/pkg/sqsh/trunk/Makefile 2011-12-15 04:36:40 UTC (rev 16513) @@ -2,8 +2,15 @@ VERSION = 2.1.7 CATEGORIES = utils -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +#PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +# using this recipe as a reference for how to work with Sybase OCS +# under CSW: +# +# http://sourceforge.net/apps/trac/gar/browser/csw/mgar/pkg/cpan/DBD-Sybase/trunk/Makefile +# +# + # Hardwired to skip the tests ifeq ($(VERSION),2.1.7) #TEST_TARGET = check @@ -42,7 +49,48 @@ BUILD64 = 1 +EXTRA_MODULATORS = DBDRIVER +MODULATIONS_DBDRIVER = ocs freetds + +SKIP_MODULATIONS = isa-i386-dbdriver-ocs + +PACKAGES = CSWsqsh-ocs CSWsqsh-freetds + +CATALOGNAME_CSWsqsh-ocs = sqsh_ocs +CATALOGNAME_CSWsqsh-freetds = sqsh_freetds + +SPKG_DESC_CSWsqsh-ocs = $(DESCRIPTION) (Linked against Sybase OCS) +SPKG_DESC_CSWsqsh-freetds = $(DESCRIPTION) (Linked against FreeTDS) + +RUNTIME_DEP_PKGS_CSWsqsh-freetds += CSWfreetds +RUNTIME_DEP_PKGS_CSWsqsh-freetds += CSWggettextrt +RUNTIME_DEP_PKGS_CSWsqsh-ocs += CSWsqsh-freetds + +SYBASE_ocs = /opt/csw/sybase/OCS-12_5 +SYBASE_freetds = /opt/csw +SYBASE = $(SYBASE_$(DBDRIVER)) + +LD_LIBRARY_PATH = $(SYBASE)/lib + +NOISALIST = 1 +EXTRA_LIB = $(SYBASE)/lib + +LD_OPTIONS = +EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) + +EXTRA_CONFIGURE_EXPORTS = SYBASE LD_LIBRARY_PATH + +EXTRA_TEST_EXPORTS = LD_LIBRARY_PATH + +PKGFILES_CSWsqsh-ocs = /opt/csw/bin/sqsh-ocs + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shared --disable-nls +# These are provided by the Sybase OCS libraries +CHECKPKG_OVERRIDES_CSWsqsh-ocs += soname-not-found|libcs.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so +CHECKPKG_OVERRIDES_CSWsqsh-ocs += soname-not-found|libcomn.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so +CHECKPKG_OVERRIDES_CSWsqsh-ocs += soname-not-found|libtcl.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so +CHECKPKG_OVERRIDES_CSWsqsh-ocs += soname-not-found|libct.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Thu Dec 15 05:47:03 2011 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Thu, 15 Dec 2011 04:47:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[16514] csw/mgar/pkg/sqsh/trunk/Makefile Message-ID: Revision: 16514 http://gar.svn.sourceforge.net/gar/?rev=16514&view=rev Author: d_pocock Date: 2011-12-15 04:47:03 +0000 (Thu, 15 Dec 2011) Log Message: ----------- sqsh: add alternatives for sqsh OCS/freetds Modified Paths: -------------- csw/mgar/pkg/sqsh/trunk/Makefile Modified: csw/mgar/pkg/sqsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/sqsh/trunk/Makefile 2011-12-15 04:36:40 UTC (rev 16513) +++ csw/mgar/pkg/sqsh/trunk/Makefile 2011-12-15 04:47:03 UTC (rev 16514) @@ -84,6 +84,13 @@ PKGFILES_CSWsqsh-ocs = /opt/csw/bin/sqsh-ocs +ALTERNATIVES_CSWsqsh-ocs = ocs +ALTERNATIVES_CSWsqsh-freetds = freetds +ALTERNATIVE_ocs = /opt/csw/bin/sqsh sqsh /opt/csw/bin/sqsh-ocs 200 +#ALTERNATIVE_ocs += EDIR)/Sybase.bs bs $(DBDSYBASEDIR)/Sybase-ocs.bs +ALTERNATIVE_freetds = /opt/csw/bin/sqsh sqsh /opt/csw/bin/sqsh-freetds 100 +#ALTERNATIVE_freetds += $(DBDSYBASEDIR)/Sybase.bs bs $(DBDSYBASEDIR)/Sybase-freetds.bs + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shared --disable-nls This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Thu Dec 15 06:16:35 2011 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Thu, 15 Dec 2011 05:16:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[16515] csw/mgar/pkg/sqsh/trunk/Makefile Message-ID: Revision: 16515 http://gar.svn.sourceforge.net/gar/?rev=16515&view=rev Author: d_pocock Date: 2011-12-15 05:16:35 +0000 (Thu, 15 Dec 2011) Log Message: ----------- sqsh: enable readline support Modified Paths: -------------- csw/mgar/pkg/sqsh/trunk/Makefile Modified: csw/mgar/pkg/sqsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/sqsh/trunk/Makefile 2011-12-15 04:47:03 UTC (rev 16514) +++ csw/mgar/pkg/sqsh/trunk/Makefile 2011-12-15 05:16:35 UTC (rev 16515) @@ -92,7 +92,7 @@ #ALTERNATIVE_freetds += $(DBDSYBASEDIR)/Sybase.bs bs $(DBDSYBASEDIR)/Sybase-freetds.bs CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --enable-shared --disable-nls +CONFIGURE_ARGS += --enable-shared --disable-nls --with-readline # These are provided by the Sybase OCS libraries CHECKPKG_OVERRIDES_CSWsqsh-ocs += soname-not-found|libcs.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Thu Dec 15 06:18:58 2011 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Thu, 15 Dec 2011 05:18:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[16516] csw/mgar/pkg/sqsh/trunk/Makefile Message-ID: Revision: 16516 http://gar.svn.sourceforge.net/gar/?rev=16516&view=rev Author: d_pocock Date: 2011-12-15 05:18:58 +0000 (Thu, 15 Dec 2011) Log Message: ----------- sqsh: fix for linking to FreeTDS Modified Paths: -------------- csw/mgar/pkg/sqsh/trunk/Makefile Modified: csw/mgar/pkg/sqsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/sqsh/trunk/Makefile 2011-12-15 05:16:35 UTC (rev 16515) +++ csw/mgar/pkg/sqsh/trunk/Makefile 2011-12-15 05:18:58 UTC (rev 16516) @@ -77,6 +77,7 @@ LD_OPTIONS = EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) +EXTRA_LINKER_FLAGS_CSWsqsh-freetds = -ltdsS EXTRA_CONFIGURE_EXPORTS = SYBASE LD_LIBRARY_PATH This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Thu Dec 15 06:22:36 2011 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Thu, 15 Dec 2011 05:22:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[16517] csw/mgar/pkg/sqsh/trunk/Makefile Message-ID: Revision: 16517 http://gar.svn.sourceforge.net/gar/?rev=16517&view=rev Author: d_pocock Date: 2011-12-15 05:22:36 +0000 (Thu, 15 Dec 2011) Log Message: ----------- sqsh: temporarily diable readline support Modified Paths: -------------- csw/mgar/pkg/sqsh/trunk/Makefile Modified: csw/mgar/pkg/sqsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/sqsh/trunk/Makefile 2011-12-15 05:18:58 UTC (rev 16516) +++ csw/mgar/pkg/sqsh/trunk/Makefile 2011-12-15 05:22:36 UTC (rev 16517) @@ -93,7 +93,9 @@ #ALTERNATIVE_freetds += $(DBDSYBASEDIR)/Sybase.bs bs $(DBDSYBASEDIR)/Sybase-freetds.bs CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --enable-shared --disable-nls --with-readline +CONFIGURE_ARGS += --enable-shared --disable-nls +# this should be enabled if available on build machine +#CONFIGURE_ARGS += --with-readline # These are provided by the Sybase OCS libraries CHECKPKG_OVERRIDES_CSWsqsh-ocs += soname-not-found|libcs.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Thu Dec 15 06:44:18 2011 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Thu, 15 Dec 2011 05:44:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[16518] csw/mgar/pkg/sqsh/trunk/Makefile Message-ID: Revision: 16518 http://gar.svn.sourceforge.net/gar/?rev=16518&view=rev Author: d_pocock Date: 2011-12-15 05:44:18 +0000 (Thu, 15 Dec 2011) Log Message: ----------- sqsh: temporarily disable freetds modulation Modified Paths: -------------- csw/mgar/pkg/sqsh/trunk/Makefile Modified: csw/mgar/pkg/sqsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/sqsh/trunk/Makefile 2011-12-15 05:22:36 UTC (rev 16517) +++ csw/mgar/pkg/sqsh/trunk/Makefile 2011-12-15 05:44:18 UTC (rev 16518) @@ -50,7 +50,9 @@ BUILD64 = 1 EXTRA_MODULATORS = DBDRIVER -MODULATIONS_DBDRIVER = ocs freetds +MODULATIONS_DBDRIVER = ocs +# uncomment below to build for FreeTDS too +#MODULATIONS_DBDRIVER += freetds SKIP_MODULATIONS = isa-i386-dbdriver-ocs This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Thu Dec 15 06:48:43 2011 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Thu, 15 Dec 2011 05:48:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[16519] csw/mgar/pkg/sqsh/trunk/Makefile Message-ID: Revision: 16519 http://gar.svn.sourceforge.net/gar/?rev=16519&view=rev Author: d_pocock Date: 2011-12-15 05:48:43 +0000 (Thu, 15 Dec 2011) Log Message: ----------- sqsh: temporarily disable BUILD64 Modified Paths: -------------- csw/mgar/pkg/sqsh/trunk/Makefile Modified: csw/mgar/pkg/sqsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/sqsh/trunk/Makefile 2011-12-15 05:44:18 UTC (rev 16518) +++ csw/mgar/pkg/sqsh/trunk/Makefile 2011-12-15 05:48:43 UTC (rev 16519) @@ -47,7 +47,7 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = -BUILD64 = 1 +#BUILD64 = 1 EXTRA_MODULATORS = DBDRIVER MODULATIONS_DBDRIVER = ocs This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Thu Dec 15 06:52:48 2011 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Thu, 15 Dec 2011 05:52:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[16520] csw/mgar/pkg/sqsh/trunk/ Message-ID: Revision: 16520 http://gar.svn.sourceforge.net/gar/?rev=16520&view=rev Author: d_pocock Date: 2011-12-15 05:52:48 +0000 (Thu, 15 Dec 2011) Log Message: ----------- ganglia-modules-solaris: set props to ignore ./work Property Changed: ---------------- csw/mgar/pkg/sqsh/trunk/ Property changes on: csw/mgar/pkg/sqsh/trunk ___________________________________________________________________ Added: svn:ignore + work This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Thu Dec 15 06:53:40 2011 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Thu, 15 Dec 2011 05:53:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[16521] csw/mgar/pkg/sqsh/trunk/Makefile Message-ID: Revision: 16521 http://gar.svn.sourceforge.net/gar/?rev=16521&view=rev Author: d_pocock Date: 2011-12-15 05:53:40 +0000 (Thu, 15 Dec 2011) Log Message: ----------- sqsh: try with readline again Modified Paths: -------------- csw/mgar/pkg/sqsh/trunk/Makefile Modified: csw/mgar/pkg/sqsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/sqsh/trunk/Makefile 2011-12-15 05:52:48 UTC (rev 16520) +++ csw/mgar/pkg/sqsh/trunk/Makefile 2011-12-15 05:53:40 UTC (rev 16521) @@ -97,7 +97,7 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shared --disable-nls # this should be enabled if available on build machine -#CONFIGURE_ARGS += --with-readline +CONFIGURE_ARGS += --with-readline # These are provided by the Sybase OCS libraries CHECKPKG_OVERRIDES_CSWsqsh-ocs += soname-not-found|libcs.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Thu Dec 15 07:47:10 2011 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Thu, 15 Dec 2011 06:47:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[16522] csw/mgar/pkg/sqsh/trunk/Makefile Message-ID: Revision: 16522 http://gar.svn.sourceforge.net/gar/?rev=16522&view=rev Author: d_pocock Date: 2011-12-15 06:47:10 +0000 (Thu, 15 Dec 2011) Log Message: ----------- sqsh: disable manually set linker flags for FreeTDS Modified Paths: -------------- csw/mgar/pkg/sqsh/trunk/Makefile Modified: csw/mgar/pkg/sqsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/sqsh/trunk/Makefile 2011-12-15 05:53:40 UTC (rev 16521) +++ csw/mgar/pkg/sqsh/trunk/Makefile 2011-12-15 06:47:10 UTC (rev 16522) @@ -79,7 +79,7 @@ LD_OPTIONS = EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) -EXTRA_LINKER_FLAGS_CSWsqsh-freetds = -ltdsS +#EXTRA_LINKER_FLAGS_CSWsqsh-freetds = -ltds EXTRA_CONFIGURE_EXPORTS = SYBASE LD_LIBRARY_PATH This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Thu Dec 15 07:48:40 2011 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Thu, 15 Dec 2011 06:48:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[16523] csw/mgar/pkg/sqsh/trunk/Makefile Message-ID: Revision: 16523 http://gar.svn.sourceforge.net/gar/?rev=16523&view=rev Author: d_pocock Date: 2011-12-15 06:48:39 +0000 (Thu, 15 Dec 2011) Log Message: ----------- sqsh: enable freetds modulation again Modified Paths: -------------- csw/mgar/pkg/sqsh/trunk/Makefile Modified: csw/mgar/pkg/sqsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/sqsh/trunk/Makefile 2011-12-15 06:47:10 UTC (rev 16522) +++ csw/mgar/pkg/sqsh/trunk/Makefile 2011-12-15 06:48:39 UTC (rev 16523) @@ -52,7 +52,7 @@ EXTRA_MODULATORS = DBDRIVER MODULATIONS_DBDRIVER = ocs # uncomment below to build for FreeTDS too -#MODULATIONS_DBDRIVER += freetds +MODULATIONS_DBDRIVER += freetds SKIP_MODULATIONS = isa-i386-dbdriver-ocs 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 Dec 15 13:07:26 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 15 Dec 2011 12:07:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[16524] csw/mgar/pkg/smartmontools/trunk Message-ID: Revision: 16524 http://gar.svn.sourceforge.net/gar/?rev=16524&view=rev Author: wahwah Date: 2011-12-15 12:07:25 +0000 (Thu, 15 Dec 2011) Log Message: ----------- smartmontools/trunk: version bump, migration to GAR v2 Modified Paths: -------------- csw/mgar/pkg/smartmontools/trunk/Makefile csw/mgar/pkg/smartmontools/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/smartmontools/trunk/files/CSWsmartmontools.depend csw/mgar/pkg/smartmontools/trunk/files/CSWsmartmontools.gspec csw/mgar/pkg/smartmontools/trunk/files/CSWsmartmontools.prototype Property Changed: ---------------- csw/mgar/pkg/smartmontools/trunk/ Property changes on: csw/mgar/pkg/smartmontools/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 Modified: csw/mgar/pkg/smartmontools/trunk/Makefile =================================================================== --- csw/mgar/pkg/smartmontools/trunk/Makefile 2011-12-15 06:48:39 UTC (rev 16523) +++ csw/mgar/pkg/smartmontools/trunk/Makefile 2011-12-15 12:07:25 UTC (rev 16524) @@ -1,6 +1,8 @@ +# $Id$ + NAME = smartmontools -VERSION = 5.38 -GARTYPE = v1 +VERSION = 5.42 +GARTYPE = v2 CATEGORIES = utils DESCRIPTION = S.M.A.R.T. disk monitoring tools @@ -12,38 +14,39 @@ support for ATA/ATAPI-5 disks. endef -MASTER_SITES = http://smartmontools.sourceforge.net/ +MASTER_SITES = $(SF_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.gz -DISTFILES += $(call admfiles,CSWsmartmontools, postinstall depend prototype) -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz +# If the url used to check for software update is different of MASTER_SITES, +# then uncomment the next line. Otherwise it is set by default to the value of +# MASTER_SITES +# UPSTREAM_MASTER_SITES = http://surfnet.dl.sourceforge.net/sourceforge/smartmontools/ -# If the url used to check for software update is different of MASTER_SITES, then -# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES -UPSTREAM_MASTER_SITES = http://surfnet.dl.sourceforge.net/sourceforge/smartmontools/ - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-docdir=$(sharedstatedir)/doc/$(NAME) CONFIGURE_ARGS += --with-initscriptdir=/etc/opt/csw/init.d -TEST_TARGET = check +INITSMF = $(sysconfdir)/init.d/cswsmartd +CHECKPKG_OVERRIDES_CSWsmartmontools += file-with-bad-content +EXTRA_CFLAGS = -xnorunpath +EXTRA_CXXFLAGS = -norunpath + +include gar/category.mk + # moving configuration file -post-install: - (cd $(DESTDIR)$(prefix)/etc; \ +post-install-modulated: + (cd $(DESTDIR)$(sysconfdir); \ for i in smartd.conf; do \ if [ -r "$$i" ]; then \ - echo "$$i -> $$i.CSW"; \ - mv "$$i" "$$i.CSW"; \ + gmv -v "$$i" "$$i.CSW"; \ fi \ done) - (cd $(DESTDIR)/etc/opt/csw/init.d; \ + (cd $(DESTDIR)$(sysconfdir)/init.d; \ for i in smartd; do \ if [ -r "$$i" ]; then \ - echo "$$i -> csw$$i"; \ - mv "$$i" "csw$$i"; \ + gmv -v "$$i" "csw$$i"; \ fi \ done) -include gar/category.mk +PATH := /opt/csw/gnu:$(PATH) Modified: csw/mgar/pkg/smartmontools/trunk/checksums =================================================================== --- csw/mgar/pkg/smartmontools/trunk/checksums 2011-12-15 06:48:39 UTC (rev 16523) +++ csw/mgar/pkg/smartmontools/trunk/checksums 2011-12-15 12:07:25 UTC (rev 16524) @@ -1,5 +1 @@ -a282846532ecbd6b4a28072373b3a70b download/smartmontools-5.38.tar.gz -28e1281d77b7c5920cb90f4d6c97f7df download/CSWsmartmontools.gspec -307c061f168249834c527eeb8d6e0501 download/CSWsmartmontools.postinstall -e5586868ebec465f4b66d0da3c1eedda download/CSWsmartmontools.depend -9e07053388cfc10816db34c6053af0a9 download/CSWsmartmontools.prototype +4460bf9a79a1252ff5c00ba52cf76b2a smartmontools-5.42.tar.gz Deleted: csw/mgar/pkg/smartmontools/trunk/files/CSWsmartmontools.depend =================================================================== --- csw/mgar/pkg/smartmontools/trunk/files/CSWsmartmontools.depend 2011-12-15 06:48:39 UTC (rev 16523) +++ csw/mgar/pkg/smartmontools/trunk/files/CSWsmartmontools.depend 2011-12-15 12:07:25 UTC (rev 16524) @@ -1,2 +0,0 @@ -P CSWcommon -P CSWcswclassutils Deleted: csw/mgar/pkg/smartmontools/trunk/files/CSWsmartmontools.gspec =================================================================== --- csw/mgar/pkg/smartmontools/trunk/files/CSWsmartmontools.gspec 2011-12-15 06:48:39 UTC (rev 16523) +++ csw/mgar/pkg/smartmontools/trunk/files/CSWsmartmontools.gspec 2011-12-15 12:07:25 UTC (rev 16524) @@ -1,4 +0,0 @@ -%var bitname smartmontools -%var pkgname CSWsmartmontools -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING Deleted: csw/mgar/pkg/smartmontools/trunk/files/CSWsmartmontools.prototype =================================================================== --- csw/mgar/pkg/smartmontools/trunk/files/CSWsmartmontools.prototype 2011-12-15 06:48:39 UTC (rev 16523) +++ csw/mgar/pkg/smartmontools/trunk/files/CSWsmartmontools.prototype 2011-12-15 12:07:25 UTC (rev 16524) @@ -1,30 +0,0 @@ -d none /opt/csw/etc 0755 root bin -f none /opt/csw/etc/smartd.conf.CSW 0644 root bin -d none /opt/csw/sbin 0755 root bin -f none /opt/csw/sbin/smartctl 0755 root bin -f none /opt/csw/sbin/smartd 0755 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/doc 0755 root bin -d none /opt/csw/share/doc/smartmontools 0755 root bin -f none /opt/csw/share/doc/smartmontools/AUTHORS 0644 root bin -f none /opt/csw/share/doc/smartmontools/CHANGELOG 0644 root bin -f none /opt/csw/share/doc/smartmontools/COPYING 0644 root bin -f none /opt/csw/share/doc/smartmontools/INSTALL 0644 root bin -f none /opt/csw/share/doc/smartmontools/NEWS 0644 root bin -f none /opt/csw/share/doc/smartmontools/README 0644 root bin -f none /opt/csw/share/doc/smartmontools/TODO 0644 root bin -f none /opt/csw/share/doc/smartmontools/WARNINGS 0644 root bin -d none /opt/csw/share/doc/smartmontools/examplescripts 0755 root bin -f none /opt/csw/share/doc/smartmontools/examplescripts/Example1 0755 root bin -f none /opt/csw/share/doc/smartmontools/examplescripts/Example2 0755 root bin -f none /opt/csw/share/doc/smartmontools/examplescripts/Example3 0755 root bin -f none /opt/csw/share/doc/smartmontools/examplescripts/Example4 0755 root bin -f none /opt/csw/share/doc/smartmontools/examplescripts/README 0644 root bin -f none /opt/csw/share/doc/smartmontools/smartd.conf 0644 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man1m 0755 root bin -f none /opt/csw/share/man/man1m/smartctl.1m 0644 root bin -f none /opt/csw/share/man/man1m/smartd.1m 0644 root bin -d none /opt/csw/share/man/man4 0755 root bin -f none /opt/csw/share/man/man4/smartd.conf.4 0644 root bin -f cswinitsmf /etc/opt/csw/init.d/cswsmartd 0755 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Dec 15 13:22:10 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 15 Dec 2011 12:22:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[16525] csw/mgar/pkg/smartmontools/trunk/Makefile Message-ID: Revision: 16525 http://gar.svn.sourceforge.net/gar/?rev=16525&view=rev Author: wahwah Date: 2011-12-15 12:22:10 +0000 (Thu, 15 Dec 2011) Log Message: ----------- smartmontools/trunk: setting ID on the Makefile Property Changed: ---------------- csw/mgar/pkg/smartmontools/trunk/Makefile Property changes on: csw/mgar/pkg/smartmontools/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 Dec 15 15:03:42 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 15 Dec 2011 14:03:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[16526] csw/mgar/pkg/smartmontools/trunk/Makefile Message-ID: Revision: 16526 http://gar.svn.sourceforge.net/gar/?rev=16526&view=rev Author: wahwah Date: 2011-12-15 14:03:42 +0000 (Thu, 15 Dec 2011) Log Message: ----------- smartmontools/trunk: build for 5.10 separately Modified Paths: -------------- csw/mgar/pkg/smartmontools/trunk/Makefile Modified: csw/mgar/pkg/smartmontools/trunk/Makefile =================================================================== --- csw/mgar/pkg/smartmontools/trunk/Makefile 2011-12-15 12:22:10 UTC (rev 16525) +++ csw/mgar/pkg/smartmontools/trunk/Makefile 2011-12-15 14:03:42 UTC (rev 16526) @@ -17,10 +17,8 @@ MASTER_SITES = $(SF_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.gz -# If the url used to check for software update is different of MASTER_SITES, -# then uncomment the next line. Otherwise it is set by default to the value of -# MASTER_SITES -# UPSTREAM_MASTER_SITES = http://surfnet.dl.sourceforge.net/sourceforge/smartmontools/ +PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-docdir=$(sharedstatedir)/doc/$(NAME) @@ -34,7 +32,7 @@ include gar/category.mk -# moving configuration file +# Moving the configuration file. post-install-modulated: (cd $(DESTDIR)$(sysconfdir); \ for i in smartd.conf; do \ @@ -49,4 +47,5 @@ fi \ done) +# The 5.42 version needs GNU sed going by 'sed'. PATH := /opt/csw/gnu:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Thu Dec 15 16:03:46 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Thu, 15 Dec 2011 15:03:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[16527] csw/mgar/pkg/postgresql/branches/postgresql-8. 3-raos/Makefile Message-ID: Revision: 16527 http://gar.svn.sourceforge.net/gar/?rev=16527&view=rev Author: guengel Date: 2011-12-15 15:03:46 +0000 (Thu, 15 Dec 2011) Log Message: ----------- postgresql/branches/postgresql-8.3-raos: Added amd64 specific CHECKPKG_OVERRIDES. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile 2011-12-15 14:03:42 UTC (rev 16526) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile 2011-12-15 15:03:46 UTC (rev 16527) @@ -320,6 +320,11 @@ RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWosslrt # Those '/usr/local' are ok, they are in a HPUX section of the file CHECKPKG_OVERRIDES_CSW$(NAME)-dev += $(foreach i,$(BUILD_ISAS), $(subst $(ISA_DEFAULT)/,,file-with-bad-content|/usr/local|root$(libdir)/$(i)/$(NAME)/$(BASE_VERSION_NODOT)/pgxs/src/Makefile.shlib) ) +# The above did not get rid of these, so, until I figure out how to +# merge them with the above, they stay here +CHECKPKG_OVERRIDES_CSW$(NAME)-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/$(NAME)/$(BASE_VERSION_NODOT)/pgxs/src/Makefile.shlib +# This happens only on amd64 +CHECKPKG_OVERRIDES_CSW$(NAME)-dev += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/$(NAME)/$(BASE_VERSION_NODOT)/pgxs/src/Makefile.global #ALTERNATIVES_CSW$(NAME)-dev = $(foreach i,$(BUILD_ISAS), dev_$(i)) PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-doc 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 Dec 15 16:05:29 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 15 Dec 2011 15:05:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[16528] csw/mgar/pkg/smartmontools/trunk/Makefile Message-ID: Revision: 16528 http://gar.svn.sourceforge.net/gar/?rev=16528&view=rev Author: wahwah Date: 2011-12-15 15:05:29 +0000 (Thu, 15 Dec 2011) Log Message: ----------- smartmontools/trunk: add information why we're building on 5.10 separately Modified Paths: -------------- csw/mgar/pkg/smartmontools/trunk/Makefile Modified: csw/mgar/pkg/smartmontools/trunk/Makefile =================================================================== --- csw/mgar/pkg/smartmontools/trunk/Makefile 2011-12-15 15:03:46 UTC (rev 16527) +++ csw/mgar/pkg/smartmontools/trunk/Makefile 2011-12-15 15:05:29 UTC (rev 16528) @@ -17,6 +17,10 @@ MASTER_SITES = $(SF_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.gz +# smartmontools packages built on 5.9 don't work on 5.10: +# > Error SMART Thresholds Read failed: I/O error +# > Smartctl: SMART Read Thresholds failed. +# However, packages built on 5.10 do work on 5.10. 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 Thu Dec 15 16:29:30 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 15 Dec 2011 15:29:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[16529] csw/mgar/pkg/mysql5/branches/mysql-5.5.x Message-ID: Revision: 16529 http://gar.svn.sourceforge.net/gar/?rev=16529&view=rev Author: wahwah Date: 2011-12-15 15:29:29 +0000 (Thu, 15 Dec 2011) Log Message: ----------- mysql5/branches/mysql-5.5.x: in progress: the fight with the horrible, horrible cmake build which won't find the 64-bit SSL library and won't tell why Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Added Paths: ----------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/64/ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/64/openssl.pc Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2011-12-15 15:05:29 UTC (rev 16528) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2011-12-15 15:29:29 UTC (rev 16529) @@ -1,6 +1,10 @@ # Copyright 2009 OpenCSW # Distributed under the terms of the GNU General Public License v2 # $Id$ +# +# If you are involved in packaging MySQL, consider subscribing to the +# packagers mailing list: +# http://lists.mysql.com/packagers PROJ_NAME = mysql NAME = $(PROJ_NAME)55 @@ -15,6 +19,11 @@ # Useful when making a series of builds on the same day # GARFLAVOR ?= DBG +# There is v9-specific assembler, and I don't see an easy way to switch it +# off. +SKIP_MODULATIONS = isa-sparcv8 +# The alternative is to ship sparcv8+ binaries. + DISTNAME = mysql-$(VERSION) SPKG_SOURCEURL = http://www.mysql.com/ @@ -28,7 +37,7 @@ # cg error (as) : ".../mysql-5.5.16/mysys/my_timer_cycles.il (template for # my_timer_cycles_il_sparc32)", line 27 : cannot use SPARC v9 instructions # with this target architecture -GARCOMPILER = GNU +# GARCOMPILER = GNU INITSMF = $(sysconfdir)/init\.d/csw$(NAME) @@ -64,7 +73,8 @@ # PATCHFILES += 0002-cast-user_info-pw_gid-to-gid_t.patch # PATCHFILES += 0003-OpenCSW-perl-for-tests.patch # PATCHFILES += 0004-var-opt-csw-mysql51-for-datadir-in-my-.cnf.patch -PATCHFILES += 0002-stop-cmake-from-messing-with-cflags.patch +# The configuration phase failed (?) +# PATCHFILES += 0002-stop-cmake-from-messing-with-cflags.patch PACKAGES += CSWlibmysqlclient$(MYSQL_LIB_VER) PKGFILES_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient\.so\.$(MYSQL_LIB_VER)(\.\d+)*) @@ -205,7 +215,24 @@ CMAKE_ARGS += -DDEFAULT_CHARSET=utf8 CMAKE_ARGS += -DDEFAULT_COLLATION=utf8_general_ci CMAKE_ARGS += -DWITH_COMMENT='OpenCSW' +CMAKE_ARGS += -DCMAKE_C_FLAGS="$(CFLAGS)" -DCMAKE_CXX_FLAGS="$(CXXFLAGS)" +CMAKE_ARGS += -DBUILD_CONFIG=mysql_release +# CMAKE_ARGS += -DOPENSSL_INCLUDE_DIR="$(includedir)" +# CMAKE_ARGS += -DCMAKE_LIBRARY_PATH="$(libdir)" +# CMAKE_ARGS += -DCMAKE_PREFIX_PATH="$(prefix)" +CMAKE_ARGS += -DOPENSSL_ROOT_DIR=$(prefix) +# CMAKE_LIBRARY_PATH = $(libdir) +# EXTRA_CONFIGURE_EXPORTS += CMAKE_LIBRARY_PATH +# CMAKE_INCLUDE_PATH = $(includedir) +# EXTRA_CONFIGURE_EXPORTS += CMAKE_INCLUDE_PATH +# CMAKE_PREFIX_PATH = $(prefix) +# EXTRA_CONFIGURE_EXPORTS += CMAKE_PREFIX_PATH +# OPENSSL_INCLUDE_DIR = $(includedir) +# EXTRA_CONFIGURE_EXPORTS += OPENSSL_INCLUDE_DIR +# OPENSSL_ROOT_DIR = $(prefix) +# EXTRA_CONFIGURE_EXPORTS += OPENSSL_ROOT_DIR + # TODO: Make the tests pass. They don't at the moment. SKIPTEST ?= 1 TEST_SCRIPTS = custom @@ -291,6 +318,8 @@ CONFIGURE_SCRIPTS = custom +EXTRA_PKG_CONFIG_DIRS = $(FILEDIR)/64 + include gar/category.mk # CFLAGS := $(filter-out -I%,$(CFLAGS)) @@ -311,10 +340,13 @@ @$(MAKECOOKIE) configure-custom: + # --debug-output \ + # --debug-trycompile \ (cd $(WORKSRC) && \ /usr/bin/env -i \ $(CONFIGURE_ENV) \ - cmake . \ + cmake \ + . \ $(CMAKE_ARGS)) @$(MAKECOOKIE) Added: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/64/openssl.pc =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/64/openssl.pc (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/64/openssl.pc 2011-12-15 15:29:29 UTC (rev 16529) @@ -0,0 +1,11 @@ +prefix=/opt/csw +exec_prefix=${prefix} +libdir=${exec_prefix}/lib/64 +includedir=${prefix}/include + +Name: OpenSSL +Description: Secure Sockets Layer and cryptography libraries and tools +Version: 0.9.8r +Requires: +Libs: -L${libdir} -lssl -lcrypto -lsocket -lnsl -ldl +Cflags: -I${includedir} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Dec 15 22:23:38 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 15 Dec 2011 21:23:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[16530] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 16530 http://gar.svn.sourceforge.net/gar/?rev=16530&view=rev Author: bonivart Date: 2011-12-15 21:23:38 +0000 (Thu, 15 Dec 2011) Log Message: ----------- pkgutil: 2.6 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-12-15 15:29:29 UTC (rev 16529) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2011-12-15 21:23:38 UTC (rev 16530) @@ -1,5 +1,5 @@ NAME = pkgutil -VERSION = 2.5.1 +VERSION = 2.6b1 CATEGORIES = utils DESCRIPTION = Installs Solaris packages easily Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2011-12-15 15:29:29 UTC (rev 16529) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2011-12-15 21:23:38 UTC (rev 16530) @@ -1 +1 @@ -6ebc2a32b0e7ebea5c02045284fd2d94 pkgutil-2.5.1.zip +d5dcdac19a3e9cae017f8f64b2bdb9a2 pkgutil-2.6b1.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 Thu Dec 15 23:33:54 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 15 Dec 2011 22:33:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[16531] csw/mgar/pkg/sqsh/trunk/Makefile Message-ID: Revision: 16531 http://gar.svn.sourceforge.net/gar/?rev=16531&view=rev Author: dmichelsen Date: 2011-12-15 22:33:54 +0000 (Thu, 15 Dec 2011) Log Message: ----------- sqsh/trunk: Several compile and link issues fixed Modified Paths: -------------- csw/mgar/pkg/sqsh/trunk/Makefile Modified: csw/mgar/pkg/sqsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/sqsh/trunk/Makefile 2011-12-15 21:23:38 UTC (rev 16530) +++ csw/mgar/pkg/sqsh/trunk/Makefile 2011-12-15 22:33:54 UTC (rev 16531) @@ -2,22 +2,16 @@ VERSION = 2.1.7 CATEGORIES = utils -#PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +# Sybase is available on Solaris 9 sparc 32 and 64 bit and Solaris 10 amd64 +PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 # using this recipe as a reference for how to work with Sybase OCS # under CSW: # # http://sourceforge.net/apps/trac/gar/browser/csw/mgar/pkg/cpan/DBD-Sybase/trunk/Makefile -# -# -# Hardwired to skip the tests -ifeq ($(VERSION),2.1.7) -#TEST_TARGET = check -TEST_SCRIPTS = -endif - -DESCRIPTION = powerful SQL shell with advanced scripting ability for Sybase +DESCRIPTION = Powerful SQL shell with advanced scripting ability for Sybase define BLURB Sqsh (pronounced skwish) is short for SQshelL (pronounced s-q-shell), it is intended as a replacement for the venerable 'isql' program @@ -34,75 +28,82 @@ SF_PROJ = sqsh MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(NAME)-$(VERSION).tar.gz -DISTFILES += $(PATCHFILES) -DISTNAME = $(NAME)-$(VERSION) +DISTFILES = $(DISTNAME).tar.gz -EXTRA_DOCS = $(PATCHFILES) - -# We define upstream file regex so we can be notifed of new upstream software release -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 = - -#BUILD64 = 1 - EXTRA_MODULATORS = DBDRIVER MODULATIONS_DBDRIVER = ocs -# uncomment below to build for FreeTDS too MODULATIONS_DBDRIVER += freetds +# I just don't have Sybase i386 32 bit SKIP_MODULATIONS = isa-i386-dbdriver-ocs -PACKAGES = CSWsqsh-ocs CSWsqsh-freetds +PACKAGES += CSWsqsh-ocs +SPKG_DESC_CSWsqsh-ocs = $(DESCRIPTION) (Linked against Sybase OCS) +PKGFILES_CSWsqsh-ocs += $(call baseisadirs,$(bindir),sqsh-ocs) +PKGFILES_CSWsqsh-ocs += $(sysconfdir)/.*-ocs.* +RUNTIME_DEP_PKGS_CSWsqsh-ocs += CSWfreetds +RUNTIME_DEP_PKGS_CSWsqsh-ocs += CSWlibreadline6 +# This is for libintl.so which is provided by Sybase and should be used from there, +# it is not to be taken from the development package CSWggettext-dev +CHECKPKG_OVERRIDES_CSWsqsh-ocs += missing-dependency|CSWggettext-dev +# The Sybase package can not be released due to license restrictions +CHECKPKG_OVERRIDES_CSWsqsh-ocs += soname-not-found|libcomn.so|is|needed|by|opt/csw/bin/sqsh-ocs +CHECKPKG_OVERRIDES_CSWsqsh-ocs += soname-not-found|libtcl.so|is|needed|by|opt/csw/bin/sqsh-ocs +CHECKPKG_OVERRIDES_CSWsqsh-ocs += soname-not-found|libcs.so|is|needed|by|opt/csw/bin/sqsh-ocs +# This is for /usr/local/lib/sqsh/help, this is not in the distribution, don't know where to find that, ignore for now. +CHECKPKG_OVERRIDES_CSWsqsh-ocs += file-with-bad-content|/usr/local|root/opt/csw/bin/sqsh-ocs -CATALOGNAME_CSWsqsh-ocs = sqsh_ocs -CATALOGNAME_CSWsqsh-freetds = sqsh_freetds - -SPKG_DESC_CSWsqsh-ocs = $(DESCRIPTION) (Linked against Sybase OCS) +PACKAGES += CSWsqsh-freetds SPKG_DESC_CSWsqsh-freetds = $(DESCRIPTION) (Linked against FreeTDS) - +# PKGFILES is catchall RUNTIME_DEP_PKGS_CSWsqsh-freetds += CSWfreetds -RUNTIME_DEP_PKGS_CSWsqsh-freetds += CSWggettextrt -RUNTIME_DEP_PKGS_CSWsqsh-ocs += CSWsqsh-freetds +RUNTIME_DEP_PKGS_CSWsqsh-freetds += CSWlibreadline6 +# This is for /usr/local/lib/sqsh/help, this is not in the distribution, don't know where to find that, ignore for now. +CHECKPKG_OVERRIDES_CSWsqsh-freetds += file-with-bad-content|/usr/local|root/opt/csw/bin/sqsh-freetds +# Only the staticlibtds is searched by default, change to shared lib +REINPLACEMENTS += libtds-a +REINPLACE_MATCH_libtds-a = libtds.a +REINPLACE_WITH_libtds-a = libct.so +REINPLACE_FILES_libtds-a += configure + +REINPLACEMENTS += libtds-l +REINPLACE_MATCH_libtds-l = -ltds +REINPLACE_WITH_libtds-l = -lct +REINPLACE_FILES_libtds-l += configure + SYBASE_ocs = /opt/csw/sybase/OCS-12_5 SYBASE_freetds = /opt/csw SYBASE = $(SYBASE_$(DBDRIVER)) -LD_LIBRARY_PATH = $(SYBASE)/lib - NOISALIST = 1 EXTRA_LIB = $(SYBASE)/lib -LD_OPTIONS = -EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) -#EXTRA_LINKER_FLAGS_CSWsqsh-freetds = -ltds +EXTRA_CONFIGURE_EXPORTS = SYBASE INCDIRS LIBDIRS +CONFIGURE_ENV_INCDIRS = $(includedir) +CONFIGURE_ENV_LIBDIRS = $(SYBASE)/lib:$(libdir) -EXTRA_CONFIGURE_EXPORTS = SYBASE LD_LIBRARY_PATH +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-shared --disable-nls +CONFIGURE_ARGS += --with-readline -EXTRA_TEST_EXPORTS = LD_LIBRARY_PATH +# There is no testsuite +TEST_SCRIPTS = -PKGFILES_CSWsqsh-ocs = /opt/csw/bin/sqsh-ocs +MERGE_SCRIPTS_isa-default-dbdriver-ocs = copy-all +MERGE_SCRIPTS_isa-default-dbdriver-freetds = copy-only +MERGE_DIRS_isa-default-dbdriver-freetds = $(DBDSYBASEDIR) +EXTRA_PAX_ARGS = -s ",/sqsh$$,/sqsh-$(DBDRIVER),p" +EXTRA_PAX_ARGS += -s ",/sqshrc$$,/sqshrc-$(DBDRIVER),p" + +PRESERVECONF += $(foreach D,$(MODULATIONS_DBDRIVER),$(sysconfdir)/sqshrc-$D) + ALTERNATIVES_CSWsqsh-ocs = ocs ALTERNATIVES_CSWsqsh-freetds = freetds ALTERNATIVE_ocs = /opt/csw/bin/sqsh sqsh /opt/csw/bin/sqsh-ocs 200 -#ALTERNATIVE_ocs += EDIR)/Sybase.bs bs $(DBDSYBASEDIR)/Sybase-ocs.bs +ALTERNATIVE_ocs += /etc/opt/csw/sqshrc sqshrc /etc/opt/csw/sqshrc-ocs ALTERNATIVE_freetds = /opt/csw/bin/sqsh sqsh /opt/csw/bin/sqsh-freetds 100 -#ALTERNATIVE_freetds += $(DBDSYBASEDIR)/Sybase.bs bs $(DBDSYBASEDIR)/Sybase-freetds.bs +ALTERNATIVE_freetds += /etc/opt/csw/sqshrc sqshrc /etc/opt/csw/sqshrc-freetds -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --enable-shared --disable-nls -# this should be enabled if available on build machine -CONFIGURE_ARGS += --with-readline - -# These are provided by the Sybase OCS libraries -CHECKPKG_OVERRIDES_CSWsqsh-ocs += soname-not-found|libcs.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so -CHECKPKG_OVERRIDES_CSWsqsh-ocs += soname-not-found|libcomn.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so -CHECKPKG_OVERRIDES_CSWsqsh-ocs += soname-not-found|libtcl.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so -CHECKPKG_OVERRIDES_CSWsqsh-ocs += soname-not-found|libct.so|is|needed|by|opt/csw/lib/perl/site_perl/auto/DBD/Sybase/Sybase-ocs.so - include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Dec 15 23:42:51 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 15 Dec 2011 22:42:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[16532] csw/mgar/pkg/sqsh/trunk/Makefile Message-ID: Revision: 16532 http://gar.svn.sourceforge.net/gar/?rev=16532&view=rev Author: dmichelsen Date: 2011-12-15 22:42:51 +0000 (Thu, 15 Dec 2011) Log Message: ----------- sqsh/trunk: Some tiny fixups for preserveconf Modified Paths: -------------- csw/mgar/pkg/sqsh/trunk/Makefile Modified: csw/mgar/pkg/sqsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/sqsh/trunk/Makefile 2011-12-15 22:33:54 UTC (rev 16531) +++ csw/mgar/pkg/sqsh/trunk/Makefile 2011-12-15 22:42:51 UTC (rev 16532) @@ -10,6 +10,11 @@ # under CSW: # # http://sourceforge.net/apps/trac/gar/browser/csw/mgar/pkg/cpan/DBD-Sybase/trunk/Makefile +# +# To bo done: +# - Solaris 9 i386 build +# - Solaris 10 i386 and amd64 build +# - PRESERVECONF somehow does not work yet, interaction with alternatives? DESCRIPTION = Powerful SQL shell with advanced scripting ability for Sybase define BLURB @@ -95,9 +100,9 @@ MERGE_DIRS_isa-default-dbdriver-freetds = $(DBDSYBASEDIR) EXTRA_PAX_ARGS = -s ",/sqsh$$,/sqsh-$(DBDRIVER),p" -EXTRA_PAX_ARGS += -s ",/sqshrc$$,/sqshrc-$(DBDRIVER),p" +EXTRA_PAX_ARGS += -s ",/sqshrc$$,/sqshrc-$(DBDRIVER).CSW,p" -PRESERVECONF += $(foreach D,$(MODULATIONS_DBDRIVER),$(sysconfdir)/sqshrc-$D) +PRESERVECONF += $(foreach D,$(MODULATIONS_DBDRIVER),$(sysconfdir)/sqshrc-$D.CSW) ALTERNATIVES_CSWsqsh-ocs = ocs ALTERNATIVES_CSWsqsh-freetds = freetds This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Dec 16 13:39:51 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 16 Dec 2011 12:39:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[16533] csw/mgar/pkg/unixodbc/trunk/Makefile Message-ID: Revision: 16533 http://gar.svn.sourceforge.net/gar/?rev=16533&view=rev Author: dmichelsen Date: 2011-12-16 12:39:50 +0000 (Fri, 16 Dec 2011) Log Message: ----------- unixodbc/trunk: Minor fixups Modified Paths: -------------- csw/mgar/pkg/unixodbc/trunk/Makefile Modified: csw/mgar/pkg/unixodbc/trunk/Makefile =================================================================== --- csw/mgar/pkg/unixodbc/trunk/Makefile 2011-12-15 22:42:51 UTC (rev 16532) +++ csw/mgar/pkg/unixodbc/trunk/Makefile 2011-12-16 12:39:50 UTC (rev 16533) @@ -17,7 +17,8 @@ PACKAGES += CSWunixodbc SPKG_DESC_CSWunixodbc = $(DESCRIPTION) -RUNTIME_DEP_PKGS_CSWunixodbc += CSWiconv +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWunixodbc += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWunixodbc += CSWlibreadline6 RUNTIME_DEP_PKGS_CSWunixodbc += CSWlibltdl7 RUNTIME_DEP_PKGS_CSWunixodbc += CSWlibodbcinst1 @@ -34,25 +35,23 @@ PACKAGES += CSWlibodbc1 SPKG_DESC_CSWlibodbc1 = $(DESCRIPTION), libodbc.so.1 -PKGFILES_CSWlibodbc1 = $(call pkgfiles_lib,libodbc.so.1) +PKGFILES_CSWlibodbc1 += $(call pkgfiles_lib,libodbc.so.1) +PKGFILES_CSWlibodbc1 += $(sysconfdir)/.* RUNTIME_DEP_PKGS_CSWlibodbc1 += CSWlibltdl7 -RUNTIME_DEP_PKGS_CSWlibodbc1 += CSWiconv +RUNTIME_DEP_PKGS_CSWlibodbc1 += CSWlibiconv2 PACKAGES += CSWlibodbccr1 SPKG_DESC_CSWlibodbccr1 = $(DESCRIPTION), libodbccr.so.1 -PKGFILES_CSWlibodbccr1 = $(call pkgfiles_lib,libodbccr.so.1) +PKGFILES_CSWlibodbccr1 += $(call pkgfiles_lib,libodbccr.so.1) PACKAGES += CSWlibodbcinst1 SPKG_DESC_CSWlibodbcinst1 = $(DESCRIPTION), libodbcinst.so.1 -PKGFILES_CSWlibodbcinst1 = $(call pkgfiles_lib,libodbcinst.so.1) +PKGFILES_CSWlibodbcinst1 += $(call pkgfiles_lib,libodbcinst.so.1) RUNTIME_DEP_PKGS_CSWlibodbcinst1 += CSWlibltdl7 BUILD64 = 1 CONFIGURE_ARGS += $(DIRPATHS) -CONFIGURE_ARGS += --enable-gui=no -# TEST_SCRIPTS = - PRESERVECONF += $(sysconfdir)/odbc.ini PRESERVECONF += $(sysconfdir)/odbcinst.ini This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Dec 16 13:42:46 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 16 Dec 2011 12:42:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[16534] csw/mgar/pkg Message-ID: Revision: 16534 http://gar.svn.sourceforge.net/gar/?rev=16534&view=rev Author: dmichelsen Date: 2011-12-16 12:42:45 +0000 (Fri, 16 Dec 2011) Log Message: ----------- unixodbc-libodbc1: Split off libodbc*.so.1 Added Paths: ----------- csw/mgar/pkg/unixodbc-libodbc1/ csw/mgar/pkg/unixodbc-libodbc1/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/unixodbc-libodbc1/trunk/Makefile Deleted: csw/mgar/pkg/unixodbc-libodbc1/trunk/Makefile =================================================================== --- csw/mgar/pkg/unixodbc/trunk/Makefile 2011-11-15 10:21:50 UTC (rev 16195) +++ csw/mgar/pkg/unixodbc-libodbc1/trunk/Makefile 2011-12-16 12:42:45 UTC (rev 16534) @@ -1,63 +0,0 @@ -# Copyright 2009 OpenCSW -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -NAME = unixodbc -VERSION = 2.3.0 -CATEGORIES = lib - -DESCRIPTION = ODBC drivers for Unix systems -define BLURB -endef - -MASTER_SITES = http://www.unixodbc.org/ - -DISTNAME = unixODBC-$(VERSION) -DISTFILES = $(DISTNAME).tar.gz - -PACKAGES += CSWunixodbc -SPKG_DESC_CSWunixodbc = $(DESCRIPTION) -RUNTIME_DEP_PKGS_CSWunixodbc += CSWiconv -RUNTIME_DEP_PKGS_CSWunixodbc += CSWlibreadline6 -RUNTIME_DEP_PKGS_CSWunixodbc += CSWlibltdl7 -RUNTIME_DEP_PKGS_CSWunixodbc += CSWlibodbcinst1 -RUNTIME_DEP_PKGS_CSWunixodbc += CSWlibodbc1 - -PACKAGES += CSWunixodbc-dev -CATALOGNAME_CSWunixodbc-dev = unixodbc_dev -SPKG_DESC_CSWunixodbc-dev = Development files for libodbc*.so.1 -PKGFILES_CSWunixodbc-dev += $(PKGFILES_DEVEL) -PKGFILES_CSWunixodbc-dev += $(call baseisadirs,$(bindir),odbc_config) -RUNTIME_DEP_PKGS_CSWunixodbc-dev += CSWlibodbc1 -RUNTIME_DEP_PKGS_CSWunixodbc-dev += CSWlibodbccr1 -RUNTIME_DEP_PKGS_CSWunixodbc-dev += CSWlibodbcinst1 - -PACKAGES += CSWlibodbc1 -SPKG_DESC_CSWlibodbc1 = $(DESCRIPTION), libodbc.so.1 -PKGFILES_CSWlibodbc1 = $(call pkgfiles_lib,libodbc.so.1) -RUNTIME_DEP_PKGS_CSWlibodbc1 += CSWlibltdl7 -RUNTIME_DEP_PKGS_CSWlibodbc1 += CSWiconv - -PACKAGES += CSWlibodbccr1 -SPKG_DESC_CSWlibodbccr1 = $(DESCRIPTION), libodbccr.so.1 -PKGFILES_CSWlibodbccr1 = $(call pkgfiles_lib,libodbccr.so.1) - -PACKAGES += CSWlibodbcinst1 -SPKG_DESC_CSWlibodbcinst1 = $(DESCRIPTION), libodbcinst.so.1 -PKGFILES_CSWlibodbcinst1 = $(call pkgfiles_lib,libodbcinst.so.1) -RUNTIME_DEP_PKGS_CSWlibodbcinst1 += CSWlibltdl7 - -BUILD64 = 1 -CONFIGURE_ARGS += $(DIRPATHS) -CONFIGURE_ARGS += --enable-gui=no - -# TEST_SCRIPTS = - -PRESERVECONF += $(sysconfdir)/odbc.ini -PRESERVECONF += $(sysconfdir)/odbcinst.ini - -MIGRATE_FILES_CSWunixodbc += odbc.ini -MIGRATE_FILES_CSWunixodbc += odbcinst.ini -MIGRATE_FILES_CSWunixodbc += ODBCDataSources - -include gar/category.mk Copied: csw/mgar/pkg/unixodbc-libodbc1/trunk/Makefile (from rev 16533, csw/mgar/pkg/unixodbc/trunk/Makefile) =================================================================== --- csw/mgar/pkg/unixodbc-libodbc1/trunk/Makefile (rev 0) +++ csw/mgar/pkg/unixodbc-libodbc1/trunk/Makefile 2011-12-16 12:42:45 UTC (rev 16534) @@ -0,0 +1,62 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +NAME = unixodbc +VERSION = 2.3.0 +CATEGORIES = lib + +DESCRIPTION = ODBC drivers for Unix systems +define BLURB +endef + +MASTER_SITES = http://www.unixodbc.org/ + +DISTNAME = unixODBC-$(VERSION) +DISTFILES = $(DISTNAME).tar.gz + +PACKAGES += CSWunixodbc +SPKG_DESC_CSWunixodbc = $(DESCRIPTION) +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWunixodbc += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWunixodbc += CSWlibreadline6 +RUNTIME_DEP_PKGS_CSWunixodbc += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWunixodbc += CSWlibodbcinst1 +RUNTIME_DEP_PKGS_CSWunixodbc += CSWlibodbc1 + +PACKAGES += CSWunixodbc-dev +CATALOGNAME_CSWunixodbc-dev = unixodbc_dev +SPKG_DESC_CSWunixodbc-dev = Development files for libodbc*.so.1 +PKGFILES_CSWunixodbc-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWunixodbc-dev += $(call baseisadirs,$(bindir),odbc_config) +RUNTIME_DEP_PKGS_CSWunixodbc-dev += CSWlibodbc1 +RUNTIME_DEP_PKGS_CSWunixodbc-dev += CSWlibodbccr1 +RUNTIME_DEP_PKGS_CSWunixodbc-dev += CSWlibodbcinst1 + +PACKAGES += CSWlibodbc1 +SPKG_DESC_CSWlibodbc1 = $(DESCRIPTION), libodbc.so.1 +PKGFILES_CSWlibodbc1 += $(call pkgfiles_lib,libodbc.so.1) +PKGFILES_CSWlibodbc1 += $(sysconfdir)/.* +RUNTIME_DEP_PKGS_CSWlibodbc1 += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWlibodbc1 += CSWlibiconv2 + +PACKAGES += CSWlibodbccr1 +SPKG_DESC_CSWlibodbccr1 = $(DESCRIPTION), libodbccr.so.1 +PKGFILES_CSWlibodbccr1 += $(call pkgfiles_lib,libodbccr.so.1) + +PACKAGES += CSWlibodbcinst1 +SPKG_DESC_CSWlibodbcinst1 = $(DESCRIPTION), libodbcinst.so.1 +PKGFILES_CSWlibodbcinst1 += $(call pkgfiles_lib,libodbcinst.so.1) +RUNTIME_DEP_PKGS_CSWlibodbcinst1 += CSWlibltdl7 + +BUILD64 = 1 +CONFIGURE_ARGS += $(DIRPATHS) + +PRESERVECONF += $(sysconfdir)/odbc.ini +PRESERVECONF += $(sysconfdir)/odbcinst.ini + +MIGRATE_FILES_CSWunixodbc += odbc.ini +MIGRATE_FILES_CSWunixodbc += odbcinst.ini +MIGRATE_FILES_CSWunixodbc += ODBCDataSources + +include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Dec 16 14:07:30 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 16 Dec 2011 13:07:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[16535] csw/mgar/pkg/unixodbc-libodbc1/trunk/Makefile Message-ID: Revision: 16535 http://gar.svn.sourceforge.net/gar/?rev=16535&view=rev Author: dmichelsen Date: 2011-12-16 13:07:30 +0000 (Fri, 16 Dec 2011) Log Message: ----------- unixodbc-libodbc1/trunk: No longer generate packages which are also in unixodbc/ Modified Paths: -------------- csw/mgar/pkg/unixodbc-libodbc1/trunk/Makefile Modified: csw/mgar/pkg/unixodbc-libodbc1/trunk/Makefile =================================================================== --- csw/mgar/pkg/unixodbc-libodbc1/trunk/Makefile 2011-12-16 12:42:45 UTC (rev 16534) +++ csw/mgar/pkg/unixodbc-libodbc1/trunk/Makefile 2011-12-16 13:07:30 UTC (rev 16535) @@ -15,7 +15,8 @@ DISTNAME = unixODBC-$(VERSION) DISTFILES = $(DISTNAME).tar.gz -PACKAGES += CSWunixodbc +# This is now taken from 2.3.1 resulting in *.so.2 libs +#PACKAGES += CSWunixodbc SPKG_DESC_CSWunixodbc = $(DESCRIPTION) # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWunixodbc += CSWlibiconv2 @@ -24,6 +25,7 @@ RUNTIME_DEP_PKGS_CSWunixodbc += CSWlibodbcinst1 RUNTIME_DEP_PKGS_CSWunixodbc += CSWlibodbc1 +# This is now taken from 2.3.1 PACKAGES += CSWunixodbc-dev CATALOGNAME_CSWunixodbc-dev = unixodbc_dev SPKG_DESC_CSWunixodbc-dev = Development files for libodbc*.so.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 Fri Dec 16 14:11:50 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 16 Dec 2011 13:11:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[16536] csw/mgar/pkg/unixodbc/trunk Message-ID: Revision: 16536 http://gar.svn.sourceforge.net/gar/?rev=16536&view=rev Author: dmichelsen Date: 2011-12-16 13:11:50 +0000 (Fri, 16 Dec 2011) Log Message: ----------- unixodbc/trunk: Update to 2.3.1, fix for new SONAME *.so.2 Modified Paths: -------------- csw/mgar/pkg/unixodbc/trunk/Makefile csw/mgar/pkg/unixodbc/trunk/checksums Modified: csw/mgar/pkg/unixodbc/trunk/Makefile =================================================================== --- csw/mgar/pkg/unixodbc/trunk/Makefile 2011-12-16 13:07:30 UTC (rev 16535) +++ csw/mgar/pkg/unixodbc/trunk/Makefile 2011-12-16 13:11:50 UTC (rev 16536) @@ -3,7 +3,7 @@ # $Id$ NAME = unixodbc -VERSION = 2.3.0 +VERSION = 2.3.1 CATEGORIES = lib DESCRIPTION = ODBC drivers for Unix systems @@ -15,39 +15,50 @@ DISTNAME = unixODBC-$(VERSION) DISTFILES = $(DISTNAME).tar.gz +FOREIGN_PACKAGES += CSWlibodbc1 +FOREIGN_PACKAGES += CSWlibodbccr1 +FOREIGN_PACKAGES += CSWlibodbcinst1 + PACKAGES += CSWunixodbc SPKG_DESC_CSWunixodbc = $(DESCRIPTION) # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWunixodbc += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWunixodbc += CSWlibreadline6 RUNTIME_DEP_PKGS_CSWunixodbc += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWunixodbc += CSWlibodbcinst2 +RUNTIME_DEP_PKGS_CSWunixodbc += CSWlibodbc2 +# These are legacy dependencies for packages depending on CSWunixodbc and expecting *.so.1 libraries +RUNTIME_DEP_PKGS_CSWunixodbc += CSWlibodbc1 +RUNTIME_DEP_PKGS_CSWunixodbc += CSWlibodbccr1 RUNTIME_DEP_PKGS_CSWunixodbc += CSWlibodbcinst1 -RUNTIME_DEP_PKGS_CSWunixodbc += CSWlibodbc1 +CHECKPKG_OVERRIDES_CSWunixodbc += surplus-dependency|CSWlibodbcinst1 +CHECKPKG_OVERRIDES_CSWunixodbc += surplus-dependency|CSWlibodbccr1 +CHECKPKG_OVERRIDES_CSWunixodbc += surplus-dependency|CSWlibodbc1 PACKAGES += CSWunixodbc-dev CATALOGNAME_CSWunixodbc-dev = unixodbc_dev -SPKG_DESC_CSWunixodbc-dev = Development files for libodbc*.so.1 +SPKG_DESC_CSWunixodbc-dev = Development files for libodbc*.so.2 PKGFILES_CSWunixodbc-dev += $(PKGFILES_DEVEL) PKGFILES_CSWunixodbc-dev += $(call baseisadirs,$(bindir),odbc_config) -RUNTIME_DEP_PKGS_CSWunixodbc-dev += CSWlibodbc1 -RUNTIME_DEP_PKGS_CSWunixodbc-dev += CSWlibodbccr1 -RUNTIME_DEP_PKGS_CSWunixodbc-dev += CSWlibodbcinst1 +RUNTIME_DEP_PKGS_CSWunixodbc-dev += CSWlibodbc2 +RUNTIME_DEP_PKGS_CSWunixodbc-dev += CSWlibodbccr2 +RUNTIME_DEP_PKGS_CSWunixodbc-dev += CSWlibodbcinst2 -PACKAGES += CSWlibodbc1 -SPKG_DESC_CSWlibodbc1 = $(DESCRIPTION), libodbc.so.1 -PKGFILES_CSWlibodbc1 += $(call pkgfiles_lib,libodbc.so.1) -PKGFILES_CSWlibodbc1 += $(sysconfdir)/.* -RUNTIME_DEP_PKGS_CSWlibodbc1 += CSWlibltdl7 -RUNTIME_DEP_PKGS_CSWlibodbc1 += CSWlibiconv2 +PACKAGES += CSWlibodbc2 +SPKG_DESC_CSWlibodbc2 = $(DESCRIPTION), libodbc.so.2 +PKGFILES_CSWlibodbc2 += $(call pkgfiles_lib,libodbc.so.2) +PKGFILES_CSWlibodbc2 += $(sysconfdir)/.* +RUNTIME_DEP_PKGS_CSWlibodbc2 += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWlibodbc2 += CSWlibiconv2 -PACKAGES += CSWlibodbccr1 -SPKG_DESC_CSWlibodbccr1 = $(DESCRIPTION), libodbccr.so.1 -PKGFILES_CSWlibodbccr1 += $(call pkgfiles_lib,libodbccr.so.1) +PACKAGES += CSWlibodbccr2 +SPKG_DESC_CSWlibodbccr2 = $(DESCRIPTION), libodbccr.so.2 +PKGFILES_CSWlibodbccr2 += $(call pkgfiles_lib,libodbccr.so.2) -PACKAGES += CSWlibodbcinst1 -SPKG_DESC_CSWlibodbcinst1 = $(DESCRIPTION), libodbcinst.so.1 -PKGFILES_CSWlibodbcinst1 += $(call pkgfiles_lib,libodbcinst.so.1) -RUNTIME_DEP_PKGS_CSWlibodbcinst1 += CSWlibltdl7 +PACKAGES += CSWlibodbcinst2 +SPKG_DESC_CSWlibodbcinst2 = $(DESCRIPTION), libodbcinst.so.2 +PKGFILES_CSWlibodbcinst2 += $(call pkgfiles_lib,libodbcinst.so.2) +RUNTIME_DEP_PKGS_CSWlibodbcinst2 += CSWlibltdl7 BUILD64 = 1 CONFIGURE_ARGS += $(DIRPATHS) Modified: csw/mgar/pkg/unixodbc/trunk/checksums =================================================================== --- csw/mgar/pkg/unixodbc/trunk/checksums 2011-12-16 13:07:30 UTC (rev 16535) +++ csw/mgar/pkg/unixodbc/trunk/checksums 2011-12-16 13:11:50 UTC (rev 16536) @@ -1 +1 @@ -f2ad22cbdffe836c58987ed2332c2e99 unixODBC-2.3.0.tar.gz +86788d4006620fa1f171c13d07fdcaab unixODBC-2.3.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 Fri Dec 16 14:12:15 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 16 Dec 2011 13:12:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[16537] csw/mgar/pkg/unixodbc-libodbc1/trunk/Makefile Message-ID: Revision: 16537 http://gar.svn.sourceforge.net/gar/?rev=16537&view=rev Author: dmichelsen Date: 2011-12-16 13:12:15 +0000 (Fri, 16 Dec 2011) Log Message: ----------- unixodbc-libodbc1/trunk: Fix typo Modified Paths: -------------- csw/mgar/pkg/unixodbc-libodbc1/trunk/Makefile Modified: csw/mgar/pkg/unixodbc-libodbc1/trunk/Makefile =================================================================== --- csw/mgar/pkg/unixodbc-libodbc1/trunk/Makefile 2011-12-16 13:11:50 UTC (rev 16536) +++ csw/mgar/pkg/unixodbc-libodbc1/trunk/Makefile 2011-12-16 13:12:15 UTC (rev 16537) @@ -27,7 +27,7 @@ # This is now taken from 2.3.1 PACKAGES += CSWunixodbc-dev -CATALOGNAME_CSWunixodbc-dev = unixodbc_dev +#CATALOGNAME_CSWunixodbc-dev = unixodbc_dev SPKG_DESC_CSWunixodbc-dev = Development files for libodbc*.so.1 PKGFILES_CSWunixodbc-dev += $(PKGFILES_DEVEL) PKGFILES_CSWunixodbc-dev += $(call baseisadirs,$(bindir),odbc_config) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Dec 16 14:14:41 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 16 Dec 2011 13:14:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[16538] csw/mgar/pkg/unixodbc-libodbc1/trunk/Makefile Message-ID: Revision: 16538 http://gar.svn.sourceforge.net/gar/?rev=16538&view=rev Author: dmichelsen Date: 2011-12-16 13:14:41 +0000 (Fri, 16 Dec 2011) Log Message: ----------- unixodbc-libodbc1/trunk: Moan, another typo Modified Paths: -------------- csw/mgar/pkg/unixodbc-libodbc1/trunk/Makefile Modified: csw/mgar/pkg/unixodbc-libodbc1/trunk/Makefile =================================================================== --- csw/mgar/pkg/unixodbc-libodbc1/trunk/Makefile 2011-12-16 13:12:15 UTC (rev 16537) +++ csw/mgar/pkg/unixodbc-libodbc1/trunk/Makefile 2011-12-16 13:14:41 UTC (rev 16538) @@ -26,8 +26,8 @@ RUNTIME_DEP_PKGS_CSWunixodbc += CSWlibodbc1 # This is now taken from 2.3.1 -PACKAGES += CSWunixodbc-dev -#CATALOGNAME_CSWunixodbc-dev = unixodbc_dev +#PACKAGES += CSWunixodbc-dev +CATALOGNAME_CSWunixodbc-dev = unixodbc_dev SPKG_DESC_CSWunixodbc-dev = Development files for libodbc*.so.1 PKGFILES_CSWunixodbc-dev += $(PKGFILES_DEVEL) PKGFILES_CSWunixodbc-dev += $(call baseisadirs,$(bindir),odbc_config) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Dec 16 15:01:39 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 16 Dec 2011 14:01:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[16539] csw/mgar/pkg/unixodbc-libodbc1/trunk/Makefile Message-ID: Revision: 16539 http://gar.svn.sourceforge.net/gar/?rev=16539&view=rev Author: dmichelsen Date: 2011-12-16 14:01:39 +0000 (Fri, 16 Dec 2011) Log Message: ----------- unixodbc-libodbc1/trunk: Skip config files for legacy version Modified Paths: -------------- csw/mgar/pkg/unixodbc-libodbc1/trunk/Makefile Modified: csw/mgar/pkg/unixodbc-libodbc1/trunk/Makefile =================================================================== --- csw/mgar/pkg/unixodbc-libodbc1/trunk/Makefile 2011-12-16 13:14:41 UTC (rev 16538) +++ csw/mgar/pkg/unixodbc-libodbc1/trunk/Makefile 2011-12-16 14:01:39 UTC (rev 16539) @@ -38,7 +38,7 @@ PACKAGES += CSWlibodbc1 SPKG_DESC_CSWlibodbc1 = $(DESCRIPTION), libodbc.so.1 PKGFILES_CSWlibodbc1 += $(call pkgfiles_lib,libodbc.so.1) -PKGFILES_CSWlibodbc1 += $(sysconfdir)/.* +#PKGFILES_CSWlibodbc1 += $(sysconfdir)/.* RUNTIME_DEP_PKGS_CSWlibodbc1 += CSWlibltdl7 RUNTIME_DEP_PKGS_CSWlibodbc1 += CSWlibiconv2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Dec 16 17:23:23 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 16 Dec 2011 16:23:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[16540] csw/mgar/pkg/freetds/trunk Message-ID: Revision: 16540 http://gar.svn.sourceforge.net/gar/?rev=16540&view=rev Author: dmichelsen Date: 2011-12-16 16:23:22 +0000 (Fri, 16 Dec 2011) Log Message: ----------- freetds/trunk: Update to 0.91, general rework Modified Paths: -------------- csw/mgar/pkg/freetds/trunk/Makefile csw/mgar/pkg/freetds/trunk/checksums Modified: csw/mgar/pkg/freetds/trunk/Makefile =================================================================== --- csw/mgar/pkg/freetds/trunk/Makefile 2011-12-16 14:01:39 UTC (rev 16539) +++ csw/mgar/pkg/freetds/trunk/Makefile 2011-12-16 16:23:22 UTC (rev 16540) @@ -1,6 +1,6 @@ # $Id$ NAME = freetds -VERSION = 0.82 +VERSION = 0.91 CATEGORIES = lib DESCRIPTION = Implementation of the TDS protocol used by MS SQL Server and Sybase @@ -9,41 +9,59 @@ to natively talk to Microsoft SQL Server and Sybase databases. endef -MASTER_SITES = http://ftp.ibiblio.org/pub/Linux/ALPHA/freetds/stable/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +MASTER_SITES += http://ftp.ibiblio.org/pub/Linux/ALPHA/freetds/stable/ +DISTFILES = $(NAME)-$(VERSION).tar.bz2 -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +VENDOR_URL = http://www.freetds.org/ -PACKAGES = CSWfreetds CSWfreetdsdoc +BUILD_DEP_PKGS += CSWlibreadline-dev +BUILD_DEP_PKGS += CSWlibncurses-dev +BUILD_DEP_PKGS += CSWunixodbc-dev -CATALOGNAME_CSWfreetds = freetds -CATALOGNAME_CSWfreetdsdoc = freetds_doc - +PACKAGES = CSWfreetds SPKG_DESC_CSWfreetds = $(DESCRIPTION) -SPKG_DESC_CSWfreetdsdoc = Documentation for freetds +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWfreetds += CSWlibodbc2 +RUNTIME_DEP_PKGS_CSWfreetds += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWfreetds += CSWlibncurses5 +RUNTIME_DEP_PKGS_CSWfreetds += CSWlibreadline6 +RUNTIME_DEP_PKGS_CSWfreetds += CSWlibsybdb5 +# This is just an example +CHECKPKG_OVERRIDES_CSWfreetds += file-with-bad-content|/usr/local|root/opt/csw/bin/osql -RUNTIME_DEP_PKGS_CSWfreetds = CSWunixodbc CSWiconv CSWreadline CSWncurses -BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWfreetds) +PACKAGES += CSWlibct4 +SPKG_DESC_CSWlibct4 = FreeTDS library, libct.so.4 +PKGFILES_CSWlibct4 += $(call pkgfiles_lib,libct.so.4) -sysconfdir = /etc/opt/csw +PACKAGES += CSWlibsybdb5 +SPKG_DESC_CSWlibsybdb5 += FreeTDS library, libsybdb.so.5 +PKGFILES_CSWlibsybdb5 += $(call pkgfiles_lib,libsybdb.so.5) +PACKAGES += CSWlibtdsodbc0 +SPKG_DESC_CSWlibtdsodbc0 = FreeTDS library, libtdsodbc.so.0 +PKGFILES_CSWlibtdsodbc0 += $(call pkgfiles_lib,libtdsodbc.so.0) +RUNTIME_DEP_PKGS_CSWlibtdsodbc0 += CSWlibodbcinst2 + +PACKAGES += CSWfreetds-dev +SPKG_DESC_CSWfreetds-dev = Development files for libct.so.4, libsybdb.so.5 and libtdsodbc.so.0 +PKGFILES_CSWfreetds-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWfreetds-dev += $(docdir)/.* +RUNTIME_DEP_PKGS_CSWfreetds-dev += CSWlibsybdb5 +RUNTIME_DEP_PKGS_CSWfreetds-dev += CSWlibct4 +RUNTIME_DEP_PKGS_CSWfreetds-dev += CSWlibtdsodbc0 +OBSOLETED_BY_CSWfreetds-dev += CSWfreetdsdoc +CATALOGNAME_CSWfreetdsdoc = freetds_doc_stub +# There are lots of examples which would need careful adjustment, contributions welcome! +CHECKPKG_OVERRIDES_CSWfreetds-dev += file-with-bad-content + BUILD64 = 1 -NOISAEXEC = 1 -CONFIGURE_ARGS = $(DIRPATHS) -MERGE_DIRS_isa-extra = $(libdir) +# Testsuite needs a running Sybase/SQLServer database +SKIPTEST ?= 1 -EXTRA_PAX_ARGS = '-s,.*{}$$,,p' '-s,/doc/$(NAME)-$(VERSION),/doc/$(NAME),p' +EXTRA_PAX_ARGS = -s ',.*{}$$,,p' -s ',/doc/$(NAME)-$(VERSION),/doc/$(NAME),p' PRESERVECONF = $(addprefix $(sysconfdir)/,freetds.conf locales.conf pool.conf) MIGRATE_FILES_CSWfreetds = freetds.conf locales.conf pool.conf -ARCHALL_CSWfreetdsdoc = 1 -PKGFILES_CSWfreetdsdoc = $(PKGFILES_DOC) - include gar/category.mk - -post-configure-modulated: - @# Use latest libtool, the one shipped is too old - cp $(bindir_install)/libtool $(WORKSRC)/libtool - @$(MAKECOOKIE) Modified: csw/mgar/pkg/freetds/trunk/checksums =================================================================== --- csw/mgar/pkg/freetds/trunk/checksums 2011-12-16 14:01:39 UTC (rev 16539) +++ csw/mgar/pkg/freetds/trunk/checksums 2011-12-16 16:23:22 UTC (rev 16540) @@ -1 +1 @@ -3df6b2e83fd420e90f1becbd1162990a freetds-0.82.tar.gz +e88e96800c89d62307812315b235eb18 freetds-0.91.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Fri Dec 16 20:47:49 2011 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Fri, 16 Dec 2011 19:47:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[16541] csw/mgar/pkg/openssh/trunk/files Message-ID: Revision: 16541 http://gar.svn.sourceforge.net/gar/?rev=16541&view=rev Author: chninkel Date: 2011-12-16 19:47:49 +0000 (Fri, 16 Dec 2011) Log Message: ----------- openssh: fixed an error in server key generation (Closes: #4876) Modified Paths: -------------- csw/mgar/pkg/openssh/trunk/files/changelog.CSW csw/mgar/pkg/openssh/trunk/files/cswopenssh csw/mgar/pkg/openssh/trunk/files/sshd.smf_wrapper Modified: csw/mgar/pkg/openssh/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2011-12-16 16:23:22 UTC (rev 16540) +++ csw/mgar/pkg/openssh/trunk/files/changelog.CSW 2011-12-16 19:47:49 UTC (rev 16541) @@ -1,3 +1,9 @@ +openssh (5.9p1,REV=2011.12.16) unstable + + * Fixed an error in server key generation (Closes: #4876) + + -- Yann Rouillard Fri, 16 Dec 2011 20:46:24 +0100 + openssh (5.9p1,REV=2011.09.19) unstable * New upstream release. Modified: csw/mgar/pkg/openssh/trunk/files/cswopenssh =================================================================== --- csw/mgar/pkg/openssh/trunk/files/cswopenssh 2011-12-16 16:23:22 UTC (rev 16540) +++ csw/mgar/pkg/openssh/trunk/files/cswopenssh 2011-12-16 19:47:49 UTC (rev 16541) @@ -20,7 +20,7 @@ for ALGO in rsa dsa ecdsa; do if [ ! -f "$KEYDIR/ssh_host_${ALGO}_key" ]; then echo "Creating new ${ALGO} public/private host key pair" - ssh-keygen -f $KEYDIR/ssh_host_${ALGO}_key -t rsa -N '' + ssh-keygen -f $KEYDIR/ssh_host_${ALGO}_key -t ${ALGO} -N '' fi done fi Modified: csw/mgar/pkg/openssh/trunk/files/sshd.smf_wrapper =================================================================== --- csw/mgar/pkg/openssh/trunk/files/sshd.smf_wrapper 2011-12-16 16:23:22 UTC (rev 16540) +++ csw/mgar/pkg/openssh/trunk/files/sshd.smf_wrapper 2011-12-16 19:47:49 UTC (rev 16541) @@ -8,7 +8,7 @@ for ALGO in rsa dsa ecdsa; do if [ ! -f "$KEYDIR/ssh_host_${ALGO}_key" ]; then echo "Creating new ${ALGO} public/private host key pair" - ssh-keygen -f $KEYDIR/ssh_host_${ALGO}_key -t rsa -N '' + ssh-keygen -f $KEYDIR/ssh_host_${ALGO}_key -t ${ALGO} -N '' fi done fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sat Dec 17 09:03:50 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 17 Dec 2011 08:03:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[16542] csw/mgar/pkg/gnome-ssh-askpass/trunk/Makefile Message-ID: Revision: 16542 http://gar.svn.sourceforge.net/gar/?rev=16542&view=rev Author: guengel Date: 2011-12-17 08:03:49 +0000 (Sat, 17 Dec 2011) Log Message: ----------- gnome-ssh-askpass/trunk: Updated RUNTIME_DEP_PKGS and BUILD_DEP_PKGS. Modified Paths: -------------- csw/mgar/pkg/gnome-ssh-askpass/trunk/Makefile Modified: csw/mgar/pkg/gnome-ssh-askpass/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnome-ssh-askpass/trunk/Makefile 2011-12-16 19:47:49 UTC (rev 16541) +++ csw/mgar/pkg/gnome-ssh-askpass/trunk/Makefile 2011-12-17 08:03:49 UTC (rev 16542) @@ -29,8 +29,13 @@ PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 PACKAGES = CSW$(NAME) -RUNTIME_DEP_PKGS = CSWgtk2 -RUNTIME_DEP_PKGS += CSWglib2 +RUNTIME_DEP_PKGS = CSWgtk2 +RUNTIME_DEP_PKGS += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS += CSWlibglib2-0-0 RUNTIME_DEP_PKGS += CSWpango RUNTIME_DEP_PKGS += CSWlibatk RUNTIME_DEP_PKGS += CSWlibintl8 @@ -38,11 +43,11 @@ RUNTIME_DEP_PKGS += CSWfconfig RUNTIME_DEP_PKGS += CSWlibcairo2 -BUILD_DEP_PKGS = CSWgtk2devel -BUILD_DEP_PKGS += CSWglib2devel +BUILD_DEP_PKGS = CSWgtk2devel +BUILD_DEP_PKGS += CSWlibglib2-dev BUILD_DEP_PKGS += CSWpangodevel BUILD_DEP_PKGS += CSWlibpixman-dev -BUILD_DEP_PKGS += CSWlibatkdevel +BUILD_DEP_PKGS += CSWlibatk-dev BUILD_DEP_PKGS += CSWlibpng-dev BUILD_DEP_PKGS += CSWsunx11devel This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sat Dec 17 10:15:47 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 17 Dec 2011 09:15:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[16543] csw/mgar/pkg/gtk2/branches/2.24-raos Message-ID: Revision: 16543 http://gar.svn.sourceforge.net/gar/?rev=16543&view=rev Author: guengel Date: 2011-12-17 09:15:46 +0000 (Sat, 17 Dec 2011) Log Message: ----------- gtk2/branches/2.24-raos: Use $(sysconfdir)/64 on 64bit platforms instead of the source code patch. Modified Paths: -------------- csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile Added Paths: ----------- csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Add-update-modules-cmd-line-option.patch Removed Paths: ------------- csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Add-update-modules-cmd-line-option.patch csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Use-distinct-files-for-gtk.immodules-on-32-64bit-lib.patch Modified: csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile =================================================================== --- csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile 2011-12-17 08:03:49 UTC (rev 16542) +++ csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile 2011-12-17 09:15:46 UTC (rev 16543) @@ -50,13 +50,6 @@ # This disables a check that I wasn't able to fix PATCHFILES += 0000-Disable-gtk_test_create_widget-g_type_from_name-GtkT.patch -# This patch makes gtk look for -# -# - gtk.immodules-64 on 64bit ISAs -# -# - gtk.immodules on 32bit ISAs -PATCHFILES += 0000-Use-distinct-files-for-gtk.immodules-on-32-64bit-lib.patch - # This patch adds a command line option `--update-modules` to # gtk-query-immodules-2.0 which has the default location of # gtk.immodules hardcoded and takes 32/64bit ISAs into account. @@ -417,6 +410,13 @@ BUILD64 = 1 +# This is because gtk.immodules resides in $(sysconfdir)/gtk-2.0. If +# we don't take the memory model into account, 32/64 bit libs would +# get the wrong IM Modules list in gtk.immodules (see also the pango +# recipe). +sysconfdir-suffix-64 = /64 +sysconfdir = /etc/opt/csw$(sysconfdir-suffix-$(MEMORYMODEL)) + # We need the binaries to query 64 bit modules MERGE_DIRS_isa-extra = $(bindir) $(libdir) Deleted: csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Add-update-modules-cmd-line-option.patch =================================================================== --- csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Add-update-modules-cmd-line-option.patch 2011-12-17 08:03:49 UTC (rev 16542) +++ csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Add-update-modules-cmd-line-option.patch 2011-12-17 09:15:46 UTC (rev 16543) @@ -1,76 +0,0 @@ -From 780bf4b7fe81f5ecb94858e43fe07c4374a1f441 Mon Sep 17 00:00:00 2001 -From: Rafael Ostertag -Date: Mon, 12 Dec 2011 22:00:33 +0100 -Subject: [PATCH] Add --update-modules cmd line option - ---- - gtk/queryimmodules.c | 36 +++++++++++++++++++++++++++++++++++- - 1 files changed, 35 insertions(+), 1 deletions(-) - -diff --git a/gtk/queryimmodules.c b/gtk/queryimmodules.c -index 5369c7f..21611e4 100644 ---- a/gtk/queryimmodules.c -+++ b/gtk/queryimmodules.c -@@ -23,6 +23,7 @@ - - #include - #include -+#include - #include - - #include -@@ -30,6 +31,8 @@ - #ifdef HAVE_UNISTD_H - #include - #endif -+#include -+#include - - #ifdef USE_LA_MODULES - #define SOEXT ".la" -@@ -164,10 +167,41 @@ query_module (const char *dir, const char *name) - int main (int argc, char **argv) - { - char *cwd; -- int i; -+ int i, fd, retval; - char *path; -+ char *gtk_immodules; - gboolean error = FALSE; - -+ /* -+ * Quick an dirty hack -+ */ -+ if ( argc == 2 && strcmp("--update-modules", argv[1]) == 0 ) -+ { -+#if defined(__amd64) || defined(__sparcv9) -+ gtk_immodules = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules-64", NULL); -+#else -+ gtk_immodules = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL); -+#endif -+ fd = g_open(gtk_immodules, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); -+ if ( fd == -1 ) -+ { -+ g_fprintf(stderr, "Cannot open %s.\n", gtk_immodules); -+ exit(1); -+ } -+ -+ if ( dup2(fd, STDOUT_FILENO) == -1 ) -+ { -+ g_fprintf(stderr, "Unable to redirect STDOUT.\n"); -+ exit(1); -+ } -+ -+ /* -+ * cheat, to make it think there are no arguments given -+ */ -+ argc = 1; -+ } -+ -+ - g_printf ("# GTK+ Input Method Modules file\n" - "# Automatically generated file, do not edit\n" - "# Created by %s from gtk+-%d.%d.%d\n" --- -1.7.6.1 - Added: csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Add-update-modules-cmd-line-option.patch =================================================================== --- csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Add-update-modules-cmd-line-option.patch (rev 0) +++ csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Add-update-modules-cmd-line-option.patch 2011-12-17 09:15:46 UTC (rev 16543) @@ -0,0 +1,82 @@ +From c6d567e18c04b779d3d7b587b903c2cbf4d392e5 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sat, 17 Dec 2011 10:12:38 +0100 +Subject: [PATCH] Add --update-modules cmd line option + +--- + gtk/queryimmodules.c | 42 +++++++++++++++++++++++++++++++++++++++++- + 1 files changed, 41 insertions(+), 1 deletions(-) + +diff --git a/gtk/queryimmodules.c b/gtk/queryimmodules.c +index 5369c7f..8287790 100644 +--- a/gtk/queryimmodules.c ++++ b/gtk/queryimmodules.c +@@ -23,6 +23,7 @@ + + #include + #include ++#include + #include + + #include +@@ -30,6 +31,8 @@ + #ifdef HAVE_UNISTD_H + #include + #endif ++#include ++#include + + #ifdef USE_LA_MODULES + #define SOEXT ".la" +@@ -164,10 +167,47 @@ query_module (const char *dir, const char *name) + int main (int argc, char **argv) + { + char *cwd; +- int i; ++ int i, fd, retval; + char *path; ++ char *gtk_immodules; + gboolean error = FALSE; + ++ /* ++ * Quick an dirty hack. ++ * ++ * This will allow us to create the gtk.immodules in the default ++ * place by providing `--update-modules' as cmd line argument, ++ * without worrying where this might be when calling ++ * gtk-query-immodules-2.0 from a postinstall script. ++ * ++ * The basic idea is to redirect STDOUT to the default file and then ++ * let the normal flow of the program continue like there was no cmd ++ * line argument. Be aware, that this only works when no other cmd ++ * line options were passed. ++ */ ++ if ( argc == 2 && strcmp("--update-modules", argv[1]) == 0 ) ++ { ++ gtk_immodules = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL); ++ fd = g_open(gtk_immodules, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); ++ if ( fd == -1 ) ++ { ++ g_fprintf(stderr, "Cannot open %s.\n", gtk_immodules); ++ exit(1); ++ } ++ ++ if ( dup2(fd, STDOUT_FILENO) == -1 ) ++ { ++ g_fprintf(stderr, "Unable to redirect STDOUT.\n"); ++ exit(1); ++ } ++ ++ /* ++ * cheat, to make it think there are no arguments given ++ */ ++ argc = 1; ++ } ++ ++ + g_printf ("# GTK+ Input Method Modules file\n" + "# Automatically generated file, do not edit\n" + "# Created by %s from gtk+-%d.%d.%d\n" +-- +1.7.6.1 + Deleted: csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Use-distinct-files-for-gtk.immodules-on-32-64bit-lib.patch =================================================================== --- csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Use-distinct-files-for-gtk.immodules-on-32-64bit-lib.patch 2011-12-17 08:03:49 UTC (rev 16542) +++ csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Use-distinct-files-for-gtk.immodules-on-32-64bit-lib.patch 2011-12-17 09:15:46 UTC (rev 16543) @@ -1,35 +0,0 @@ -From d7e51a17837834806952718835254927669e55e6 Mon Sep 17 00:00:00 2001 -From: Rafael Ostertag -Date: Mon, 12 Dec 2011 20:10:28 +0100 -Subject: [PATCH] Use distinct files for gtk.immodules on 32/64bit libs - ---- - gtk/gtkrc.c | 11 +++++++++++ - 1 files changed, 11 insertions(+), 0 deletions(-) - -diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c -index 82a6470..38b0176 100644 ---- a/gtk/gtkrc.c -+++ b/gtk/gtkrc.c -@@ -450,7 +450,18 @@ gtk_rc_get_im_module_file (void) - if (im_module_file) - result = g_strdup (im_module_file); - else -+ /* -+ * Because we install 32/64 bit libraries concurrently, we -+ * need to have a separate gtk.immodules files. -+ * -+ * - gtk.immodules is for 32bit libs -+ * - gtk.immodules-64 is for 64bit libs -+ */ -+#if defined(__sparcv9) || defined(__amd64) -+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules-64", NULL); -+#else - result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL); -+#endif - } - - return result; --- -1.7.6.1 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sat Dec 17 12:00:37 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 17 Dec 2011 11:00:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[16544] csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile Message-ID: Revision: 16544 http://gar.svn.sourceforge.net/gar/?rev=16544&view=rev Author: guengel Date: 2011-12-17 11:00:37 +0000 (Sat, 17 Dec 2011) Log Message: ----------- gtk2/branches/2.24-raos: Additional BUILD_DEP_PKGS. Modified Paths: -------------- csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile Modified: csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile =================================================================== --- csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile 2011-12-17 09:15:46 UTC (rev 16543) +++ csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile 2011-12-17 11:00:37 UTC (rev 16544) @@ -404,9 +404,13 @@ BUILD_DEP_PKGS += CSWlibgdk-pixbuf-dev BUILD_DEP_PKGS += CSWsunx11devel BUILD_DEP_PKGS += CSWggettext-dev -# Because of cups depends on krb +# Because cups depends on krb BUILD_DEP_PKGS += CSWlibkrb5-dev BUILD_DEP_PKGS += CSWggettext +BUILD_DEP_PKGS += CSWlibpixman-dev +BUILD_DEP_PKGS += CSWlibpng-dev +# Needed to make a test work +BUILD_DEP_PKGS += CSWgamin BUILD64 = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sat Dec 17 12:44:46 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 17 Dec 2011 11:44:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[16545] csw/mgar/pkg/gtk2/branches/2.24-raos Message-ID: Revision: 16545 http://gar.svn.sourceforge.net/gar/?rev=16545&view=rev Author: guengel Date: 2011-12-17 11:44:45 +0000 (Sat, 17 Dec 2011) Log Message: ----------- gtk2/branches/2.24-raos: Moved some packages back into CSWgtk2. Added post-merge in order to adjust paths in docs. Modified Paths: -------------- csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile csw/mgar/pkg/gtk2/branches/2.24-raos/files/CSWgtk2.postinstall Added Paths: ----------- csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Adjust-hardcoded-path-to-opt-csw-share.patch csw/mgar/pkg/gtk2/branches/2.24-raos/files/README.CSW Removed Paths: ------------- csw/mgar/pkg/gtk2/branches/2.24-raos/files/CSWgtk2-immodules.postinstall Modified: csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile =================================================================== --- csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile 2011-12-17 11:00:37 UTC (rev 16544) +++ csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile 2011-12-17 11:44:45 UTC (rev 16545) @@ -39,10 +39,9 @@ DISTNAME = gtk+-$(VERSION) DISTFILES = $(DISTNAME).tar.bz2 DISTFILES += CSWgtk2.postinstall -DISTFILES += CSWgtk2-immodules.postinstall +DISTFILES += README.CSW -EXPANDVARS = CSWgtk2-immodules.postinstall -EXPANDVARS += CSWgtk2.postinstall +EXPANDVARS = CSWgtk2.postinstall # This makes the tests work in the first place PATCHFILES += 0000-Use-absolute-path-to-Xvfb.patch @@ -57,6 +56,8 @@ # It goes together with the above patch. PATCHFILES += 0000-Add-update-modules-cmd-line-option.patch +PATCHFILES += 0000-Adjust-hardcoded-path-to-opt-csw-share.patch + PACKAGES += CSWgtk2 SPKG_DESC_CSWgtk2 = $(DESCRIPTION) # Catchall @@ -67,8 +68,6 @@ RUNTIME_DEP_PKGS_CSWgtk2 += CSWgtk2-engines RUNTIME_DEP_PKGS_CSWgtk2 += CSWgtk2-printbackends-papi RUNTIME_DEP_PKGS_CSWgtk2 += CSWgtk2-printbackends-file -RUNTIME_DEP_PKGS_CSWgtk2 += CSWgtk2-printbackends-cups -RUNTIME_DEP_PKGS_CSWgtk2 += CSWgtk2-printbackends-lpr RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibgailutil18 RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibgtk-x112-0-0 # I pull the whole gdk pixbuf to make sure gdk-pixbuf-query-loaders will @@ -92,86 +91,6 @@ RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibz1 RUNTIME_DEP_PKGS_CSWgtk2 += CSWpango -PACKAGES += CSWgtk2-immodules -SPKG_DESC_CSWgtk2-immodules = $(DESCRIPTION), IM Modules -PKGFILES_CSWgtk2-immodules = .*/immodules/.* -PKGFILES_CSWgtk2-immodules += .*/gtk-2.0/im-multipress.conf -PKGFILES_CSWgtk2-immodules += .*/gtk-query-immodules-2.0 -RUNTIME_DEP_PKGS_CSWgtk2-immodules = CSWlibgdk-x112-0-0 -RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWlibgtk-x112-0-0 -# I pull the whole gdk pixbuf to make sure gdk-pixbuf-query-loaders will be -# called as well -RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWgdkpixbuf -RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWfconfig -RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWftype2 -RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWlibatk1-0-0 -RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWlibcairo2 -RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWlibexpat1 -RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWlibgio2-0-0 -RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWlibgmodule2-0-0 -RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWlibpixman1-0 -RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWlibpng12-0 -RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWlibxrender -RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWlibz1 -RUNTIME_DEP_PKGS_CSWgtk2-immodules += CSWpango - -PACKAGES += CSWgtk2-modules -SPKG_DESC_CSWgtk2-modules = $(DESCRIPTION), Modules -PKGFILES_CSWgtk2-modules = .*/modules/.* -RUNTIME_DEP_PKGS_CSWgtk2-modules = CSWlibgdk-x112-0-0 -RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWlibgtk-x112-0-0 -# I pull the whole gdk pixbuf to make sure gdk-pixbuf-query-loaders will be -# called as well -RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWgdkpixbuf -RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWfconfig -RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWftype2 -RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWlibatk1-0-0 -RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWlibcairo2 -RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWlibexpat1 -RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWlibgio2-0-0 -RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWlibgmodule2-0-0 -RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWlibpixman1-0 -RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWlibpng12-0 -RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWlibxrender -RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWlibz1 -RUNTIME_DEP_PKGS_CSWgtk2-modules += CSWpango - -PACKAGES += CSWgtk2-engines -SPKG_DESC_CSWgtk2-engines = $(DESCRIPTION), Engines -PKGFILES_CSWgtk2-engines = .*/engines/.* -RUNTIME_DEP_PKGS_CSWgtk2-engines = CSWlibgdk-x112-0-0 -RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWlibgtk-x112-0-0 -# I pull the whole gdk pixbuf to make sure gdk-pixbuf-query-loaders will be -# called as well -RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWgdkpixbuf -RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWfconfig -RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWftype2 -RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWlibatk1-0-0 -RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWlibcairo2 -RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWlibexpat1 -RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWlibgio2-0-0 -RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWlibgmodule2-0-0 -RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWlibpixman1-0 -RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWlibpng12-0 -RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWlibxrender -RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWlibz1 -RUNTIME_DEP_PKGS_CSWgtk2-engines += CSWpango - PACKAGES += CSWgtk2-printbackends-papi SPKG_DESC_CSWgtk2-printbackends-papi = $(DESCRIPTION), Print Backend PKGFILES_CSWgtk2-printbackends-papi = .*/printbackends/libprintbackend-papi.* @@ -411,6 +330,8 @@ BUILD_DEP_PKGS += CSWlibpng-dev # Needed to make a test work BUILD_DEP_PKGS += CSWgamin +# Used to adjust documentation +BUILD_DEP_PKGS += CSWgsed BUILD64 = 1 @@ -433,3 +354,9 @@ CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) include gar/category.mk + +post-merge: + gsed -i -e 's|/usr/share/|$(sharedstatedir)/|g' \ + -e 's|/usr/lib|$(libdir)|g' \ + -e 's|/usr/include|$(includedir)|g' `find $(PKGROOT)$(sharedstatedir)/gtk-doc -type f` + @$(MAKECOOKIE) \ No newline at end of file Added: csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Adjust-hardcoded-path-to-opt-csw-share.patch =================================================================== --- csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Adjust-hardcoded-path-to-opt-csw-share.patch (rev 0) +++ csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Adjust-hardcoded-path-to-opt-csw-share.patch 2011-12-17 11:44:45 UTC (rev 16545) @@ -0,0 +1,25 @@ +From f84f9b4ba14c5d02547e80853da005cd97001d12 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sat, 17 Dec 2011 12:41:47 +0100 +Subject: [PATCH] Adjust hardcoded path to /opt/csw/share + +--- + demos/testpixbuf-color.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/demos/testpixbuf-color.c b/demos/testpixbuf-color.c +index 003f333..851a15b 100644 +--- a/demos/testpixbuf-color.c ++++ b/demos/testpixbuf-color.c +@@ -6,7 +6,7 @@ + + #include + +-#define ICC_PROFILE "/usr/share/color/icc/bluish.icc" ++#define ICC_PROFILE "/opt/csw/share/color/icc/bluish.icc" + #define ICC_PROFILE_SIZE 3966 + + static gboolean +-- +1.7.6.1 + Deleted: csw/mgar/pkg/gtk2/branches/2.24-raos/files/CSWgtk2-immodules.postinstall =================================================================== --- csw/mgar/pkg/gtk2/branches/2.24-raos/files/CSWgtk2-immodules.postinstall 2011-12-17 11:00:37 UTC (rev 16544) +++ csw/mgar/pkg/gtk2/branches/2.24-raos/files/CSWgtk2-immodules.postinstall 2011-12-17 11:44:45 UTC (rev 16545) @@ -1,44 +0,0 @@ -#!/bin/sh -# -# We will call gtk-query-immodules-2.0 for all ISAs -# -# Attention: the OpenCSW gtk-query-immodules-2.0 has been patched to -# support a command line option `--update-modules' to create the -# gtk.immodules (32bit executable) and gtk.immodules-64 (64bit -# executable) file. - -umask 0022 - -BIN=gtk-query-immodules-2.0 -BIN_OPTS="--update-modules" - -echo "** Querying IM Modules" - -# But first, do the obvious -/usr/bin/printf "- Default ISA... " - at prefix@/bin/${BIN} ${BIN_OPTS} >/dev/null 2>&1 -if [ $? -ne 0 ] -then - echo "Error" -else - echo "OK" -fi - -# Now, do all other -for i in @BUILD_ISAS@ -do - ISABIN=@prefix@/bin/$i/${BIN} - if [ -x "${ISABIN}" ] - then - /usr/bin/printf "- $i ISA... " - "${ISABIN}" ${BIN_OPTS} >/dev/null 2>&1 - if [ $? -ne 0 ] - then - echo "Error" - else - echo "OK" - fi - fi -done - -echo "** Done querying IM Modules" Modified: csw/mgar/pkg/gtk2/branches/2.24-raos/files/CSWgtk2.postinstall =================================================================== --- csw/mgar/pkg/gtk2/branches/2.24-raos/files/CSWgtk2.postinstall 2011-12-17 11:00:37 UTC (rev 16544) +++ csw/mgar/pkg/gtk2/branches/2.24-raos/files/CSWgtk2.postinstall 2011-12-17 11:44:45 UTC (rev 16545) @@ -24,3 +24,36 @@ echo "** Done Updating Icon cache" +BIN=gtk-query-immodules-2.0 +BIN_OPTS="--update-modules" + +echo "** Querying IM Modules" + +# But first, do the obvious +/usr/bin/printf "- Default ISA... " + at prefix@/bin/${BIN} ${BIN_OPTS} >/dev/null 2>&1 +if [ $? -ne 0 ] +then + echo "Error" +else + echo "OK" +fi + +# Now, do all other +for i in @NEEDED_ISAS@ +do + ISABIN=@prefix@/bin/$i/${BIN} + if [ -x "${ISABIN}" ] + then + /usr/bin/printf "- $i ISA... " + "${ISABIN}" ${BIN_OPTS} >/dev/null 2>&1 + if [ $? -ne 0 ] + then + echo "Error" + else + echo "OK" + fi + fi +done + +echo "** Done querying IM Modules" \ No newline at end of file Added: csw/mgar/pkg/gtk2/branches/2.24-raos/files/README.CSW =================================================================== --- csw/mgar/pkg/gtk2/branches/2.24-raos/files/README.CSW (rev 0) +++ csw/mgar/pkg/gtk2/branches/2.24-raos/files/README.CSW 2011-12-17 11:44:45 UTC (rev 16545) @@ -0,0 +1,26 @@ +GTK+ 2 +====== + + +Printer Backends +---------------- + +By default, only the file printer backend will be installed. If +support for CUPS is required, the package `gtk2_printbackends_cups` +has to be installed by calling + + /opt/csw/bin/pkgutil -i gtk2_printbackends_cups + +Support for the LPR printer backend can be enabled by installing +`gtk2_printbackends_lpr`: + + /opt/csw/bin/pkgutil -i gtk2_printbackends_lpr + + +gtk-query-immodules-2.0 +----------------------- + +The gtk-query-immodules-2.0 that comes with OpenCSW's GTK+ 2 has a +command line argument `--update-modules' which is not found in the +upstream release of GTK+ 2. It will update the file gtk.immodules in +the default location using the standard IM Modules search path. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sat Dec 17 12:54:42 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 17 Dec 2011 11:54:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[16546] csw/mgar/pkg/gnome-ssh-askpass/trunk/Makefile Message-ID: Revision: 16546 http://gar.svn.sourceforge.net/gar/?rev=16546&view=rev Author: guengel Date: 2011-12-17 11:54:42 +0000 (Sat, 17 Dec 2011) Log Message: ----------- gnome-ssh-askpass/trunk: Removed surplus RUNTIME_DEP_PKG. Modified Paths: -------------- csw/mgar/pkg/gnome-ssh-askpass/trunk/Makefile Modified: csw/mgar/pkg/gnome-ssh-askpass/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnome-ssh-askpass/trunk/Makefile 2011-12-17 11:44:45 UTC (rev 16545) +++ csw/mgar/pkg/gnome-ssh-askpass/trunk/Makefile 2011-12-17 11:54:42 UTC (rev 16546) @@ -37,7 +37,6 @@ RUNTIME_DEP_PKGS += CSWlibgio2-0-0 RUNTIME_DEP_PKGS += CSWlibglib2-0-0 RUNTIME_DEP_PKGS += CSWpango -RUNTIME_DEP_PKGS += CSWlibatk RUNTIME_DEP_PKGS += CSWlibintl8 RUNTIME_DEP_PKGS += CSWftype2 RUNTIME_DEP_PKGS += CSWfconfig This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sat Dec 17 13:26:10 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 17 Dec 2011 12:26:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[16547] csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile Message-ID: Revision: 16547 http://gar.svn.sourceforge.net/gar/?rev=16547&view=rev Author: guengel Date: 2011-12-17 12:26:10 +0000 (Sat, 17 Dec 2011) Log Message: ----------- gtk2/branches/2.24-raos: Removed unneeded RUNTIME_DEP_PKGS. Modified Paths: -------------- csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile Modified: csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile =================================================================== --- csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile 2011-12-17 11:54:42 UTC (rev 16546) +++ csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile 2011-12-17 12:26:10 UTC (rev 16547) @@ -63,9 +63,6 @@ # Catchall RUNTIME_DEP_PKGS_CSWgtk2 = CSWlibgdk-x112-0-0 RUNTIME_DEP_PKGS_CSWgtk2 += CSWhicoloricontheme -RUNTIME_DEP_PKGS_CSWgtk2 += CSWgtk2-immodules -RUNTIME_DEP_PKGS_CSWgtk2 += CSWgtk2-modules -RUNTIME_DEP_PKGS_CSWgtk2 += CSWgtk2-engines RUNTIME_DEP_PKGS_CSWgtk2 += CSWgtk2-printbackends-papi RUNTIME_DEP_PKGS_CSWgtk2 += CSWgtk2-printbackends-file RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibgailutil18 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Dec 17 14:19:46 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 17 Dec 2011 13:19:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[16548] csw/mgar/pkg/freetds/trunk/Makefile Message-ID: Revision: 16548 http://gar.svn.sourceforge.net/gar/?rev=16548&view=rev Author: dmichelsen Date: 2011-12-17 13:19:46 +0000 (Sat, 17 Dec 2011) Log Message: ----------- freetds/trunk: Depend on libiconv to make libs self-sufficient Modified Paths: -------------- csw/mgar/pkg/freetds/trunk/Makefile Modified: csw/mgar/pkg/freetds/trunk/Makefile =================================================================== --- csw/mgar/pkg/freetds/trunk/Makefile 2011-12-17 12:26:10 UTC (rev 16547) +++ csw/mgar/pkg/freetds/trunk/Makefile 2011-12-17 13:19:46 UTC (rev 16548) @@ -32,15 +32,18 @@ PACKAGES += CSWlibct4 SPKG_DESC_CSWlibct4 = FreeTDS library, libct.so.4 PKGFILES_CSWlibct4 += $(call pkgfiles_lib,libct.so.4) +RUNTIME_DEP_PKGS_CSWlibct4 += CSWlibiconv2 PACKAGES += CSWlibsybdb5 SPKG_DESC_CSWlibsybdb5 += FreeTDS library, libsybdb.so.5 PKGFILES_CSWlibsybdb5 += $(call pkgfiles_lib,libsybdb.so.5) +RUNTIME_DEP_PKGS_CSWlibsybdb5 += CSWlibiconv2 PACKAGES += CSWlibtdsodbc0 SPKG_DESC_CSWlibtdsodbc0 = FreeTDS library, libtdsodbc.so.0 PKGFILES_CSWlibtdsodbc0 += $(call pkgfiles_lib,libtdsodbc.so.0) RUNTIME_DEP_PKGS_CSWlibtdsodbc0 += CSWlibodbcinst2 +RUNTIME_DEP_PKGS_CSWlibtdsodbc0 += CSWlibiconv2 PACKAGES += CSWfreetds-dev SPKG_DESC_CSWfreetds-dev = Development files for libct.so.4, libsybdb.so.5 and libtdsodbc.so.0 @@ -54,6 +57,9 @@ # There are lots of examples which would need careful adjustment, contributions welcome! CHECKPKG_OVERRIDES_CSWfreetds-dev += file-with-bad-content +# Make sure library is self-sufficient +EXTRA_LINKER_FLAGS = -liconv + BUILD64 = 1 # Testsuite needs a running Sybase/SQLServer database This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sat Dec 17 15:02:43 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 17 Dec 2011 14:02:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[16549] csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile Message-ID: Revision: 16549 http://gar.svn.sourceforge.net/gar/?rev=16549&view=rev Author: guengel Date: 2011-12-17 14:02:43 +0000 (Sat, 17 Dec 2011) Log Message: ----------- gtk2/branches/2.24-raos: Install files needed by 64bit libraries. Modified Paths: -------------- csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile Property Changed: ---------------- csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile Modified: csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile =================================================================== --- csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile 2011-12-17 13:19:46 UTC (rev 16548) +++ csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile 2011-12-17 14:02:43 UTC (rev 16549) @@ -1,3 +1,5 @@ +# $Id$ +# # Note 1: 32/64bit builds # ------ # @@ -353,6 +355,8 @@ include gar/category.mk post-merge: + ginstall -d $(PKGROOT)$(sysconfdir)/64/gtk-2.0 + ginstall $(PKGROOT)$(sysconfdir)/gtk-2.0/im-multipress.conf $(PKGROOT)$(sysconfdir)/64/gtk-2.0/ gsed -i -e 's|/usr/share/|$(sharedstatedir)/|g' \ -e 's|/usr/lib|$(libdir)|g' \ -e 's|/usr/include|$(includedir)|g' `find $(PKGROOT)$(sharedstatedir)/gtk-doc -type f` Property changes on: csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Dec 17 15:45:26 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 17 Dec 2011 14:45:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[16550] csw/mgar/pkg/sqsh/trunk/Makefile Message-ID: Revision: 16550 http://gar.svn.sourceforge.net/gar/?rev=16550&view=rev Author: dmichelsen Date: 2011-12-17 14:45:26 +0000 (Sat, 17 Dec 2011) Log Message: ----------- sqsh/trunk: Add Solaris 10 and 64 bit Modified Paths: -------------- csw/mgar/pkg/sqsh/trunk/Makefile Modified: csw/mgar/pkg/sqsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/sqsh/trunk/Makefile 2011-12-17 14:02:43 UTC (rev 16549) +++ csw/mgar/pkg/sqsh/trunk/Makefile 2011-12-17 14:45:26 UTC (rev 16550) @@ -40,32 +40,55 @@ MODULATIONS_DBDRIVER += freetds # I just don't have Sybase i386 32 bit -SKIP_MODULATIONS = isa-i386-dbdriver-ocs +SKIP_MODULATIONS += isa-i386-dbdriver-ocs +SKIP_MODULATIONS += isa-pentium_pro-dbdriver-ocs PACKAGES += CSWsqsh-ocs SPKG_DESC_CSWsqsh-ocs = $(DESCRIPTION) (Linked against Sybase OCS) PKGFILES_CSWsqsh-ocs += $(call baseisadirs,$(bindir),sqsh-ocs) PKGFILES_CSWsqsh-ocs += $(sysconfdir)/.*-ocs.* -RUNTIME_DEP_PKGS_CSWsqsh-ocs += CSWfreetds RUNTIME_DEP_PKGS_CSWsqsh-ocs += CSWlibreadline6 # This is for libintl.so which is provided by Sybase and should be used from there, # it is not to be taken from the development package CSWggettext-dev CHECKPKG_OVERRIDES_CSWsqsh-ocs += missing-dependency|CSWggettext-dev # The Sybase package can not be released due to license restrictions -CHECKPKG_OVERRIDES_CSWsqsh-ocs += soname-not-found|libcomn.so|is|needed|by|opt/csw/bin/sqsh-ocs -CHECKPKG_OVERRIDES_CSWsqsh-ocs += soname-not-found|libtcl.so|is|needed|by|opt/csw/bin/sqsh-ocs -CHECKPKG_OVERRIDES_CSWsqsh-ocs += soname-not-found|libcs.so|is|needed|by|opt/csw/bin/sqsh-ocs +CHECKPKG_OVERRIDES_CSWsqsh-ocs += soname-not-found|libsybct64.so|is|needed|by|opt/csw/bin/amd64/sqsh-ocs +CHECKPKG_OVERRIDES_CSWsqsh-ocs += soname-not-found|libsybblk64.so|is|needed|by|opt/csw/bin/amd64/sqsh-ocs +CHECKPKG_OVERRIDES_CSWsqsh-ocs += soname-not-found|libsybcomn64.so|is|needed|by|opt/csw/bin/amd64/sqsh-ocs +CHECKPKG_OVERRIDES_CSWsqsh-ocs += soname-not-found|libsybcs64.so|is|needed|by|opt/csw/bin/amd64/sqsh-ocs +CHECKPKG_OVERRIDES_CSWsqsh-ocs += soname-not-found|libsybintl64.so|is|needed|by|opt/csw/bin/amd64/sqsh-ocs +CHECKPKG_OVERRIDES_CSWsqsh-ocs += soname-not-found|libsybtcl64.so|is|needed|by|opt/csw/bin/amd64/sqsh-ocs +CHECKPKG_OVERRIDES_CSWsqsh-ocs += soname-not-found|libsybcomn64.so|is|needed|by|opt/csw/bin/sparcv9/sqsh-ocs +CHECKPKG_OVERRIDES_CSWsqsh-ocs += soname-not-found|libsybtcl64.so|is|needed|by|opt/csw/bin/sparcv9/sqsh-ocs +CHECKPKG_OVERRIDES_CSWsqsh-ocs += soname-not-found|libsybtcl.so|is|needed|by|opt/csw/bin/sparcv8plus/sqsh-ocs +CHECKPKG_OVERRIDES_CSWsqsh-ocs += soname-not-found|libsybcs64.so|is|needed|by|opt/csw/bin/sparcv9/sqsh-ocs +CHECKPKG_OVERRIDES_CSWsqsh-ocs += soname-not-found|libsybblk64.so|is|needed|by|opt/csw/bin/sparcv9/sqsh-ocs +CHECKPKG_OVERRIDES_CSWsqsh-ocs += soname-not-found|libsybcs.so|is|needed|by|opt/csw/bin/sparcv8plus/sqsh-ocs +CHECKPKG_OVERRIDES_CSWsqsh-ocs += soname-not-found|libsybct64.so|is|needed|by|opt/csw/bin/sparcv9/sqsh-ocs +CHECKPKG_OVERRIDES_CSWsqsh-ocs += soname-not-found|libsybct.so|is|needed|by|opt/csw/bin/sparcv8plus/sqsh-ocs +CHECKPKG_OVERRIDES_CSWsqsh-ocs += soname-not-found|libsybblk.so|is|needed|by|opt/csw/bin/sparcv8plus/sqsh-ocs +CHECKPKG_OVERRIDES_CSWsqsh-ocs += soname-not-found|libsybcomn.so|is|needed|by|opt/csw/bin/sparcv8plus/sqsh-ocs +CHECKPKG_OVERRIDES_CSWsqsh-ocs += soname-not-found|libsybintl.so|is|needed|by|opt/csw/bin/sparcv8plus/sqsh-ocs +CHECKPKG_OVERRIDES_CSWsqsh-ocs += soname-not-found|libsybintl64.so|is|needed|by|opt/csw/bin/sparcv9/sqsh-ocs # This is for /usr/local/lib/sqsh/help, this is not in the distribution, don't know where to find that, ignore for now. -CHECKPKG_OVERRIDES_CSWsqsh-ocs += file-with-bad-content|/usr/local|root/opt/csw/bin/sqsh-ocs +CHECKPKG_OVERRIDES_CSWsqsh-ocs += file-with-bad-content|/usr/local|root/opt/csw/bin/amd64/sqsh-ocs +CHECKPKG_OVERRIDES_CSWsqsh-ocs += file-with-bad-content|/usr/local|root/opt/csw/bin/sparcv9/sqsh-ocs +CHECKPKG_OVERRIDES_CSWsqsh-ocs += file-with-bad-content|/usr/local|root/opt/csw/bin/sparcv8plus/sqsh-ocs PACKAGES += CSWsqsh-freetds SPKG_DESC_CSWsqsh-freetds = $(DESCRIPTION) (Linked against FreeTDS) # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWsqsh-freetds += CSWfreetds +RUNTIME_DEP_PKGS_CSWsqsh-freetds += CSWlibct4 RUNTIME_DEP_PKGS_CSWsqsh-freetds += CSWlibreadline6 -# This is for /usr/local/lib/sqsh/help, this is not in the distribution, don't know where to find that, ignore for now. -CHECKPKG_OVERRIDES_CSWsqsh-freetds += file-with-bad-content|/usr/local|root/opt/csw/bin/sqsh-freetds +# This is for /usr/local/lib/sqsh/help in sqsh, this is not in the distribution, don't know where to find that, ignore for now. +CHECKPKG_OVERRIDES_CSWsqsh-freetds += file-with-bad-content|/usr/local|root/opt/csw/bin/amd64/sqsh-freetds +CHECKPKG_OVERRIDES_CSWsqsh-freetds += file-with-bad-content|/usr/local|root/opt/csw/bin/pentium_pro/sqsh-freetds +CHECKPKG_OVERRIDES_CSWsqsh-freetds += file-with-bad-content|/usr/local|root/opt/csw/bin/sparcv9/sqsh-freetds +CHECKPKG_OVERRIDES_CSWsqsh-freetds += file-with-bad-content|/usr/local|root/opt/csw/bin/sparcv8plus/sqsh-freetds +ARGS-32 = +ARGS-64 = -m64 + # Only the staticlibtds is searched by default, change to shared lib REINPLACEMENTS += libtds-a REINPLACE_MATCH_libtds-a = libtds.a @@ -77,10 +100,21 @@ REINPLACE_WITH_libtds-l = -lct REINPLACE_FILES_libtds-l += configure -SYBASE_ocs = /opt/csw/sybase/OCS-12_5 -SYBASE_freetds = /opt/csw -SYBASE = $(SYBASE_$(DBDRIVER)) +REINPLACEMENTS += linker +REINPLACE_MATCH_linker = LDFLAGS\s*=\s*(.*) +REINPLACE_WITH_linker = LDFLAGS = $(LDFLAGS) $$1 +REINPLACE_FILES_linker = src/Makefile.in +SYBASE_ocs-5.9-32 = /opt/csw/sybase/OCS-12_5 +SYBASE_ocs-5.9-64 = +SYBASE_ocs-5.10-32 = /opt/csw/sybase/OCS-15_0 +SYBASE_ocs-5.10-64 = /opt/csw/sybase64/OCS-15_0 +SYBASE_freetds-5.9-32 = /opt/csw +SYBASE_freetds-5.9-64 = /opt/csw +SYBASE_freetds-5.10-32 = /opt/csw +SYBASE_freetds-5.10-64 = /opt/csw +SYBASE = $(SYBASE_$(DBDRIVER)-$(GAROSREL)-$(MEMORYMODEL)) + NOISALIST = 1 EXTRA_LIB = $(SYBASE)/lib @@ -88,6 +122,10 @@ CONFIGURE_ENV_INCDIRS = $(includedir) CONFIGURE_ENV_LIBDIRS = $(SYBASE)/lib:$(libdir) +BUILD64-5.10 = 1 +BUILD64 = $(BUILD64-$(GAROSREL)) +ISAEXEC = 1 + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-shared --disable-nls CONFIGURE_ARGS += --with-readline @@ -96,8 +134,12 @@ TEST_SCRIPTS = MERGE_SCRIPTS_isa-default-dbdriver-ocs = copy-all -MERGE_SCRIPTS_isa-default-dbdriver-freetds = copy-only -MERGE_DIRS_isa-default-dbdriver-freetds = $(DBDSYBASEDIR) +MERGE_SCRIPTS_isa-extra-dbdriver-ocs = copy-relocated-only +MERGE_DIRS_isa-extra-dbdriver-ocs = $(bindir) +MERGE_SCRIPTS_isa-default-dbdriver-freetds = copy-relocated-only +MERGE_DIRS_isa-default-dbdriver-freetds = $(bindir) +MERGE_SCRIPTS_isa-extra-dbdriver-freetds = copy-relocated-only +MERGE_DIRS_isa-extra-dbdriver-freetds = $(bindir) EXTRA_PAX_ARGS = -s ",/sqsh$$,/sqsh-$(DBDRIVER),p" EXTRA_PAX_ARGS += -s ",/sqshrc$$,/sqshrc-$(DBDRIVER).CSW,p" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sat Dec 17 17:07:26 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 17 Dec 2011 16:07:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[16551] csw/mgar/pkg/gdk-pixbuf/trunk/files/ CSWgdkpixbuf-loaders.postinstall Message-ID: Revision: 16551 http://gar.svn.sourceforge.net/gar/?rev=16551&view=rev Author: guengel Date: 2011-12-17 16:07:25 +0000 (Sat, 17 Dec 2011) Log Message: ----------- gdk-pixbuf/trunk: Improved postinstall script. Modified Paths: -------------- csw/mgar/pkg/gdk-pixbuf/trunk/files/CSWgdkpixbuf-loaders.postinstall Modified: csw/mgar/pkg/gdk-pixbuf/trunk/files/CSWgdkpixbuf-loaders.postinstall =================================================================== --- csw/mgar/pkg/gdk-pixbuf/trunk/files/CSWgdkpixbuf-loaders.postinstall 2011-12-17 14:45:26 UTC (rev 16550) +++ csw/mgar/pkg/gdk-pixbuf/trunk/files/CSWgdkpixbuf-loaders.postinstall 2011-12-17 16:07:25 UTC (rev 16551) @@ -2,36 +2,55 @@ # # We will call gdk-pixbuf-query-loaders for all ISAs +umask 0022 + + GDKPBQUERY=gdk-pixbuf-query-loaders GDKPBQUERY_OPTS="--update-cache" -echo "** Updating GDK pixbuf loaders" +if [ "${PKG_ROOT_DIR}" = "" ] +then + PKG_ROOT_DIR=/ +fi -# But first, do the obvious -/usr/bin/printf "- Default ISA... " - at prefix@/bin/${GDKPBQUERY} ${GDKPBQUERY_OPTS} >/dev/null 2>&1 -if [ $? -ne 0 ] +if [ -z "${PKGINST}" ] then - echo "Error" -else - echo "OK" + PKGINST=CSWgdkpixbuf-loaders fi -# Now, do all other -for i in @BUILD_ISAS@ +echo "** Updating GDK pixbuf loaders" + +for i in @NEEDED_ISAS@ do - queryloader=@prefix@/bin/$i/gdk-pixbuf-query-loaders - if [ -x "${queryloader}" ] + # The default ISA is removed + isa="`echo $i | /usr/bin/sed -e 's|@ISA_DEFAULT@||g'`" + queryloader=@prefix@/bin/${isa}/gdk-pixbuf-query-loaders + if [ -x "${PKG_ROOT_DIR}${queryloader}" ] then - /usr/bin/printf "- $i ISA... " - "${queryloader}" ${GDKPBQUERY_OPTS} >/dev/null 2>&1 + if [ -z "${isa}" ] + then + /usr/bin/printf "- Default ISA... " + else + /usr/bin/printf "- ${isa} ISA... " + fi + + # Figure out the directory where loaders.cache is stored + loaders_dir="`${queryloader} | /usr/bin/awk '/LoaderDir/ { print $4 }'`" + loaders_cache_dir="`/usr/bin/dirname "${loaders_dir} + # Now we got the file + loaders_cache_file="${loaders_cache_dir}/loaders.cache" + + /usr/sbin/chroot "${PKG_ROOT_DIR}" "${queryloader}" ${GDKPBQUERY_OPTS} >/dev/null 2>&1 if [ $? -ne 0 ] then echo "Error" else + /usr/sbin/chroot "${PKG_ROOT_DIR}" /usr/sbin/installf ${PKGINST} ${loaders_cache_file} f 0644 root bin echo "OK" fi fi done +/usr/sbin/chroot "${PKG_ROOT_DIR}" /usr/sbin/installf -f ${PKGINST} + echo "** Done updating GDK pixbuf loaders" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sat Dec 17 17:48:31 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 17 Dec 2011 16:48:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[16552] csw/mgar/pkg/gtk2/branches/2.24-raos/files Message-ID: Revision: 16552 http://gar.svn.sourceforge.net/gar/?rev=16552&view=rev Author: guengel Date: 2011-12-17 16:48:30 +0000 (Sat, 17 Dec 2011) Log Message: ----------- gtk2/branches/2.24-raos: Improved postinstall. Modified Paths: -------------- csw/mgar/pkg/gtk2/branches/2.24-raos/files/CSWgtk2.postinstall Added Paths: ----------- csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Add-update-modules-cmd-line-option.patch Removed Paths: ------------- csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Add-update-modules-cmd-line-option.patch Deleted: csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Add-update-modules-cmd-line-option.patch =================================================================== --- csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Add-update-modules-cmd-line-option.patch 2011-12-17 16:07:25 UTC (rev 16551) +++ csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Add-update-modules-cmd-line-option.patch 2011-12-17 16:48:30 UTC (rev 16552) @@ -1,82 +0,0 @@ -From c6d567e18c04b779d3d7b587b903c2cbf4d392e5 Mon Sep 17 00:00:00 2001 -From: Rafael Ostertag -Date: Sat, 17 Dec 2011 10:12:38 +0100 -Subject: [PATCH] Add --update-modules cmd line option - ---- - gtk/queryimmodules.c | 42 +++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 41 insertions(+), 1 deletions(-) - -diff --git a/gtk/queryimmodules.c b/gtk/queryimmodules.c -index 5369c7f..8287790 100644 ---- a/gtk/queryimmodules.c -+++ b/gtk/queryimmodules.c -@@ -23,6 +23,7 @@ - - #include - #include -+#include - #include - - #include -@@ -30,6 +31,8 @@ - #ifdef HAVE_UNISTD_H - #include - #endif -+#include -+#include - - #ifdef USE_LA_MODULES - #define SOEXT ".la" -@@ -164,10 +167,47 @@ query_module (const char *dir, const char *name) - int main (int argc, char **argv) - { - char *cwd; -- int i; -+ int i, fd, retval; - char *path; -+ char *gtk_immodules; - gboolean error = FALSE; - -+ /* -+ * Quick an dirty hack. -+ * -+ * This will allow us to create the gtk.immodules in the default -+ * place by providing `--update-modules' as cmd line argument, -+ * without worrying where this might be when calling -+ * gtk-query-immodules-2.0 from a postinstall script. -+ * -+ * The basic idea is to redirect STDOUT to the default file and then -+ * let the normal flow of the program continue like there was no cmd -+ * line argument. Be aware, that this only works when no other cmd -+ * line options were passed. -+ */ -+ if ( argc == 2 && strcmp("--update-modules", argv[1]) == 0 ) -+ { -+ gtk_immodules = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL); -+ fd = g_open(gtk_immodules, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); -+ if ( fd == -1 ) -+ { -+ g_fprintf(stderr, "Cannot open %s.\n", gtk_immodules); -+ exit(1); -+ } -+ -+ if ( dup2(fd, STDOUT_FILENO) == -1 ) -+ { -+ g_fprintf(stderr, "Unable to redirect STDOUT.\n"); -+ exit(1); -+ } -+ -+ /* -+ * cheat, to make it think there are no arguments given -+ */ -+ argc = 1; -+ } -+ -+ - g_printf ("# GTK+ Input Method Modules file\n" - "# Automatically generated file, do not edit\n" - "# Created by %s from gtk+-%d.%d.%d\n" --- -1.7.6.1 - Added: csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Add-update-modules-cmd-line-option.patch =================================================================== --- csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Add-update-modules-cmd-line-option.patch (rev 0) +++ csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Add-update-modules-cmd-line-option.patch 2011-12-17 16:48:30 UTC (rev 16552) @@ -0,0 +1,96 @@ +From 1ae7e710bce003ff900de41947f8ae5e57fc6409 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sat, 17 Dec 2011 16:54:29 +0100 +Subject: [PATCH] Add --update-modules cmd line option + +--- + gtk/queryimmodules.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++--- + 1 files changed, 49 insertions(+), 4 deletions(-) + +diff --git a/gtk/queryimmodules.c b/gtk/queryimmodules.c +index 5369c7f..223e8ee 100644 +--- a/gtk/queryimmodules.c ++++ b/gtk/queryimmodules.c +@@ -23,6 +23,7 @@ + + #include + #include ++#include + #include + + #include +@@ -30,6 +31,8 @@ + #ifdef HAVE_UNISTD_H + #include + #endif ++#include ++#include + + #ifdef USE_LA_MODULES + #define SOEXT ".la" +@@ -164,16 +167,58 @@ query_module (const char *dir, const char *name) + int main (int argc, char **argv) + { + char *cwd; +- int i; ++ int i, fd, retval; + char *path; ++ char *gtk_immodules; + gboolean error = FALSE; + ++ /* ++ * Quick an dirty hack. ++ * ++ * This will allow us to create the gtk.immodules in the default ++ * place by providing `--update-modules' as cmd line argument, ++ * without worrying where this might be when calling ++ * gtk-query-immodules-2.0 from a postinstall script. ++ * ++ * The basic idea is to redirect STDOUT to the default file and then ++ * let the normal flow of the program continue like there was no cmd ++ * line argument. Be aware, that this only works when no other cmd ++ * line options were passed. ++ */ ++ if ( argc == 2 && strcmp("--update-modules", argv[1]) == 0 ) ++ { ++ gtk_immodules = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL); ++ fd = g_open(gtk_immodules, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); ++ if ( fd == -1 ) ++ { ++ g_fprintf(stderr, "Cannot open %s.\n", gtk_immodules); ++ exit(1); ++ } ++ ++ if ( dup2(fd, STDOUT_FILENO) == -1 ) ++ { ++ g_fprintf(stderr, "Unable to redirect STDOUT.\n"); ++ exit(1); ++ } ++ ++ /* ++ * cheat, to make it think there are no arguments given ++ */ ++ argc = 1; ++ } ++ ++ + g_printf ("# GTK+ Input Method Modules file\n" + "# Automatically generated file, do not edit\n" +- "# Created by %s from gtk+-%d.%d.%d\n" +- "#\n", ++ "# Created by %s from gtk+-%d.%d.%d (OpenCSW Patch)\n" ++ "#\n" ++ "#\n" ++ "# DefaultFile = %s\n" ++ "# DefaultDir = %s\n", + argv[0], +- GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); ++ GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION, ++ g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL), ++ g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", NULL)); + + + if (argc == 1) /* No arguments given */ +-- +1.7.6.1 + Modified: csw/mgar/pkg/gtk2/branches/2.24-raos/files/CSWgtk2.postinstall =================================================================== --- csw/mgar/pkg/gtk2/branches/2.24-raos/files/CSWgtk2.postinstall 2011-12-17 16:07:25 UTC (rev 16551) +++ csw/mgar/pkg/gtk2/branches/2.24-raos/files/CSWgtk2.postinstall 2011-12-17 16:48:30 UTC (rev 16552) @@ -4,19 +4,35 @@ BIN=gtk-update-icon-cache +if [ "${PKG_ROOT_DIR}" = "" ] +then + PKG_ROOT_DIR=/ +fi +if [ -z "${PKGINST}" ] +then + PKGINST=CSWgtk2 +fi + echo "** Updating Icon cache" -for i in @datadir@/icons/* +for i in ${PKG_ROOT_DIR}@datadir@/icons/* do if [ -d "${i}" ] then /usr/bin/printf "- ${i}... " - @bindir@/${BIN} ${i} >/dev/null 2>&1 + /usr/sbin/chroot "${PKG_ROOT_DIR}" @bindir@/${BIN} ${i} >/dev/null 2>&1 if [ $? -ne 0 ] then echo "Error" else + # Directories with no icons in them do not raise an error, + # so we have to check whether the file has been actually + # created. + if [ -f "${i}/icon-theme.cache" ] + then + /usr/sbin/chroot "${PKG_ROOT_DIR}" /usr/sbin/installf ${PKGINST} ${i}/icon-theme.cache f 0644 root bin + fi echo "OK" fi fi @@ -29,31 +45,36 @@ echo "** Querying IM Modules" -# But first, do the obvious -/usr/bin/printf "- Default ISA... " - at prefix@/bin/${BIN} ${BIN_OPTS} >/dev/null 2>&1 -if [ $? -ne 0 ] -then - echo "Error" -else - echo "OK" -fi - # Now, do all other for i in @NEEDED_ISAS@ do - ISABIN=@prefix@/bin/$i/${BIN} + # The default ISA is removed + isa="`echo $i | /usr/bin/sed -e 's|@ISA_DEFAULT@||g'`" + ISABIN=@prefix@/bin/${isa}/${BIN} if [ -x "${ISABIN}" ] then - /usr/bin/printf "- $i ISA... " - "${ISABIN}" ${BIN_OPTS} >/dev/null 2>&1 + if [ -z "${isa}" ] + then + /usr/bin/printf "- Default ISA... " + else + /usr/bin/printf "- ${isa} ISA... " + fi + + # Figure out the default file path (binary has to be patched for this) + gtk_immodules="`${ISABIN} | /usr/bin/awk '/DefaultFile =/ { print $4 }`" + + + /usr/sbin/chroot "${PKG_ROOT_DIR}" "${ISABIN}" ${BIN_OPTS} >/dev/null 2>&1 if [ $? -ne 0 ] then echo "Error" else + /usr/sbin/chroot "${PKG_ROOT_DIR}" /usr/sbin/installf ${PKGINST} ${gtk_immodules} f 0644 root bin echo "OK" fi fi done +/usr/sbin/chroot "${PKG_ROOT_DIR}" /usr/sbin/installf -f ${PKGINST} + echo "** Done querying IM Modules" \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sat Dec 17 17:49:48 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 17 Dec 2011 16:49:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[16553] csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile Message-ID: Revision: 16553 http://gar.svn.sourceforge.net/gar/?rev=16553&view=rev Author: guengel Date: 2011-12-17 16:49:48 +0000 (Sat, 17 Dec 2011) Log Message: ----------- gtk2/branches/2.24-raos: Renamed -dev package. Obsoleted CSWgtk2devl. Modified Paths: -------------- csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile Modified: csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile =================================================================== --- csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile 2011-12-17 16:48:30 UTC (rev 16552) +++ csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile 2011-12-17 16:49:48 UTC (rev 16553) @@ -54,8 +54,6 @@ # This patch adds a command line option `--update-modules` to # gtk-query-immodules-2.0 which has the default location of # gtk.immodules hardcoded and takes 32/64bit ISAs into account. -# -# It goes together with the above patch. PATCHFILES += 0000-Add-update-modules-cmd-line-option.patch PATCHFILES += 0000-Adjust-hardcoded-path-to-opt-csw-share.patch @@ -275,35 +273,37 @@ RUNTIME_DEP_PKGS_CSWlibgtk-x112-0-0 += CSWpango -PACKAGES += CSWgtk2-dev -SPKG_DESC_CSWgtk2-dev = $(DESCRIPTION), Development files -PKGFILES_CSWgtk2-dev = $(PKGFILES_DEVEL) -PKGFILES_CSWgtk2-dev += .*/share/gtk-2.0/demo/.* +PACKAGES += CSWlibgtk2-dev +SPKG_DESC_CSWlibgtk2-dev = $(DESCRIPTION), Development files +PKGFILES_CSWlibgtk2-dev = $(PKGFILES_DEVEL) +PKGFILES_CSWlibgtk2-dev += .*/share/gtk-2.0/demo/.* # Use this to pick up files in lib/gtk-2.0/include -PKGFILES_CSWgtk2-dev += .*/include/.*\.h -PKGFILES_CSWgtk2-dev += .*/gtk-demo -PKGFILES_CSWgtk2-dev += .*/gtk-builder-convert -RUNTIME_DEP_PKGS_CSWgtk2-dev = CSWlibgdk-x112-0-0 +PKGFILES_CSWlibgtk2-dev += .*/include/.*\.h +PKGFILES_CSWlibgtk2-dev += .*/gtk-demo +PKGFILES_CSWlibgtk2-dev += .*/gtk-builder-convert +RUNTIME_DEP_PKGS_CSWlibgtk2-dev = CSWlibgdk-x112-0-0 # I pull the whole gdk pixbuf to make sure gdk-pixbuf-query-loaders # will be called as well -RUNTIME_DEP_PKGS_CSWgtk2-dev += CSWgdkpixbuf -RUNTIME_DEP_PKGS_CSWgtk2-dev += CSWfconfig -RUNTIME_DEP_PKGS_CSWgtk2-dev += CSWftype2 -RUNTIME_DEP_PKGS_CSWgtk2-dev += CSWlibatk1-0-0 -RUNTIME_DEP_PKGS_CSWgtk2-dev += CSWlibcairo2 -RUNTIME_DEP_PKGS_CSWgtk2-dev += CSWlibexpat1 -RUNTIME_DEP_PKGS_CSWgtk2-dev += CSWlibgio2-0-0 -RUNTIME_DEP_PKGS_CSWgtk2-dev += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWgtk2-dev += CSWlibgmodule2-0-0 -RUNTIME_DEP_PKGS_CSWgtk2-dev += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWgtk2-dev += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWgtk2-dev += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWgtk2-dev += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWgtk2-dev += CSWlibpixman1-0 -RUNTIME_DEP_PKGS_CSWgtk2-dev += CSWlibpng12-0 -RUNTIME_DEP_PKGS_CSWgtk2-dev += CSWlibxrender -RUNTIME_DEP_PKGS_CSWgtk2-dev += CSWlibz1 -RUNTIME_DEP_PKGS_CSWgtk2-dev += CSWpango +RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWgdkpixbuf +RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWftype2 +RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibpixman1-0 +RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibxrender +RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWpango +OBSOLETED_BY_CSWlibgtk2-dev = CSWgtk2devel +CATALOGNAME_CSWgtk2devel = gtk2_devel_sub PACKAGES += CSWgtk2-doc This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sat Dec 17 21:21:43 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 17 Dec 2011 20:21:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[16554] csw/mgar/pkg/gdk-pixbuf/trunk Message-ID: Revision: 16554 http://gar.svn.sourceforge.net/gar/?rev=16554&view=rev Author: guengel Date: 2011-12-17 20:21:43 +0000 (Sat, 17 Dec 2011) Log Message: ----------- gdk-pixbuf/trunk: Got rid of CSWgdkpixbuf-loaders (merged into CSWgdkpixbuf). Modified Paths: -------------- csw/mgar/pkg/gdk-pixbuf/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/gdk-pixbuf/trunk/files/CSWgdkpixbuf.postinstall Removed Paths: ------------- csw/mgar/pkg/gdk-pixbuf/trunk/files/CSWgdkpixbuf-loaders.postinstall Modified: csw/mgar/pkg/gdk-pixbuf/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdk-pixbuf/trunk/Makefile 2011-12-17 16:49:48 UTC (rev 16553) +++ csw/mgar/pkg/gdk-pixbuf/trunk/Makefile 2011-12-17 20:21:43 UTC (rev 16554) @@ -18,7 +18,7 @@ # A simple test with emacs-gtk and gftp does not indicate that # installing gdk-pixbuf over an existing gtk 2.18 installation does # break anything. -CHECKPKG_OVERRIDES_CSWgdkpixbuf-loaders += file-collision|/opt/csw/bin/gdk-pixbuf-query-loaders|CSWgdkpixbuf-loaders|CSWgtk2 +CHECKPKG_OVERRIDES_CSWgdkpixbuf += file-collision|/opt/csw/bin/gdk-pixbuf-query-loaders|CSWgdkpixbuf|CSWgtk2 CHECKPKG_OVERRIDES_CSWgdkpixbuf += file-collision|/opt/csw/bin/gdk-pixbuf-csource|CSWgdkpixbuf|CSWgtk2 CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-query-loaders.html|CSWgdkpixbuf-doc|CSWgtk2doc CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/GdkPixbufLoader.html|CSWgdkpixbuf-doc|CSWgtk2doc @@ -74,9 +74,9 @@ MASTER_SITES = $(GNOME_MIRROR) DISTFILES = $(DISTNAME).tar.xz -DISTFILES += CSWgdkpixbuf-loaders.postinstall +DISTFILES += CSWgdkpixbuf.postinstall -EXPANDVARS = CSWgdkpixbuf-loaders.postinstall +EXPANDVARS = CSWgdkpixbuf.postinstall PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 @@ -86,7 +86,6 @@ SPKG_DESC_CSWgdkpixbuf = $(DESCRIPTION) RUNTIME_DEP_PKGS_CSWgdkpixbuf = CSWlibgdk-pixbuf2-0-0 RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgdk-pixbuf-xlib2-0-0 -RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWgdkpixbuf-loaders RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgmodule2-0-0 @@ -94,10 +93,11 @@ RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgthread2-0-0 RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibintl8 RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibtiff3 # I assume if one installs CSWgdkpixbuf, one wants all the stuff # except -dev CHECKPKG_OVERRIDES_CSWgdkpixbuf += surplus-dependency|CSWlibgdk-pixbuf-xlib2-0-0 -CHECKPKG_OVERRIDES_CSWgdkpixbuf += surplus-dependency|CSWgdkpixbuf-loaders CHECKPKG_OVERRIDES_CSWgdkpixbuf += catalogname-does-not-match-pkgname|pkgname=CSWgdkpixbuf|catalogname=gdk_pixbuf|expected-catalogname=gdkpixbuf PACKAGES += CSWgdkpixbuf-doc @@ -131,24 +131,6 @@ RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibpng12-0 -PACKAGES += CSWgdkpixbuf-loaders -# To retain backwards compatibility with gdk pixbuf package 0.22 -CATALOGNAME_CSWgdkpixbuf-loaders = gdk_pixbuf_loaders -SPKG_DESC_CSWgdkpixbuf-loaders = $(DESCRIPTION), loader modules -PKGFILES_CSWgdkpixbuf-loaders = .*/loaders/.*\.so -PKGFILES_CSWgdkpixbuf-loaders += .*/gdk-pixbuf-query-loaders -RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders = CSWlibgdk-pixbuf2-0-0 -RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibgio2-0-0 -RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibgmodule2-0-0 -RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibjpeg7 -RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibpng12-0 -RUNTIME_DEP_PKGS_CSWgdkpixbuf-loaders += CSWlibtiff3 -CHECKPKG_OVERRIDES_CSWgdkpixbuf-loaders += catalogname-does-not-match-pkgname|pkgname=CSWgdkpixbuf-loaders|catalogname=gdk_pixbuf_loaders|expected-catalogname=gdkpixbuf_loaders - PACKAGES += CSWlibgdk-pixbuf-dev SPKG_DESC_CSWlibgdk-pixbuf-dev = Developtment files $(DESCRIPTION) PKGFILES_CSWlibgdk-pixbuf-dev = $(PKGFILES_DEVEL) @@ -156,6 +138,8 @@ RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-dev += CSWlibgdk-pixbuf2-0-0 RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-dev += CSWlibgdk-pixbuf-xlib2-0-0 + + BUILD_DEP_PKGS = CSWggettext-dev BUILD_DEP_PKGS += CSWjbigkit BUILD_DEP_PKGS += CSWlibglib2-dev Deleted: csw/mgar/pkg/gdk-pixbuf/trunk/files/CSWgdkpixbuf-loaders.postinstall =================================================================== --- csw/mgar/pkg/gdk-pixbuf/trunk/files/CSWgdkpixbuf-loaders.postinstall 2011-12-17 16:49:48 UTC (rev 16553) +++ csw/mgar/pkg/gdk-pixbuf/trunk/files/CSWgdkpixbuf-loaders.postinstall 2011-12-17 20:21:43 UTC (rev 16554) @@ -1,56 +0,0 @@ -#!/bin/sh -# -# We will call gdk-pixbuf-query-loaders for all ISAs - -umask 0022 - - -GDKPBQUERY=gdk-pixbuf-query-loaders -GDKPBQUERY_OPTS="--update-cache" - -if [ "${PKG_ROOT_DIR}" = "" ] -then - PKG_ROOT_DIR=/ -fi - -if [ -z "${PKGINST}" ] -then - PKGINST=CSWgdkpixbuf-loaders -fi - -echo "** Updating GDK pixbuf loaders" - -for i in @NEEDED_ISAS@ -do - # The default ISA is removed - isa="`echo $i | /usr/bin/sed -e 's|@ISA_DEFAULT@||g'`" - queryloader=@prefix@/bin/${isa}/gdk-pixbuf-query-loaders - if [ -x "${PKG_ROOT_DIR}${queryloader}" ] - then - if [ -z "${isa}" ] - then - /usr/bin/printf "- Default ISA... " - else - /usr/bin/printf "- ${isa} ISA... " - fi - - # Figure out the directory where loaders.cache is stored - loaders_dir="`${queryloader} | /usr/bin/awk '/LoaderDir/ { print $4 }'`" - loaders_cache_dir="`/usr/bin/dirname "${loaders_dir} - # Now we got the file - loaders_cache_file="${loaders_cache_dir}/loaders.cache" - - /usr/sbin/chroot "${PKG_ROOT_DIR}" "${queryloader}" ${GDKPBQUERY_OPTS} >/dev/null 2>&1 - if [ $? -ne 0 ] - then - echo "Error" - else - /usr/sbin/chroot "${PKG_ROOT_DIR}" /usr/sbin/installf ${PKGINST} ${loaders_cache_file} f 0644 root bin - echo "OK" - fi - fi -done - -/usr/sbin/chroot "${PKG_ROOT_DIR}" /usr/sbin/installf -f ${PKGINST} - -echo "** Done updating GDK pixbuf loaders" Copied: csw/mgar/pkg/gdk-pixbuf/trunk/files/CSWgdkpixbuf.postinstall (from rev 16551, csw/mgar/pkg/gdk-pixbuf/trunk/files/CSWgdkpixbuf-loaders.postinstall) =================================================================== --- csw/mgar/pkg/gdk-pixbuf/trunk/files/CSWgdkpixbuf.postinstall (rev 0) +++ csw/mgar/pkg/gdk-pixbuf/trunk/files/CSWgdkpixbuf.postinstall 2011-12-17 20:21:43 UTC (rev 16554) @@ -0,0 +1,56 @@ +#!/bin/sh +# +# We will call gdk-pixbuf-query-loaders for all ISAs + +umask 0022 + + +GDKPBQUERY=gdk-pixbuf-query-loaders +GDKPBQUERY_OPTS="--update-cache" + +if [ "${PKG_ROOT_DIR}" = "" ] +then + PKG_ROOT_DIR=/ +fi + +if [ -z "${PKGINST}" ] +then + PKGINST=CSWgdkpixbuf-loaders +fi + +echo "** Updating GDK pixbuf loaders" + +for i in @NEEDED_ISAS@ +do + # The default ISA is removed + isa="`echo $i | /usr/bin/sed -e 's|@ISA_DEFAULT@||g'`" + queryloader=@prefix@/bin/${isa}/gdk-pixbuf-query-loaders + if [ -x "${PKG_ROOT_DIR}${queryloader}" ] + then + if [ -z "${isa}" ] + then + /usr/bin/printf "- Default ISA... " + else + /usr/bin/printf "- ${isa} ISA... " + fi + + # Figure out the directory where loaders.cache is stored + loaders_dir="`${queryloader} | /usr/bin/awk '/LoaderDir/ { print $4 }'`" + loaders_cache_dir="`/usr/bin/dirname "${loaders_dir} + # Now we got the file + loaders_cache_file="${loaders_cache_dir}/loaders.cache" + + /usr/sbin/chroot "${PKG_ROOT_DIR}" "${queryloader}" ${GDKPBQUERY_OPTS} >/dev/null 2>&1 + if [ $? -ne 0 ] + then + echo "Error" + else + /usr/sbin/chroot "${PKG_ROOT_DIR}" /usr/sbin/installf ${PKGINST} ${loaders_cache_file} f 0644 root bin + echo "OK" + fi + fi +done + +/usr/sbin/chroot "${PKG_ROOT_DIR}" /usr/sbin/installf -f ${PKGINST} + +echo "** Done updating GDK pixbuf loaders" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From phipsy at users.sourceforge.net Sat Dec 17 23:22:10 2011 From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net) Date: Sat, 17 Dec 2011 22:22:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[16555] csw/mgar/pkg/augeas/trunk Message-ID: Revision: 16555 http://gar.svn.sourceforge.net/gar/?rev=16555&view=rev Author: phipsy Date: 2011-12-17 22:22:10 +0000 (Sat, 17 Dec 2011) Log Message: ----------- augeas: attempts at getting it to compile. #fail Modified Paths: -------------- csw/mgar/pkg/augeas/trunk/Makefile csw/mgar/pkg/augeas/trunk/checksums Added Paths: ----------- csw/mgar/pkg/augeas/trunk/files/0001-fix-0.10.0-to-compile-on-solaris.patch csw/mgar/pkg/augeas/trunk/files/0002-second-aattempt-at-getting-it-to-build-on-solaris.patch Removed Paths: ------------- csw/mgar/pkg/augeas/trunk/files/0001-add-csw-paths-for-sudoers.patch Modified: csw/mgar/pkg/augeas/trunk/Makefile =================================================================== --- csw/mgar/pkg/augeas/trunk/Makefile 2011-12-17 20:21:43 UTC (rev 16554) +++ csw/mgar/pkg/augeas/trunk/Makefile 2011-12-17 22:22:10 UTC (rev 16555) @@ -1,5 +1,5 @@ NAME = augeas -VERSION = 0.8.1 +VERSION = 0.10.0 CATEGORIES = lib DESCRIPTION = A configuration editing tool @@ -14,11 +14,13 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz VENDOR_URL = http://augeas.net +BUILD_DEP_PKGS = CSWlibxml2-2 CSWlibxml2-dev RUNTIME_DEP_PKGS = CSWgcc4corert CSWlibgnugetopt -RUNTIME_DEP_PKGS += CSWlibreadline6 +RUNTIME_DEP_PKGS += CSWlibreadline6 CSWlibxml2-2 GARCOMPILER = GCC4 EXTRA_LDFLAGS = -lgnugetopt -PATCHFILES += 0001-add-csw-paths-for-sudoers.patch +PATCHFILES += 0001-fix-0.10.0-to-compile-on-solaris.patch +PATCHFILES += 0002-second-aattempt-at-getting-it-to-build-on-solaris.patch # Building on Solaris 10 doesn't work as it support C99 and the above fixes are # not necessary there. Modified: csw/mgar/pkg/augeas/trunk/checksums =================================================================== --- csw/mgar/pkg/augeas/trunk/checksums 2011-12-17 20:21:43 UTC (rev 16554) +++ csw/mgar/pkg/augeas/trunk/checksums 2011-12-17 22:22:10 UTC (rev 16555) @@ -3,3 +3,5 @@ a6a6a5515d7bbebe61c1e90db12eef72 augeas-0.7.0.tar.gz e425bcfc46fd5b18473a4ff47c2878d3 augeas-0.8.0.tar.gz 62d47bdc60e175f93aed3b81cb8e2785 augeas-0.8.1.tar.gz +5ef0ce53ce4c75f59ab2523506731084 augeas-0.9.0.tar.gz +fe1834e90a066c3208ac0214622c7352 augeas-0.10.0.tar.gz Deleted: csw/mgar/pkg/augeas/trunk/files/0001-add-csw-paths-for-sudoers.patch =================================================================== --- csw/mgar/pkg/augeas/trunk/files/0001-add-csw-paths-for-sudoers.patch 2011-12-17 20:21:43 UTC (rev 16554) +++ csw/mgar/pkg/augeas/trunk/files/0001-add-csw-paths-for-sudoers.patch 2011-12-17 22:22:10 UTC (rev 16555) @@ -1,25 +0,0 @@ -From 4f44644052f34452a6a5be402b964ad0da55be54 Mon Sep 17 00:00:00 2001 -From: Mark Phillips -Date: Fri, 8 Jul 2011 13:13:11 +0200 -Subject: [PATCH] add csw paths for sudoers - ---- - lenses/sudoers.aug | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/lenses/sudoers.aug b/lenses/sudoers.aug -index a108ee2..ec3764a 100644 ---- a/lenses/sudoers.aug -+++ b/lenses/sudoers.aug -@@ -493,6 +493,8 @@ let filter = (incl "/etc/sudoers") - . (incl "/usr/local/etc/sudoers") - . (incl "/etc/sudoers.d/*") - . (incl "/usr/local/etc/sudoers.d/*") -+ . (incl "/opt/csw/etc/sudoers") -+ . (incl "/etc/opt/csw/sudoers") - . Util.stdexcl - - let xfm = transform lns filter --- -1.7.6 - Added: csw/mgar/pkg/augeas/trunk/files/0001-fix-0.10.0-to-compile-on-solaris.patch =================================================================== --- csw/mgar/pkg/augeas/trunk/files/0001-fix-0.10.0-to-compile-on-solaris.patch (rev 0) +++ csw/mgar/pkg/augeas/trunk/files/0001-fix-0.10.0-to-compile-on-solaris.patch 2011-12-17 22:22:10 UTC (rev 16555) @@ -0,0 +1,25 @@ +From 025a79fcbf0c7bcb8a99e7c0444d1e4aac439200 Mon Sep 17 00:00:00 2001 +From: Mark Phillips +Date: Fri, 16 Dec 2011 14:15:23 +0100 +Subject: [PATCH] fix 0.10.0 to compile on solaris + +--- + src/regexp.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/regexp.c b/src/regexp.c +index cf0ea5d..811087d 100644 +--- a/src/regexp.c ++++ b/src/regexp.c +@@ -50,7 +50,7 @@ char *regexp_escape(const struct regexp *r) { + ret = fa_restrict_alphabet(r->pattern->str, strlen(r->pattern->str), + &nre, &nre_len, 2, 1); + if (ret == 0) { +- pat = escape(nre, nre_len); ++ pat = escape(nre, nre_len, RX_ESCAPES); + free(nre); + } + #endif +-- +1.7.6.1 + Added: csw/mgar/pkg/augeas/trunk/files/0002-second-aattempt-at-getting-it-to-build-on-solaris.patch =================================================================== --- csw/mgar/pkg/augeas/trunk/files/0002-second-aattempt-at-getting-it-to-build-on-solaris.patch (rev 0) +++ csw/mgar/pkg/augeas/trunk/files/0002-second-aattempt-at-getting-it-to-build-on-solaris.patch 2011-12-17 22:22:10 UTC (rev 16555) @@ -0,0 +1,6135 @@ +From c418d070025c9ac5de6d12a0473d0e65ba9d8b67 Mon Sep 17 00:00:00 2001 +From: Mark Phillips +Date: Fri, 16 Dec 2011 15:56:54 +0100 +Subject: [PATCH] second aattempt at getting it to build on solaris + +--- + ChangeLog | 596 ++++++++++++++++-------------- + Makefile.in | 2 + + aclocal.m4 | 452 +---------------------- + build/aux/config.guess | 858 +++++++++++++++++++++++------------------- + build/aux/config.sub | 347 ++++++++++++++---- + config.h.in | 12 + + configure | 181 +++++++++- + doc/Makefile.in | 2 + + doc/naturaldocs/Makefile.in | 2 + + examples/Makefile.in | 2 + + gnulib/lib/Makefile.am | 20 +- + gnulib/lib/Makefile.in | 27 +- + gnulib/m4/gnulib-comp.m4 | 22 ++ + gnulib/tests/Makefile.am | 16 + + gnulib/tests/Makefile.in | 118 ++++--- + gnulib/tests/test-readlink.h | 2 +- + man/Makefile.in | 2 + + man/augparse.1 | 2 +- + src/Makefile.in | 2 + + tests/Makefile.in | 2 + + 20 files changed, 1418 insertions(+), 1249 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index a7764d4..e93e7a5 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,7 @@ ++2011-12-02 David Lutterkort ++ ++ Version 0.10.0 ++ + 2011-12-02 Dominic Cleal + + Implement escape sequences for whitespace, quotes and square brackets in command arguments to match Puppet provider. +@@ -19,7 +23,7 @@ + + Add documentation to test_aliases.aug + +-2011-12-01 David Lutterkort ++2011-12-02 David Lutterkort + + * src/augtool.c (print_aug_error): print newline after error details + +@@ -56,6 +60,8 @@ + * src/augtool.c: call aug_init with AUG_NO_ERR_CLOSE and print errors on + initialization failure + ++2011-12-01 David Lutterkort ++ + Update documentation for augtool/augrun and man page + + Adjust more copyright notices +@@ -115,32 +121,32 @@ + + Better integration of tests in NaturalDocs, verbatim code display in doc. + +-2011-11-30 Rapha?l Pinson +- + Add unit tests for aug_to_xml + ++2011-11-30 Rapha?l Pinson ++ + libaugeas must now be linked to libxml, too. + + 2011-11-30 Dominic Cleal + + * augeas.spec.in: add build req on libxml2-devel + +-2011-11-29 Rapha?l Pinson ++2011-11-30 Rapha?l Pinson + + Add an Examples section to reprepro_uploaders.aug's header + + ARG_CHECK errors when condition is met. Invert conditions in aug_to_xml. + +-2011-11-29 Francis Giraldeau ++2011-11-30 Francis Giraldeau + + Sudoers: add more parameter flags/options + Fixes bug #143 + +-2011-11-29 Rapha?l Pinson ++2011-11-30 Rapha?l Pinson + + Add aug_to_xml to public API + +-2011-11-29 David Lutterkort ++2011-11-30 David Lutterkort + + New error code AUG_EBADARG and ARG_CHECK macro + Use ARG_CHECK to check arguments passed through the public API for +@@ -175,7 +181,7 @@ + + Improve CSS for NaturalDocs + +-2011-11-28 Dominic Cleal ++2011-11-29 Dominic Cleal + + augtool: change readline tab completion to be context-aware + +@@ -184,10 +190,12 @@ + changing relative paths into absolute paths. The context is stored in + /augeas/context and defaults to the value "/files". + +-2011-11-28 David Lutterkort ++2011-11-29 David Lutterkort + + * src/transform.c (load_file): fix segfault when storing span in NULL tree + ++2011-11-28 David Lutterkort ++ + * src/syntax.c (print_tree): print something for a NULL tree + + 2011-11-28 Rapha?l Pinson +@@ -218,8 +226,6 @@ + + Add elif support to shellvars.aug + +-2011-11-22 Rapha?l Pinson +- + Add big WARNING to aptconf.aug + + Register modules.aug with naturaldocs +@@ -260,12 +266,12 @@ + + Refactor modprobe.aug: * Parse commands in install/remove stanzas; * Drop support for include as it is not documented in manpages and no unit tests are shipped. + +-2011-11-21 Rapha?l Pinson +- + Fix unpriviliged into unpriviliged in test_postfix_master.aug, too. + + Add one-liner unit test for shellvars.aug + ++2011-11-21 Rapha?l Pinson ++ + shellvars.aug: Refactor lens, add end-of-line comment support, if/then/else/fi conditionals, one-liners support + + phpvars.aug: Add test for bash-style comment, improve eol comments, use generic_function in simple_function definition +@@ -337,7 +343,7 @@ + + Fix origin entries in aptpreferences.aug + +-2011-11-15 Dominic Cleal ++2011-11-16 Dominic Cleal + + Resolv: Permit end-of-line comments + Fixes ticket #223 +@@ -345,15 +351,15 @@ + Krb5: Allow a [pam] section for pam_krb5 (possibly deprecated) + Fixes ticket #225 + +-2011-11-15 Roman Rakus ++2011-11-16 Roman Rakus + + Kdump: new lens and tests + +-2011-11-15 Dominic Cleal ++2011-11-16 Dominic Cleal + + aug_srun: add 'insert' and 'move' command aliases to 'ins' and 'mv' + +-2011-11-15 Michael Chapman ++2011-11-16 Michael Chapman + + Dhcpd: slashes must be double-quoted + In dhcpd.conf, tokens containing slashes must be double-quoted. +@@ -381,7 +387,7 @@ + RHEL 5 uses /etc/dhcpd.conf. + RHEL 6 uses /etc/dhcp/dhcpd.conf. + +-2011-11-15 David Lutterkort ++2011-11-16 David Lutterkort + + Mdadm: use case-insensitive regexps + +@@ -393,15 +399,15 @@ + totalize used to create transitions into the crash state that did + transition on upper case letters, violating the convention. + +-2011-11-13 David Lutterkort ++2011-11-14 David Lutterkort + + * src/builtin.c (regexp_match): new helper to test a regexp + +-2011-11-13 Matthew Booth ++2011-11-14 Matthew Booth + + Mdadm_conf: new lens for /etc/mdadm.conf + +-2011-11-13 David Lutterkort ++2011-11-14 David Lutterkort + + * lenses/tests/test_iptables.aug: fix syntax error + +@@ -591,7 +597,7 @@ + + Add functionalities, refactor volume by type of disk_config entry and add tests to fai_diskconfig.aug + +-2011-09-01 David Lutterkort ++2011-09-02 David Lutterkort + + * src/pathx.c (nodeset_as_regexp): match nothing if nodeset is empty + This makes sure that constructs like 'glob(no_such_node)' or +@@ -604,8 +610,6 @@ + This patch fixes autosave in the case only one command is provided as + arguments and adds a test that checks proper handling of this case. + +-2011-08-31 Francis Giraldeau +- + Disable autoload transform for the fai_diskconfig + Autoload transform with only standard exclude makes failing the glob_for_lens + xpath test. fai_diskconfig does this. As a temporary fix, we disable transform +@@ -665,19 +669,21 @@ + Spacevars: rename toplevel lens to lns + Leave simple_lns as an alias for backwards compatibility + +-2011-08-08 David Lutterkort ++2011-08-09 David Lutterkort + + * examples/fadot.c: accept -h option to print usage + +-2011-07-25 David Lutterkort ++2011-07-26 David Lutterkort + + .gitignore: ignore tests/test-run + + Version 0.9.0 + ++2011-07-25 David Lutterkort ++ + Minor fixes to make distcheck pass + +-2011-07-22 David Lutterkort ++2011-07-23 David Lutterkort + + path expressions: parse [expr1 or expr2] correctly + Since commit ea010d85, we would interpret the predicate [e1 or e2] as +@@ -687,6 +693,8 @@ + + Of course, this is a heinous hack. + ++2011-07-22 David Lutterkort ++ + Migrate tests from test-mv.sh into run.tests + + aug_srun: new API call +@@ -705,12 +713,12 @@ + + Aliases: allow spaces and commas in aliases; add docs + +-2011-07-11 Dominic Cleal ++2011-07-12 Dominic Cleal + + Sudoers: support users:groups format in a Runas_Spec line for sudo -g + Fixes ticket #211 + +-2011-07-11 David Lutterkort ++2011-07-12 David Lutterkort + + * tests/test-bug-1.sh: fix test + The test caused an augtool failure for all the wrong reasons +@@ -780,10 +788,12 @@ + + * examples/fadot.c: include , link against GNULIB + +-2011-05-10 David Lutterkort ++2011-05-11 David Lutterkort + + tests: expand what the valgrind target runs + ++2011-05-10 David Lutterkort ++ + * src/pathx.c: rename CHECK_ERROR{,_RET0} to RET{,0}_ON_ERROR + This should make it harder to misuse them and cause memory leaks + +@@ -838,10 +848,12 @@ + + Fixes BZ 700608 + +-2011-04-15 David Lutterkort ++2011-04-16 David Lutterkort + + Version 0.8.1 + ++2011-04-15 David Lutterkort ++ + Iptables: handle --tcp-flags + Fixes bug #157 + +@@ -891,8 +903,6 @@ + Httpd: include /etc/httpd/conf/httpd.conf used on Fedora/RHEL + Fixes https://bugzilla.redhat.com/show_bug.cgi?id=688149 + +-2011-03-22 David Lutterkort +- + * src/lexer.l: fix a few compilation warnings + + Eliminate global variable 'comment_depth' in lexer +@@ -910,7 +920,7 @@ + + Add support for #includedir in sudoers.aug and test (ticket #188) + +-2011-03-17 Francis Giraldeau ++2011-03-18 Francis Giraldeau + + Support sudoers in nsswitch.aug + nsswitch.conf support a configuration item to specify database backend, this +@@ -938,7 +948,7 @@ + + Add FreeBSD /etc/rc.conf file to Shellvars lens. + +-2011-03-15 David Lutterkort ++2011-03-16 David Lutterkort + + Replace erroneous assert(0) with proper error report + * src/put.c (create_union): report an error to the user if none of the +@@ -973,7 +983,7 @@ + * src/try: read commands from build/augcmds.txt rather than /tmp; use a + more sensible default if augcmds.txt does not exist + +-2011-03-03 Matthew Booth ++2011-03-04 Matthew Booth + + Use getopt-gnu from gnulib for AIX support + +@@ -1007,7 +1017,7 @@ + + Changes in nrpe.aug Remove wrong ^ in comment regex Use Util.comment_generic Use generic modules Improve NaturalDocs documentation + +-2011-02-23 David Lutterkort ++2011-02-24 David Lutterkort + + Version 0.8.0 + +@@ -1026,7 +1036,7 @@ + + Split Solaris multiboot argument for the kernel path into @path node (ticket #158) + +-2011-02-22 Francis Giraldeau ++2011-02-23 Francis Giraldeau + + Add aug_span API function V2 + aug_span API function provides information about the node of the specified +@@ -1067,7 +1077,7 @@ + + Allow indentation for "iface" entries in interfaces.aug (Fix ticket #182) Add unit test for "iface" indentation + +-2011-02-16 Francis Giraldeau ++2011-02-17 Francis Giraldeau + + Minor code format cleanup + * Cut long lines to 80 chars +@@ -1081,7 +1091,7 @@ + + Add comment_c_style and comment_multiline Add empty_generic and make empty a call to it Add empty_c_style to complement comment_c_style + +-2011-02-15 Francis Giraldeau ++2011-02-16 Francis Giraldeau + + Fix segfault in get.c with L_MAYBE lens (bug#180) + When a L_MAYBE lens was the last child of a L_CONCAT inside a L_SUBTREE, then +@@ -1100,17 +1110,17 @@ + + Improve vim syntax file + +-2011-02-14 David Lutterkort ++2011-02-15 David Lutterkort + + man pages: update man page for augtool + +-2011-02-14 Rapha?l Pinson ++2011-02-15 Rapha?l Pinson + + augtool: add --interactive option + This option runs an interactive shell after evaluating STDIN or an explicit + inputfile + +-2011-02-14 David Lutterkort ++2011-02-15 David Lutterkort + + Mysql: change default comment delimiter from ';' to '#' + Fixes bug #181 reported by devzero +@@ -1137,7 +1147,7 @@ + * Allow directives without arguments in httpd.aug + * Adjust test_httpd.aug to test argument-less directives + +-2011-01-25 Francis Giraldeau ++2011-01-26 Francis Giraldeau + + Fix httpd.aug doc, filter and add to checks + * Added other contributors to authors +@@ -1156,16 +1166,16 @@ + are separated by spaces and it raises ambiguity when using unquoting. The lens + doesn't support either long lines splitted by backslash. + +-2011-01-25 David Lutterkort ++2011-01-26 David Lutterkort + + * src/pathx.c (store_error): make sure pos_str is always NUL terminated + Fixes bug #178 + +-2011-01-19 Fred ++2011-01-20 Fred + + PuppetFileserver: new lens for Puppet's fileserver.conf + +-2011-01-19 David Lutterkort ++2011-01-20 David Lutterkort + + * man/augtool.pod: fix typos + Fixes https://bugzilla.redhat.com/show_bug.cgi?id=628502 +@@ -1178,7 +1188,7 @@ + * src/pathx.c (coerce_to_bool, eval_pred): make sure we return something + when assert(0) is compiled away + +-2011-01-13 Francis Giraldeau ++2011-01-14 Francis Giraldeau + + Fix a small bashism from test script + +@@ -1189,7 +1199,7 @@ + + Fixes bug #175 + +-2011-01-11 David Lutterkort ++2011-01-12 David Lutterkort + + Replace augtest by test-augtool.sh + This removes the silly dependency on Ruby, since augtest was the only +@@ -1224,8 +1234,6 @@ + + In autosave mode, print "save" when in echo or interactive mode. Remove comma at the end of enum list. + +-2011-01-10 Rapha?l Pinson +- + Refactor augtool.c to use only readline + + augtool: add --autosave option +@@ -1236,7 +1244,7 @@ + + Fixes ticket #172 + +-2011-01-07 David Lutterkort ++2011-01-08 David Lutterkort + + bootstrap: add sys_wait module + Fixes bug #164 +@@ -1373,8 +1381,6 @@ + * tests/modules/pass_square.aug: unit tests to validate the square lens, + regular and recursives + +-2010-12-09 Francis Giraldeau +- + Add test for lens-access.sh in Makefile + + 2010-12-02 Rapha?l Pinson +@@ -1389,7 +1395,7 @@ + + Fix GPL into LGPLv2+ for a series of lenses. + +-2010-11-24 Francis Giraldeau ++2010-11-25 Francis Giraldeau + + Ignore eclipse project files + +@@ -1522,10 +1528,12 @@ + + Fix example in lens + +-2010-11-02 Raphael Pinson ++2010-11-03 Raphael Pinson + + Add a few lenses to Menu.txt + ++2010-11-02 Raphael Pinson ++ + Add shells.aug and associated test + + 2010-11-01 Raphael Pinson +@@ -1552,17 +1560,19 @@ + + Use generic modules in bbhosts.aug + +-2010-10-26 Francis Giraldeau ++2010-10-27 Francis Giraldeau + + Fixes bug #144: wrong behavior of iter concat + This patch fix the list_tail_cons macro to fastforward the tail list when + the first item is added to the list, otherwise if the first item added when + the list is NULL has two item, the tail points the the first item. + +-2010-10-26 Raphael Pinson ++2010-10-27 Raphael Pinson + + Fix filter to use proper file + ++2010-10-26 Raphael Pinson ++ + Remove trailing whitespace + + Add nsswitch.aug and associated test +@@ -1620,11 +1630,9 @@ + + Improve keepalived.aug + +-2010-09-23 Rapha?l Pinson +- + Add a lens for keepalived.conf and associated test + +-2010-09-23 David Lutterkort ++2010-09-24 David Lutterkort + + Preserve parse errors under /augeas//error + With the changes in commit 5ee81630, a subtree in /augeas/files that is +@@ -1651,7 +1659,7 @@ + + Odbc: new lens and tests. + +-2010-09-15 David Lutterkort ++2010-09-16 David Lutterkort + + When setting a tree node to the value it already has, do not modify the tree + +@@ -1698,10 +1706,12 @@ + * src/get.c (visit_exit): fix segfault from empty stack for L_MAYBE + Fixes bug #136 + +-2010-08-06 David Lutterkort ++2010-08-07 David Lutterkort + + Version 0.7.3 + ++2010-08-06 David Lutterkort ++ + Fix behavior of aug_defnode + (1) Make sure that the definition of the variable is recorded under + /augeas/variables +@@ -1754,7 +1764,7 @@ + Limits: also look for files in /etc/security/limits.d + Suggested by David Timms + +-2010-07-23 Tim Stoop ++2010-07-24 Tim Stoop + + Mysql: lens for MySQL's *.cnf files + +@@ -1785,10 +1795,12 @@ + If the user writes 'let rec l = rhs' and the RHS does not mention l, just + mark the lens as regular and carry on. + +-2010-07-21 David Lutterkort ++2010-07-22 David Lutterkort + + * src/syntax.c (load_module_file): make sure we report an error + ++2010-07-21 David Lutterkort ++ + Fix segfault in glue routines; add test for the fix + The tree_*_glue functions did not set the error struct when parsing a path; + this caused a segfault when trying to insert before/after a non-existant +@@ -1824,11 +1836,11 @@ + + Adding is_scan in the condition to accept an item + +-2010-06-30 Matthew Booth ++2010-07-01 Matthew Booth + + Device_map: new lens for grub's device.map + +-2010-06-29 David Lutterkort ++2010-06-30 David Lutterkort + + Avoid unnecessary file parsing when reloading the tree + We used to reparse every file we knew about upon aug_load. Now, we only +@@ -1861,6 +1873,8 @@ + * tests/cutest.c (run): add impl + * tests/test-save.c (run): remove + ++2010-06-29 David Lutterkort ++ + Redefine all variables upon load + This is a slight change in behavior: before, we used to just discard the + contents of all variables upon load. Now, we redefine variables by +@@ -1917,14 +1931,14 @@ + * lenses/shellvars_array.aug: new lens + * lenses/tests/test_shellvars_array.aug: test for new lens + +-2010-05-13 David Lutterkort ++2010-05-14 David Lutterkort + + Add modules_conf to naturaldocs Menu + + Add /etc/modules.conf from hell + Actually, from http://www.janerob.com/rob/ts5100/modules.conf + +-2010-05-13 Matthew Booth ++2010-05-14 Matthew Booth + + Modules_conf: new lens for modules.conf and conf.modules + +@@ -1989,8 +2003,6 @@ + * tests/test-save.c: use proper includes for WIFEXITED + Without them, the build fails on FreeBSD + +-2010-04-20 David Lutterkort +- + Debctrl (multi_line_entry): fix bad regexp + The lens 'del /^ / " "' is not valid, since we do not allow '^' as a meta + character. Changing that to 'del / / " "' exposed a typecheck problem in +@@ -2005,13 +2017,15 @@ + + * tests/fatest.c (testExpandCharRanges): test escaping of literal '|' + +-2010-04-19 David Lutterkort ++2010-04-20 David Lutterkort + + * tests/fatest.c (print_regerror): do not use alloca + + * bootstrap: pull in isblank explicitly + Fixes bug #111 + ++2010-04-19 David Lutterkort ++ + * src/lens.c (lns_check_rec): fix refcounting mistake on error path + Fixes bug #120 + +@@ -2043,30 +2057,30 @@ + + * src/jmt.c (build_tree): print debug output for build_nullable + +-2010-03-12 David Lutterkort ++2010-03-13 David Lutterkort + + * lenses/tests/test_logrotate.aug: add test for files separated by newlines + This test the fix for bug #104, commit fe0453ce. + +-2010-03-11 David Lutterkort ++2010-03-12 David Lutterkort + + * lenses/group.aug (password): remove backslashes + Backslashes in char classes are taken literally, they do not escape a + character. + +-2010-03-11 root ++2010-03-12 root + + Group: Added disabled password support + * lenses/group.aug: '*' and '!' are allowed chars for disabled password + * lenses/tests/test_group.aug: added test for lens change + +-2010-03-11 David Lutterkort ++2010-03-12 David Lutterkort + + * src/lens.c (lns_check_rec): avoid use of uninitialized 'result' + The ensures can fail, and we check whether result is NULL in the error + path. + +-2010-03-05 David Lutterkort ++2010-03-06 David Lutterkort + + * src/lens.c (lns_format_atype): format L_REC lenses + +@@ -2081,7 +2095,7 @@ + + Approx: allow keywords starting with '$' + +-2010-03-04 David Lutterkort ++2010-03-05 David Lutterkort + + Approx: lens and test for the approx proxy server + +@@ -2130,7 +2144,7 @@ + + Debctrl: new lens and test + +-2010-02-23 David Lutterkort ++2010-02-24 David Lutterkort + + Ntp: add 'tinker' directive + Fixes bug #103 +@@ -2138,7 +2152,7 @@ + Logrotate: tolerate whitespace at the end of a line + Fixes bug #101 + +-2010-02-23 Raphael Pinson ++2010-02-24 Raphael Pinson + + Dhclient: add rfc code parsing + Fixes bug #107 +@@ -2168,7 +2182,7 @@ + + Nagisocfg: lens and test for /etc/nagios3/nagios.cfg + +-2010-02-12 Ivana Hutarova Varekova ++2010-02-13 Ivana Hutarova Varekova + + Cgrules: new lens and test + See cgrules.conf for http://libcg.sourceforge.net/ +@@ -2188,8 +2202,6 @@ + Instead of dumping raw regular expressions for the tree encoding, print out + something resembling our tree notation. + +-2010-02-08 David Lutterkort +- + libfa: handle the syntax r{min,} properly + * src/fa.c (parse_repeated_regexp): set max = -1 when we see r{min,}; + (re_iter_as_string): when max == -1, print r{min,} +@@ -2197,6 +2209,8 @@ + + * src/fa.c (parse_int): flag not parsing anything as an error + ++2010-02-08 David Lutterkort ++ + * src/jmt.c: add caller filtering + Caller filtering is needed to weed out seemingly ambiguous parse trees (see + Section 5.3 of Jim/Mandelbaum's paper) +@@ -2221,7 +2235,7 @@ + + Sshd: allow optional arguments in subsystem commands + +-2010-01-27 David Lutterkort ++2010-01-28 David Lutterkort + + * src/augeas.c (tree_replace): don't bother marking the new parent as dirty + We call tree_rm on it earlier, which already marks it as dirty. +@@ -2234,7 +2248,7 @@ + * src/get.c (no_match_error): initialize lname + Otherwise, gcc complains about a possibly uninitialized value with -O2 + +-2010-01-25 David Lutterkort ++2010-01-26 David Lutterkort + + Test for using a recursive lens inside other lenses + +@@ -2301,7 +2315,7 @@ + + * src/get.c (struct state): make info a pointer + +-2010-01-23 David Lutterkort ++2010-01-24 David Lutterkort + + * src/lens.c (restrict_regexp): properly report OOM + +@@ -2309,7 +2323,7 @@ + + Document the basics of building from git + +-2010-01-15 David Lutterkort ++2010-01-16 David Lutterkort + + * src/builtin.c: builtins for printing and inspecting lenses + +@@ -2330,10 +2344,12 @@ + In analogy to 'label', this lens allows setting the value of a tree node to + a fixed string + +-2010-01-14 David Lutterkort ++2010-01-15 David Lutterkort + + Version 0.7.0 + ++2010-01-14 David Lutterkort ++ + Json: lens and tests for generic Json files + + Tests for recursive (context free) lenses +@@ -2447,7 +2463,7 @@ + + * src/lens.c (subtree_atype): new function + +-2010-01-07 David Lutterkort ++2010-01-08 David Lutterkort + + Facelift for augtool + This makes augtool somewhat friendlier, mostly because +@@ -2459,6 +2475,8 @@ + be enclosed in quotes if they have spaces with predicates, e.g. you can + now type 'get /foo[ last() ]' + ++2010-01-07 David Lutterkort ++ + Record an error if more than one lens tries to load a file + * src/transform.c (file_info): new function; (transform_load): detect if + more than one lens tries to load a file and record error in +@@ -2507,8 +2525,6 @@ + + Xinetd (name): fix bad '-' in character class + +-2010-01-05 David Lutterkort +- + Do not choke on non-existing lens during save + * src/transform.c (add_file_info): check that lens is non-NULL; + (lens_from_name): provide detailed error message when lens lookup +@@ -2543,7 +2559,7 @@ + + * src/regexp.c (print_regexp): clean the regexp with fa_restrict_alphabet + +-2009-12-18 David Lutterkort ++2009-12-19 David Lutterkort + + * src/builtin.c (lens_get, lens_put): propagate errors as exceptions + +@@ -2565,7 +2581,7 @@ + + * doc/ftdetect/augeas.vim: fix syntax + +-2009-12-09 Partha Aji ++2009-12-10 Partha Aji + + Made samba aug accept entry keys with ':' in them + +@@ -2598,7 +2614,7 @@ + * src/parser.y: properly initialize yylloc + Fixes ticket #96 + +-2009-11-25 David Lutterkort ++2009-11-26 David Lutterkort + + Properly check regexp literals for syntax errors + * src/regexp.h (regexp_check): new function +@@ -2630,7 +2646,7 @@ + + Support version pins in apt_preferences + +-2009-11-23 David Lutterkort ++2009-11-24 David Lutterkort + + * tests/Makefile.am (lens_tests): run postfix_access tests + +@@ -2661,8 +2677,6 @@ + happened (e.g., out-of-memory) that has already been reported in the + central augeas->error instance. + +-2009-11-12 David Lutterkort +- + * src/info.c (print_info): do not choke on NULL info + + * src/internal.h: new macros MEMCMP and MEMMOVE +@@ -2820,7 +2834,7 @@ + /etc/ethers: new lens and test + The followings adds a new lens for /etc/ethers and associated test. + +-2009-09-30 David Lutterkort ++2009-10-01 David Lutterkort + + * src/augparse.c: get error details from error API + +@@ -2873,6 +2887,8 @@ + - use the safe-alloc macros for allocations + - abort the test when internal allocations fail + ++2009-09-30 David Lutterkort ++ + * src/hash.c (hash_alloc_insert): return 0/-1 for success/error + + Use a proper function for make_ref +@@ -2889,7 +2905,7 @@ + * src/transform.c: do not include canonicalize.h anymore + The canonicalize-lgpl gnulib module doesn't require that anymore + +-2009-09-21 David Lutterkort ++2009-09-22 David Lutterkort + + Path expressions: add regexp matching + Add a function regexp : string -> regexp and an operator +@@ -2920,6 +2936,8 @@ + parser/typechecker. Now functions like pathx_first etc. report errors + properly. + ++2009-09-21 David Lutterkort ++ + Store pathx parse errors in internal error struct + The pathx_parse function will now store error information in a struct + error; we pass the one from struct augeas in and save it in the pathx. +@@ -2951,13 +2969,15 @@ + + Version 0.5.3 + +-2009-09-11 David Lutterkort ++2009-09-12 David Lutterkort + + Man pages: update to match current augtool and augparse + + Add --version option to augtool and augparse + Fixes bug #88 + ++2009-09-11 David Lutterkort ++ + A couple more files for the test root + + Add preceding-sibling and following-sibling axes to path expressions +@@ -2979,8 +2999,6 @@ + + * src/try: fix 'set annotate' for gdb + +-2009-09-03 David Lutterkort +- + Transparent save of cross-device links + When saving to a file, we first write to a file with extension .augnew and + then rename that file to the actual file. This fails when the original is a +@@ -2991,9 +3009,9 @@ + e.g. when the original file is bindmounted - in that situation, we have to + copy. + +- * src/syntax.c (print_value): use print_tree instead of dump_tree ++2009-09-03 David Lutterkort + +-2009-09-02 David Lutterkort ++ * src/syntax.c (print_value): use print_tree instead of dump_tree + + * lenses/rx.aug (fspath): simplistic regex for filesystem paths + +@@ -3001,6 +3019,8 @@ + When the typechecker finds lens overlap in a union's put direction, format + the generated example as a tree to make it more readable. + ++2009-09-02 David Lutterkort ++ + * src/lens.c(enc_format): remove extraneous quote + + Make fa_example work for strings with embedded NUL's +@@ -3069,7 +3089,7 @@ + + Fixes bug #68 + +-2009-08-12 David Lutterkort ++2009-08-13 David Lutterkort + + Do not assume how glob allocates gl_pathv + We assumed that the gl_pathv in a glob_t was allocated in a particular +@@ -3077,7 +3097,7 @@ + + * src/transform.c (filter_generate): make a copy of gl_pathv + +-2009-08-10 David Lutterkort ++2009-08-11 David Lutterkort + + aug_load: cleanup variables when deleting /files + The first thing aug_load does is delete /augeas/files and /files. We need +@@ -3093,7 +3113,7 @@ + + Pass symtab explicitly into pathx_symtab_remove_descendants + +-2009-08-06 David Lutterkort ++2009-08-07 David Lutterkort + + Record new files under /augeas/files when they are saved + * src/transform.c (transform_save): add file info with add_file_info +@@ -3207,7 +3227,7 @@ + ls -lZ $hosts | cut -d ' ' -f 5. The latter fails with some + combinations of ls and SELinux. + +-2009-07-16 David Lutterkort ++2009-07-17 David Lutterkort + + * src/Makefile.am: link libfa with gnulib, needed on AIX + +@@ -3215,11 +3235,11 @@ + + * doc/augeas.vim: vi syntax highlighting for .aug files + +-2009-07-13 David Lutterkort ++2009-07-14 David Lutterkort + + Version 0.5.2 + +-2009-07-09 David Lutterkort ++2009-07-10 David Lutterkort + + tree handling: propagate dirty flag into root + We had an off-by-one error in tree_mark_dirty that lead to the root of the +@@ -3234,13 +3254,15 @@ + + This bug was introduced in commit 7278965b + +-2009-07-08 David Lutterkort ++2009-07-09 David Lutterkort + + Ntp: allow additional options for server etc. + Allow options listed on http://doc.ntp.org/4.2.4/confopt.html + + Fixes bug #72 reported by Micah + ++2009-07-08 David Lutterkort ++ + Shellvars: allow backticks as quote characters + * lenses/shellvars.aug (simple_value): allow backticks as quotes + * lenses/tests/test_shellvars.aug: add tests +@@ -3276,7 +3298,7 @@ + + Reported and fix suggested by Jeff Johnson + +-2009-06-26 Jim Meyering ++2009-06-27 Jim Meyering + + tests: divide test-lenses.sh into its 54 independent tests + This permits these tests to be run in parallel. +@@ -3297,7 +3319,7 @@ + * configure.ac: Require automake-1.11. + Enable color-tests parallel-tests. Use AM_SILENT_RULES([yes]) + +-2009-06-26 Marc Fournier ++2009-06-27 Marc Fournier + + Yum: also read files in /etc/yum/pluginconf.d + +@@ -3321,7 +3343,7 @@ + * man/augtool.pod: document --echo option + * man/augtool.1: regenerated + +-2009-06-15 Jim Meyering ++2009-06-16 Jim Meyering + + build: fix "make distcheck" failure + * src/Makefile.am (EXTRA_DIST): Add fa_sym.version. +@@ -3333,13 +3355,13 @@ + * test-test-preserve.sh: work with BSD ls, as well as GNU ls + Needed to make the test pass on OS/X + +-2009-06-11 David Lutterkort ++2009-06-12 David Lutterkort + + libfa: use linker script to only export public symbols + libfa was exporting all kinds of symbols that were meant to be internal; + now it only exports what's in fa.h + +-2009-06-11 Anders F Bj\xF6rklund ++2009-06-12 Anders F Bj\xF6rklund + + configure: do not use version script if the linker doesn't support it + That is the case on OS X +@@ -3355,7 +3377,7 @@ + * src/augtool.c: add missing include for ctype.h + Part of fix for ticket #66 + +-2009-06-09 David Lutterkort ++2009-06-10 David Lutterkort + + Version 0.5.1 + +@@ -3406,7 +3428,7 @@ + + * tests/root/etc/: add group and passwd files + +-2009-05-28 Matt Palmer ++2009-05-29 Matt Palmer + + Interfaces: various bug fixes + * disallow end-of-line comments +@@ -3415,7 +3437,7 @@ + Interfaces: accept options containing '_' + Bug reported by Jonas Eriksson + +-2009-05-28 David Lutterkort ++2009-05-29 David Lutterkort + + * tests/grub-rm-entry.rb: 'savedefault' indented by '\t', not '' + +@@ -3423,7 +3445,7 @@ + + Modprobe: handle comments at the end of a line + +-2009-04-13 David Lutterkort ++2009-04-14 David Lutterkort + + Grub: allow optional argument for savedefault command + +@@ -3480,21 +3502,19 @@ + + Squid: allow indentation of entries + +-2009-04-07 Raphael Pinson +- + Logrotate: allow = as a separator for value_to_eol + Fix ticket #61 by allowing "=" as a valid separator in value_to_eol. + "word" may not contain "=" anymore in this case. Note that this is not + documented in "man logrotate" but is shipped by default in CentOS (cf + ticket #61). + +-2009-04-07 David Lutterkort ++2009-04-08 David Lutterkort + + Ntp: fixes to make the default Fedora config work + Now enough of ntp.conf is understood so that the config from Fedora 10 with + all directives uncommented can be processed. + +-2009-04-07 Raphael Pinson ++2009-04-08 Raphael Pinson + + Ntp: add fudge directive + Fixes ticket #59 +@@ -3507,7 +3527,7 @@ + + Bug reported by Michael Conigliaro + +-2009-04-03 David Lutterkort ++2009-04-04 David Lutterkort + + * src/augtool.c: new option --noautoload + +@@ -3520,7 +3540,7 @@ + + Rx: remove \b and \d escapes + +-2009-04-03 Raphael Pinson ++2009-04-04 Raphael Pinson + + Modify some existing lenses to use new utility modules + Changes Aliases, Exports, Fstab, Group, and Monit +@@ -3544,7 +3564,7 @@ + * handle empty lines + * find vsftpd.conf on Fedora/RHEL + +-2009-03-27 David Lutterkort ++2009-03-28 David Lutterkort + + Iptables: fix ticket #51 + * allow more characters in chain names +@@ -3558,6 +3578,8 @@ + + * src/get.c (get_quant_star): do not leak registers + ++2009-03-27 David Lutterkort ++ + Some more test files + + Fix uninitialized variables found by optimizer +@@ -3633,7 +3655,7 @@ + The new API call aug_defvar allows defining variables that can later be + used in path expressions. + +-2009-03-22 David Lutterkort ++2009-03-23 David Lutterkort + + Add FilterExpr to path expression grammar + This allows using constructs like $foo/some/path and $foo[2] +@@ -3648,7 +3670,7 @@ + + * src/pathx.c (clone_value): new function + +-2009-03-21 David Lutterkort ++2009-03-22 David Lutterkort + + * src/pathx.c (release_value): factor logic into separate function + +@@ -3661,10 +3683,12 @@ + + * examples/fadot: remove, checked in by mistake + +-2009-03-20 David Lutterkort ++2009-03-21 David Lutterkort + + * .gitignore: ignore examples/fadot + ++2009-03-20 David Lutterkort ++ + * src/get.c: rename 'Short iteration' to a more helpful message + + * src/transform.c (store_error): report which lens failed +@@ -3682,7 +3706,7 @@ + operations on FA's from the command line, like intersection and complement + of FA's. + +-2009-03-19 David Lutterkort ++2009-03-20 David Lutterkort + + * src/pathx.c: call make_value before pop_value + Since make_value might realloc, pointers retrieved with pop_value may +@@ -3692,6 +3716,8 @@ + + * src/augeas.c: create various /augeas nodes when they go missing + ++2009-03-19 David Lutterkort ++ + * src/put.c (create_concat): fix goofy error message + + Update and refresh man pages +@@ -3742,7 +3768,7 @@ + legal iptables config file; what makes it basic is that it doesn't break + some of the values down as fine-grained as I would like to have them + +-2009-03-13 David Lutterkort ++2009-03-14 David Lutterkort + + * configure.ac: bump major version of libfa + +@@ -3754,6 +3780,8 @@ + + * src/fa.h (fa_compile): pass in size of regexp + ++2009-03-13 David Lutterkort ++ + * src/fa.h: use 'struct fa *' instead of fa_t + + * src/augeas.c: fix handling of dirty flag +@@ -3766,14 +3794,14 @@ + + * Makefile.maint: different setup at home + +-2009-03-12 David Lutterkort +- + * src/transform.c (transform_save): properly sync data to disk + Make sure the data we write into the .augnew file hits the disk before + renaming to the proper name + + Modprobe: lens and tests for modprobe.conf + ++2009-03-12 David Lutterkort ++ + * src/fa.c (re_cset_as_string): turn '[^\n]' into '.' + + Place Sudoers and Util under LGPLv2+ +@@ -3808,7 +3836,7 @@ + + cat /tmp/squid2.7 /tmp/squid3-HEAD | sort | uniq + +-2009-03-08 David Lutterkort ++2009-03-09 David Lutterkort + + * tests/xpath.tests: Hosts lens puts comments into #comment nodes + +@@ -3832,20 +3860,22 @@ + + Sshd: add test showing how to add a Subsystem + +-2009-03-03 David Lutterkort ++2009-03-04 David Lutterkort + + * Makefile.maint: add autogen target + + * src/pathx.c (eval_rel): for numbers, '<' and '<=' were reversed + ++2009-03-03 David Lutterkort ++ + Postfix_main: handle continuation lines + + * src/pathx.c: fix some comments + +-2009-03-02 David Lutterkort +- + Version 0.4.1 + ++2009-03-02 David Lutterkort ++ + * configure.ac: make default warning level 'maximum' + Using 'error' here is too unfriendly on weird platforms, since builds can + fail, e.g. because of broken system headers. When doing actual development, +@@ -3864,7 +3894,7 @@ + + * src/pathx.c: it is an error if we don't consume the whole expression + +-2009-02-27 David Lutterkort ++2009-02-28 David Lutterkort + + * tests/test-event-saved.sh: make sure fuiles are writable by owner + +@@ -3882,8 +3912,6 @@ + + * src/augeas.c (tree_find): helper for getting a tree node + +-2009-02-24 David Lutterkort +- + * src/augeas.c: erase /augeas/events/saved only once + tree_save is called recursively; /augeas/events/saved must be reset + in aug_save, not tree_save +@@ -3894,19 +3922,23 @@ + + * src/transform.h: move transform decls out of syntax.h + ++2009-02-24 David Lutterkort ++ + Util.stdexcl: exclude .augsave and .augnew files + +-2009-02-20 David Lutterkort ++2009-02-21 David Lutterkort + + * src/lexer.l: correct location info for strings and regexps + + * src/get.c: check for valid match before calling token() + +-2009-02-19 David Lutterkort ++2009-02-20 David Lutterkort + + * src/parser.y: do not allow epsilon as a tree constant + This grammar mistake made epsilon a valid expression + ++2009-02-19 David Lutterkort ++ + * src/fa.c: cache hash values in the state + This gives about a 15% performance improvement in typechecking + the logrotate lens +@@ -3997,7 +4029,7 @@ + + * src/augtool.c (cmd_match): check return from aug_match more defensively + +-2009-02-06 David Lutterkort ++2009-02-07 David Lutterkort + + Version 0.4.0 + +@@ -4007,6 +4039,8 @@ + Fix compilation on OpenSolaris + * src/pathx.c (position): assert not marked as noreturn + ++2009-02-06 David Lutterkort ++ + * tests/test-xpath.c (run_one_test): allow results in arbitrary order. Files on Fedora and Debian are enumerated in different order, leading to spurious test failures + + * src/pathx.c: remove the value() function, it's redundant with '.' +@@ -4036,7 +4070,7 @@ + Lens and tests for DarkIce + See http://darkice.tyrell.hu/ + +-2009-02-01 David Lutterkort ++2009-02-02 David Lutterkort + + * src/augeas.c: use ALLOC instead of CALLOC + +@@ -4048,7 +4082,7 @@ + + * src/augeas.c (init_root): check for failure of strdup + +-2009-01-30 David Lutterkort ++2009-01-31 David Lutterkort + + * src/pathx.c: factor test if a step matches into step_matches + This also fixes a problem matching, test also included +@@ -4114,7 +4148,7 @@ + + Grub: support color directive + +-2009-01-26 David Lutterkort ++2009-01-27 David Lutterkort + + Version 0.3.6 + +@@ -4138,15 +4172,15 @@ + + Report version and legal save modes in /augeas/version + +-2009-01-17 David Lutterkort ++2009-01-18 David Lutterkort + + * ref.h: include limits.h, since we use UINT_MAX + +-2009-01-16 David Lutterkort ++2009-01-17 David Lutterkort + + Mark up code in documentation comments for Dpkg and Exports + +-2009-01-16 Robin Lee Powell ++2009-01-17 Robin Lee Powell + + Documentation for Exports and Dpkg + +@@ -4189,20 +4223,20 @@ + * test-preserve.sh: Use cut -b1-10 to get mode from ls -l output. + Use ls -lZ (not ls -Z, which is not portable) to get SELinux context. + +-2009-01-04 Arnaud Gomes-do-Vale ++2009-01-05 Arnaud Gomes-do-Vale + + * src/Makefile.am: fix bz #478619 - do not use abspath + +-2009-01-03 Robin Lee Powell ++2009-01-04 Robin Lee Powell + + Dpkg: new lens and test + +-2009-01-03 David Lutterkort ++2009-01-04 David Lutterkort + + Php: expand filter slightly + Suggested by Robin Lee Powell + +-2008-12-29 David Lutterkort ++2008-12-30 David Lutterkort + + Fix segfault when branch in a union does not have a ktype + * src/lens.c (lns_key_regexp): check for NULL ktype of branch +@@ -4210,25 +4244,25 @@ + + Bug reported by Robin Lee Powell + +-2008-12-27 Free Ekanayaka ++2008-12-28 Free Ekanayaka + + Add soma lens and test + + Add limits lens and test + +-2008-12-24 David Lutterkort ++2008-12-25 David Lutterkort + + * autogen.sh: remove bogus argument to configure + +-2008-12-24 Marc Fournier ++2008-12-25 Marc Fournier + + Php, Gdm: exclude literal ".anon" from title, not regexp /.anon/ + +-2008-12-24 Free Ekanayaka ++2008-12-25 Free Ekanayaka + + Phpvars: allow whitespaces before the \n in the ++2008-12-24 David Lutterkort + + Version 0.3.5 + +@@ -4240,11 +4274,11 @@ + The list of users in a group is now split into individual 'user/' + nodes. If a group has no members, no user/ nodes are produced. + +-2008-12-23 Free Ekanayaka ++2008-12-24 Free Ekanayaka + + Add lens and test for /etc/group + +-2008-12-23 David Lutterkort ++2008-12-24 David Lutterkort + + Simpler interface and implementation for path_find_one + +@@ -4270,19 +4304,19 @@ + + Add an explicit parent pointer to the tree + +-2008-12-23 Free Ekanayaka ++2008-12-24 Free Ekanayaka + + Lens and test for config files using PHP-style variables + Process /etc/squirrelmail/config.php + +-2008-12-23 Marc Fournier ++2008-12-24 Marc Fournier + + New lens and tests for /etc/rsyncd.conf + rsyncd.conf is an ini file which allows indented + parameters (like smb.conf) as well as entries outside + any section (like php.ini). + +-2008-12-23 David Lutterkort ++2008-12-24 David Lutterkort + + * fa.c: mark '.' as a special character that needs to be escaped + +@@ -4333,7 +4367,7 @@ + * transform.c (transform_save): if rename fails because new/backup file + and target file are on different devices, copy the files + +-2008-11-05 David Lutterkort ++2008-11-06 David Lutterkort + + * Makefile.maint: add target tag-release + +@@ -4368,11 +4402,11 @@ + build: use LIB_SELINUX as set by gnulib + * configure.ac: do not set up LIB_SELINUX, gnulib does that + +-2008-10-22 Sylvain Baubeau ++2008-10-23 Sylvain Baubeau + + Grub: support "rootnoverify" and "chainloader" directives + +-2008-10-21 David Lutterkort ++2008-10-22 David Lutterkort + + Version 0.3.2 + +@@ -4380,6 +4414,8 @@ + + test-events-saved.sh: sort the list of saved files + ++2008-10-21 David Lutterkort ++ + aug_save: report saved files in /augeas/events/saved + aug_save now reports which files were changed on disk underneath + /augeas/events/saved; if multiple files are changed in one save operation, +@@ -4397,8 +4433,6 @@ + still create the file with whatever default user/group/mode the current + user has set. + +-2008-10-20 David Lutterkort +- + aug_save: report the number of files that were changed + When the tree is saved, keep track of the number of files that were + actually changed and return that number. +@@ -4434,11 +4468,11 @@ + + Add gdm lens and associated test + +-2008-10-02 David Lutterkort ++2008-10-03 David Lutterkort + + Ignore files based on .hgignore + +-2008-10-01 David Lutterkort ++2008-10-02 David Lutterkort + + Complain when nodes in the tree can not be put + When nodes are added to the tree that do not match the appropriate +@@ -4451,14 +4485,16 @@ + This also uncovered that the test rec-hosts-add.rb was broken, but still + passed. + +-2008-10-01 David Lutterkort ++2008-10-02 David Lutterkort + + Pass --nostdinc properly when running under gdb + ++2008-10-01 David Lutterkort ++ + Logrotate: parse tabooext into list; add processing of a number of options + Patch by Sean E. Millichamp + +-2008-09-22 David Lutterkort ++2008-09-23 David Lutterkort + + Grub: add support for 'serial' and 'terminal' + Patch by Sean E. Millichamp +@@ -4470,6 +4506,8 @@ + Logrotate: add dateext flag + Patch by Sean E. Millichamp + ++2008-09-22 David Lutterkort ++ + Various changes to the NaturalDocs support + This patch changes a few things around in the NaturalDocs support: + +@@ -4510,7 +4548,7 @@ + + Adapt augeas.h for NaturalDocs parsing + +-2008-09-08 David Lutterkort ++2008-09-09 David Lutterkort + + Sshd: better handling of match blocks + Split match conditions into individual 'Condition' entries. Store the +@@ -4525,7 +4563,7 @@ + Ldap: merge with Spacevars. Spacevars: process havp.config + Adapt Test_ldap, since there is no Ldap.lns anymore + +-2008-09-08 David Lutterkort ++2008-09-09 David Lutterkort + + Use --nostdinc in tests + We never want to use installed lenses in the tests; they should only be +@@ -4555,12 +4593,12 @@ + + Shellvars: handle space at the end of a line + +-2008-09-04 David Lutterkort +- + Added tag release-0.3.1 for changeset 803c17b1833a + + Release 0.3.1 + ++2008-09-04 David Lutterkort ++ + Sysctl: lens for sysctl.conf + Contributed by Sean Millichamp + +@@ -4623,7 +4661,7 @@ + - When a union during 'put' does not match, produce an error instead of + aborting + +-2008-08-28 David Lutterkort ++2008-08-29 David Lutterkort + + Fix a bug with transferring skeletons + It is possible for a skeleton to move from one subtree lens to another, if +@@ -4665,7 +4703,7 @@ + See man dput.cf(5) from a recent dput version (Ubuntu/hardy or + Debian/lenny) + +-2008-08-26 David Lutterkort ++2008-08-27 David Lutterkort + + Typecheck del lens + The builtin lens 'del RE STR' was missing a typecheck: the default string +@@ -4708,7 +4746,7 @@ + Adapt php.aug to support entries outside of sections and still map sections + as labels (Fix #9) + +-2008-08-15 David Lutterkort ++2008-08-16 David Lutterkort + + Shellvars: one more cornercase with double quoted strings + +@@ -4722,12 +4760,12 @@ + There is no point in trying to match against skel->text for a store lens + since that is always NULL. + ++2008-08-15 David Lutterkort ++ + Fix syntax error in test + + augl_error: Initialize info + +-2008-08-14 David Lutterkort +- + aug_mv: fix bug when moving at the root level + When moving from the root level, the source node needs to be removed from + aug->tree, not aug->tree->children. In addition, the list_remove macro must +@@ -4769,7 +4807,7 @@ + + Sudoers: clean up comment definition + +-2008-08-12 David Lutterkort ++2008-08-13 David Lutterkort + + Hosts: handle comments at the end of a host entry + Comments are put into the tree as part of that host node, i.e. will live as +@@ -4840,7 +4878,7 @@ + See regex(7) or + http://www.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap09.html#tag_09_04 + +-2008-08-09 David Lutterkort ++2008-08-10 David Lutterkort + + Revamp the dict data structure + Dicts were simple linked lists of key/value pairs, and appending and +@@ -4883,12 +4921,12 @@ + list_reverse reverses a list in place. list_tail_cons appends to a list in + constant time, since it is given a pointer to the tail of the list. + +-2008-08-07 David Lutterkort +- + Added tag release-0.3.0 for changeset 60f2a13c2528 + + Release 0.3.0 + ++2008-08-07 David Lutterkort ++ + Mention the exit status + + Version libfa and libaugeas +@@ -4915,7 +4953,7 @@ + failed. This is useful when piping multiple commands into augtool to check + that they all succeeded. + +-2008-07-29 David Lutterkort ++2008-07-30 David Lutterkort + + Fix failures on FreeBSD + (1) Point augtool at the lenses in the source dir (not FreeBSD problem, +@@ -4964,7 +5002,7 @@ + + Add a call to move a subtree to the public API + +-2008-07-26 David Lutterkort ++2008-07-27 David Lutterkort + + Refactor tree_create + +@@ -5035,13 +5073,13 @@ + Lens for Debian's dput files + Contributed by Raphael Pinson + +-2008-07-17 David Lutterkort +- + augtool: Print '(none)' when getting a path with no value + The output used to be mangled. Now it is 'path = value' if hte path has a + non-NULL value, 'path (none)' if the path exists but has a NULL value, and + 'path (o)' if an error occurred. + ++2008-07-17 David Lutterkort ++ + Added tag release-0.2.1 for changeset 13fdcd9bb18a + + aliases.aug: Do not require whitespace after commas +@@ -5075,7 +5113,7 @@ + Otherwise, get and parse on an empty string will produce a 'short + iteration' error, even if the empty string is acceptable for that lens. + +-2008-07-07 David Lutterkort ++2008-07-08 David Lutterkort + + Put the default dir for lenses into DATADIR (the real fix) + Reworks 527:14602e2757dd in a way that actually works and conforms to the +@@ -5084,10 +5122,12 @@ + Most of this fix suggested by Jim Meyering, I only touched it up a little + (and no doubt introduced all the bugs). + ++2008-07-07 David Lutterkort ++ + Check for NULL values in the put direction of store + This is now flagged as an error instead of causing a segfault. + +-2008-07-03 David Lutterkort ++2008-07-04 David Lutterkort + + Lens for /etc/exports + +@@ -5099,13 +5139,13 @@ + + Suppress generated manpages + +-2008-06-30 David Lutterkort +- + Put the default dir for lenses into DATADIR + Instead of hardcoding the default dir for lenses to somewhere in '/usr', + look in DATADIR - that's after all where the default lenses are installed + if DATADIR (or PREFIX) is changed. + ++2008-06-30 David Lutterkort ++ + Man page for augparse + + Put Augeas version into footer +@@ -5132,10 +5172,10 @@ + With this change, error messages contain an indication to where the error + happened that is a little closer to the actual trouble spot. + +-2008-06-12 David Lutterkort +- + Check that we take the right branch in a union + ++2008-06-12 David Lutterkort ++ + Process /etc/sysconfig/selinux + Patch by Alan Pevec + +@@ -5166,7 +5206,7 @@ + + Release 0.2.0 + +-2008-06-03 David Lutterkort ++2008-06-04 David Lutterkort + + Remove bashisms from test scripts + Make tests scripts work with plain old sh; also, don't hardcode location of +@@ -5387,8 +5427,6 @@ + increased, as the calling conventions for builtin functions stipulate that + the returned value is owned by the caller + +-2008-05-14 David Lutterkort +- + Report errors more clearly in the tree + When an error happens during get/put, store additional info in the tree: + for get errors, store the position in the file where the error occured, for +@@ -5399,7 +5437,7 @@ + with the value associated with /augeas/F/error giving some indication about + the kind of error encountered. + +-2008-05-13 David Lutterkort ++2008-05-14 David Lutterkort + + Report errors during put + +@@ -5417,6 +5455,8 @@ + that "jumped branches", i.e. whose get used one branch of the union, and + the put uses the other branch because of changes to the tree. + ++2008-05-13 David Lutterkort ++ + Reduce the number of calls to collect + We were calling collect way too often, which was slowing things down. Also + broke collect into separate subfunctions so we can see better when one of +@@ -5435,12 +5475,14 @@ + + Fix up the existing lenses that violate that. + +-2008-05-09 David Lutterkort ++2008-05-10 David Lutterkort + + Keep re_cset_as_string from including an explicit '\0' + We use NUL delimited strings; that means we can not use a CSET + representation that mentions '\0' explicitly. + ++2008-05-09 David Lutterkort ++ + Use the new '-' operator for key_re + + Add subtraction of regular expressions to the language +@@ -5468,8 +5510,6 @@ + There are lots of gyrations to keep the generated regexp reasonably short + (and syntactically correct) + +-2008-05-08 David Lutterkort +- + Check for (some) allocation failures + + Reference count 'struct re' instances +@@ -5512,8 +5552,6 @@ + Small fixes to the specfile + Suggested by Michael Schwendt + +-2008-05-05 David Lutterkort +- + Lens and transform for xinetd.conf + + Enclose the regexp for a key in (..) before adding a / +@@ -5585,7 +5623,7 @@ + + do ldconfig in post/postun of the libs subpackage + +-2008-04-28 David Lutterkort ++2008-04-29 David Lutterkort + + Free the value when freeing a tree node + +@@ -5615,8 +5653,6 @@ + Note that the baseurl nodes have to be consecutive; otherwise, put will + fail. + +-2008-04-24 David Lutterkort +- + Fix lens selection in union + The logic in put to select the appropriate branch in unions got it wrong if + the first branch matched the empty word, because applies only checked that +@@ -5630,6 +5666,8 @@ + we unref STAR at the end, we need to take ownership of STAR->LENS when + constructing the concat of L and STAR->LENS + ++2008-04-24 David Lutterkort ++ + * src/fa.c (string_extend): Handle realloc failure. + Patch by Jim Meyering + +@@ -5647,8 +5685,6 @@ + Remove trailing whitespace from the end of lines + No functional change, only formatting. + +-2008-04-23 David Lutterkort +- + Remove aug_exists - it does not exist anymore + + Delete old, outdated notes +@@ -5673,6 +5709,8 @@ + Also, parseline initializes all args as NULL now to guard against garbage + pointers accumulating from previous uses. + ++2008-04-23 David Lutterkort ++ + Don't complain about missing optional args + For example, both 'print' and 'print PATH' are legal. Make sure we accept + either. +@@ -5714,8 +5752,6 @@ + Properly escape/unescape quotes in strings + Patch provided by Alan Pevec + +-2008-04-21 David Lutterkort +- + Updated for 0.0.8 and upcoming 0.1.0 release + + Remove aug_exists from public API +@@ -5740,6 +5776,8 @@ + Parse network configs in /etc/sysconfig/ifcfg-* + Patch provided by Alan Pevec + ++2008-04-21 David Lutterkort ++ + Don't mark ROOT for MAKE_PATH as const - it's not always true + + Cap file reads (arbitrarily) at 32MB +@@ -5766,25 +5804,25 @@ + + Add "2008" to the copyright in the headers + +-2008-04-19 David Lutterkort ++2008-04-20 David Lutterkort + + Remove dependency on glib and use kazlib's hash table instead + The dependency on glib was only there for the hash tables used by + libfa. Rather than requiring all of glib just for that, use the hash table + implementation in hash.[ch] taken from kazlib. + +-2008-04-18 David Lutterkort ++2008-04-19 David Lutterkort + + Hashtable from Kazlib 1.20 + Available from http://users.footprints.net/~kaz/kazlib.html + + Abort if failing assertions are not used + +-2008-04-19 David Lutterkort ++2008-04-20 David Lutterkort + + Remove pathsplit symbol + +-2008-04-16 David Lutterkort ++2008-04-17 David Lutterkort + + Added tag release-0.0.8 for changeset cb00aa18e518 + +@@ -5794,6 +5832,8 @@ + + Install lens tests in lenses/tests/ not lenses/ + ++2008-04-16 David Lutterkort ++ + Use the right path expression to print the whole tree + + Don't segfault when a test fails without producing any tree +@@ -5802,8 +5842,6 @@ + + Call the node for a boot entry 'title' + +-2008-04-14 David Lutterkort +- + Remove the use in sequences in some places + Where indentation isn't important, we can flatten and simplify the tree by + not using seqs. Instead of something like aliases/1, aliases/2, ... we now +@@ -5816,6 +5854,8 @@ + Change the ins syntax to support insert before/after + This reflects the change to the aug_insert API + ++2008-04-14 David Lutterkort ++ + Handle searching for the last() element properly + path_first didn't find anything when looking for 'element[last()]' + +@@ -5833,7 +5873,7 @@ + + Running a failing test fails loading the whole module + +-2008-04-11 David Lutterkort ++2008-04-12 David Lutterkort + + Add path expressions allowing XPath-like path matching + Path expressions passed in through the public API can now contain indices +@@ -5842,6 +5882,8 @@ + + Syntax and semantics follow XPath. + ++2008-04-11 David Lutterkort ++ + Run all tests - don't abort after the first failure + + 2008-04-10 David Lutterkort +@@ -5852,8 +5894,6 @@ + It's enough to pass -c to augtool on the first test we run; doing it again + in later tests is completely redundant and just slows the test run down. + +-2008-04-09 David Lutterkort +- + Complain if a transform is built from a lens orphaning a key/value + Such a transform would lose information when applied and can't be + valid. Ideally, this check would be in the typechecker, but requires +@@ -5874,6 +5914,8 @@ + + Update README + ++2008-04-09 David Lutterkort ++ + Remove 'spec' files and tests that don't make sense any longer + + Fail test scripts on _any_ unexpected error +@@ -5916,8 +5958,6 @@ + is already defined locally, everything works, and if it is not, an error is + produced. + +-2008-04-08 David Lutterkort +- + Typecheck the atype of concat and iter + + Typecheck the atype of union +@@ -5933,6 +5973,8 @@ + + Clearer error message + ++2008-04-08 David Lutterkort ++ + Processing of pam.d + + Pull some useful space deleters into Util +@@ -5969,8 +6011,6 @@ + identifier mentioned in the autoload must be defined in the enclosing + module. + +-2008-04-07 David Lutterkort +- + Builtins for filters and transforms + Three simple builtins to construct transforms: + +@@ -5978,12 +6018,8 @@ + - excl : string -> filter -> filter excludes all files matching a glob + - transform: lens -> filter -> transform + +-2008-04-08 David Lutterkort +- + Implement free_lens + +-2008-04-07 David Lutterkort +- + A lens for yum + + Fix bad free +@@ -6006,13 +6042,15 @@ + + Add a 'gensym' builtin + ++2008-04-07 David Lutterkort ++ + More ref ocunting fixes + - aug_close now releases the list of modules + - compile_bracket cleans up the arg + - augparse closes the augeas connection, mostly so that we can see leaks + in valgrind better + +-2008-04-04 David Lutterkort ++2008-04-05 David Lutterkort + + Fix major brainfart in ref counting lists + The way lists were reference counted (and particularly unref'd) was just +@@ -6032,6 +6070,8 @@ + + Exceptions during compilation countas failure + ++2008-04-04 David Lutterkort ++ + Fix how the key regexp for unions is calculated + Union would produce spurious empty keys, for example in the expression + [ key /a/ . ([ l1 ] | [ l2 ]) ] +@@ -6069,8 +6109,6 @@ + + Update yylloc for string/regexp constants + +-2008-04-03 David Lutterkort +- + When compile_exp produces an exn, bind it anyway + This avoids lots of trouble with NULL values + +@@ -6113,6 +6151,8 @@ + automatically load it by looking for a file mod.aug on the module load + path. + ++2008-04-03 David Lutterkort ++ + Rename struct env to struct module + + Separate function composition from concatenation +@@ -6131,8 +6171,6 @@ + Fix reference problem + The wrong type was being unref'd + +-2008-04-02 David Lutterkort +- + Free the whole dictionary + While entries are looked up, dict->entry changes; dict->mark is the head of + the list of all entries that were ever in the dict. +@@ -6160,6 +6198,8 @@ + lns_get now reports parse errors in an lns_error struct, which is turned + into an exception in the interpreter. + ++2008-04-02 David Lutterkort ++ + Added tag ml-syntax-start for changeset fcd6c04a1eed + + A subtree without a key matches "/" +@@ -6172,8 +6212,6 @@ + + Fill in subtree->atype with empty regexp + +-2008-04-01 David Lutterkort +- + Interpreter for the new file description syntax + This is by no means done, but done enough to allow incremental fixes from + now on. This checkin still contains lots of FIXME's and bugs. Very simple +@@ -6182,7 +6220,7 @@ + The syntax for describing files is now a very simple OCaml-like functional + language; the file syntax.c implements an interpreter for that language. + +-2008-03-25 David Lutterkort ++2008-03-26 David Lutterkort + + Revamp the language + +@@ -6219,8 +6257,6 @@ + with a single node matching FOO is wrongly split as if there was a COMMENT + (which, if it were there would have to have a NULL label) + +-2008-03-13 David Lutterkort +- + Defer allocating storage for a state_set as long as possible + + Rename constants state_set_* to array_* +@@ -6242,6 +6278,8 @@ + individually, and since traversing and accessing transitions is a wee bit + faster. + ++2008-03-13 David Lutterkort ++ + Remove unused macro + + Clean up fa_iter some +@@ -6265,13 +6303,13 @@ + When order of states in a set doesn't matter, allow the set to be kept + sorted so that search can use binary search. + +-2008-03-12 David Lutterkort +- + Fix two memory leaks + + Remove the last uses of FA_MAP + Use STATE_SET instead, since it's faster and lighterweight + ++2008-03-12 David Lutterkort ++ + Rename structs fa_state and fa_trans to state and trans + + [mq]: min_hopcroft.patch +@@ -6300,8 +6338,6 @@ + reducs the overhead from memory allocations, since the array is expanded by + doubling its size (up to some threshold) + +-2008-03-11 David Lutterkort +- + fa_star added a spurious epstrans loop on new initial + + Mark live and reachable states +@@ -6324,7 +6360,7 @@ + Fix subtle bug in determinize + Fix a bug that would only hit if '\0' is ever in points. + +-2008-03-06 David Lutterkort ++2008-03-07 David Lutterkort + + Add fa_ambig_example to generate ambiguous words + Generate an ambiguous string upv given two languages and directions on how +@@ -6339,9 +6375,9 @@ + preferences, so that for example, alnum characters are preferred over + printable ones, and those over nonprintable ones. + +- Fix some cornercases in fa_example ++2008-03-06 David Lutterkort + +-2008-03-05 David Lutterkort ++ Fix some cornercases in fa_example + + Add generators and tests for some basic languages + Basic languages are the empty language, the language containing only the +@@ -6362,6 +6398,8 @@ + Also added switches to augtool to set this from the command line, and to + set the filesystem root. + ++2008-03-05 David Lutterkort ++ + Added tag release-0.0.5 for changeset 0efe2a620e39 + + Mark print_re as unused +@@ -6374,8 +6412,6 @@ + To make Augeas threadsafe, we need to move away from keeping stuff in + global variables. + +-2008-03-04 David Lutterkort +- + Add fa_example which produces an example string from a regular language + + Add a test that performs Anders Moeller's ambiguity algorithm manually +@@ -6387,6 +6423,8 @@ + + Also added tests to check these two problems. + ++2008-03-04 David Lutterkort ++ + Fix handling of negated charsets + Negated charsets where handled entirely wrong. A character set is now + represented as a map from char -> {0, 1}. That map is rather big (one byte +@@ -6406,10 +6444,10 @@ + + Add deciding unambiguously iterable based on ua concatenable + +-2008-03-03 David Lutterkort +- + Automatically free all automata allocated during a test + ++2008-03-03 David Lutterkort ++ + Cleanup the returned FA in fa_intersect + + Add a target to run fatest through valgrind +@@ -6426,7 +6464,7 @@ + Use a linker script instead. The visibility pragma is only available in gcc + >= 4.0, and thus imposes a pretty high burden to build Augeas. + +-2008-02-29 David Lutterkort ++2008-03-01 David Lutterkort + + Reign in the number of symbols exported from libaugeas + Use visibility=hidden to keep most local symbols to ourselves. Still needs +@@ -6444,6 +6482,8 @@ + + Add tests for language subsets and equality + ++2008-02-29 David Lutterkort ++ + The beginnings of a finite automata library + The code is heavily based on the Java package dk.brics.automaton by Anders + Moeller (http://www.brics.dk/automaton/) +@@ -6465,8 +6505,6 @@ + When skipping nodes with NULL label, don't segfault if the whole tail of + the list has NULL labels + +-2008-02-25 David Lutterkort +- + Added tag release-0.0.4 for changeset d8e750d82f97 + + Version 0.0.4 +@@ -6496,6 +6534,8 @@ + + Rename AUGEAS_SPECLIB to AUGEAS_LENS_LIB + ++2008-02-25 David Lutterkort ++ + Added tag release-0.0.2 for changeset f981ccccb0ab + + Include the try script in the distribution +@@ -6533,10 +6573,10 @@ + The list of env vars for AcceptEnv was not being split into individual + pieces + +-2008-02-20 David Lutterkort +- + A (pretty kludgy) description for cmfm.conf + ++2008-02-20 David Lutterkort ++ + Make printing of skel/dict optional + + Print test results a tad prettier +@@ -6574,8 +6614,6 @@ + + Allow escaping of a slash in tegular expressions + +-2008-02-18 David Lutterkort +- + Base parsing completely off regexp matching. + Parsing now uses regexp matching, and not the CFG-style parsing based on + first sets previously used. This actually makes it easier to write specs, +@@ -6594,6 +6632,8 @@ + + Remove unused token T_FIELD + ++2008-02-18 David Lutterkort ++ + Rename match.xaction to match.action + The field was named initially to avoid a clash with another 'action' field, + but that field is gone now. +@@ -6629,7 +6669,7 @@ + helps maintain the illusion for users that the split node is really just + one node. + +-2008-02-15 David Lutterkort ++2008-02-16 David Lutterkort + + Report some information underneath /augeas + The root directory and information about how files were loaded into the +@@ -6637,6 +6677,8 @@ + + Fix very bad use of realloc + ++2008-02-15 David Lutterkort ++ + Adjust expected diff + Do not allow comments to disappear + +@@ -6688,8 +6730,6 @@ + + Properly handle a NULL value in aug_set. Make aug_insert deal with NULL labels. + +-2008-02-14 David Lutterkort +- + Fixed, nicely working tests + + Readline completion +@@ -6714,15 +6754,13 @@ + + This change is majorly broken. + +-2008-02-12 David Lutterkort +- + Better description of lenses + + Different representation of the tree + The tree is now represented as a tree data structure, where each node in + the tree stores only a path component (label). + +-2008-02-08 David Lutterkort ++2008-02-09 David Lutterkort + + Beginnings of a formal writeup + +@@ -6742,8 +6780,6 @@ + + Don't segfault when the parse matches nothing + +-2008-01-29 David Lutterkort +- + Another yum test + + Remove more unneeded cruft +@@ -6777,6 +6813,8 @@ + + Test that reordering of subtrees works + ++2008-01-29 David Lutterkort ++ + Set the root of the tree from include + + Respect ordering of nodes in the config tree. +@@ -6838,7 +6876,7 @@ + + Docs + +-2008-01-24 David Lutterkort ++2008-01-25 David Lutterkort + + Rough thoughts about emit + +@@ -6883,8 +6921,6 @@ + + Detect association of values with impossible paths + +-2008-01-17 David Lutterkort +- + Make augtest set AUGEAS_ROOT and AUGEAS_SPECLIB before running augtool. + augtest now copies test files into a separate subdirectory and points + augtool to that as its root. It also points augtool to ../spec for the spec +@@ -6943,13 +6979,13 @@ + + Remove debug printing in augparse about loaded maps + +-2008-01-07 David Lutterkort ++2008-01-08 David Lutterkort + + Free tokens entirely when freeing file + + Set action in all path components + +-2008-01-03 David Lutterkort ++2008-01-04 David Lutterkort + + Provider that uses specs + The spec provider is hooked into libaugeas and loaded. It reads spec files +@@ -6969,7 +7005,7 @@ + + Compile regexps for multiline matching + +-2008-01-02 David Lutterkort ++2008-01-03 David Lutterkort + + Fix syntax error; we want to test that missing defaults are noticed + +@@ -6979,6 +7015,8 @@ + + Print the filename in errors about tokens (abbrevs) + ++2008-01-02 David Lutterkort ++ + Add name to grammars + + Add -v switch for printing errors +@@ -6990,7 +7028,7 @@ + paths is maintained. References to values work with the exception of + references to rules. + +-2007-12-21 David Lutterkort ++2007-12-22 David Lutterkort + + Check grammar acceptance/rejection + +@@ -7004,9 +7042,9 @@ + - the assignment part of the action is done after the field/group + has been parsed + +- Snapshot before changing the syntax of rule actions ++2007-12-21 David Lutterkort + +-2007-12-20 David Lutterkort ++ Snapshot before changing the syntax of rule actions + + Remove unused keyword and token 'default' + +@@ -7031,6 +7069,8 @@ + Produce tokens during parsing. + Also, nicer printing of the tokens read. + ++2007-12-20 David Lutterkort ++ + Stricter checking for ambiguous rules + Check that all items in alternatives have non-overlapping first sets. Two + sets are overlapping if they both contain an entry pointing to the same +@@ -7061,7 +7101,7 @@ + + Factor aug_make_file into internal.c + +-2007-12-01 David Lutterkort ++2007-12-02 David Lutterkort + + Be more verbose about which tests were run + +@@ -7079,7 +7119,7 @@ + + Explain yourself + +-2007-11-30 David Lutterkort ++2007-12-01 David Lutterkort + + Add a test that shows how to change the initdefault + +@@ -7099,6 +7139,8 @@ + + aug_rec_save: Check input parameters + ++2007-11-30 David Lutterkort ++ + Major overhaul of record parsing + Use PCRE to split records with regexps, and abstract a major chunk of + functionality out so it is independent of parsing pam config files +@@ -7111,7 +7153,7 @@ + + Basic tests for record parsing + +-2007-11-26 David Lutterkort ++2007-11-27 David Lutterkort + + Trim trailing slashes from paths + +diff --git a/Makefile.in b/Makefile.in +index d08d7e2..626b008 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -111,6 +111,7 @@ am__aclocal_m4_deps = $(top_srcdir)/gnulib/m4/00gnulib.m4 \ + $(top_srcdir)/gnulib/m4/pathmax.m4 \ + $(top_srcdir)/gnulib/m4/printf.m4 \ + $(top_srcdir)/gnulib/m4/putenv.m4 \ ++ $(top_srcdir)/gnulib/m4/rawmemchr.m4 \ + $(top_srcdir)/gnulib/m4/readlink.m4 \ + $(top_srcdir)/gnulib/m4/realloc.m4 \ + $(top_srcdir)/gnulib/m4/regex.m4 \ +@@ -130,6 +131,7 @@ am__aclocal_m4_deps = $(top_srcdir)/gnulib/m4/00gnulib.m4 \ + $(top_srcdir)/gnulib/m4/stdlib_h.m4 \ + $(top_srcdir)/gnulib/m4/stpcpy.m4 \ + $(top_srcdir)/gnulib/m4/stpncpy.m4 \ ++ $(top_srcdir)/gnulib/m4/strchrnul.m4 \ + $(top_srcdir)/gnulib/m4/string_h.m4 \ + $(top_srcdir)/gnulib/m4/strndup.m4 \ + $(top_srcdir)/gnulib/m4/strnlen.m4 \ +diff --git a/aclocal.m4 b/aclocal.m4 +index b3a5ed7..929c6d7 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -177,456 +177,6 @@ else + fi[]dnl + ])# PKG_CHECK_MODULES + +-# po.m4 serial 17 (gettext-0.18) +-dnl Copyright (C) 1995-2010 Free Software Foundation, Inc. +-dnl This file is free software; the Free Software Foundation +-dnl gives unlimited permission to copy and/or distribute it, +-dnl with or without modifications, as long as this notice is preserved. +-dnl +-dnl This file can can be used in projects which are not available under +-dnl the GNU General Public License or the GNU Library General Public +-dnl License but which still want to provide support for the GNU gettext +-dnl functionality. +-dnl Please note that the actual code of the GNU gettext library is covered +-dnl by the GNU Library General Public License, and the rest of the GNU +-dnl gettext package package is covered by the GNU General Public License. +-dnl They are *not* in the public domain. +- +-dnl Authors: +-dnl Ulrich Drepper , 1995-2000. +-dnl Bruno Haible , 2000-2003. +- +-AC_PREREQ([2.50]) +- +-dnl Checks for all prerequisites of the po subdirectory. +-AC_DEFUN([AM_PO_SUBDIRS], +-[ +- AC_REQUIRE([AC_PROG_MAKE_SET])dnl +- AC_REQUIRE([AC_PROG_INSTALL])dnl +- AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake +- AC_REQUIRE([AM_NLS])dnl +- +- dnl Release version of the gettext macros. This is used to ensure that +- dnl the gettext macros and po/Makefile.in.in are in sync. +- AC_SUBST([GETTEXT_MACRO_VERSION], [0.18]) +- +- dnl Perform the following tests also if --disable-nls has been given, +- dnl because they are needed for "make dist" to work. +- +- dnl Search for GNU msgfmt in the PATH. +- dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions. +- dnl The second test excludes FreeBSD msgfmt. +- AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, +- [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && +- (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], +- :) +- AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT]) +- +- dnl Test whether it is GNU msgfmt >= 0.15. +-changequote(,)dnl +- case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in +- '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;; +- *) MSGFMT_015=$MSGFMT ;; +- esac +-changequote([,])dnl +- AC_SUBST([MSGFMT_015]) +-changequote(,)dnl +- case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in +- '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;; +- *) GMSGFMT_015=$GMSGFMT ;; +- esac +-changequote([,])dnl +- AC_SUBST([GMSGFMT_015]) +- +- dnl Search for GNU xgettext 0.12 or newer in the PATH. +- dnl The first test excludes Solaris xgettext and early GNU xgettext versions. +- dnl The second test excludes FreeBSD xgettext. +- AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, +- [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && +- (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], +- :) +- dnl Remove leftover from FreeBSD xgettext call. +- rm -f messages.po +- +- dnl Test whether it is GNU xgettext >= 0.15. +-changequote(,)dnl +- case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in +- '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;; +- *) XGETTEXT_015=$XGETTEXT ;; +- esac +-changequote([,])dnl +- AC_SUBST([XGETTEXT_015]) +- +- dnl Search for GNU msgmerge 0.11 or newer in the PATH. +- AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge, +- [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :) +- +- dnl Installation directories. +- dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we +- dnl have to define it here, so that it can be used in po/Makefile. +- test -n "$localedir" || localedir='${datadir}/locale' +- AC_SUBST([localedir]) +- +- dnl Support for AM_XGETTEXT_OPTION. +- test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS= +- AC_SUBST([XGETTEXT_EXTRA_OPTIONS]) +- +- AC_CONFIG_COMMANDS([po-directories], [[ +- for ac_file in $CONFIG_FILES; do +- # Support "outfile[:infile[:infile...]]" +- case "$ac_file" in +- *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; +- esac +- # PO directories have a Makefile.in generated from Makefile.in.in. +- case "$ac_file" in */Makefile.in) +- # Adjust a relative srcdir. +- ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` +- ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" +- ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` +- # In autoconf-2.13 it is called $ac_given_srcdir. +- # In autoconf-2.50 it is called $srcdir. +- test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" +- case "$ac_given_srcdir" in +- .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; +- /*) top_srcdir="$ac_given_srcdir" ;; +- *) top_srcdir="$ac_dots$ac_given_srcdir" ;; +- esac +- # Treat a directory as a PO directory if and only if it has a +- # POTFILES.in file. This allows packages to have multiple PO +- # directories under different names or in different locations. +- if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then +- rm -f "$ac_dir/POTFILES" +- test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" +- cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" +- POMAKEFILEDEPS="POTFILES.in" +- # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend +- # on $ac_dir but don't depend on user-specified configuration +- # parameters. +- if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then +- # The LINGUAS file contains the set of available languages. +- if test -n "$OBSOLETE_ALL_LINGUAS"; then +- test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" +- fi +- ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` +- # Hide the ALL_LINGUAS assigment from automake < 1.5. +- eval 'ALL_LINGUAS''=$ALL_LINGUAS_' +- POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" +- else +- # The set of available languages was given in configure.in. +- # Hide the ALL_LINGUAS assigment from automake < 1.5. +- eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' +- fi +- # Compute POFILES +- # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) +- # Compute UPDATEPOFILES +- # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update) +- # Compute DUMMYPOFILES +- # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop) +- # Compute GMOFILES +- # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo) +- case "$ac_given_srcdir" in +- .) srcdirpre= ;; +- *) srcdirpre='$(srcdir)/' ;; +- esac +- POFILES= +- UPDATEPOFILES= +- DUMMYPOFILES= +- GMOFILES= +- for lang in $ALL_LINGUAS; do +- POFILES="$POFILES $srcdirpre$lang.po" +- UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" +- DUMMYPOFILES="$DUMMYPOFILES $lang.nop" +- GMOFILES="$GMOFILES $srcdirpre$lang.gmo" +- done +- # CATALOGS depends on both $ac_dir and the user's LINGUAS +- # environment variable. +- INST_LINGUAS= +- if test -n "$ALL_LINGUAS"; then +- for presentlang in $ALL_LINGUAS; do +- useit=no +- if test "%UNSET%" != "$LINGUAS"; then +- desiredlanguages="$LINGUAS" +- else +- desiredlanguages="$ALL_LINGUAS" +- fi +- for desiredlang in $desiredlanguages; do +- # Use the presentlang catalog if desiredlang is +- # a. equal to presentlang, or +- # b. a variant of presentlang (because in this case, +- # presentlang can be used as a fallback for messages +- # which are not translated in the desiredlang catalog). +- case "$desiredlang" in +- "$presentlang"*) useit=yes;; +- esac +- done +- if test $useit = yes; then +- INST_LINGUAS="$INST_LINGUAS $presentlang" +- fi +- done +- fi +- CATALOGS= +- if test -n "$INST_LINGUAS"; then +- for lang in $INST_LINGUAS; do +- CATALOGS="$CATALOGS $lang.gmo" +- done +- fi +- test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" +- sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" +- for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do +- if test -f "$f"; then +- case "$f" in +- *.orig | *.bak | *~) ;; +- *) cat "$f" >> "$ac_dir/Makefile" ;; +- esac +- fi +- done +- fi +- ;; +- esac +- done]], +- [# Capture the value of obsolete ALL_LINGUAS because we need it to compute +- # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it +- # from automake < 1.5. +- eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"' +- # Capture the value of LINGUAS because we need it to compute CATALOGS. +- LINGUAS="${LINGUAS-%UNSET%}" +- ]) +-]) +- +-dnl Postprocesses a Makefile in a directory containing PO files. +-AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE], +-[ +- # When this code is run, in config.status, two variables have already been +- # set: +- # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in, +- # - LINGUAS is the value of the environment variable LINGUAS at configure +- # time. +- +-changequote(,)dnl +- # Adjust a relative srcdir. +- ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` +- ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" +- ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` +- # In autoconf-2.13 it is called $ac_given_srcdir. +- # In autoconf-2.50 it is called $srcdir. +- test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" +- case "$ac_given_srcdir" in +- .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; +- /*) top_srcdir="$ac_given_srcdir" ;; +- *) top_srcdir="$ac_dots$ac_given_srcdir" ;; +- esac +- +- # Find a way to echo strings without interpreting backslash. +- if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then +- gt_echo='echo' +- else +- if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then +- gt_echo='printf %s\n' +- else +- echo_func () { +- cat < "$ac_file.tmp" +- if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then +- # Add dependencies that cannot be formulated as a simple suffix rule. +- for lang in $ALL_LINGUAS; do +- frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` +- cat >> "$ac_file.tmp" < /dev/null; then +- # Add dependencies that cannot be formulated as a simple suffix rule. +- for lang in $ALL_LINGUAS; do +- frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'` +- cat >> "$ac_file.tmp" < Revision: 16556 http://gar.svn.sourceforge.net/gar/?rev=16556&view=rev Author: guengel Date: 2011-12-18 09:01:01 +0000 (Sun, 18 Dec 2011) Log Message: ----------- postgresql/branches/postgresql-8.3-raos: Added postmsg. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile 2011-12-17 22:22:10 UTC (rev 16555) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile 2011-12-18 09:01:01 UTC (rev 16556) @@ -176,10 +176,14 @@ INITSCRIPTFILETMPL = $(INITSCRIPTFILE).tmpl INITSCRIPTFILE_VERSIONED = $(INITSCRIPTFILE)-$(BASE_VERSION_NODOT) + # These are the alternatives provided for the packages. I use them in the # recipe to iterate over all possible alternatives (see 'post-merge:') myALTERNATIVES= server client dev contrib +POSTMSG = $(foreach n,$(myALTERNATIVES),$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_$(n)/CSW$(NAME)$(BASE_VERSION_NODOT)-$(n).postmsg) + + # My sed, since EXPANDVARS has proven unreliable to me mySED = gsed -e 's|@USERGROUPFILE_VERSIONED@|$(USERGROUPFILE_VERSIONED)|g' \ -e 's|@CSWPGSQLCONFFILE_VERSIONED@|$(CSWPGSQLCONFFILE_VERSIONED)|g' \ @@ -200,7 +204,10 @@ DISTFILES += $(INITSCRIPTFILETMPL) DISTFILES += $(USERGROUPFILETMPL) DISTFILES += $(CSWPGSQLCONFFILETMPL) +DISTFILES += $(notdir $(POSTMSG)) +NOCHECKSUM = $(notdir $(POSTMSG)) + # This patch will replace /usr/local/include by /opt/csw/include in # ecpg.c and thus silence a checkpkg error. PATCHFILES += 0001-ecpg-usr-local-include-replacement.patch @@ -262,7 +269,7 @@ CHECKPKG_OVERRIDES_CSW$(NAME)$(BASE_VERSION_NODOT)-server = $(foreach n,$(SO_NAMES_SERVER), soname-not-part-of-filename|soname=lib$(n).0|filename=$(n) ) # This one isn't covered by the above. CHECKPKG_OVERRIDES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += soname-not-part-of-filename|soname=libplpgsql.so.1|filename=plpgsql.so -#ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-server = $(foreach i,$(BUILD_ISAS), server_$(i)) +#ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-server = $(foreach i,$(NEEDED_ISAS), server_$(i)) PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-client SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-client = PostgreSQL $(VERSION), Client @@ -278,7 +285,7 @@ RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibxslt1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibgssapi-krb5-2 -#ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-client = $(foreach i,$(BUILD_ISAS), client_$(i)) +#ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-client = $(foreach i,$(NEEDED_ISAS), client_$(i)) PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-contrib SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = PostgreSQL $(VERSION), Contrib @@ -297,7 +304,7 @@ RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibreadline6 # This will produce some 'unused overrides'. CHECKPKG_OVERRIDES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = $(foreach n,$(SO_NAMES_CONTRIB), soname-not-part-of-filename|soname=lib$(n).0|filename=$(n) ) -#ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = $(foreach i,$(BUILD_ISAS), contrib_$(i)) +#ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = $(foreach i,$(NEEDED_ISAS), contrib_$(i)) PACKAGES += CSW$(NAME)-dev SPKG_DESC_CSW$(NAME)-dev = PostgreSQL $(VERSION), Development Files @@ -319,13 +326,8 @@ RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibreadline6 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWosslrt # Those '/usr/local' are ok, they are in a HPUX section of the file -CHECKPKG_OVERRIDES_CSW$(NAME)-dev += $(foreach i,$(BUILD_ISAS), $(subst $(ISA_DEFAULT)/,,file-with-bad-content|/usr/local|root$(libdir)/$(i)/$(NAME)/$(BASE_VERSION_NODOT)/pgxs/src/Makefile.shlib) ) -# The above did not get rid of these, so, until I figure out how to -# merge them with the above, they stay here -CHECKPKG_OVERRIDES_CSW$(NAME)-dev += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/$(NAME)/$(BASE_VERSION_NODOT)/pgxs/src/Makefile.shlib -# This happens only on amd64 -CHECKPKG_OVERRIDES_CSW$(NAME)-dev += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/$(NAME)/$(BASE_VERSION_NODOT)/pgxs/src/Makefile.global -#ALTERNATIVES_CSW$(NAME)-dev = $(foreach i,$(BUILD_ISAS), dev_$(i)) +CHECKPKG_OVERRIDES_CSW$(NAME)-dev += $(foreach i,$(NEEDED_ISAS), $(subst $(ISA_DEFAULT)/,,file-with-bad-content|/usr/local|root$(libdir)/$(i)/$(NAME)/$(BASE_VERSION_NODOT)/pgxs/src/Makefile.shlib) ) +#ALTERNATIVES_CSW$(NAME)-dev = $(foreach i,$(NEEDED_ISAS), dev_$(i)) PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-doc ARCHALL_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = 1 @@ -393,10 +395,6 @@ CONFIGURE_ARGS += --without-krb5 CONFIGURE_ARGS += --without-bonjour -# Skipping tests to save time during packaging, and to enable x86 builds. -# -# IMHO, tests are essential, especially on Solaris, and I do not experience -# build troubles on x86 having them enabled --raos #SKIPTEST ?= 1 include gar/category.mk @@ -405,19 +403,19 @@ # This will generate the ALTERNATIVEs for the binaries in $(libexecdir)/postgresql/XY. # I consider this bad voodoo. ## Server -$(foreach alt,$(BUILD_ISAS), $(eval alt_priority=$(shell expr $(alt_priority) + 10)) $(eval ALTERNATIVE_server_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_SERVER)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-server $(libexecdir)/$(subst server_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) $(eval ALTERNATIVE_server_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_SERVER)),$(BIN_NAMES_SERVER)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT) $(libexecdir)/$(subst server_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) ) +$(foreach alt,$(NEEDED_ISAS), $(eval alt_priority=$(shell expr $(alt_priority) + 10)) $(eval ALTERNATIVE_server_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_SERVER)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-server $(libexecdir)/$(subst server_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) $(eval ALTERNATIVE_server_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_SERVER)),$(BIN_NAMES_SERVER)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT) $(libexecdir)/$(subst server_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) ) ## Client # reset priority alt_priority = 20 -$(foreach alt,$(BUILD_ISAS), $(eval alt_priority=$(shell expr $(alt_priority) + 10)) $(eval ALTERNATIVE_client_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_CLIENT)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-client $(libexecdir)/$(subst client_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) $(eval ALTERNATIVE_client_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_CLIENT)),$(BIN_NAMES_CLIENT)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT) $(libexecdir)/$(subst client_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) ) +$(foreach alt,$(NEEDED_ISAS), $(eval alt_priority=$(shell expr $(alt_priority) + 10)) $(eval ALTERNATIVE_client_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_CLIENT)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-client $(libexecdir)/$(subst client_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) $(eval ALTERNATIVE_client_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_CLIENT)),$(BIN_NAMES_CLIENT)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT) $(libexecdir)/$(subst client_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) ) ## Contrib # reset priority alt_priority = 20 -$(foreach alt,$(BUILD_ISAS), $(eval alt_priority=$(shell expr $(alt_priority) + 10)) $(eval ALTERNATIVE_contrib_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_CONTRIB)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-contrib $(libexecdir)/$(subst contrib_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) $(eval ALTERNATIVE_contrib_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_CONTRIB)),$(BIN_NAMES_CONTRIB)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT) $(libexecdir)/$(subst contrib_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) ) +$(foreach alt,$(NEEDED_ISAS), $(eval alt_priority=$(shell expr $(alt_priority) + 10)) $(eval ALTERNATIVE_contrib_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_CONTRIB)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-contrib $(libexecdir)/$(subst contrib_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) $(eval ALTERNATIVE_contrib_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_CONTRIB)),$(BIN_NAMES_CONTRIB)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT) $(libexecdir)/$(subst contrib_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) ) ## Devel # reset priority alt_priority = 20 -$(foreach alt,$(BUILD_ISAS), $(eval alt_priority=$(shell expr $(alt_priority) + 10)) $(eval ALTERNATIVE_dev_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_DEVEL)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-dev $(libexecdir)/$(subst dev_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) $(eval ALTERNATIVE_dev_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_DEVEL)),$(BIN_NAMES_DEVEL)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT) $(libexecdir)/$(subst dev_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) ) +$(foreach alt,$(NEEDED_ISAS), $(eval alt_priority=$(shell expr $(alt_priority) + 10)) $(eval ALTERNATIVE_dev_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_DEVEL)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-dev $(libexecdir)/$(subst dev_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) $(eval ALTERNATIVE_dev_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_DEVEL)),$(BIN_NAMES_DEVEL)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT) $(libexecdir)/$(subst dev_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) ) # We adjust the $(pkglibdir) found in $(WORKSRC)/src/Makefile.global.in, so # that it should be possible to install 8.x and 8.y concurrently @@ -440,7 +438,7 @@ post-merge: # Create my alternatives files - $(foreach a,$(myALTERNATIVES), $(foreach i,$(BUILD_ISAS), $(shell ginstall -d $(PKGROOT)$(sharedstatedir)/alternatives ; echo "$(ALTERNATIVE_$(a)_$(i))" > $(PKGROOT)$(sharedstatedir)/alternatives/$(NAME)$(BASE_VERSION_NODOT)_$(a)_$(i)))) + $(foreach a,$(myALTERNATIVES), $(foreach i,$(NEEDED_ISAS), $(shell ginstall -d $(PKGROOT)$(sharedstatedir)/alternatives ; echo "$(ALTERNATIVE_$(a)_$(i))" > $(PKGROOT)$(sharedstatedir)/alternatives/$(NAME)$(BASE_VERSION_NODOT)_$(a)_$(i)))) # Create the PGDATA directory ginstall -d $(PKGROOT)$(PGDATA) # The usergroup file @@ -464,7 +462,22 @@ -e 's|/usr/local|$(prefix)|g' \ -e 's|/usr/share|$(datadir)|g' $$f ; \ done + $(foreach n,$(POSTMSG), $(shell ginstall -d $(PKGROOT)$(dir $(n))) $(shell ginstall $(WORKDIR)/$(notdir $(n)) $(PKGROOT)$(n))) @$(MAKECOOKIE) pre-package: $(mySED) $(FILEDIR)/CSWpostgresql-server.postinstall.tmpl > $(WORKDIR)/CSW$(NAME)$(BASE_VERSION_NODOT)-server.postinstall + +$(foreach n,$(POSTMSG),$(DOWNLOADDIR)/$(notdir $(n))): + @echo " ==> Generating $(notdir $@)" + @(exec >$@; \ + echo "There are 32bit and 64bit versions of $(NAME) $(VERSION) binaries on the system installed:"; \ + echo; \ + echo "You can easily select between the versions with the alternatives(8)"; \ + echo "system by executing"; \ + echo; \ + echo " /opt/csw/sbin/alternatives --config $(subst .postmsg,,$(subst CSW,,$(notdir $@)))"; \ + echo; \ + echo "See http://www.opencsw.org/packages/alternatives for details." ; \ + ) + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Dec 18 14:44:44 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 18 Dec 2011 13:44:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[16557] csw/mgar/pkg/postgresql/branches/postgresql-8. 3-raos Message-ID: Revision: 16557 http://gar.svn.sourceforge.net/gar/?rev=16557&view=rev Author: guengel Date: 2011-12-18 13:44:44 +0000 (Sun, 18 Dec 2011) Log Message: ----------- postgresql/branches/postgresql-8.3-raos: Put EXPANDVARS back in place. Bumped version 8.3.17. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/checksums csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswpostgresql.tmpl Removed Paths: ------------- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libecpg.so.4-i386-libecpg.so.4.2 csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libecpg.so.4-sparcv8-libecpg.so.4.2 csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libecpg.so.4-sparcv9-libecpg.so.4.2 csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libecpg.so.5-i386-libecpg.so.5.2 csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libecpg.so.5-sparcv8-libecpg.so.5.2 csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libecpg.so.5-sparcv9-libecpg.so.5.2 csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libecpg_compat.so.2-i386-libecpg_compat.so.2.2 csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libecpg_compat.so.2-sparcv8-libecpg_compat.so.2.2 csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libecpg_compat.so.2-sparcv9-libecpg_compat.so.2.2 csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpgtypes.so.1-i386-libpgtypes.so.1.2 csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpgtypes.so.1-sparcv8-libpgtypes.so.1.2 csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpgtypes.so.1-sparcv9-libpgtypes.so.1.2 csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpgtypes.so.2-i386-libpgtypes.so.2.2 csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpgtypes.so.2-sparcv8-libpgtypes.so.2.2 csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpgtypes.so.2-sparcv9-libpgtypes.so.2.2 csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpq.so.3-i386-libpq.so.3.2 csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpq.so.3-sparcv8-libpq.so.3.2 csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpq.so.3-sparcv9-libpq.so.3.2 csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpq.so.4-i386-libpq.so.4.1 csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpq.so.4-sparcv8-libpq.so.4.1 csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpq.so.4-sparcv9-libpq.so.4.1 csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/merge_legacy_libs.sh Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile 2011-12-18 09:01:01 UTC (rev 16556) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile 2011-12-18 13:44:44 UTC (rev 16557) @@ -92,7 +92,7 @@ BASE_VERSION = 8.3 VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION)) -PATCHLEVEL = 16 +PATCHLEVEL = 17 VERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = apps @@ -176,37 +176,32 @@ INITSCRIPTFILETMPL = $(INITSCRIPTFILE).tmpl INITSCRIPTFILE_VERSIONED = $(INITSCRIPTFILE)-$(BASE_VERSION_NODOT) +# The postinstall script for the postgreSQL server +SERVERPOSTINSTTMPL = CSWpostgresql-server.postinstall.tmpl +SERVERPOSTINST_VERSIONED = CSW$(NAME)$(BASE_VERSION_NODOT)-server.postinstall + # These are the alternatives provided for the packages. I use them in the # recipe to iterate over all possible alternatives (see 'post-merge:') myALTERNATIVES= server client dev contrib POSTMSG = $(foreach n,$(myALTERNATIVES),$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_$(n)/CSW$(NAME)$(BASE_VERSION_NODOT)-$(n).postmsg) - -# My sed, since EXPANDVARS has proven unreliable to me -mySED = gsed -e 's|@USERGROUPFILE_VERSIONED@|$(USERGROUPFILE_VERSIONED)|g' \ - -e 's|@CSWPGSQLCONFFILE_VERSIONED@|$(CSWPGSQLCONFFILE_VERSIONED)|g' \ - -e 's|@INITSCRIPTFILE_VERSIONED@|$(INITSCRIPTFILE_VERSIONED)|g' \ - -e 's|@NAME@|$(NAME)|g' \ - -e 's|@VERSION@|$(VERSION)|g' \ - -e 's|@BASE_VERSION_NODOT@|$(BASE_VERSION_NODOT)|g' \ - -e 's|@PGLOCALSTATEDIR_BASE@|$(PGLOCALSTATEDIR_BASE)|g' \ - -e 's|@PGDATA@|$(PGDATA)|g' \ - -e 's|@sysconfdir@|$(sysconfdir)|g' \ - -e 's|@bindir@|$(bindir)|g' - - MASTER_SITES = http://ftp.postgresql.org/pub/source/v$(VERSION)/ DISTFILES = $(NAME)-$(VERSION).tar.bz2 DISTFILES += README-CSW.txt -DISTFILES += CSWpostgresql-server.postinstall.tmpl +DISTFILES += $(SERVERPOSTINSTTMPL) DISTFILES += $(INITSCRIPTFILETMPL) DISTFILES += $(USERGROUPFILETMPL) DISTFILES += $(CSWPGSQLCONFFILETMPL) DISTFILES += $(notdir $(POSTMSG)) NOCHECKSUM = $(notdir $(POSTMSG)) +EXPANDVARS = $(CSWPGSQLCONFFILETMPL) +EXPANDVARS += $(INITSCRIPTFILETMPL) +EXPANDVARS += $(CSWPGSQLCONFFILETMPL) +EXPANDVARS += $(SERVERPOSTINSTTMPL) +EXPANDVARS += $(USERGROUPFILETMPL) # This patch will replace /usr/local/include by /opt/csw/include in # ecpg.c and thus silence a checkpkg error. @@ -327,6 +322,8 @@ RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWosslrt # Those '/usr/local' are ok, they are in a HPUX section of the file CHECKPKG_OVERRIDES_CSW$(NAME)-dev += $(foreach i,$(NEEDED_ISAS), $(subst $(ISA_DEFAULT)/,,file-with-bad-content|/usr/local|root$(libdir)/$(i)/$(NAME)/$(BASE_VERSION_NODOT)/pgxs/src/Makefile.shlib) ) +# That's ok too, it's docbook stuff which we don't use in this build +CHECKPKG_OVERRIDES_CSW$(NAME)-dev += $(foreach i,$(NEEDED_ISAS), $(subst $(ISA_DEFAULT)/,,file-with-bad-content|/usr/share|root$(libdir)/$(i)/$(NAME)/$(BASE_VERSION_NODOT)/pgxs/src/Makefile.shlib) ) #ALTERNATIVES_CSW$(NAME)-dev = $(foreach i,$(NEEDED_ISAS), dev_$(i)) PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-doc @@ -441,15 +438,6 @@ $(foreach a,$(myALTERNATIVES), $(foreach i,$(NEEDED_ISAS), $(shell ginstall -d $(PKGROOT)$(sharedstatedir)/alternatives ; echo "$(ALTERNATIVE_$(a)_$(i))" > $(PKGROOT)$(sharedstatedir)/alternatives/$(NAME)$(BASE_VERSION_NODOT)_$(a)_$(i)))) # Create the PGDATA directory ginstall -d $(PKGROOT)$(PGDATA) -# The usergroup file - ginstall -d $(PKGROOT)$(USERGROUPDIR) - $(mySED) $(FILEDIR)/$(USERGROUPFILETMPL) > $(PKGROOT)$(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED) -# The init script - ginstall -d $(PKGROOT)$(sysconfdir)/init.d - $(mySED) $(FILEDIR)/$(INITSCRIPTFILETMPL) > $(PKGROOT)$(sysconfdir)/init.d/$(INITSCRIPTFILE_VERSIONED) - chmod 0755 $(PKGROOT)$(sysconfdir)/init.d/$(INITSCRIPTFILE_VERSIONED) -# The init script config - $(mySED) $(FILEDIR)/$(CSWPGSQLCONFFILETMPL) > $(PKGROOT)$(sysconfdir)/$(CSWPGSQLCONFFILE_VERSIONED).CSW # Adjust the man page names for man1 for f in $(PKGROOT)$(datadir)/man/man1/* ; do \ f_no_suffix="`echo $$f | sed -e 's/.1$$//'`" ; \ @@ -465,8 +453,21 @@ $(foreach n,$(POSTMSG), $(shell ginstall -d $(PKGROOT)$(dir $(n))) $(shell ginstall $(WORKDIR)/$(notdir $(n)) $(PKGROOT)$(n))) @$(MAKECOOKIE) + pre-package: - $(mySED) $(FILEDIR)/CSWpostgresql-server.postinstall.tmpl > $(WORKDIR)/CSW$(NAME)$(BASE_VERSION_NODOT)-server.postinstall +# The postinstall for the server package + ginstall $(WORKDIR)/$(SERVERPOSTINSTTMPL) $(WORKDIR)/$(SERVERPOSTINST_VERSIONED) +# The usergroup file + ginstall -d $(PKGROOT)$(USERGROUPDIR) + ginstall $(WORKDIR)/$(USERGROUPFILETMPL) $(PKGROOT)$(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED) +# The init script + ginstall -d $(PKGROOT)$(sysconfdir)/init.d + ginstall $(WORKDIR)/$(INITSCRIPTFILETMPL) $(PKGROOT)$(sysconfdir)/init.d/$(INITSCRIPTFILE_VERSIONED) + chmod 0755 $(PKGROOT)$(sysconfdir)/init.d/$(INITSCRIPTFILE_VERSIONED) +# The init script config + ginstall $(WORKDIR)/$(CSWPGSQLCONFFILETMPL) $(PKGROOT)$(sysconfdir)/$(CSWPGSQLCONFFILE_VERSIONED).CSW + @$(MAKECOOKIE) + @$(MAKECOOKIE) $(foreach n,$(POSTMSG),$(DOWNLOADDIR)/$(notdir $(n))): @echo " ==> Generating $(notdir $@)" Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/checksums =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/checksums 2011-12-18 09:01:01 UTC (rev 16556) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/checksums 2011-12-18 13:44:44 UTC (rev 16557) @@ -1 +1 @@ -92004b0494b646748a1f562cea7d695e postgresql-8.3.16.tar.bz2 +cedfbcdb153291c0762492ef34fa7b41 postgresql-8.3.17.tar.bz2 Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswpostgresql.tmpl =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswpostgresql.tmpl 2011-12-18 09:01:01 UTC (rev 16556) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswpostgresql.tmpl 2011-12-18 13:44:44 UTC (rev 16557) @@ -9,16 +9,12 @@ # - Style changes # # -# This files is a template. The following variables need to be substituted -# before it can be run: -# -# - PGDATA -# - bindir -# - sysconfdir +VERSION=@BASE_VERSION_NODOT@ + USERCONF=@CSWPGSQLCONFFILE_VERSIONED@ -PGCTL=@bindir@/pg_ctl- at BASE_VERSION_NODOT@ -PGINIT=@bindir@/initdb- at BASE_VERSION_NODOT@ +PGCTL=@bindir@/pg_ctl-${VERSION} +PGINIT=@bindir@/initdb-${VERSION} # Read in the user configuration file [ -s /opt/csw/etc/${USERCONF} ] && . /opt/csw/etc/${USERCONF} Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libecpg.so.4-i386-libecpg.so.4.2 =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libecpg.so.4-sparcv8-libecpg.so.4.2 =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libecpg.so.4-sparcv9-libecpg.so.4.2 =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libecpg.so.5-i386-libecpg.so.5.2 =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libecpg.so.5-sparcv8-libecpg.so.5.2 =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libecpg.so.5-sparcv9-libecpg.so.5.2 =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libecpg_compat.so.2-i386-libecpg_compat.so.2.2 =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libecpg_compat.so.2-sparcv8-libecpg_compat.so.2.2 =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libecpg_compat.so.2-sparcv9-libecpg_compat.so.2.2 =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpgtypes.so.1-i386-libpgtypes.so.1.2 =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpgtypes.so.1-sparcv8-libpgtypes.so.1.2 =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpgtypes.so.1-sparcv9-libpgtypes.so.1.2 =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpgtypes.so.2-i386-libpgtypes.so.2.2 =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpgtypes.so.2-sparcv8-libpgtypes.so.2.2 =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpgtypes.so.2-sparcv9-libpgtypes.so.2.2 =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpq.so.3-i386-libpq.so.3.2 =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpq.so.3-sparcv8-libpq.so.3.2 =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpq.so.3-sparcv9-libpq.so.3.2 =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpq.so.4-i386-libpq.so.4.1 =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpq.so.4-sparcv8-libpq.so.4.1 =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/libpq.so.4-sparcv9-libpq.so.4.1 =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/merge_legacy_libs.sh =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/merge_legacy_libs.sh 2011-12-18 09:01:01 UTC (rev 16556) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/merge_legacy_libs.sh 2011-12-18 13:44:44 UTC (rev 16557) @@ -1,41 +0,0 @@ -#!/opt/csw/bin/bash -# $Id$ - -set -u -set -e -set -x - -declare -r ARCH=$1 -declare -r SOURCE_DIR=$2 -declare -r TARGET_DIR=$3 - -if [[ "${ARCH}" = "i386" ]]; then - archs="i386 amd64" -elif [[ "${ARCH}" = "sparc" ]]; then - archs="sparcv8 sparcv9" -else - echo "Wrong arch: ${ARCH}" - exit 1 -fi - -for arch in ${archs}; do - files=${SOURCE_DIR}/lib*-${arch}-* - for f in $files; do - if [[ -r ${f} ]]; then - bn=$(basename ${f}) - soname=$(echo $bn | cut -d- -f1) - filename=$(echo $bn | cut -d- -f3) - echo + ${bn} - if [[ "${arch}" = "sparcv8" || "${arch}" = "i386" ]]; then - gcp ${SOURCE_DIR}/${bn} ${TARGET_DIR}/${filename} - gln -s ${filename} ${TARGET_DIR}/${soname} - else - mkdir -p ${TARGET_DIR}/${arch} - gcp ${SOURCE_DIR}/${bn} ${TARGET_DIR}/${arch}/${filename} - gln -s ${filename} ${TARGET_DIR}/${arch}/${soname} - fi - else - echo - ${f} - fi - done -done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Dec 18 15:00:16 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 18 Dec 2011 14:00:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[16558] csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile Message-ID: Revision: 16558 http://gar.svn.sourceforge.net/gar/?rev=16558&view=rev Author: guengel Date: 2011-12-18 14:00:16 +0000 (Sun, 18 Dec 2011) Log Message: ----------- gtk2/branches/2.24-raos: Added RUNTIME_DEP. Removed inaccurate comment. Modified Paths: -------------- csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile Modified: csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile =================================================================== --- csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile 2011-12-18 13:44:44 UTC (rev 16557) +++ csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile 2011-12-18 14:00:16 UTC (rev 16558) @@ -1,23 +1,4 @@ # $Id$ -# -# Note 1: 32/64bit builds -# ------ -# -# The IM Modules stuff expects a file listing all the available -# modules which is created by gtk-query-immodules-2.0. By default this -# file is located at $(sysconfdir)/gtk-2.0/gtk.immodules. Since we -# provide 32/64bit libraries we cannot simply go with the default. -# -# This recipe has two patches which take care of the above mentioned -# problem. The first patch makes 64bit libraries look for -# $(sysconfdir)/gtk-2.0/gtk.immodules-64. 32bit libraries still use -# $(sysconfdir)/gtk-2.0/gtk.immodules. -# -# The second patch modifies gtk-query-immodules-2.0, so that it -# accepts a command line option '--update-modules' which will create -# the proper file in $(sysconfdir)/gtk-2.0/ depending on the ISA, -# i.e. gtk.immodules-64 on 64bit ISAs and gtk.immodules on 32bit -# ISAs. This helps to greatly simplify the postinstall script. NAME = gtk2 VERSION = 2.24.8 @@ -285,6 +266,7 @@ # I pull the whole gdk pixbuf to make sure gdk-pixbuf-query-loaders # will be called as well RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWgdkpixbuf +RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibgdk-pixbuf-dev RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWfconfig RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWftype2 RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibatk1-0-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 Sun Dec 18 15:15:55 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 18 Dec 2011 14:15:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[16559] csw/mgar/pkg/pigz/trunk Message-ID: Revision: 16559 http://gar.svn.sourceforge.net/gar/?rev=16559&view=rev Author: dmichelsen Date: 2011-12-18 14:15:54 +0000 (Sun, 18 Dec 2011) Log Message: ----------- pigz/trunk: Update to 2.1.7 and latest standards Modified Paths: -------------- csw/mgar/pkg/pigz/trunk/Makefile csw/mgar/pkg/pigz/trunk/checksums Modified: csw/mgar/pkg/pigz/trunk/Makefile =================================================================== --- csw/mgar/pkg/pigz/trunk/Makefile 2011-12-18 14:00:16 UTC (rev 16558) +++ csw/mgar/pkg/pigz/trunk/Makefile 2011-12-18 14:15:54 UTC (rev 16559) @@ -1,5 +1,5 @@ NAME = pigz -VERSION = 2.1.6 +VERSION = 2.1.7 CATEGORIES = utils DESCRIPTION = A parallel implementation of gzip @@ -12,21 +12,19 @@ MASTER_SITES = http://www.zlib.net/pigz/ DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTNAME = $(NAME) DISTFILES += pigz-wrapper DISTFILES += unpigz-wrapper -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +VENDOR_URL = http://www.zlib.net/pigz/ -# 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 = - -SPKG_SOURCEURL = http://www.zlib.net/pigz/ - LICENSE = README -RUNTIME_DEP_PKGS = CSWzlib +PACKAGES += CSWpigz +SPKG_DESC_CSWpigz = A parallel implementation of gzip +RUNTIME_DEP_PKGS_CSWpigz += CSWlibz1 +# This is just the license +CHECKPKG_OVERRIDES_CSWpigz += file-with-bad-content|/usr/local|root/opt/csw/share/doc/pigz/license # Optimization show effects < 5% #REQUESTED_ISAS = $(ISALIST_$(GARCOMPILER)) Modified: csw/mgar/pkg/pigz/trunk/checksums =================================================================== --- csw/mgar/pkg/pigz/trunk/checksums 2011-12-18 14:00:16 UTC (rev 16558) +++ csw/mgar/pkg/pigz/trunk/checksums 2011-12-18 14:15:54 UTC (rev 16559) @@ -1,3 +1 @@ -cbe9030c4be3d0ef2438ee5f8b169ca4 pigz-2.1.6.tar.gz -58c123caae9ea93973c815d175e43dbf pigz-wrapper -13ba5dde0a6279f3394947a587f1c027 unpigz-wrapper +a09e1097fdc05ac0fff763bdb4d2d5e4 pigz-2.1.7.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Dec 18 16:13:03 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 18 Dec 2011 15:13:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[16560] csw/mgar/pkg/postgresql/branches/postgresql-8. 3-raos/Makefile Message-ID: Revision: 16560 http://gar.svn.sourceforge.net/gar/?rev=16560&view=rev Author: guengel Date: 2011-12-18 15:13:02 +0000 (Sun, 18 Dec 2011) Log Message: ----------- postgresql/branches/postgresql-8.3-raos: Fixed CHECKPKG_OVERRIDES. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile 2011-12-18 14:15:54 UTC (rev 16559) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile 2011-12-18 15:13:02 UTC (rev 16560) @@ -323,7 +323,7 @@ # Those '/usr/local' are ok, they are in a HPUX section of the file CHECKPKG_OVERRIDES_CSW$(NAME)-dev += $(foreach i,$(NEEDED_ISAS), $(subst $(ISA_DEFAULT)/,,file-with-bad-content|/usr/local|root$(libdir)/$(i)/$(NAME)/$(BASE_VERSION_NODOT)/pgxs/src/Makefile.shlib) ) # That's ok too, it's docbook stuff which we don't use in this build -CHECKPKG_OVERRIDES_CSW$(NAME)-dev += $(foreach i,$(NEEDED_ISAS), $(subst $(ISA_DEFAULT)/,,file-with-bad-content|/usr/share|root$(libdir)/$(i)/$(NAME)/$(BASE_VERSION_NODOT)/pgxs/src/Makefile.shlib) ) +CHECKPKG_OVERRIDES_CSW$(NAME)-dev += $(foreach i,$(NEEDED_ISAS), $(subst $(ISA_DEFAULT)/,,file-with-bad-content|/usr/share|root$(libdir)/$(i)/$(NAME)/$(BASE_VERSION_NODOT)/pgxs/src/Makefile.global) ) #ALTERNATIVES_CSW$(NAME)-dev = $(foreach i,$(NEEDED_ISAS), dev_$(i)) PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-doc This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Dec 18 16:21:58 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 18 Dec 2011 15:21:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[16561] csw/mgar/pkg/php5_apc/trunk/Makefile Message-ID: Revision: 16561 http://gar.svn.sourceforge.net/gar/?rev=16561&view=rev Author: bdwalton Date: 2011-12-18 15:21:57 +0000 (Sun, 18 Dec 2011) Log Message: ----------- php5_apc/trunk: add sparc specific tweak to get passing tests (not optimal but maybe workable) Modified Paths: -------------- csw/mgar/pkg/php5_apc/trunk/Makefile Modified: csw/mgar/pkg/php5_apc/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5_apc/trunk/Makefile 2011-12-18 15:13:02 UTC (rev 16560) +++ csw/mgar/pkg/php5_apc/trunk/Makefile 2011-12-18 15:21:57 UTC (rev 16561) @@ -51,6 +51,14 @@ include gar/category.mk +# these are after the include so GARCH is set. +# attempting to get a usable build on sparc: +# https://bugs.php.net/bug.php?id=59100 +ifeq ($(GARCH),sparc) +EXTRA_CFLAGS = -xmemalign=1i +endif + + post-extract-isa-$(ISA_DEFAULT_$(GARCH)): @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Dec 18 16:34:18 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 18 Dec 2011 15:34:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[16562] csw/mgar/pkg/php5_apc/trunk/Makefile Message-ID: Revision: 16562 http://gar.svn.sourceforge.net/gar/?rev=16562&view=rev Author: bdwalton Date: 2011-12-18 15:34:18 +0000 (Sun, 18 Dec 2011) Log Message: ----------- php5_apc/trunk: add support for enable/disable at install time Modified Paths: -------------- csw/mgar/pkg/php5_apc/trunk/Makefile Modified: csw/mgar/pkg/php5_apc/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5_apc/trunk/Makefile 2011-12-18 15:21:57 UTC (rev 16561) +++ csw/mgar/pkg/php5_apc/trunk/Makefile 2011-12-18 15:34:18 UTC (rev 16562) @@ -12,6 +12,8 @@ PHP_PREFIX = $(prefix)/php5 PHP_BIN = $(PHP_PREFIX)/bin +PHP5_EXT = 1 + PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ STRIP_DIRS += $(PHP5ROOT)/bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Dec 18 19:15:27 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 18 Dec 2011 18:15:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[16563] csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile Message-ID: Revision: 16563 http://gar.svn.sourceforge.net/gar/?rev=16563&view=rev Author: guengel Date: 2011-12-18 18:15:26 +0000 (Sun, 18 Dec 2011) Log Message: ----------- gtk2/branches/2.24-raos: Made checkpkg happy. Modified Paths: -------------- csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile Modified: csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile =================================================================== --- csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile 2011-12-18 15:34:18 UTC (rev 16562) +++ csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile 2011-12-18 18:15:26 UTC (rev 16563) @@ -42,218 +42,173 @@ PACKAGES += CSWgtk2 SPKG_DESC_CSWgtk2 = $(DESCRIPTION) # Catchall -RUNTIME_DEP_PKGS_CSWgtk2 = CSWlibgdk-x112-0-0 -RUNTIME_DEP_PKGS_CSWgtk2 += CSWhicoloricontheme -RUNTIME_DEP_PKGS_CSWgtk2 += CSWgtk2-printbackends-papi -RUNTIME_DEP_PKGS_CSWgtk2 += CSWgtk2-printbackends-file -RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibgailutil18 -RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibgtk-x112-0-0 +RUNTIME_DEP_PKGS_CSWgtk2 = CSWlibgdk-x11-2-0-0 # I pull the whole gdk pixbuf to make sure gdk-pixbuf-query-loaders will # called as well RUNTIME_DEP_PKGS_CSWgtk2 += CSWgdkpixbuf RUNTIME_DEP_PKGS_CSWgtk2 += CSWfconfig RUNTIME_DEP_PKGS_CSWgtk2 += CSWftype2 +RUNTIME_DEP_PKGS_CSWgtk2 += CSWgtk2-printbackends-file RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibatk1-0-0 RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibcairo2 -RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibgailutil18 +RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibgdk-pixbuf2-0-0 RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibgtk-x11-2-0-0 RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibpixman1-0 -RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibpng12-0 RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibxrender -RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibz1 RUNTIME_DEP_PKGS_CSWgtk2 += CSWpango +CHECKPKG_OVERRIDES_CSWgtk2 += surplus-dependency|CSWgtk2-printbackends-file +CHECKPKG_OVERRIDES_CSWgtk2 += surplus-dependency|CSWgdkpixbuf PACKAGES += CSWgtk2-printbackends-papi SPKG_DESC_CSWgtk2-printbackends-papi = $(DESCRIPTION), Print Backend PKGFILES_CSWgtk2-printbackends-papi = .*/printbackends/libprintbackend-papi.* -RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi = CSWlibgdk-x112-0-0 -RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibgtk-x112-0-0 -# I pull the whole gdk pixbuf to make sure gdk-pixbuf-query-loaders will be -# called as well -RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWgdkpixbuf +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi = CSWlibgdk-x11-2-0-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWfconfig RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWftype2 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibatk1-0-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibcairo2 -RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibgdk-pixbuf2-0-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibgtk-x11-2-0-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibpixman1-0 -RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibpng12-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibxrender -RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibz1 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWpango PACKAGES += CSWgtk2-printbackends-file SPKG_DESC_CSWgtk2-printbackends-file = $(DESCRIPTION), File Print Backend PKGFILES_CSWgtk2-printbackends-file = .*/printbackends/libprintbackend-file.* -RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file = CSWgtk2-printbackends-papi -RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibgdk-x112-0-0 -RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibgtk-x112-0-0 -# I pull the whole gdk pixbuf to make sure gdk-pixbuf-query-loaders will be -# called as well -RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWgdkpixbuf +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file = CSWgtk2-printbackends-papi RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWfconfig RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWftype2 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibatk1-0-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibcairo2 -RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibgdk-x11-2-0-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibgtk-x11-2-0-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibpixman1-0 -RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibpng12-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibxrender -RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibz1 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWpango +CHECKPKG_OVERRIDES_CSWgtk2-printbackends-file += surplus-dependency|CSWgtk2-printbackends-papi PACKAGES += CSWgtk2-printbackends-cups SPKG_DESC_CSWgtk2-printbackends-cups = $(DESCRIPTION), CUPS Print Backend PKGFILES_CSWgtk2-printbackends-cups = .*/printbackends/libprintbackend-cups.* -RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups = CSWgtk2-printbackends-papi -RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibgdk-x112-0-0 -RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibgtk-x112-0-0 -# I pull the whole gdk pixbuf to make sure gdk-pixbuf-query-loaders will be -# called as well -RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWgdkpixbuf +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups = CSWgtk2-printbackends-papi RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWfconfig RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWftype2 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibatk1-0-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibcairo2 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibcom-err3 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibcups2 -RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibgdk-x11-2-0-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibgtk-x11-2-0-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibintl8 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibk5crypto3 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibkrb5support0 -RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibpixman1-0 -RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibpng12-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibxrender RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibz1 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWosslrt RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWpango +CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += surplus-dependency|CSWgtk2-printbackends-papi +CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-cups.so PACKAGES += CSWgtk2-printbackends-lpr SPKG_DESC_CSWgtk2-printbackends-lpr = $(DESCRIPTION), LPR Print Backend PKGFILES_CSWgtk2-printbackends-lpr = .*/printbackends/libprintbackend-lpr.* RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr = CSWgtk2-printbackends-papi -RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibgdk-x112-0-0 -RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibgtk-x112-0-0 -# I pull the whole gdk pixbuf to make sure gdk-pixbuf-query-loaders will be -# called as well -RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWgdkpixbuf RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWfconfig RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWftype2 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibatk1-0-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibcairo2 -RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibgdk-x11-2-0-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibgtk-x11-2-0-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibpixman1-0 -RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibpng12-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibxrender -RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibz1 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWpango +CHECKPKG_OVERRIDES_CSWgtk2-printbackends-lpr += surplus-dependency|CSWgtk2-printbackends-papi PACKAGES += CSWlibgailutil18 SPKG_DESC_CSWlibgailutil18 = $(DESCRIPTION), libgailutil PKGFILES_CSWlibgailutil18 = $(call pkgfiles_lib,libgailutil.so.18) -RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibgailutil18 = CSWfconfig RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWftype2 RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibatk1-0-0 RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibcairo2 -RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibgdk-x11-2-0-0 RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibgtk-x11-2-0-0 RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibpixman1-0 -RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibpng12-0 RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibxrender -RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibz1 RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWpango +PACKAGES += CSWlibgdk-x11-2-0-0 +SPKG_DESC_CSWlibgdk-x11-2-0-0 = $(DESCRIPTION), libgdk-x11-2.0 +PKGFILES_CSWlibgdk-x11-2-0-0 = $(call pkgfiles_lib,libgdk-x11-2.0.so.0) +RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 = CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWlibxrender +RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWpango -PACKAGES += CSWlibgdk-x112-0-0 -SPKG_DESC_CSWlibgdk-x112-0-0 = $(DESCRIPTION), libgdk-x11-2.0 -PKGFILES_CSWlibgdk-x112-0-0 = $(call pkgfiles_lib,libgdk-x11-2.0.so.0) -# I pull the whole gdk pixbuf to make sure gdk-pixbuf-query-loaders will be -# called as well -RUNTIME_DEP_PKGS_CSWlibgdk-x112-0-0 = CSWgdkpixbuf -RUNTIME_DEP_PKGS_CSWlibgdk-x112-0-0 += CSWfconfig -RUNTIME_DEP_PKGS_CSWlibgdk-x112-0-0 += CSWftype2 -RUNTIME_DEP_PKGS_CSWlibgdk-x112-0-0 += CSWlibcairo2 -RUNTIME_DEP_PKGS_CSWlibgdk-x112-0-0 += CSWlibexpat1 -RUNTIME_DEP_PKGS_CSWlibgdk-x112-0-0 += CSWlibgio2-0-0 -RUNTIME_DEP_PKGS_CSWlibgdk-x112-0-0 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibgdk-x112-0-0 += CSWlibgmodule2-0-0 -RUNTIME_DEP_PKGS_CSWlibgdk-x112-0-0 += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWlibgdk-x112-0-0 += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWlibgdk-x112-0-0 += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWlibgdk-x112-0-0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibgdk-x112-0-0 += CSWlibpixman1-0 -RUNTIME_DEP_PKGS_CSWlibgdk-x112-0-0 += CSWlibpng12-0 -RUNTIME_DEP_PKGS_CSWlibgdk-x112-0-0 += CSWlibxrender -RUNTIME_DEP_PKGS_CSWlibgdk-x112-0-0 += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibgdk-x112-0-0 += CSWpango +PACKAGES += CSWlibgtk-x11-2-0-0 +SPKG_DESC_CSWlibgtk-x11-2-0-0 = $(DESCRIPTION), libgtk-x11-2.0 +PKGFILES_CSWlibgtk-x11-2-0-0 = $(call pkgfiles_lib,libgtk-x11-2.0.so.0) +RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 = CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWftype2 +RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibxrender +RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWpango -PACKAGES += CSWlibgtk-x112-0-0 -SPKG_DESC_CSWlibgtk-x112-0-0 = $(DESCRIPTION), libgtk-x11-2.0 -PKGFILES_CSWlibgtk-x112-0-0 = $(call pkgfiles_lib,libgtk-x11-2.0.so.0) -RUNTIME_DEP_PKGS_CSWlibgtk-x112-0-0 = CSWlibgdk-x112-0-0 -# I pull the whole gdk pixbuf to make sure gdk-pixbuf-query-loaders will -# called as well -RUNTIME_DEP_PKGS_CSWlibgtk-x112-0-0 += CSWgdkpixbuf -RUNTIME_DEP_PKGS_CSWlibgtk-x112-0-0 += CSWfconfig -RUNTIME_DEP_PKGS_CSWlibgtk-x112-0-0 += CSWftype2 -RUNTIME_DEP_PKGS_CSWlibgtk-x112-0-0 += CSWlibatk1-0-0 -RUNTIME_DEP_PKGS_CSWlibgtk-x112-0-0 += CSWlibcairo2 -RUNTIME_DEP_PKGS_CSWlibgtk-x112-0-0 += CSWlibexpat1 -RUNTIME_DEP_PKGS_CSWlibgtk-x112-0-0 += CSWlibgio2-0-0 -RUNTIME_DEP_PKGS_CSWlibgtk-x112-0-0 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibgtk-x112-0-0 += CSWlibgmodule2-0-0 -RUNTIME_DEP_PKGS_CSWlibgtk-x112-0-0 += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWlibgtk-x112-0-0 += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWlibgtk-x112-0-0 += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWlibgtk-x112-0-0 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibgtk-x112-0-0 += CSWlibpixman1-0 -RUNTIME_DEP_PKGS_CSWlibgtk-x112-0-0 += CSWlibpng12-0 -RUNTIME_DEP_PKGS_CSWlibgtk-x112-0-0 += CSWlibxrender -RUNTIME_DEP_PKGS_CSWlibgtk-x112-0-0 += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibgtk-x112-0-0 += CSWpango - PACKAGES += CSWlibgtk2-dev SPKG_DESC_CSWlibgtk2-dev = $(DESCRIPTION), Development files PKGFILES_CSWlibgtk2-dev = $(PKGFILES_DEVEL) @@ -262,36 +217,39 @@ PKGFILES_CSWlibgtk2-dev += .*/include/.*\.h PKGFILES_CSWlibgtk2-dev += .*/gtk-demo PKGFILES_CSWlibgtk2-dev += .*/gtk-builder-convert -RUNTIME_DEP_PKGS_CSWlibgtk2-dev = CSWlibgdk-x112-0-0 +RUNTIME_DEP_PKGS_CSWlibgtk2-dev = CSWlibgailutil18 # I pull the whole gdk pixbuf to make sure gdk-pixbuf-query-loaders # will be called as well -RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWgdkpixbuf -RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibgdk-pixbuf-dev RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWfconfig RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWftype2 +RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWgdkpixbuf RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibatk1-0-0 RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibcairo2 -RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibgdk-pixbuf-dev +RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibgdk-x11-2-0-0 RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibgtk-x11-2-0-0 RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibpixman1-0 -RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibpng12-0 RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibxrender -RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibz1 RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWpango OBSOLETED_BY_CSWlibgtk2-dev = CSWgtk2devel CATALOGNAME_CSWgtk2devel = gtk2_devel_sub +CHECKPKG_OVERRIDES_CSWlibgtk2-dev += surplus-dependency|CSWgdkpixbuf +CHECKPKG_OVERRIDES_CSWlibgtk2-dev += surplus-dependency|CSWlibgdk-pixbuf-dev +# Covered by CSWgdkpixbuf +CHECKPKG_OVERRIDES_CSWlibgtk2-dev += missing-dependency|CSWlibgdk-pixbuf2-0-0 -PACKAGES += CSWgtk2-doc -SPKG_DESC_CSWgtk2-doc = $(DESCRIPTION), Documentation -ARCHALL_CSWgtk2-doc = 1 -PKGFILES_CSWgtk2-doc = .*/share/gtk-doc/.* +PACKAGES += CSWgtk2doc +SPKG_DESC_CSWgtk2doc = $(DESCRIPTION), Documentation +ARCHALL_CSWgtk2doc = 1 +PKGFILES_CSWgtk2doc = .*/share/gtk-doc/.* +CHECKPKG_OVERRIDES_CSWgtk2doc += file-with-bad-content|/usr/local|root/opt/csw/share/gtk-doc/html/gtk/gtk-Resource-Files.html +CHECKPKG_OVERRIDES_CSWgtk2doc += file-with-bad-content|/usr/local|root/opt/csw/share/gtk-doc/html/gtk/gtk-running.html SPKG_SOURCEURL = http://www.gtk.org/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Dec 18 19:43:17 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 18 Dec 2011 18:43:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[16564] csw/mgar/pkg/postgresql/branches/postgresql-8. 4-raos/ Message-ID: Revision: 16564 http://gar.svn.sourceforge.net/gar/?rev=16564&view=rev Author: guengel Date: 2011-12-18 18:43:16 +0000 (Sun, 18 Dec 2011) Log Message: ----------- Branching to postgresql 8.4. Added Paths: ----------- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Dec 18 22:36:52 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 18 Dec 2011 21:36:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[16565] csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile Message-ID: Revision: 16565 http://gar.svn.sourceforge.net/gar/?rev=16565&view=rev Author: guengel Date: 2011-12-18 21:36:51 +0000 (Sun, 18 Dec 2011) Log Message: ----------- gtk2/branches/2.24-raos: Fixed typo. Modified Paths: -------------- csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile Modified: csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile =================================================================== --- csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile 2011-12-18 18:43:16 UTC (rev 16564) +++ csw/mgar/pkg/gtk2/branches/2.24-raos/Makefile 2011-12-18 21:36:51 UTC (rev 16565) @@ -237,7 +237,7 @@ RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibxrender RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWpango OBSOLETED_BY_CSWlibgtk2-dev = CSWgtk2devel -CATALOGNAME_CSWgtk2devel = gtk2_devel_sub +CATALOGNAME_CSWgtk2devel = gtk2_devel_stub CHECKPKG_OVERRIDES_CSWlibgtk2-dev += surplus-dependency|CSWgdkpixbuf CHECKPKG_OVERRIDES_CSWlibgtk2-dev += surplus-dependency|CSWlibgdk-pixbuf-dev # Covered by CSWgdkpixbuf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Dec 18 23:52:46 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 18 Dec 2011 22:52:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[16566] csw/mgar/pkg/postgresql/branches/postgresql-8. 4-raos Message-ID: Revision: 16566 http://gar.svn.sourceforge.net/gar/?rev=16566&view=rev Author: guengel Date: 2011-12-18 22:52:46 +0000 (Sun, 18 Dec 2011) Log Message: ----------- postgresql/branches/postgresql-8.4-raos: Recipe without -contrib. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/Makefile csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/checksums Added Paths: ----------- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch Removed Paths: ------------- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/Makefile 2011-12-18 21:36:51 UTC (rev 16565) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/Makefile 2011-12-18 22:52:46 UTC (rev 16566) @@ -89,10 +89,10 @@ # This BUILD is NOT READY! It needs work before it's usable. NAME = postgresql -BASE_VERSION = 8.3 +BASE_VERSION = 8.4 VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION)) -PATCHLEVEL = 17 +PATCHLEVEL = 10 VERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = apps @@ -329,7 +329,7 @@ PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-doc ARCHALL_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = 1 SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = PostgreSQL $(VERSION), Documentation Files -PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = .*/doc/$(NAME)/$(BASE_VERSION_NODOT)/.*\.html +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = .*/doc/$(NAME)/$(BASE_VERSION_NODOT)/.*\.(html|css) PACKAGES += CSWlibecpg-compat3 SPKG_DESC_CSWlibecpg-compat3 = PostgreSQL $(VERSION), libecpg_compat @@ -380,7 +380,7 @@ CONFIGURE_ARGS += --localstatedir=$(PGDATA) CONFIGURE_ARGS += --with-includes=$(includedir) CONFIGURE_ARGS += --with-libraries=$(libdir) -CONFIGURE_ARGS += --with-docdir=$(PGDOCDIR) +CONFIGURE_ARGS += --docdir=$(PGDOCDIR) # configure complains that we are not thread-safe, wtf? --raos #CONFIGURE_ARGS += --enable-thread-safety @@ -422,16 +422,13 @@ fi @$(MAKECOOKIE) -post-build-modulated: - $(BUILD_ENV) gmake -C $(WORKSRC)/contrib all - @$(MAKECOOKIE) +# post-build-modulated: +# $(BUILD_ENV) gmake -C $(WORKSRC)/contrib all +# @$(MAKECOOKIE) -post-install-modulated: - $(INSTALL_ENV) gmake -C $(WORKSRC)/contrib DESTDIR=$(DESTDIR) install - ginstall -d -m 755 $(DESTDIR)$(prefix)/bin - [ -r $(DESTDIR)$(bindir)/pg_config ] && \ - gmv -v $(DESTDIR)$(bindir)/pg_config $(DESTDIR)$(prefix)/bin || true - @$(MAKECOOKIE) +# post-install-modulated: +# $(INSTALL_ENV) gmake -C $(WORKSRC)/contrib DESTDIR=$(DESTDIR) install +# @$(MAKECOOKIE) post-merge: # Create my alternatives files Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/checksums =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/checksums 2011-12-18 21:36:51 UTC (rev 16565) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/checksums 2011-12-18 22:52:46 UTC (rev 16566) @@ -1 +1 @@ -cedfbcdb153291c0762492ef34fa7b41 postgresql-8.3.17.tar.bz2 +6fd9b76e1d4df479e0b5402c88b1860e postgresql-8.4.10.tar.bz2 Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch 2011-12-18 21:36:51 UTC (rev 16565) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch 2011-12-18 22:52:46 UTC (rev 16566) @@ -1,45 +0,0 @@ -From bcfc4c25ea42d70719bc62a9674b2832b106f466 Mon Sep 17 00:00:00 2001 -From: Rafael Ostertag -Date: Sat, 10 Dec 2011 16:41:08 +0100 -Subject: [PATCH] Run tests in /var/tmp/pgsql/tmp_check - ---- - src/test/regress/GNUmakefile | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile -index da117dc..471cef8 100644 ---- a/src/test/regress/GNUmakefile -+++ b/src/test/regress/GNUmakefile -@@ -141,7 +141,8 @@ tablespace-setup: - ## - - check: all -- ./pg_regress --temp-install=./tmp_check --top-builddir=$(top_builddir) --srcdir="$(abs_srcdir)" --temp-port=$(TEMP_PORT) --schedule="$(srcdir)"/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE) $(TEMP_CONF) -+ install -d /var/tmp/pgsql/tmp_check -+ ./pg_regress --temp-install=/var/tmp/pgsql/tmp_check --top-builddir=$(top_builddir) --srcdir="$(abs_srcdir)" --temp-port=$(TEMP_PORT) --schedule="$(srcdir)"/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE) $(TEMP_CONF) - - installcheck: all - ./pg_regress --psqldir="$(PSQLDIR)" --schedule="$(srcdir)"/serial_schedule --srcdir="$(abs_srcdir)" --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE) -@@ -160,7 +161,8 @@ bigtest: all - ./pg_regress --psqldir="$(PSQLDIR)" --schedule="$(srcdir)"/serial_schedule --srcdir="$(abs_srcdir)" --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE) numeric_big - - bigcheck: all -- ./pg_regress --temp-install=./tmp_check --top-builddir=$(top_builddir) --srcdir="$(abs_srcdir)" --temp-port=$(TEMP_PORT) --schedule="$(srcdir)"/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE) numeric_big -+ install -d /var/tmp/pgsql/tmp_check -+ ./pg_regress --temp-install=/var/tmp/pgsql/tmp_check --top-builddir=$(top_builddir) --srcdir="$(abs_srcdir)" --temp-port=$(TEMP_PORT) --schedule="$(srcdir)"/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE) numeric_big - - - ## -@@ -174,7 +176,7 @@ clean distclean maintainer-clean: clean-lib - rm -f $(output_files) $(input_files) pg_regress_main.o pg_regress.o pg_regress$(X) - # things created by various check targets - rm -rf testtablespace -- rm -rf results tmp_check log -+ rm -rf results /var/tmp/pgsql/tmp_check log - rm -f regression.diffs regression.out regress.out run_check.out - ifeq ($(PORTNAME), cygwin) - rm -f regress.def --- -1.7.6.1 - Added: csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch (rev 0) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch 2011-12-18 22:52:46 UTC (rev 16566) @@ -0,0 +1,42 @@ +From 8ea189fd88c2e2fb0c0d5df0e9addcd07b7a637d Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sun, 18 Dec 2011 22:09:16 +0100 +Subject: [PATCH] Run tests in /var/tmp/pgsql/tmp_check + +--- + src/test/regress/GNUmakefile | 7 ++++--- + 1 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile +index 83b02cb..85884ee 100644 +--- a/src/test/regress/GNUmakefile ++++ b/src/test/regress/GNUmakefile +@@ -141,7 +141,8 @@ tablespace-setup: + pg_regress_call = ./pg_regress --inputdir=$(srcdir) --dlpath=. --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE) + + check: all +- $(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF) ++ install -d /var/tmp/pgsql/tmp_check ++ $(pg_regress_call) --temp-install=/var/tmp/pgsql/tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF) + + installcheck: all + $(pg_regress_call) --psqldir="$(PSQLDIR)" --schedule=$(srcdir)/serial_schedule +@@ -160,7 +161,7 @@ bigtest: all + $(pg_regress_call) --psqldir="$(PSQLDIR)" --schedule=$(srcdir)/serial_schedule numeric_big + + bigcheck: all +- $(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) numeric_big ++ $(pg_regress_call) --temp-install=/var/tmp/pgsql/tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) numeric_big + + + ## +@@ -173,5 +174,5 @@ clean distclean maintainer-clean: clean-lib + # things created by various check targets + rm -f $(output_files) $(input_files) + rm -rf testtablespace +- rm -rf results tmp_check log ++ rm -rf results /var/tmp/pgsql/tmp_check log + rm -f regression.diffs regression.out regress.out run_check.out +-- +1.7.6.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Dec 18 23:54:16 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 18 Dec 2011 22:54:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[16567] csw/mgar/pkg/postgresql/branches/postgresql-8. 3-raos/Makefile Message-ID: Revision: 16567 http://gar.svn.sourceforge.net/gar/?rev=16567&view=rev Author: guengel Date: 2011-12-18 22:54:16 +0000 (Sun, 18 Dec 2011) Log Message: ----------- postgresql/branches/postgresql-8.3-raos: Removed leftovers from old recipe. Fixed PKGFILES on -doc. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile 2011-12-18 22:52:46 UTC (rev 16566) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile 2011-12-18 22:54:16 UTC (rev 16567) @@ -329,7 +329,7 @@ PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-doc ARCHALL_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = 1 SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = PostgreSQL $(VERSION), Documentation Files -PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = .*/doc/$(NAME)/$(BASE_VERSION_NODOT)/.*\.html +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = .*/doc/$(NAME)/$(BASE_VERSION_NODOT)/.*\.(html|css) PACKAGES += CSWlibecpg-compat3 SPKG_DESC_CSWlibecpg-compat3 = PostgreSQL $(VERSION), libecpg_compat @@ -428,9 +428,6 @@ post-install-modulated: $(INSTALL_ENV) gmake -C $(WORKSRC)/contrib DESTDIR=$(DESTDIR) install - ginstall -d -m 755 $(DESTDIR)$(prefix)/bin - [ -r $(DESTDIR)$(bindir)/pg_config ] && \ - gmv -v $(DESTDIR)$(bindir)/pg_config $(DESTDIR)$(prefix)/bin || true @$(MAKECOOKIE) post-merge: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Mon Dec 19 10:55:54 2011 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 19 Dec 2011 09:55:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[16568] csw/mgar/pkg Message-ID: Revision: 16568 http://gar.svn.sourceforge.net/gar/?rev=16568&view=rev Author: cgrzemba Date: 2011-12-19 09:55:53 +0000 (Mon, 19 Dec 2011) Log Message: ----------- svrcore/trunk: Mozilla Svrcore, first build Added Paths: ----------- csw/mgar/pkg/svrcore/ csw/mgar/pkg/svrcore/Makefile csw/mgar/pkg/svrcore/branches/ csw/mgar/pkg/svrcore/tags/ csw/mgar/pkg/svrcore/trunk/ csw/mgar/pkg/svrcore/trunk/Makefile csw/mgar/pkg/svrcore/trunk/checksums csw/mgar/pkg/svrcore/trunk/files/ Added: csw/mgar/pkg/svrcore/Makefile =================================================================== --- csw/mgar/pkg/svrcore/Makefile (rev 0) +++ csw/mgar/pkg/svrcore/Makefile 2011-12-19 09:55:53 UTC (rev 16568) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/svrcore/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/svrcore/trunk/Makefile =================================================================== --- csw/mgar/pkg/svrcore/trunk/Makefile (rev 0) +++ csw/mgar/pkg/svrcore/trunk/Makefile 2011-12-19 09:55:53 UTC (rev 16568) @@ -0,0 +1,72 @@ +# $Id$ +# +NAME = svrcore +MAJOR_VERSION = 4 +MIN_VERSION = 0.4 +VERSION = $(MAJOR_VERSION).$(MIN_VERSION) +GARTYPE = v2 +CATEGORIES = lib + +DESCRIPTION = Mozilla LDAP SVR Core +define BLURB + This is the Mozilla SVR Core needed by LDAP SDK +endef + +MASTER_SITES = http://ftp.mozilla.org/pub/directory/svrcore/releases/4.0.4/src/ +DISTFILES = $(NAME)-$(VERSION).tar.bz2 + +# 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 = + +PACKAGES += CSWlibsvrcore0 +CATALOGNAME_CSWlibsvrcore0 = libsvrcore0 +SPKG_DESC_CSWlibsvrcore0 += $(DESCRIPTION) +PKGFILES_CSWlibsvrcore0 = $(call pkgfiles_lib,libsvrcore.so.0) +RUNTIME_DEP_PKGS_CSWlibsvrcore0 += CSWlibnspr4 +RUNTIME_DEP_PKGS_CSWlibsvrcore0 += CSWlibnss3 +RUNTIME_DEP_PKGS_CSWlibsvrcore0 += CSWlibplc4 +RUNTIME_DEP_PKGS_CSWlibsvrcore0 += CSWlibplds4 +PACKAGING_PLATFORMS += solaris10-sparc +PACKAGING_PLATFORMS += solaris10-i386 + +PACKAGES += CSWlibsvrcore0-dev +CATALOGNAME_CSWlibsvrcore0-dev = libsvrcore0_dev +SPKG_DESC_CSWlibsvrcore0-dev += $(DESCRIPTION), development files +PKGFILES_CSWlibsvrcore0-dev = $(PKGFILES_DEVEL) +PKGFILES_CSWlibsvrcore0-dev += /opt/csw/lib/libsvrcore.so +PKGFILES_CSWlibsvrcore0-dev += /opt/csw/lib/sparcv9/libsvrcore.so +ARCHALL_CSWgnutlsdevel = 1 + +# Move the include files to include/nspr to prevent polluting the main +# header file namespace. +includedir = $(prefix)/include/nspr + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS_isa-sparcv9 = --enable-64bit +CONFIGURE_ARGS_isa-amd64 = --enable-64bit +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MODULATION)) +CONFIGURE_ARGS_OPT += --enable-optimize="-xO3" +CONFIGURE_ARGS_OPT += --disable-debug +CONFIGURE_ARGS_OPT += --enable-strip +CONFIGURE_ARGS_DBG += --enable-debug +CONFIGURE_ARGS_DBG += --disable-strip +CONFIGURE_ARGS_OPT += --with-nss-inc=/opt/csw/include/nss +CONFIGURE_ARGS_OPT += --with-nss-lib=/opt/csw/lib +CONFIGURE_ARGS_OPT += --with-nspr-inc=/opt/csw/include/nspr +CONFIGURE_ARGS_OPT += --with-nspr-lib=/opt/csw/lib +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) + + +RUNTIME_DEP_PKGS_CSWlibsvrcore0-dev += CSWlibsvrcore0 + +BUILD64 = 1 + +include gar/category.mk + + Property changes on: csw/mgar/pkg/svrcore/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/svrcore/trunk/checksums =================================================================== --- csw/mgar/pkg/svrcore/trunk/checksums (rev 0) +++ csw/mgar/pkg/svrcore/trunk/checksums 2011-12-19 09:55:53 UTC (rev 16568) @@ -0,0 +1 @@ +46bcdc82624d11c1bb168cf9f15e066c svrcore-4.0.4.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Dec 19 11:47:16 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 19 Dec 2011 10:47:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[16569] csw/mgar/pkg/gtk2 Message-ID: Revision: 16569 http://gar.svn.sourceforge.net/gar/?rev=16569&view=rev Author: dmichelsen Date: 2011-12-19 10:47:16 +0000 (Mon, 19 Dec 2011) Log Message: ----------- gtk2: Move legacy aside Added Paths: ----------- csw/mgar/pkg/gtk2/tags/legacy-phil/ Removed Paths: ------------- csw/mgar/pkg/gtk2/branch-c/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Mon Dec 19 13:24:19 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Mon, 19 Dec 2011 12:24:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[16570] csw/mgar/pkg/gtk2/trunk Message-ID: Revision: 16570 http://gar.svn.sourceforge.net/gar/?rev=16570&view=rev Author: guengel Date: 2011-12-19 12:24:19 +0000 (Mon, 19 Dec 2011) Log Message: ----------- gtk2/trunk: Merged with 2.24 branch Modified Paths: -------------- csw/mgar/pkg/gtk2/trunk/Makefile csw/mgar/pkg/gtk2/trunk/checksums csw/mgar/pkg/gtk2/trunk/files/CSWgtk2.postinstall Added Paths: ----------- csw/mgar/pkg/gtk2/trunk/files/0000-Add-update-modules-cmd-line-option.patch csw/mgar/pkg/gtk2/trunk/files/0000-Adjust-hardcoded-path-to-opt-csw-share.patch csw/mgar/pkg/gtk2/trunk/files/0000-Disable-gtk_test_create_widget-g_type_from_name-GtkT.patch csw/mgar/pkg/gtk2/trunk/files/0000-Use-absolute-path-to-Xvfb.patch csw/mgar/pkg/gtk2/trunk/files/README.CSW Removed Paths: ------------- csw/mgar/pkg/gtk2/trunk/files/gdkdnd-x11.c.diff Property Changed: ---------------- csw/mgar/pkg/gtk2/trunk/ csw/mgar/pkg/gtk2/trunk/Makefile Property changes on: csw/mgar/pkg/gtk2/trunk ___________________________________________________________________ Added: svn:mergeinfo + /csw/mgar/pkg/gtk2/branches/2.24-raos:16452-16569 Modified: csw/mgar/pkg/gtk2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtk2/trunk/Makefile 2011-12-19 10:47:16 UTC (rev 16569) +++ csw/mgar/pkg/gtk2/trunk/Makefile 2011-12-19 12:24:19 UTC (rev 16570) @@ -1,7 +1,13 @@ +# $Id$ + NAME = gtk2 -VERSION = 2.18.9 +VERSION = 2.24.8 CATEGORIES = lib +GARTYPE = v2 +GARCOMPILER = SOS12U1 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + DESCRIPTION = GTK+, the multiplatform X11 toolkit for GUI development define BLURB GTK, which stands for the Gimp ToolKit, is a library for creating graphical @@ -10,79 +16,288 @@ some unique features over standard widget libraries. endef -# WARNING: The Solaris 9 (and maybe 10) X11R6 header file Xlibint.h has -# an error which will cause gdkasync.c to fail. To fix this, correct -# line 613 of Xlibint.h (definition of GetEmptyReq() macro: -# -# #if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP) - GNOME_PROJ = gtk+ MASTER_SITES = $(GNOME_MIRROR) DISTNAME = gtk+-$(VERSION) DISTFILES = $(DISTNAME).tar.bz2 DISTFILES += CSWgtk2.postinstall +DISTFILES += README.CSW -PATCHFILES = gdkdnd-x11.c.diff +EXPANDVARS = CSWgtk2.postinstall -PACKAGES = CSWgtk2 CSWgtk2devel CSWgtk2doc +# This makes the tests work in the first place +PATCHFILES += 0000-Use-absolute-path-to-Xvfb.patch -CATALOGNAME_CSWgtk2 = gtk2 -CATALOGNAME_CSWgtk2devel = gtk2_devel -CATALOGNAME_CSWgtk2doc = gtk2_doc +# This disables a check that I wasn't able to fix +PATCHFILES += 0000-Disable-gtk_test_create_widget-g_type_from_name-GtkT.patch -SPKG_DESC_CSWgtk2 = A feature rich toolkit for creating graphical user interfaces -SPKG_DESC_CSWgtk2devel = A feature rich toolkit for creating graphical user interfaces development package -SPKG_DESC_CSWgtk2doc = A feature rich toolkit for creating graphical user interfaces documentation +# This patch adds a command line option `--update-modules` to +# gtk-query-immodules-2.0 which has the default location of +# gtk.immodules hardcoded and takes 32/64bit ISAs into account. +PATCHFILES += 0000-Add-update-modules-cmd-line-option.patch -BUILD_DEP_PKGS = CSWbash -RUNTIME_DEP_PKGS_CSWgtk2 = CSWfconfig CSWftype2 CSWggettextrt CSWglib2 CSWjpeg CSWlibatk -RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibcairo CSWlibxrender CSWpango CSWpng CSWtiff -RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibcups -RUNTIME_DEP_PKGS_CSWgtk2 += CSWgnutls -RUNTIME_DEP_PKGS_CSWgtk2 += CSWzlib -RUNTIME_DEP_PKGS_CSWgtk2 += CSWkrb5lib +PATCHFILES += 0000-Adjust-hardcoded-path-to-opt-csw-share.patch -RUNTIME_DEP_PKGS_CSWgtk2devel = CSWgtk2 CSWglib2devel CSWlibatkdevel -RUNTIME_DEP_PKGS_CSWgtk2devel += CSWlibcairodevel CSWlibxrenderdevel CSWpangodevel +PACKAGES += CSWgtk2 +SPKG_DESC_CSWgtk2 = $(DESCRIPTION) +# Catchall +RUNTIME_DEP_PKGS_CSWgtk2 = CSWlibgdk-x11-2-0-0 +# I pull the whole gdk pixbuf to make sure gdk-pixbuf-query-loaders will +# called as well +RUNTIME_DEP_PKGS_CSWgtk2 += CSWgdkpixbuf +RUNTIME_DEP_PKGS_CSWgtk2 += CSWfconfig +RUNTIME_DEP_PKGS_CSWgtk2 += CSWftype2 +RUNTIME_DEP_PKGS_CSWgtk2 += CSWgtk2-printbackends-file +RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibgailutil18 +RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibxrender +RUNTIME_DEP_PKGS_CSWgtk2 += CSWpango +CHECKPKG_OVERRIDES_CSWgtk2 += surplus-dependency|CSWgtk2-printbackends-file +CHECKPKG_OVERRIDES_CSWgtk2 += surplus-dependency|CSWgdkpixbuf -SPKG_SOURCEURL = http://www.gtk.org/ +PACKAGES += CSWgtk2-printbackends-papi +SPKG_DESC_CSWgtk2-printbackends-papi = $(DESCRIPTION), Print Backend +PKGFILES_CSWgtk2-printbackends-papi = .*/printbackends/libprintbackend-papi.* +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi = CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWfconfig +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWftype2 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibxrender +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWpango -NOISALIST = 1 -BUILD64 = 1 +PACKAGES += CSWgtk2-printbackends-file +SPKG_DESC_CSWgtk2-printbackends-file = $(DESCRIPTION), File Print Backend +PKGFILES_CSWgtk2-printbackends-file = .*/printbackends/libprintbackend-file.* +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file = CSWgtk2-printbackends-papi +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWfconfig +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWftype2 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibxrender +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWpango +CHECKPKG_OVERRIDES_CSWgtk2-printbackends-file += surplus-dependency|CSWgtk2-printbackends-papi -CONFIGURE_ARGS = $(DIRPATHS) +PACKAGES += CSWgtk2-printbackends-cups +SPKG_DESC_CSWgtk2-printbackends-cups = $(DESCRIPTION), CUPS Print Backend +PKGFILES_CSWgtk2-printbackends-cups = .*/printbackends/libprintbackend-cups.* +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups = CSWgtk2-printbackends-papi +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWfconfig +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWftype2 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibcom-err3 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibcups2 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibk5crypto3 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibkrb5-3 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibkrb5support0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibxrender +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibz1 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWosslrt +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWpango +CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += surplus-dependency|CSWgtk2-printbackends-papi +CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-cups.so -CONFIGURE_ARGS-32 += --enable-cups -CONFIGURE_ARGS-64 += --disable-cups -CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) +PACKAGES += CSWgtk2-printbackends-lpr +SPKG_DESC_CSWgtk2-printbackends-lpr = $(DESCRIPTION), LPR Print Backend +PKGFILES_CSWgtk2-printbackends-lpr = .*/printbackends/libprintbackend-lpr.* +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr = CSWgtk2-printbackends-papi +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWfconfig +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWftype2 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibxrender +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWpango +CHECKPKG_OVERRIDES_CSWgtk2-printbackends-lpr += surplus-dependency|CSWgtk2-printbackends-papi -STRIP_LIBTOOL = 1 +PACKAGES += CSWlibgailutil18 +SPKG_DESC_CSWlibgailutil18 = $(DESCRIPTION), libgailutil +PKGFILES_CSWlibgailutil18 = $(call pkgfiles_lib,libgailutil.so.18) +RUNTIME_DEP_PKGS_CSWlibgailutil18 = CSWfconfig +RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWftype2 +RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibxrender +RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWpango -#TEST_TARGET = check -# There is a test failing on Xvfb which may or may not be harmful. Disable for now. -TEST_TARGET = +PACKAGES += CSWlibgdk-x11-2-0-0 +SPKG_DESC_CSWlibgdk-x11-2-0-0 = $(DESCRIPTION), libgdk-x11-2.0 +PKGFILES_CSWlibgdk-x11-2-0-0 = $(call pkgfiles_lib,libgdk-x11-2.0.so.0) +RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 = CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWlibxrender +RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWpango -TEST_OVERRIDE_DIRS = SHELL -SHELL = /opt/csw/bin/bash -PKGFILES_CSWgtk2devel = $(PKGFILES_DEVEL) -PKGFILES_CSWgtk2devel += $(sharedstatedir)/gtk-2.0/demo/.* -PKGFILES_CSWgtk2doc = $(sharedstatedir)/gtk-doc/.* +PACKAGES += CSWlibgtk-x11-2-0-0 +SPKG_DESC_CSWlibgtk-x11-2-0-0 = $(DESCRIPTION), libgtk-x11-2.0 +PKGFILES_CSWlibgtk-x11-2-0-0 = $(call pkgfiles_lib,libgtk-x11-2.0.so.0) +RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 = CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWftype2 +RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibxrender +RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWpango + +PACKAGES += CSWlibgtk2-dev +SPKG_DESC_CSWlibgtk2-dev = $(DESCRIPTION), Development files +PKGFILES_CSWlibgtk2-dev = $(PKGFILES_DEVEL) +PKGFILES_CSWlibgtk2-dev += .*/share/gtk-2.0/demo/.* +# Use this to pick up files in lib/gtk-2.0/include +PKGFILES_CSWlibgtk2-dev += .*/include/.*\.h +PKGFILES_CSWlibgtk2-dev += .*/gtk-demo +PKGFILES_CSWlibgtk2-dev += .*/gtk-builder-convert +RUNTIME_DEP_PKGS_CSWlibgtk2-dev = CSWlibgailutil18 +# I pull the whole gdk pixbuf to make sure gdk-pixbuf-query-loaders +# will be called as well +RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWftype2 +RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWgdkpixbuf +RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibgdk-pixbuf-dev +RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibxrender +RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWpango +OBSOLETED_BY_CSWlibgtk2-dev = CSWgtk2devel +CATALOGNAME_CSWgtk2devel = gtk2_devel_stub +CHECKPKG_OVERRIDES_CSWlibgtk2-dev += surplus-dependency|CSWgdkpixbuf +CHECKPKG_OVERRIDES_CSWlibgtk2-dev += surplus-dependency|CSWlibgdk-pixbuf-dev +# Covered by CSWgdkpixbuf +CHECKPKG_OVERRIDES_CSWlibgtk2-dev += missing-dependency|CSWlibgdk-pixbuf2-0-0 + + +PACKAGES += CSWgtk2doc +SPKG_DESC_CSWgtk2doc = $(DESCRIPTION), Documentation ARCHALL_CSWgtk2doc = 1 +PKGFILES_CSWgtk2doc = .*/share/gtk-doc/.* +CHECKPKG_OVERRIDES_CSWgtk2doc += file-with-bad-content|/usr/local|root/opt/csw/share/gtk-doc/html/gtk/gtk-Resource-Files.html +CHECKPKG_OVERRIDES_CSWgtk2doc += file-with-bad-content|/usr/local|root/opt/csw/share/gtk-doc/html/gtk/gtk-running.html -CHECKPKG_OVERRIDES_CSWgtk2 += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-cups.so +SPKG_SOURCEURL = http://www.gtk.org/ -CHECKPKG_OVERRIDES_CSWgtk2devel += surplus-dependency|CSWglib2devel -CHECKPKG_OVERRIDES_CSWgtk2devel += surplus-dependency|CSWpangodevel -CHECKPKG_OVERRIDES_CSWgtk2devel += surplus-dependency|CSWlibatkdevel -CHECKPKG_OVERRIDES_CSWgtk2devel += surplus-dependency|CSWgtk2 -CHECKPKG_OVERRIDES_CSWgtk2devel += surplus-dependency|CSWlibxrenderdevel -CHECKPKG_OVERRIDES_CSWgtk2devel += surplus-dependency|CSWlibcairodevel +BUILD_DEP_PKGS = CSWpkgconfig +BUILD_DEP_PKGS += CSWcups-dev +BUILD_DEP_PKGS += CSWlibglib2-dev +BUILD_DEP_PKGS += CSWlibatk-dev +BUILD_DEP_PKGS += CSWpangodevel +BUILD_DEP_PKGS += CSWlibcairo-dev +BUILD_DEP_PKGS += CSWlibgdk-pixbuf-dev +BUILD_DEP_PKGS += CSWsunx11devel +BUILD_DEP_PKGS += CSWggettext-dev +# Because cups depends on krb +BUILD_DEP_PKGS += CSWlibkrb5-dev +BUILD_DEP_PKGS += CSWggettext +BUILD_DEP_PKGS += CSWlibpixman-dev +BUILD_DEP_PKGS += CSWlibpng-dev +# Needed to make a test work +BUILD_DEP_PKGS += CSWgamin +# Used to adjust documentation +BUILD_DEP_PKGS += CSWgsed -# There are a *ton* of different libs on amd64 available that are not installed on Solaris 9. -# Skip this complete test for now. -CHECKPKG_OVERRIDES_CSWgtk2 += soname-not-found +BUILD64 = 1 +# This is because gtk.immodules resides in $(sysconfdir)/gtk-2.0. If +# we don't take the memory model into account, 32/64 bit libs would +# get the wrong IM Modules list in gtk.immodules (see also the pango +# recipe). +sysconfdir-suffix-64 = /64 +sysconfdir = /etc/opt/csw$(sysconfdir-suffix-$(MEMORYMODEL)) + +# We need the binaries to query 64 bit modules +MERGE_DIRS_isa-extra = $(bindir) $(libdir) + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-shm +CONFIGURE_ARGS += --enable-xkb +CONFIGURE_ARGS += --enable-xinerama +CONFIGURE_ARGS += --enable-cups +CONFIGURE_ARGS-64 += --disable-cups +CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) + include gar/category.mk + +post-merge: + ginstall -d $(PKGROOT)$(sysconfdir)/64/gtk-2.0 + ginstall $(PKGROOT)$(sysconfdir)/gtk-2.0/im-multipress.conf $(PKGROOT)$(sysconfdir)/64/gtk-2.0/ + gsed -i -e 's|/usr/share/|$(sharedstatedir)/|g' \ + -e 's|/usr/lib|$(libdir)|g' \ + -e 's|/usr/include|$(includedir)|g' `find $(PKGROOT)$(sharedstatedir)/gtk-doc -type f` + @$(MAKECOOKIE) \ No newline at end of file Property changes on: csw/mgar/pkg/gtk2/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/gtk2/trunk/checksums =================================================================== --- csw/mgar/pkg/gtk2/trunk/checksums 2011-12-19 10:47:16 UTC (rev 16569) +++ csw/mgar/pkg/gtk2/trunk/checksums 2011-12-19 12:24:19 UTC (rev 16570) @@ -1,3 +1 @@ -7ff4fdcaa073afc764af7106c0ba441c CSWgtk2.postinstall -7d8564607a919fb1f25567a424384236 gdkdnd-x11.c.diff -f680d38c973635365acababacb1730ec gtk+-2.18.9.tar.bz2 +0413187f7e596aef00ccd1b54776ff03 gtk+-2.24.8.tar.bz2 Copied: csw/mgar/pkg/gtk2/trunk/files/0000-Add-update-modules-cmd-line-option.patch (from rev 16569, csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Add-update-modules-cmd-line-option.patch) =================================================================== --- csw/mgar/pkg/gtk2/trunk/files/0000-Add-update-modules-cmd-line-option.patch (rev 0) +++ csw/mgar/pkg/gtk2/trunk/files/0000-Add-update-modules-cmd-line-option.patch 2011-12-19 12:24:19 UTC (rev 16570) @@ -0,0 +1,96 @@ +From 1ae7e710bce003ff900de41947f8ae5e57fc6409 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sat, 17 Dec 2011 16:54:29 +0100 +Subject: [PATCH] Add --update-modules cmd line option + +--- + gtk/queryimmodules.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++--- + 1 files changed, 49 insertions(+), 4 deletions(-) + +diff --git a/gtk/queryimmodules.c b/gtk/queryimmodules.c +index 5369c7f..223e8ee 100644 +--- a/gtk/queryimmodules.c ++++ b/gtk/queryimmodules.c +@@ -23,6 +23,7 @@ + + #include + #include ++#include + #include + + #include +@@ -30,6 +31,8 @@ + #ifdef HAVE_UNISTD_H + #include + #endif ++#include ++#include + + #ifdef USE_LA_MODULES + #define SOEXT ".la" +@@ -164,16 +167,58 @@ query_module (const char *dir, const char *name) + int main (int argc, char **argv) + { + char *cwd; +- int i; ++ int i, fd, retval; + char *path; ++ char *gtk_immodules; + gboolean error = FALSE; + ++ /* ++ * Quick an dirty hack. ++ * ++ * This will allow us to create the gtk.immodules in the default ++ * place by providing `--update-modules' as cmd line argument, ++ * without worrying where this might be when calling ++ * gtk-query-immodules-2.0 from a postinstall script. ++ * ++ * The basic idea is to redirect STDOUT to the default file and then ++ * let the normal flow of the program continue like there was no cmd ++ * line argument. Be aware, that this only works when no other cmd ++ * line options were passed. ++ */ ++ if ( argc == 2 && strcmp("--update-modules", argv[1]) == 0 ) ++ { ++ gtk_immodules = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL); ++ fd = g_open(gtk_immodules, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); ++ if ( fd == -1 ) ++ { ++ g_fprintf(stderr, "Cannot open %s.\n", gtk_immodules); ++ exit(1); ++ } ++ ++ if ( dup2(fd, STDOUT_FILENO) == -1 ) ++ { ++ g_fprintf(stderr, "Unable to redirect STDOUT.\n"); ++ exit(1); ++ } ++ ++ /* ++ * cheat, to make it think there are no arguments given ++ */ ++ argc = 1; ++ } ++ ++ + g_printf ("# GTK+ Input Method Modules file\n" + "# Automatically generated file, do not edit\n" +- "# Created by %s from gtk+-%d.%d.%d\n" +- "#\n", ++ "# Created by %s from gtk+-%d.%d.%d (OpenCSW Patch)\n" ++ "#\n" ++ "#\n" ++ "# DefaultFile = %s\n" ++ "# DefaultDir = %s\n", + argv[0], +- GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); ++ GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION, ++ g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL), ++ g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", NULL)); + + + if (argc == 1) /* No arguments given */ +-- +1.7.6.1 + Copied: csw/mgar/pkg/gtk2/trunk/files/0000-Adjust-hardcoded-path-to-opt-csw-share.patch (from rev 16569, csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Adjust-hardcoded-path-to-opt-csw-share.patch) =================================================================== --- csw/mgar/pkg/gtk2/trunk/files/0000-Adjust-hardcoded-path-to-opt-csw-share.patch (rev 0) +++ csw/mgar/pkg/gtk2/trunk/files/0000-Adjust-hardcoded-path-to-opt-csw-share.patch 2011-12-19 12:24:19 UTC (rev 16570) @@ -0,0 +1,25 @@ +From f84f9b4ba14c5d02547e80853da005cd97001d12 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sat, 17 Dec 2011 12:41:47 +0100 +Subject: [PATCH] Adjust hardcoded path to /opt/csw/share + +--- + demos/testpixbuf-color.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/demos/testpixbuf-color.c b/demos/testpixbuf-color.c +index 003f333..851a15b 100644 +--- a/demos/testpixbuf-color.c ++++ b/demos/testpixbuf-color.c +@@ -6,7 +6,7 @@ + + #include + +-#define ICC_PROFILE "/usr/share/color/icc/bluish.icc" ++#define ICC_PROFILE "/opt/csw/share/color/icc/bluish.icc" + #define ICC_PROFILE_SIZE 3966 + + static gboolean +-- +1.7.6.1 + Copied: csw/mgar/pkg/gtk2/trunk/files/0000-Disable-gtk_test_create_widget-g_type_from_name-GtkT.patch (from rev 16569, csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Disable-gtk_test_create_widget-g_type_from_name-GtkT.patch) =================================================================== --- csw/mgar/pkg/gtk2/trunk/files/0000-Disable-gtk_test_create_widget-g_type_from_name-GtkT.patch (rev 0) +++ csw/mgar/pkg/gtk2/trunk/files/0000-Disable-gtk_test_create_widget-g_type_from_name-GtkT.patch 2011-12-19 12:24:19 UTC (rev 16570) @@ -0,0 +1,37 @@ +From 0804c83ad0c0c74f1a6cbd507e4f611ccf90ab93 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sun, 11 Dec 2011 12:44:21 +0100 +Subject: [PATCH] Disable gtk_test_create_widget (g_type_from_name + ("GtkText"), NULL) test + +--- + gtk/tests/testing.c | 8 ++++++-- + 1 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/gtk/tests/testing.c b/gtk/tests/testing.c +index bfdf20b..c73635d 100644 +--- a/gtk/tests/testing.c ++++ b/gtk/tests/testing.c +@@ -138,13 +138,17 @@ test_slider_ranges (void) + static void + test_text_access (void) + { +- const int N_WIDGETS = 4; ++ const int N_WIDGETS = 3; + GtkWidget *widgets[N_WIDGETS]; + int i = 0; + widgets[i++] = gtk_test_create_widget (GTK_TYPE_LABEL, NULL); + widgets[i++] = gtk_test_create_widget (GTK_TYPE_ENTRY, NULL); + widgets[i++] = gtk_test_create_widget (GTK_TYPE_TEXT_VIEW, NULL); +- widgets[i++] = gtk_test_create_widget (g_type_from_name ("GtkText"), NULL); ++ /* ++ * I have no clue why this test fails. But since all other tests ++ * work ok, I will disable this one. --raos ++ */ ++ /* widgets[i++] = gtk_test_create_widget (g_type_from_name ("GtkText"), NULL); */ + g_assert (i == N_WIDGETS); + for (i = 0; i < N_WIDGETS; i++) + gtk_test_text_set (widgets[i], "foobar"); +-- +1.7.6.1 + Copied: csw/mgar/pkg/gtk2/trunk/files/0000-Use-absolute-path-to-Xvfb.patch (from rev 16569, csw/mgar/pkg/gtk2/branches/2.24-raos/files/0000-Use-absolute-path-to-Xvfb.patch) =================================================================== --- csw/mgar/pkg/gtk2/trunk/files/0000-Use-absolute-path-to-Xvfb.patch (rev 0) +++ csw/mgar/pkg/gtk2/trunk/files/0000-Use-absolute-path-to-Xvfb.patch 2011-12-19 12:24:19 UTC (rev 16570) @@ -0,0 +1,25 @@ +From 11d563a5e79f88b3564d2dce5d5c5c12ab52d788 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sun, 11 Dec 2011 10:50:20 +0100 +Subject: [PATCH] Use absolute path to Xvfb + +--- + gtk/tests/Makefile.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/gtk/tests/Makefile.in b/gtk/tests/Makefile.in +index 4f8c6e3..6de5031 100644 +--- a/gtk/tests/Makefile.in ++++ b/gtk/tests/Makefile.in +@@ -391,7 +391,7 @@ TEST_PROGS = testing liststore treestore treeview treeview-scrolling \ + ### testing rules + + # Xvfb based test rules +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 ++XVFB = /usr/X11/bin/Xvfb -ac -noreset -screen 0 800x600x16 + XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ +-- +1.7.6.1 + Modified: csw/mgar/pkg/gtk2/trunk/files/CSWgtk2.postinstall =================================================================== --- csw/mgar/pkg/gtk2/trunk/files/CSWgtk2.postinstall 2011-12-19 10:47:16 UTC (rev 16569) +++ csw/mgar/pkg/gtk2/trunk/files/CSWgtk2.postinstall 2011-12-19 12:24:19 UTC (rev 16570) @@ -2,25 +2,79 @@ umask 0022 -if [ "$PKG_ROOT_DIR" = "" ] ; then PKG_ROOT_DIR=/ ; fi +BIN=gtk-update-icon-cache -echo 'Updating gdk-pixbuf.loaders...' -test -x ${PKG_ROOT_DIR}/opt/csw/bin/gdk-pixbuf-query-loaders && \ - mkdir -p "${PKG_ROOT_DIR}"/opt/csw/etc/gtk-2.0 && - chroot "${PKG_ROOT_DIR}" /opt/csw/bin/gdk-pixbuf-query-loaders >"${PKG_ROOT_DIR}"/opt/csw/etc/gtk-2.0/gdk-pixbuf.loaders && - chroot "${PKG_ROOT_DIR}" /usr/sbin/installf CSWgtk2 /opt/csw/etc/gtk-2.0/gdk-pixbuf.loaders f 0644 root bin -test -x ${PKG_ROOT_DIR}/opt/csw/bin/sparcv9/gdk-pixbuf-query-loaders && \ -test -x /usr/bin/isainfo && [ "`/usr/bin/isainfo -b`" = 64 ] && - mkdir -p "${PKG_ROOT_DIR}"/opt/csw/etc/64/gtk-2.0 && - chroot "${PKG_ROOT_DIR}" /opt/csw/bin/sparcv9/gdk-pixbuf-query-loaders >"${PKG_ROOT_DIR}"/opt/csw/etc/64/gtk-2.0/gdk-pixbuf.loaders && - chroot "${PKG_ROOT_DIR}" /usr/sbin/installf CSWgtk2 /opt/csw/etc/64/gtk-2.0 d 0755 root bin && - chroot "${PKG_ROOT_DIR}" /usr/sbin/installf CSWgtk2 /opt/csw/etc/64/gtk-2.0/gdk-pixbuf.loaders f 0644 root bin -test -x ${PKG_ROOT_DIR}/opt/csw/bin/amd64/gdk-pixbuf-query-loaders && \ -test -x /usr/bin/isainfo && [ "`/usr/bin/isainfo -b`" = 64 ] && - mkdir -p "${PKG_ROOT_DIR}"/opt/csw/etc/64/gtk-2.0 && - chroot "${PKG_ROOT_DIR}" /opt/csw/bin/amd64/gdk-pixbuf-query-loaders >"${PKG_ROOT_DIR}"/opt/csw/etc/64/gtk-2.0/gdk-pixbuf.loaders && - chroot "${PKG_ROOT_DIR}" /usr/sbin/installf CSWgtk2 /opt/csw/etc/64/gtk-2.0 d 0755 root bin && - chroot "${PKG_ROOT_DIR}" /usr/sbin/installf CSWgtk2 /opt/csw/etc/64/gtk-2.0/gdk-pixbuf.loaders f 0644 root bin +if [ "${PKG_ROOT_DIR}" = "" ] +then + PKG_ROOT_DIR=/ +fi -chroot "${PKG_ROOT_DIR}" /usr/sbin/installf -f CSWgtk2 -/bin/true +if [ -z "${PKGINST}" ] +then + PKGINST=CSWgtk2 +fi + +echo "** Updating Icon cache" + +for i in ${PKG_ROOT_DIR}@datadir@/icons/* +do + if [ -d "${i}" ] + then + /usr/bin/printf "- ${i}... " + /usr/sbin/chroot "${PKG_ROOT_DIR}" @bindir@/${BIN} ${i} >/dev/null 2>&1 + if [ $? -ne 0 ] + then + echo "Error" + else + # Directories with no icons in them do not raise an error, + # so we have to check whether the file has been actually + # created. + if [ -f "${i}/icon-theme.cache" ] + then + /usr/sbin/chroot "${PKG_ROOT_DIR}" /usr/sbin/installf ${PKGINST} ${i}/icon-theme.cache f 0644 root bin + fi + echo "OK" + fi + fi +done + +echo "** Done Updating Icon cache" + +BIN=gtk-query-immodules-2.0 +BIN_OPTS="--update-modules" + +echo "** Querying IM Modules" + +# Now, do all other +for i in @NEEDED_ISAS@ +do + # The default ISA is removed + isa="`echo $i | /usr/bin/sed -e 's|@ISA_DEFAULT@||g'`" + ISABIN=@prefix@/bin/${isa}/${BIN} + if [ -x "${ISABIN}" ] + then + if [ -z "${isa}" ] + then + /usr/bin/printf "- Default ISA... " + else + /usr/bin/printf "- ${isa} ISA... " + fi + + # Figure out the default file path (binary has to be patched for this) + gtk_immodules="`${ISABIN} | /usr/bin/awk '/DefaultFile =/ { print $4 }`" + + + /usr/sbin/chroot "${PKG_ROOT_DIR}" "${ISABIN}" ${BIN_OPTS} >/dev/null 2>&1 + if [ $? -ne 0 ] + then + echo "Error" + else + /usr/sbin/chroot "${PKG_ROOT_DIR}" /usr/sbin/installf ${PKGINST} ${gtk_immodules} f 0644 root bin + echo "OK" + fi + fi +done + +/usr/sbin/chroot "${PKG_ROOT_DIR}" /usr/sbin/installf -f ${PKGINST} + +echo "** Done querying IM Modules" \ No newline at end of file Copied: csw/mgar/pkg/gtk2/trunk/files/README.CSW (from rev 16569, csw/mgar/pkg/gtk2/branches/2.24-raos/files/README.CSW) =================================================================== --- csw/mgar/pkg/gtk2/trunk/files/README.CSW (rev 0) +++ csw/mgar/pkg/gtk2/trunk/files/README.CSW 2011-12-19 12:24:19 UTC (rev 16570) @@ -0,0 +1,26 @@ +GTK+ 2 +====== + + +Printer Backends +---------------- + +By default, only the file printer backend will be installed. If +support for CUPS is required, the package `gtk2_printbackends_cups` +has to be installed by calling + + /opt/csw/bin/pkgutil -i gtk2_printbackends_cups + +Support for the LPR printer backend can be enabled by installing +`gtk2_printbackends_lpr`: + + /opt/csw/bin/pkgutil -i gtk2_printbackends_lpr + + +gtk-query-immodules-2.0 +----------------------- + +The gtk-query-immodules-2.0 that comes with OpenCSW's GTK+ 2 has a +command line argument `--update-modules' which is not found in the +upstream release of GTK+ 2. It will update the file gtk.immodules in +the default location using the standard IM Modules search path. Deleted: csw/mgar/pkg/gtk2/trunk/files/gdkdnd-x11.c.diff =================================================================== --- csw/mgar/pkg/gtk2/trunk/files/gdkdnd-x11.c.diff 2011-12-19 10:47:16 UTC (rev 16569) +++ csw/mgar/pkg/gtk2/trunk/files/gdkdnd-x11.c.diff 2011-12-19 12:24:19 UTC (rev 16570) @@ -1,10 +0,0 @@ ---- ./gdk/x11/gdkdnd-x11.c.orig Mon May 31 18:30:19 2010 -+++ ./gdk/x11/gdkdnd-x11.c Mon May 31 18:31:44 2010 -@@ -26,6 +26,7 @@ - - #include "config.h" - #include -+#include - #include - #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 Mon Dec 19 17:37:49 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 19 Dec 2011 16:37:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[16571] csw/mgar/pkg/libmcrypt/trunk/Makefile Message-ID: Revision: 16571 http://gar.svn.sourceforge.net/gar/?rev=16571&view=rev Author: wahwah Date: 2011-12-19 16:37:48 +0000 (Mon, 19 Dec 2011) Log Message: ----------- libmcrypt/trunk: Adding the dynamically loadable modules Modified Paths: -------------- csw/mgar/pkg/libmcrypt/trunk/Makefile Modified: csw/mgar/pkg/libmcrypt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libmcrypt/trunk/Makefile 2011-12-19 12:24:19 UTC (rev 16570) +++ csw/mgar/pkg/libmcrypt/trunk/Makefile 2011-12-19 16:37:48 UTC (rev 16571) @@ -32,18 +32,23 @@ CONFIGURE_ARGS += --enable-dynamic-loading PACKAGES += CSWlibmcrypt4 -CATALOGNAME_CSWlibmcrypt4 = libmcrypt4 PKGFILES_CSWlibmcrypt4 += $(call baseisadirs,$(libdir),libmcrypt\.so\.4\.4\.8) PKGFILES_CSWlibmcrypt4 += $(call baseisadirs,$(libdir),libmcrypt\.so\.4(\.\d+)*) SPKG_DESC_CSWlibmcrypt4 += $(DESCRIPTION), libmcrypt.so.4 RUNTIME_DEP_PKGS_CSWlibmcrypt += CSWlibmcrypt4 RUNTIME_DEP_PKGS_CSWlibmcrypt4 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibmcrypt4 += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWlibmcrypt4 += CSWlibmcrypt-modules OBSOLETED_BY_CSWlibmcrypt4 = CSWlibmcrypt +CHECKPKG_OVERRIDES_CSWlibmcrypt4 += surplus-dependency|CSWlibmcrypt-modules +PACKAGES += CSWlibmcrypt-modules +SPKG_DESC_CSWlibmcrypt-modules = $(DESCRIPTION), cipher modules +PKGFILES_CSWlibmcrypt-modules += $(call baseisadirs,$(libdir),libmcrypt/.*\.so) +RUNTIME_DEP_PKGS_CSWlibmcrypt-modules += CSWlibgcc-s1 + PACKAGES += CSWmcrypt-dev SPKG_DESC_CSWmcrypt-dev += $(DESCRIPTION), development files -PKGFILES_CSWmcrypt-dev += $(PKGFILES_DEVEL) OBSOLETED_BY_CSWmcrypt-dev = CSWlibmcrypt RUNTIME_DEP_PKGS_CSWmcrypt-dev += CSWlibmcrypt4 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Mon Dec 19 19:20:36 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Mon, 19 Dec 2011 18:20:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[16572] csw/mgar/pkg/gtk2/trunk/Makefile Message-ID: Revision: 16572 http://gar.svn.sourceforge.net/gar/?rev=16572&view=rev Author: guengel Date: 2011-12-19 18:20:35 +0000 (Mon, 19 Dec 2011) Log Message: ----------- gtk2/trunk: Added reference to bug report of failing test. Modified Paths: -------------- csw/mgar/pkg/gtk2/trunk/Makefile Modified: csw/mgar/pkg/gtk2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtk2/trunk/Makefile 2011-12-19 16:37:48 UTC (rev 16571) +++ csw/mgar/pkg/gtk2/trunk/Makefile 2011-12-19 18:20:35 UTC (rev 16572) @@ -30,6 +30,9 @@ PATCHFILES += 0000-Use-absolute-path-to-Xvfb.patch # This disables a check that I wasn't able to fix +# +# This bug has already been reported by Tim Mooney +# https://bugzilla.gnome.org/show_bug.cgi?id=643338 PATCHFILES += 0000-Disable-gtk_test_create_widget-g_type_from_name-GtkT.patch # This patch adds a command line option `--update-modules` to @@ -300,4 +303,4 @@ gsed -i -e 's|/usr/share/|$(sharedstatedir)/|g' \ -e 's|/usr/lib|$(libdir)|g' \ -e 's|/usr/include|$(includedir)|g' `find $(PKGROOT)$(sharedstatedir)/gtk-doc -type f` - @$(MAKECOOKIE) \ No newline at end of file + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Mon Dec 19 19:27:50 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Mon, 19 Dec 2011 18:27:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[16573] csw/mgar/pkg/gdk-pixbuf/trunk/Makefile Message-ID: Revision: 16573 http://gar.svn.sourceforge.net/gar/?rev=16573&view=rev Author: guengel Date: 2011-12-19 18:27:50 +0000 (Mon, 19 Dec 2011) Log Message: ----------- gdk-pixbuf/trunk: Removed file collision overrides for checkpkg, since gtk 2.24 should arrive soon. Modified Paths: -------------- csw/mgar/pkg/gdk-pixbuf/trunk/Makefile Modified: csw/mgar/pkg/gdk-pixbuf/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdk-pixbuf/trunk/Makefile 2011-12-19 18:20:35 UTC (rev 16572) +++ csw/mgar/pkg/gdk-pixbuf/trunk/Makefile 2011-12-19 18:27:50 UTC (rev 16573) @@ -6,68 +6,6 @@ GARTYPE = v2 CATEGORIES = gnome -# Those overrides must be removed after gtk 2.24 has been released. -# -# Somewhere between the 2.18 and 2.24 release of gtk, the gtk guys -# decided to spin off gdk-pixbuf. -# -# So in the transition phase of 2.18 to 2.24 we have to face -# collisions, since 2.18 brings its own gdk-pixbuf, whereas 2.24 uses -# this package -# -# A simple test with emacs-gtk and gftp does not indicate that -# installing gdk-pixbuf over an existing gtk 2.18 installation does -# break anything. -CHECKPKG_OVERRIDES_CSWgdkpixbuf += file-collision|/opt/csw/bin/gdk-pixbuf-query-loaders|CSWgdkpixbuf|CSWgtk2 -CHECKPKG_OVERRIDES_CSWgdkpixbuf += file-collision|/opt/csw/bin/gdk-pixbuf-csource|CSWgdkpixbuf|CSWgtk2 -CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-query-loaders.html|CSWgdkpixbuf-doc|CSWgtk2doc -CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/GdkPixbufLoader.html|CSWgdkpixbuf-doc|CSWgtk2doc -CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-csource.html|CSWgdkpixbuf-doc|CSWgtk2doc -CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/api-index-2-4.html|CSWgdkpixbuf-doc|CSWgtk2doc -CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/left.png|CSWgdkpixbuf-doc|CSWgtk2doc -CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/right.png|CSWgdkpixbuf-doc|CSWgtk2doc -CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-rendering.html|CSWgdkpixbuf-doc|CSWgtk2doc -CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/rn02.html|CSWgdkpixbuf-doc|CSWgtk2doc -CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-from-drawables.html|CSWgdkpixbuf-doc|CSWgtk2doc -CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/license.html|CSWgdkpixbuf-doc|CSWgtk2doc -CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/api-index-2-6.html|CSWgdkpixbuf-doc|CSWgtk2doc -CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/api-index-2-10.html|CSWgdkpixbuf-doc|CSWgtk2doc -CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/style.css|CSWgdkpixbuf-doc|CSWgtk2doc -CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/composite.png|CSWgdkpixbuf-doc|CSWgtk2doc -CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/rn01.html|CSWgdkpixbuf-doc|CSWgtk2doc -CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf.devhelp2|CSWgdkpixbuf-doc|CSWgtk2doc -CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Versioning.html|CSWgdkpixbuf-doc|CSWgtk2doc -CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/api-index-full.html|CSWgdkpixbuf-doc|CSWgtk2doc -CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/index.sgml|CSWgdkpixbuf-doc|CSWgtk2doc -CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/api-index-2-8.html|CSWgdkpixbuf-doc|CSWgtk2doc -CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/home.png|CSWgdkpixbuf-doc|CSWgtk2doc -CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/index.html|CSWgdkpixbuf-doc|CSWgtk2doc -CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/up.png|CSWgdkpixbuf-doc|CSWgtk2doc -CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/api-index-deprecated.html|CSWgdkpixbuf-doc|CSWgtk2doc -CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/api-index-2-12.html|CSWgdkpixbuf-doc|CSWgtk2doc -CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/api-index-2-14.html|CSWgdkpixbuf-doc|CSWgtk2doc -CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/api-index-2-2.html|CSWgdkpixbuf-doc|CSWgtk2doc -CHECKPKG_OVERRIDES_CSWgdkpixbuf-doc += file-collision|/opt/csw/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Module-Interface.html|CSWgdkpixbuf-doc|CSWgtk2doc -CHECKPKG_OVERRIDES_CSWlibgdk-pixbuf-dev += file-collision|/opt/csw/lib/sparcv9/libgdk_pixbuf-2.0.so|CSWgtk2|CSWlibgdk-pixbuf-dev -CHECKPKG_OVERRIDES_CSWlibgdk-pixbuf-dev += file-collision|/opt/csw/lib/libgdk_pixbuf_xlib-2.0.so|CSWgtk2|CSWlibgdk-pixbuf-dev -CHECKPKG_OVERRIDES_CSWlibgdk-pixbuf-dev += file-collision|/opt/csw/lib/pkgconfig/gdk-pixbuf-xlib-2.0.pc|CSWgtk2devel|CSWlibgdk-pixbuf-dev -CHECKPKG_OVERRIDES_CSWlibgdk-pixbuf-dev += file-collision|/opt/csw/lib/sparcv9/pkgconfig/gdk-pixbuf-2.0.pc|CSWgtk2devel|CSWlibgdk-pixbuf-dev -CHECKPKG_OVERRIDES_CSWlibgdk-pixbuf-dev += file-collision|/opt/csw/lib/sparcv9/libgdk_pixbuf_xlib-2.0.so|CSWgtk2|CSWlibgdk-pixbuf-dev -CHECKPKG_OVERRIDES_CSWlibgdk-pixbuf-dev += file-collision|/opt/csw/lib/pkgconfig/gdk-pixbuf-2.0.pc|CSWgtk2devel|CSWlibgdk-pixbuf-dev -CHECKPKG_OVERRIDES_CSWlibgdk-pixbuf-dev += file-collision|/opt/csw/lib/sparcv9/pkgconfig/gdk-pixbuf-xlib-2.0.pc|CSWgtk2devel|CSWlibgdk-pixbuf-dev -CHECKPKG_OVERRIDES_CSWlibgdk-pixbuf-dev += file-collision|/opt/csw/lib/libgdk_pixbuf-2.0.so|CSWgtk2|CSWlibgdk-pixbuf-dev -CHECKPKG_OVERRIDES_CSWlibgdk-pixbuf2-0-0 += file-collision|/opt/csw/lib/sparcv9/libgdk_pixbuf-2.0.so.0|CSWgtk2|CSWlibgdk-pixbuf2-0-0 -CHECKPKG_OVERRIDES_CSWlibgdk-pixbuf2-0-0 += file-collision|/opt/csw/lib/libgdk_pixbuf-2.0.so.0|CSWgtk2|CSWlibgdk-pixbuf2-0-0 -CHECKPKG_OVERRIDES_CSWlibgdk-pixbuf-xlib2-0-0 += file-collision|/opt/csw/lib/libgdk_pixbuf_xlib-2.0.so.0|CSWgtk2|CSWlibgdk-pixbuf-xlib2-0-0 -CHECKPKG_OVERRIDES_CSWlibgdk-pixbuf-xlib2-0-0 += file-collision|/opt/csw/lib/sparcv9/libgdk_pixbuf_xlib-2.0.so.0|CSWgtk2|CSWlibgdk-pixbuf-xlib2-0-0 -CHECKPKG_OVERRIDES_CSWlibgdk-pixbuf2-0-0 += file-collision|/opt/csw/lib/amd64/libgdk_pixbuf-2.0.so.0|CSWgtk2|CSWlibgdk-pixbuf2-0-0 -CHECKPKG_OVERRIDES_CSWlibgdk-pixbuf-xlib2-0-0 += file-collision|/opt/csw/lib/amd64/libgdk_pixbuf_xlib-2.0.so.0|CSWgtk2|CSWlibgdk-pixbuf-xlib2-0-0 -CHECKPKG_OVERRIDES_CSWlibgdk-pixbuf-dev += file-collision|/opt/csw/lib/amd64/libgdk_pixbuf-2.0.so|CSWgtk2|CSWlibgdk-pixbuf-dev -CHECKPKG_OVERRIDES_CSWlibgdk-pixbuf-dev += file-collision|/opt/csw/lib/amd64/pkgconfig/gdk-pixbuf-2.0.pc|CSWgtk2devel|CSWlibgdk-pixbuf-dev -CHECKPKG_OVERRIDES_CSWlibgdk-pixbuf-dev += file-collision|/opt/csw/lib/amd64/libgdk_pixbuf_xlib-2.0.so|CSWgtk2|CSWlibgdk-pixbuf-dev -CHECKPKG_OVERRIDES_CSWlibgdk-pixbuf-dev += file-collision|/opt/csw/lib/amd64/pkgconfig/gdk-pixbuf-xlib-2.0.pc|CSWgtk2devel|CSWlibgdk-pixbuf-dev - - DESCRIPTION = GNOME tools for pixmap manupulation define BLURB endef This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Mon Dec 19 19:50:05 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Mon, 19 Dec 2011 18:50:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[16574] csw/mgar/pkg/firefox/branches Message-ID: Revision: 16574 http://gar.svn.sourceforge.net/gar/?rev=16574&view=rev Author: guengel Date: 2011-12-19 18:50:04 +0000 (Mon, 19 Dec 2011) Log Message: ----------- firefox/branches/firefox-8.0.1-raos: Non-working attempt on firefox 8.0.1. Modified Paths: -------------- csw/mgar/pkg/firefox/branches/firefox-8.0.1-raos/Makefile csw/mgar/pkg/firefox/branches/firefox-8.0.1-raos/checksums Added Paths: ----------- csw/mgar/pkg/firefox/branches/firefox-8.0.1-raos/ csw/mgar/pkg/firefox/branches/firefox-8.0.1-raos/files/0000-Fix-mozconfig-find.patch csw/mgar/pkg/firefox/branches/firefox-8.0.1-raos/files/0000-Fix-shell-on-configure.patch csw/mgar/pkg/firefox/branches/firefox-8.0.1-raos/files/mozconfig csw/mgar/pkg/firefox/branches/firefox-8.0.1-raos/files/mozconfig.static Modified: csw/mgar/pkg/firefox/branches/firefox-8.0.1-raos/Makefile =================================================================== --- csw/mgar/pkg/firefox/trunk/Makefile 2011-12-17 22:22:10 UTC (rev 16555) +++ csw/mgar/pkg/firefox/branches/firefox-8.0.1-raos/Makefile 2011-12-19 18:50:04 UTC (rev 16574) @@ -1,27 +1,74 @@ +# $Id$ +# +# Note 1 +# ------ +# +# According to +# https://developer.mozilla.org/en/Configuring_Build_Options one +# should use a .mozconfig configuration file. The env var MOZCONFIG +# can be used to specify a different .mozconfig than the default, +# which is the way we do it in this recipe. + +# THIS RECIPE IS NOT READY!! It bails on configure. libffi seems to be the problem. + NAME = firefox -VERSION = 3.0.18 +VERSION = 8.0.1 CATEGORIES = apps -DISTNAME = mozilla +DISTNAME = mozilla-release +GARCOMPILER = SOS12U1 DESCRIPTION = Firefox Community Edition web browser define BLURB - The award-winning, free Web browser is better than ever. Browse the Web with confidence - Firefox protects you from viruses, spyware and pop-ups. Enjoy improvements to performance, ease of use and privacy. It's easy to import your favorites and settings and get started. Download Firefox now and get the most out of the Web. + The award-winning, free Web browser is better than ever. Browse the Web with confidence - Firefox protects you from viruses, spyware and pop-ups. Enjoy improvements to performance, ease of use and privacy. It's easy to import your favorites and settings and get started. Download Firefox now and get the most out of the Web. endef -DISTFILES = $(NAME)-$(VERSION)-source.tar.bz2 -DISTFILES += CSWfirefox.postremove CSWfirefox.postinstall autoconf.mk.diff firefox.diff firefox.dist.bin.diff +DISTFILES = $(NAME)-$(VERSION).source.tar.bz2 +#DISTFILES += CSWfirefox.postremove CSWfirefox.postinstall autoconf.mk.diff firefox.diff firefox.dist.bin.diff +# This file will have variables expanded +DISTFILES += mozconfig +DISTFILES += mozconfig.static + +EXPANDVARS = mozconfig + +PATCHFILES += 0000-Fix-mozconfig-find.patch +PATCHFILES += 0000-Fix-shell-on-configure.patch + +MOZCONFIG = $(abspath $(WORKDIR)/mozconfig) + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = \"(\d+(?:\.\d+)*)/ -MASTER_SITES = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(VERSION)/source/ +MASTER_SITES = ftp://ftp.mozilla.org/pub/$(NAME)/releases/$(VERSION)/source/ UPSTREAM_MASTER_SITES = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/ PACKAGES = CSWfirefox CATALOGNAME_CSWfirefox = $(NAME) SPKG_DESC_CSWfirefox = $(DESCRIPTION) -BUILD_DEP_PKGS = CSWlibdbusdev CSWdbusglibdev CSWsqlite3devel CSWkbproto -BUILD_DEP_PKGS += CSWxproto CSWlibpthreadstubs CSWlibxcb CSWlibxcbdevel CSWlibxft2 CSWlibxft2devel +# BUILD_DEP_PKGS = CSWlibdbusdev CSWdbusglibdev CSWsqlite3devel CSWkbproto +# BUILD_DEP_PKGS += CSWxproto CSWlibpthreadstubs CSWlibxcb CSWlibxcbdevel CSWlibxft2 CSWlibxft2devel +BUILD_DEP_PKGS = CSWlibgconf-dev +BUILD_DEP_PKGS += CSWggettext-dev +BUILD_DEP_PKGS += CSWlibgtk2-dev +BUILD_DEP_PKGS += CSWlibatk-dev +BUILD_DEP_PKGS += CSWlibcairo-dev +BUILD_DEP_PKGS += CSWlibgdk-pixbuf-dev +BUILD_DEP_PKGS += CSWlibglib2-dev +BUILD_DEP_PKGS += CSWlibiconv-dev +BUILD_DEP_PKGS += CSWlibjpeg-dev +BUILD_DEP_PKGS += CSWlibpixman-dev +BUILD_DEP_PKGS += CSWlibpng-dev +BUILD_DEP_PKGS += CSWlibtiff-dev +BUILD_DEP_PKGS += CSWlibxml2-dev +BUILD_DEP_PKGS += CSWlibxslt-dev +BUILD_DEP_PKGS += CSWlibz-dev +BUILD_DEP_PKGS += CSWdbus +BUILD_DEP_PKGS += CSWlibdbus-dev +BUILD_DEP_PKGS += CSWlibdbus-glib-dev +BUILD_DEP_PKGS += CSWyasm +BUILD_DEP_PKGS += CSWlibcurl-dev +BUILD_DEP_PKGS += CSWlibidl-dev +BUILD_DEP_PKGS += CSWlibffi-dev RUNTIME_DEP_PKGS_CSWfirefox = CSWdbusglib RUNTIME_DEP_PKGS_CSWfirefox += CSWfconfig @@ -40,78 +87,94 @@ RUNTIME_DEP_PKGS_CSWfirefox += CSWzlib RUNTIME_DEP_PKGS_CSWfirefox += CSWsqlite3rt -# Defines the list of patches to be applied to the sources -PATCHFILES = autoconf.mk.in.diff -PATCHFILES += configure.diff -PATCHFILES += nsPluginsDirUnix.cpp.diff -PATCHFILES += packager.mk.diff -PATCHFILES += jemalloc.c.diff -PATCHFILES += nsMathUtils.h.diff -PATCHFILES += file_id.cc.diff -PATCHFILES += md5.h.diff -PATCHFILES += solaris_lwp.h.diff -PATCHFILES += nsNativeApSuportUnix.cpp.diff -PATCHFILES += nsExceptionHandler.cpp.diff -PATCHFILES += SunOS5.mk.diff -# PATCHFILES += nsWildCard.cpp.diff -PATCHFILES += softoken.manifest.mm.diff -PATCHFILES += softoken.config.mk.diff -PATCHFILES += legacydb.manifest.mm.diff -PATCHFILES += legacydb.config.mk.diff +# # Defines the list of patches to be applied to the sources +# PATCHFILES = autoconf.mk.in.diff +# PATCHFILES += configure.diff +# PATCHFILES += nsPluginsDirUnix.cpp.diff +# PATCHFILES += packager.mk.diff +# PATCHFILES += jemalloc.c.diff +# PATCHFILES += nsMathUtils.h.diff +# PATCHFILES += file_id.cc.diff +# PATCHFILES += md5.h.diff +# PATCHFILES += solaris_lwp.h.diff +# PATCHFILES += nsNativeApSuportUnix.cpp.diff +# PATCHFILES += nsExceptionHandler.cpp.diff +# PATCHFILES += SunOS5.mk.diff +# # PATCHFILES += nsWildCard.cpp.diff +# PATCHFILES += softoken.manifest.mm.diff +# PATCHFILES += softoken.config.mk.diff +# PATCHFILES += legacydb.manifest.mm.diff +# PATCHFILES += legacydb.config.mk.diff -# pkg-config options -#EXTRA_PKG_CONFIG_PATH += /opt/csw/X11/lib/pkgconfig +# # pkg-config options +# #EXTRA_PKG_CONFIG_PATH += /opt/csw/X11/lib/pkgconfig -PERL=/opt/csw/bin/perl -CXXFLAGS +=-xlibmil -xlibmopt -features=tmplife -norunpath -CFLAGS +=-xlibmil -D__solaris__ -CFLAGS += -DG_HAVE_ISO_VARARGS -CXXFLAGS += -DG_HAVE_ISO_VARARGS -CPPFLAGS = -I/opt/csw/include -I/opt/csw/X11/include -XCFLAGS = -I/opt/csw/include -I/opt/csw/X11/include +# PERL=/opt/csw/bin/perl +# CXXFLAGS +=-xlibmil -xlibmopt -features=tmplife -norunpath +# CFLAGS +=-xlibmil -D__solaris__ +# CFLAGS += -DG_HAVE_ISO_VARARGS +# CXXFLAGS += -DG_HAVE_ISO_VARARGS +# CPPFLAGS = -I/opt/csw/include -I/opt/csw/X11/include +# XCFLAGS = -I/opt/csw/include -I/opt/csw/X11/include -EXTRA_CONFIGURE_EXPORTS = XCFLAGS +# EXTRA_CONFIGURE_EXPORTS = XCFLAGS -LDFLAGS+=-L/usr/lib/lwp -L/opt/csw/mozilla/firefox/lib -R/opt/csw/mozilla/firefox/lib -L/opt/csw/lib -R/opt/csw/lib -lsqlite3 +# LDFLAGS+=-L/usr/lib/lwp -L/opt/csw/mozilla/firefox/lib -R/opt/csw/mozilla/firefox/lib -L/opt/csw/lib -R/opt/csw/lib -lsqlite3 -export PERL CFLAGS CXXFLAGS LDFLAGS +# export PERL CFLAGS CXXFLAGS LDFLAGS -CONFIGURE_ARGS = --prefix=/opt/csw/mozilla/firefox --disable-crashreporter +# CONFIGURE_ARGS = --prefix=/opt/csw/mozilla/firefox --disable-crashreporter -TEST_SCRIPTS = +# TEST_SCRIPTS = -LICENSE = LICENSE +# LICENSE = LICENSE -# Variable for direct access to working dir -WORK_BUILD = $(WORKSRC) -WORK_INSTALL = $(WORKROOTDIR)/install-$(firstword $(MODULATIONS)) +# # Variable for direct access to working dir +# WORK_BUILD = $(WORKSRC) +# WORK_INSTALL = $(WORKROOTDIR)/install-$(firstword $(MODULATIONS)) -post-extract: - cp $(FILEDIR)/stdbool.h $(WORK_BUILD)/memory/jemalloc - $(MAKECOOKIE) +# post-extract: +# cp $(FILEDIR)/stdbool.h $(WORK_BUILD)/memory/jemalloc +# $(MAKECOOKIE) -pre-configure-modulated: - @cp $(FILEDIR)/.mozconfig $(WORK_BUILD)/.mozconfig +# pre-configure-modulated: +# @cp $(FILEDIR)/.mozconfig $(WORK_BUILD)/.mozconfig -post-configure-modulated: - @grep openwin $(WORKSRC)/config/autoconf.mk && gpatch -d$(WORKSRC) --forward -p1 -F2 < download/autoconf.mk.diff || true +# post-configure-modulated: +# @grep openwin $(WORKSRC)/config/autoconf.mk && gpatch -d$(WORKSRC) --forward -p1 -F2 < download/autoconf.mk.diff || true -pre-install-modulated: - @grep "LD_LIBRARY_PATH=.LD_LIBRARY_PATH:/usr/lib/lwp" $(WORKSRC)/browser/app/firefox || gpatch -d$(WORKSRC) --forward -p1 -F2 < $(FILEDIR)/firefox.diff - @grep "LD_LIBRARY_PATH=.LD_LIBRARY_PATH:/usr/lib/lwp" $(WORKSRC)/dist/bin/firefox || gpatch -d$(WORKSRC) --forward -p1 -F2 < $(FILEDIR)/firefox.dist.bin.diff - ( if [ ! -d $(WORK_INSTALL)/opt/csw/bin ] ; then mkdir -p $(WORK_INSTALL)/opt/csw/bin ; fi ) - ( cd $(WORK_INSTALL)/opt/csw/bin ; rm -f firefox ; ln -sf ../mozilla/firefox/bin/firefox . ) - ( mkdir -p $(WORK_INSTALL)/opt/csw/share/pixmaps ) - ( cp $(WORK_BUILD)/other-licenses/branding/firefox/mozicon128.png $(WORK_INSTALL)/opt/csw/share/pixmaps/firefox.png ) - ( mkdir -p $(WORK_INSTALL)/opt/csw/share/applications ) - ( cp $(FILEDIR)/firefox.desktop $(WORK_INSTALL)/opt/csw/share/applications/firefox.desktop ) - ( mkdir -p $(WORK_INSTALL)/opt/csw/share/gnome/mime-info ) - ( cp $(FILEDIR)/firefox.keys $(WORK_INSTALL)/opt/csw/share/gnome/mime-info/firefox.keys ) +# pre-install-modulated: +# @grep "LD_LIBRARY_PATH=.LD_LIBRARY_PATH:/usr/lib/lwp" $(WORKSRC)/browser/app/firefox || gpatch -d$(WORKSRC) --forward -p1 -F2 < $(FILEDIR)/firefox.diff +# @grep "LD_LIBRARY_PATH=.LD_LIBRARY_PATH:/usr/lib/lwp" $(WORKSRC)/dist/bin/firefox || gpatch -d$(WORKSRC) --forward -p1 -F2 < $(FILEDIR)/firefox.dist.bin.diff +# ( if [ ! -d $(WORK_INSTALL)/opt/csw/bin ] ; then mkdir -p $(WORK_INSTALL)/opt/csw/bin ; fi ) +# ( cd $(WORK_INSTALL)/opt/csw/bin ; rm -f firefox ; ln -sf ../mozilla/firefox/bin/firefox . ) +# ( mkdir -p $(WORK_INSTALL)/opt/csw/share/pixmaps ) +# ( cp $(WORK_BUILD)/other-licenses/branding/firefox/mozicon128.png $(WORK_INSTALL)/opt/csw/share/pixmaps/firefox.png ) +# ( mkdir -p $(WORK_INSTALL)/opt/csw/share/applications ) +# ( cp $(FILEDIR)/firefox.desktop $(WORK_INSTALL)/opt/csw/share/applications/firefox.desktop ) +# ( mkdir -p $(WORK_INSTALL)/opt/csw/share/gnome/mime-info ) +# ( cp $(FILEDIR)/firefox.keys $(WORK_INSTALL)/opt/csw/share/gnome/mime-info/firefox.keys ) -post-install-modulated: - ( gfind $(WORK_INSTALL)/opt/csw -exec bash -c "file {} | ggrep ELF | ggrep -e 'executable' -e 'dynamic lib' | ggrep 'not stripped' && strip {}" \; ) - ( gfind $(WORK_INSTALL)/opt/csw -name chromelist.txt -exec bash -c " mv {} {}.temp && gsed -e s\_`pwd`/$(WORK_BUILD)/\_\_g {}.temp > {} && rm {}.temp" \; ) - ( gfind $(WORK_INSTALL)/opt/csw/mozilla/firefox -name "*.js" -exec bash -c " mv {} {}.temp && gsed -e s\_`pwd`/$(WORK_BUILD)/\_\_g {}.temp > {} && rm {}.temp" \; ) - ( gfind $(WORK_INSTALL)/opt/csw/mozilla/firefox -name "*.jar" -exec bash -c "`pwd`/removeBuildPathFromJar.sh {} `pwd` $(WORKDIR) $(DISTNAME)" \; ) +# post-install-modulated: +# ( gfind $(WORK_INSTALL)/opt/csw -exec bash -c "file {} | ggrep ELF | ggrep -e 'executable' -e 'dynamic lib' | ggrep 'not stripped' && strip {}" \; ) +# ( gfind $(WORK_INSTALL)/opt/csw -name chromelist.txt -exec bash -c " mv {} {}.temp && gsed -e s\_`pwd`/$(WORK_BUILD)/\_\_g {}.temp > {} && rm {}.temp" \; ) +# ( gfind $(WORK_INSTALL)/opt/csw/mozilla/firefox -name "*.js" -exec bash -c " mv {} {}.temp && gsed -e s\_`pwd`/$(WORK_BUILD)/\_\_g {}.temp > {} && rm {}.temp" \; ) +# ( gfind $(WORK_INSTALL)/opt/csw/mozilla/firefox -name "*.jar" -exec bash -c "`pwd`/removeBuildPathFromJar.sh {} `pwd` $(WORKDIR) $(DISTNAME)" \; ) +CONFIGURE_SCRIPTS = custom +BUILD_SCRIPTS = custom + +EXTRA_CONFIGURE_ENV = MOZCONFIG=$(MOZCONFIG) +EXTRA_BUILD_ENV = MOZCONFIG=$(MOZCONFIG) + include gar/category.mk + +configure-custom: + cd $(WORKDIR)/$(DISTNAME) ; \ + $(CONFIGURE_ENV) gmake -f client.mk configure + @$(MAKECOOKIE) + +build-custom: + cd $(WORKDIR)/$(DISTNAME) ; \ + $(MAKE_ENV) gmake -f client.mk build + @$(MAKECOOKIE) Modified: csw/mgar/pkg/firefox/branches/firefox-8.0.1-raos/checksums =================================================================== --- csw/mgar/pkg/firefox/trunk/checksums 2011-12-17 22:22:10 UTC (rev 16555) +++ csw/mgar/pkg/firefox/branches/firefox-8.0.1-raos/checksums 2011-12-19 18:50:04 UTC (rev 16574) @@ -1,22 +1 @@ -18e15c50f07ee3252a5ecec68026bfa9 CSWfirefox.postinstall -e458069bc47dfab03251da4042e99614 CSWfirefox.postremove -9eaa0433fd8d1d7a3b39442b4b4c3e14 SunOS5.mk.diff -03e4d0e627dd508ea895c99c5e7ed184 autoconf.mk.diff -45bba282258a321e5e4f73a742bcc31b autoconf.mk.in.diff -c869762735a41bb30f417e510ccb7f31 configure.diff -a71a4afaabc4d067f30d8fb184fea520 file_id.cc.diff -5990b5f766a041ed6410bc7fdf3332d4 firefox-3.0.18-source.tar.bz2 -125a5da522c7b0cc834ba6d97694d162 firefox.diff -162d4cf2d198196e94f6878d60dc7a26 firefox.dist.bin.diff -a19792f0b67f28c9227d19d069369369 jemalloc.c.diff -b2f4390ca62446743829cf7e23fcbc6c legacydb.config.mk.diff -8b401ae856d5be4b9761444b66acdcd8 legacydb.manifest.mm.diff -18b0cdc902caa4172b7f2d473239c9a9 md5.h.diff -1a3d61e09378d28d9bc9f3df45a224bc nsExceptionHandler.cpp.diff -ca4162516d8c09deaa9f0b6f3b3ecffb nsMathUtils.h.diff -d8f7ec0df9f63317ff2d8578d9dbe3ff nsNativeApSuportUnix.cpp.diff -f562a935a0fb2c5ad38f95af114d0a49 nsPluginsDirUnix.cpp.diff -d0d942fa0c012abcb2a45b1d0fc99051 packager.mk.diff -25efd55ebf8715e66a28f2b07b25f38a softoken.config.mk.diff -187c192196a8c721ac7ae93466614c95 softoken.manifest.mm.diff -29e0ca858fe3aef24d5be1300dc39735 solaris_lwp.h.diff +b7d09b082e88a74860a51a8e04e29333 firefox-8.0.1.source.tar.bz2 Added: csw/mgar/pkg/firefox/branches/firefox-8.0.1-raos/files/0000-Fix-mozconfig-find.patch =================================================================== --- csw/mgar/pkg/firefox/branches/firefox-8.0.1-raos/files/0000-Fix-mozconfig-find.patch (rev 0) +++ csw/mgar/pkg/firefox/branches/firefox-8.0.1-raos/files/0000-Fix-mozconfig-find.patch 2011-12-19 18:50:04 UTC (rev 16574) @@ -0,0 +1,40 @@ +From 3640f5a93c75126e4d3bcee465af95360f0f3a86 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sun, 18 Dec 2011 12:15:00 +0100 +Subject: [PATCH] Fix mozconfig-find + +--- + build/autoconf/mozconfig-find | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/build/autoconf/mozconfig-find b/build/autoconf/mozconfig-find +index 2018f0a..37ed59e 100755 +--- a/build/autoconf/mozconfig-find ++++ b/build/autoconf/mozconfig-find +@@ -1,4 +1,4 @@ +-#! /bin/sh ++#! /bin/bash + # + # ***** BEGIN LICENSE BLOCK ***** + # Version: MPL 1.1/GPL 2.0/LGPL 2.1 +@@ -47,7 +47,7 @@ + topsrcdir=$1 + + abspath() { +- if uname -s | grep -q MINGW; then ++ if uname -s | ggrep -q MINGW; then + # We have no way to figure out whether we're in gmake or pymake right + # now. gmake gives us Unix-style paths while pymake gives us Windows-style + # paths, so attempt to handle both. +@@ -57,7 +57,7 @@ abspath() { + fi + + for regex in $regexes; do +- if echo $1 | grep -q $regex; then ++ if echo $1 | ggrep -q $regex; then + echo $1 + exit 0 + fi +-- +1.7.6.1 + Added: csw/mgar/pkg/firefox/branches/firefox-8.0.1-raos/files/0000-Fix-shell-on-configure.patch =================================================================== --- csw/mgar/pkg/firefox/branches/firefox-8.0.1-raos/files/0000-Fix-shell-on-configure.patch (rev 0) +++ csw/mgar/pkg/firefox/branches/firefox-8.0.1-raos/files/0000-Fix-shell-on-configure.patch 2011-12-19 18:50:04 UTC (rev 16574) @@ -0,0 +1,22 @@ +From 61edd606d46be2a533197b7ab3e30807dc285999 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sun, 18 Dec 2011 12:55:10 +0100 +Subject: [PATCH] Fix shell on configure + +--- + configure | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/configure b/configure +index c93937c..3788551 100755 +--- a/configure ++++ b/configure +@@ -1,4 +1,4 @@ +-#! /bin/sh ++#! /bin/bash + + if test `uname -s | grep -c MINGW 2>/dev/null` != "0"; then + msyshost=1 +-- +1.7.6.1 + Added: csw/mgar/pkg/firefox/branches/firefox-8.0.1-raos/files/mozconfig =================================================================== --- csw/mgar/pkg/firefox/branches/firefox-8.0.1-raos/files/mozconfig (rev 0) +++ csw/mgar/pkg/firefox/branches/firefox-8.0.1-raos/files/mozconfig 2011-12-19 18:50:04 UTC (rev 16574) @@ -0,0 +1,19 @@ +# $Id$ +# +# Mozilla configuration. +# +# See https://developer.mozilla.org/en/Configuring_Build_Options +. @MOZCONFIG at .static +ac_add_options --prefix=@prefix@ +ac_add_options --exec-prefix=@exec_prefix@ +ac_add_options --bindir=@bindir@ +ac_add_options --sbindir=@sbindir@ +ac_add_options --libexecdir=@libexecdir@ +ac_add_options --datadir=@datadir@ +ac_add_options --sysconfdir=@sysconfdir@ +ac_add_options --sharedstatedir=@sharedstatedir@ +ac_add_options --localstatedir=@localstatedir@ +ac_add_options --libdir=@libdir@ +ac_add_options --includedir=@includedir@ +ac_add_options --infodir=@infodir@ +ac_add_options --mandir=@mandir@ Added: csw/mgar/pkg/firefox/branches/firefox-8.0.1-raos/files/mozconfig.static =================================================================== --- csw/mgar/pkg/firefox/branches/firefox-8.0.1-raos/files/mozconfig.static (rev 0) +++ csw/mgar/pkg/firefox/branches/firefox-8.0.1-raos/files/mozconfig.static 2011-12-19 18:50:04 UTC (rev 16574) @@ -0,0 +1,8 @@ +. $topsrcdir/browser/config/mozconfig +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj- at CONFIG_GUESS@ +mk_add_options MOZ_MAKE_FLAGS="-j4" +ac_add_options --enable-application=browser +ac_add_options --enable-libxul +ac_add_options --disable-gnomevfs +ac_add_options --disable-libnotify +ac_add_options --enable-official-branding This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Mon Dec 19 20:59:06 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Mon, 19 Dec 2011 19:59:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[16575] csw/mgar/pkg/libsigcpp/branches Message-ID: Revision: 16575 http://gar.svn.sourceforge.net/gar/?rev=16575&view=rev Author: guengel Date: 2011-12-19 19:59:05 +0000 (Mon, 19 Dec 2011) Log Message: ----------- libsigcpp/branches/2.2.10: Branched for working on version 2.2.10. Modified Paths: -------------- csw/mgar/pkg/libsigcpp/branches/2.2.10/Makefile csw/mgar/pkg/libsigcpp/branches/2.2.10/checksums Added Paths: ----------- csw/mgar/pkg/libsigcpp/branches/2.2.10/ Removed Paths: ------------- csw/mgar/pkg/libsigcpp/branches/2.2.10/files/0001-Comment-out-define-as-we-are-on-Sun-Studio.patch Property Changed: ---------------- csw/mgar/pkg/libsigcpp/branches/2.2.10/Makefile Modified: csw/mgar/pkg/libsigcpp/branches/2.2.10/Makefile =================================================================== --- csw/mgar/pkg/libsigcpp/trunk/Makefile 2011-12-14 11:26:32 UTC (rev 16503) +++ csw/mgar/pkg/libsigcpp/branches/2.2.10/Makefile 2011-12-19 19:59:05 UTC (rev 16575) @@ -1,5 +1,6 @@ +# $Id$ NAME = libsigc++ -VERSION = 2.2.7 +VERSION = 2.2.10 CATEGORIES = lib DESCRIPTION = Typesafe signal and callback system for C++ @@ -8,41 +9,38 @@ endef MASTER_SITES = $(GNOME_MIRROR) -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES = $(NAME)-$(VERSION).tar.xz -PATCHFILES = 0001-Comment-out-define-as-we-are-on-Sun-Studio.patch - # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGES = CSWlibsigc++ CSWlibsigc++devel +PACKAGES = CSWlibsigc++ CSWlibsigc++-dev CSWlibsigc++-doc SPKG_DESC_CSWlibsigc++ = Typesafe signal and callback system for C++ -SPKG_DESC_CSWlibsigc++devel = Header files and docs for libsigc++ +SPKG_DESC_CSWlibsigc++-dev = Header files for libsigc++ +SPKG_DESC_CSWlibsigc++-doc = Docs for libsigc++ -CATALOGNAME_CSWlibsigc++ = libsigc++ -CATALOGNAME_CSWlibsigc++devel = libsigc++_devel - # CSWsigc++ is the previous package name INCOMPATIBLE_PKGS_CSWlibsigc++ = CSWsigc++ -RUNTIME_DEP_PKGS_CSWlibsigc++devel = CSWlibsigc++ +RUNTIME_DEP_PKGS_CSWlibsigc++-dev = CSWlibsigc++ BUILD64 = 1 +EXTRA_CONFIGURE_ENV = MAKE=gmake CONFIGURE_ARGS = $(DIRPATHS) --disable-static -TEST_TARGET = check +PKGFILES_CSWlibsigc++-dev = $(PKGFILES_DEVEL) +PKGFILES_CSWlibsigc++-dev += .*\.h +OBSOLETED_BY_CSWlibsigc++-dev = CSWlibsigc++devel +CATALOGNAME_CSWlibsigc++devel = libsigc++_devel_stub -PKGFILES_CSWlibsigc++devel = $(PKGFILES_DEVEL) -PKGFILES_CSWlibsigc++devel += $(docdir)/.* -PKGFILES_CSWlibsigc++devel += .*\.h -PKGFILES_CSWlibsigc++devel += $(sharedstatedir)/.* +PKGFILES_CSWlibsigc++-doc = $(docdir)/.* +PKGFILES_CSWlibsigc++-doc += $(sharedstatedir)/devhelp/.* +ARCHALL_CSWlibsigc++-doc = 1 -CHECKPKG_OVERRIDES_CSWlibsigc++devel += surplus-dependency|CSWlibsigc++ +CHECKPKG_OVERRIDES_CSWlibsigc++-dev += surplus-dependency|CSWlibsigc++ include gar/category.mk -PATH := /opt/csw/gnu:$(PATH) - post-configure-modulated: @# Make sure libtool keeps -norunpath during linking perl -pi -e 's,\|-xarch=,|-norunpath|-xarch=,' $(WORKSRC)/libtool Property changes on: csw/mgar/pkg/libsigcpp/branches/2.2.10/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/libsigcpp/branches/2.2.10/checksums =================================================================== --- csw/mgar/pkg/libsigcpp/trunk/checksums 2011-12-14 11:26:32 UTC (rev 16503) +++ csw/mgar/pkg/libsigcpp/branches/2.2.10/checksums 2011-12-19 19:59:05 UTC (rev 16575) @@ -1,2 +1 @@ -9ed819b9adb3e17c536d4749b85c253f 0001-Comment-out-define-as-we-are-on-Sun-Studio.patch -48afe53ba0e3958f6ac5f072afed1c53 libsigc++-2.2.7.tar.gz +73419b477f3bb9ddb9905c88a92f4b4c libsigc++-2.2.10.tar.xz Deleted: csw/mgar/pkg/libsigcpp/branches/2.2.10/files/0001-Comment-out-define-as-we-are-on-Sun-Studio.patch =================================================================== --- csw/mgar/pkg/libsigcpp/trunk/files/0001-Comment-out-define-as-we-are-on-Sun-Studio.patch 2011-12-14 11:26:32 UTC (rev 16503) +++ csw/mgar/pkg/libsigcpp/branches/2.2.10/files/0001-Comment-out-define-as-we-are-on-Sun-Studio.patch 2011-12-19 19:59:05 UTC (rev 16575) @@ -1,25 +0,0 @@ -From db7e603d9531ce0ade0d71479997579d62242534 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Wed, 26 May 2010 14:10:20 +0200 -Subject: [PATCH] Comment out define as we are on Sun Studio - ---- - sigc++/signal.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/sigc++/signal.h b/sigc++/signal.h -index 9e81ed0..c273ce0 100644 ---- a/sigc++/signal.h -+++ b/sigc++/signal.h -@@ -18,7 +18,7 @@ - //Compilers, such as older versions of SUN Forte C++, that do not allow this also often - //do not allow a typedef to have the same name as a class in the typedef's definition. - //For Sun Forte CC 5.7 (SUN Workshop 10), comment this out to fix the build. -- #define SIGC_TYPEDEF_REDEFINE_ALLOWED 1 -+ //define SIGC_TYPEDEF_REDEFINE_ALLOWED 1 - #endif - - namespace sigc { --- -1.7.1 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Mon Dec 19 21:11:58 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Mon, 19 Dec 2011 20:11:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[16576] csw/mgar/pkg/postgresql/branches/postgresql-8. 4-raos/Makefile Message-ID: Revision: 16576 http://gar.svn.sourceforge.net/gar/?rev=16576&view=rev Author: guengel Date: 2011-12-19 20:11:58 +0000 (Mon, 19 Dec 2011) Log Message: ----------- postgresql/branches/postgresql-8.4-raos: Updated SO_NAMES_CONTRIB with new .so names. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/Makefile Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/Makefile 2011-12-19 19:59:05 UTC (rev 16575) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/Makefile 2011-12-19 20:11:58 UTC (rev 16576) @@ -139,6 +139,7 @@ SO_NAMES_CONTRIB += isn.so lo.so ltree.so moddatetime.so pageinspect.so pg_buffercache.so SO_NAMES_CONTRIB += pg_freespacemap.so pg_trgm.so pgcrypto.so pgrowlocks.so pgstattuple.so SO_NAMES_CONTRIB += pgxml.so refint.so seg.so sslinfo.so tablefunc.so test_parser.so timetravel.so tsearch2.so +SO_NAMES_CONTRIB += auto_explain.so btree_gin.so citext.so pg_stat_statements.so # Miscellaneous files MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/conversion_create.sql MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/information_schema.sql @@ -171,7 +172,7 @@ CSWPGSQLCONFFILE_VERSIONED = $(subst $(suffix $(CSWPGSQLCONFFILE)),,$(CSWPGSQLCONFFILE))-$(BASE_VERSION_NODOT).conf # The initscript. Please note, although the file does not feature a version -# number here, it will be installed with $(BASE_VERSION_NODOT) appended +# number here, it will Be Installed With $(BASE_VERSION_NODOT) appended INITSCRIPTFILE = cswpostgresql INITSCRIPTFILETMPL = $(INITSCRIPTFILE).tmpl INITSCRIPTFILE_VERSIONED = $(INITSCRIPTFILE)-$(BASE_VERSION_NODOT) @@ -422,13 +423,13 @@ fi @$(MAKECOOKIE) -# post-build-modulated: -# $(BUILD_ENV) gmake -C $(WORKSRC)/contrib all -# @$(MAKECOOKIE) +post-build-modulated: + $(BUILD_ENV) gmake -C $(WORKSRC)/contrib all + @$(MAKECOOKIE) -# post-install-modulated: -# $(INSTALL_ENV) gmake -C $(WORKSRC)/contrib DESTDIR=$(DESTDIR) install -# @$(MAKECOOKIE) +post-install-modulated: + $(INSTALL_ENV) gmake -C $(WORKSRC)/contrib DESTDIR=$(DESTDIR) install + @$(MAKECOOKIE) post-merge: # Create my alternatives files This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Mon Dec 19 21:54:00 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Mon, 19 Dec 2011 20:54:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[16577] csw/mgar/pkg/libsigcpp/branches/2.2.10/Makefile Message-ID: Revision: 16577 http://gar.svn.sourceforge.net/gar/?rev=16577&view=rev Author: guengel Date: 2011-12-19 20:53:59 +0000 (Mon, 19 Dec 2011) Log Message: ----------- libsigcpp/branches/2.2.10: Renamed package containing shared library to adhere standards. Modified Paths: -------------- csw/mgar/pkg/libsigcpp/branches/2.2.10/Makefile Modified: csw/mgar/pkg/libsigcpp/branches/2.2.10/Makefile =================================================================== --- csw/mgar/pkg/libsigcpp/branches/2.2.10/Makefile 2011-12-19 20:11:58 UTC (rev 16576) +++ csw/mgar/pkg/libsigcpp/branches/2.2.10/Makefile 2011-12-19 20:53:59 UTC (rev 16577) @@ -14,17 +14,21 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGES = CSWlibsigc++ CSWlibsigc++-dev CSWlibsigc++-doc +PACKAGES = CSWlibsigc2-0-0 CSWlibsigc++-dev CSWlibsigc++-doc -SPKG_DESC_CSWlibsigc++ = Typesafe signal and callback system for C++ +SPKG_DESC_CSWlibsigc2-0-0 = Typesafe signal and callback system for C++ SPKG_DESC_CSWlibsigc++-dev = Header files for libsigc++ SPKG_DESC_CSWlibsigc++-doc = Docs for libsigc++ +OBSOLETED_BY_CSWlibsigc2-0-0 = CSWlibsigc++ +CATALOGNAME_CSWlibsigc++ = libsigc++_stub + # CSWsigc++ is the previous package name INCOMPATIBLE_PKGS_CSWlibsigc++ = CSWsigc++ -RUNTIME_DEP_PKGS_CSWlibsigc++-dev = CSWlibsigc++ +RUNTIME_DEP_PKGS_CSWlibsigc++-dev = CSWlibsigc2-0-0 BUILD64 = 1 +EXTRA_CXXFLAGS += -norunpath EXTRA_CONFIGURE_ENV = MAKE=gmake CONFIGURE_ARGS = $(DIRPATHS) --disable-static @@ -37,7 +41,7 @@ PKGFILES_CSWlibsigc++-doc += $(sharedstatedir)/devhelp/.* ARCHALL_CSWlibsigc++-doc = 1 -CHECKPKG_OVERRIDES_CSWlibsigc++-dev += surplus-dependency|CSWlibsigc++ +CHECKPKG_OVERRIDES_CSWlibsigc++-dev += surplus-dependency|CSWlibsigc2-0-0 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Dec 20 02:39:49 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 20 Dec 2011 01:39:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[16578] csw/mgar/pkg Message-ID: Revision: 16578 http://gar.svn.sourceforge.net/gar/?rev=16578&view=rev Author: bdwalton Date: 2011-12-20 01:39:49 +0000 (Tue, 20 Dec 2011) Log Message: ----------- skeleton for the php5 intl pecl library Added Paths: ----------- csw/mgar/pkg/php5_intl/ csw/mgar/pkg/php5_intl/Makefile csw/mgar/pkg/php5_intl/branches/ csw/mgar/pkg/php5_intl/tags/ csw/mgar/pkg/php5_intl/trunk/ csw/mgar/pkg/php5_intl/trunk/Makefile csw/mgar/pkg/php5_intl/trunk/checksums csw/mgar/pkg/php5_intl/trunk/files/ Copied: csw/mgar/pkg/php5_intl/Makefile (from rev 15145, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/php5_intl/Makefile (rev 0) +++ csw/mgar/pkg/php5_intl/Makefile 2011-12-20 01:39:49 UTC (rev 16578) @@ -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/php5_intl/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/php5_intl/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5_intl/trunk/Makefile (rev 0) +++ csw/mgar/pkg/php5_intl/trunk/Makefile 2011-12-20 01:39:49 UTC (rev 16578) @@ -0,0 +1,25 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = php5_intl +DISTNAME = intl-$(VERSION) +VERSION = 1.1.2 +GARTYPE = v2 +CATEGORIES = xtra + +DESCRIPTION = PHP5 Internationalization extension +define BLURB +The Internationalization extension exposes functionality of the ICU library to PHP. +endef + +MASTER_SITES = http://pecl.php.net/get/ +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 = + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Property changes on: csw/mgar/pkg/php5_intl/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/php5_intl/trunk/checksums =================================================================== --- csw/mgar/pkg/php5_intl/trunk/checksums (rev 0) +++ csw/mgar/pkg/php5_intl/trunk/checksums 2011-12-20 01:39:49 UTC (rev 16578) @@ -0,0 +1 @@ +6e32eb19a8920c48f88571eb2e9d2213 intl-1.1.2.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Dec 20 11:24:13 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 20 Dec 2011 10:24:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[16579] csw/mgar/pkg/libsigcpp/branches/2.2.10/Makefile Message-ID: Revision: 16579 http://gar.svn.sourceforge.net/gar/?rev=16579&view=rev Author: dmichelsen Date: 2011-12-20 10:24:13 +0000 (Tue, 20 Dec 2011) Log Message: ----------- libsigcpp/branches/2.2.10: Some reordering Modified Paths: -------------- csw/mgar/pkg/libsigcpp/branches/2.2.10/Makefile Modified: csw/mgar/pkg/libsigcpp/branches/2.2.10/Makefile =================================================================== --- csw/mgar/pkg/libsigcpp/branches/2.2.10/Makefile 2011-12-20 01:39:49 UTC (rev 16578) +++ csw/mgar/pkg/libsigcpp/branches/2.2.10/Makefile 2011-12-20 10:24:13 UTC (rev 16579) @@ -9,43 +9,30 @@ endef MASTER_SITES = $(GNOME_MIRROR) -DISTFILES = $(NAME)-$(VERSION).tar.xz +DISTFILES += $(DISTNAME).tar.xz -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - -PACKAGES = CSWlibsigc2-0-0 CSWlibsigc++-dev CSWlibsigc++-doc - -SPKG_DESC_CSWlibsigc2-0-0 = Typesafe signal and callback system for C++ -SPKG_DESC_CSWlibsigc++-dev = Header files for libsigc++ -SPKG_DESC_CSWlibsigc++-doc = Docs for libsigc++ - +PACKAGES = CSWlibsigc2-0-0 +SPKG_DESC_CSWlibsigc2-0-0 = Typesafe signal and callback system for C++, libsigc-2.0.so.0 +PKGFILES_CSWlibsigc2-0-0 += $(call pkgfiles_lib,libsigc-2.0.so.0) OBSOLETED_BY_CSWlibsigc2-0-0 = CSWlibsigc++ -CATALOGNAME_CSWlibsigc++ = libsigc++_stub - # CSWsigc++ is the previous package name INCOMPATIBLE_PKGS_CSWlibsigc++ = CSWsigc++ -RUNTIME_DEP_PKGS_CSWlibsigc++-dev = CSWlibsigc2-0-0 +PACKAGES += CSWlibsigc-dev +SPKG_DESC_CSWlibsigc-dev = Header files for libsigc-2.0.so.0 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibsigc-dev = CSWlibsigc2-0-0 +OBSOLETED_BY_CSWlibsigc-dev = CSWlibsigc++devel +CATALOGNAME_CSWlibsigc++devel = libsigc++_devel_stub + BUILD64 = 1 EXTRA_CXXFLAGS += -norunpath EXTRA_CONFIGURE_ENV = MAKE=gmake CONFIGURE_ARGS = $(DIRPATHS) --disable-static -PKGFILES_CSWlibsigc++-dev = $(PKGFILES_DEVEL) -PKGFILES_CSWlibsigc++-dev += .*\.h -OBSOLETED_BY_CSWlibsigc++-dev = CSWlibsigc++devel -CATALOGNAME_CSWlibsigc++devel = libsigc++_devel_stub +# Do not strip -norunpath during libtool invocation +REINPLACE_MATCH = (\|-xarch=) +REINPLACE_WITH = |-norunpath$$1 +REINPLACE_FILES = build/ltmain.sh -PKGFILES_CSWlibsigc++-doc = $(docdir)/.* -PKGFILES_CSWlibsigc++-doc += $(sharedstatedir)/devhelp/.* -ARCHALL_CSWlibsigc++-doc = 1 - -CHECKPKG_OVERRIDES_CSWlibsigc++-dev += surplus-dependency|CSWlibsigc2-0-0 - include gar/category.mk - -post-configure-modulated: - @# Make sure libtool keeps -norunpath during linking - perl -pi -e 's,\|-xarch=,|-norunpath|-xarch=,' $(WORKSRC)/libtool - @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Tue Dec 20 13:44:07 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Tue, 20 Dec 2011 12:44:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[16580] csw/mgar/pkg/libsigcpp/trunk Message-ID: Revision: 16580 http://gar.svn.sourceforge.net/gar/?rev=16580&view=rev Author: guengel Date: 2011-12-20 12:44:07 +0000 (Tue, 20 Dec 2011) Log Message: ----------- libsigcpp/trunk: Reintegrated branch 2.2.10. Modified Paths: -------------- csw/mgar/pkg/libsigcpp/trunk/Makefile csw/mgar/pkg/libsigcpp/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/libsigcpp/trunk/files/0001-Comment-out-define-as-we-are-on-Sun-Studio.patch Property Changed: ---------------- csw/mgar/pkg/libsigcpp/trunk/ csw/mgar/pkg/libsigcpp/trunk/Makefile Property changes on: csw/mgar/pkg/libsigcpp/trunk ___________________________________________________________________ Added: svn:mergeinfo + /csw/mgar/pkg/libsigcpp/branches/2.2.10:16575-16579 Modified: csw/mgar/pkg/libsigcpp/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsigcpp/trunk/Makefile 2011-12-20 10:24:13 UTC (rev 16579) +++ csw/mgar/pkg/libsigcpp/trunk/Makefile 2011-12-20 12:44:07 UTC (rev 16580) @@ -1,5 +1,6 @@ +# $Id$ NAME = libsigc++ -VERSION = 2.2.7 +VERSION = 2.2.10 CATEGORIES = lib DESCRIPTION = Typesafe signal and callback system for C++ @@ -8,42 +9,30 @@ endef MASTER_SITES = $(GNOME_MIRROR) -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES += $(DISTNAME).tar.xz -PATCHFILES = 0001-Comment-out-define-as-we-are-on-Sun-Studio.patch - -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - -PACKAGES = CSWlibsigc++ CSWlibsigc++devel - -SPKG_DESC_CSWlibsigc++ = Typesafe signal and callback system for C++ -SPKG_DESC_CSWlibsigc++devel = Header files and docs for libsigc++ - -CATALOGNAME_CSWlibsigc++ = libsigc++ -CATALOGNAME_CSWlibsigc++devel = libsigc++_devel - +PACKAGES = CSWlibsigc2-0-0 +SPKG_DESC_CSWlibsigc2-0-0 = Typesafe signal and callback system for C++, libsigc-2.0.so.0 +PKGFILES_CSWlibsigc2-0-0 += $(call pkgfiles_lib,libsigc-2.0.so.0) +OBSOLETED_BY_CSWlibsigc2-0-0 = CSWlibsigc++ # CSWsigc++ is the previous package name INCOMPATIBLE_PKGS_CSWlibsigc++ = CSWsigc++ -RUNTIME_DEP_PKGS_CSWlibsigc++devel = CSWlibsigc++ +PACKAGES += CSWlibsigc-dev +SPKG_DESC_CSWlibsigc-dev = Header files for libsigc-2.0.so.0 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibsigc-dev = CSWlibsigc2-0-0 +OBSOLETED_BY_CSWlibsigc-dev = CSWlibsigc++devel +CATALOGNAME_CSWlibsigc++devel = libsigc++_devel_stub + BUILD64 = 1 +EXTRA_CXXFLAGS += -norunpath +EXTRA_CONFIGURE_ENV = MAKE=gmake CONFIGURE_ARGS = $(DIRPATHS) --disable-static -TEST_TARGET = check +# Do not strip -norunpath during libtool invocation +REINPLACE_MATCH = (\|-xarch=) +REINPLACE_WITH = |-norunpath$$1 +REINPLACE_FILES = build/ltmain.sh -PKGFILES_CSWlibsigc++devel = $(PKGFILES_DEVEL) -PKGFILES_CSWlibsigc++devel += $(docdir)/.* -PKGFILES_CSWlibsigc++devel += .*\.h -PKGFILES_CSWlibsigc++devel += $(sharedstatedir)/.* - -CHECKPKG_OVERRIDES_CSWlibsigc++devel += surplus-dependency|CSWlibsigc++ - include gar/category.mk - -PATH := /opt/csw/gnu:$(PATH) - -post-configure-modulated: - @# Make sure libtool keeps -norunpath during linking - perl -pi -e 's,\|-xarch=,|-norunpath|-xarch=,' $(WORKSRC)/libtool - @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/libsigcpp/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: csw/mgar/pkg/libsigcpp/trunk/checksums =================================================================== --- csw/mgar/pkg/libsigcpp/trunk/checksums 2011-12-20 10:24:13 UTC (rev 16579) +++ csw/mgar/pkg/libsigcpp/trunk/checksums 2011-12-20 12:44:07 UTC (rev 16580) @@ -1,2 +1 @@ -9ed819b9adb3e17c536d4749b85c253f 0001-Comment-out-define-as-we-are-on-Sun-Studio.patch -48afe53ba0e3958f6ac5f072afed1c53 libsigc++-2.2.7.tar.gz +73419b477f3bb9ddb9905c88a92f4b4c libsigc++-2.2.10.tar.xz Deleted: csw/mgar/pkg/libsigcpp/trunk/files/0001-Comment-out-define-as-we-are-on-Sun-Studio.patch =================================================================== --- csw/mgar/pkg/libsigcpp/trunk/files/0001-Comment-out-define-as-we-are-on-Sun-Studio.patch 2011-12-20 10:24:13 UTC (rev 16579) +++ csw/mgar/pkg/libsigcpp/trunk/files/0001-Comment-out-define-as-we-are-on-Sun-Studio.patch 2011-12-20 12:44:07 UTC (rev 16580) @@ -1,25 +0,0 @@ -From db7e603d9531ce0ade0d71479997579d62242534 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Wed, 26 May 2010 14:10:20 +0200 -Subject: [PATCH] Comment out define as we are on Sun Studio - ---- - sigc++/signal.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/sigc++/signal.h b/sigc++/signal.h -index 9e81ed0..c273ce0 100644 ---- a/sigc++/signal.h -+++ b/sigc++/signal.h -@@ -18,7 +18,7 @@ - //Compilers, such as older versions of SUN Forte C++, that do not allow this also often - //do not allow a typedef to have the same name as a class in the typedef's definition. - //For Sun Forte CC 5.7 (SUN Workshop 10), comment this out to fix the build. -- #define SIGC_TYPEDEF_REDEFINE_ALLOWED 1 -+ //define SIGC_TYPEDEF_REDEFINE_ALLOWED 1 - #endif - - namespace sigc { --- -1.7.1 - 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 Dec 20 14:03:47 2011 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Tue, 20 Dec 2011 13:03:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[16581] csw/mgar/pkg/zsh/trunk Message-ID: Revision: 16581 http://gar.svn.sourceforge.net/gar/?rev=16581&view=rev Author: opk Date: 2011-12-20 13:03:46 +0000 (Tue, 20 Dec 2011) Log Message: ----------- update for 4.3.15 Modified Paths: -------------- csw/mgar/pkg/zsh/trunk/Makefile csw/mgar/pkg/zsh/trunk/checksums Modified: csw/mgar/pkg/zsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/zsh/trunk/Makefile 2011-12-20 12:44:07 UTC (rev 16580) +++ csw/mgar/pkg/zsh/trunk/Makefile 2011-12-20 13:03:46 UTC (rev 16581) @@ -1,5 +1,5 @@ NAME = zsh -VERSION = 4.3.14 +VERSION = 4.3.15 CATEGORIES = devel DESCRIPTION = Powerful UNIX shell @@ -41,6 +41,7 @@ CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/zsh/functions/_setxkbmap CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/share/zsh/functions/_units CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/bin/zsh-$(VERSION) +CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/bin/zsh CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/zshcontrib.1 CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/share/zsh/functions/_gcc CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/share/zsh/functions/_urls Modified: csw/mgar/pkg/zsh/trunk/checksums =================================================================== --- csw/mgar/pkg/zsh/trunk/checksums 2011-12-20 12:44:07 UTC (rev 16580) +++ csw/mgar/pkg/zsh/trunk/checksums 2011-12-20 13:03:46 UTC (rev 16581) @@ -1 +1 @@ -1c819a3ff7302b42eba988e333e76109 zsh-4.3.14.tar.bz2 +11766b0dd674a513810903cd33ffcac4 zsh-4.3.15.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From d_pocock at users.sourceforge.net Tue Dec 20 16:13:51 2011 From: d_pocock at users.sourceforge.net (d_pocock at users.sourceforge.net) Date: Tue, 20 Dec 2011 15:13:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[16582] csw/mgar/pkg/ganglia-modules-solaris/trunk Message-ID: Revision: 16582 http://gar.svn.sourceforge.net/gar/?rev=16582&view=rev Author: d_pocock Date: 2011-12-20 15:13:50 +0000 (Tue, 20 Dec 2011) Log Message: ----------- ganglia-modules-solaris: update to 1.0.1 Modified Paths: -------------- csw/mgar/pkg/ganglia-modules-solaris/trunk/Makefile csw/mgar/pkg/ganglia-modules-solaris/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/ganglia-modules-solaris/trunk/files/COPYING Modified: csw/mgar/pkg/ganglia-modules-solaris/trunk/Makefile =================================================================== --- csw/mgar/pkg/ganglia-modules-solaris/trunk/Makefile 2011-12-20 13:03:46 UTC (rev 16581) +++ csw/mgar/pkg/ganglia-modules-solaris/trunk/Makefile 2011-12-20 15:13:50 UTC (rev 16582) @@ -1,5 +1,5 @@ NAME = ganglia-modules-solaris -VERSION = 1.0 +VERSION = 1.0.1 CATEGORIES = utils PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 @@ -22,7 +22,7 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += $(PATCHFILES) -DISTFILES += COPYING +#DISTFILES += COPYING DISTNAME = $(NAME)-$(VERSION) EXTRA_DOCS = $(PATCHFILES) Modified: csw/mgar/pkg/ganglia-modules-solaris/trunk/checksums =================================================================== --- csw/mgar/pkg/ganglia-modules-solaris/trunk/checksums 2011-12-20 13:03:46 UTC (rev 16581) +++ csw/mgar/pkg/ganglia-modules-solaris/trunk/checksums 2011-12-20 15:13:50 UTC (rev 16582) @@ -1 +1 @@ -74310f94ebe6ba5c704768e9deffc259 ganglia-modules-solaris-1.0.tar.gz +99010ee52d38b6ae2b52f50b27cfc330 ganglia-modules-solaris-1.0.1.tar.gz Deleted: csw/mgar/pkg/ganglia-modules-solaris/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/ganglia-modules-solaris/trunk/files/COPYING 2011-12-20 13:03:46 UTC (rev 16581) +++ csw/mgar/pkg/ganglia-modules-solaris/trunk/files/COPYING 2011-12-20 15:13:50 UTC (rev 16582) @@ -1,4 +0,0 @@ - - -GNU license - 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 Dec 20 17:19:00 2011 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Tue, 20 Dec 2011 16:19:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[16583] csw/mgar/pkg/tkcvs/trunk Message-ID: Revision: 16583 http://gar.svn.sourceforge.net/gar/?rev=16583&view=rev Author: opk Date: 2011-12-20 16:19:00 +0000 (Tue, 20 Dec 2011) Log Message: ----------- update to tkcvs 8.2.3 Modified Paths: -------------- csw/mgar/pkg/tkcvs/trunk/Makefile csw/mgar/pkg/tkcvs/trunk/checksums Modified: csw/mgar/pkg/tkcvs/trunk/Makefile =================================================================== --- csw/mgar/pkg/tkcvs/trunk/Makefile 2011-12-20 15:13:50 UTC (rev 16582) +++ csw/mgar/pkg/tkcvs/trunk/Makefile 2011-12-20 16:19:00 UTC (rev 16583) @@ -1,5 +1,5 @@ NAME = tkcvs -VERSION = 8.2.2 +VERSION = 8.2.3 CATEGORIES = apps DESCRIPTION = A graphical front-end to CVS and Subversion @@ -11,24 +11,25 @@ endef MASTER_SITES = http://www.twobarleycorns.net/ -DISTNAME = $(NAME)_$(subst .,_,$(VERSION)) -DISTFILES = $(NAME)_$(subst .,_,$(VERSION)).tar.gz +DISTFILES = $(NAME)-$(VERSION).tar.gz UPSTREAM_MASTER_SITES = $(MASTER_SITES)/tkcvs.html -UFILES_REGEX = $(NAME)_(\d+(?:_\d+)*).tar.gz +UFILES_REGEX = $(NAME)-(\d+(?:.\d+)*).tar.gz CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = INSTALL_SCRIPTS = custom -LICENSE = COPYING +LICENSE = LICENSE.txt ARCHALL = 1 RUNTIME_DEP_PKGS = CSWtcl CSWtk CSWtkdiff CHECKPKG_OVERRIDES_CSWtkcvs += surplus-dependency|CSWtcl CHECKPKG_OVERRIDES_CSWtkcvs += surplus-dependency|CSWtkdiff CHECKPKG_OVERRIDES_CSWtkcvs += surplus-dependency|CSWtk +CHECKPKG_OVERRIDES_CSWtkcvs += file-with-bad-content|/usr/local|root/opt/csw/lib/tkcvs/help.tcl +CHECKPKG_OVERRIDES_CSWtkcvs += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/tkcvs.1 include gar/category.mk Modified: csw/mgar/pkg/tkcvs/trunk/checksums =================================================================== --- csw/mgar/pkg/tkcvs/trunk/checksums 2011-12-20 15:13:50 UTC (rev 16582) +++ csw/mgar/pkg/tkcvs/trunk/checksums 2011-12-20 16:19:00 UTC (rev 16583) @@ -1 +1 @@ -8ad8f5a3b32392fa02a2fffa42032432 tkcvs_8_2_2.tar.gz +d6bde44169d5943bd7f63e58c0748509 tkcvs-8.2.3.tar.gz 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 Dec 20 18:00:14 2011 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Tue, 20 Dec 2011 17:00:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[16584] csw/mgar/pkg/lang-python/pytz/trunk Message-ID: Revision: 16584 http://gar.svn.sourceforge.net/gar/?rev=16584&view=rev Author: opk Date: 2011-12-20 17:00:13 +0000 (Tue, 20 Dec 2011) Log Message: ----------- update pytz to 2011n 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-12-20 16:19:00 UTC (rev 16583) +++ csw/mgar/pkg/lang-python/pytz/trunk/Makefile 2011-12-20 17:00:13 UTC (rev 16584) @@ -1,6 +1,6 @@ # $Id$ NAME = pytz -VERSION = 2011h +VERSION = 2011n 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-12-20 16:19:00 UTC (rev 16583) +++ csw/mgar/pkg/lang-python/pytz/trunk/checksums 2011-12-20 17:00:13 UTC (rev 16584) @@ -1 +1 @@ -8ae163533975070ed864b8d639bf096e pytz-2011h.tar.bz2 +6322c068f0497c82216ed36f6873e9d0 pytz-2011n.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Dec 21 10:35:26 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 21 Dec 2011 09:35:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[16585] csw/mgar/pkg/tkdiff/trunk Message-ID: Revision: 16585 http://gar.svn.sourceforge.net/gar/?rev=16585&view=rev Author: dmichelsen Date: 2011-12-21 09:35:26 +0000 (Wed, 21 Dec 2011) Log Message: ----------- tkdiff/trunk: Update to 4.2 and latest standards Modified Paths: -------------- csw/mgar/pkg/tkdiff/trunk/Makefile csw/mgar/pkg/tkdiff/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/tkdiff/trunk/ Property changes on: csw/mgar/pkg/tkdiff/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/tkdiff/trunk/Makefile =================================================================== --- csw/mgar/pkg/tkdiff/trunk/Makefile 2011-12-20 17:00:13 UTC (rev 16584) +++ csw/mgar/pkg/tkdiff/trunk/Makefile 2011-12-21 09:35:26 UTC (rev 16585) @@ -1,5 +1,5 @@ NAME = tkdiff -VERSION = 4.1.4 +VERSION = 4.2 CATEGORIES = utils DESCRIPTION = A graphical diff tool @@ -7,24 +7,27 @@ endef MASTER_SITES = $(SF_MIRROR) -DISTNAME = $(NAME)-$(VERSION)-unix -DISTFILES = $(DISTNAME).tar.gz -PATCHFILES = force-csw-wish.patch +DISTFILES += $(NAME)-$(VERSION).tar.gz +DISTNAME = tkdiff-unix +PATCHFILES += force-csw-wish.patch -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*)-unix.tar.gz +VENDOR_URL = http://tkdiff.sourceforge.net/ -DEP_PKGS = CSWtk +LICENSE = LICENSE.txt -VENDOR_URL = http://tkdiff.sourceforge.net/ +PACKAGES += CSWtkdiff +SPKG_DESC_CSWtkdiff = A graphical diff tool +# PKGFILES is catchall +ARCHALL_CSWtkdiff = 1 +# We need "wish" from CSWtk which is not detected by checkpkg +RUNTIME_DEP_PKGS_CSWtkdiff += CSWtk +CHECKPKG_OVERRIDES_CSWtkdiff += surplus-dependency|CSWtk BUILD_SCRIPTS = CONFIGURE_SCRIPTS = TEST_SCRIPTS = INSTALL_SCRIPTS = custom -ARCHALL = 1 - include gar/category.mk install-custom: Modified: csw/mgar/pkg/tkdiff/trunk/checksums =================================================================== --- csw/mgar/pkg/tkdiff/trunk/checksums 2011-12-20 17:00:13 UTC (rev 16584) +++ csw/mgar/pkg/tkdiff/trunk/checksums 2011-12-21 09:35:26 UTC (rev 16585) @@ -1,2 +1 @@ -073909cbcda23f9365a3f38463a3b011 force-csw-wish.patch -f904fbbb71ab2ab5390f747e6c1114ee tkdiff-4.1.4-unix.tar.gz +efc19226416afe3e98e4a29c112cfc3e tkdiff-4.2.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 Dec 21 11:39:48 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 21 Dec 2011 10:39:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[16586] csw/mgar/pkg Message-ID: Revision: 16586 http://gar.svn.sourceforge.net/gar/?rev=16586&view=rev Author: dmichelsen Date: 2011-12-21 10:39:47 +0000 (Wed, 21 Dec 2011) Log Message: ----------- djvulibre15: Split off legacy library Modified Paths: -------------- csw/mgar/pkg/djvulibre15/trunk/Makefile csw/mgar/pkg/djvulibre15/trunk/checksums Added Paths: ----------- csw/mgar/pkg/djvulibre15/ csw/mgar/pkg/djvulibre15/trunk/files/libdjvulibre.so.15.i386 csw/mgar/pkg/djvulibre15/trunk/files/libdjvulibre.so.15.sparc Removed Paths: ------------- csw/mgar/pkg/djvulibre15/trunk/files/ddjvu.cpp.patch Property Changed: ---------------- csw/mgar/pkg/djvulibre15/trunk/ Property changes on: csw/mgar/pkg/djvulibre15/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/djvulibre15/trunk/Makefile =================================================================== --- csw/mgar/pkg/djvulibre/trunk/Makefile 2011-11-15 10:21:50 UTC (rev 16195) +++ csw/mgar/pkg/djvulibre15/trunk/Makefile 2011-12-21 10:39:47 UTC (rev 16586) @@ -1,5 +1,5 @@ NAME = djvulibre -VERSION = 3.5.22 +VERSION = 3.5.20.2 CATEGORIES = apps DESCRIPTION = DjVu standalone viewer, browser plug-in, command line tools @@ -8,70 +8,33 @@ SF_PROJ = djvu MASTER_SITES = $(SF_MIRRORS)/DjVuLibre/$(VERSION)/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES += libdjvulibre.so.15.sparc +DISTFILES += libdjvulibre.so.15.i386 -PACKAGES = CSWdjvulibre CSWdjvulibrert CSWdjvulibredevel -CATALOGNAME_CSWdjvulibre = djvulibre -CATALOGNAME_CSWdjvulibrert = djvulibre_rt -CATALOGNAME_CSWdjvulibredevel = djvulibre_devel +VENDOR_URL = http://djvu.sourceforge.net/ -SPKG_DESC_CSWdjvulibre += DjVu standalone viewer, browser plug-in, command linetools -SPKG_DESC_CSWdjvulibrert += DjVu standalone viewer, browser plug-in, command line tools - runtime package -SPKG_DESC_CSWdjvulibredevel += DjVu standalone viewer, browser plug-in, commandline tools - developer package +PACKAGES += CSWlibdjvulibre15 +SPKG_DESC_CSWlibdjvulibre15 += DjVu library, libdjvulibre.so.15 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibdjvulibre15 += CSWlibjpeg62 +RUNTIME_DEP_PKGS_CSWlibdjvulibre15 += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWdjvulibre += CSWdjvulibrert CSWjpeg -RUNTIME_DEP_PKGS_CSWdjvulibre += CSWtiff -RUNTIME_DEP_PKGS_CSWdjvulibrert += CSWjpeg -RUNTIME_DEP_PKGS_CSWdjvulibrert += CSWiconv -RUNTIME_DEP_PKGS_CSWdjvulibredevel += CSWdjvulibrert +# This is a legacy lib, keep old errors until this expires out +CHECKPKG_OVERRIDES_CSWlibdjvulibre15 += license-missing|/opt/csw/share/doc/libdjvulibre15/license +CHECKPKG_OVERRIDES_CSWlibdjvulibre15 += bad-rpath-entry|/lib|opt/csw/lib/libdjvulibre.so.15.5.0 +CHECKPKG_OVERRIDES_CSWlibdjvulibre15 += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/libdjvulibre.so.15.5.0 +CHECKPKG_OVERRIDES_CSWlibdjvulibre15 += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/lib/libdjvulibre.so.15.5.0 +CHECKPKG_OVERRIDES_CSWlibdjvulibre15 += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/libdjvulibre.so.15.5.0 -PKGFILES_CSWdjvulibrert = $(PKGFILES_RT) -PKGFILES_CSWdjvulibredevel = $(PKGFILES_DEVEL) +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom - -CHECKPKG_OVERRIDES_CSWdjvulibredevel += missing-dependency|CSWdjvulibre - -SPKG_SOURCEURL = http://djvu.sourceforge.net/ - -LICENSE = COPYING - -PATCHFILES += ddjvu.cpp.patch - -UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=32953 -UPSTREAM_USE_SF = 1 -UFILES_REGEX = (\d+(?:\.\d+)*) - -OPTS='-DNDEBUG' -EXTRA_COMMON_EXPORTS += OPTS - -PTHREAD_LIBS = -lpthread -PTHREAD_CFLAGS = -D_REENTRANT -EXTRA_COMMON_EXPORTS += PTHREAD_LIBS -EXTRA_COMMON_EXPORTS += PTHREAD_CFLAGS - -EXTRA_INC = $(prefix)/X11/include -EXTRA_LIB = $(prefix)/X11/lib -EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib - -X_CFLAGS = -I$(prefix)/X11/include -X_LIBS = -L$(prefix)/X11/lib -R$(prefix)/X11/lib -EXTRA_COMMON_EXPORTS += X_CFLAGS -EXTRA_COMMON_EXPORTS += X_LIBS - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include -CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) - -BUILD64 = 1 - -TEST_TARGET = - include gar/category.mk -post-install-isa-sparcv8: - @cp $(FILEDIR)/libdjvulibre.so.15.s $(INSTALLISADIR)$(libdir)/libdjvulibre.so.15 - $(MAKECOOKIE) - -post-install-isa-i386: - @cp $(FILEDIR)/libdjvulibre.so.15.i $(INSTALLISADIR)$(libdir)/libdjvulibre.so.15 - $(MAKECOOKIE) +install-custom: + ginstall -d $(DESTDIR)$(libdir) + ginstall $(WORKDIR)/libdjvulibre.so.15.$(GARCH) $(DESTDIR)$(libdir)/libdjvulibre.so.15.5.0 + gln -s libdjvulibre.so.15.5.0 $(DESTDIR)$(libdir)/libdjvulibre.so.15 + @$(MAKECOOKIE) Modified: csw/mgar/pkg/djvulibre15/trunk/checksums =================================================================== --- csw/mgar/pkg/djvulibre/trunk/checksums 2011-11-15 10:21:50 UTC (rev 16195) +++ csw/mgar/pkg/djvulibre15/trunk/checksums 2011-12-21 10:39:47 UTC (rev 16586) @@ -1,2 +0,0 @@ -23e0083aef7878b2c9527d2e5e7a8fa9 ddjvu.cpp.patch -d1513784ce0e4f37d71595dc34c95ec7 djvulibre-3.5.22.tar.gz Deleted: csw/mgar/pkg/djvulibre15/trunk/files/ddjvu.cpp.patch =================================================================== --- csw/mgar/pkg/djvulibre/trunk/files/ddjvu.cpp.patch 2011-11-15 10:21:50 UTC (rev 16195) +++ csw/mgar/pkg/djvulibre15/trunk/files/ddjvu.cpp.patch 2011-12-21 10:39:47 UTC (rev 16586) @@ -1,13 +0,0 @@ ---- djvulibre-3.5.22.orig/tools/ddjvu.cpp 2009-02-13 10:46:27.000000000 +0100 -+++ djvulibre-3.5.22/tools/ddjvu.cpp 2010-01-07 17:45:43.925544787 +0100 -@@ -66,6 +66,10 @@ - - #include - #include -+#if (defined(__SUNPRO_CC) && ( defined(__SunOS_5_8) || defined(__SunOS_5_9))) && !defined(__sparcv9) -+using std::__flsbuf; -+using std::__filbuf; -+#endif - #include - #include - #include Added: csw/mgar/pkg/djvulibre15/trunk/files/libdjvulibre.so.15.i386 =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/djvulibre15/trunk/files/libdjvulibre.so.15.i386 ___________________________________________________________________ Added: svn:mime-type + application/x-sharedlib Added: csw/mgar/pkg/djvulibre15/trunk/files/libdjvulibre.so.15.sparc =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/djvulibre15/trunk/files/libdjvulibre.so.15.sparc ___________________________________________________________________ Added: svn:mime-type + application/x-sharedlib This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Dec 21 11:58:20 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 21 Dec 2011 10:58:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[16587] csw/mgar/pkg/ilmbase2/ Message-ID: Revision: 16587 http://gar.svn.sourceforge.net/gar/?rev=16587&view=rev Author: dmichelsen Date: 2011-12-21 10:58:20 +0000 (Wed, 21 Dec 2011) Log Message: ----------- ilmbase: Make separate dir for legacy ilmbase2 Added Paths: ----------- csw/mgar/pkg/ilmbase2/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Dec 21 14:28:36 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 21 Dec 2011 13:28:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[16588] csw/mgar/pkg/ImageMagick/trunk/Makefile Message-ID: Revision: 16588 http://gar.svn.sourceforge.net/gar/?rev=16588&view=rev Author: dmichelsen Date: 2011-12-21 13:28:35 +0000 (Wed, 21 Dec 2011) Log Message: ----------- ImageMagick/trunk: Update dependency to new gtk Modified Paths: -------------- csw/mgar/pkg/ImageMagick/trunk/Makefile Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile =================================================================== --- csw/mgar/pkg/ImageMagick/trunk/Makefile 2011-12-21 10:58:20 UTC (rev 16587) +++ csw/mgar/pkg/ImageMagick/trunk/Makefile 2011-12-21 13:28:35 UTC (rev 16588) @@ -118,7 +118,7 @@ RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibbz2-1-0 RUNTIME_DEP_PKGS_CSWimagemagick += CSWilmbase RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibpng12-0 -RUNTIME_DEP_PKGS_CSWimagemagick += CSWgtk2 +RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgdk-pixbuf2-0-0 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgthread2-0-0 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWimagemagick += CSWlibgobject2-0-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 Wed Dec 21 15:37:32 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 21 Dec 2011 14:37:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[16589] csw/mgar/pkg/djvulibre/trunk Message-ID: Revision: 16589 http://gar.svn.sourceforge.net/gar/?rev=16589&view=rev Author: dmichelsen Date: 2011-12-21 14:37:32 +0000 (Wed, 21 Dec 2011) Log Message: ----------- djvulibre/trunk: Update to 3.5.24, general rework Modified Paths: -------------- csw/mgar/pkg/djvulibre/trunk/Makefile csw/mgar/pkg/djvulibre/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/djvulibre/trunk/ Property changes on: csw/mgar/pkg/djvulibre/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/djvulibre/trunk/Makefile =================================================================== --- csw/mgar/pkg/djvulibre/trunk/Makefile 2011-12-21 13:28:35 UTC (rev 16588) +++ csw/mgar/pkg/djvulibre/trunk/Makefile 2011-12-21 14:37:32 UTC (rev 16589) @@ -1,5 +1,5 @@ NAME = djvulibre -VERSION = 3.5.22 +VERSION = 3.5.24 CATEGORIES = apps DESCRIPTION = DjVu standalone viewer, browser plug-in, command line tools @@ -9,69 +9,56 @@ SF_PROJ = djvu MASTER_SITES = $(SF_MIRRORS)/DjVuLibre/$(VERSION)/ DISTFILES = $(NAME)-$(VERSION).tar.gz +PATCHFILES += ddjvu.cpp.patch -PACKAGES = CSWdjvulibre CSWdjvulibrert CSWdjvulibredevel -CATALOGNAME_CSWdjvulibre = djvulibre -CATALOGNAME_CSWdjvulibrert = djvulibre_rt -CATALOGNAME_CSWdjvulibredevel = djvulibre_devel +VENDOR_URL = http://djvu.sourceforge.net/ -SPKG_DESC_CSWdjvulibre += DjVu standalone viewer, browser plug-in, command linetools -SPKG_DESC_CSWdjvulibrert += DjVu standalone viewer, browser plug-in, command line tools - runtime package -SPKG_DESC_CSWdjvulibredevel += DjVu standalone viewer, browser plug-in, commandline tools - developer package +FOREIGN_PKGS += CSWlibdjvulibre15 -RUNTIME_DEP_PKGS_CSWdjvulibre += CSWdjvulibrert CSWjpeg -RUNTIME_DEP_PKGS_CSWdjvulibre += CSWtiff -RUNTIME_DEP_PKGS_CSWdjvulibrert += CSWjpeg -RUNTIME_DEP_PKGS_CSWdjvulibrert += CSWiconv -RUNTIME_DEP_PKGS_CSWdjvulibredevel += CSWdjvulibrert +PACKAGES += CSWdjvulibre +CATALOGNAME_CSWdjvulibre = djvulibre +SPKG_DESC_CSWdjvulibre += DjVu standalone viewer and ommandline tools +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWdjvulibre += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWdjvulibre += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWdjvulibre += CSWlibdjvulibre21 +# This is for legacy package expecting to find libdjvulibre.so.15 when pulling in CSWdjvulibre +RUNTIME_DEP_PKGS_CSWdjvulibre += CSWlibdjvulibre15 +CHECKPKG_OVERRIDES_CSWdjvulibre += surplus-dependency|CSWlibdjvulibre15 -PKGFILES_CSWdjvulibrert = $(PKGFILES_RT) -PKGFILES_CSWdjvulibredevel = $(PKGFILES_DEVEL) +# What is this for? +CHECKPKG_OVERRIDES_CSWdjvulibre += file-with-bad-content|/usr/share|root/opt/csw/share/djvu/osi/desktop/register-djvu-mime +CHECKPKG_OVERRIDES_CSWdjvulibre += file-with-bad-content|/usr/local|root/opt/csw/share/djvu/osi/desktop/register-djvu-mime +PACKAGES += CSWlibdjvulibre21 +SPKG_DESC_CSWlibdjvulibre21 += DjVu library, libdjvulibre.so.21 +PKGFILES_CSWlibdjvulibre21 += $(call pkgfiles_lib,libdjvulibre.so.21) +OBSOLETED_BY_CSWlibdjvulibre21 += CSWdjvulibrert +CATALOGNAME_CSWdjvulibrert = djvulibre_rt_stub +RUNTIME_DEP_PKGS_CSWlibdjvulibre21 += CSWlibjpeg7 -CHECKPKG_OVERRIDES_CSWdjvulibredevel += missing-dependency|CSWdjvulibre +PACKAGES += CSWlibdjvulibre-dev +SPKG_DESC_CSWlibdjvulibre-dev += Development files for libdjvulibre.so.21 +PKGFILES_CSWlibdjvulibre-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibdjvulibre-dev += CSWlibdjvulibre21 +OBSOLETED_BY_CSWlibdjvulibre-dev += CSWdjvulibredevel +CATALOGNAME_CSWdjvulibredevel = djvulibre_devel_stub -SPKG_SOURCEURL = http://djvu.sourceforge.net/ - -LICENSE = COPYING - -PATCHFILES += ddjvu.cpp.patch - -UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=32953 -UPSTREAM_USE_SF = 1 -UFILES_REGEX = (\d+(?:\.\d+)*) - -OPTS='-DNDEBUG' -EXTRA_COMMON_EXPORTS += OPTS - +OPTS = '-DNDEBUG' PTHREAD_LIBS = -lpthread PTHREAD_CFLAGS = -D_REENTRANT +EXTRA_COMMON_EXPORTS += OPTS EXTRA_COMMON_EXPORTS += PTHREAD_LIBS EXTRA_COMMON_EXPORTS += PTHREAD_CFLAGS -EXTRA_INC = $(prefix)/X11/include -EXTRA_LIB = $(prefix)/X11/lib -EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib +EXTRA_CXXFLAGS += -norunpath +REINPLACE_MATCH = (\|-xarch=) +REINPLACE_WITH = |-norunpath$$1 +REINPLACE_FILES += config/ltmain.sh -X_CFLAGS = -I$(prefix)/X11/include -X_LIBS = -L$(prefix)/X11/lib -R$(prefix)/X11/lib -EXTRA_COMMON_EXPORTS += X_CFLAGS -EXTRA_COMMON_EXPORTS += X_LIBS - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include -CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) - BUILD64 = 1 -TEST_TARGET = +# There is no testsuite +TEST_SCRIPTS = include gar/category.mk - -post-install-isa-sparcv8: - @cp $(FILEDIR)/libdjvulibre.so.15.s $(INSTALLISADIR)$(libdir)/libdjvulibre.so.15 - $(MAKECOOKIE) - -post-install-isa-i386: - @cp $(FILEDIR)/libdjvulibre.so.15.i $(INSTALLISADIR)$(libdir)/libdjvulibre.so.15 - $(MAKECOOKIE) Modified: csw/mgar/pkg/djvulibre/trunk/checksums =================================================================== --- csw/mgar/pkg/djvulibre/trunk/checksums 2011-12-21 13:28:35 UTC (rev 16588) +++ csw/mgar/pkg/djvulibre/trunk/checksums 2011-12-21 14:37:32 UTC (rev 16589) @@ -1,2 +1 @@ -23e0083aef7878b2c9527d2e5e7a8fa9 ddjvu.cpp.patch -d1513784ce0e4f37d71595dc34c95ec7 djvulibre-3.5.22.tar.gz +af83d27af5083198432a178d22b259c5 djvulibre-3.5.24.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 Dec 21 15:50:32 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 21 Dec 2011 14:50:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[16590] csw/mgar/pkg/djvulibre/trunk/Makefile Message-ID: Revision: 16590 http://gar.svn.sourceforge.net/gar/?rev=16590&view=rev Author: dmichelsen Date: 2011-12-21 14:50:32 +0000 (Wed, 21 Dec 2011) Log Message: ----------- djvulibre/trunk: Enable isaexec Modified Paths: -------------- csw/mgar/pkg/djvulibre/trunk/Makefile Modified: csw/mgar/pkg/djvulibre/trunk/Makefile =================================================================== --- csw/mgar/pkg/djvulibre/trunk/Makefile 2011-12-21 14:37:32 UTC (rev 16589) +++ csw/mgar/pkg/djvulibre/trunk/Makefile 2011-12-21 14:50:32 UTC (rev 16590) @@ -57,6 +57,7 @@ REINPLACE_FILES += config/ltmain.sh BUILD64 = 1 +ISAEXEC = 1 # There is no testsuite TEST_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Dec 21 15:53:50 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 21 Dec 2011 14:53:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[16591] csw/mgar/pkg/ilmbase/trunk Message-ID: Revision: 16591 http://gar.svn.sourceforge.net/gar/?rev=16591&view=rev Author: dmichelsen Date: 2011-12-21 14:53:50 +0000 (Wed, 21 Dec 2011) Log Message: ----------- ilmbase/trunk: Update to 1.0.2 and general rework Modified Paths: -------------- csw/mgar/pkg/ilmbase/trunk/Makefile csw/mgar/pkg/ilmbase/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/ilmbase/trunk/files/libHalf.so.2.0.2.i csw/mgar/pkg/ilmbase/trunk/files/libHalf.so.2.0.2.s csw/mgar/pkg/ilmbase/trunk/files/libIex.so.2.0.2.i csw/mgar/pkg/ilmbase/trunk/files/libIex.so.2.0.2.s csw/mgar/pkg/ilmbase/trunk/files/libImath.so.2.0.2.i csw/mgar/pkg/ilmbase/trunk/files/libImath.so.2.0.2.s csw/mgar/pkg/ilmbase/trunk/files/ltmain.sh.patch Property Changed: ---------------- csw/mgar/pkg/ilmbase/trunk/ Property changes on: csw/mgar/pkg/ilmbase/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/ilmbase/trunk/Makefile =================================================================== --- csw/mgar/pkg/ilmbase/trunk/Makefile 2011-12-21 14:50:32 UTC (rev 16590) +++ csw/mgar/pkg/ilmbase/trunk/Makefile 2011-12-21 14:53:50 UTC (rev 16591) @@ -1,5 +1,5 @@ NAME = ilmbase -VERSION = 1.0.1 +VERSION = 1.0.2 CATEGORIES = lib DESCRIPTION = Base libraries used by OpenEXR @@ -22,87 +22,52 @@ MASTER_SITES = http://download.savannah.nongnu.org/releases/openexr/ DISTFILES = $(NAME)-$(VERSION).tar.gz -DISTFILES += libHalf.so.2.0.2.i -DISTFILES += libHalf.so.2.0.2.s -DISTFILES += libIex.so.2.0.2.i -DISTFILES += libIex.so.2.0.2.s -DISTFILES += libImath.so.2.0.2.i -DISTFILES += libImath.so.2.0.2.s -PACKAGES = CSWilmbase CSWilmbasedevel -CATALOGNAME_CSWilmbase = ilmbase -CATALOGNAME_CSWilmbasedevel = ilmbase_devel +PATCHFILES += ImathMath.patch -SPKG_DESC_CSWilmbase += Base libraries used by OpenEXR -SPKG_DESC_CSWilmbasedevel += Base libraries used by OpenEXR - developer package +VENDOR_URL = http://www.openexr.com -PKGFILES_CSWilmbasedevel = $(PKGFILES_DEVEL) +LICENSE = LICENSE -RUNTIME_DEP_PKGS_CSWilmbase += -RUNTIME_DEP_PKGS_CSWilmbasedevel += CSWilmbase +PACKAGES += CSWlibhalf6 +SPKG_DESC_CSWlibhalf6 += $(DESCRIPTION), libHalf.so.6 +PKGFILES_CSWlibhalf6 += $(call pkgfiles_lib,libHalf.so.6) +OBSOLETED_BY_CSWlibhalf6 += CSWilmbase +RUNTIME_DEP_PKGS_CSWlibilmthread6 += CSWlibiex6 +PACKAGES += CSWlibiex6 +SPKG_DESC_CSWlibiex6 += $(DESCRIPTION), libIex.so.6 +PKGFILES_CSWlibiex6 += $(call pkgfiles_lib,libIex.so.6) +OBSOLETED_BY_CSWlibiex6 += CSWilmbase -CHECKPKG_OVERRIDES_CSWilmbase += symbol-not-found|libIex.so.2.0.2 -CHECKPKG_OVERRIDES_CSWilmbase += symbol-not-found|libHalf.so.2.0.2 -CHECKPKG_OVERRIDES_CSWilmbase += symbol-not-found|libImath.so.2.0.2 -CHECKPKG_OVERRIDES_CSWilmbase += symbol-not-found|libIlmThread.so.6.0.0 -CHECKPKG_OVERRIDES_CSWilmbase += symbol-not-found|libImath.so.6.0.0 +PACKAGES += CSWlibilmthread6 +SPKG_DESC_CSWlibilmthread6 += $(DESCRIPTION), libIlmThread.so.6 +PKGFILES_CSWlibilmthread6 += $(call pkgfiles_lib,libIlmThread.so.6) +OBSOLETED_BY_CSWlibilmthread6 += CSWilmbase -SPKG_SOURCEURL = http://www.openexr.com +PACKAGES += CSWlibimath6 +SPKG_DESC_CSWlibimath6 += $(DESCRIPTION), libImath.so.6 +PKGFILES_CSWlibimath6 += $(call pkgfiles_lib,libImath.so.6) +RUNTIME_DEP_PKGS_CSWlibimath6 += CSWlibiex6 +OBSOLETED_BY_CSWlibimath6 += CSWilmbase -LICENSE = LICENSE +PACKAGES += CSWilmbase-dev +SPKG_DESC_CSWilmbase-dev += Development files for ILM base libraries +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWilmbase-dev += CSWlibilmthread6 +RUNTIME_DEP_PKGS_CSWilmbase-dev += CSWlibhalf6 +RUNTIME_DEP_PKGS_CSWilmbase-dev += CSWlibiex6 +RUNTIME_DEP_PKGS_CSWilmbase-dev += CSWlibimath6 +OBSOLETED_BY_CSWilmbase-dev += CSWilmbasedevel +CATALOGNAME_CSWilmbasedevel = ilmbase_devel_stub -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -UPSTREAM_MASTER_SITES = http://download.savannah.nongnu.org/releases/openexr/ +EXTRA_LD_FLAGS = -lm -CONFIGURE_ARGS = $(DIRPATHS) +EXTRA_CXXFLAGS += -norunpath +REINPLACE_MATCH = (\|-xarch=) +REINPLACE_WITH = |-norunpath$$1 +REINPLACE_FILES += ltmain.sh -PATCHFILES = ImathMath.patch -PATCHFILES += ltmain.sh.patch - -EXTRA_LD_FLAGS += -lCstd -lCrun -lc -lm -EXTRA_CXX_FLAGS_isa-i386 = -EXTRA_CXX_FLAGS_isa-sparcv8 = -EXTRA_CXX_FLAGS_isa-amd64 = -KPIC -EXTRA_CXX_FLAGS_isa-sparcv9 = -KPIC -EXTRA_CXX_FLAGS += $(EXTRA_LD_FLAGS_$(MODULATION)) - BUILD64 = 1 -# Check fails if library isn't installed /opt/csw/lib and until a 64-bit -# lib is installed test has to be disabled -#TEST_TARGET = check -TEST_TARGET = - -STRIP_LIBTOOL = 1 - include gar/category.mk - -# -# Test to see if rebuilding libtool would fix 64-bit problem... -# -#pre-configure-modulated: -# @echo " ==> Regenerating build tools..." -# @(cd $(WORKSRC) ; \ -# aclocal && \ -# autoconf && \ -# libtoolize --automake --force && \ -# aclocal && \ -# automake -a ) -# @$(MAKECOOKIE) - -post-install-isa-sparcv8: - @cp $(FILEDIR)/libHalf.so.2.0.2.s $(INSTALLISADIR)/opt/csw/lib/libHalf.so.2.0.2 - @cp $(FILEDIR)/libIex.so.2.0.2.s $(INSTALLISADIR)/opt/csw/lib/libIex.so.2.0.2 - @cp $(FILEDIR)/libImath.so.2.0.2.s $(INSTALLISADIR)/opt/csw/lib/libImath.so.2.0.2 - @( if [ ! -r $(INSTALLISADIR)$(libdir)/libHalf.so.2 ] ; then ln -s libHalf.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libHalf.so.2 ; fi ) - @( if [ ! -r $(INSTALLISADIR)$(libdir)/libIex.so.2 ] ; then ln -s libIex.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libIex.so.2 ; fi ) - @( if [ ! -r $(INSTALLISADIR)$(libdir)/libImath.so.2 ] ; then ln -s libImath.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libImath.so.2 ; fi ) - -post-install-isa-i386: - @cp $(FILEDIR)/libHalf.so.2.0.2.i $(INSTALLISADIR)/opt/csw/lib/libHalf.so.2.0.2 - @cp $(FILEDIR)/libIex.so.2.0.2.i $(INSTALLISADIR)/opt/csw/lib/libIex.so.2.0.2 - @cp $(FILEDIR)/libImath.so.2.0.2.i $(INSTALLISADIR)/opt/csw/lib/libImath.so.2.0.2 - @( if [ ! -r $(INSTALLISADIR)$(libdir)/libHalf.so.2 ] ; then ln -s libHalf.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libHalf.so.2 ; fi ) - @( if [ ! -r $(INSTALLISADIR)$(libdir)/libIex.so.2 ] ; then ln -s libIex.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libIex.so.2 ; fi ) - @( if [ ! -r $(INSTALLISADIR)$(libdir)/libImath.so.2 ] ; then ln -s libImath.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libImath.so.2 ; fi ) Modified: csw/mgar/pkg/ilmbase/trunk/checksums =================================================================== --- csw/mgar/pkg/ilmbase/trunk/checksums 2011-12-21 14:50:32 UTC (rev 16590) +++ csw/mgar/pkg/ilmbase/trunk/checksums 2011-12-21 14:53:50 UTC (rev 16591) @@ -1,9 +1 @@ -6873969f50e5d1c43ec93a90a65d85bd ImathMath.patch -f76f094e69a6079b0beb93d97e2a217e ilmbase-1.0.1.tar.gz -b7daafc6a6c92a3cf9dfb47e24fa630f libHalf.so.2.0.2.i -cdce2f2b1c7d00dc76124ecb5418b9a2 libHalf.so.2.0.2.s -1b589f5b747846688c27f55de9b1ec7a libIex.so.2.0.2.i -ddf913c9000dc4580ad330b9dd938826 libIex.so.2.0.2.s -756523f803ce1be3e125b6ce63e3183c libImath.so.2.0.2.i -ce47a211381deadfc38722f5abda54d7 libImath.so.2.0.2.s -f1016498bff3cce0c722108f4603e6c5 ltmain.sh.patch +26c133ee8ca48e1196fbfb3ffe292ab4 ilmbase-1.0.2.tar.gz Deleted: csw/mgar/pkg/ilmbase/trunk/files/libHalf.so.2.0.2.i =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/ilmbase/trunk/files/libHalf.so.2.0.2.s =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/ilmbase/trunk/files/libIex.so.2.0.2.i =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/ilmbase/trunk/files/libIex.so.2.0.2.s =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/ilmbase/trunk/files/libImath.so.2.0.2.i =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/ilmbase/trunk/files/libImath.so.2.0.2.s =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/ilmbase/trunk/files/ltmain.sh.patch =================================================================== --- csw/mgar/pkg/ilmbase/trunk/files/ltmain.sh.patch 2011-12-21 14:50:32 UTC (rev 16590) +++ csw/mgar/pkg/ilmbase/trunk/files/ltmain.sh.patch 2011-12-21 14:53:50 UTC (rev 16591) @@ -1,24 +0,0 @@ ---- ilmbase-1.0.1.orig/ltmain.sh 2006-12-16 00:23:48.000000000 +0100 -+++ ilmbase-1.0.1/ltmain.sh 2010-01-04 03:01:58.123927193 +0100 -@@ -1553,9 +1553,10 @@ - esac - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" -- if test "$with_gcc" = "yes" ; then -+# Fix for 64-bit CC -+# if test "$with_gcc" = "yes" ; then - compiler_flags="$compiler_flags $arg" -- fi -+# fi - continue - ;; - -@@ -4015,7 +4016,7 @@ - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" -- eval cmd=\"$cmd\" -+ eval cmd=\"$cmd -norunpath\" - $show "$cmd" - $run eval "$cmd" || exit $? - done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Wed Dec 21 16:21:38 2011 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Wed, 21 Dec 2011 15:21:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[16568] csw/mgar/pkg In-Reply-To: References: Message-ID: 2011/12/19 > > Revision: 16568 > ? ? ? ? ?http://gar.svn.sourceforge.net/gar/?rev=16568&view=rev > Author: ? cgrzemba > Date: ? ? 2011-12-19 09:55:53 +0000 (Mon, 19 Dec 2011) > Log Message: > ----------- > svrcore/trunk: Mozilla Svrcore, first build > > Added Paths: > ----------- > ? ?csw/mgar/pkg/svrcore/ > ? ?csw/mgar/pkg/svrcore/Makefile > ? ?csw/mgar/pkg/svrcore/branches/ > ? ?csw/mgar/pkg/svrcore/tags/ > ? ?csw/mgar/pkg/svrcore/trunk/ > ? ?csw/mgar/pkg/svrcore/trunk/Makefile > ? ?csw/mgar/pkg/svrcore/trunk/checksums > ? ?csw/mgar/pkg/svrcore/trunk/files/ > > Added: csw/mgar/pkg/svrcore/Makefile > =================================================================== > --- csw/mgar/pkg/svrcore/Makefile ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? (rev 0) > +++ csw/mgar/pkg/svrcore/Makefile ? ? ? 2011-12-19 09:55:53 UTC (rev 16568) > @@ -0,0 +1,2 @@ > +%: > + ? ? ? $(MAKE) -C trunk $* > > > Property changes on: csw/mgar/pkg/svrcore/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/svrcore/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/svrcore/trunk/Makefile ? ? ? ? ? ? ? ? ? ? ? ? (rev 0) > +++ csw/mgar/pkg/svrcore/trunk/Makefile 2011-12-19 09:55:53 UTC (rev 16568) > @@ -0,0 +1,72 @@ > +# $Id$ > +# > +NAME = svrcore > +MAJOR_VERSION = 4 > +MIN_VERSION = 0.4 > +VERSION = $(MAJOR_VERSION).$(MIN_VERSION) > +GARTYPE = v2 > +CATEGORIES = lib > + > +DESCRIPTION = Mozilla LDAP SVR Core > +define BLURB > + ?This is the Mozilla SVR Core needed by LDAP SDK > +endef > + > +MASTER_SITES = http://ftp.mozilla.org/pub/directory/svrcore/releases/4.0.4/src/ > +DISTFILES ?= $(NAME)-$(VERSION).tar.bz2 > + > +# 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 = You can remove the unused lines above. > +PACKAGES += CSWlibsvrcore0 > +CATALOGNAME_CSWlibsvrcore0 = libsvrcore0 > +SPKG_DESC_CSWlibsvrcore0 += $(DESCRIPTION) > +PKGFILES_CSWlibsvrcore0 = $(call pkgfiles_lib,libsvrcore.so.0) > +RUNTIME_DEP_PKGS_CSWlibsvrcore0 += CSWlibnspr4 > +RUNTIME_DEP_PKGS_CSWlibsvrcore0 += CSWlibnss3 > +RUNTIME_DEP_PKGS_CSWlibsvrcore0 += CSWlibplc4 > +RUNTIME_DEP_PKGS_CSWlibsvrcore0 += CSWlibplds4 > +PACKAGING_PLATFORMS += solaris10-sparc > +PACKAGING_PLATFORMS += solaris10-i386 You can move the PACKAGING_PLATFORMS lines closer to the top of the file; they affect the whole recipe. > +PACKAGES += CSWlibsvrcore0-dev > +CATALOGNAME_CSWlibsvrcore0-dev = libsvrcore0_dev > +SPKG_DESC_CSWlibsvrcore0-dev += $(DESCRIPTION), development files > +PKGFILES_CSWlibsvrcore0-dev = $(PKGFILES_DEVEL) > +PKGFILES_CSWlibsvrcore0-dev += /opt/csw/lib/libsvrcore.so > +PKGFILES_CSWlibsvrcore0-dev += /opt/csw/lib/sparcv9/libsvrcore.so > +ARCHALL_CSWgnutlsdevel = 1 > + > +# Move the include files to include/nspr to prevent polluting the main > +# header file namespace. > +includedir = $(prefix)/include/nspr > + > +CONFIGURE_ARGS ?= $(DIRPATHS) > +CONFIGURE_ARGS_isa-sparcv9 = --enable-64bit > +CONFIGURE_ARGS_isa-amd64 = --enable-64bit > +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MODULATION)) > +CONFIGURE_ARGS_OPT += --enable-optimize="-xO3" > +CONFIGURE_ARGS_OPT += --disable-debug > +CONFIGURE_ARGS_OPT += --enable-strip > +CONFIGURE_ARGS_DBG += --enable-debug > +CONFIGURE_ARGS_DBG += --disable-strip > +CONFIGURE_ARGS_OPT += --with-nss-inc=/opt/csw/include/nss > +CONFIGURE_ARGS_OPT += --with-nss-lib=/opt/csw/lib > +CONFIGURE_ARGS_OPT += --with-nspr-inc=/opt/csw/include/nspr > +CONFIGURE_ARGS_OPT += --with-nspr-lib=/opt/csw/lib Two things: the library switches are probably not dependent on GARFLAVOR; instead of using "/opt/csw/lib", use $(libdir), the same goes for $(includedir). > +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) > + > + > +RUNTIME_DEP_PKGS_CSWlibsvrcore0-dev += CSWlibsvrcore0 You can move that to the CSWlibsvrcore0-dev definition. > +BUILD64 = 1 > + > +include gar/category.mk Looks good overall! Good job! From cgrzemba at users.sourceforge.net Wed Dec 21 16:57:32 2011 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 21 Dec 2011 15:57:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[16592] csw/mgar/pkg/svrcore/trunk/Makefile Message-ID: Revision: 16592 http://gar.svn.sourceforge.net/gar/?rev=16592&view=rev Author: cgrzemba Date: 2011-12-21 15:57:32 +0000 (Wed, 21 Dec 2011) Log Message: ----------- svrcore/trunk: prettified buildrecipe Modified Paths: -------------- csw/mgar/pkg/svrcore/trunk/Makefile Modified: csw/mgar/pkg/svrcore/trunk/Makefile =================================================================== --- csw/mgar/pkg/svrcore/trunk/Makefile 2011-12-21 14:53:50 UTC (rev 16591) +++ csw/mgar/pkg/svrcore/trunk/Makefile 2011-12-21 15:57:32 UTC (rev 16592) @@ -15,15 +15,9 @@ MASTER_SITES = http://ftp.mozilla.org/pub/directory/svrcore/releases/4.0.4/src/ DISTFILES = $(NAME)-$(VERSION).tar.bz2 -# 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 +PACKAGING_PLATFORMS += solaris10-sparc +PACKAGING_PLATFORMS += solaris10-i386 -# 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 = - PACKAGES += CSWlibsvrcore0 CATALOGNAME_CSWlibsvrcore0 = libsvrcore0 SPKG_DESC_CSWlibsvrcore0 += $(DESCRIPTION) @@ -32,8 +26,6 @@ RUNTIME_DEP_PKGS_CSWlibsvrcore0 += CSWlibnss3 RUNTIME_DEP_PKGS_CSWlibsvrcore0 += CSWlibplc4 RUNTIME_DEP_PKGS_CSWlibsvrcore0 += CSWlibplds4 -PACKAGING_PLATFORMS += solaris10-sparc -PACKAGING_PLATFORMS += solaris10-i386 PACKAGES += CSWlibsvrcore0-dev CATALOGNAME_CSWlibsvrcore0-dev = libsvrcore0_dev @@ -42,10 +34,11 @@ PKGFILES_CSWlibsvrcore0-dev += /opt/csw/lib/libsvrcore.so PKGFILES_CSWlibsvrcore0-dev += /opt/csw/lib/sparcv9/libsvrcore.so ARCHALL_CSWgnutlsdevel = 1 +RUNTIME_DEP_PKGS_CSWlibsvrcore0-dev += CSWlibsvrcore0 # Move the include files to include/nspr to prevent polluting the main # header file namespace. -includedir = $(prefix)/include/nspr +# includedir = $(prefix)/include/nspr CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS_isa-sparcv9 = --enable-64bit @@ -56,17 +49,13 @@ CONFIGURE_ARGS_OPT += --enable-strip CONFIGURE_ARGS_DBG += --enable-debug CONFIGURE_ARGS_DBG += --disable-strip -CONFIGURE_ARGS_OPT += --with-nss-inc=/opt/csw/include/nss -CONFIGURE_ARGS_OPT += --with-nss-lib=/opt/csw/lib -CONFIGURE_ARGS_OPT += --with-nspr-inc=/opt/csw/include/nspr -CONFIGURE_ARGS_OPT += --with-nspr-lib=/opt/csw/lib +CONFIGURE_ARGS_OPT += --with-nss-inc=$(includedir)/nss +CONFIGURE_ARGS_OPT += --with-nss-lib=$(libdir) +CONFIGURE_ARGS_OPT += --with-nspr-inc=$(includedir)/nspr +CONFIGURE_ARGS_OPT += --with-nspr-lib=/$(libdir) CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) - -RUNTIME_DEP_PKGS_CSWlibsvrcore0-dev += CSWlibsvrcore0 - BUILD64 = 1 include gar/category.mk - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Dec 22 09:26:44 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 22 Dec 2011 08:26:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[16593] csw/mgar/pkg/openexr/trunk Message-ID: Revision: 16593 http://gar.svn.sourceforge.net/gar/?rev=16593&view=rev Author: dmichelsen Date: 2011-12-22 08:26:44 +0000 (Thu, 22 Dec 2011) Log Message: ----------- openexr/trunk: Update to 1.7.0, remove legacy libs, general rework, not yet finished Modified Paths: -------------- csw/mgar/pkg/openexr/trunk/Makefile csw/mgar/pkg/openexr/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/openexr/trunk/files/libIlmImf.so.2.0.2.i csw/mgar/pkg/openexr/trunk/files/libIlmImf.so.2.0.2.s Property Changed: ---------------- csw/mgar/pkg/openexr/trunk/ Property changes on: csw/mgar/pkg/openexr/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/openexr/trunk/Makefile =================================================================== --- csw/mgar/pkg/openexr/trunk/Makefile 2011-12-21 15:57:32 UTC (rev 16592) +++ csw/mgar/pkg/openexr/trunk/Makefile 2011-12-22 08:26:44 UTC (rev 16593) @@ -1,5 +1,5 @@ NAME = openexr -VERSION = 1.6.1 +VERSION = 1.7.0 CATEGORIES = lib DESCRIPTION = High dynamic-range (HDR) image file format developed by Industrial Light & Magic @@ -17,71 +17,27 @@ details. endef -MASTER_SITES = http://savannah.nongnu.org/download/openexr/ +MASTER_SITES = http://download.savannah.nongnu.org/releases/openexr/ DISTFILES = $(NAME)-$(VERSION).tar.gz -DISTFILES += libIlmImf.so.2.0.2.i -DISTFILES += libIlmImf.so.2.0.2.s -PACKAGES = CSWopenexr CSWopenexrrt CSWopenexrdevel CSWopenexrdoc -CATALOGNAME_CSWopenexr = openexr -CATALOGNAME_CSWopenexrrt = openexr_rt -CATALOGNAME_CSWopenexrdevel = openexr_devel -CATALOGNAME_CSWopenexrdoc = openexr_doc +VENDOR_URL = http://www.openexr.com -SPKG_DESC_CSWopenexr += $(DESCRIPTION) -SPKG_DESC_CSWopenexrrt += $(DESCRIPTION) - runtime package -SPKG_DESC_CSWopenexrdevel += $(DESCRIPTION) - developer package -SPKG_DESC_CSWopenexrdoc += $(DESCRIPTION) - documentation - -PKGFILES_CSWopenexrrt = $(PKGFILES_RT) -PKGFILES_CSWopenexrdevel = $(PKGFILES_DEVEL) -PKGFILES_CSWopenexrdoc = $(docdir)/OpenEXR.* - -ARCHALL_CSWopenexrdoc = 1 - -RUNTIME_DEP_PKGS_CSWopenexr += CSWopenexrrt -RUNTIME_DEP_PKGS_CSWopenexr += CSWilmbase -RUNTIME_DEP_PKGS_CSWopenexr += CSWzlib -RUNTIME_DEP_PKGS_CSWopenexrrt += CSWilmbase CSWzlib -RUNTIME_DEP_PKGS_CSWopenexrdevel += CSWopenexrrt -RUNTIME_DEP_PKGS_CSWopenexrdoc += - -SPKG_SOURCEURL = http://www.openexr.com - -CHECKPKG_OVERRIDES_CSWopenexrdevel += missing-dependency|CSWopenexr - LICENSE = LICENSE -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES += CSWopenexr +SPKG_DESC_CSWopenexr += $(DESCRIPTION) -PATCHFILES += ltmain.sh.patch -PATCHFILES += makePreview.cpp.patch +#PACKAGES += CSWopenexrrt +CATALOGNAME_CSWopenexrrt = openexr_rt_stub +SPKG_DESC_CSW = -EXTRA_LD_FLAGS += -lCstd -lCrun -lc -lm -EXTRA_CXX_FLAGS_isa-i386 = -EXTRA_CXX_FLAGS_isa-sparcv8 = -EXTRA_CXX_FLAGS_isa-amd64 = -KPIC -EXTRA_CXX_FLAGS_isa-sparcv9 = -KPIC -EXTRA_CXX_FLAGS += $(EXTRA_LD_FLAGS_$(MODULATION)) +PACKAGES += CSWopenexr-dev +SPKG_DESC_CSWopenexr-dev = Development files for ... +PKGFILES_CSWopenexr-dev += $(PKGFILES_DEVEL) +OBSOLETED_BY_CSWopenexr-dev += CSWopenexrdevel +CATALOGNAME_CSWopenexrdevel = openexr_devel_stub BUILD64 = 1 -# Check fails if library isn't installed /opt/csw/lib and until a 64-bit -# lib is installed test has to be disabled -#TEST_TARGET = check -TEST_TARGET = - -STRIP_LIBTOOL = 1 - -CONFIGURE_ARGS = $(DIRPATHS) - include gar/category.mk -# Until kdeoffice_gcc is rebuilt using new openexr/ilmbase -post-install-isa-sparcv8: - @cp $(FILEDIR)/libIlmImf.so.2.0.2.s $(INSTALLISADIR)/opt/csw/lib/libIlmImf.so.2.0.2 - @( if [ ! -r $(INSTALLISADIR)$(libdir)/libIlmImf.so.2 ] ; then ln -s libIlmImf.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libIlmImf.so.2 ; fi ) - -post-install-isa-i386: - @cp $(FILEDIR)/libIlmImf.so.2.0.2.i $(INSTALLISADIR)/opt/csw/lib/libIlmImf.so.2.0.2 - @( if [ ! -r $(INSTALLISADIR)$(libdir)/libIlmImf.so.2 ] ; then ln -s libIlmImf.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libIlmImf.so.2 ; fi ) Modified: csw/mgar/pkg/openexr/trunk/checksums =================================================================== --- csw/mgar/pkg/openexr/trunk/checksums 2011-12-21 15:57:32 UTC (rev 16592) +++ csw/mgar/pkg/openexr/trunk/checksums 2011-12-22 08:26:44 UTC (rev 16593) @@ -1,5 +1 @@ -0d08a0c9f251d385b5d3c86ac7da84e5 libIlmImf.so.2.0.2.i -32dec457461b5d371eb2dd4a2e5d2231 libIlmImf.so.2.0.2.s -aab7ae39a7fc1317192aa5663e0ba3d7 ltmain.sh.patch -462c6cb9708c254261fd1515c1294336 makePreview.cpp.patch -11951f164f9c872b183df75e66de145a openexr-1.6.1.tar.gz +27113284f7d26a58f853c346e0851d7a openexr-1.7.0.tar.gz Deleted: csw/mgar/pkg/openexr/trunk/files/libIlmImf.so.2.0.2.i =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/openexr/trunk/files/libIlmImf.so.2.0.2.s =================================================================== (Binary files differ) 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 Dec 22 13:17:04 2011 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Thu, 22 Dec 2011 12:17:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[16594] csw/mgar/pkg/zsh/trunk/Makefile Message-ID: Revision: 16594 http://gar.svn.sourceforge.net/gar/?rev=16594&view=rev Author: opk Date: 2011-12-22 12:17:03 +0000 (Thu, 22 Dec 2011) Log Message: ----------- fix issue with recent zsh package and installation of extra completion funcs Modified Paths: -------------- csw/mgar/pkg/zsh/trunk/Makefile Modified: csw/mgar/pkg/zsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/zsh/trunk/Makefile 2011-12-22 08:26:44 UTC (rev 16593) +++ csw/mgar/pkg/zsh/trunk/Makefile 2011-12-22 12:17:03 UTC (rev 16594) @@ -41,7 +41,6 @@ CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/zsh/functions/_setxkbmap CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/share/zsh/functions/_units CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/bin/zsh-$(VERSION) -CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/bin/zsh CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/zshcontrib.1 CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/share/zsh/functions/_gcc CHECKPKG_OVERRIDES_CSWzsh += file-with-bad-content|/usr/local|root/opt/csw/share/zsh/functions/_urls @@ -64,5 +63,6 @@ # http://www.zsh.org/mla/workers/2007/msg01236.html CPPFLAGS := -I$(includedir)/ncursesw $(CPPFLAGS) -post-install: +post-install-modulated: cp -p $(WORKDIR)/_pkgutil $(WORKDIR)/_mgar $(DESTDIR)$(sharedstatedir)/$(NAME)/functions + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Dec 22 14:47:49 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 22 Dec 2011 13:47:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[16595] csw/mgar/pkg/mysql5/branches/mysql-5.5.x Message-ID: Revision: 16595 http://gar.svn.sourceforge.net/gar/?rev=16595&view=rev Author: wahwah Date: 2011-12-22 13:47:49 +0000 (Thu, 22 Dec 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.5.x: Bump the version number, add CSWbison build dep Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2011-12-22 12:17:03 UTC (rev 16594) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2011-12-22 13:47:49 UTC (rev 16595) @@ -9,7 +9,7 @@ PROJ_NAME = mysql NAME = $(PROJ_NAME)55 BASE_VERSION = 5.5 -PATCHLEVEL = 16 +PATCHLEVEL = 19 ALTS_PRIO = 55 VERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = server @@ -171,8 +171,9 @@ DISTFILES += cswusergroup # TODO: Do the proper prerequsite pkgs. -BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -BUILD_DEP_PKGS = CSWcmake +BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS) +BUILD_DEP_PKGS += CSWcmake +BUILD_DEP_PKGS += CSWbison PROGRAM_SUFFIX = -$(BASE_VERSION) # Set ./configure options Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums 2011-12-22 12:17:03 UTC (rev 16594) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums 2011-12-22 13:47:49 UTC (rev 16595) @@ -1 +1 @@ -462ab3752dd666ec06ca32f92673b59e mysql-5.5.16.tar.gz +a78cf450974e9202bd43674860349b5a mysql-5.5.19.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Dec 22 17:45:13 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 22 Dec 2011 16:45:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[16596] csw/mgar/pkg/mysql5/branches/mysql-5.5.x Message-ID: Revision: 16596 http://gar.svn.sourceforge.net/gar/?rev=16596&view=rev Author: wahwah Date: 2011-12-22 16:45:12 +0000 (Thu, 22 Dec 2011) Log Message: ----------- pkg/mysql5/branches/mysql-5.5.x: work around the SSL discovery problem http://bugs.mysql.com/bug.php?id=61619 Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Added Paths: ----------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0003-I-HATE-CMAKE.patch Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2011-12-22 13:47:49 UTC (rev 16595) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2011-12-22 16:45:12 UTC (rev 16596) @@ -75,6 +75,8 @@ # PATCHFILES += 0004-var-opt-csw-mysql51-for-datadir-in-my-.cnf.patch # The configuration phase failed (?) # PATCHFILES += 0002-stop-cmake-from-messing-with-cflags.patch +# PATCHFILES += 0005-I-HATE-CMAKE.patch +PATCHFILES += 0003-I-HATE-CMAKE.patch PACKAGES += CSWlibmysqlclient$(MYSQL_LIB_VER) PKGFILES_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient\.so\.$(MYSQL_LIB_VER)(\.\d+)*) @@ -160,6 +162,12 @@ # EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ # EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ +# A workaround for OpenSSL +# http://www.cmake.org/pipermail/cmake/2011-December/048220.html +# EXTRA_CFLAGS = -I$(includedir) +# EXTRA_CXXFLAGS = -I$(includedir) +# It doesn't work. cmake filters them out or something. + MASTER_SITES = http://ftp.heanet.ie/mirrors/www.mysql.com/Downloads/MySQL-$(BASE_VERSION)/ DISTFILES = mysql-$(VERSION).tar.gz DISTFILES += csw$(NAME).tpl @@ -222,6 +230,10 @@ # CMAKE_ARGS += -DCMAKE_LIBRARY_PATH="$(libdir)" # CMAKE_ARGS += -DCMAKE_PREFIX_PATH="$(prefix)" CMAKE_ARGS += -DOPENSSL_ROOT_DIR=$(prefix) +# CMAKE_ARGS += -DOPENSSL_SSL_LIBRARIES=$(libdir)/$(MM_LIBDIR)/libssl.so +# CMAKE_ARGS += -DOPENSSL_CRYPTO_LIBRARIES=$(libdir)/$(MM_LIBDIR)/libcrypto.so +CMAKE_ARGS += -DCMAKE_INCLUDE_PATH="$(includedir)" +CMAKE_ARGS += -DCMAKE_LIBRARY_PATH="$(libdir)" # CMAKE_LIBRARY_PATH = $(libdir) # EXTRA_CONFIGURE_EXPORTS += CMAKE_LIBRARY_PATH @@ -319,7 +331,7 @@ CONFIGURE_SCRIPTS = custom -EXTRA_PKG_CONFIG_DIRS = $(FILEDIR)/64 +# EXTRA_PKG_CONFIG_DIRS = $(FILEDIR)/64 include gar/category.mk Added: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0003-I-HATE-CMAKE.patch =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0003-I-HATE-CMAKE.patch (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0003-I-HATE-CMAKE.patch 2011-12-22 16:45:12 UTC (rev 16596) @@ -0,0 +1,36 @@ +From da58cb8a9a33720c3c187fcebfd28cefc3886c26 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Thu, 22 Dec 2011 17:05:40 +0100 +Subject: [PATCH] I HATE CMAKE + +For being so opaque. + +Fix stolen from: +http://bugs.mysql.com/bug.php?id=61619 +--- + cmake/ssl.cmake | 5 ++++- + 1 files changed, 4 insertions(+), 1 deletions(-) + +diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake +index 9b16bf0..97dc7d2 100644 +--- a/cmake/ssl.cmake ++++ b/cmake/ssl.cmake +@@ -64,11 +64,14 @@ MACRO (MYSQL_CHECK_SSL) + MYSQL_USE_BUNDLED_SSL() + ELSEIF(WITH_SSL STREQUAL "system" OR WITH_SSL STREQUAL "yes") + # Check for system library +- SET(OPENSSL_FIND_QUIETLY TRUE) ++ # SET(OPENSSL_FIND_QUIETLY TRUE) + INCLUDE(FindOpenSSL) ++ MESSAGE(STATUS "OPENSSL_INCLUDE_DIR = ${OPENSSL_INCLUDE_DIR}") ++ MESSAGE(STATUS "OPENSSL_LIBRARIES = ${OPENSSL_LIBRARIES}") + FIND_LIBRARY(CRYPTO_LIBRARY crypto) + MARK_AS_ADVANCED(CRYPTO_LIBRARY) + INCLUDE(CheckSymbolExists) ++ SET(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR}) + CHECK_SYMBOL_EXISTS(SHA512_DIGEST_LENGTH "openssl/sha.h" + HAVE_SHA512_DIGEST_LENGTH) + IF(OPENSSL_FOUND AND CRYPTO_LIBRARY AND HAVE_SHA512_DIGEST_LENGTH) +-- +1.7.6.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 Dec 23 17:41:37 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 23 Dec 2011 16:41:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[16597] csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Message-ID: Revision: 16597 http://gar.svn.sourceforge.net/gar/?rev=16597&view=rev Author: wahwah Date: 2011-12-23 16:41:37 +0000 (Fri, 23 Dec 2011) Log Message: ----------- mysql5/branches/mysql-5.5.x: work in progress Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2011-12-22 16:45:12 UTC (rev 16596) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2011-12-23 16:41:37 UTC (rev 16597) @@ -14,15 +14,12 @@ VERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = server -# PACKAGING_PLATFORMS = solaris9-sparc solaris10-sparc - # Useful when making a series of builds on the same day # GARFLAVOR ?= DBG -# There is v9-specific assembler, and I don't see an easy way to switch it -# off. -SKIP_MODULATIONS = isa-sparcv8 -# The alternative is to ship sparcv8+ binaries. +# There is some assembler code, which doesn't work on sparcv8, and I don't see +# an easy way to switch it off. +ISA_DEFAULT_sparc-5.9 = sparcv8plus DISTNAME = mysql-$(VERSION) SPKG_SOURCEURL = http://www.mysql.com/ @@ -33,11 +30,8 @@ (Structured Query Language) database server. endef -# Compilation with Solaris Studio fails: -# cg error (as) : ".../mysql-5.5.16/mysys/my_timer_cycles.il (template for -# my_timer_cycles_il_sparc32)", line 27 : cannot use SPARC v9 instructions -# with this target architecture -# GARCOMPILER = GNU +# There are problems with the build using Sun Studio. +GARCOMPILER = GNU INITSMF = $(sysconfdir)/init\.d/csw$(NAME) @@ -69,13 +63,6 @@ ALTERNATIVE_mysql_dev += $(foreach C,$(wordlist 2,$(words $(CSWmysql-dev_programs)),$(CSWmysql-dev_programs)),\ $(mandir)/man1/$(C).1 $C $(mandir)/man1/$(C)$(PROGRAM_SUFFIX).1) -# PATCHFILES = 0001-Use-libc-not-libcrypt.patch -# PATCHFILES += 0002-cast-user_info-pw_gid-to-gid_t.patch -# PATCHFILES += 0003-OpenCSW-perl-for-tests.patch -# PATCHFILES += 0004-var-opt-csw-mysql51-for-datadir-in-my-.cnf.patch -# The configuration phase failed (?) -# PATCHFILES += 0002-stop-cmake-from-messing-with-cflags.patch -# PATCHFILES += 0005-I-HATE-CMAKE.patch PATCHFILES += 0003-I-HATE-CMAKE.patch PACKAGES += CSWlibmysqlclient$(MYSQL_LIB_VER) @@ -83,12 +70,12 @@ SPKG_DESC_CSWlibmysqlclient$(MYSQL_LIB_VER) += MySQL $(BASE_VERSION) client library, libmysqlclient.so.$(MYSQL_LIB_VER) RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSWlibz1 RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSWosslrt +RUNTIME_DEP_PKGS_CSWlibmysqlclient18 += CSWlibgcc-s1 PACKAGES += CSWlibmysqlclient-r$(MYSQL_LIB_VER) PKGFILES_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient_r\.so\.$(MYSQL_LIB_VER)(\.\d+)*) SPKG_DESC_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += MySQL $(BASE_VERSION) client library, libmysqlclient_r.so.$(MYSQL_LIB_VER) -RUNTIME_DEP_PKGS_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += CSWosslrt +RUNTIME_DEP_PKGS_CSWlibmysqlclient-r18 += CSWlibmysqlclient18 # Defining the client programs, which are going to pick up the 32- and 64-bit # binaries, symbolic links, isaexec stuff and man pages. @@ -131,43 +118,18 @@ RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibwrap1 RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibz1 RUNTIME_DEP_PKGS_CSW$(NAME) += CSWosslrt +RUNTIME_DEP_PKGS_CSWmysql55 += CSWlibgcc-s1 CHECKPKG_OVERRIDES_CSW$(NAME) += bad-rpath-entry CHECKPKG_OVERRIDES_CSW$(NAME) += file-with-bad-content EXTRA_MERGE_EXCLUDE_FILES += $(prefix)/mysql-test.* EXTRA_MERGE_EXCLUDE_FILES += $(prefix)/sql-bench.* -# PATCHFILES = 0001-Use-libc-not-libcrypt.patch PATCHFILES += 0002-cast-user_info-pw_gid-to-gid_t.patch -# PATCHFILES += 0003-OpenCSW-perl-for-tests.patch -# PATCHFILES += 0004-basedir-and-datadir-in-the-cnf-files.patch -# PATCHFILES += 0004-looking-for-ps-use-basename-0.patch -# Perhaps using sed would be better, but we have a patch for now. -# PATCHFILES += 0006-Use-my_print_defaults$(PROGRAM_SUFFIX).patch -# PATCHFILES += 0007-versioned-mysqld-during-db-init-5.1.patch -# PATCHFILES += 0008-versioned-datadir-in-mysql_install_db-5.1.patch # Enable 64 bits build BUILD64 = 1 -# EXTRA_CFLAGS = $(EXTRA_CFLAGS_$(GARCH)) -# EXTRA_CFLAGS_sparc = -xO4 -xstrconst $(COMMON_CFLAGS) -# EXTRA_CFLAGS_i386 = -xO3 -nofstore -xregs=no%frameptr $(COMMON_CFLAGS) -# EXTRA_CXXFLAGS = $(EXTRA_CXXFLAGS_$(GARCH)) -# EXTRA_CXXFLAGS_sparc = -xO4 $(COMMON_CFLAGS) -# EXTRA_CXXFLAGS_i386 = -xO3 -nofstore -xregs=no%frameptr $(COMMON_CFLAGS) -# COMMON_CFLAGS = -mt -fsimple=1 -ftrap=%none -xbuiltin=%all -xlibmil -xlibmopt - -# These flags don't work with GCC -# EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ -# EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ - -# A workaround for OpenSSL -# http://www.cmake.org/pipermail/cmake/2011-December/048220.html -# EXTRA_CFLAGS = -I$(includedir) -# EXTRA_CXXFLAGS = -I$(includedir) -# It doesn't work. cmake filters them out or something. - MASTER_SITES = http://ftp.heanet.ie/mirrors/www.mysql.com/Downloads/MySQL-$(BASE_VERSION)/ DISTFILES = mysql-$(VERSION).tar.gz DISTFILES += csw$(NAME).tpl @@ -235,17 +197,6 @@ CMAKE_ARGS += -DCMAKE_INCLUDE_PATH="$(includedir)" CMAKE_ARGS += -DCMAKE_LIBRARY_PATH="$(libdir)" -# CMAKE_LIBRARY_PATH = $(libdir) -# EXTRA_CONFIGURE_EXPORTS += CMAKE_LIBRARY_PATH -# CMAKE_INCLUDE_PATH = $(includedir) -# EXTRA_CONFIGURE_EXPORTS += CMAKE_INCLUDE_PATH -# CMAKE_PREFIX_PATH = $(prefix) -# EXTRA_CONFIGURE_EXPORTS += CMAKE_PREFIX_PATH -# OPENSSL_INCLUDE_DIR = $(includedir) -# EXTRA_CONFIGURE_EXPORTS += OPENSSL_INCLUDE_DIR -# OPENSSL_ROOT_DIR = $(prefix) -# EXTRA_CONFIGURE_EXPORTS += OPENSSL_ROOT_DIR - # TODO: Make the tests pass. They don't at the moment. SKIPTEST ?= 1 TEST_SCRIPTS = custom @@ -331,27 +282,14 @@ CONFIGURE_SCRIPTS = custom -# EXTRA_PKG_CONFIG_DIRS = $(FILEDIR)/64 - include gar/category.mk -# CFLAGS := $(filter-out -I%,$(CFLAGS)) - test-custom: alias sh=/usr/bin/bash; \ cd $(WORKSRC)/mysql-test; \ perl mysql-test-run.pl --mem --big-test --force \ --skip-test=archive-big --skip-test=/gis/ -pre-configure-modulated: - # To work around the following libtool version mismatch problem: - # libtool: Version mismatch error. This is libtool 2.2.6, but the - # libtool: definition of this LT_INIT comes from libtool 2.2.6b. - # libtool: You should recreate aclocal.m4 with macros from libtool 2.2.6 - # http://lists.opencsw.org/pipermail/maintainers/2009-December/005066.html - # cd $(WORKSRC) && autoreconf --force --install --symlink - @$(MAKECOOKIE) - configure-custom: # --debug-output \ # --debug-trycompile \ @@ -384,13 +322,17 @@ gmv -v "$(DESTDIR)$(bindir)/$${f}" \ "$(DESTDIR)$(bindir)/$${f}$(PROGRAM_SUFFIX)"; \ done + (cd $(DESTDIR)$(libdir); rm libmysqlclient_r.so.18; \ + ln -s libmysqlclient.so.18 libmysqlclient_r.so.18) + (cd $(DESTDIR)$(libdir); rm libmysqlclient_r.so.18.0.0; \ + ln -s libmysqlclient.so.18.0.0 libmysqlclient_r.so.18.0.0) @$(MAKECOOKIE) post-merge: ginstall -m 755 -d $(PKGROOT)$(localstatedir) 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 644 $(FILEDIR)/ChangeLog $(PKGROOT)$(datadir)/$(NAME)/doc/ChangeLog-$(BASE_VERSION) + ginstall -m 644 $(FILEDIR)/README.CSW $(PKGROOT)$(datadir)/$(NAME)/doc/README-$(BASE_VERSION).CSW 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 @@ -398,14 +340,6 @@ ginstall -m 755 -d $(PKGROOT)$(sysconfdir)/pkg/CSW$(NAME) ginstall -m 644 $(FILEDIR)/cswusergroup \ $(PKGROOT)$(sysconfdir)/pkg/CSW$(NAME) - # Create symlinks to binaries - # ginstall -m 755 -d $(PKGROOT)$(bindir) - #for f in $(PKGROOT)$(bindir)/*; do \ - # if echo $$f | grep amd64$$; then continue; fi; \ - # if echo $$f | grep sparcv9$$; then continue; fi; \ - # ln -s ../$(NAME)/bin/`basename $$f` \ - # $(PKGROOT)$(bindir)/`basename $$f`; \ - #done # http://www.opencsw.org/bugtrack/view.php?id=4149 ginstall -m 755 -d $(PKGROOT)$(sysconfdir) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Dec 23 20:32:14 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 23 Dec 2011 19:32:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[16598] csw/mgar/pkg/mysql5/branches/mysql-5.5.x Message-ID: Revision: 16598 http://gar.svn.sourceforge.net/gar/?rev=16598&view=rev Author: wahwah Date: 2011-12-23 19:32:14 +0000 (Fri, 23 Dec 2011) Log Message: ----------- mysql5/branches/mysql-5.5.x: Why do you strip runpath, cmake? Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Added Paths: ----------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0003-WHY-IS-CMAKE-TRYING-TO-BE-SMARTER-THAN-ME.patch Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2011-12-23 16:41:37 UTC (rev 16597) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2011-12-23 19:32:14 UTC (rev 16598) @@ -64,6 +64,7 @@ $(mandir)/man1/$(C).1 $C $(mandir)/man1/$(C)$(PROGRAM_SUFFIX).1) PATCHFILES += 0003-I-HATE-CMAKE.patch +PATCHFILES += 0003-WHY-IS-CMAKE-TRYING-TO-BE-SMARTER-THAN-ME.patch PACKAGES += CSWlibmysqlclient$(MYSQL_LIB_VER) PKGFILES_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient\.so\.$(MYSQL_LIB_VER)(\.\d+)*) @@ -103,22 +104,28 @@ PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),$(mandir)/man1/$(bin_name)$(PROGRAM_SUFFIX)\.1) PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),/opt/csw/bin/$(bin_name)$(PROGRAM_SUFFIX)) PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),/opt/csw/sbin/$(bin_name)$(PROGRAM_SUFFIX)) +RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibmysqlclient$(MYSQL_LIB_VER) RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibmysqlclient-r$(MYSQL_LIB_VER) RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibncursesw5 +RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibz1 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWosslrt CHECKPKG_OVERRIDES_CSW$(NAME)client += bad-rpath-entry +# It's intentional. There's a sparcv8-incompatible assembler code there. +CHECKPKG_OVERRIDES_CSW$(NAME)client_isa-sparcv8plus += binary-architecture-does-not-match-placement +CHECKPKG_OVERRIDES_CSW$(NAME)client += CHECKPKG_OVERRIDES_CSW$(NAME)client_$(ISA) PACKAGES += CSW$(NAME) RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibmysqlclient-r$(MYSQL_LIB_VER) RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibmysqlclient$(MYSQL_LIB_VER) SPKG_DESC_CSW$(NAME) = Multithreaded SQL database RUNTIME_DEP_PKGS_CSW$(NAME) += CSW$(NAME)client +RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibwrap1 RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibz1 RUNTIME_DEP_PKGS_CSW$(NAME) += CSWosslrt -RUNTIME_DEP_PKGS_CSWmysql55 += CSWlibgcc-s1 CHECKPKG_OVERRIDES_CSW$(NAME) += bad-rpath-entry CHECKPKG_OVERRIDES_CSW$(NAME) += file-with-bad-content Added: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0003-WHY-IS-CMAKE-TRYING-TO-BE-SMARTER-THAN-ME.patch =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0003-WHY-IS-CMAKE-TRYING-TO-BE-SMARTER-THAN-ME.patch (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0003-WHY-IS-CMAKE-TRYING-TO-BE-SMARTER-THAN-ME.patch 2011-12-23 19:32:14 UTC (rev 16598) @@ -0,0 +1,28 @@ +From 5d40e65ac43b6b57f53d60a3e2db22a2981dc9ed Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Fri, 23 Dec 2011 20:29:18 +0100 +Subject: [PATCH] WHY IS CMAKE TRYING TO BE SMARTER THAN ME?! + +When I set -R/opt/csw/lib in CPPFLAGS, I do mean -R/opt/csw/lib, how hard is +it to understand? +--- + configure.cmake | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/configure.cmake b/configure.cmake +index c3cc787..15d75dc 100644 +--- a/configure.cmake ++++ b/configure.cmake +@@ -53,6 +53,9 @@ IF(NOT SYSTEM_TYPE) + ENDIF() + ENDIF() + ++# Don't strip runpath as it breaks the binaries that need libraries in ++# /opt/csw/lib. ++set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) + + # Always enable -Wall for gnu C/C++ + IF(CMAKE_COMPILER_IS_GNUCXX) +-- +1.7.6.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 Sun Dec 25 02:52:37 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 25 Dec 2011 01:52:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[16599] csw/mgar/pkg/apache2/branches/fs-rework/ Message-ID: Revision: 16599 http://gar.svn.sourceforge.net/gar/?rev=16599&view=rev Author: bdwalton Date: 2011-12-25 01:52:37 +0000 (Sun, 25 Dec 2011) Log Message: ----------- remove old branch, prepare to restart this effort Removed Paths: ------------- csw/mgar/pkg/apache2/branches/fs-rework/ 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 Dec 27 12:41:02 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 27 Dec 2011 11:41:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[16600] csw/mgar/pkg/gcc4/trunk Message-ID: Revision: 16600 http://gar.svn.sourceforge.net/gar/?rev=16600&view=rev Author: wahwah Date: 2011-12-27 11:41:02 +0000 (Tue, 27 Dec 2011) Log Message: ----------- gcc4/trunk: adding the default RPATH by shipping a custom specs file Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile csw/mgar/pkg/gcc4/trunk/files/0002-default-rpath.diff Added Paths: ----------- csw/mgar/pkg/gcc4/trunk/files/customize_specs.sh Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2011-12-25 01:52:37 UTC (rev 16599) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2011-12-27 11:41:02 UTC (rev 16600) @@ -21,9 +21,6 @@ LIBOBJC = 3 -# Add default RPATH -PATCHFILES = 0002-default-rpath.diff - PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 @@ -521,9 +518,10 @@ ginstall -d -m 755 $(DESTDIR)$(prefix)/$(PKG_VERSION_TOKEN)/bin for b in $(CORE_BINARIES) $(CXX_BINARIES) \ $(FORTRAN_BINARIES) $(JAVA_BINARIES); do \ - gln -v -s ../../bin/$${b}$(PROGRAM_SUFFIX) \ + gln -v -s -f ../../bin/$${b}$(PROGRAM_SUFFIX) \ $(DESTDIR)$(prefix)/$(PKG_VERSION_TOKEN)/bin/$${b}; \ done + bash $(FILEDIR)/customize_specs.sh $(DESTDIR) $(PROGRAM_SUFFIX) $(VERSION) @$(MAKECOOKIE) # We need GNU find as find Modified: csw/mgar/pkg/gcc4/trunk/files/0002-default-rpath.diff =================================================================== --- csw/mgar/pkg/gcc4/trunk/files/0002-default-rpath.diff 2011-12-25 01:52:37 UTC (rev 16599) +++ csw/mgar/pkg/gcc4/trunk/files/0002-default-rpath.diff 2011-12-27 11:41:02 UTC (rev 16600) @@ -1,3 +1,5 @@ +This doesn't quite work the way we want it. We need something that works on +Solaris 9 and 10, for both sparc and intel. --- gcc-4.6.2/gcc/config/i386/sol2-10.h 2011-12-11 00:34:08.341738656 +0100 +++ gcc-4.6.2/gcc/config/i386/sol2-10.h.mod 2011-12-11 00:32:27.545153224 +0100 @@ -131,6 +131,11 @@ Added: csw/mgar/pkg/gcc4/trunk/files/customize_specs.sh =================================================================== --- csw/mgar/pkg/gcc4/trunk/files/customize_specs.sh (rev 0) +++ csw/mgar/pkg/gcc4/trunk/files/customize_specs.sh 2011-12-27 11:41:02 UTC (rev 16600) @@ -0,0 +1,24 @@ +#!/opt/csw/bin/bash + +# This script generates and modifies a GCC specs file which after placing on +# the filesystem will automatically add -R/opt/csw/lib to all gcc/g++ +# invocations. + +set -x +set -e + +DESTDIR=$1 +PROGRAM_SUFFIX=$2 +VERSION=$3 + +# Creating a modified specs file +# In the global modulation, the gcc binary is not there. +gcc_bin="${DESTDIR}/opt/csw/bin/gcc${PROGRAM_SUFFIX}" +if [[ -x "${gcc_bin}" ]]; then + "${gcc_bin}" -dumpspecs > specs + gsed -i \ + -e \ + '/\*lib:/,+1 s+%.*+& %{m64:-R /opt/csw/lib/64 } %{!m64:-R /opt/csw/lib}+' \ + specs + gmv -v specs "$(gfind ${DESTDIR}/opt/csw/lib -name ${VERSION} -type d -print)" +fi Property changes on: csw/mgar/pkg/gcc4/trunk/files/customize_specs.sh ___________________________________________________________________ Added: svn:executable + * 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 Dec 27 13:05:21 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 27 Dec 2011 12:05:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[16601] csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Message-ID: Revision: 16601 http://gar.svn.sourceforge.net/gar/?rev=16601&view=rev Author: wahwah Date: 2011-12-27 12:05:21 +0000 (Tue, 27 Dec 2011) Log Message: ----------- mysql5/branches/mysql-5.5.x: adding arch-related overrides (yes, we build for sparcv8+) Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2011-12-27 11:41:02 UTC (rev 16600) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2011-12-27 12:05:21 UTC (rev 16601) @@ -5,7 +5,11 @@ # If you are involved in packaging MySQL, consider subscribing to the # packagers mailing list: # http://lists.mysql.com/packagers +# +# About building MySQL with cmake: +# http://forge.mysql.com/wiki/Autotools_to_CMake_Transition_Guide + PROJ_NAME = mysql NAME = $(PROJ_NAME)55 BASE_VERSION = 5.5 @@ -56,6 +60,7 @@ PKGFILES_CSWmysql-dev += $(prefix)/include.* PKGFILES_CSWmysql-dev += /opt/csw/include/mysql CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root$(mandir)/man1/mysql_config$(PROGRAM_SUFFIX).1 +CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root$(mandir)/man1/mysql_config.1 ALTERNATIVES_CSWmysql-dev = mysql_dev ALTERNATIVE_mysql_dev = $(bindir)/$(firstword $(CSWmysql-dev_programs)) mysql_dev $(bindir)/$(firstword $(CSWmysql-dev_programs)) $(ALTS_PRIO) ALTERNATIVE_mysql_dev += $(foreach C,$(wordlist 2,$(words $(CSWmysql-dev_programs)),$(CSWmysql-dev_programs)),\ @@ -112,10 +117,13 @@ RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibz1 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWosslrt CHECKPKG_OVERRIDES_CSW$(NAME)client += bad-rpath-entry -# It's intentional. There's a sparcv8-incompatible assembler code there. -CHECKPKG_OVERRIDES_CSW$(NAME)client_isa-sparcv8plus += binary-architecture-does-not-match-placement -CHECKPKG_OVERRIDES_CSW$(NAME)client += CHECKPKG_OVERRIDES_CSW$(NAME)client_$(ISA) +# It's intentional. There's a sparcv8-incompatible assembler code there, so we +# must build for sparcv8+ on Solaris 9. +CHECKPKG_OVERRIDES_CSW$(NAME)client += binary-architecture-does-not-match-placement +CHECKPKG_OVERRIDES_CSW$(NAME) += binary-architecture-does-not-match-placement +CHECKPKG_OVERRIDES_CSWlibmysqlclient18 += binary-architecture-does-not-match-placement + PACKAGES += CSW$(NAME) RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibmysqlclient-r$(MYSQL_LIB_VER) RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibmysqlclient$(MYSQL_LIB_VER) @@ -333,6 +341,7 @@ ln -s libmysqlclient.so.18 libmysqlclient_r.so.18) (cd $(DESTDIR)$(libdir); rm libmysqlclient_r.so.18.0.0; \ ln -s libmysqlclient.so.18.0.0 libmysqlclient_r.so.18.0.0) + # gmv -vf $(DESTDIR)$(mandir)/man1/mysql_config.1 @$(MAKECOOKIE) 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 Tue Dec 27 19:10:18 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 27 Dec 2011 18:10:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[16602] csw/mgar/gar/v2/lib/web Message-ID: Revision: 16602 http://gar.svn.sourceforge.net/gar/?rev=16602&view=rev Author: wahwah Date: 2011-12-27 18:10:18 +0000 (Tue, 27 Dec 2011) Log Message: ----------- An example of processing catalog data in Perl Added Paths: ----------- csw/mgar/gar/v2/lib/web/examples/ csw/mgar/gar/v2/lib/web/examples/catalog_data.pl Added: csw/mgar/gar/v2/lib/web/examples/catalog_data.pl =================================================================== --- csw/mgar/gar/v2/lib/web/examples/catalog_data.pl (rev 0) +++ csw/mgar/gar/v2/lib/web/examples/catalog_data.pl 2011-12-27 18:10:18 UTC (rev 16602) @@ -0,0 +1,22 @@ +#!/usr/bin/env perl +# +# This is a minimal example how to read a process catalog data via the +# REST interface. The idea is that you fetch data from a specific URL, +# which is a JSON representation of a data structure. You decode the +# structure, and you're ready to process it. +# +# In this example, the data structure read is one package catalog. + +use warnings; + +use LWP::Simple; +use JSON; +use Data::Dumper; + +my $url = 'http://buildfarm.opencsw.org/pkgdb/rest/catalogs/unstable/sparc/SunOS5.9/'; +# More URL patterns at: http://buildfarm.opencsw.org/pkgdb/ +my $json_string = get $url; +die "Couldn't get $url" unless defined $json_string; +my $catalog_data = decode_json $json_string; +# You can process the catalog data here. +print Dumper($catalog_data); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Tue Dec 27 19:13:22 2011 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 27 Dec 2011 18:13:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[16603] csw/mgar/pkg/openssl1/trunk Message-ID: Revision: 16603 http://gar.svn.sourceforge.net/gar/?rev=16603&view=rev Author: chninkel Date: 2011-12-27 18:13:22 +0000 (Tue, 27 Dec 2011) Log Message: ----------- openssl1: applied some modifications from openssl Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile csw/mgar/pkg/openssl1/trunk/checkpkg.overrides csw/mgar/pkg/openssl1/trunk/checksums Added Paths: ----------- csw/mgar/pkg/openssl1/trunk/files/block_bad_certificates.patch Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2011-12-27 18:10:18 UTC (rev 16602) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2011-12-27 18:13:22 UTC (rev 16603) @@ -13,7 +13,7 @@ ###### Package information ####### NAME = openssl -VERSION = 1.0.0d +VERSION = 1.0.0e CATEGORIES = lib SONAME=$(shell echo $(VERSION) | tr -d '[a-z]') @@ -25,60 +25,62 @@ as a full-strength general-purpose cryptography library. endef -PACKAGES = CSWlibssl1-0-0 CSWlibssl1-0-0-devel CSWopenssl1-utils +PACKAGES = CSWlibssl1-0-0 CSWlibssl-dev CSWopenssl-utils SPKG_DESC_CSWlibssl1-0-0 = Openssl 1.0 runtime libraries PKGFILES_CSWlibssl1-0-0 = $(libdir).*\.so(\.\d+)* PKGFILES_CSWlibssl1-0-0 += $(prefix)/etc/ssl/private $(prefix)/etc/ssl/certs PKGFILES_CSWlibssl1-0-0 += $(docdir)/libssl1_0_0/.* -RUNTIME_DEP_PKGS_CSWlibssl1-0-0-devel = CSWlibssl1-0-0 -SPKG_DESC_CSWlibssl1-0-0-devel = Openssl 1.0 development support files -PKGFILES_CSWlibssl1-0-0-devel = $(PKGFILES_DEVEL) -PKGFILES_CSWlibssl1-0-0-devel += $(docdir)/libssl1_0_0_devel/.* +RUNTIME_DEP_PKGS_CSWlibssl-dev = CSWlibssl1-0-0 +SPKG_DESC_CSWlibssl-dev = Openssl 1.0 development support files +PKGFILES_CSWlibssl-dev = $(PKGFILES_DEVEL) +PKGFILES_CSWlibssl-dev += $(docdir)/libssl_dev/.* -RUNTIME_DEP_PKGS_CSWopenssl1-utils = CSWlibssl1-0-0 -SPKG_DESC_CSWopenssl1-utils = Openssl 1.0 binaries and related tools -PKGFILES_CSWopenssl1-utils = $(bindir)/[^/]* $(mandir)/man1/.* $(mandir)/man5/.* $(mandir)/man7/.* -PKGFILES_CSWopenssl1-utils += $(prefix)/ssl/misc/.* -PKGFILES_CSWopenssl1-utils += $(prefix)/etc/ssl/openssl\.cnf.* -PKGFILES_CSWopenssl1-utils += $(docdir)/openssl1_utils/.* +RUNTIME_DEP_PKGS_CSWopenssl-utils = CSWlibssl1-0-0 +SPKG_DESC_CSWopenssl-utils = Openssl 1.0 binaries and related tools +PKGFILES_CSWopenssl-utils = $(bindir)/[^/]* $(mandir)/man1/.* $(mandir)/man5/.* $(mandir)/man7/.* +PKGFILES_CSWopenssl-utils += $(prefix)/ssl/misc/.* +PKGFILES_CSWopenssl-utils += $(prefix)/etc/ssl/openssl\.cnf.* +PKGFILES_CSWopenssl-utils += $(docdir)/openssl_utils/.* PRESERVECONF = $(prefix)/etc/ssl/openssl.cnf # We use SUN perl, not the opencsw one -CHECKPKG_OVERRIDES_CSWopenssl1-utils += missing-dependency|CSWperl +#CHECKPKG_OVERRIDES_CSWopenssl-utils += missing-dependency|CSWperl # We ship the .a files in the devel package -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += discouraged-path-in-pkgmap|/opt/csw/lib/libcrypto.a -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += discouraged-path-in-pkgmap|/opt/csw/lib/libssl.a +CHECKPKG_OVERRIDES_CSWlibssl-dev += discouraged-path-in-pkgmap|/opt/csw/lib/libcrypto.a +CHECKPKG_OVERRIDES_CSWlibssl-dev += discouraged-path-in-pkgmap|/opt/csw/lib/libssl.a ifeq ($(GARCH),sparc) -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv8plus+vis/libcrypto.a -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv8plus+vis/libssl.a +CHECKPKG_OVERRIDES_CSWlibssl-dev += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv8plus+vis/libcrypto.a +CHECKPKG_OVERRIDES_CSWlibssl-dev += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv8plus+vis/libssl.a else -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += discouraged-path-in-pkgmap|/opt/csw/lib/pentium_pro/libcrypto.a -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += discouraged-path-in-pkgmap|/opt/csw/lib/pentium_pro/libssl.a -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/libcrypto.a -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/libssl.a +CHECKPKG_OVERRIDES_CSWlibssl-dev += discouraged-path-in-pkgmap|/opt/csw/lib/pentium_pro/libcrypto.a +CHECKPKG_OVERRIDES_CSWlibssl-dev += discouraged-path-in-pkgmap|/opt/csw/lib/pentium_pro/libssl.a +CHECKPKG_OVERRIDES_CSWlibssl-dev += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/libcrypto.a +CHECKPKG_OVERRIDES_CSWlibssl-dev += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/libssl.a endif -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += surplus-dependency|CSWlibssl1-0-0 +#CHECKPKG_OVERRIDES_CSWlibssl-dev += surplus-dependency|CSWlibssl1-0-0 # We do ship libcrypto in libssl package CHECKPKG_OVERRIDES_CSWlibssl1-0-0 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libcrypto.so.1.0.0|soname=libcrypto.so.1.0.0|pkgname=CSWlibssl1-0-0|expected=CSWlibcrypto1-0-0 -CHECKPKG_OVERRIDES_CSWlibssl1-0-0 += shared-lib-pkgname-mismatch|file=opt/csw/lib/pentium_pro/libcrypto.so.1.0.0|soname=libcrypto.so.1.0.0|pkgname=CSWlibssl1-0-0|expected=CSWlibcrypto1-0-0 +#CHECKPKG_OVERRIDES_CSWlibssl1-0-0 += shared-lib-pkgname-mismatch|file=opt/csw/lib/pentium_pro/libcrypto.so.1.0.0|soname=libcrypto.so.1.0.0|pkgname=CSWlibssl1-0-0|expected=CSWlibcrypto1-0-0 CHECKPKG_OVERRIDES_CSWlibssl1-0-0 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libcrypto.so.1.0.0|soname=libcrypto.so.1.0.0|pkgname=CSWlibssl1-0-0|expected=CSWlibcrypto1-0-0 + # References to default path in documentation files, can be safely ignored -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-with-bad-content|/usr/local|root/opt/csw/share/doc/libssl1_0_0_devel/INSTALL -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-with-bad-content|/usr/local|root/opt/csw/share/doc/libssl1_0_0_devel/CHANGES -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-with-bad-content|/usr/local|root/opt/csw/share/doc/libssl1_0_0_devel/FAQ +CHECKPKG_OVERRIDES_CSWlibssl-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/libssl_dev/INSTALL +CHECKPKG_OVERRIDES_CSWlibssl-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/libssl_dev/CHANGES +CHECKPKG_OVERRIDES_CSWlibssl-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/libssl_dev/FAQ CHECKPKG_OVERRIDES_CSWlibssl1-0-0 += file-with-bad-content|/usr/local|root/opt/csw/share/doc/libssl1_0_0/INSTALL CHECKPKG_OVERRIDES_CSWlibssl1-0-0 += file-with-bad-content|/usr/local|root/opt/csw/share/doc/libssl1_0_0/FAQ CHECKPKG_OVERRIDES_CSWlibssl1-0-0 += file-with-bad-content|/usr/local|root/opt/csw/share/doc/libssl1_0_0/CHANGES -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl1_utils/CHANGES -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl1_utils/FAQ -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl1_utils/INSTALL +CHECKPKG_OVERRIDES_CSWopenssl-utils += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl_utils/CHANGES +CHECKPKG_OVERRIDES_CSWopenssl-utils += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl_utils/FAQ +CHECKPKG_OVERRIDES_CSWopenssl-utils += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl_utils/INSTALL +# We have a lot of collision until libssl1.0.0 will replace libssl0.9.8 include checkpkg.overrides ###### Upstream and opencsw files information ####### @@ -104,6 +106,10 @@ # Update openssl.cnf path in man page to follow opencsw standard PATCHFILES += opencsw_paths.patch +# +# Let's always block some compromised CA, whatever the CA configured +# (patchs taken from Debian Package) +PATCHFILES += block_bad_certificates.patch LICENSE = LICENSE @@ -157,6 +163,15 @@ cd $(WORKSRC) && ln -nf Configure configure @$(MAKECOOKIE) +fix-paths: + gsed -i -e 's,/usr/local/ssl/lib,/opt/csw/etc/ssl,' $(PKGROOT)$(mandir)/man1/ca.1 + gsed -i -e 's,/usr/local/ssl,/opt/csw/ssl,' $(PKGROOT)$(bindir)/c_rehash + @$(MAKECOOKIE) + +install-certs: + [ ! -f $(PKGROOT)$(prefix)/ssl/openssl.cnf ] || \ + ginstall -D $(PKGROOT)$(prefix)/ssl/openssl.cnf $(PKGROOT)$(sysconfdir)/ssl/openssl.cnf.CSW + merge-doc: for CATALOGNAME in $(foreach PKG, $(PACKAGES), $(call catalogname,$(PKG))); do \ ginstall -d $(PKGROOT)/$(docdir)/$$CATALOGNAME; \ @@ -165,4 +180,4 @@ done @$(MAKECOOKIE) -post-merge: merge-doc +post-merge: merge-doc install-certs fix-paths Modified: csw/mgar/pkg/openssl1/trunk/checkpkg.overrides =================================================================== --- csw/mgar/pkg/openssl1/trunk/checkpkg.overrides 2011-12-27 18:10:18 UTC (rev 16602) +++ csw/mgar/pkg/openssl1/trunk/checkpkg.overrides 2011-12-27 18:13:22 UTC (rev 16603) @@ -1,1090 +1,1092 @@ -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man1/ripemd160.1|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man1/s_time.1|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man1/enc.1|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man5/x509v3_config.5|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/bin/openssl|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man1/asn1parse.1|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man1/sha1.1|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man1/gendsa.1|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/ssl/misc/c_name|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/ssl/openssl.cnf|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man1/speed.1|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man1/ciphers.1|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man1/sess_id.1|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man1/s_client.1|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man1/pkcs7.1|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man5/config.5|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man1/genrsa.1|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man1/version.1|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man1/dgst.1|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/ssl/misc/CA.sh|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man1/crl2pkcs7.1|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/bin/c_rehash|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/ssl/misc/CA.pl|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man1/req.1|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man1/md5.1|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man1/crl.1|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man1/verify.1|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man1/spkac.1|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/ssl/misc/c_issuer|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man1/ocsp.1|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man1/nseq.1|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man1/mdc2.1|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man1/s_server.1|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man1/rsa.1|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man1/smime.1|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man1/rand.1|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man1/dsa.1|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man1/pkcs8.1|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man1/dhparam.1|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/ssl/misc/c_info|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man1/sha.1|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man1/ecparam.1|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man7/des_modes.7|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man1/pkcs12.1|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man1/passwd.1|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man1/openssl.1|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man1/md4.1|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man1/CA.pl.1|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man1/md2.1|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man1/ca.1|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/ssl/misc/c_hash|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man1/ec.1|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man1/errstr.1|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man1/rsautl.1|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man1/dsaparam.1|CSWopenssl1-utils|CSWosslutils -CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-collision|/opt/csw/share/man/man1/x509.1|CSWopenssl1-utils|CSWosslutils - -CHECKPKG_OVERRIDES_CSWlibssl1-0-0 += file-collision|/opt/csw/ssl/private|CSWlibssl1-0-0|CSWosslrt - -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_eof.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/dh.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/i2d_DSAPrivateKey.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_find_type.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/DSA_size.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_s_bio.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_use_certificate_file.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_get_shutdown.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_DigestInit_ex.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/ERR_peek_error.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_shutdown.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/X509_NAME_get_entry.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/OpenSSL_add_all_algorithms.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_sess_set_new_cb.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/OBJ_obj2txt.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_get_info_callback.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/include/openssl/crypto.h|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/DH_free.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BF_ofb64_encrypt.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/include/openssl/comp.h|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/DSA_free.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/CRYPTO_num_locks.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/include/openssl/objects.h|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_new_file.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_CIPHER_CTX_cipher.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/DES_ede3_cbc_encrypt.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/RSA_free.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_clear.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/i2d_DSA_SIG.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_f_buffer.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BF_decrypt.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/ERR_GET_REASON.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/RSA_print.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/DH_new_method.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_CIPHER_CTX_iv_length.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/include/openssl/conf_api.h|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SMIME_read_PKCS7.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/X509_NAME_get_index_by_NID.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_get_ex_data.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/DH_set_ex_data.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_get_conn_ip.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/lib/pkgconfig/openssl.pc|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_get_verify_mode.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/ERR_clear_error.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_SignInit.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/DES_ede2_cbc_encrypt.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_set_ex_data.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/RSA_verify.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/d2i_509_CRL_fp.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_ctrl_get_write_guarantee.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/lib/amd64/libssl.a|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/DH_generate_parameters.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_use_PrivateKey.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/DH_set_method.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/lh_node_stats_bio.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_get_default_timeout.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_COMP_add_compression_method.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/MD2_Update.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_PKEY_type.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/ecdsa.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_get_cipher_list.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_get_mode.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/ERR_free_strings.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/DSA_sign.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/lib/libcrypto.a|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/hmac.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_load_verify_locations.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/DES_ecb2_encrypt.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/ASN1_STRING_free.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/RSA_PKCS1_SSLeay.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/include/openssl/engine.h|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/bn_div_words.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/DH_set_default_method.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/d2i_X509_bio.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_add_session.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/mdc2.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_sha.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_SealFinal.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/OBJ_cleanup.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_dss.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_mod_mul_reciprocal.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_EncryptFinal.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_MD_CTX_type.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/include/openssl/idea.h|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/include/openssl/rand.h|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/DSA_verify.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_lshift1.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/include/openssl/dsa.h|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_append_filename.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/DH_new.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/include/openssl/x509v3.h|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_push.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_MONT_CTX_set.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_BLINDING_get_flags.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/X509_NAME_add_entry.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/bn_sub_words.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_set_max_cert_list.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_CIPHER_CTX_init.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_get_session.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_sess_accept_good.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/ERR_GET_LIB.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSLeay_version.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_CIPHER_mode.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/include/openssl/ui.h|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/DES_is_weak_key.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSLeay.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/RAND_seed.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_set_mode.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/ASN1_STRING_type_new.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_PKEY_assign_DSA.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_set_tmp_dh_callback.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/DES_ecb_encrypt.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/RSA_sign_ASN1_OCTET_STRING.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_remove_session.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/UI_OpenSSL.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_s_accept.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_CIPHER_CTX_type.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/OBJ_txt2obj.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_PKEY_get1_DH.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/DSAparams_print_fp.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/RSA_new.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/ERR_load_crypto_strings.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/i2d_DHparams.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/d2i_DHparams.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/include/openssl/opensslconf.h|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/lh_node_usage_stats_bio.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_sess_misses.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/MD4.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_check_private_key.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/MD5_Init.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/PKCS7_decrypt.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_set_verify.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_PKEY_get1_RSA.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/include/openssl/err.h|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_ucmp.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_EncryptUpdate.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_BLINDING_get_thread_id.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/ERR_peek_last_error_line_data.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/engine.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/d2i_X509.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_CTX_get.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/UI_add_user_data.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/ERR_load_strings.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/i2d_Netscape_RSA.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/include/openssl/dso.h|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_set_callback_arg.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_CIPHER_block_size.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_mod_word.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/DSA_print.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_set_generate_session_id.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/OBJ_sn2nid.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_CIPHER_CTX_block_size.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_set_bio.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_SESSION_get_ex_data.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/RAND_egd.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/RC4.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/ASN1_STRING_type.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_set_md.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_PKEY_set1_RSA.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/RAND_load_file.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_accept.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_set_session_id_context.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_set_ssl_method.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/OPENSSL_ia32cap.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_BLINDING_set_thread_id.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_get_verify_callback.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/HMAC_Update.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/i2d_X509_bio.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/ERR_peek_error_line.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_set_verify.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/PKCS12_create.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_SESSION_get_ex_new_index.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/DSA_do_verify.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/ERR_peek_last_error.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/d2i_DSA_PUBKEY.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_md_null.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_has_matching_session_id.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_sess_get_get_cb.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_CIPHER_param_to_asn1.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/MD5_Final.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/RSA_get_ex_data.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_get_ex_new_index.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_get_rbio.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_set_max_cert_list.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/X509_NAME_ENTRY_create_by_txt.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/ERR_print_errors.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/RSA_padding_add_SSLv23.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_flush_sessions.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_OpenFinal.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_mod.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_new_buffer_ssl_connect.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_gcd.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_set_generate_session_id.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_bn2dec.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_new_ssl_connect.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_get_cipherbynid.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_debug_callback.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_sess_timeouts.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_set_accept_bios.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_ctrl.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/ERR_get_next_error_library.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_mask_bits.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_MAX_MD_SIZE.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/OpenSSL_add_ssl_algorithms.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_should_io_special.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/RSA_padding_add_PKCS1_type_1.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/bn_mul_normal.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/des_read_pw.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_get_md_ctx.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_use_PrivateKey.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_gets.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_get_mode.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/RSA_flags.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/bn_check_top.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_CIPHER_CTX_key_length.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_set_conn_int_port.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_sub.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/PKCS7_encrypt.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_new_fp.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_get_verify_mode.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/RIPEMD160_Init.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/lh_error.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/evp.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_div.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/include/openssl/krb5_asn.h|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/RSA_print_fp.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/d2i_X509_REQ_fp.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BUF_MEM_grow.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/UI_dup_input_string.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_flush.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/d2i_Netscape_RSA.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/lib/amd64/libcrypto.a|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_set_options.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_rstate_string.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/d2i_PKCS8PrivateKey_fp.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_MD_CTX_md.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/include/openssl/rsa.h|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/bn_mul_low_recursive.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/RSA_blinding_off.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_DecryptFinal.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/i2d_SSL_SESSION.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_new_fd.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_set_tmp_rsa.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/include/openssl/pqueue.h|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/UI_dup_error_string.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/OPENSSL_no_config.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BUF_strdup.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_is_bit_set.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/HMAC_cleanup.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/ASN1_STRING_new.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_next.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_free.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/x509.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/OBJ_nid2obj.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/d2i_DSA_SIG.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_dss1.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/UI_add_input_boolean.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_add_extra_chain_cert.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_BLINDING_free.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/MD2_Final.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/bn_add_words.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_CIPHER_flags.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_BLINDING_update.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_ptr_ctrl.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_set_shutdown.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/RIPEMD160.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_set_cert_verify_callback.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/ASN1_STRING_data.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/MD4_Init.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/RSA_padding_check_PKCS1_OAEP.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_do_connect.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_PKEY_free.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_RECP_CTX_set.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/include/openssl/symhacks.h|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/ERR_get_error_line.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/RSA_new_method.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/d2i_SSL_SESSION.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/DSA_new.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/DES_set_key_checked.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_pending.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_bn2hex.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/OBJ_txt2nid.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/lh_node_stats.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SHA1_Init.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_get_cipher_name.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/ERR_GET_FUNC.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/OBJ_obj2nid.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/lh_free.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/lh_insert.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/bn_set_low.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_load_client_CA_file.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/DES_ecb3_encrypt.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/DSA_set_method.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/OBJ_create.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_s_fd.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_get_conn_port.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_use_RSAPrivateKey.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BF_options.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/RAND_set_rand_method.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_CipherFinal_ex.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_get_cipher_bits.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/include/openssl/e_os2.h|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/lh_delete.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SHA1_Update.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_new_socket.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/CRYPTO_get_new_dynlockid.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_clear_bit.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/ASN1_generate_v3.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_vfree.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_get_ex_new_index.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/PKCS7_verify.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/X509_NAME_entry_count.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_get_ex_data_X509_STORE_CTX_idx.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/bn_mul_words.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_set_callback.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/bn_mul_high.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_set_options.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/bn_set_max.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/include/openssl/txt_db.h|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_mod_add.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_CIPHER_CTX_ctrl.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/RSA_padding_add_PKCS1_type_2.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/DH_get_default_method.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_s_connect.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_use_certificate_ASN1.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_set_fd.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_get_conn_hostname.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_BLINDING_convert_ex.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_want_x509_lookup.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/buffer.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/X509_NAME_add_entry_by_OBJ.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_sess_get_cache_size.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/RSA_private_encrypt.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_mdc2.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_BLINDING_convert.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_DigestUpdate.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_get_fd.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/ASN1_STRING_length_set.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_nnmod.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/include/openssl/sha.h|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_get_verify_callback.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_set_session_id_context.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_set_mem_eof_return.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_destroy_bio_pair.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/DES_set_key_unchecked.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_add_word.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_do_accept.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_get_info_callback.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_use_RSAPrivateKey_file.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_get_fp.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/DES_fcrypt.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CIPHER_get_version.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_set_ssl_renegotiate_bytes.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_mod_inverse.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_PKEY_new.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_get_cipherbyobj.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_get_quiet_shutdown.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/i2d_ASN1_OBJECT.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_set_ssl_version.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/bn_fix_top.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/CRYPTO_get_ex_data.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/i2d_PKCS8PrivateKey_fp.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/DES_string_to_2keys.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/X509_NAME_print.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/DES_ede3_cfb64_encrypt.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSLeay_add_ssl_algorithms.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_rshift1.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/RAND_SSLeay.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_mod_sub.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_get_mem_data.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/i2d_X509_ALGOR.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/DSA_do_sign.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/include/openssl/obj_mac.h|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_sess_get_new_cb.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/include/openssl/pkcs7.h|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/d2i_PKCS8PrivateKey_bio.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/X509_NAME_print_ex.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_MONT_CTX_init.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CIPHER_get_bits.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_get_fd.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/d2i_X509_CRL.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/include/openssl/ecdh.h|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/CRYPTO_destroy_dynlockid.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/bio.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_SealUpdate.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_make_bio_pair.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/ERR_reason_error_string.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/OPENSSL_load_builtin_modules.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_new_mem_buf.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_mod_sqr.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_rstate_string_long.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_get_ciphers.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/lib/pentium_pro/libssl.a|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_set_ssl.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_is_odd.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/ERR_load_UI_strings.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/d2i_X509_SIG.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/i2d_DSAPublicKey.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/ASN1_generate_nconf.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BF_ecb_encrypt.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/DSA_get_ex_new_index.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_should_read.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/bn_set_high.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_sess_accept.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_MD_block_size.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_mod_mul_montgomery.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/DES_crypt.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/i2d_X509_REQ_fp.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_CIPHER_CTX_flags.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_want_write.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_MD_CTX_destroy.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_get_quiet_shutdown.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/include/openssl/cast.h|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/bn_mul_part_recursive.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_MD_CTX_create.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_want.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/X509_NAME_print_ex_fp.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_get_write_buf_size.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/DES_pcbc_encrypt.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/X509_NAME_ENTRY_get_data.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_set_verify_depth.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_get_close.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/des_read_pw_string.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_set_mode.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/bn_expand2.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/DH_get_ex_new_index.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_reset.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/des_read_password.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_use_PrivateKey_ASN1.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/include/openssl/blowfish.h|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/MDC2_Final.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/UI_set_default_method.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_CIPHER_asn1_to_param.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_MD_pkey_type.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_ctrl.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_use_RSAPrivateKey_file.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/X509_new.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_use_certificate_chain_file.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_bin2bn.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/include/openssl/dh.h|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/include/openssl/ec.h|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/UI_get_method.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_dup.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_add_client_CA.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_value_one.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/RSA_null_method.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/RSA_public_encrypt.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/RSA_set_method.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/bn_mul_add_words.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_DecryptUpdate.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_get_options.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/err.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/i2d_X509_fp.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/DES_key_sched.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/include/openssl/ui_compat.h|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/ERR_get_error_line_data.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/threads.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_EncryptFinal_ex.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_MONT_CTX_copy.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_sess_set_cache_size.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_CIPHER_CTX_mode.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_CTX_init.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_new.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_PKEY_assign_DH.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_alert_desc_string_long.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/UI_get0_user_data.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_get_cipher.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_set_quiet_shutdown.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/UI_construct_prompt.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/RC4_set_key.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_CIPHER_CTX_nid.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_ctrl.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/X509_NAME_oneline.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/DSA_SIG_free.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/bn_sqr_normal.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_clear_free.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_SESSION_get_timeout.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/RIPEMD160_Final.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_state_string_long.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_BLINDING_invert_ex.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_use_certificate_ASN1.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/include/openssl/pem.h|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_ctrl_get_read_request.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_mul.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_CIPHER_iv_length.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_set_quiet_shutdown.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_SESSION_set_time.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_get_cipher_status.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/DSA_generate_key.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/include/openssl/pkcs12.h|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_lshift.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_mul_word.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/i2d_PKCS8PrivateKey_nid_bio.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/ssl.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_set_conn_hostname.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_dec2bn.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/RSA_padding_add_none.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/bn_wexpand.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/DES_enc_read.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_get_ssl.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_get_verify_depth.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SHA1_Final.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_BLINDING_invert.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/include/openssl/opensslv.h|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_sessions.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/lh_stats_bio.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/DH_OpenSSL.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_alert_desc_string.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_PKEY_assign_EC_KEY.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_s_socket.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/lib/pkgconfig/libcrypto.pc|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/X509_NAME_add_entry_by_NID.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/RSA_set_default_method.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_sess_cb_hits.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/PKCS7_sign.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_read.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/CRYPTO_set_ex_data.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/include/openssl/buffer.h|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_get_digestbyname.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/RSA_check_key.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_set_accept_port.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BUF_MEM_free.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/i2d_X509_CRL_bio.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_s_null.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/include/openssl/ssl.h|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_exp.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_get_num_renegotiates.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/RAND_bytes.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/include/openssl/ossl_typ.h|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/include/openssl/ebcdic.h|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_should_write.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_use_certificate.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/include/openssl/asn1t.h|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_get_word.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/dsa.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/DES_enc_write.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_rand.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_MD_CTX_copy_ex.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_OpenUpdate.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_need_tmp_rsa.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/DES_xcbc_encrypt.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/i2d_X509_REQ_bio.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_read_filename.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_get_cipher_version.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/UI_new_method.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_MD_CTX_size.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/i2d_RSA_PUBKEY.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/UI_dup_input_boolean.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/OPENSSL_Applink.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/DSA_new_method.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/OBJ_nid2sn.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/bn.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_SESSION_free.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_set_msg_callback_arg.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/ASN1_STRING_set.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/d2i_RSAPrivateKey.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_use_certificate.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/UI_add_verify_string.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_SESSION_set_ex_data.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_get_SSL_CTX.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_get_timeout.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_ctrl_wpending.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_is_one.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_set_ssl_mode.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/CRYPTO_set_dynlock_destroy_callback.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_new.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BF_encrypt.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_set_cipher_list.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/DES_ede3_ofb64_encrypt.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_set_ssl_renegotiate_timeout.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_get_retry_reason.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_set_info_callback.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/bn_internal.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_OpenInit.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_set_msg_callback.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/DH_size.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/RSA_padding_check_none.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/lh_retrieve.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_get_bind_mode.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/include/openssl/asn1_mac.h|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_get_max_cert_list.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/include/openssl/asn1.h|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/d2i_DSAPrivateKey.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/DES_ede2_cfb64_encrypt.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CIPHER_get_name.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/OBJ_nid2ln.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_set_default_passwd_cb_userdata.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/X509_NAME_delete_entry.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_from_montgomery.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_f_cipher.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/CRYPTO_lock.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_rw_filename.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/ERR_func_error_string.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_is_word.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_set_connect_state.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_CIPHER_CTX_get_app_data.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/i2d_X509_CRL.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/RAND_pseudo_bytes.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/RSA_padding_check_PKCS1_type_2.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_s_file.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_set_conn_port.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_set_verify_depth.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_set_bit.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_PKEY_get1_EC_KEY.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_sess_set_get_cb.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_swap.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SMIME_write_PKCS7.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/d2i_RSAPublicKey.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/ERR_lib_error_string.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_free.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/RSA_blinding_on.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_get_peer_certificate.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_DecryptInit.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/i2d_DSA_PUBKEY.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/include/openssl/aes.h|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/include/openssl/ocsp.h|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/include/openssl/kssl.h|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/HMAC_Init.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_get_verify_depth.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/RSA_verify_ASN1_OCTET_STRING.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/DES_cfb64_encrypt.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/X509_NAME_ENTRY_create_by_OBJ.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_get_info_callback.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/include/openssl/ssl23.h|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_f_base64.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/SSL_CTX_sess_hits.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/X509_NAME_add_entry_by_txt.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/ERR_PACK.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/include/openssl/tls1.h|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/lhash.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/EVP_PKEY_assign_RSA.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BN_mpi2bn.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/CONF_modules_load_file.3|CSWlibssl1-0-0-devel|CSWossldevel -CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-collision|/opt/csw/share/man/man3/BIO_ssl_copy_session_id.3|CSWlibssl1-0-0-devel|CSWossldevel @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Dec 28 00:59:38 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 27 Dec 2011 23:59:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[16604] csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Message-ID: Revision: 16604 http://gar.svn.sourceforge.net/gar/?rev=16604&view=rev Author: wahwah Date: 2011-12-27 23:59:38 +0000 (Tue, 27 Dec 2011) Log Message: ----------- mysql5/branches/mysql-5.5.x: dependency fixes, readme file fix Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2011-12-27 18:13:22 UTC (rev 16603) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2011-12-27 23:59:38 UTC (rev 16604) @@ -110,9 +110,9 @@ PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),/opt/csw/bin/$(bin_name)$(PROGRAM_SUFFIX)) PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),/opt/csw/sbin/$(bin_name)$(PROGRAM_SUFFIX)) RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibmysqlclient$(MYSQL_LIB_VER) -RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibmysqlclient-r$(MYSQL_LIB_VER) -RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibncursesw5 +# RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibmysqlclient$(MYSQL_LIB_VER) +# RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibmysqlclient-r$(MYSQL_LIB_VER) +# RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibncursesw5 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibz1 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWosslrt @@ -125,13 +125,13 @@ CHECKPKG_OVERRIDES_CSWlibmysqlclient18 += binary-architecture-does-not-match-placement PACKAGES += CSW$(NAME) -RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibmysqlclient-r$(MYSQL_LIB_VER) -RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibmysqlclient$(MYSQL_LIB_VER) +# RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibmysqlclient-r$(MYSQL_LIB_VER) +# RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibmysqlclient$(MYSQL_LIB_VER) SPKG_DESC_CSW$(NAME) = Multithreaded SQL database RUNTIME_DEP_PKGS_CSW$(NAME) += CSW$(NAME)client RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibstdc++6 -RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibwrap1 +# RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibwrap1 RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibz1 RUNTIME_DEP_PKGS_CSW$(NAME) += CSWosslrt CHECKPKG_OVERRIDES_CSW$(NAME) += bad-rpath-entry @@ -291,8 +291,6 @@ # These are harmless, although it would be nice to clean them up eventually. # Help appreciated? -CHECKPKG_OVERRIDES_CSWmysql51 += file-collision|/opt/csw/share/doc/mysql5devel_stub/README.CSW|CSWmysql5|CSWmysql51 -CHECKPKG_OVERRIDES_CSWmysql51 += file-collision|/opt/csw/share/doc/mysql_dev/README.CSW|CSWmysql5|CSWmysql51 CHECKPKG_OVERRIDES_CSWmysql51 += file-collision|/opt/csw/share/info/mysql.info|CSWmysql5|CSWmysql51 CONFIGURE_SCRIPTS = custom @@ -350,8 +348,8 @@ ginstall -m 644 $(FILEDIR)/ChangeLog $(PKGROOT)$(datadir)/$(NAME)/doc/ChangeLog-$(BASE_VERSION) ginstall -m 644 $(FILEDIR)/README.CSW $(PKGROOT)$(datadir)/$(NAME)/doc/README-$(BASE_VERSION).CSW 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 + gln -sf ../../../$(NAME)/share/$(NAME)/doc/README-$(BASE_VERSION).CSW \ + $(PKGROOT)/opt/csw/share/$(NAME)/doc/README-$(BASE_VERSION).CSW ginstall -m 755 $(FILEDIR)/quick_start-csw $(PKGROOT)$(datadir)/mysql ginstall -m 755 -d $(PKGROOT)$(sysconfdir)/pkg/CSW$(NAME) ginstall -m 644 $(FILEDIR)/cswusergroup \ 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 Dec 28 01:44:19 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 28 Dec 2011 00:44:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[16605] csw/mgar/pkg/mysql5/branches/mysql-5.5.x Message-ID: Revision: 16605 http://gar.svn.sourceforge.net/gar/?rev=16605&view=rev Author: wahwah Date: 2011-12-28 00:44:19 +0000 (Wed, 28 Dec 2011) Log Message: ----------- mysql5/branches/mysql-5.5.x: add an override - shouldn't be necessary, but I'll work it out later Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/README.CSW Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2011-12-27 23:59:38 UTC (rev 16604) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2011-12-28 00:44:19 UTC (rev 16605) @@ -61,6 +61,9 @@ PKGFILES_CSWmysql-dev += /opt/csw/include/mysql CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root$(mandir)/man1/mysql_config$(PROGRAM_SUFFIX).1 CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root$(mandir)/man1/mysql_config.1 +# Not sure why this is necessary. All README.CSW should have a version number +# appended. +CHECKPKG_OVERRIDES_CSWmysql55 += file-collision|/opt/csw/share/doc/mysql_dev/README.CSW|CSWmysql5|CSWmysql55 ALTERNATIVES_CSWmysql-dev = mysql_dev ALTERNATIVE_mysql_dev = $(bindir)/$(firstword $(CSWmysql-dev_programs)) mysql_dev $(bindir)/$(firstword $(CSWmysql-dev_programs)) $(ALTS_PRIO) ALTERNATIVE_mysql_dev += $(foreach C,$(wordlist 2,$(words $(CSWmysql-dev_programs)),$(CSWmysql-dev_programs)),\ Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/README.CSW =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/README.CSW 2011-12-27 23:59:38 UTC (rev 16604) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/README.CSW 2011-12-28 00:44:19 UTC (rev 16605) @@ -1,3 +1,5 @@ +[[needs review]] + MySQL 5.1 OpenCSW package ======================= This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Dec 28 19:14:28 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 28 Dec 2011 18:14:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[16606] csw/mgar/pkg/cswcommon/trunk/Makefile Message-ID: Revision: 16606 http://gar.svn.sourceforge.net/gar/?rev=16606&view=rev Author: bdwalton Date: 2011-12-28 18:14:28 +0000 (Wed, 28 Dec 2011) Log Message: ----------- cswcommon/trunk: small cleanup Modified Paths: -------------- csw/mgar/pkg/cswcommon/trunk/Makefile Modified: csw/mgar/pkg/cswcommon/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswcommon/trunk/Makefile 2011-12-28 00:44:19 UTC (rev 16605) +++ csw/mgar/pkg/cswcommon/trunk/Makefile 2011-12-28 18:14:28 UTC (rev 16606) @@ -4,7 +4,7 @@ # built from a different source. NAME = cswcommon -VERSION = 1.4.6 +VERSION = 1.5 CATEGORIES = utils DESCRIPTION = Installs some useful standard CSW filesystem symlinks and files @@ -13,17 +13,10 @@ #MASTER_SITES = http://mirror.opencsw.org/opencsw/current/$(shell uname -p)/5.8 MASTER_SITES = http://mirror.opencsw.org/opencsw/current/sparc/5.8/ -DISTFILES = common-1.4.6,REV=2008.04.28-SunOS5.8-sparc-CSW.pkg +DISTFILES = common-1.5,REV=2010.12.11-SunOS5.8-sparc-CSW.pkg PACKAGES = common -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = (\d+(?:\.\d+)*).tar.gz - -# If the url used to check for software update is different of MASTER_SITES, then -# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES -# UPSTREAM_MASTER_SITES = - CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Dec 28 19:16:10 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 28 Dec 2011 18:16:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[16607] csw/mgar/pkg/cswcommon/trunk/files Message-ID: Revision: 16607 http://gar.svn.sourceforge.net/gar/?rev=16607&view=rev Author: bdwalton Date: 2011-12-28 18:16:10 +0000 (Wed, 28 Dec 2011) Log Message: ----------- cswcommon/trunk: update stored package and package map Modified Paths: -------------- csw/mgar/pkg/cswcommon/trunk/files/pkgmap Added Paths: ----------- csw/mgar/pkg/cswcommon/trunk/files/common-1.5,REV=2010.12.11-SunOS5.8-i386-CSW.pkg Removed Paths: ------------- csw/mgar/pkg/cswcommon/trunk/files/common-1.4.6,REV=2008.04.28-SunOS5.8-sparc-CSW.pkg Deleted: csw/mgar/pkg/cswcommon/trunk/files/common-1.4.6,REV=2008.04.28-SunOS5.8-sparc-CSW.pkg =================================================================== (Binary files differ) Added: csw/mgar/pkg/cswcommon/trunk/files/common-1.5,REV=2010.12.11-SunOS5.8-i386-CSW.pkg =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/cswcommon/trunk/files/common-1.5,REV=2010.12.11-SunOS5.8-i386-CSW.pkg ___________________________________________________________________ Added: svn:mime-type + application/x-svr4-package Modified: csw/mgar/pkg/cswcommon/trunk/files/pkgmap =================================================================== --- csw/mgar/pkg/cswcommon/trunk/files/pkgmap 2011-12-28 18:14:28 UTC (rev 16606) +++ csw/mgar/pkg/cswcommon/trunk/files/pkgmap 2011-12-28 18:16:10 UTC (rev 16607) @@ -1,27 +1,36 @@ -: 1 164 +: 1 598 1 d none /etc/opt/csw 0755 root bin +1 d none /etc/opt/csw/pkg-hooks 0755 root bin +1 d none /etc/opt/csw/pkg-hooks/postbatchinstall.d 0755 root bin +1 d none /etc/opt/csw/pkg-hooks/postbatchremove.d 0755 root bin +1 d none /etc/opt/csw/pkg-hooks/postbatchupgrade.d 0755 root bin +1 d none /etc/opt/csw/pkg-hooks/postinstall.d 0755 root bin +1 d none /etc/opt/csw/pkg-hooks/postremove.d 0755 root bin +1 d none /etc/opt/csw/pkg-hooks/postupgrade.d 0755 root bin +1 d none /etc/opt/csw/pkg-hooks/prebatchinstall.d 0755 root bin +1 d none /etc/opt/csw/pkg-hooks/prebatchremove.d 0755 root bin +1 d none /etc/opt/csw/pkg-hooks/prebatchupgrade.d 0755 root bin +1 d none /etc/opt/csw/pkg-hooks/preinstall.d 0755 root bin +1 d none /etc/opt/csw/pkg-hooks/preremove.d 0755 root bin +1 d none /etc/opt/csw/pkg-hooks/preupgrade.d 0755 root bin 1 d none /opt/csw 0755 root bin 1 d none /opt/csw/bin 0755 root bin -1 s none /opt/csw/bin/sparc=sparcv8 -1 d none /opt/csw/bin/sparcv8 0755 root bin -1 d none /opt/csw/bin/sparcv8plus 0755 root bin -1 d none /opt/csw/bin/sparcv8plus+vis 0755 root bin -1 d none /opt/csw/bin/sparcv9 0755 root bin +1 d none /opt/csw/bin/amd64 0755 root bin +1 d none /opt/csw/bin/i486 0755 root bin +1 d none /opt/csw/bin/pentium 0755 root bin 1 s none /opt/csw/doc=share/doc 1 d none /opt/csw/etc 0755 root bin 1 d none /opt/csw/include 0755 root bin 1 s none /opt/csw/info=share/info 1 d none /opt/csw/lib 0755 root bin 1 s none /opt/csw/lib/32=. -1 s none /opt/csw/lib/64=sparcv9 +1 s none /opt/csw/lib/64=amd64 1 d none /opt/csw/lib/X11 0755 root bin 1 d none /opt/csw/lib/X11/app-defaults 0755 root bin +1 d none /opt/csw/lib/amd64 0755 root bin +1 s none /opt/csw/lib/i386=. 1 s none /opt/csw/lib/locale=../share/locale -1 s none /opt/csw/lib/sparc=. -1 s none /opt/csw/lib/sparcv8=. -1 d none /opt/csw/lib/sparcv8plus 0755 root bin -1 d none /opt/csw/lib/sparcv8plus+vis 0755 root bin -1 d none /opt/csw/lib/sparcv9 0755 root bin +1 d none /opt/csw/lib/pentium 0755 root bin 1 s none /opt/csw/man=share/man 1 d none /opt/csw/sbin 0755 root bin 1 d none /opt/csw/share 0755 root bin @@ -34,28 +43,22 @@ 1 d none /opt/csw/share/locale/be/LC_MESSAGES 0755 root bin 1 d none /opt/csw/share/locale/bg 0755 root bin 1 d none /opt/csw/share/locale/bg/LC_MESSAGES 0755 root bin -1 s none /opt/csw/share/locale/bg/LC_TIME=LC_MESSAGES 1 d none /opt/csw/share/locale/ca 0755 root bin 1 d none /opt/csw/share/locale/ca/LC_MESSAGES 0755 root bin 1 d none /opt/csw/share/locale/cs 0755 root bin 1 d none /opt/csw/share/locale/cs/LC_MESSAGES 0755 root bin -1 s none /opt/csw/share/locale/cs/LC_TIME=LC_MESSAGES 1 d none /opt/csw/share/locale/da 0755 root bin 1 d none /opt/csw/share/locale/da/LC_MESSAGES 0755 root bin -1 s none /opt/csw/share/locale/da/LC_TIME=LC_MESSAGES 1 d none /opt/csw/share/locale/de 0755 root bin 1 d none /opt/csw/share/locale/de/LC_MESSAGES 0755 root bin -1 s none /opt/csw/share/locale/de/LC_TIME=LC_MESSAGES 1 d none /opt/csw/share/locale/el 0755 root bin 1 d none /opt/csw/share/locale/el/LC_MESSAGES 0755 root bin -1 s none /opt/csw/share/locale/el/LC_TIME=LC_MESSAGES 1 d none /opt/csw/share/locale/en at boldquot 0755 root bin 1 d none /opt/csw/share/locale/en at boldquot/LC_MESSAGES 0755 root bin 1 d none /opt/csw/share/locale/en at quot 0755 root bin 1 d none /opt/csw/share/locale/en at quot/LC_MESSAGES 0755 root bin 1 d none /opt/csw/share/locale/es 0755 root bin 1 d none /opt/csw/share/locale/es/LC_MESSAGES 0755 root bin -1 s none /opt/csw/share/locale/es/LC_TIME=LC_MESSAGES 1 d none /opt/csw/share/locale/et 0755 root bin 1 d none /opt/csw/share/locale/et/LC_MESSAGES 0755 root bin 1 d none /opt/csw/share/locale/eu 0755 root bin @@ -64,12 +67,10 @@ 1 d none /opt/csw/share/locale/fi/LC_MESSAGES 0755 root bin 1 d none /opt/csw/share/locale/fr 0755 root bin 1 d none /opt/csw/share/locale/fr/LC_MESSAGES 0755 root bin -1 s none /opt/csw/share/locale/fr/LC_TIME=LC_MESSAGES 1 d none /opt/csw/share/locale/ga 0755 root bin 1 d none /opt/csw/share/locale/ga/LC_MESSAGES 0755 root bin 1 d none /opt/csw/share/locale/gl 0755 root bin 1 d none /opt/csw/share/locale/gl/LC_MESSAGES 0755 root bin -1 s none /opt/csw/share/locale/gl/LC_TIME=LC_MESSAGES 1 d none /opt/csw/share/locale/he 0755 root bin 1 d none /opt/csw/share/locale/he/LC_MESSAGES 0755 root bin 1 d none /opt/csw/share/locale/hr 0755 root bin @@ -80,51 +81,39 @@ 1 d none /opt/csw/share/locale/id/LC_MESSAGES 0755 root bin 1 d none /opt/csw/share/locale/it 0755 root bin 1 d none /opt/csw/share/locale/it/LC_MESSAGES 0755 root bin -1 s none /opt/csw/share/locale/it/LC_TIME=LC_MESSAGES 1 d none /opt/csw/share/locale/ja 0755 root bin 1 d none /opt/csw/share/locale/ja/LC_MESSAGES 0755 root bin -1 s none /opt/csw/share/locale/ja/LC_TIME=LC_MESSAGES 1 d none /opt/csw/share/locale/ko 0755 root bin 1 d none /opt/csw/share/locale/ko/LC_MESSAGES 0755 root bin -1 s none /opt/csw/share/locale/ko/LC_TIME=LC_MESSAGES 1 f none /opt/csw/share/locale/locale.alias 0644 root bin 2676 12726 1083469567 1 d none /opt/csw/share/locale/lt 0755 root bin 1 d none /opt/csw/share/locale/lt/LC_MESSAGES 0755 root bin 1 d none /opt/csw/share/locale/nl 0755 root bin 1 d none /opt/csw/share/locale/nl/LC_MESSAGES 0755 root bin -1 s none /opt/csw/share/locale/nl/LC_TIME=LC_MESSAGES 1 d none /opt/csw/share/locale/nn 0755 root bin 1 d none /opt/csw/share/locale/nn/LC_MESSAGES 0755 root bin 1 d none /opt/csw/share/locale/no 0755 root bin 1 d none /opt/csw/share/locale/no/LC_MESSAGES 0755 root bin -1 s none /opt/csw/share/locale/no/LC_TIME=LC_MESSAGES 1 d none /opt/csw/share/locale/pl 0755 root bin 1 d none /opt/csw/share/locale/pl/LC_MESSAGES 0755 root bin -1 s none /opt/csw/share/locale/pl/LC_TIME=LC_MESSAGES 1 d none /opt/csw/share/locale/pt 0755 root bin 1 d none /opt/csw/share/locale/pt/LC_MESSAGES 0755 root bin -1 s none /opt/csw/share/locale/pt/LC_TIME=LC_MESSAGES 1 d none /opt/csw/share/locale/pt_BR 0755 root bin 1 d none /opt/csw/share/locale/pt_BR/LC_MESSAGES 0755 root bin -1 s none /opt/csw/share/locale/pt_BR/LC_TIME=LC_MESSAGES 1 d none /opt/csw/share/locale/ro 0755 root bin 1 d none /opt/csw/share/locale/ro/LC_MESSAGES 0755 root bin 1 d none /opt/csw/share/locale/ru 0755 root bin 1 d none /opt/csw/share/locale/ru/LC_MESSAGES 0755 root bin -1 s none /opt/csw/share/locale/ru/LC_TIME=LC_MESSAGES 1 d none /opt/csw/share/locale/sk 0755 root bin 1 d none /opt/csw/share/locale/sk/LC_MESSAGES 0755 root bin -1 s none /opt/csw/share/locale/sk/LC_TIME=LC_MESSAGES 1 d none /opt/csw/share/locale/sl 0755 root bin 1 d none /opt/csw/share/locale/sl/LC_MESSAGES 0755 root bin -1 s none /opt/csw/share/locale/sl/LC_TIME=LC_MESSAGES 1 d none /opt/csw/share/locale/sp 0755 root bin 1 d none /opt/csw/share/locale/sp/LC_MESSAGES 0755 root bin 1 d none /opt/csw/share/locale/sr 0755 root bin 1 d none /opt/csw/share/locale/sr/LC_MESSAGES 0755 root bin 1 d none /opt/csw/share/locale/sv 0755 root bin 1 d none /opt/csw/share/locale/sv/LC_MESSAGES 0755 root bin -1 s none /opt/csw/share/locale/sv/LC_TIME=LC_MESSAGES 1 d none /opt/csw/share/locale/tr 0755 root bin 1 d none /opt/csw/share/locale/tr/LC_MESSAGES 0755 root bin 1 d none /opt/csw/share/locale/uk 0755 root bin @@ -135,7 +124,6 @@ 1 d none /opt/csw/share/locale/wa/LC_MESSAGES 0755 root bin 1 d none /opt/csw/share/locale/zh 0755 root bin 1 d none /opt/csw/share/locale/zh/LC_MESSAGES 0755 root bin -1 s none /opt/csw/share/locale/zh/LC_TIME=LC_MESSAGES 1 d none /opt/csw/share/locale/zh_CN 0755 root bin 1 d none /opt/csw/share/locale/zh_CN.GB2312 0755 root bin 1 d none /opt/csw/share/locale/zh_CN.GB2312/LC_MESSAGES 0755 root bin @@ -146,5 +134,6 @@ 1 d none /opt/csw/share/man 0755 root bin 1 d none /opt/csw/var 0755 root bin 1 d none /var/opt/csw 0755 root bin +1 d none /var/opt/csw/pkg-hooks 0755 root bin 1 i checkinstall 2162 37599 1137116436 -1 i pkginfo 382 32403 1224265997 +1 i pkginfo 374 31461 1292086087 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Dec 28 19:53:31 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 28 Dec 2011 18:53:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[16608] csw/mgar/pkg/cswcommon/trunk/files Message-ID: Revision: 16608 http://gar.svn.sourceforge.net/gar/?rev=16608&view=rev Author: bdwalton Date: 2011-12-28 18:53:31 +0000 (Wed, 28 Dec 2011) Log Message: ----------- cswcommon/trunk: replace old (partial) map2dirlist script with a new script that can generate shell script to create the dir/symlink entries in the pkgmap Added Paths: ----------- csw/mgar/pkg/cswcommon/trunk/files/map2dirstructure Removed Paths: ------------- csw/mgar/pkg/cswcommon/trunk/files/map2dirlist Deleted: csw/mgar/pkg/cswcommon/trunk/files/map2dirlist =================================================================== --- csw/mgar/pkg/cswcommon/trunk/files/map2dirlist 2011-12-28 18:16:10 UTC (rev 16607) +++ csw/mgar/pkg/cswcommon/trunk/files/map2dirlist 2011-12-28 18:53:31 UTC (rev 16608) @@ -1,8 +0,0 @@ -#!/usr/bin/perl - -open F, "pkgmap"; -while( ) { - chomp; - my @l = split /\s+/; - -} Added: csw/mgar/pkg/cswcommon/trunk/files/map2dirstructure =================================================================== --- csw/mgar/pkg/cswcommon/trunk/files/map2dirstructure (rev 0) +++ csw/mgar/pkg/cswcommon/trunk/files/map2dirstructure 2011-12-28 18:53:31 UTC (rev 16608) @@ -0,0 +1,35 @@ +#!/opt/csw/bin/ruby + +puts "set -x" +puts "set -e" + +puts "gmkdir CSWcommon" +puts "cd CSWcommon" + +File.open('pkgmap') do |pkgmap| + pkgmap.each_line do |line| + parts = line.split(/\s+/) + # skip over administrative entries + next unless %w(d s f).include?(parts[1]) + + case parts[1] + when 'd' + reldir = parts[3].sub(/^\//, '') + puts "[ -d \"#{reldir}\" ] || gmkdir -m 0755 -p #{reldir}" + when 's' + # we make the assumption that all symlinks in CSWcommon are to + # (relative) directories + (link, target) = parts[3].split(/=/) + link.sub!(/^\//, '') + parent = File.dirname(link) + linkname = File.basename(link) + puts "[ -d \"#{parent}\" ] || gmkdir -m 0755 -p #{parent}" + puts "pushd #{parent}" + puts "[ -d \"#{target}\" ] || gmkdir -m 0755 -p #{target}" + puts "gln -s #{target} #{linkname}" + puts "popd" + else + puts "echo \"Skipping #{parts[3]} (type: #{parts[1]}).\"" + end + end +end Property changes on: csw/mgar/pkg/cswcommon/trunk/files/map2dirstructure ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Dec 28 23:09:00 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 28 Dec 2011 22:09:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[16609] csw/mgar/pkg/parallel/trunk Message-ID: Revision: 16609 http://gar.svn.sourceforge.net/gar/?rev=16609&view=rev Author: dmichelsen Date: 2011-12-28 22:09:00 +0000 (Wed, 28 Dec 2011) Log Message: ----------- parallel/trunk: Update to 20111222 and use reinplacement Modified Paths: -------------- csw/mgar/pkg/parallel/trunk/Makefile csw/mgar/pkg/parallel/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/parallel/trunk/ Property changes on: csw/mgar/pkg/parallel/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/parallel/trunk/Makefile =================================================================== --- csw/mgar/pkg/parallel/trunk/Makefile 2011-12-28 18:53:31 UTC (rev 16608) +++ csw/mgar/pkg/parallel/trunk/Makefile 2011-12-28 22:09:00 UTC (rev 16609) @@ -1,6 +1,6 @@ # $Id$ NAME = parallel -VERSION = 20111022 +VERSION = 20111222 CATEGORIES = utils DESCRIPTION = Shell tool for executing jobs in parallel @@ -22,6 +22,13 @@ ARCHALL = 1 +REINPLACE_MATCH = \#!/usr/bin/perl +REINPLACE_WITH = \#!/opt/csw/bin/perl +REINPLACE_FILES += src/niceload +REINPLACE_FILES += src/parallel +REINPLACE_FILES += src/sem +REINPLACE_FILES += src/sql + EXTRA_COMMON_EXPORTS = HOME # Some idioms are used that the system Perl doesn't have @@ -31,9 +38,6 @@ # This references a special ssh like /usr/local/bin/myssh CHECKPKG_OVERRIDES_CSWparallel += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/parallel.1 +CHECKPKG_OVERRIDES_CSWparallel += file-with-bad-content|/usr/local|root/opt/csw/share/doc/parallel/parallel.html include gar/category.mk - -post-extract-modulated: - -cd $(WORKSRC)/src && perl -pi -e 's,#!/usr/bin/perl,#!/opt/csw/bin/perl,' niceload parallel sem sql - @$(MAKECOOKIE) Modified: csw/mgar/pkg/parallel/trunk/checksums =================================================================== --- csw/mgar/pkg/parallel/trunk/checksums 2011-12-28 18:53:31 UTC (rev 16608) +++ csw/mgar/pkg/parallel/trunk/checksums 2011-12-28 22:09:00 UTC (rev 16609) @@ -1 +1 @@ -ed5710d204fe8981ba44f771af72955b parallel-20111022.tar.bz2 +cddba502666d4c6658a59060fed854f3 parallel-20111222.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Dec 28 23:13:00 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 28 Dec 2011 22:13:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[16610] csw/mgar/pkg/haproxy/trunk Message-ID: Revision: 16610 http://gar.svn.sourceforge.net/gar/?rev=16610&view=rev Author: dmichelsen Date: 2011-12-28 22:13:00 +0000 (Wed, 28 Dec 2011) Log Message: ----------- haproxy/trunk: Update to 1.4.18, add 64 bit Modified Paths: -------------- csw/mgar/pkg/haproxy/trunk/Makefile csw/mgar/pkg/haproxy/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/haproxy/trunk/ Property changes on: csw/mgar/pkg/haproxy/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/haproxy/trunk/Makefile =================================================================== --- csw/mgar/pkg/haproxy/trunk/Makefile 2011-12-28 22:09:00 UTC (rev 16609) +++ csw/mgar/pkg/haproxy/trunk/Makefile 2011-12-28 22:13:00 UTC (rev 16610) @@ -6,7 +6,7 @@ # * Use the shipped Makefile optimization flags # NAME = haproxy -VERSION = 1.4.15 +VERSION = 1.4.18 CATEGORIES = apps DESCRIPTION = Reliable, high performance TCP/HTTP load balancer @@ -22,15 +22,17 @@ endef MASTER_SITES = http://haproxy.1wt.eu/download/1.4/src/ -DISTFILES = $(DISTNAME).tar.gz +DISTFILES += $(DISTNAME).tar.gz -VENDOR_URL = http://haproxy.1wt.eu/ +VENDOR_URL = http://haproxy.1wt.eu/ LICENSE = LICENSE # Heavily optimized, supported for gcc, didn't dare to touch GARCOMPILER = GCC4 +BUILD64 = 1 +ISAEXEC = 1 CONFIGURE_SCRIPTS = TEST_SCRIPTS = @@ -42,6 +44,7 @@ INSTALL_ARGS = \ PREFIX=$(prefix) \ + SBINDIR=$(sbindir) \ DOCDIR=$(docdir)/$(NAME) # Don't care for now, investigate later! Modified: csw/mgar/pkg/haproxy/trunk/checksums =================================================================== --- csw/mgar/pkg/haproxy/trunk/checksums 2011-12-28 22:09:00 UTC (rev 16609) +++ csw/mgar/pkg/haproxy/trunk/checksums 2011-12-28 22:13:00 UTC (rev 16610) @@ -1 +1 @@ -c1b4fc6028c6d8e23dde8c91ff47eabe haproxy-1.4.15.tar.gz +4ac88bb1a76c4b84ed4f6131183bedbe haproxy-1.4.18.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 Dec 28 23:36:46 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 28 Dec 2011 22:36:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[16611] csw/mgar/pkg/haproxy/trunk/Makefile Message-ID: Revision: 16611 http://gar.svn.sourceforge.net/gar/?rev=16611&view=rev Author: dmichelsen Date: 2011-12-28 22:36:46 +0000 (Wed, 28 Dec 2011) Log Message: ----------- haproxy/trunk: Some more updated for 64 bit Modified Paths: -------------- csw/mgar/pkg/haproxy/trunk/Makefile Modified: csw/mgar/pkg/haproxy/trunk/Makefile =================================================================== --- csw/mgar/pkg/haproxy/trunk/Makefile 2011-12-28 22:13:00 UTC (rev 16610) +++ csw/mgar/pkg/haproxy/trunk/Makefile 2011-12-28 22:36:46 UTC (rev 16611) @@ -28,6 +28,17 @@ LICENSE = LICENSE +# Don't care for now, investigate later! +CHECKPKG_OVERRIDES_CSWhaproxy += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/haproxy.1 +CHECKPKG_OVERRIDES_CSWhaproxy += file-with-bad-content|/usr/share|root/opt/csw/share/doc/haproxy/haproxy.1 +CHECKPKG_OVERRIDES_CSWhaproxy += file-with-bad-content|/usr/share|root/opt/csw/share/doc/haproxy/examples/build.cfg +CHECKPKG_OVERRIDES_CSWhaproxy += file-with-bad-content|/usr/share|root/opt/csw/share/doc/haproxy/examples/haproxy.cfg +CHECKPKG_OVERRIDES_CSWhaproxy += file-with-bad-content|/usr/share|root/opt/csw/share/doc/haproxy/examples/haproxy-1.1.21-flx.1.pkg + +# This is in fact ok for libcrypt.so +CHECKPKG_OVERRIDES_CSWhaproxy += bad-rpath-entry|/usr/lib/$$ISALIST|opt/csw/sbin/sparcv9/haproxy +CHECKPKG_OVERRIDES_CSWhaproxy += bad-rpath-entry|/usr/lib/$$ISALIST|opt/csw/sbin/amd64/haproxy + # Heavily optimized, supported for gcc, didn't dare to touch GARCOMPILER = GCC4 @@ -36,6 +47,9 @@ CONFIGURE_SCRIPTS = TEST_SCRIPTS = +# We specifically need /usr/lib/64 +EXTRA_LIB += /usr/lib + BUILD_ARGS = \ TARGET=solaris \ CC=$(CC) \ @@ -47,13 +61,6 @@ SBINDIR=$(sbindir) \ DOCDIR=$(docdir)/$(NAME) -# Don't care for now, investigate later! -CHECKPKG_OVERRIDES_CSWhaproxy += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/haproxy.1 -CHECKPKG_OVERRIDES_CSWhaproxy += file-with-bad-content|/usr/share|root/opt/csw/share/doc/haproxy/haproxy.1 -CHECKPKG_OVERRIDES_CSWhaproxy += file-with-bad-content|/usr/share|root/opt/csw/share/doc/haproxy/examples/build.cfg -CHECKPKG_OVERRIDES_CSWhaproxy += file-with-bad-content|/usr/share|root/opt/csw/share/doc/haproxy/examples/haproxy.cfg -CHECKPKG_OVERRIDES_CSWhaproxy += file-with-bad-content|/usr/share|root/opt/csw/share/doc/haproxy/examples/haproxy-1.1.21-flx.1.pkg - include gar/category.mk # Makefile contains references to install This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Dec 28 23:40:48 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 28 Dec 2011 22:40:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[16612] csw/mgar/pkg/tin/trunk Message-ID: Revision: 16612 http://gar.svn.sourceforge.net/gar/?rev=16612&view=rev Author: dmichelsen Date: 2011-12-28 22:40:48 +0000 (Wed, 28 Dec 2011) Log Message: ----------- tin/trunk: Update to 2.0.1, lots of path updates and cleanup Modified Paths: -------------- csw/mgar/pkg/tin/trunk/Makefile csw/mgar/pkg/tin/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/tin/trunk/ Property changes on: csw/mgar/pkg/tin/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/tin/trunk/Makefile =================================================================== --- csw/mgar/pkg/tin/trunk/Makefile 2011-12-28 22:36:46 UTC (rev 16611) +++ csw/mgar/pkg/tin/trunk/Makefile 2011-12-28 22:40:48 UTC (rev 16612) @@ -1,5 +1,5 @@ NAME = tin -VERSION = 2.0.0 +VERSION = 2.0.1 CATEGORIES = net DESCRIPTION = Terminal-based news reader @@ -20,19 +20,70 @@ BUILD_DEP_PKGS += CSWlibicu-dev BUILD_DEP_PKGS += CSWlibiconv-dev BUILD_DEP_PKGS += CSWlibncurses-dev -BUILD_DEP_PKGS += CSWgsasl-dev +BUILD_DEP_PKGS += CSWlibgsasl-dev RUNTIME_DEP_PKGS_CSWtin += CSWperl RUNTIME_DEP_PKGS_CSWtin += CSWlibpcre0 RUNTIME_DEP_PKGS_CSWtin += CSWlibintl8 RUNTIME_DEP_PKGS_CSWtin += CSWlibidn11 -RUNTIME_DEP_PKGS_CSWtin += CSWlibicu46 +RUNTIME_DEP_PKGS_CSWtin += CSWlibicuuc48 RUNTIME_DEP_PKGS_CSWtin += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWtin += CSWlibncursesw5 RUNTIME_DEP_PKGS_CSWtin += CSWlibgsasl7 VENDOR_URL = http://www.tin.org/ +# Old default is +# #define TIN_DEFAULTS_BUILTIN "/etc/opt/tin","/etc/tin","/etc","/usr/local/lib/tin","/usr/local/lib","/usr/local/etc/tin","/usr/local/etc","/usr/lib/tin","/usr/lib",NULL +REINPLACEMENTS += tin_defaults_builtin +REINPLACE_MATCH_tin_defaults_builtin = (\#define\s+TIN_DEFAULTS_BUILTIN\s+).* +REINPLACE_WITH_tin_defaults_builtin = $$1 "/etc/opt/csw/tin","/opt/csw/etc/tin",NULL +REINPLACE_FILES_tin_defaults_builtin += include/tin.h + +MAILCAP_PATH = ~/.mailcap:/etc/opt/csw/mailcap:/opt/csw/etc/mailcap +NEWS_PATH = /var/opt/csw/spool/news + +# Old default is +# ./src/rfc1524.c:#define DEFAULT_MAILCAPS "~/.mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap:/etc/mail/mailcap" +REINPLACEMENTS += default_mailcaps +REINPLACE_MATCH_default_mailcaps = (\#define\s+DEFAULT_MAILCAPS\s+).* +REINPLACE_WITH_default_mailcaps = $$1 "$(MAILCAP_PATH)" +REINPLACE_FILES_default_mailcaps += src/rfc1524.c + +# These need to be adjusted: + +# unstable9s% strings work/solaris9-sparc/pkgroot/opt/csw/share/man/man1/tin.1 | grep /usr/local +# 30 6 * * * /usr/local/bin/tin \-u +# .IR /usr/local/etc/mailcap +# .IR /usr/local/share/locale/${LC_MESSAGES}/LC_MESSAGES/tin.mo + +# unstable9s% strings work/solaris9-sparc/pkgroot/opt/csw/share/man/man5/tin.5 | grep /usr/local +# .IR /usr/local/etc/mailcap +# \fI/usr/lib/news\fR, \fI/var/lib/news\fR, \fI/usr/local/lib/news\fR or +# .IR /usr/local/share/locale/$LC_MESSAGES/LC_MESSAGES/tin.mo + +REINPLACEMENTS += tindir +REINPLACE_MATCH_tindir = /usr/local/bin/tin +REINPLACE_WITH_tindir = $(bindir)/tin +REINPLACE_FILES_tindir += doc/tin.1 + +REINPLACEMENTS += mailcap +REINPLACE_MATCH_mailcap = /usr/local/etc/mailcap +REINPLACE_WITH_mailcap = $(MAILCAP_PATH) +REINPLACE_FILES_mailcap += doc/tin.1 +REINPLACE_FILES_mailcap += doc/tin.5 + +REINPLACEMENTS += locale +REINPLACE_MATCH_locale = /usr/local/share/locale +REINPLACE_WITH_locale = $(sharedstatedir)/locale +REINPLACE_FILES_locale += doc/tin.1 +REINPLACE_FILES_locale += doc/tin.5 + +REINPLACEMENTS += news_path +REINPLACE_MATCH_news_path = \\fI/usr/lib/news.*news\\fR +REINPLACE_WITH_news_path = \\fI$(NEWS_PATH)\\fR +REINPLACE_FILES_news_path += doc/tin.5 + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-coffee CONFIGURE_ARGS += --enable-ipv6 @@ -42,13 +93,13 @@ CONFIGURE_ARGS += --x-libraries=/usr/openwin/lib CONFIGURE_ARGS += --with-x --with-Xaw3d CONFIGURE_ARGS += --with-libdir=$(libdir)/news -CONFIGURE_ARGS += --with-spooldir=/var/opt/csw/spool/news +CONFIGURE_ARGS += --with-spooldir=$(NEWS_PATH) # tin requires to run 'make build' BUILD_ARGS = build # tin doesn't have a test target -TEST_TARGET = +TEST_SCRIPTS = # These are provided by CSWmutt-base EXTRA_MERGE_EXCLUDE_FILES += $(mandir)/man5/mmdf\.5 @@ -56,7 +107,6 @@ include gar/category.mk -#post-install-modulated: -# /usr/ccs/bin/strip $(DESTDIR)$(prefix)/bin/tin -# /usr/ccs/bin/mcs -d $(DESTDIR)$(prefix)/bin/tin - +post-extract-modulated: + @# This is most certainly an upstream typo + -cp po/Makefile.inn po/Makefile.in Modified: csw/mgar/pkg/tin/trunk/checksums =================================================================== --- csw/mgar/pkg/tin/trunk/checksums 2011-12-28 22:36:46 UTC (rev 16611) +++ csw/mgar/pkg/tin/trunk/checksums 2011-12-28 22:40:48 UTC (rev 16612) @@ -1 +1 @@ -b4072dc8004a7e5ee7dd16c887ffa09c tin-2.0.0.tar.bz2 +e61837b8559e7cdbc35bc11f15c3b7ce tin-2.0.1.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Dec 29 00:05:00 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 28 Dec 2011 23:05:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[16613] csw/mgar/pkg/haproxy/trunk/Makefile Message-ID: Revision: 16613 http://gar.svn.sourceforge.net/gar/?rev=16613&view=rev Author: dmichelsen Date: 2011-12-28 23:04:59 +0000 (Wed, 28 Dec 2011) Log Message: ----------- haproxy/trunk: Add overrides for strange Solaris-shipped lib Modified Paths: -------------- csw/mgar/pkg/haproxy/trunk/Makefile Modified: csw/mgar/pkg/haproxy/trunk/Makefile =================================================================== --- csw/mgar/pkg/haproxy/trunk/Makefile 2011-12-28 22:40:48 UTC (rev 16612) +++ csw/mgar/pkg/haproxy/trunk/Makefile 2011-12-28 23:04:59 UTC (rev 16613) @@ -4,6 +4,9 @@ # ! Include init script # ! Include default configuration # * Use the shipped Makefile optimization flags +# * For some obscure reason this link is missing on unstable10x: +# lrwxrwxrwx 1 root root 13 Dec 28 23:53 /usr/lib/64/libcrypt.so -> libcrypt_d.so +# I added this link manually for now, investigate later! # NAME = haproxy VERSION = 1.4.18 @@ -35,9 +38,9 @@ CHECKPKG_OVERRIDES_CSWhaproxy += file-with-bad-content|/usr/share|root/opt/csw/share/doc/haproxy/examples/haproxy.cfg CHECKPKG_OVERRIDES_CSWhaproxy += file-with-bad-content|/usr/share|root/opt/csw/share/doc/haproxy/examples/haproxy-1.1.21-flx.1.pkg -# This is in fact ok for libcrypt.so -CHECKPKG_OVERRIDES_CSWhaproxy += bad-rpath-entry|/usr/lib/$$ISALIST|opt/csw/sbin/sparcv9/haproxy -CHECKPKG_OVERRIDES_CSWhaproxy += bad-rpath-entry|/usr/lib/$$ISALIST|opt/csw/sbin/amd64/haproxy +# This is cross-linked, but not correctly added to the package database +# /usr/lib/abi/abi_libcrypt_d.so.1 f none 0755 root bin 37708 45322 1036400527 SUNWcstl +CHECKPKG_OVERRIDES_CSWhaproxy += soname-not-found|libcrypt_d.so.1|is|needed|by|opt/csw/sbin/amd64/haproxy # Heavily optimized, supported for gcc, didn't dare to touch GARCOMPILER = GCC4 @@ -47,9 +50,6 @@ CONFIGURE_SCRIPTS = TEST_SCRIPTS = -# We specifically need /usr/lib/64 -EXTRA_LIB += /usr/lib - BUILD_ARGS = \ TARGET=solaris \ CC=$(CC) \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Dec 29 15:34:06 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 29 Dec 2011 14:34:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[16614] csw/mgar/pkg/git/trunk Message-ID: Revision: 16614 http://gar.svn.sourceforge.net/gar/?rev=16614&view=rev Author: bdwalton Date: 2011-12-29 14:34:06 +0000 (Thu, 29 Dec 2011) Log Message: ----------- git/trunk: version bump Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile csw/mgar/pkg/git/trunk/checksums Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2011-12-28 23:04:59 UTC (rev 16613) +++ csw/mgar/pkg/git/trunk/Makefile 2011-12-29 14:34:06 UTC (rev 16614) @@ -1,5 +1,5 @@ NAME = git -VERSION = 1.7.8 +VERSION = 1.7.8.2 #PATCHLEVEL = rc1 CATEGORIES = devel Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2011-12-28 23:04:59 UTC (rev 16613) +++ csw/mgar/pkg/git/trunk/checksums 2011-12-29 14:34:06 UTC (rev 16614) @@ -1 +1 @@ -4a3c03a04dbb857ecc875dae1278b76e git-1.7.8.tar.gz +f9def92c4afb708f69006da841502b80 git-1.7.8.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Thu Dec 29 16:14:30 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 29 Dec 2011 15:14:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[16615] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 16615 http://gar.svn.sourceforge.net/gar/?rev=16615&view=rev Author: rthurner Date: 2011-12-29 15:14:30 +0000 (Thu, 29 Dec 2011) Log Message: ----------- subversion, csw-upload-pkg gives different errors, try to fix them Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2011-12-29 14:34:06 UTC (rev 16614) +++ csw/mgar/pkg/subversion/trunk/Makefile 2011-12-29 15:14:30 UTC (rev 16615) @@ -49,7 +49,6 @@ SPKG_DESC_CSWsvn = Version control rethought CATALOGNAME_CSWsvn = subversion CHECKPKG_OVERRIDES_CSWsvn += catalogname-does-not-match-pkgname|pkgname=CSWsvn|catalogname=subversion|expected-catalogname=svn -CHECKPKG_OVERRIDES_CSWsvn += license-missing|/opt/csw/share/doc/subversion/license CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/repos.pyc CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/wc.pyc CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/__init__.pyc @@ -82,8 +81,9 @@ RUNTIME_DEP_PKGS_CSWsvn += CSWosslrt RUNTIME_DEP_PKGS_CSWsvn += CSWlibgnome-keyring0 RUNTIME_DEP_PKGS_CSWsvn += CSWlibdbus1-3 -RUNTIME_DEP_PKGS_CSWsvn += CSWglib2 +RUNTIME_DEP_PKGS_CSWsvn += CSWlibglib2-0-0 + PACKAGES += CSWsvn-dev SPKG_DESC_CSWsvn-dev = Subversion Development Support OBSOLETED_BY_CSWsvn-dev = CSWsvn-devel @@ -99,7 +99,6 @@ CATALOGNAME_CSWsvn-contrib = subversion_contrib PKGFILES_CSWsvn-contrib = $(docdir)/subversion/contrib.* ARCHALL_CSWsvn-contrib = 1 -CHECKPKG_OVERRIDES_CSWsvn-contrib += action-class-only-in-pkginfo|none CHECKPKG_OVERRIDES_CSWsvn-contrib += catalogname-does-not-match-pkgname|pkgname=CSWsvn-contrib|catalogname=subversion_contrib|expected-catalogname=svn_contrib @@ -108,7 +107,6 @@ CATALOGNAME_CSWsvn-tools = subversion_tools PKGFILES_CSWsvn-tools = $(docdir)/subversion/tools.* ARCHALL_CSWsvn-tools = 1 -CHECKPKG_OVERRIDES_CSWsvn-tools += action-class-only-in-pkginfo|none CHECKPKG_OVERRIDES_CSWsvn-tools += catalogname-does-not-match-pkgname|pkgname=CSWsvn-tools|catalogname=subversion_tools|expected-catalogname=svn_tools This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Dec 29 16:22:40 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 29 Dec 2011 15:22:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[16616] csw/mgar/pkg/pkg-get/trunk/Makefile Message-ID: Revision: 16616 http://gar.svn.sourceforge.net/gar/?rev=16616&view=rev Author: bdwalton Date: 2011-12-29 15:22:40 +0000 (Thu, 29 Dec 2011) Log Message: ----------- pkg-get/trunk: correct package description Modified Paths: -------------- csw/mgar/pkg/pkg-get/trunk/Makefile Modified: csw/mgar/pkg/pkg-get/trunk/Makefile =================================================================== --- csw/mgar/pkg/pkg-get/trunk/Makefile 2011-12-29 15:14:30 UTC (rev 16615) +++ csw/mgar/pkg/pkg-get/trunk/Makefile 2011-12-29 15:22:40 UTC (rev 16616) @@ -22,7 +22,7 @@ PACKAGES = CSWpkgget CATALOGNAME_CSWpkgget = pkg_get_stub -SPKG_DESC_CSWpkgget = A deprecated package delivery tool (User notice version) +SPKG_DESC_CSWpkgget = A deprecated package delivery tool RUNTIME_DEP_PKGS_CSWpkgget = CSWpkgutil ARCHALL_CSWpkgget = 1 CHECKPKG_OVERRIDES_CSWpkgget += surplus-dependency|CSWpkgutil This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Thu Dec 29 23:03:02 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 29 Dec 2011 22:03:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[16617] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 16617 http://gar.svn.sourceforge.net/gar/?rev=16617&view=rev Author: rthurner Date: 2011-12-29 22:03:02 +0000 (Thu, 29 Dec 2011) Log Message: ----------- subverison: depend on differing versions for solaris9 and solaris10 Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2011-12-29 15:22:40 UTC (rev 16616) +++ csw/mgar/pkg/subversion/trunk/Makefile 2011-12-29 22:03:02 UTC (rev 16617) @@ -81,9 +81,12 @@ RUNTIME_DEP_PKGS_CSWsvn += CSWosslrt RUNTIME_DEP_PKGS_CSWsvn += CSWlibgnome-keyring0 RUNTIME_DEP_PKGS_CSWsvn += CSWlibdbus1-3 -RUNTIME_DEP_PKGS_CSWsvn += CSWlibglib2-0-0 +# as long as we build for solaris9 and 10, consider differing glib versions +PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 solaris10-sparc solaris10-i386 +RUNTIME_DEP_PKGS_CSWsvn-5.9 += CSWglib2 +RUNTIME_DEP_PKGS_CSWsvn-5.10 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWsvn += $(RUNTIME_DEP_PKGS_CSWsvn-$(GAROSREL)) - PACKAGES += CSWsvn-dev SPKG_DESC_CSWsvn-dev = Subversion Development Support OBSOLETED_BY_CSWsvn-dev = CSWsvn-devel This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Thu Dec 29 23:37:18 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Thu, 29 Dec 2011 22:37:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[16618] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 16618 http://gar.svn.sourceforge.net/gar/?rev=16618&view=rev Author: rthurner Date: 2011-12-29 22:37:17 +0000 (Thu, 29 Dec 2011) Log Message: ----------- subversion, only for solaris10 as glib2 Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2011-12-29 22:03:02 UTC (rev 16617) +++ csw/mgar/pkg/subversion/trunk/Makefile 2011-12-29 22:37:17 UTC (rev 16618) @@ -41,6 +41,9 @@ LICENSE = LICENSE +# solaris9 does not have the newest glib2 any more +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 + BUILD_DEP_PKGS += CSWlibexpat-dev BUILD_DEP_PKGS += CSWlibserf-dev BUILD_DEP_PKGS += CSWlibsqlite3-dev @@ -81,11 +84,7 @@ RUNTIME_DEP_PKGS_CSWsvn += CSWosslrt RUNTIME_DEP_PKGS_CSWsvn += CSWlibgnome-keyring0 RUNTIME_DEP_PKGS_CSWsvn += CSWlibdbus1-3 -# as long as we build for solaris9 and 10, consider differing glib versions -PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 solaris10-sparc solaris10-i386 -RUNTIME_DEP_PKGS_CSWsvn-5.9 += CSWglib2 -RUNTIME_DEP_PKGS_CSWsvn-5.10 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWsvn += $(RUNTIME_DEP_PKGS_CSWsvn-$(GAROSREL)) +RUNTIME_DEP_PKGS_CSWsvn += CSWlibglib2-0-0 PACKAGES += CSWsvn-dev SPKG_DESC_CSWsvn-dev = Subversion Development Support This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Fri Dec 30 15:36:40 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Fri, 30 Dec 2011 14:36:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[16619] csw/mgar/pkg/postgresql/branches Message-ID: Revision: 16619 http://gar.svn.sourceforge.net/gar/?rev=16619&view=rev Author: guengel Date: 2011-12-30 14:36:40 +0000 (Fri, 30 Dec 2011) Log Message: ----------- postgresql/branches/postgresql-8.3-raos: Rewrote README.CSW. Added Paths: ----------- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/README.CSW csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/README.CSW Copied: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/README.CSW (from rev 16592, csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/README-CSW.txt) =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/README.CSW (rev 0) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/README.CSW 2011-12-30 14:36:40 UTC (rev 16619) @@ -0,0 +1,120 @@ +OpenCSW PostgreSQL +================== + + +Parallel Installations +---------------------- + +OpenCSW's PostgreSQL allows for parallel installation of different +PostgreSQL versions. Therefore, the binaries have appended the +PostgreSQL version, e.g. PostgreSQL's @VERSION@ `psql' is named +`psql- at BASE_VERSION_NODOT@'. The same holds for manpages. + +The notable exception to this are development files. Development files +are only available for the latest PostgreSQL version provided by +OpenCSW and have no version appended. + +Please see also `Starting the PostgreSQL Server' below for caveat on +running multiple PostgreSQL servers in parallel. + + +32/64-bit Binaries +------------------ + +It can be chosen between 32-bit or 64-bit binaries using the +alternatives mechanism (see the alternative's README.user). By +default, PostgreSQL will use 64-bit binaries. + +Alternatives are provided for server, client, contrib, and dev +binaries separately. This makes it possible to select different memory +models for those binaries independently. + +In order to list the alternatives provided, issue + + /opt/csw/sbin/alternatives --list + +on the command line. + +Please note, that a database cluster initialized by the 32-bit server +binaries cannot be used by the 64-bit versions and vice versa. If you +want to switch the memory model of the server, you have to + + 1. dump the entire database cluster + 2. switch the memory model of the server binaries + 3. remove the database cluster + 4. re-initialize the database cluster using `initdb- at BASE_VERSION_NODOT@' + (see also `Initializing the Database Cluster' below) + 5. start the server and restore the database cluster from the dump + created in step 1. + + +Starting the PostgreSQL Server +------------------------------ + +When installing the PostgreSQL server for the first time, only the +database cluster will be initialized using default values provided by + + @sysconfdir@/postgresql- at BASE_VERSION_NODOT@.conf + +and the database server will not be started, allowing for +post-installation customization. + +In order to start the PostgreSQL server you can either use + + svcadm enable cswpostgresql- at BASE_VERSION_NODOT@ # Solaris 10+ only + +or + + @sysconfdir@/init.d/cswpostgresql- at BASE_VERSION_NODOT@ start + +Please note, that when installing multiple PostgreSQL server versions +in parallel, the above method will work for the first database server +started only. Subsequent servers starts will fail unless the listening +port is set to distinct values using the `SERVEROPTS' in + + @sysconfdir@/postgresql-XY.conf + +like + + SERVEROPTS="-p " + +where `' is the port number the server has to listen on, +which is by default 5432. So, one could configure the servers, for +instance, to make the first server listen on 5432, the second on 5433, +and so on. + +Alternatively, one can use the `postgresql.conf' file in the database +cluster directory to provide a different listening port. + + +User Configuration of Server Options +------------------------------------ + +Configuration of the server start-up options is done through a +user-configuration file, `@sysconfdir@/postgresql- at BASE_VERSION_NODOT@.conf'. +A sample template has been provided for you at `/etc/opt/csw/postgresql- at BASE_VERSION_NODOT@.conf.CSW'. + +This file also defines the location of the PostgreSQL database +cluster in `PGDATA', which is by default `/var/opt/csw/postgresql/@BASE_VERSION_NODOT@'. + + +Initializing the Database Cluster +--------------------------------- + +The startup script `/etc/opt/csw/init.d/cswpostgresql- at BASE_VERSION_NODOT@' allows to +initialize the database cluster by providing the argument `init' as such + + /etc/opt/csw/init.d/cswpostgresql- at BASE_VERSION_NODOT@ init + +This will initialize the database cluster at the location specified in +the `PGDATA' variable defined in `/etc/opt/csw/postgresql- at BASE_VERSION_NODOT@.conf'. + +When installing PostgreSQL for the first time, the database cluster +will be initialized using default values. + + +-- +That's all folks. + +Rafael Ostertag +raos at opencsw.org Property changes on: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/README.CSW ___________________________________________________________________ Added: svn:id + Id Copied: csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/README.CSW (from rev 16592, csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/README-CSW.txt) =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/README.CSW (rev 0) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/README.CSW 2011-12-30 14:36:40 UTC (rev 16619) @@ -0,0 +1,120 @@ +OpenCSW PostgreSQL +================== + + +Parallel Installations +---------------------- + +OpenCSW's PostgreSQL allows for parallel installation of different +PostgreSQL versions. Therefore, the binaries have appended the +PostgreSQL version, e.g. PostgreSQL's @VERSION@ `psql' is named +`psql- at BASE_VERSION_NODOT@'. The same holds for manpages. + +The notable exception to this are development files. Development files +are only available for the latest PostgreSQL version provided by +OpenCSW and have no version appended. + +Please see also `Starting the PostgreSQL Server' below for caveat on +running multiple PostgreSQL servers in parallel. + + +32/64-bit Binaries +------------------ + +It can be chosen between 32-bit or 64-bit binaries using the +alternatives mechanism (see the alternative's README.user). By +default, PostgreSQL will use 64-bit binaries. + +Alternatives are provided for server, client, contrib, and dev +binaries separately. This makes it possible to select different memory +models for those binaries independently. + +In order to list the alternatives provided, issue + + /opt/csw/sbin/alternatives --list + +on the command line. + +Please note, that a database cluster initialized by the 32-bit server +binaries cannot be used by the 64-bit versions and vice versa. If you +want to switch the memory model of the server, you have to + + 1. dump the entire database cluster + 2. switch the memory model of the server binaries + 3. remove the database cluster + 4. re-initialize the database cluster using `initdb- at BASE_VERSION_NODOT@' + (see also `Initializing the Database Cluster' below) + 5. start the server and restore the database cluster from the dump + created in step 1. + + +Starting the PostgreSQL Server +------------------------------ + +When installing the PostgreSQL server for the first time, only the +database cluster will be initialized using default values provided by + + @sysconfdir@/postgresql- at BASE_VERSION_NODOT@.conf + +and the database server will not be started, allowing for +post-installation customization. + +In order to start the PostgreSQL server you can either use + + svcadm enable cswpostgresql- at BASE_VERSION_NODOT@ # Solaris 10+ only + +or + + @sysconfdir@/init.d/cswpostgresql- at BASE_VERSION_NODOT@ start + +Please note, that when installing multiple PostgreSQL server versions +in parallel, the above method will work for the first database server +started only. Subsequent servers starts will fail unless the listening +port is set to distinct values using the `SERVEROPTS' in + + @sysconfdir@/postgresql-XY.conf + +like + + SERVEROPTS="-p " + +where `' is the port number the server has to listen on, +which is by default 5432. So, one could configure the servers, for +instance, to make the first server listen on 5432, the second on 5433, +and so on. + +Alternatively, one can use the `postgresql.conf' file in the database +cluster directory to provide a different listening port. + + +User Configuration of Server Options +------------------------------------ + +Configuration of the server start-up options is done through a +user-configuration file, `@sysconfdir@/postgresql- at BASE_VERSION_NODOT@.conf'. +A sample template has been provided for you at `/etc/opt/csw/postgresql- at BASE_VERSION_NODOT@.conf.CSW'. + +This file also defines the location of the PostgreSQL database +cluster in `PGDATA', which is by default `/var/opt/csw/postgresql/@BASE_VERSION_NODOT@'. + + +Initializing the Database Cluster +--------------------------------- + +The startup script `/etc/opt/csw/init.d/cswpostgresql- at BASE_VERSION_NODOT@' allows to +initialize the database cluster by providing the argument `init' as such + + /etc/opt/csw/init.d/cswpostgresql- at BASE_VERSION_NODOT@ init + +This will initialize the database cluster at the location specified in +the `PGDATA' variable defined in `/etc/opt/csw/postgresql- at BASE_VERSION_NODOT@.conf'. + +When installing PostgreSQL for the first time, the database cluster +will be initialized using default values. + + +-- +That's all folks. + +Rafael Ostertag +raos at opencsw.org Property changes on: csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/README.CSW ___________________________________________________________________ Added: svn:id + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Fri Dec 30 15:37:42 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Fri, 30 Dec 2011 14:37:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[16620] csw/mgar/pkg/postgresql/branches Message-ID: Revision: 16620 http://gar.svn.sourceforge.net/gar/?rev=16620&view=rev Author: guengel Date: 2011-12-30 14:37:41 +0000 (Fri, 30 Dec 2011) Log Message: ----------- postgresql/branches/postgresql-8.3-raos: Removed old README. Removed Paths: ------------- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/README-CSW.txt csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/README-CSW.txt Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/README-CSW.txt =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/README-CSW.txt 2011-12-30 14:36:40 UTC (rev 16619) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/README-CSW.txt 2011-12-30 14:37:41 UTC (rev 16620) @@ -1,105 +0,0 @@ -*** Important information - please make sure you read this ! *** - -$Id$ - -*** Migrating from older versions *** - -If you have upgraded from a previous 8.0, 8.1 or 8.2 version of PostgreSQL, -your databases will NOT work on this 8.3.x version. Before upgrading, you -should dump your databases using the old utilities. You can then create a -new data directory using this 8.3.x package, and import your dumps. -See the "64-bit support" section below for pointers to documentation on t -his. - -Another point to note is that the location of the PostgreSQL install has -changed. Previous 7.3.x packages used /opt/csw as the base - this package -uses /opt/csw/postgresql. You will need to add /opt/csw/postgresql/bin to your -$PATH, and any scripts you have written using the old locations will have to -be changed. - - -*** User configuration of server options *** - -Configuration of the server start-up options is now done through a user- -configuration file, /opt/csw/etc/postgresql.conf. A sample template has been -provided for you at /opt/csw/etc/postgresql.conf.csw. If you want to change -any of the server options discussed below, make a copy of this file to -/opt/csw/etc/postgresql.conf and edit it accordingly. - -If you cannot modify this file (for instance, you are mounting /opt/csw -from a read-only NFS server), you can use /etc/opt/csw/postgresql.conf -instead, and it will take precedence over /opt/csw/etc/postgresql.conf. - -*** Networking *** - -By default, the cswpostgres init script will start the server up listening on -localhost only. If you want to allow other hosts on your network to connect, you -will need to add "-o -i" to the value of SERVEROPTS in the user configuration -file and restart your server. The included template has the line already -entered, you just need to uncomment it (remove the leading #). - -Once this is done, PostgreSQL will now bind to all network interfaces and -listen for connections. You will still need to configure which hosts are allowed -access by modifying the pg_hba.conf file in your data directory - read the manual -for more information on this. - -*** 64-bit support *** - -The SPARC packages have been built with 64-bit support, but by default, the -32-bit version of the server will be run. If you need the 64-bit version, -edit the user configuration file and change the values of PGINIT and PGCTL -accordingly. - -It is important to note that the 64-bit server WILL NOT WORK with databases -created with the 32-bit version, and vice versa. You will get an error -message if you attempt this. - -In order to migrate your system to the 64-bit server, you will need to dump -your databases while running the 32-bit client, stop and upgrade the server, -initialise a new database directory, and import your dumps. For more information -on this procedure, see the PostgreSQL manual (included with this package), -chapter 9 - Backup and restore. This is located at : - -/opt/csw/postgresql/share/doc/html/backup.html - -All other PostgreSQL binaries in /opt/csw/postgresql/bin/ are copies of the -'isaexec' wrapper, which will run the appropriate binary for your -architecture and/or kernel. - -*** Starting the server *** - -The PostgreSQL database runs under the user 'postgres' - this has been created -for you by the installation script. - -The default PostgreSQL data directory is /opt/csw/var/pgdata. As this does not -exist, you will need to create it yourself before the database will start. -You can change the location of the data directory by altering the user -configuration file, and modifying the value of PGDATA. - -A startup script has been provided for you that handles database initialisation, -startup and shutdown functions - it is located at /etc/init.d/cswpostgres. You -should always use this script to start or stop the server, otherwise you may -find that you are running the wrong binaries (64-bit instead of 32-bit). - -It is set to start the database the next time the system enters runlevel 3 - -usually, this will be at the next boot. - -To create the data directory, the startup script accepts the "init" argument : - -/etc/init.d/cswpostgres init - -This will create and initialise the data directory. After this step has been -completed succesfully, the database can be started with : - -/etc/init.d/cswpostgres start - -If you get errors relating to shared memory on startup, make sure you have read -the section entitled "Manging Kernel Resources" - this is in Chapter 3 of the -PostgreSQL HTML Administrator's Guide, located at - -/opt/csw/postgresql/share/doc/html/index.html - - -Mark Round, -mark at blastwave.org - Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/README-CSW.txt =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/README-CSW.txt 2011-12-30 14:36:40 UTC (rev 16619) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/README-CSW.txt 2011-12-30 14:37:41 UTC (rev 16620) @@ -1,105 +0,0 @@ -*** Important information - please make sure you read this ! *** - -$Id$ - -*** Migrating from older versions *** - -If you have upgraded from a previous 8.0, 8.1 or 8.2 version of PostgreSQL, -your databases will NOT work on this 8.3.x version. Before upgrading, you -should dump your databases using the old utilities. You can then create a -new data directory using this 8.3.x package, and import your dumps. -See the "64-bit support" section below for pointers to documentation on t -his. - -Another point to note is that the location of the PostgreSQL install has -changed. Previous 7.3.x packages used /opt/csw as the base - this package -uses /opt/csw/postgresql. You will need to add /opt/csw/postgresql/bin to your -$PATH, and any scripts you have written using the old locations will have to -be changed. - - -*** User configuration of server options *** - -Configuration of the server start-up options is now done through a user- -configuration file, /opt/csw/etc/postgresql.conf. A sample template has been -provided for you at /opt/csw/etc/postgresql.conf.csw. If you want to change -any of the server options discussed below, make a copy of this file to -/opt/csw/etc/postgresql.conf and edit it accordingly. - -If you cannot modify this file (for instance, you are mounting /opt/csw -from a read-only NFS server), you can use /etc/opt/csw/postgresql.conf -instead, and it will take precedence over /opt/csw/etc/postgresql.conf. - -*** Networking *** - -By default, the cswpostgres init script will start the server up listening on -localhost only. If you want to allow other hosts on your network to connect, you -will need to add "-o -i" to the value of SERVEROPTS in the user configuration -file and restart your server. The included template has the line already -entered, you just need to uncomment it (remove the leading #). - -Once this is done, PostgreSQL will now bind to all network interfaces and -listen for connections. You will still need to configure which hosts are allowed -access by modifying the pg_hba.conf file in your data directory - read the manual -for more information on this. - -*** 64-bit support *** - -The SPARC packages have been built with 64-bit support, but by default, the -32-bit version of the server will be run. If you need the 64-bit version, -edit the user configuration file and change the values of PGINIT and PGCTL -accordingly. - -It is important to note that the 64-bit server WILL NOT WORK with databases -created with the 32-bit version, and vice versa. You will get an error -message if you attempt this. - -In order to migrate your system to the 64-bit server, you will need to dump -your databases while running the 32-bit client, stop and upgrade the server, -initialise a new database directory, and import your dumps. For more information -on this procedure, see the PostgreSQL manual (included with this package), -chapter 9 - Backup and restore. This is located at : - -/opt/csw/postgresql/share/doc/html/backup.html - -All other PostgreSQL binaries in /opt/csw/postgresql/bin/ are copies of the -'isaexec' wrapper, which will run the appropriate binary for your -architecture and/or kernel. - -*** Starting the server *** - -The PostgreSQL database runs under the user 'postgres' - this has been created -for you by the installation script. - -The default PostgreSQL data directory is /opt/csw/var/pgdata. As this does not -exist, you will need to create it yourself before the database will start. -You can change the location of the data directory by altering the user -configuration file, and modifying the value of PGDATA. - -A startup script has been provided for you that handles database initialisation, -startup and shutdown functions - it is located at /etc/init.d/cswpostgres. You -should always use this script to start or stop the server, otherwise you may -find that you are running the wrong binaries (64-bit instead of 32-bit). - -It is set to start the database the next time the system enters runlevel 3 - -usually, this will be at the next boot. - -To create the data directory, the startup script accepts the "init" argument : - -/etc/init.d/cswpostgres init - -This will create and initialise the data directory. After this step has been -completed succesfully, the database can be started with : - -/etc/init.d/cswpostgres start - -If you get errors relating to shared memory on startup, make sure you have read -the section entitled "Manging Kernel Resources" - this is in Chapter 3 of the -PostgreSQL HTML Administrator's Guide, located at - -/opt/csw/postgresql/share/doc/html/index.html - - -Mark Round, -mark at blastwave.org - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Fri Dec 30 15:41:56 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Fri, 30 Dec 2011 14:41:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[16621] csw/mgar/pkg/postgresql/branches Message-ID: Revision: 16621 http://gar.svn.sourceforge.net/gar/?rev=16621&view=rev Author: guengel Date: 2011-12-30 14:41:55 +0000 (Fri, 30 Dec 2011) Log Message: ----------- Initialization of the database cluster is now done by invoking the start-up script's init routine. Provide the user with some more information when the database cluster has been initialized for the first time. Added Paths: ----------- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/CSWpostgresql-server.postinstall.tmpl csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/CSWpostgresql-server.postinstall.tmpl Removed Paths: ------------- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/CSWpostgresql-server.postinstall.tmpl csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/CSWpostgresql-server.postinstall.tmpl Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/CSWpostgresql-server.postinstall.tmpl =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/CSWpostgresql-server.postinstall.tmpl 2011-12-30 14:37:41 UTC (rev 16620) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/CSWpostgresql-server.postinstall.tmpl 2011-12-30 14:41:55 UTC (rev 16621) @@ -1,44 +0,0 @@ -#!/bin/sh -# vim:set ft=sh: -# -# $Id$ -# -# Initialize the database cluster if it hasn't been initialized before. - -USERCONF=@CSWPGSQLCONFFILE_VERSIONED@ -PGCTL=@bindir@/pg_ctl- at BASE_VERSION_NODOT@ -PGINIT=@bindir@/initdb- at BASE_VERSION_NODOT@ - -# Read in the user configuration file -[ -s /opt/csw/etc/${USERCONF} ] && . /opt/csw/etc/${USERCONF} -[ -s @sysconfdir@/${USERCONF} ] && . @sysconfdir@/${USERCONF} - -initialize_cluster() { - chown postgres "${PGDATA}" - chmod 0700 "${PGDATA}" - echo "Initializing PostgreSQL database..." - su postgres -c "\"${PGINIT}\" -D \"${PGDATA}\" -E UTF8" -} - -if [ `ls -l ${PGDATA} 2>/dev/null | wc -l` -eq 1 ]; then - initialize_cluster -else - echo "The database cluster seems to be initialized already." -fi - -# FIXME: We assume that every Sol 10 user is using SMF, whereas it is possible -# to use CSW on Sol 10 without SMF -if [ -x /usr/sbin/svcadm ]; then - fmri="cswpostgresql- at BASE_VERSION_NODOT@" - echo "Enabling the ${fmri} service in SMF" - # Let things settle a little bit - sleep 4 - svcadm clear "${fmri}" - svcadm enable "${fmri}" -else - initscript="/etc/opt/csw/init.d/cswpostgresql- at BASE_VERSION_NODOT@" - echo "Issuing ${initscript} start" - "${initscript}" start -fi - -exit 0 Copied: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/CSWpostgresql-server.postinstall.tmpl (from rev 16592, csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/CSWpostgresql-server.postinstall.tmpl) =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/CSWpostgresql-server.postinstall.tmpl (rev 0) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/CSWpostgresql-server.postinstall.tmpl 2011-12-30 14:41:55 UTC (rev 16621) @@ -0,0 +1,64 @@ +#!/bin/sh +# vim:set ft=sh: +# +# $Id$ +# +# Initialize the database cluster if it hasn't been initialized before. + +USERCONF=@CSWPGSQLCONFFILE_VERSIONED@ +PGCTL=@bindir@/pg_ctl- at BASE_VERSION_NODOT@ +PGINIT=@bindir@/initdb- at BASE_VERSION_NODOT@ + +# Read in the user configuration file +[ -s /opt/csw/etc/${USERCONF} ] && . /opt/csw/etc/${USERCONF} +[ -s @sysconfdir@/${USERCONF} ] && . @sysconfdir@/${USERCONF} + +if [ ! -d "${PGDATA}" -o `ls -l ${PGDATA} 2>/dev/null | wc -l` -eq 1 ]; then + @sysconfdir@/init.d/cswpostgresql- at BASE_VERSION_NODOT@ init + cat </dev/null | wc -l` -eq 1 ]; then - initialize_cluster -else - echo "The database cluster seems to be initialized already." -fi - -# FIXME: We assume that every Sol 10 user is using SMF, whereas it is possible -# to use CSW on Sol 10 without SMF -if [ -x /usr/sbin/svcadm ]; then - fmri="cswpostgresql- at BASE_VERSION_NODOT@" - echo "Enabling the ${fmri} service in SMF" - # Let things settle a little bit - sleep 4 - svcadm clear "${fmri}" - svcadm enable "${fmri}" -else - initscript="/etc/opt/csw/init.d/cswpostgresql- at BASE_VERSION_NODOT@" - echo "Issuing ${initscript} start" - "${initscript}" start -fi - -exit 0 Copied: csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/CSWpostgresql-server.postinstall.tmpl (from rev 16592, csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/CSWpostgresql-server.postinstall.tmpl) =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/CSWpostgresql-server.postinstall.tmpl (rev 0) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/CSWpostgresql-server.postinstall.tmpl 2011-12-30 14:41:55 UTC (rev 16621) @@ -0,0 +1,64 @@ +#!/bin/sh +# vim:set ft=sh: +# +# $Id$ +# +# Initialize the database cluster if it hasn't been initialized before. + +USERCONF=@CSWPGSQLCONFFILE_VERSIONED@ +PGCTL=@bindir@/pg_ctl- at BASE_VERSION_NODOT@ +PGINIT=@bindir@/initdb- at BASE_VERSION_NODOT@ + +# Read in the user configuration file +[ -s /opt/csw/etc/${USERCONF} ] && . /opt/csw/etc/${USERCONF} +[ -s @sysconfdir@/${USERCONF} ] && . @sysconfdir@/${USERCONF} + +if [ ! -d "${PGDATA}" -o `ls -l ${PGDATA} 2>/dev/null | wc -l` -eq 1 ]; then + @sysconfdir@/init.d/cswpostgresql- at BASE_VERSION_NODOT@ init + cat < Revision: 16622 http://gar.svn.sourceforge.net/gar/?rev=16622&view=rev Author: guengel Date: 2011-12-30 14:46:26 +0000 (Fri, 30 Dec 2011) Log Message: ----------- postgresql/branches/postgresql-8.3-raos: Provide support for more customization thru the user-configuration file. Added Paths: ----------- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswpostgresql.tmpl csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/postgresql.conf.tmpl csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/cswpostgresql.tmpl csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/postgresql.conf.tmpl Removed Paths: ------------- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswpostgresql.tmpl csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/postgresql.conf.tmpl csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/cswpostgresql.tmpl csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/postgresql.conf.tmpl Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswpostgresql.tmpl =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswpostgresql.tmpl 2011-12-30 14:41:55 UTC (rev 16621) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswpostgresql.tmpl 2011-12-30 14:46:26 UTC (rev 16622) @@ -1,99 +0,0 @@ -#!/bin/sh -# $Id$ -# -# PostgreSQL startup script - part of the CSWpostgresql package -# mark at blastwave.org -# -# 2009-11-29 Maciej Blizinski (maciej at opencsw.org) -# - Parametrized file locations -# - Style changes -# -# - -VERSION=@BASE_VERSION_NODOT@ - -USERCONF=@CSWPGSQLCONFFILE_VERSIONED@ -PGCTL=@bindir@/pg_ctl-${VERSION} -PGINIT=@bindir@/initdb-${VERSION} - -# Read in the user configuration file -[ -s /opt/csw/etc/${USERCONF} ] && . /opt/csw/etc/${USERCONF} -[ -s @sysconfdir@/${USERCONF} ] && . @sysconfdir@/${USERCONF} - -# Defaults -[ -z "${PGDATA}" ] && PGDATA=@PGDATA@ -[ -z "${PGDATA}" ] && SHUTDOWNMODE=fast - -if [ -n "${SERVEROPTS}" ] -then - # Make sure, SERVEROPTS start with -o - echo "${SERVEROPTS}" | grep '^-o' >/dev/null 2>&1 - if [ $? -ne 0 ] - then - SERVEROPTS="-o ${SERVEROPTS}" - fi -fi - - -# Exit if postgres user hasn't been created. -# FIXME: This bit of code is old. It might be obsolete. -if grep '^postgres:' /etc/passwd >/dev/null; then - echo > /dev/null -else - getent passwd postgres >/dev/null - if [ $? -ne 0 ] ; then - exit 0 - fi -fi - -# Change to ${PGDATA}, as pgctl etc. need to be started from -# a directory that they can read -cd "${PGDATA}" - -case "$1" in -start) - if [ -d ${PGDATA} -a `ls -l ${PGDATA} 2> /dev/null | wc -l` -gt 1 ]; then - # PostgreSQL data directory exists and is populated - echo "Starting PostgreSQL..." - su postgres -c "${PGCTL} start -D ${PGDATA} -l ${PGDATA}/postgresql.log ${SERVEROPTS}" - fi - ;; - -stop) - echo "Stopping PostgreSQL database..." - su postgres -c "${PGCTL} stop -D ${PGDATA} -l ${PGDATA}/postgresql.log -m ${SHUTDOWNMODE}" - true # The previous command fails when there's no .pid file - ;; - -restart) - echo "Restarting PostgreSQL database..." - su postgres -c "${PGCTL} restart -D ${PGDATA} -l ${PGDATA}/postgresql.log -m ${SHUTDOWNMODE} ${SERVEROPTS}" - ;; - -reload) - echo "Reloading PostgreSQL database..." - su postgres -c "${PGCTL} reload -D ${PGDATA} -l ${PGDATA}/postgresql.log" - ;; - -status) - su postgres -c "${PGCTL} status -D ${PGDATA}" - ;; - -init) - # create and initialise data directory - echo "Creating PostgreSQL data directory at ${PGDATA}..." - # Create it, unless it's already there and empty - [ -d "${PGDATA}" -a `ls -l ${PGDATA} 2> /dev/null | wc -l` -eq 1 ] || mkdir -p "${PGDATA}" - chown postgres "${PGDATA}" - chmod 0700 "${PGDATA}" - echo "Initialising PostgreSQL database..." - su postgres -c "\"${PGINIT}\" -D \"${PGDATA}\" -E UTF8" - ;; - -*) - echo "Usage: ${0} (init|start|stop|restart|reload|status)" - ;; - -esac - -# vim:set ft=sh sw=2 ts=2 sts=2 expandtab si ci: Copied: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswpostgresql.tmpl (from rev 16592, csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswpostgresql.tmpl) =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswpostgresql.tmpl (rev 0) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswpostgresql.tmpl 2011-12-30 14:46:26 UTC (rev 16622) @@ -0,0 +1,116 @@ +#!/bin/sh +# $Id$ +# +# PostgreSQL startup script - part of the CSWpostgresql package +# +# 2009-11-29 Maciej Blizinski (maciej at opencsw.org) +# - Parametrized file locations +# - Style changes +# +# +#RC_KNUM 20 # Number used for kill script symlink, e.g. K20cswfoo +#RC_SNUM 80 # Number used for start script symlink, e.g. S80cswfoo +#RC_KLEV 0,1,2,S # Run levels that should have a kill script symlink +#RC_SLEV 3 # Run levels that should have a start script symlink +#AUTOENABLE no # If set to no will not enable service regardless of +# local csw.conf, use when a package needs setup before +# being useful, would otherwise leave service in +# maintenance mode + +VERSION=@BASE_VERSION_NODOT@ + +USERCONF=@CSWPGSQLCONFFILE_VERSIONED@ +PGCTL=@bindir@/pg_ctl-${VERSION} +PGINIT=@bindir@/initdb-${VERSION} + +# Read in the user configuration file +[ -s /opt/csw/etc/${USERCONF} ] && . /opt/csw/etc/${USERCONF} +[ -s @sysconfdir@/${USERCONF} ] && . @sysconfdir@/${USERCONF} + +# Defaults +[ -z "${PGDATA}" ] && PGDATA=@PGDATA@ +[ -z "${SHUTDOWNMODE}" ] && SHUTDOWNMODE=fast +[ -z "${PGENCODING}" ] && PGENCODING=UTF8 +[ -z "${PGSUPERUSER}" ] && PGSUPERUSER=postgres + +if [ -n "${SERVEROPTS}" ] +then + # Remove the -o option, we provide it later on + SERVEROPTS=`echo "${SERVEROPTS}" | sed 's/^-o[ ]*//'` +fi +if [ -n "${PGLOCALE}" ] +then + PGLOCALE="--locale=${PGLOCALE}" +fi + + +# Exit if postgres user hasn't been created. +# FIXME: This bit of code is old. It might be obsolete. +if grep '^postgres:' /etc/passwd >/dev/null; then + echo > /dev/null +else + getent passwd postgres >/dev/null + if [ $? -ne 0 ] ; then + exit 0 + fi +fi + +cd / + +case "$1" in +start) + if [ -d ${PGDATA} -a `ls -l ${PGDATA} 2> /dev/null | wc -l` -gt 1 ]; then + # PostgreSQL data directory exists and is populated + echo "Starting PostgreSQL..." + if [ -n "${SERVEROPTS}" ] + then + su postgres -c "${PGCTL} start -D ${PGDATA} -l ${PGDATA}/postgresql.log -o '${SERVEROPTS}'" + else + su postgres -c "${PGCTL} start -D ${PGDATA} -l ${PGDATA}/postgresql.log" + fi + fi + ;; + +stop) + echo "Stopping PostgreSQL database..." + su postgres -c "${PGCTL} stop -D ${PGDATA} -l ${PGDATA}/postgresql.log -m ${SHUTDOWNMODE}" + true # The previous command fails when there's no .pid file + ;; + +restart) + echo "Restarting PostgreSQL database..." + if [ -n "${SERVEROPTS}" ] + then + su postgres -c "${PGCTL} restart -D ${PGDATA} -l ${PGDATA}/postgresql.log -m ${SHUTDOWNMODE} -o '${SERVEROPTS}'" + else + su postgres -c "${PGCTL} restart -D ${PGDATA} -l ${PGDATA}/postgresql.log -m ${SHUTDOWNMODE}" + fi + ;; + +reload) + echo "Reloading PostgreSQL database..." + su postgres -c "${PGCTL} reload -D ${PGDATA} -l ${PGDATA}/postgresql.log" + ;; + +status) + su postgres -c "${PGCTL} status -D ${PGDATA}" + ;; + +init) + # create and initialise data directory + echo "Creating PostgreSQL data directory at ${PGDATA}..." + # Create it, unless it's already there and empty + [ -d "${PGDATA}" -a `ls -l ${PGDATA} 2> /dev/null | wc -l` -eq 1 ] || mkdir -p "${PGDATA}" + chown postgres "${PGDATA}" + chmod 0700 "${PGDATA}" + echo "Initialising PostgreSQL database..." + su postgres -c "\"${PGINIT}\" -D \"${PGDATA}\" -E ${PGENCODING} -U ${PGSUPERUSER} ${PGLOCALE}" + ;; + +*) + echo "Usage: ${0} (init|start|stop|restart|reload|status)" + ;; + +esac + +# vim:set ft=sh sw=2 ts=2 sts=2 expandtab si ci: Property changes on: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswpostgresql.tmpl ___________________________________________________________________ Added: svn:keywords + Id Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/postgresql.conf.tmpl =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/postgresql.conf.tmpl 2011-12-30 14:41:55 UTC (rev 16621) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/postgresql.conf.tmpl 2011-12-30 14:46:26 UTC (rev 16622) @@ -1,34 +0,0 @@ -# Example PostgreSQL server configuration file. -# -# Provided by the OpenCSW package of PostgreSQL. This file is read by the -# /etc/opt/csw/init.d/cswpostgres startup script, and can be used to override -# the defaults. -# -# Please use alternatives to choose between 32/64bit version of the server. - -# The location of the data directory. -# Default : @PGDATA@ -PGDATA=@PGDATA@ - -# The shutdown mode used -# -# Shutdown modes are: -# smart quit after all clients have disconnected -# fast quit directly, with proper shutdown -# immediate quit without complete shutdown; will lead to recovery on restart -# -# Default: fast -SHUTDOWNMODE=fast - -# Additional options to pass to postmaster. -# -# These options will be passed to the postmaster program. The most common use -# of these is to allow network access to PostgreSQL from other hosts over -# TCP/IP. This is done by using the flags "-i", as in the example below. -# Uncomment this line to enable network access to PostgreSQL. Note that you -# will still need to configure authentication in the pg_hba.conf in your data -# directory. -# -# Please note: it is no longer necessary to pass the '-o' option. -# -# SERVEROPTS="-i" Copied: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/postgresql.conf.tmpl (from rev 16592, csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/postgresql.conf.tmpl) =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/postgresql.conf.tmpl (rev 0) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/postgresql.conf.tmpl 2011-12-30 14:46:26 UTC (rev 16622) @@ -0,0 +1,61 @@ +# Example PostgreSQL server configuration file. +# +# Provided by the OpenCSW package of PostgreSQL. This file is read by the +# /etc/opt/csw/init.d/cswpostgres startup script, and can be used to override +# the defaults. +# +# Please use alternatives to choose between 32/64bit version of the +# server (See also @docdir@/@NAME@@BASE_VERSION_NODOT at _server/README.CSW) + +# The location of the data directory. +# Default: @PGDATA@ +PGDATA=@PGDATA@ + +# The shutdown mode used +# +# Shutdown modes are: +# smart quit after all clients have disconnected +# fast quit directly, with proper shutdown +# immediate quit without complete shutdown; will lead to recovery on restart +# +# Default: fast +SHUTDOWNMODE=fast + +# Additional options to pass to postmaster. +# +# Please note: it is no longer necessary to pass the '-o' option. +# +# SERVEROPTS="-i" + + +## +## The following options are used by initdb when initializing the +## database cluster +## + +# The PostgreSQL encoding of the database cluster. This is used when +# initializing the database cluster using the init script. +# +# For a complete list of character sets supported, go to +# +# http://www.postgresql.org/docs/@BASE_VERSION@/static/multibyte.html#MULTIBYTE-CHARSET-SUPPORTED +# +# Default: UTF8 +PGENCODING=UTF8 + +# The locale used to initialize the database cluster. +# +# If none is specified, the locale is inherited from the environment +# that initdb runs in. +# +# Default: +#PGLOCALE=en_US.UTF-8 + +# Selects the user name of the database superuser. This defaults to +# the name of the effective user running initdb. It is really not +# important what the superuser's name is, but one might choose to keep +# the customary name postgres, even if the operating system user's +# name is different. +# +# Default: postgres +PGSUPERUSER=postgres Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/cswpostgresql.tmpl =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/cswpostgresql.tmpl 2011-12-30 14:41:55 UTC (rev 16621) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/cswpostgresql.tmpl 2011-12-30 14:46:26 UTC (rev 16622) @@ -1,99 +0,0 @@ -#!/bin/sh -# $Id$ -# -# PostgreSQL startup script - part of the CSWpostgresql package -# mark at blastwave.org -# -# 2009-11-29 Maciej Blizinski (maciej at opencsw.org) -# - Parametrized file locations -# - Style changes -# -# - -VERSION=@BASE_VERSION_NODOT@ - -USERCONF=@CSWPGSQLCONFFILE_VERSIONED@ -PGCTL=@bindir@/pg_ctl-${VERSION} -PGINIT=@bindir@/initdb-${VERSION} - -# Read in the user configuration file -[ -s /opt/csw/etc/${USERCONF} ] && . /opt/csw/etc/${USERCONF} -[ -s @sysconfdir@/${USERCONF} ] && . @sysconfdir@/${USERCONF} - -# Defaults -[ -z "${PGDATA}" ] && PGDATA=@PGDATA@ -[ -z "${PGDATA}" ] && SHUTDOWNMODE=fast - -if [ -n "${SERVEROPTS}" ] -then - # Make sure, SERVEROPTS start with -o - echo "${SERVEROPTS}" | grep '^-o' >/dev/null 2>&1 - if [ $? -ne 0 ] - then - SERVEROPTS="-o ${SERVEROPTS}" - fi -fi - - -# Exit if postgres user hasn't been created. -# FIXME: This bit of code is old. It might be obsolete. -if grep '^postgres:' /etc/passwd >/dev/null; then - echo > /dev/null -else - getent passwd postgres >/dev/null - if [ $? -ne 0 ] ; then - exit 0 - fi -fi - -# Change to ${PGDATA}, as pgctl etc. need to be started from -# a directory that they can read -cd "${PGDATA}" - -case "$1" in -start) - if [ -d ${PGDATA} -a `ls -l ${PGDATA} 2> /dev/null | wc -l` -gt 1 ]; then - # PostgreSQL data directory exists and is populated - echo "Starting PostgreSQL..." - su postgres -c "${PGCTL} start -D ${PGDATA} -l ${PGDATA}/postgresql.log ${SERVEROPTS}" - fi - ;; - -stop) - echo "Stopping PostgreSQL database..." - su postgres -c "${PGCTL} stop -D ${PGDATA} -l ${PGDATA}/postgresql.log -m ${SHUTDOWNMODE}" - true # The previous command fails when there's no .pid file - ;; - -restart) - echo "Restarting PostgreSQL database..." - su postgres -c "${PGCTL} restart -D ${PGDATA} -l ${PGDATA}/postgresql.log -m ${SHUTDOWNMODE} ${SERVEROPTS}" - ;; - -reload) - echo "Reloading PostgreSQL database..." - su postgres -c "${PGCTL} reload -D ${PGDATA} -l ${PGDATA}/postgresql.log" - ;; - -status) - su postgres -c "${PGCTL} status -D ${PGDATA}" - ;; - -init) - # create and initialise data directory - echo "Creating PostgreSQL data directory at ${PGDATA}..." - # Create it, unless it's already there and empty - [ -d "${PGDATA}" -a `ls -l ${PGDATA} 2> /dev/null | wc -l` -eq 1 ] || mkdir -p "${PGDATA}" - chown postgres "${PGDATA}" - chmod 0700 "${PGDATA}" - echo "Initialising PostgreSQL database..." - su postgres -c "\"${PGINIT}\" -D \"${PGDATA}\" -E UTF8" - ;; - -*) - echo "Usage: ${0} (init|start|stop|restart|reload|status)" - ;; - -esac - -# vim:set ft=sh sw=2 ts=2 sts=2 expandtab si ci: Copied: csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/cswpostgresql.tmpl (from rev 16592, csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswpostgresql.tmpl) =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/cswpostgresql.tmpl (rev 0) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/cswpostgresql.tmpl 2011-12-30 14:46:26 UTC (rev 16622) @@ -0,0 +1,116 @@ +#!/bin/sh +# $Id$ +# +# PostgreSQL startup script - part of the CSWpostgresql package +# +# 2009-11-29 Maciej Blizinski (maciej at opencsw.org) +# - Parametrized file locations +# - Style changes +# +# +#RC_KNUM 20 # Number used for kill script symlink, e.g. K20cswfoo +#RC_SNUM 80 # Number used for start script symlink, e.g. S80cswfoo +#RC_KLEV 0,1,2,S # Run levels that should have a kill script symlink +#RC_SLEV 3 # Run levels that should have a start script symlink +#AUTOENABLE no # If set to no will not enable service regardless of +# local csw.conf, use when a package needs setup before +# being useful, would otherwise leave service in +# maintenance mode + +VERSION=@BASE_VERSION_NODOT@ + +USERCONF=@CSWPGSQLCONFFILE_VERSIONED@ +PGCTL=@bindir@/pg_ctl-${VERSION} +PGINIT=@bindir@/initdb-${VERSION} + +# Read in the user configuration file +[ -s /opt/csw/etc/${USERCONF} ] && . /opt/csw/etc/${USERCONF} +[ -s @sysconfdir@/${USERCONF} ] && . @sysconfdir@/${USERCONF} + +# Defaults +[ -z "${PGDATA}" ] && PGDATA=@PGDATA@ +[ -z "${SHUTDOWNMODE}" ] && SHUTDOWNMODE=fast +[ -z "${PGENCODING}" ] && PGENCODING=UTF8 +[ -z "${PGSUPERUSER}" ] && PGSUPERUSER=postgres + +if [ -n "${SERVEROPTS}" ] +then + # Remove the -o option, we provide it later on + SERVEROPTS=`echo "${SERVEROPTS}" | sed 's/^-o[ ]*//'` +fi +if [ -n "${PGLOCALE}" ] +then + PGLOCALE="--locale=${PGLOCALE}" +fi + + +# Exit if postgres user hasn't been created. +# FIXME: This bit of code is old. It might be obsolete. +if grep '^postgres:' /etc/passwd >/dev/null; then + echo > /dev/null +else + getent passwd postgres >/dev/null + if [ $? -ne 0 ] ; then + exit 0 + fi +fi + +cd / + +case "$1" in +start) + if [ -d ${PGDATA} -a `ls -l ${PGDATA} 2> /dev/null | wc -l` -gt 1 ]; then + # PostgreSQL data directory exists and is populated + echo "Starting PostgreSQL..." + if [ -n "${SERVEROPTS}" ] + then + su postgres -c "${PGCTL} start -D ${PGDATA} -l ${PGDATA}/postgresql.log -o '${SERVEROPTS}'" + else + su postgres -c "${PGCTL} start -D ${PGDATA} -l ${PGDATA}/postgresql.log" + fi + fi + ;; + +stop) + echo "Stopping PostgreSQL database..." + su postgres -c "${PGCTL} stop -D ${PGDATA} -l ${PGDATA}/postgresql.log -m ${SHUTDOWNMODE}" + true # The previous command fails when there's no .pid file + ;; + +restart) + echo "Restarting PostgreSQL database..." + if [ -n "${SERVEROPTS}" ] + then + su postgres -c "${PGCTL} restart -D ${PGDATA} -l ${PGDATA}/postgresql.log -m ${SHUTDOWNMODE} -o '${SERVEROPTS}'" + else + su postgres -c "${PGCTL} restart -D ${PGDATA} -l ${PGDATA}/postgresql.log -m ${SHUTDOWNMODE}" + fi + ;; + +reload) + echo "Reloading PostgreSQL database..." + su postgres -c "${PGCTL} reload -D ${PGDATA} -l ${PGDATA}/postgresql.log" + ;; + +status) + su postgres -c "${PGCTL} status -D ${PGDATA}" + ;; + +init) + # create and initialise data directory + echo "Creating PostgreSQL data directory at ${PGDATA}..." + # Create it, unless it's already there and empty + [ -d "${PGDATA}" -a `ls -l ${PGDATA} 2> /dev/null | wc -l` -eq 1 ] || mkdir -p "${PGDATA}" + chown postgres "${PGDATA}" + chmod 0700 "${PGDATA}" + echo "Initialising PostgreSQL database..." + su postgres -c "\"${PGINIT}\" -D \"${PGDATA}\" -E ${PGENCODING} -U ${PGSUPERUSER} ${PGLOCALE}" + ;; + +*) + echo "Usage: ${0} (init|start|stop|restart|reload|status)" + ;; + +esac + +# vim:set ft=sh sw=2 ts=2 sts=2 expandtab si ci: Property changes on: csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/cswpostgresql.tmpl ___________________________________________________________________ Added: svn:keywords + Id Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/postgresql.conf.tmpl =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/postgresql.conf.tmpl 2011-12-30 14:41:55 UTC (rev 16621) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/postgresql.conf.tmpl 2011-12-30 14:46:26 UTC (rev 16622) @@ -1,34 +0,0 @@ -# Example PostgreSQL server configuration file. -# -# Provided by the OpenCSW package of PostgreSQL. This file is read by the -# /etc/opt/csw/init.d/cswpostgres startup script, and can be used to override -# the defaults. -# -# Please use alternatives to choose between 32/64bit version of the server. - -# The location of the data directory. -# Default : @PGDATA@ -PGDATA=@PGDATA@ - -# The shutdown mode used -# -# Shutdown modes are: -# smart quit after all clients have disconnected -# fast quit directly, with proper shutdown -# immediate quit without complete shutdown; will lead to recovery on restart -# -# Default: fast -SHUTDOWNMODE=fast - -# Additional options to pass to postmaster. -# -# These options will be passed to the postmaster program. The most common use -# of these is to allow network access to PostgreSQL from other hosts over -# TCP/IP. This is done by using the flags "-i", as in the example below. -# Uncomment this line to enable network access to PostgreSQL. Note that you -# will still need to configure authentication in the pg_hba.conf in your data -# directory. -# -# Please note: it is no longer necessary to pass the '-o' option. -# -# SERVEROPTS="-i" Copied: csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/postgresql.conf.tmpl (from rev 16592, csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/postgresql.conf.tmpl) =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/postgresql.conf.tmpl (rev 0) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/postgresql.conf.tmpl 2011-12-30 14:46:26 UTC (rev 16622) @@ -0,0 +1,61 @@ +# Example PostgreSQL server configuration file. +# +# Provided by the OpenCSW package of PostgreSQL. This file is read by the +# /etc/opt/csw/init.d/cswpostgres startup script, and can be used to override +# the defaults. +# +# Please use alternatives to choose between 32/64bit version of the +# server (See also @docdir@/@NAME@@BASE_VERSION_NODOT at _server/README.CSW) + +# The location of the data directory. +# Default: @PGDATA@ +PGDATA=@PGDATA@ + +# The shutdown mode used +# +# Shutdown modes are: +# smart quit after all clients have disconnected +# fast quit directly, with proper shutdown +# immediate quit without complete shutdown; will lead to recovery on restart +# +# Default: fast +SHUTDOWNMODE=fast + +# Additional options to pass to postmaster. +# +# Please note: it is no longer necessary to pass the '-o' option. +# +# SERVEROPTS="-i" + + +## +## The following options are used by initdb when initializing the +## database cluster +## + +# The PostgreSQL encoding of the database cluster. This is used when +# initializing the database cluster using the init script. +# +# For a complete list of character sets supported, go to +# +# http://www.postgresql.org/docs/@BASE_VERSION@/static/multibyte.html#MULTIBYTE-CHARSET-SUPPORTED +# +# Default: UTF8 +PGENCODING=UTF8 + +# The locale used to initialize the database cluster. +# +# If none is specified, the locale is inherited from the environment +# that initdb runs in. +# +# Default: +#PGLOCALE=en_US.UTF-8 + +# Selects the user name of the database superuser. This defaults to +# the name of the effective user running initdb. It is really not +# important what the superuser's name is, but one might choose to keep +# the customary name postgres, even if the operating system user's +# name is different. +# +# Default: postgres +PGSUPERUSER=postgres This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Fri Dec 30 15:52:42 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Fri, 30 Dec 2011 14:52:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[16623] csw/mgar/pkg/postgresql/branches/postgresql-8. 3-raos/Makefile Message-ID: Revision: 16623 http://gar.svn.sourceforge.net/gar/?rev=16623&view=rev Author: guengel Date: 2011-12-30 14:52:42 +0000 (Fri, 30 Dec 2011) Log Message: ----------- postgresql/branches/postgresql-8.3-raos: Included postmsg in -server, -client, -contrib, and -dev. All parts of the -dev package do not feature $(BASE_VERSION_NODOT) anymore. Improved/simplified creation of alternatives. Added a test target to catch missing/superfluous SO_NAMES_* and BIN_NAMES_*. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile 2011-12-30 14:46:26 UTC (rev 16622) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile 2011-12-30 14:52:42 UTC (rev 16623) @@ -34,7 +34,8 @@ # Note 3: Alternatives # ------ # -# I was unable to get the alternatives system to work with using +# I was unable to get the alternatives system to work with using, for +# instance, # # ALTERNATIVES_CSWpostgresql83-server = server_amd64 server_pentium_pro # @@ -86,8 +87,6 @@ # amount of effort. -# This BUILD is NOT READY! It needs work before it's usable. - NAME = postgresql BASE_VERSION = 8.3 VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) @@ -183,13 +182,20 @@ # These are the alternatives provided for the packages. I use them in the # recipe to iterate over all possible alternatives (see 'post-merge:') -myALTERNATIVES= server client dev contrib +# +# Please note that these should correspond to the package suffices. +myALTERNATIVES = server client dev contrib -POSTMSG = $(foreach n,$(myALTERNATIVES),$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_$(n)/CSW$(NAME)$(BASE_VERSION_NODOT)-$(n).postmsg) +POSTMSG = $(foreach n,$(myALTERNATIVES),\ + $(if $(subst dev,,$(n)),\ + $(docdir)/$(NAME)$(BASE_VERSION_NODOT)_$(n)/CSW$(NAME)$(BASE_VERSION_NODOT)-$(n).postmsg,\ + $(docdir)/$(NAME)_$(n)/CSW$(NAME)-$(n).postmsg \ + )\ +) MASTER_SITES = http://ftp.postgresql.org/pub/source/v$(VERSION)/ DISTFILES = $(NAME)-$(VERSION).tar.bz2 -DISTFILES += README-CSW.txt +DISTFILES += README.CSW DISTFILES += $(SERVERPOSTINSTTMPL) DISTFILES += $(INITSCRIPTFILETMPL) DISTFILES += $(USERGROUPFILETMPL) @@ -202,6 +208,7 @@ EXPANDVARS += $(CSWPGSQLCONFFILETMPL) EXPANDVARS += $(SERVERPOSTINSTTMPL) EXPANDVARS += $(USERGROUPFILETMPL) +EXPANDVARS += README.CSW # This patch will replace /usr/local/include by /opt/csw/include in # ecpg.c and thus silence a checkpkg error. @@ -253,6 +260,8 @@ PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*$(sysconfdir)/init\.d/.* PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*$(sysconfdir)/$(CSWPGSQLCONFFILE_VERSIONED).CSW PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_server.* +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*/CSW$(NAME)$(BASE_VERSION_NODOT)-server.postmsg +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_server/README.CSW RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibreadline6 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWosslrt RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibz1 @@ -272,6 +281,8 @@ PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += $(foreach n,$(BIN_NAMES_CLIENT),.*/man1/$(n)-$(BASE_VERSION_NODOT)\.1$$) PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += $(MISC_NAMES_CLIENT) PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_client.* +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += .*/CSW$(NAME)$(BASE_VERSION_NODOT)-client.postmsg +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_client/README.CSW RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibreadline6 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWosslrt RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibz1 @@ -289,6 +300,8 @@ PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += $(foreach n,$(SO_NAMES_CONTRIB),.*/$(NAME)/$(BASE_VERSION_NODOT)/*$(n)$$) PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*/$(NAME)/$(BASE_VERSION_NODOT)/contrib.* PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_contrib.* +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*/CSW$(NAME)$(BASE_VERSION_NODOT)-contrib.postmsg +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_contrib/README.CSW RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWosslrt RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibz1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibpq5 @@ -308,7 +321,10 @@ PKGFILES_CSW$(NAME)-dev += $(foreach n,$(BIN_NAMES_DEVEL),.*$(n)$$) PKGFILES_CSW$(NAME)-dev += $(foreach n,$(BIN_NAMES_DEVEL),.*/man1/$(n)-$(BASE_VERSION_NODOT)\.1$$) PKGFILES_CSW$(NAME)-dev += .*/man5/.* -PKGFILES_CSW$(NAME)-dev += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_dev.* +# Alternatives for -dev have no version appended +PKGFILES_CSW$(NAME)-dev += .*/alternatives/$(NAME)_dev.* +PKGFILES_CSW$(NAME)-dev += .*/CSW$(NAME)-dev.postmsg +PKGFILES_CSW$(NAME)-dev += .*$(docdir)/$(NAME)_dev/README.CSW RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibecpg-compat3 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibecpg6 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibpq5 @@ -395,24 +411,53 @@ #SKIPTEST ?= 1 include gar/category.mk -# This variable will be increased in the course of the following foreach loops +# This will generate the ALTERNATIVEs for the binaries in +# $(libexecdir)/postgresql/XY. +# +# The uppercase_* variables are used to translate the lowercase +# $(myALTERNATIVES) to uppercase. +# +# -dev is handled separately further below +# +# How it does create the alternatives: +# +# for pkg in $(myALTERNATIVES) +# -- set alternative priority to 20 +# for alt in $(NEEDED_ISAS) +# -- increment alternative priority by 10 +# -- create master alternative for pkg, remove default isa from path, +# store alternative in $(ALTERNATIVE_$(pkg)_$(alt) +# -- create slave alternatives for pkg, remove default isa from path, +# append slave alternative to $(ALTERNATIVE_$(pkg)_$(alt) +# end alt +# end pkg +# +# The same approach is used for -dev, but the enclosing outer loop is +# not used, and the alternatives are not having the BASE_VERSION_NODOT +# to their file names appended. +# +# In the post-merge target, the alternatives are written to their +# respective files + +uppercase_server = SERVER +uppercase_client = CLIENT +uppercase_contrib = CONTRIB +$(foreach pkg,$(filter-out dev,$(myALTERNATIVES)),\ + $(eval alt_priority = 20) \ + $(foreach alt,$(NEEDED_ISAS), \ + $(eval alt_priority=$(shell expr $(alt_priority) + 10)) \ + $(eval ALTERNATIVE_$(pkg)_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_$(uppercase_$(pkg)))),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-$(pkg) $(libexecdir)/$(alt)/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) \ + $(eval ALTERNATIVE_$(pkg)_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_$(uppercase_$(pkg)))),$(BIN_NAMES_$(uppercase_$(pkg)))),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-$(pkg) $(libexecdir)/$(alt)/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) \ + )\ +) +# Devel is handled separately, since it does not use +# $(BASE_VERSION_NODOT) alt_priority = 20 -# This will generate the ALTERNATIVEs for the binaries in $(libexecdir)/postgresql/XY. -# I consider this bad voodoo. -## Server -$(foreach alt,$(NEEDED_ISAS), $(eval alt_priority=$(shell expr $(alt_priority) + 10)) $(eval ALTERNATIVE_server_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_SERVER)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-server $(libexecdir)/$(subst server_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) $(eval ALTERNATIVE_server_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_SERVER)),$(BIN_NAMES_SERVER)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT) $(libexecdir)/$(subst server_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) ) -## Client -# reset priority -alt_priority = 20 -$(foreach alt,$(NEEDED_ISAS), $(eval alt_priority=$(shell expr $(alt_priority) + 10)) $(eval ALTERNATIVE_client_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_CLIENT)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-client $(libexecdir)/$(subst client_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) $(eval ALTERNATIVE_client_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_CLIENT)),$(BIN_NAMES_CLIENT)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT) $(libexecdir)/$(subst client_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) ) -## Contrib -# reset priority -alt_priority = 20 -$(foreach alt,$(NEEDED_ISAS), $(eval alt_priority=$(shell expr $(alt_priority) + 10)) $(eval ALTERNATIVE_contrib_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_CONTRIB)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-contrib $(libexecdir)/$(subst contrib_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) $(eval ALTERNATIVE_contrib_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_CONTRIB)),$(BIN_NAMES_CONTRIB)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT) $(libexecdir)/$(subst contrib_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) ) -## Devel -# reset priority -alt_priority = 20 -$(foreach alt,$(NEEDED_ISAS), $(eval alt_priority=$(shell expr $(alt_priority) + 10)) $(eval ALTERNATIVE_dev_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_DEVEL)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-dev $(libexecdir)/$(subst dev_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) $(eval ALTERNATIVE_dev_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_DEVEL)),$(BIN_NAMES_DEVEL)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT) $(libexecdir)/$(subst dev_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) ) +$(foreach alt,$(NEEDED_ISAS),\ + $(eval alt_priority=$(shell expr $(alt_priority) + 10)) \ + $(eval ALTERNATIVE_dev_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_DEVEL)),$(bindir)/$(n) $(NAME)-dev $(libexecdir)/$(alt)/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) \ + $(eval ALTERNATIVE_dev_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_DEVEL)),$(BIN_NAMES_DEVEL)),$(bindir)/$(n) $(NAME)-dev $(libexecdir)/$(alt)/$(NAME)/$(BASE_VERSION_NODOT)/$(n))))\ +) # We adjust the $(pkglibdir) found in $(WORKSRC)/src/Makefile.global.in, so # that it should be possible to install 8.x and 8.y concurrently @@ -430,9 +475,10 @@ $(INSTALL_ENV) gmake -C $(WORKSRC)/contrib DESTDIR=$(DESTDIR) install @$(MAKECOOKIE) -post-merge: -# Create my alternatives files - $(foreach a,$(myALTERNATIVES), $(foreach i,$(NEEDED_ISAS), $(shell ginstall -d $(PKGROOT)$(sharedstatedir)/alternatives ; echo "$(ALTERNATIVE_$(a)_$(i))" > $(PKGROOT)$(sharedstatedir)/alternatives/$(NAME)$(BASE_VERSION_NODOT)_$(a)_$(i)))) +post-merge: $(foreach n,$(POSTMSG),$(PKGROOT)/$(n)) test-installation +# Create my alternatives files. Development alternatives have stripped +# off the version + $(foreach a,$(myALTERNATIVES), $(foreach i,$(NEEDED_ISAS), $(shell ginstall -d $(PKGROOT)$(sharedstatedir)/alternatives ; echo "$(ALTERNATIVE_$(a)_$(i))" > $(if $(subst dev,,$(a)),$(PKGROOT)$(sharedstatedir)/alternatives/$(NAME)$(BASE_VERSION_NODOT)_$(a)_$(i),$(PKGROOT)$(sharedstatedir)/alternatives/$(NAME)_$(a)_$(i)) ) ) ) # Create the PGDATA directory ginstall -d $(PKGROOT)$(PGDATA) # Adjust the man page names for man1 @@ -463,19 +509,75 @@ chmod 0755 $(PKGROOT)$(sysconfdir)/init.d/$(INITSCRIPTFILE_VERSIONED) # The init script config ginstall $(WORKDIR)/$(CSWPGSQLCONFFILETMPL) $(PKGROOT)$(sysconfdir)/$(CSWPGSQLCONFFILE_VERSIONED).CSW +# Remove all the README.CSW, since they have not expanded the +# variables, and copy only the one's we're interested in + for f in $(PKGROOT)$(docdir)/*/README.CSW ; do \ + rm $$f ; \ + done + for d in $(foreach n,$(subst dev,,$(myALTERNATIVES)),$(NAME)$(BASE_VERSION_NODOT)_$(n)) $(NAME)$(BASE_VERSION_NODOT) ; do \ + ginstall $(WORKDIR)/README.CSW $(PKGROOT)$(docdir)/$$d/ ; \ + done @$(MAKECOOKIE) - @$(MAKECOOKIE) +$(foreach n,$(POSTMSG),$(PKGROOT)/$(n)): + ginstall -d $(dir $@) + @echo "Linking Post Messages" + ln $(DOWNLOADDIR)/$(notdir $@) $@ + $(foreach n,$(POSTMSG),$(DOWNLOADDIR)/$(notdir $(n))): @echo " ==> Generating $(notdir $@)" - @(exec >$@; \ - echo "There are 32bit and 64bit versions of $(NAME) $(VERSION) binaries on the system installed:"; \ - echo; \ - echo "You can easily select between the versions with the alternatives(8)"; \ - echo "system by executing"; \ - echo; \ - echo " /opt/csw/sbin/alternatives --config $(subst .postmsg,,$(subst CSW,,$(notdir $@)))"; \ - echo; \ - echo "See http://www.opencsw.org/packages/alternatives for details." ; \ - ) + echo "" > $@ + echo "---" >> $@ + echo "" >> $@ + echo "There are 32bit and 64bit versions of $(NAME) $(VERSION) binaries on the system installed:" >> $@ + echo "" >> $@ + echo "You can easily select between the versions with the alternatives(8)" >> $@ + echo "system by executing" >> $@ + echo "" >> $@ + echo " /opt/csw/sbin/alternatives --config $(subst .postmsg,,$(subst CSW,,$(notdir $@)))" >> $@ + echo "" >> $@ + echo "See http://www.opencsw.org/packages/alternatives for details." >> $@ + echo "" >> $@ + echo "---" >> $@ + echo "" >> $@ @$(MAKECOOKIE) + +test-installation: +# Check if all binaries and libraries defined in the variables +# BIN_NAMES_* and SO_NAMES_* are there + for n in $(BIN_NAMES_SERVER) $(BIN_NAMES_DEVEL) $(BIN_NAMES_CLIENT) $(BIN_NAMES_CONTRIB) ; do \ + if [ -f $(PKGROOT)$(PGBINDIR)/$$n ] ; then\ + : ; \ + else \ + echo "Extra binary defined $$n" ; \ + exit 1 ; \ + fi ; \ + done + for n in $(SO_NAMES_SERVER) $(SO_NAMES_CONTRIB) ; do \ + if [ -f $(PKGROOT)$(libdir)/$(NAME)/$(BASE_VERSION_NODOT)/$$n ] ; then\ + : ; \ + else \ + echo "Extra library defined $$n" ; \ + exit 1 ; \ + fi ; \ + done +# Check if all binaries and libraries in the pkgroot are contained in +# the respective recipe variables. + for n in `gfind $(PKGROOT)$(PGBINDIR) -maxdepth 1 -type f` ; do \ + echo "$(BIN_NAMES_SERVER) $(BIN_NAMES_DEVEL) $(BIN_NAMES_CLIENT) $(BIN_NAMES_CONTRIB)" | grep `basename $$n` >/dev/null 2>&1 ; \ + if [ $$? -eq 0 ] ; then \ + : ; \ + else \ + echo "Binary `basename $$n` not defined" ; \ + exit 1 ; \ + fi ; \ + done + for n in `gfind $(PKGROOT)$(libdir)/$(NAME)/$(BASE_VERSION_NODOT) -maxdepth 1 -type f` ; do \ + echo "$(SO_NAMES_SERVER) $(SO_NAMES_CONTRIB)" | grep `basename $$n` >/dev/null 2>&1 ; \ + if [ $$? -eq 0 ] ; then \ + : ; \ + else \ + echo "Library `basename $$n` not defined" ; \ + exit 1 ; \ + fi ; \ + done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Fri Dec 30 15:54:31 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Fri, 30 Dec 2011 14:54:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[16624] csw/mgar/pkg/postgresql/branches/postgresql-8. 4-raos Message-ID: Revision: 16624 http://gar.svn.sourceforge.net/gar/?rev=16624&view=rev Author: guengel Date: 2011-12-30 14:54:31 +0000 (Fri, 30 Dec 2011) Log Message: ----------- postgresql/branches/postgresql-8.4-raos: Incorporated changes from postgresql-8.3-raos branch. Removed binaries from BIN_NAMES_SERVER; removed libraries from SO_NAMES_CONTRIB. Added Paths: ----------- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/Makefile Removed Paths: ------------- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/Makefile Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/Makefile 2011-12-30 14:52:42 UTC (rev 16623) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/Makefile 2011-12-30 14:54:31 UTC (rev 16624) @@ -1,482 +0,0 @@ -# Copyright 2009 OpenCSW -# Distributed under the terms of the GNU General Public License v2 -# $Id$ -# -# Note 1 -# ------ -# -# A word of caution: PostgreSQL does use autoconf, but it does *not* use -# automake. That said, it `misses' many features found in pure -# autoconf/automake builds, e.g. --program-suffix is not available. This also -# explains some quirks of this recipe. -# -# -# Note 2 -# ------ -# -# The idea is to make it possible to install different major/minor versions of -# PostgreSQL at the same time but without installing them to distinct --prefix -# directories, which in turn makes linking against PostgreSQL easier. This has -# been achieved as follows: -# -# * libraries go into $(libdir) -# -# * binaries go into $(libexec)/postgres/XY/ and alternatives are used to -# bring the binaries into $(prefix)/bin -# -# Generally, putting libraries in $(libdir) should not pose a problem, but in -# the case of PostgresSQL, there is also a directory $(libdir)/postgres which -# is unversioned and cannot be changed by passing arguments to configure. This -# shortcoming can be lifted by adjusting $(pkglibdir) in -# $(WORKSRC)/src/Makefile.global.in which is what we do. -# -# -# Note 3: Alternatives -# ------ -# -# I was unable to get the alternatives system to work with using -# -# ALTERNATIVES_CSWpostgresql83-server = server_amd64 server_pentium_pro -# -# and then defining those alternatives. /opt/csw/sbin/alternatives choked on -# the one file generated for server containing two distinct alternatives. So I -# cooked my own soup: -# -# 1. Create for server, client, contrib, devel separate files containing the -# alternatives for the ISAs -# -# 2. Adjust the prototype to add include the class 'cswalternatives' for the -# files in question. -# -# The problem appeared to be having two lines in the same file. So my approach -# is to generate one file per line of alternatives. -# -# -# Note 4: New upstream releases -# ------ -# -# 1. Adjust BASE_VERSION and/or PATCHLEVEL. -# -# 2. Comment out 'post-install-modulated:'. So we can identify changes in the -# server/client environment. -# -# 3. `mgar package` -# -# 4. If step 3 succeeded, check the prototype of -# CSW$(NAME)$(BASE_VERSION_NODOT) for files that have slipped by and put -# them in the proper place. -# -# 5. Uncomment 'post-install-modulated:'. This will shed light on changes in -# the contrib environment. -# -# 6. `mgar spotless package` -# -# 7. If step 6 succeeded, check the prototype of -# CSW$(NAME)$(BASE_VERSION_NODOT) for files that have slipped by and put -# them in the proper place. -# -# 8. Make sure the proper version numbers are used for the library packages. -# -# -# Note 5: Development package -# ------ -# -# The development package is not versioned, i.e. named CSW$(NAME)-dev, -# since we can only support one set of header files with a reasonable -# amount of effort. - - -# This BUILD is NOT READY! It needs work before it's usable. - -NAME = postgresql -BASE_VERSION = 8.4 -VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) -BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION)) -PATCHLEVEL = 10 -VERSION = $(BASE_VERSION).$(PATCHLEVEL) -CATEGORIES = apps - -# Useful when making a series of builds on the same day -# GARFLAVOR ?= DBG - -VENDOR_URL = http://www.postgresql.org/ - -define BLURB - PostgreSQL is a powerful, open source object-relational database system. - It has more than 15 years of active development and a proven architecture - that has earned it a strong reputation for reliability, data integrity, - and correctness. -endef - -# -# These variables control many aspects of the build -# -PGBINDIR = $(libexecdir)/$(NAME)/$(BASE_VERSION_NODOT) -PGSBINDIR = $(libexecdir)/$(NAME)/$(BASE_VERSION_NODOT) -PGDATADIR = $(datadir)/$(NAME)/$(BASE_VERSION_NODOT) -PGDOCDIR = $(datadir)/doc/$(NAME)/$(BASE_VERSION_NODOT) -PGLOCALSTATEDIR_BASE = $(localstatedir)/$(NAME) -PGDATA = $(PGLOCALSTATEDIR_BASE)/$(BASE_VERSION_NODOT) -# Those BIN_NAMES_* are used both, for package creation and alternatives -BIN_NAMES_SERVER = initdb ipcclean pg_controldata pg_ctl pg_resetxlog postmaster postgres -BIN_NAMES_DEVEL = ecpg pg_config -BIN_NAMES_CLIENT = clusterdb createdb createlang createuser dropdb droplang dropuser pg_dump pg_dumpall pg_restore psql reindexdb vacuumdb -BIN_NAMES_CONTRIB = oid2name pgbench pg_standby vacuumlo -# These are shared objects used by the server. Please note, contrib installs -# also shared object in the same place, so make sure you don't mix up things -SO_NAMES_SERVER = ascii_and_mic.so cyrillic_and_mic.so dict_snowball.so euc_cn_and_mic.so -SO_NAMES_SERVER += euc_jis_2004_and_shift_jis_2004.so euc_jp_and_sjis.so euc_kr_and_mic.so -SO_NAMES_SERVER += euc_tw_and_big5.so latin2_and_win1250.so latin_and_mic.so plpgsql.so -SO_NAMES_SERVER += utf8_and_ascii.so utf8_and_big5.so utf8_and_cyrillic.so utf8_and_euc_cn.so -SO_NAMES_SERVER += utf8_and_euc_jis_2004.so utf8_and_euc_jp.so utf8_and_euc_kr.so utf8_and_euc_tw.so -SO_NAMES_SERVER += utf8_and_gb18030.so utf8_and_gbk.so utf8_and_iso8859.so utf8_and_iso8859_1.so -SO_NAMES_SERVER += utf8_and_johab.so utf8_and_shift_jis_2004.so utf8_and_sjis.so utf8_and_uhc.so utf8_and_win.so -# These are shared object used by contrib. Please note, the server installs -# also shared object in the same place, so make sure you don't mix up things -SO_NAMES_CONTRIB = _int.so adminpack.so autoinc.so btree_gist.so chkpass.so -SO_NAMES_CONTRIB += cube.so dblink.so dict_int.so dict_xsyn.so earthdistance.so -SO_NAMES_CONTRIB += fuzzystrmatch.so hstore.so insert_username.so int_aggregate.so -SO_NAMES_CONTRIB += isn.so lo.so ltree.so moddatetime.so pageinspect.so pg_buffercache.so -SO_NAMES_CONTRIB += pg_freespacemap.so pg_trgm.so pgcrypto.so pgrowlocks.so pgstattuple.so -SO_NAMES_CONTRIB += pgxml.so refint.so seg.so sslinfo.so tablefunc.so test_parser.so timetravel.so tsearch2.so -SO_NAMES_CONTRIB += auto_explain.so btree_gin.so citext.so pg_stat_statements.so -# Miscellaneous files -MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/conversion_create.sql -MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/information_schema.sql -MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/pg_hba.conf.sample -MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/pg_ident.conf.sample -MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/pg_service.conf.sample -MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/postgres.bki -MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/postgres.description -MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/postgres.shdescription -MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/postgresql.conf.sample -MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/recovery.conf.sample -MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/snowball_create.sql -MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/sql_features.txt -MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/system_views.sql -MISC_NAMES_CLIENT += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/psqlrc.sample - -# Used for the PostgreSQL user. Please note, although the file does not feature -# a version number here, it will be installed with $(BASE_VERSION_NODOT) -# appended. -USERGROUPDIR = $(sysconfdir)/pkg/$(NAME) -USERGROUPFILE = cswusergroup -USERGROUPFILETMPL = $(USERGROUPFILE).tmpl -USERGROUPFILE_VERSIONED = $(USERGROUPFILE)-$(BASE_VERSION_NODOT) - -# The configuration file for the init.d script. Please note, although the file -# does not feature a version number here, it will be installed with -# $(BASE_VERSION_NODOT) inserted. -CSWPGSQLCONFFILE = postgresql.conf -CSWPGSQLCONFFILETMPL = $(CSWPGSQLCONFFILE).tmpl -CSWPGSQLCONFFILE_VERSIONED = $(subst $(suffix $(CSWPGSQLCONFFILE)),,$(CSWPGSQLCONFFILE))-$(BASE_VERSION_NODOT).conf - -# The initscript. Please note, although the file does not feature a version -# number here, it will Be Installed With $(BASE_VERSION_NODOT) appended -INITSCRIPTFILE = cswpostgresql -INITSCRIPTFILETMPL = $(INITSCRIPTFILE).tmpl -INITSCRIPTFILE_VERSIONED = $(INITSCRIPTFILE)-$(BASE_VERSION_NODOT) - -# The postinstall script for the postgreSQL server -SERVERPOSTINSTTMPL = CSWpostgresql-server.postinstall.tmpl -SERVERPOSTINST_VERSIONED = CSW$(NAME)$(BASE_VERSION_NODOT)-server.postinstall - - -# These are the alternatives provided for the packages. I use them in the -# recipe to iterate over all possible alternatives (see 'post-merge:') -myALTERNATIVES= server client dev contrib - -POSTMSG = $(foreach n,$(myALTERNATIVES),$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_$(n)/CSW$(NAME)$(BASE_VERSION_NODOT)-$(n).postmsg) - -MASTER_SITES = http://ftp.postgresql.org/pub/source/v$(VERSION)/ -DISTFILES = $(NAME)-$(VERSION).tar.bz2 -DISTFILES += README-CSW.txt -DISTFILES += $(SERVERPOSTINSTTMPL) -DISTFILES += $(INITSCRIPTFILETMPL) -DISTFILES += $(USERGROUPFILETMPL) -DISTFILES += $(CSWPGSQLCONFFILETMPL) -DISTFILES += $(notdir $(POSTMSG)) -NOCHECKSUM = $(notdir $(POSTMSG)) - -EXPANDVARS = $(CSWPGSQLCONFFILETMPL) -EXPANDVARS += $(INITSCRIPTFILETMPL) -EXPANDVARS += $(CSWPGSQLCONFFILETMPL) -EXPANDVARS += $(SERVERPOSTINSTTMPL) -EXPANDVARS += $(USERGROUPFILETMPL) - -# This patch will replace /usr/local/include by /opt/csw/include in -# ecpg.c and thus silence a checkpkg error. -PATCHFILES += 0001-ecpg-usr-local-include-replacement.patch -# Test running on a NFS may fail. Thus we let the test run in -# /var/tmp/pgsql/tmp_check -PATCHFILES += 0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch - -INITSMF = $(sysconfdir)/init\.d/$(INITSCRIPTFILE_VERSIONED) -USERGROUP = $(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED) -PRESERVECONF = $(sysconfdir)/$(CSWPGSQLCONFFILE_VERSIONED) - -LICENSE = COPYRIGHT - -# The alternatives modifier should stay in place, until I figured out -# how to properly employ the ALTERNATIVES system in this build. -PROTOTYPE_MODIFIERS = pgdata alternatives -PROTOTYPE_FILES_pgdata = $(PGLOCALSTATEDIR_BASE).* -PROTOTYPE_USER_pgdata = postgres -PROTOTYPE_GROUP_pgdata = sys -PROTOTYPE_PERMS_pgdata = 0700 -PROTOTYPE_CLASS_pgdata = ugfiles -PROTOTYPE_FILES_alternatives = .*/alternatives/$(NAME)$(BASE_VERSION_NODOT).* -PROTOTYPE_CLASS_alternatives = cswalternatives - -# This is the catchall package. It should not contain any files from -# $(PKGROOT). After building all the packages, I check the prototype of this -# package to make sure there are no files slipped by. -PACKAGES = CSW$(NAME)$(BASE_VERSION_NODOT) -SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT) = PostgreSQL $(VERSION), Meta Package -ARCHALL_CSW$(NAME)$(BASE_VERSION_NODOT) = 1 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT) = CSW$(NAME)$(BASE_VERSION_NODOT)-server -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT) += CSW$(NAME)$(BASE_VERSION_NODOT)-client -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT) += CSW$(NAME)$(BASE_VERSION_NODOT)-contrib -CHECKPKG_OVERRIDES_CSW$(NAME)$(BASE_VERSION_NODOT) += surplus-dependency|CSW$(NAME)$(BASE_VERSION_NODOT)-client -CHECKPKG_OVERRIDES_CSW$(NAME)$(BASE_VERSION_NODOT) += surplus-dependency|CSW$(NAME)$(BASE_VERSION_NODOT)-server -CHECKPKG_OVERRIDES_CSW$(NAME)$(BASE_VERSION_NODOT) += surplus-dependency|CSW$(NAME)$(BASE_VERSION_NODOT)-contrib - -PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-server -SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-server = PostgreSQL $(VERSION), Server -PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server = $(foreach n,$(BIN_NAMES_SERVER),.*$(n)$$) -PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += $(foreach n,$(BIN_NAMES_SERVER),.*/man1/$(n)-$(BASE_VERSION_NODOT)\.1$$) -PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += $(foreach n,$(SO_NAMES_SERVER),.*/$(NAME)/$(BASE_VERSION_NODOT)/*$(n)$$) -PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += $(MISC_NAMES_SERVER) -PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*/$(NAME)/$(BASE_VERSION_NODOT)/timezone(sets|)/.* -PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*/$(NAME)/$(BASE_VERSION_NODOT)/tsearch_.*/.* -PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += $(PGLOCALSTATEDIR_BASE).* -PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*$(USERGROUP) -PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*$(sysconfdir)/init\.d/.* -PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*$(sysconfdir)/$(CSWPGSQLCONFFILE_VERSIONED).CSW -PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_server.* -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibreadline6 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWosslrt -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibz1 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibpq5 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibgnugetopt0 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibxslt1 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibgssapi-krb5-2 -CHECKPKG_OVERRIDES_CSW$(NAME)$(BASE_VERSION_NODOT)-server = $(foreach n,$(SO_NAMES_SERVER), soname-not-part-of-filename|soname=lib$(n).0|filename=$(n) ) -# This one isn't covered by the above. -CHECKPKG_OVERRIDES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += soname-not-part-of-filename|soname=libplpgsql.so.1|filename=plpgsql.so -#ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-server = $(foreach i,$(NEEDED_ISAS), server_$(i)) - -PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-client -SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-client = PostgreSQL $(VERSION), Client -PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client = $(foreach n,$(BIN_NAMES_CLIENT),.*$(n)$$) -PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += $(foreach n,$(BIN_NAMES_CLIENT),.*/man1/$(n)-$(BASE_VERSION_NODOT)\.1$$) -PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += $(MISC_NAMES_CLIENT) -PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_client.* -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibreadline6 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWosslrt -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibz1 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibpq5 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibgnugetopt0 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibxslt1 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibgssapi-krb5-2 -#ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-client = $(foreach i,$(NEEDED_ISAS), client_$(i)) - -PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-contrib -SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = PostgreSQL $(VERSION), Contrib -PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = $(foreach n,$(BIN_NAMES_CONTRIB),.*$(n)$$) -PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += $(foreach n,$(BIN_NAMES_CONTRIB),.*/man1/$(n)-$(BASE_VERSION_NODOT)\.1$$) -PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += $(foreach n,$(SO_NAMES_CONTRIB),.*/$(NAME)/$(BASE_VERSION_NODOT)/*$(n)$$) -PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*/$(NAME)/$(BASE_VERSION_NODOT)/contrib.* -PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_contrib.* -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWosslrt -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibz1 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibpq5 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibgnugetopt0 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibxslt1 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibgssapi-krb5-2 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibreadline6 -# This will produce some 'unused overrides'. -CHECKPKG_OVERRIDES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = $(foreach n,$(SO_NAMES_CONTRIB), soname-not-part-of-filename|soname=lib$(n).0|filename=$(n) ) -#ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = $(foreach i,$(NEEDED_ISAS), contrib_$(i)) - -PACKAGES += CSW$(NAME)-dev -SPKG_DESC_CSW$(NAME)-dev = PostgreSQL $(VERSION), Development Files -PKGFILES_CSW$(NAME)-dev = .*/pgxs/.* -PKGFILES_CSW$(NAME)-dev += $(PKGFILES_DEVEL) -PKGFILES_CSW$(NAME)-dev += $(foreach n,$(BIN_NAMES_DEVEL),.*$(n)$$) -PKGFILES_CSW$(NAME)-dev += $(foreach n,$(BIN_NAMES_DEVEL),.*/man1/$(n)-$(BASE_VERSION_NODOT)\.1$$) -PKGFILES_CSW$(NAME)-dev += .*/man5/.* -PKGFILES_CSW$(NAME)-dev += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_dev.* -RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibecpg-compat3 -RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibecpg6 -RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibpq5 -RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibpgtypes3 -RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibz1 -RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibgssapi-krb5-2 -RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibgnugetopt0 -RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibxslt1 -RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibreadline6 -RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWosslrt -# Those '/usr/local' are ok, they are in a HPUX section of the file -CHECKPKG_OVERRIDES_CSW$(NAME)-dev += $(foreach i,$(NEEDED_ISAS), $(subst $(ISA_DEFAULT)/,,file-with-bad-content|/usr/local|root$(libdir)/$(i)/$(NAME)/$(BASE_VERSION_NODOT)/pgxs/src/Makefile.shlib) ) -# That's ok too, it's docbook stuff which we don't use in this build -CHECKPKG_OVERRIDES_CSW$(NAME)-dev += $(foreach i,$(NEEDED_ISAS), $(subst $(ISA_DEFAULT)/,,file-with-bad-content|/usr/share|root$(libdir)/$(i)/$(NAME)/$(BASE_VERSION_NODOT)/pgxs/src/Makefile.global) ) -#ALTERNATIVES_CSW$(NAME)-dev = $(foreach i,$(NEEDED_ISAS), dev_$(i)) - -PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-doc -ARCHALL_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = 1 -SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = PostgreSQL $(VERSION), Documentation Files -PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = .*/doc/$(NAME)/$(BASE_VERSION_NODOT)/.*\.(html|css) - -PACKAGES += CSWlibecpg-compat3 -SPKG_DESC_CSWlibecpg-compat3 = PostgreSQL $(VERSION), libecpg_compat -PKGFILES_CSWlibecpg-compat3 = $(call pkgfiles_lib,libecpg_compat.so.3) -RUNTIME_DEP_PKGS_CSWlibecpg-compat3 = CSWlibecpg6 -RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibpgtypes3 -RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibpq5 - -PACKAGES += CSWlibecpg6 -SPKG_DESC_CSWlibecpg6 = PostgreSQL $(VERSION), libecpg -PKGFILES_CSWlibecpg6 = $(call pkgfiles_lib,libecpg.so.6) -RUNTIME_DEP_PKGS_CSWlibecpg6 += CSWlibpgtypes3 -RUNTIME_DEP_PKGS_CSWlibecpg6 += CSWlibpq5 - -PACKAGES += CSWlibpgtypes3 -SPKG_DESC_CSWlibpgtypes3 = PostgreSQL $(VERSION), libpgtypes -PKGFILES_CSWlibpgtypes3 = $(call pkgfiles_lib,libpgtypes.so.3) - -PACKAGES += CSWlibpq5 -SPKG_DESC_CSWlibpq5 = PostgreSQL $(VERSION), libpq -PKGFILES_CSWlibpq5 = $(call pkgfiles_lib,libpq.so.5) -RUNTIME_DEP_PKGS_CSWlibpq5 = CSWosslrt -RUNTIME_DEP_PKGS_CSWlibpq5 += CSWlibgssapi-krb5-2 - -BUILD_DEP_PKGS = CSWlibxml2-dev -BUILD_DEP_PKGS += CSWlibxslt-dev -BUILD_DEP_PKGS += CSWperl -BUILD_DEP_PKGS += CSWpython-dev -BUILD_DEP_PKGS += CSWossldevel -BUILD_DEP_PKGS += CSWlibreadline-dev -BUILD_DEP_PKGS += CSWgsed # gsed is used in this recipe -BUILD_DEP_PKGS += CSWlibz-dev -BUILD_DEP_PKGS += CSWlibgnugetopt-dev - -EXTRA_LD_OPTIONS = -R$(prefix)/lib/\$$ISALIST - -BUILD64 = 1 -#ISAEXEC = 0 -MERGE_DIRS_isa-extra = $(bindir) $(libdir) $(libexecdir) - -CONFIGURE_ARGS = $(DIRPATHS) -# This is one of the quirks mentioned at the beginning: --program-suffix is not -# supported, so IMHO, binaries should go to --libexecdir -CONFIGURE_ARGS += --bindir=$(PGBINDIR) -CONFIGURE_ARGS += --sbindir=$(PGSBINDIR) - -CONFIGURE_ARGS += --datadir=$(PGDATADIR) -CONFIGURE_ARGS += --localstatedir=$(PGDATA) -CONFIGURE_ARGS += --with-includes=$(includedir) -CONFIGURE_ARGS += --with-libraries=$(libdir) -CONFIGURE_ARGS += --docdir=$(PGDOCDIR) -# configure complains that we are not thread-safe, wtf? --raos -#CONFIGURE_ARGS += --enable-thread-safety - -CONFIGURE_ARGS += --with-gssapi -CONFIGURE_ARGS += --with-pam -CONFIGURE_ARGS += --with-openssl -CONFIGURE_ARGS += --with-libxml -CONFIGURE_ARGS += --with-libxslt -CONFIGURE_ARGS += --without-krb5 -CONFIGURE_ARGS += --without-bonjour - -#SKIPTEST ?= 1 - -include gar/category.mk -# This variable will be increased in the course of the following foreach loops -alt_priority = 20 -# This will generate the ALTERNATIVEs for the binaries in $(libexecdir)/postgresql/XY. -# I consider this bad voodoo. -## Server -$(foreach alt,$(NEEDED_ISAS), $(eval alt_priority=$(shell expr $(alt_priority) + 10)) $(eval ALTERNATIVE_server_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_SERVER)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-server $(libexecdir)/$(subst server_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) $(eval ALTERNATIVE_server_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_SERVER)),$(BIN_NAMES_SERVER)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT) $(libexecdir)/$(subst server_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) ) -## Client -# reset priority -alt_priority = 20 -$(foreach alt,$(NEEDED_ISAS), $(eval alt_priority=$(shell expr $(alt_priority) + 10)) $(eval ALTERNATIVE_client_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_CLIENT)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-client $(libexecdir)/$(subst client_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) $(eval ALTERNATIVE_client_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_CLIENT)),$(BIN_NAMES_CLIENT)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT) $(libexecdir)/$(subst client_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) ) -## Contrib -# reset priority -alt_priority = 20 -$(foreach alt,$(NEEDED_ISAS), $(eval alt_priority=$(shell expr $(alt_priority) + 10)) $(eval ALTERNATIVE_contrib_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_CONTRIB)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-contrib $(libexecdir)/$(subst contrib_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) $(eval ALTERNATIVE_contrib_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_CONTRIB)),$(BIN_NAMES_CONTRIB)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT) $(libexecdir)/$(subst contrib_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) ) -## Devel -# reset priority -alt_priority = 20 -$(foreach alt,$(NEEDED_ISAS), $(eval alt_priority=$(shell expr $(alt_priority) + 10)) $(eval ALTERNATIVE_dev_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_DEVEL)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-dev $(libexecdir)/$(subst dev_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) $(eval ALTERNATIVE_dev_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_DEVEL)),$(BIN_NAMES_DEVEL)),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT) $(libexecdir)/$(subst dev_,,$(alt))/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) ) - -# We adjust the $(pkglibdir) found in $(WORKSRC)/src/Makefile.global.in, so -# that it should be possible to install 8.x and 8.y concurrently -pre-configure-modulated: - if [ -r $(WORKSRC)/src/Makefile.global.in ] ; then \ - gsed -i -r -e 's|^(pkglibdir[[:space:]]*=[[:space:]]*)\$$\(libdir\).*$$|\1$$(libdir)/postgresql/$(BASE_VERSION_NODOT)|' $(WORKSRC)/src/Makefile.global.in ; \ - fi - @$(MAKECOOKIE) - -post-build-modulated: - $(BUILD_ENV) gmake -C $(WORKSRC)/contrib all - @$(MAKECOOKIE) - -post-install-modulated: - $(INSTALL_ENV) gmake -C $(WORKSRC)/contrib DESTDIR=$(DESTDIR) install - @$(MAKECOOKIE) - -post-merge: -# Create my alternatives files - $(foreach a,$(myALTERNATIVES), $(foreach i,$(NEEDED_ISAS), $(shell ginstall -d $(PKGROOT)$(sharedstatedir)/alternatives ; echo "$(ALTERNATIVE_$(a)_$(i))" > $(PKGROOT)$(sharedstatedir)/alternatives/$(NAME)$(BASE_VERSION_NODOT)_$(a)_$(i)))) -# Create the PGDATA directory - ginstall -d $(PKGROOT)$(PGDATA) -# Adjust the man page names for man1 - for f in $(PKGROOT)$(datadir)/man/man1/* ; do \ - f_no_suffix="`echo $$f | sed -e 's/.1$$//'`" ; \ - mv $$f $${f_no_suffix}-$(BASE_VERSION_NODOT).1 ; \ - done -# Change path names in documentation - for f in $(PKGROOT)$(docdir)/$(NAME)/$(BASE_VERSION_NODOT)/html/*.html $(PKGROOT)$(mandir)/man1/*.1 $(PKGROOT)$(datadir)/$(NAME)/$(BASE_VERSION_NODOT)/*.sample ; do \ - gsed -i -e 's|/usr/local/pgsql/data|$(localstatedir)/$(NAME)/$(BASE_VERSION_NODOT)|g' \ - -e 's|/usr/local/pgsql/|$(prefix)/|g' \ - -e 's|/usr/local|$(prefix)|g' \ - -e 's|/usr/share|$(datadir)|g' $$f ; \ - done - $(foreach n,$(POSTMSG), $(shell ginstall -d $(PKGROOT)$(dir $(n))) $(shell ginstall $(WORKDIR)/$(notdir $(n)) $(PKGROOT)$(n))) - @$(MAKECOOKIE) - - -pre-package: -# The postinstall for the server package - ginstall $(WORKDIR)/$(SERVERPOSTINSTTMPL) $(WORKDIR)/$(SERVERPOSTINST_VERSIONED) -# The usergroup file - ginstall -d $(PKGROOT)$(USERGROUPDIR) - ginstall $(WORKDIR)/$(USERGROUPFILETMPL) $(PKGROOT)$(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED) -# The init script - ginstall -d $(PKGROOT)$(sysconfdir)/init.d - ginstall $(WORKDIR)/$(INITSCRIPTFILETMPL) $(PKGROOT)$(sysconfdir)/init.d/$(INITSCRIPTFILE_VERSIONED) - chmod 0755 $(PKGROOT)$(sysconfdir)/init.d/$(INITSCRIPTFILE_VERSIONED) -# The init script config - ginstall $(WORKDIR)/$(CSWPGSQLCONFFILETMPL) $(PKGROOT)$(sysconfdir)/$(CSWPGSQLCONFFILE_VERSIONED).CSW - @$(MAKECOOKIE) - @$(MAKECOOKIE) - -$(foreach n,$(POSTMSG),$(DOWNLOADDIR)/$(notdir $(n))): - @echo " ==> Generating $(notdir $@)" - @(exec >$@; \ - echo "There are 32bit and 64bit versions of $(NAME) $(VERSION) binaries on the system installed:"; \ - echo; \ - echo "You can easily select between the versions with the alternatives(8)"; \ - echo "system by executing"; \ - echo; \ - echo " /opt/csw/sbin/alternatives --config $(subst .postmsg,,$(subst CSW,,$(notdir $@)))"; \ - echo; \ - echo "See http://www.opencsw.org/packages/alternatives for details." ; \ - ) - @$(MAKECOOKIE) Copied: csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/Makefile (from rev 16592, csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile) =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/Makefile (rev 0) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/Makefile 2011-12-30 14:54:31 UTC (rev 16624) @@ -0,0 +1,584 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ +# +# Note 1 +# ------ +# +# A word of caution: PostgreSQL does use autoconf, but it does *not* use +# automake. That said, it `misses' many features found in pure +# autoconf/automake builds, e.g. --program-suffix is not available. This also +# explains some quirks of this recipe. +# +# +# Note 2 +# ------ +# +# The idea is to make it possible to install different major/minor versions of +# PostgreSQL at the same time but without installing them to distinct --prefix +# directories, which in turn makes linking against PostgreSQL easier. This has +# been achieved as follows: +# +# * libraries go into $(libdir) +# +# * binaries go into $(libexec)/postgres/XY/ and alternatives are used to +# bring the binaries into $(prefix)/bin +# +# Generally, putting libraries in $(libdir) should not pose a problem, but in +# the case of PostgresSQL, there is also a directory $(libdir)/postgres which +# is unversioned and cannot be changed by passing arguments to configure. This +# shortcoming can be lifted by adjusting $(pkglibdir) in +# $(WORKSRC)/src/Makefile.global.in which is what we do. +# +# +# Note 3: Alternatives +# ------ +# +# I was unable to get the alternatives system to work with using, for +# instance, +# +# ALTERNATIVES_CSWpostgresql83-server = server_amd64 server_pentium_pro +# +# and then defining those alternatives. /opt/csw/sbin/alternatives choked on +# the one file generated for server containing two distinct alternatives. So I +# cooked my own soup: +# +# 1. Create for server, client, contrib, devel separate files containing the +# alternatives for the ISAs +# +# 2. Adjust the prototype to add include the class 'cswalternatives' for the +# files in question. +# +# The problem appeared to be having two lines in the same file. So my approach +# is to generate one file per line of alternatives. +# +# +# Note 4: New upstream releases +# ------ +# +# 1. Adjust BASE_VERSION and/or PATCHLEVEL. +# +# 2. Comment out 'post-install-modulated:'. So we can identify changes in the +# server/client environment. +# +# 3. `mgar package` +# +# 4. If step 3 succeeded, check the prototype of +# CSW$(NAME)$(BASE_VERSION_NODOT) for files that have slipped by and put +# them in the proper place. +# +# 5. Uncomment 'post-install-modulated:'. This will shed light on changes in +# the contrib environment. +# +# 6. `mgar spotless package` +# +# 7. If step 6 succeeded, check the prototype of +# CSW$(NAME)$(BASE_VERSION_NODOT) for files that have slipped by and put +# them in the proper place. +# +# 8. Make sure the proper version numbers are used for the library packages. +# +# +# Note 5: Development package +# ------ +# +# The development package is not versioned, i.e. named CSW$(NAME)-dev, +# since we can only support one set of header files with a reasonable +# amount of effort. + + +NAME = postgresql +BASE_VERSION = 8.4 +VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) +BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION)) +PATCHLEVEL = 10 +VERSION = $(BASE_VERSION).$(PATCHLEVEL) +CATEGORIES = apps + +# Useful when making a series of builds on the same day +# GARFLAVOR ?= DBG + +VENDOR_URL = http://www.postgresql.org/ + +define BLURB + PostgreSQL is a powerful, open source object-relational database system. + It has more than 15 years of active development and a proven architecture + that has earned it a strong reputation for reliability, data integrity, + and correctness. +endef + +# +# These variables control many aspects of the build +# +PGBINDIR = $(libexecdir)/$(NAME)/$(BASE_VERSION_NODOT) +PGSBINDIR = $(libexecdir)/$(NAME)/$(BASE_VERSION_NODOT) +PGDATADIR = $(datadir)/$(NAME)/$(BASE_VERSION_NODOT) +PGDOCDIR = $(datadir)/doc/$(NAME)/$(BASE_VERSION_NODOT) +PGLOCALSTATEDIR_BASE = $(localstatedir)/$(NAME) +PGDATA = $(PGLOCALSTATEDIR_BASE)/$(BASE_VERSION_NODOT) +# Those BIN_NAMES_* are used both, for package creation and alternatives. +# 8.4 has removed ipcclean +BIN_NAMES_SERVER = initdb pg_controldata pg_ctl pg_resetxlog postmaster postgres +BIN_NAMES_DEVEL = ecpg pg_config +BIN_NAMES_CLIENT = clusterdb createdb createlang createuser dropdb droplang dropuser pg_dump pg_dumpall pg_restore psql reindexdb vacuumdb +BIN_NAMES_CONTRIB = oid2name pgbench pg_standby vacuumlo +# These are shared objects used by the server. Please note, contrib installs +# also shared object in the same place, so make sure you don't mix up things +SO_NAMES_SERVER = ascii_and_mic.so cyrillic_and_mic.so dict_snowball.so euc_cn_and_mic.so +SO_NAMES_SERVER += euc_jis_2004_and_shift_jis_2004.so euc_jp_and_sjis.so euc_kr_and_mic.so +SO_NAMES_SERVER += euc_tw_and_big5.so latin2_and_win1250.so latin_and_mic.so plpgsql.so +SO_NAMES_SERVER += utf8_and_ascii.so utf8_and_big5.so utf8_and_cyrillic.so utf8_and_euc_cn.so +SO_NAMES_SERVER += utf8_and_euc_jis_2004.so utf8_and_euc_jp.so utf8_and_euc_kr.so utf8_and_euc_tw.so +SO_NAMES_SERVER += utf8_and_gb18030.so utf8_and_gbk.so utf8_and_iso8859.so utf8_and_iso8859_1.so +SO_NAMES_SERVER += utf8_and_johab.so utf8_and_shift_jis_2004.so utf8_and_sjis.so utf8_and_uhc.so utf8_and_win.so +# These are shared object used by contrib. Please note, the server installs +# also shared object in the same place, so make sure you don't mix up things +SO_NAMES_CONTRIB = _int.so adminpack.so autoinc.so btree_gist.so chkpass.so +SO_NAMES_CONTRIB += cube.so dblink.so dict_int.so dict_xsyn.so earthdistance.so +SO_NAMES_CONTRIB += fuzzystrmatch.so hstore.so insert_username.so +SO_NAMES_CONTRIB += isn.so lo.so ltree.so moddatetime.so pageinspect.so pg_buffercache.so +SO_NAMES_CONTRIB += pg_freespacemap.so pg_trgm.so pgcrypto.so pgrowlocks.so pgstattuple.so +SO_NAMES_CONTRIB += pgxml.so refint.so seg.so sslinfo.so tablefunc.so test_parser.so timetravel.so tsearch2.so +SO_NAMES_CONTRIB += auto_explain.so btree_gin.so citext.so pg_stat_statements.so +# Miscellaneous files +MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/conversion_create.sql +MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/information_schema.sql +MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/pg_hba.conf.sample +MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/pg_ident.conf.sample +MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/pg_service.conf.sample +MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/postgres.bki +MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/postgres.description +MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/postgres.shdescription +MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/postgresql.conf.sample +MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/recovery.conf.sample +MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/snowball_create.sql +MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/sql_features.txt +MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/system_views.sql +MISC_NAMES_CLIENT += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/psqlrc.sample + +# Used for the PostgreSQL user. Please note, although the file does not feature +# a version number here, it will be installed with $(BASE_VERSION_NODOT) +# appended. +USERGROUPDIR = $(sysconfdir)/pkg/$(NAME) +USERGROUPFILE = cswusergroup +USERGROUPFILETMPL = $(USERGROUPFILE).tmpl +USERGROUPFILE_VERSIONED = $(USERGROUPFILE)-$(BASE_VERSION_NODOT) + +# The configuration file for the init.d script. Please note, although the file +# does not feature a version number here, it will be installed with +# $(BASE_VERSION_NODOT) inserted. +CSWPGSQLCONFFILE = postgresql.conf +CSWPGSQLCONFFILETMPL = $(CSWPGSQLCONFFILE).tmpl +CSWPGSQLCONFFILE_VERSIONED = $(subst $(suffix $(CSWPGSQLCONFFILE)),,$(CSWPGSQLCONFFILE))-$(BASE_VERSION_NODOT).conf + +# The initscript. Please note, although the file does not feature a version +# number here, it will be installed with $(BASE_VERSION_NODOT) appended +INITSCRIPTFILE = cswpostgresql +INITSCRIPTFILETMPL = $(INITSCRIPTFILE).tmpl +INITSCRIPTFILE_VERSIONED = $(INITSCRIPTFILE)-$(BASE_VERSION_NODOT) + +# The postinstall script for the postgreSQL server +SERVERPOSTINSTTMPL = CSWpostgresql-server.postinstall.tmpl +SERVERPOSTINST_VERSIONED = CSW$(NAME)$(BASE_VERSION_NODOT)-server.postinstall + + +# These are the alternatives provided for the packages. I use them in the +# recipe to iterate over all possible alternatives (see 'post-merge:') +# +# Please note that these should correspond to the package suffices. +myALTERNATIVES = server client dev contrib + +POSTMSG = $(foreach n,$(myALTERNATIVES),\ + $(if $(subst dev,,$(n)),\ + $(docdir)/$(NAME)$(BASE_VERSION_NODOT)_$(n)/CSW$(NAME)$(BASE_VERSION_NODOT)-$(n).postmsg,\ + $(docdir)/$(NAME)_$(n)/CSW$(NAME)-$(n).postmsg \ + )\ +) + +MASTER_SITES = http://ftp.postgresql.org/pub/source/v$(VERSION)/ +DISTFILES = $(NAME)-$(VERSION).tar.bz2 +DISTFILES += README.CSW +DISTFILES += $(SERVERPOSTINSTTMPL) +DISTFILES += $(INITSCRIPTFILETMPL) +DISTFILES += $(USERGROUPFILETMPL) +DISTFILES += $(CSWPGSQLCONFFILETMPL) +DISTFILES += $(notdir $(POSTMSG)) +NOCHECKSUM = $(notdir $(POSTMSG)) + +EXPANDVARS = $(CSWPGSQLCONFFILETMPL) +EXPANDVARS += $(INITSCRIPTFILETMPL) +EXPANDVARS += $(CSWPGSQLCONFFILETMPL) +EXPANDVARS += $(SERVERPOSTINSTTMPL) +EXPANDVARS += $(USERGROUPFILETMPL) +EXPANDVARS += README.CSW + +# This patch will replace /usr/local/include by /opt/csw/include in +# ecpg.c and thus silence a checkpkg error. +PATCHFILES += 0001-ecpg-usr-local-include-replacement.patch +# Test running on a NFS may fail. Thus we let the test run in +# /var/tmp/pgsql/tmp_check +PATCHFILES += 0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch + +INITSMF = $(sysconfdir)/init\.d/$(INITSCRIPTFILE_VERSIONED) +USERGROUP = $(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED) +PRESERVECONF = $(sysconfdir)/$(CSWPGSQLCONFFILE_VERSIONED) + +LICENSE = COPYRIGHT + +# The alternatives modifier should stay in place, until I figured out +# how to properly employ the ALTERNATIVES system in this build. +PROTOTYPE_MODIFIERS = pgdata alternatives +PROTOTYPE_FILES_pgdata = $(PGLOCALSTATEDIR_BASE).* +PROTOTYPE_USER_pgdata = postgres +PROTOTYPE_GROUP_pgdata = sys +PROTOTYPE_PERMS_pgdata = 0700 +PROTOTYPE_CLASS_pgdata = ugfiles +PROTOTYPE_FILES_alternatives = .*/alternatives/$(NAME)$(BASE_VERSION_NODOT).* +PROTOTYPE_CLASS_alternatives = cswalternatives + +# This is the catchall package. It should not contain any files from +# $(PKGROOT). After building all the packages, I check the prototype of this +# package to make sure there are no files slipped by. +PACKAGES = CSW$(NAME)$(BASE_VERSION_NODOT) +SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT) = PostgreSQL $(VERSION), Meta Package +ARCHALL_CSW$(NAME)$(BASE_VERSION_NODOT) = 1 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT) = CSW$(NAME)$(BASE_VERSION_NODOT)-server +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT) += CSW$(NAME)$(BASE_VERSION_NODOT)-client +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT) += CSW$(NAME)$(BASE_VERSION_NODOT)-contrib +CHECKPKG_OVERRIDES_CSW$(NAME)$(BASE_VERSION_NODOT) += surplus-dependency|CSW$(NAME)$(BASE_VERSION_NODOT)-client +CHECKPKG_OVERRIDES_CSW$(NAME)$(BASE_VERSION_NODOT) += surplus-dependency|CSW$(NAME)$(BASE_VERSION_NODOT)-server +CHECKPKG_OVERRIDES_CSW$(NAME)$(BASE_VERSION_NODOT) += surplus-dependency|CSW$(NAME)$(BASE_VERSION_NODOT)-contrib + +PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-server +SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-server = PostgreSQL $(VERSION), Server +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server = $(foreach n,$(BIN_NAMES_SERVER),.*$(n)$$) +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += $(foreach n,$(BIN_NAMES_SERVER),.*/man1/$(n)-$(BASE_VERSION_NODOT)\.1$$) +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += $(foreach n,$(SO_NAMES_SERVER),.*/$(NAME)/$(BASE_VERSION_NODOT)/*$(n)$$) +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += $(MISC_NAMES_SERVER) +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*/$(NAME)/$(BASE_VERSION_NODOT)/timezone(sets|)/.* +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*/$(NAME)/$(BASE_VERSION_NODOT)/tsearch_.*/.* +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += $(PGLOCALSTATEDIR_BASE).* +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*$(USERGROUP) +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*$(sysconfdir)/init\.d/.* +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*$(sysconfdir)/$(CSWPGSQLCONFFILE_VERSIONED).CSW +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_server.* +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*/CSW$(NAME)$(BASE_VERSION_NODOT)-server.postmsg +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_server/README.CSW +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibreadline6 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWosslrt +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibz1 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibpq5 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibgnugetopt0 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibxslt1 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibgssapi-krb5-2 +CHECKPKG_OVERRIDES_CSW$(NAME)$(BASE_VERSION_NODOT)-server = $(foreach n,$(SO_NAMES_SERVER), soname-not-part-of-filename|soname=lib$(n).0|filename=$(n) ) +# This one isn't covered by the above. +CHECKPKG_OVERRIDES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += soname-not-part-of-filename|soname=libplpgsql.so.1|filename=plpgsql.so +#ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-server = $(foreach i,$(NEEDED_ISAS), server_$(i)) + +PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-client +SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-client = PostgreSQL $(VERSION), Client +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client = $(foreach n,$(BIN_NAMES_CLIENT),.*$(n)$$) +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += $(foreach n,$(BIN_NAMES_CLIENT),.*/man1/$(n)-$(BASE_VERSION_NODOT)\.1$$) +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += $(MISC_NAMES_CLIENT) +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_client.* +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += .*/CSW$(NAME)$(BASE_VERSION_NODOT)-client.postmsg +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_client/README.CSW +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibreadline6 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWosslrt +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibz1 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibpq5 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibgnugetopt0 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibxslt1 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibgssapi-krb5-2 +#ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-client = $(foreach i,$(NEEDED_ISAS), client_$(i)) + +PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-contrib +SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = PostgreSQL $(VERSION), Contrib +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = $(foreach n,$(BIN_NAMES_CONTRIB),.*$(n)$$) +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += $(foreach n,$(BIN_NAMES_CONTRIB),.*/man1/$(n)-$(BASE_VERSION_NODOT)\.1$$) +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += $(foreach n,$(SO_NAMES_CONTRIB),.*/$(NAME)/$(BASE_VERSION_NODOT)/*$(n)$$) +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*/$(NAME)/$(BASE_VERSION_NODOT)/contrib.* +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_contrib.* +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*/CSW$(NAME)$(BASE_VERSION_NODOT)-contrib.postmsg +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_contrib/README.CSW +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWosslrt +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibz1 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibpq5 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibgnugetopt0 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibxslt1 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibgssapi-krb5-2 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibreadline6 +# This will produce some 'unused overrides'. +CHECKPKG_OVERRIDES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = $(foreach n,$(SO_NAMES_CONTRIB), soname-not-part-of-filename|soname=lib$(n).0|filename=$(n) ) +#ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = $(foreach i,$(NEEDED_ISAS), contrib_$(i)) + +PACKAGES += CSW$(NAME)-dev +SPKG_DESC_CSW$(NAME)-dev = PostgreSQL $(VERSION), Development Files +PKGFILES_CSW$(NAME)-dev = .*/pgxs/.* +PKGFILES_CSW$(NAME)-dev += $(PKGFILES_DEVEL) +PKGFILES_CSW$(NAME)-dev += $(foreach n,$(BIN_NAMES_DEVEL),.*$(n)$$) +PKGFILES_CSW$(NAME)-dev += $(foreach n,$(BIN_NAMES_DEVEL),.*/man1/$(n)-$(BASE_VERSION_NODOT)\.1$$) +PKGFILES_CSW$(NAME)-dev += .*/man5/.* +# Alternatives for -dev have no version appended +PKGFILES_CSW$(NAME)-dev += .*/alternatives/$(NAME)_dev.* +PKGFILES_CSW$(NAME)-dev += .*/CSW$(NAME)-dev.postmsg +PKGFILES_CSW$(NAME)-dev += .*$(docdir)/$(NAME)_dev/README.CSW +RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibecpg-compat3 +RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibecpg6 +RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibpq5 +RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibpgtypes3 +RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibz1 +RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibgssapi-krb5-2 +RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibgnugetopt0 +RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibxslt1 +RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibreadline6 +RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWosslrt +# Those '/usr/local' are ok, they are in a HPUX section of the file +CHECKPKG_OVERRIDES_CSW$(NAME)-dev += $(foreach i,$(NEEDED_ISAS), $(subst $(ISA_DEFAULT)/,,file-with-bad-content|/usr/local|root$(libdir)/$(i)/$(NAME)/$(BASE_VERSION_NODOT)/pgxs/src/Makefile.shlib) ) +# That's ok too, it's docbook stuff which we don't use in this build +CHECKPKG_OVERRIDES_CSW$(NAME)-dev += $(foreach i,$(NEEDED_ISAS), $(subst $(ISA_DEFAULT)/,,file-with-bad-content|/usr/share|root$(libdir)/$(i)/$(NAME)/$(BASE_VERSION_NODOT)/pgxs/src/Makefile.global) ) +#ALTERNATIVES_CSW$(NAME)-dev = $(foreach i,$(NEEDED_ISAS), dev_$(i)) + +PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-doc +ARCHALL_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = 1 +SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = PostgreSQL $(VERSION), Documentation Files +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = .*/doc/$(NAME)/$(BASE_VERSION_NODOT)/.*\.(html|css) + +PACKAGES += CSWlibecpg-compat3 +SPKG_DESC_CSWlibecpg-compat3 = PostgreSQL $(VERSION), libecpg_compat +PKGFILES_CSWlibecpg-compat3 = $(call pkgfiles_lib,libecpg_compat.so.3) +RUNTIME_DEP_PKGS_CSWlibecpg-compat3 = CSWlibecpg6 +RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibpgtypes3 +RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibpq5 + +PACKAGES += CSWlibecpg6 +SPKG_DESC_CSWlibecpg6 = PostgreSQL $(VERSION), libecpg +PKGFILES_CSWlibecpg6 = $(call pkgfiles_lib,libecpg.so.6) +RUNTIME_DEP_PKGS_CSWlibecpg6 += CSWlibpgtypes3 +RUNTIME_DEP_PKGS_CSWlibecpg6 += CSWlibpq5 + +PACKAGES += CSWlibpgtypes3 +SPKG_DESC_CSWlibpgtypes3 = PostgreSQL $(VERSION), libpgtypes +PKGFILES_CSWlibpgtypes3 = $(call pkgfiles_lib,libpgtypes.so.3) + +PACKAGES += CSWlibpq5 +SPKG_DESC_CSWlibpq5 = PostgreSQL $(VERSION), libpq +PKGFILES_CSWlibpq5 = $(call pkgfiles_lib,libpq.so.5) +RUNTIME_DEP_PKGS_CSWlibpq5 = CSWosslrt +RUNTIME_DEP_PKGS_CSWlibpq5 += CSWlibgssapi-krb5-2 + +BUILD_DEP_PKGS = CSWlibxml2-dev +BUILD_DEP_PKGS += CSWlibxslt-dev +BUILD_DEP_PKGS += CSWperl +BUILD_DEP_PKGS += CSWpython-dev +BUILD_DEP_PKGS += CSWossldevel +BUILD_DEP_PKGS += CSWlibreadline-dev +BUILD_DEP_PKGS += CSWgsed # gsed is used in this recipe +BUILD_DEP_PKGS += CSWlibz-dev +BUILD_DEP_PKGS += CSWlibgnugetopt-dev + +EXTRA_LD_OPTIONS = -R$(prefix)/lib/\$$ISALIST + +BUILD64 = 1 +#ISAEXEC = 0 +MERGE_DIRS_isa-extra = $(bindir) $(libdir) $(libexecdir) + +CONFIGURE_ARGS = $(DIRPATHS) +# This is one of the quirks mentioned at the beginning: --program-suffix is not +# supported, so IMHO, binaries should go to --libexecdir +CONFIGURE_ARGS += --bindir=$(PGBINDIR) +CONFIGURE_ARGS += --sbindir=$(PGSBINDIR) + +CONFIGURE_ARGS += --datadir=$(PGDATADIR) +CONFIGURE_ARGS += --localstatedir=$(PGDATA) +CONFIGURE_ARGS += --with-includes=$(includedir) +CONFIGURE_ARGS += --with-libraries=$(libdir) +CONFIGURE_ARGS += --docdir=$(PGDOCDIR) +# configure complains that we are not thread-safe, wtf? --raos +#CONFIGURE_ARGS += --enable-thread-safety + +CONFIGURE_ARGS += --with-gssapi +CONFIGURE_ARGS += --with-pam +CONFIGURE_ARGS += --with-openssl +CONFIGURE_ARGS += --with-libxml +CONFIGURE_ARGS += --with-libxslt +CONFIGURE_ARGS += --without-krb5 +CONFIGURE_ARGS += --without-bonjour + +#SKIPTEST ?= 1 + +include gar/category.mk +# This will generate the ALTERNATIVEs for the binaries in +# $(libexecdir)/postgresql/XY. +# +# The uppercase_* variables are used to translate the lowercase +# $(myALTERNATIVES) to uppercase. +# +# -dev is handled separately further below +# +# How it does create the alternatives: +# +# for pkg in $(myALTERNATIVES) +# -- set alternative priority to 20 +# for alt in $(NEEDED_ISAS) +# -- increment alternative priority by 10 +# -- create master alternative for pkg, remove default isa from path, +# store alternative in $(ALTERNATIVE_$(pkg)_$(alt) +# -- create slave alternatives for pkg, remove default isa from path, +# append slave alternative to $(ALTERNATIVE_$(pkg)_$(alt) +# end alt +# end pkg +# +# The same approach is used for -dev, but the enclosing outer loop is +# not used, and the alternatives are not having the BASE_VERSION_NODOT +# to their file names appended. +# +# In the post-merge target, the alternatives are written to their +# respective files + +uppercase_server = SERVER +uppercase_client = CLIENT +uppercase_contrib = CONTRIB +$(foreach pkg,$(filter-out dev,$(myALTERNATIVES)),\ + $(eval alt_priority = 20) \ + $(foreach alt,$(NEEDED_ISAS), \ + $(eval alt_priority=$(shell expr $(alt_priority) + 10)) \ + $(eval ALTERNATIVE_$(pkg)_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_$(uppercase_$(pkg)))),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-$(pkg) $(libexecdir)/$(alt)/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) \ + $(eval ALTERNATIVE_$(pkg)_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_$(uppercase_$(pkg)))),$(BIN_NAMES_$(uppercase_$(pkg)))),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-$(pkg) $(libexecdir)/$(alt)/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) \ + )\ +) +# Devel is handled separately, since it does not use +# $(BASE_VERSION_NODOT) +alt_priority = 20 +$(foreach alt,$(NEEDED_ISAS),\ + $(eval alt_priority=$(shell expr $(alt_priority) + 10)) \ + $(eval ALTERNATIVE_dev_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_DEVEL)),$(bindir)/$(n) $(NAME)-dev $(libexecdir)/$(alt)/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) \ + $(eval ALTERNATIVE_dev_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_DEVEL)),$(BIN_NAMES_DEVEL)),$(bindir)/$(n) $(NAME)-dev $(libexecdir)/$(alt)/$(NAME)/$(BASE_VERSION_NODOT)/$(n))))\ +) + +# We adjust the $(pkglibdir) found in $(WORKSRC)/src/Makefile.global.in, so +# that it should be possible to install 8.x and 8.y concurrently +pre-configure-modulated: + if [ -r $(WORKSRC)/src/Makefile.global.in ] ; then \ + gsed -i -r -e 's|^(pkglibdir[[:space:]]*=[[:space:]]*)\$$\(libdir\).*$$|\1$$(libdir)/postgresql/$(BASE_VERSION_NODOT)|' $(WORKSRC)/src/Makefile.global.in ; \ + fi + @$(MAKECOOKIE) + +post-build-modulated: + $(BUILD_ENV) gmake -C $(WORKSRC)/contrib all + @$(MAKECOOKIE) + +post-install-modulated: + $(INSTALL_ENV) gmake -C $(WORKSRC)/contrib DESTDIR=$(DESTDIR) install + @$(MAKECOOKIE) + +post-merge: $(foreach n,$(POSTMSG),$(PKGROOT)/$(n)) test-installation +# Create my alternatives files. Development alternatives have stripped +# off the version + $(foreach a,$(myALTERNATIVES), $(foreach i,$(NEEDED_ISAS), $(shell ginstall -d $(PKGROOT)$(sharedstatedir)/alternatives ; echo "$(ALTERNATIVE_$(a)_$(i))" > $(if $(subst dev,,$(a)),$(PKGROOT)$(sharedstatedir)/alternatives/$(NAME)$(BASE_VERSION_NODOT)_$(a)_$(i),$(PKGROOT)$(sharedstatedir)/alternatives/$(NAME)_$(a)_$(i)) ) ) ) +# Create the PGDATA directory + ginstall -d $(PKGROOT)$(PGDATA) +# Adjust the man page names for man1 + for f in $(PKGROOT)$(datadir)/man/man1/* ; do \ + f_no_suffix="`echo $$f | sed -e 's/.1$$//'`" ; \ + mv $$f $${f_no_suffix}-$(BASE_VERSION_NODOT).1 ; \ + done +# Change path names in documentation + for f in $(PKGROOT)$(docdir)/$(NAME)/$(BASE_VERSION_NODOT)/html/*.html $(PKGROOT)$(mandir)/man1/*.1 $(PKGROOT)$(datadir)/$(NAME)/$(BASE_VERSION_NODOT)/*.sample ; do \ + gsed -i -e 's|/usr/local/pgsql/data|$(localstatedir)/$(NAME)/$(BASE_VERSION_NODOT)|g' \ + -e 's|/usr/local/pgsql/|$(prefix)/|g' \ + -e 's|/usr/local|$(prefix)|g' \ + -e 's|/usr/share|$(datadir)|g' $$f ; \ + done + $(foreach n,$(POSTMSG), $(shell ginstall -d $(PKGROOT)$(dir $(n))) $(shell ginstall $(WORKDIR)/$(notdir $(n)) $(PKGROOT)$(n))) + @$(MAKECOOKIE) + +pre-package: +# The postinstall for the server package + ginstall $(WORKDIR)/$(SERVERPOSTINSTTMPL) $(WORKDIR)/$(SERVERPOSTINST_VERSIONED) +# The usergroup file + ginstall -d $(PKGROOT)$(USERGROUPDIR) + ginstall $(WORKDIR)/$(USERGROUPFILETMPL) $(PKGROOT)$(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED) +# The init script + ginstall -d $(PKGROOT)$(sysconfdir)/init.d + ginstall $(WORKDIR)/$(INITSCRIPTFILETMPL) $(PKGROOT)$(sysconfdir)/init.d/$(INITSCRIPTFILE_VERSIONED) + chmod 0755 $(PKGROOT)$(sysconfdir)/init.d/$(INITSCRIPTFILE_VERSIONED) +# The init script config + ginstall $(WORKDIR)/$(CSWPGSQLCONFFILETMPL) $(PKGROOT)$(sysconfdir)/$(CSWPGSQLCONFFILE_VERSIONED).CSW +# Remove all the README.CSW, since they have not expanded the +# variables, and copy only the one's we're interested in + for f in $(PKGROOT)$(docdir)/*/README.CSW ; do \ + rm $$f ; \ + done + for d in $(foreach n,$(subst dev,,$(myALTERNATIVES)),$(NAME)$(BASE_VERSION_NODOT)_$(n)) $(NAME)$(BASE_VERSION_NODOT) ; do \ + ginstall $(WORKDIR)/README.CSW $(PKGROOT)$(docdir)/$$d/ ; \ + done + @$(MAKECOOKIE) + +$(foreach n,$(POSTMSG),$(PKGROOT)/$(n)): + ginstall -d $(dir $@) + @echo "Linking Post Messages" + ln $(DOWNLOADDIR)/$(notdir $@) $@ + +$(foreach n,$(POSTMSG),$(DOWNLOADDIR)/$(notdir $(n))): + @echo " ==> Generating $(notdir $@)" + echo "" > $@ + echo "---" >> $@ + echo "" >> $@ + echo "There are 32bit and 64bit versions of $(NAME) $(VERSION) binaries on the system installed:" >> $@ + echo "" >> $@ + echo "You can easily select between the versions with the alternatives(8)" >> $@ + echo "system by executing" >> $@ + echo "" >> $@ + echo " /opt/csw/sbin/alternatives --config $(subst .postmsg,,$(subst CSW,,$(notdir $@)))" >> $@ + echo "" >> $@ + echo "See http://www.opencsw.org/packages/alternatives for details." >> $@ + echo "" >> $@ + echo "---" >> $@ + echo "" >> $@ + @$(MAKECOOKIE) + +test-installation: +# Check if all binaries and libraries defined in the variables +# BIN_NAMES_* and SO_NAMES_* are there + for n in $(BIN_NAMES_SERVER) $(BIN_NAMES_DEVEL) $(BIN_NAMES_CLIENT) $(BIN_NAMES_CONTRIB) ; do \ + if [ -f $(PKGROOT)$(PGBINDIR)/$$n ] ; then\ + : ; \ + else \ + echo "Extra binary defined $$n" ; \ + exit 1 ; \ + fi ; \ + done + for n in $(SO_NAMES_SERVER) $(SO_NAMES_CONTRIB) ; do \ + if [ -f $(PKGROOT)$(libdir)/$(NAME)/$(BASE_VERSION_NODOT)/$$n ] ; then\ + : ; \ + else \ + echo "Extra library defined $$n" ; \ + exit 1 ; \ + fi ; \ + done +# Check if all binaries and libraries in the pkgroot are contained in +# the respective recipe variables. + for n in `gfind $(PKGROOT)$(PGBINDIR) -maxdepth 1 -type f` ; do \ + echo "$(BIN_NAMES_SERVER) $(BIN_NAMES_DEVEL) $(BIN_NAMES_CLIENT) $(BIN_NAMES_CONTRIB)" | grep `basename $$n` >/dev/null 2>&1 ; \ + if [ $$? -eq 0 ] ; then \ + : ; \ + else \ + echo "Binary `basename $$n` not defined" ; \ + exit 1 ; \ + fi ; \ + done + for n in `gfind $(PKGROOT)$(libdir)/$(NAME)/$(BASE_VERSION_NODOT) -maxdepth 1 -type f` ; do \ + echo "$(SO_NAMES_SERVER) $(SO_NAMES_CONTRIB)" | grep `basename $$n` >/dev/null 2>&1 ; \ + if [ $$? -eq 0 ] ; then \ + : ; \ + else \ + echo "Library `basename $$n` not defined" ; \ + exit 1 ; \ + fi ; \ + done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Fri Dec 30 16:15:26 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Fri, 30 Dec 2011 15:15:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[16625] csw/mgar/pkg/postgresql Message-ID: Revision: 16625 http://gar.svn.sourceforge.net/gar/?rev=16625&view=rev Author: guengel Date: 2011-12-30 15:15:25 +0000 (Fri, 30 Dec 2011) Log Message: ----------- postgresql: Tree cleanup. Added Paths: ----------- csw/mgar/pkg/postgresql/tags/legacy/ csw/mgar/pkg/postgresql/tags/legacy/legacy-8.3.3/ csw/mgar/pkg/postgresql/tags/legacy/optcsw/ csw/mgar/pkg/postgresql/tags/legacy/postgresql-8.3/ csw/mgar/pkg/postgresql/tags/legacy/postgresql-9.0/ Removed Paths: ------------- csw/mgar/pkg/postgresql/branches/optcsw/ csw/mgar/pkg/postgresql/branches/postgresql-8.3/ csw/mgar/pkg/postgresql/branches/postgresql-9.0/ csw/mgar/pkg/postgresql/branches/postgresql-9.1.1/ csw/mgar/pkg/postgresql/tags/legacy-8.3.3/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Fri Dec 30 18:29:31 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Fri, 30 Dec 2011 17:29:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[16626] csw/mgar/pkg/postgresql/branches Message-ID: Revision: 16626 http://gar.svn.sourceforge.net/gar/?rev=16626&view=rev Author: guengel Date: 2011-12-30 17:29:31 +0000 (Fri, 30 Dec 2011) Log Message: ----------- postgresql/branches/postgresql-9.0-raos: Branched to version 9.0. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/Makefile csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/checksums Added Paths: ----------- csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/ csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/0000-Run-tests-in-var-tmp-pgsql-tmp_check.patch csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/0000-ecpg-usr-local-include-replacement.patch Removed Paths: ------------- csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/0001-ecpg-usr-local-include-replacement.patch csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/Makefile 2011-12-30 15:15:25 UTC (rev 16625) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/Makefile 2011-12-30 17:29:31 UTC (rev 16626) @@ -88,10 +88,10 @@ NAME = postgresql -BASE_VERSION = 8.4 +BASE_VERSION = 9.0 VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION)) -PATCHLEVEL = 10 +PATCHLEVEL = 6 VERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = apps @@ -121,25 +121,27 @@ BIN_NAMES_SERVER = initdb pg_controldata pg_ctl pg_resetxlog postmaster postgres BIN_NAMES_DEVEL = ecpg pg_config BIN_NAMES_CLIENT = clusterdb createdb createlang createuser dropdb droplang dropuser pg_dump pg_dumpall pg_restore psql reindexdb vacuumdb -BIN_NAMES_CONTRIB = oid2name pgbench pg_standby vacuumlo +BIN_NAMES_CONTRIB = oid2name pgbench pg_standby vacuumlo pg_upgrade pg_archivecleanup # These are shared objects used by the server. Please note, contrib installs # also shared object in the same place, so make sure you don't mix up things SO_NAMES_SERVER = ascii_and_mic.so cyrillic_and_mic.so dict_snowball.so euc_cn_and_mic.so -SO_NAMES_SERVER += euc_jis_2004_and_shift_jis_2004.so euc_jp_and_sjis.so euc_kr_and_mic.so +SO_NAMES_SERVER += euc_jp_and_sjis.so euc_kr_and_mic.so utf8_and_euc2004.so utf8_and_sjis2004.so SO_NAMES_SERVER += euc_tw_and_big5.so latin2_and_win1250.so latin_and_mic.so plpgsql.so SO_NAMES_SERVER += utf8_and_ascii.so utf8_and_big5.so utf8_and_cyrillic.so utf8_and_euc_cn.so -SO_NAMES_SERVER += utf8_and_euc_jis_2004.so utf8_and_euc_jp.so utf8_and_euc_kr.so utf8_and_euc_tw.so +SO_NAMES_SERVER += utf8_and_euc_jp.so utf8_and_euc_kr.so utf8_and_euc_tw.so euc2004_sjis2004.so SO_NAMES_SERVER += utf8_and_gb18030.so utf8_and_gbk.so utf8_and_iso8859.so utf8_and_iso8859_1.so -SO_NAMES_SERVER += utf8_and_johab.so utf8_and_shift_jis_2004.so utf8_and_sjis.so utf8_and_uhc.so utf8_and_win.so +SO_NAMES_SERVER += utf8_and_johab.so utf8_and_sjis.so utf8_and_uhc.so utf8_and_win.so +# This has been introduced with 9.0 +SO_NAMES_SERVER += libpqwalreceiver.so # These are shared object used by contrib. Please note, the server installs # also shared object in the same place, so make sure you don't mix up things -SO_NAMES_CONTRIB = _int.so adminpack.so autoinc.so btree_gist.so chkpass.so +SO_NAMES_CONTRIB = _int.so adminpack.so autoinc.so btree_gist.so chkpass.so passwordcheck.so SO_NAMES_CONTRIB += cube.so dblink.so dict_int.so dict_xsyn.so earthdistance.so -SO_NAMES_CONTRIB += fuzzystrmatch.so hstore.so insert_username.so +SO_NAMES_CONTRIB += fuzzystrmatch.so hstore.so insert_username.so pg_upgrade_support.so SO_NAMES_CONTRIB += isn.so lo.so ltree.so moddatetime.so pageinspect.so pg_buffercache.so SO_NAMES_CONTRIB += pg_freespacemap.so pg_trgm.so pgcrypto.so pgrowlocks.so pgstattuple.so SO_NAMES_CONTRIB += pgxml.so refint.so seg.so sslinfo.so tablefunc.so test_parser.so timetravel.so tsearch2.so -SO_NAMES_CONTRIB += auto_explain.so btree_gin.so citext.so pg_stat_statements.so +SO_NAMES_CONTRIB += auto_explain.so btree_gin.so citext.so pg_stat_statements.so unaccent.so # Miscellaneous files MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/conversion_create.sql MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/information_schema.sql @@ -214,10 +216,10 @@ # This patch will replace /usr/local/include by /opt/csw/include in # ecpg.c and thus silence a checkpkg error. -PATCHFILES += 0001-ecpg-usr-local-include-replacement.patch +PATCHFILES += 0000-ecpg-usr-local-include-replacement.patch # Test running on a NFS may fail. Thus we let the test run in # /var/tmp/pgsql/tmp_check -PATCHFILES += 0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch +PATCHFILES += 0000-Run-tests-in-var-tmp-pgsql-tmp_check.patch INITSMF = $(sysconfdir)/init\.d/$(INITSCRIPTFILE_VERSIONED) USERGROUP = $(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED) @@ -383,6 +385,9 @@ BUILD_DEP_PKGS += CSWlibgnugetopt-dev EXTRA_LD_OPTIONS = -R$(prefix)/lib/\$$ISALIST +# Needed for thread safety check by configure +LIBS = -lrt +EXTRA_CONFIGURE_ENV = LIBS=$(LIBS) BUILD64 = 1 #ISAEXEC = 0 @@ -399,8 +404,6 @@ CONFIGURE_ARGS += --with-includes=$(includedir) CONFIGURE_ARGS += --with-libraries=$(libdir) CONFIGURE_ARGS += --docdir=$(PGDOCDIR) -# configure complains that we are not thread-safe, wtf? --raos -#CONFIGURE_ARGS += --enable-thread-safety CONFIGURE_ARGS += --with-gssapi CONFIGURE_ARGS += --with-pam @@ -475,6 +478,7 @@ post-install-modulated: $(INSTALL_ENV) gmake -C $(WORKSRC)/contrib DESTDIR=$(DESTDIR) install + $(INSTALL_ENV) gmake -C $(WORKSRC) DESTDIR=$(DESTDIR) install-docs @$(MAKECOOKIE) post-merge: $(foreach n,$(POSTMSG),$(PKGROOT)/$(n)) test-installation Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/checksums =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/checksums 2011-12-30 15:15:25 UTC (rev 16625) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/checksums 2011-12-30 17:29:31 UTC (rev 16626) @@ -1 +1 @@ -6fd9b76e1d4df479e0b5402c88b1860e postgresql-8.4.10.tar.bz2 +4ad7e4fc31ef8b8a75a3e4243933963f postgresql-9.0.6.tar.bz2 Added: csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/0000-Run-tests-in-var-tmp-pgsql-tmp_check.patch =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/0000-Run-tests-in-var-tmp-pgsql-tmp_check.patch (rev 0) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/0000-Run-tests-in-var-tmp-pgsql-tmp_check.patch 2011-12-30 17:29:31 UTC (rev 16626) @@ -0,0 +1,43 @@ +From 6087958b802424f91462b3a98cf75bc0d3471e09 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Fri, 30 Dec 2011 16:33:54 +0100 +Subject: [PATCH] Run tests in /var/tmp/pgsql/tmp_check + +--- + src/test/regress/GNUmakefile | 8 +++++--- + 1 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile +index 31762b8..ffe0667 100644 +--- a/src/test/regress/GNUmakefile ++++ b/src/test/regress/GNUmakefile +@@ -141,7 +141,8 @@ tablespace-setup: + pg_regress_call = ./pg_regress --inputdir=$(srcdir) --dlpath=. --multibyte=$(MULTIBYTE) $(NOLOCALE) + + check: all +- $(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF) ++ install -d /var/tmp/pgsql/tmp_check ++ $(pg_regress_call) --temp-install=/var/tmp/pgsql/tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF) + + installcheck: all + $(pg_regress_call) --psqldir="$(PSQLDIR)" --schedule=$(srcdir)/serial_schedule +@@ -162,7 +163,8 @@ bigtest: all + $(pg_regress_call) --psqldir="$(PSQLDIR)" --schedule=$(srcdir)/serial_schedule numeric_big + + bigcheck: all +- $(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) numeric_big ++ install -d /var/tmp/pgsql/tmp_check ++ $(pg_regress_call) --temp-install=/var/tmp/pgsql/tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) numeric_big + + + ## +@@ -175,5 +177,5 @@ clean distclean maintainer-clean: clean-lib + # things created by various check targets + rm -f $(output_files) $(input_files) + rm -rf testtablespace +- rm -rf results tmp_check log ++ rm -rf results /var/tmp/pgsql/tmp_check log + rm -f regression.diffs regression.out regress.out run_check.out +-- +1.7.6.1 + Added: csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/0000-ecpg-usr-local-include-replacement.patch =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/0000-ecpg-usr-local-include-replacement.patch (rev 0) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/0000-ecpg-usr-local-include-replacement.patch 2011-12-30 17:29:31 UTC (rev 16626) @@ -0,0 +1,25 @@ +From dec1e5ffd2ec2e58d185f6e4753e38ff5a0af1cd Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Fri, 30 Dec 2011 16:27:27 +0100 +Subject: [PATCH] ecpg /usr/local/include replacement + +--- + src/interfaces/ecpg/preproc/ecpg.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/interfaces/ecpg/preproc/ecpg.c b/src/interfaces/ecpg/preproc/ecpg.c +index db52bf5..05cad72 100644 +--- a/src/interfaces/ecpg/preproc/ecpg.c ++++ b/src/interfaces/ecpg/preproc/ecpg.c +@@ -253,7 +253,7 @@ main(int argc, char *const argv[]) + } + + add_include_path("."); +- add_include_path("/usr/local/include"); ++ add_include_path("/opt/csw/include"); + get_include_path(my_exec_path, include_path); + add_include_path(include_path); + add_include_path("/usr/include"); +-- +1.7.6.1 + Deleted: csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/0001-ecpg-usr-local-include-replacement.patch =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/0001-ecpg-usr-local-include-replacement.patch 2011-12-30 15:15:25 UTC (rev 16625) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/0001-ecpg-usr-local-include-replacement.patch 2011-12-30 17:29:31 UTC (rev 16626) @@ -1,25 +0,0 @@ -From dc1c663085dff97adb890534a5d6bd7ede0bf542 Mon Sep 17 00:00:00 2001 -From: Rafael Ostertag -Date: Fri, 9 Dec 2011 18:09:58 +0100 -Subject: [PATCH] ecpg /usr/local/include replacement - ---- - src/interfaces/ecpg/preproc/ecpg.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/interfaces/ecpg/preproc/ecpg.c b/src/interfaces/ecpg/preproc/ecpg.c -index e42d443..ac19813 100644 ---- a/src/interfaces/ecpg/preproc/ecpg.c -+++ b/src/interfaces/ecpg/preproc/ecpg.c -@@ -255,7 +255,7 @@ main(int argc, char *const argv[]) - } - - add_include_path("."); -- add_include_path("/usr/local/include"); -+ add_include_path("/opt/csw/include"); - get_include_path(my_exec_path, include_path); - add_include_path(include_path); - add_include_path("/usr/include"); --- -1.7.6.1 - Deleted: csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch 2011-12-30 15:15:25 UTC (rev 16625) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch 2011-12-30 17:29:31 UTC (rev 16626) @@ -1,42 +0,0 @@ -From 8ea189fd88c2e2fb0c0d5df0e9addcd07b7a637d Mon Sep 17 00:00:00 2001 -From: Rafael Ostertag -Date: Sun, 18 Dec 2011 22:09:16 +0100 -Subject: [PATCH] Run tests in /var/tmp/pgsql/tmp_check - ---- - src/test/regress/GNUmakefile | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile -index 83b02cb..85884ee 100644 ---- a/src/test/regress/GNUmakefile -+++ b/src/test/regress/GNUmakefile -@@ -141,7 +141,8 @@ tablespace-setup: - pg_regress_call = ./pg_regress --inputdir=$(srcdir) --dlpath=. --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE) - - check: all -- $(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF) -+ install -d /var/tmp/pgsql/tmp_check -+ $(pg_regress_call) --temp-install=/var/tmp/pgsql/tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF) - - installcheck: all - $(pg_regress_call) --psqldir="$(PSQLDIR)" --schedule=$(srcdir)/serial_schedule -@@ -160,7 +161,7 @@ bigtest: all - $(pg_regress_call) --psqldir="$(PSQLDIR)" --schedule=$(srcdir)/serial_schedule numeric_big - - bigcheck: all -- $(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) numeric_big -+ $(pg_regress_call) --temp-install=/var/tmp/pgsql/tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) numeric_big - - - ## -@@ -173,5 +174,5 @@ clean distclean maintainer-clean: clean-lib - # things created by various check targets - rm -f $(output_files) $(input_files) - rm -rf testtablespace -- rm -rf results tmp_check log -+ rm -rf results /var/tmp/pgsql/tmp_check log - rm -f regression.diffs regression.out regress.out run_check.out --- -1.7.6.1 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sat Dec 31 00:31:10 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Fri, 30 Dec 2011 23:31:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[16627] csw/mgar/pkg/postgresql/branches/postgresql-9. 0-raos/Makefile Message-ID: Revision: 16627 http://gar.svn.sourceforge.net/gar/?rev=16627&view=rev Author: guengel Date: 2011-12-30 23:31:09 +0000 (Fri, 30 Dec 2011) Log Message: ----------- postgresql/branches/postgresql-9.0-raos: Removed unused CHECKPG_OVERRIDES. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/Makefile Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/Makefile 2011-12-30 17:29:31 UTC (rev 16626) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/Makefile 2011-12-30 23:31:09 UTC (rev 16627) @@ -1,5 +1,3 @@ -# Copyright 2009 OpenCSW -# Distributed under the terms of the GNU General Public License v2 # $Id$ # # Note 1 @@ -274,9 +272,6 @@ RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibxslt1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibgssapi-krb5-2 -CHECKPKG_OVERRIDES_CSW$(NAME)$(BASE_VERSION_NODOT)-server = $(foreach n,$(SO_NAMES_SERVER), soname-not-part-of-filename|soname=lib$(n).0|filename=$(n) ) -# This one isn't covered by the above. -CHECKPKG_OVERRIDES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += soname-not-part-of-filename|soname=libplpgsql.so.1|filename=plpgsql.so #ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-server = $(foreach i,$(NEEDED_ISAS), server_$(i)) PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-client @@ -314,8 +309,6 @@ RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibgssapi-krb5-2 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibreadline6 -# This will produce some 'unused overrides'. -CHECKPKG_OVERRIDES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = $(foreach n,$(SO_NAMES_CONTRIB), soname-not-part-of-filename|soname=lib$(n).0|filename=$(n) ) #ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = $(foreach i,$(NEEDED_ISAS), contrib_$(i)) PACKAGES += CSW$(NAME)-dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Dec 31 05:23:52 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 31 Dec 2011 04:23:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[16628] csw/mgar/pkg/git/trunk Message-ID: Revision: 16628 http://gar.svn.sourceforge.net/gar/?rev=16628&view=rev Author: bdwalton Date: 2011-12-31 04:23:51 +0000 (Sat, 31 Dec 2011) Log Message: ----------- git/trunk: disable svn tests for now; patch around sed portability issue Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/git/trunk/files/0007-Use-perl-instead-of-sed-for-t8006-blame-textconv-tes.patch Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2011-12-30 23:31:09 UTC (rev 16627) +++ csw/mgar/pkg/git/trunk/Makefile 2011-12-31 04:23:51 UTC (rev 16628) @@ -5,6 +5,9 @@ VENDOR_URL = http://git-scm.org/ +NO_SVN_TESTS=YesPlease +EXTRA_TEST_EXPORTS = NO_SVN_TESTS + # disable tests until next version bump (at the top so it stands out) # 1.7.2.1 and 1.7.3 have a failure on current9s when fr.UFT-8 is # detected as the first available utf8 locale. the failure is @@ -107,6 +110,7 @@ # to the selection of available utf8 locales. PATCHFILES_isa-sparcv8 += 0005-Force-en_US.UTF-8-for-a-git-svn-test.patch PATCHFILES += 0006-Patch-out-a-few-usr-share-references.patch +PATCHFILES += 0007-Use-perl-instead-of-sed-for-t8006-blame-textconv-tes.patch fdirs = $(bindir_install) $(mandir) $(libexecdir_install) define _git_files Added: csw/mgar/pkg/git/trunk/files/0007-Use-perl-instead-of-sed-for-t8006-blame-textconv-tes.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/0007-Use-perl-instead-of-sed-for-t8006-blame-textconv-tes.patch (rev 0) +++ csw/mgar/pkg/git/trunk/files/0007-Use-perl-instead-of-sed-for-t8006-blame-textconv-tes.patch 2011-12-31 04:23:51 UTC (rev 16628) @@ -0,0 +1,39 @@ +From 146a5f084306992e70bc31d93d110fa2b9192160 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Sat, 31 Dec 2011 05:02:05 +0100 +Subject: [PATCH] Use perl instead of sed for t8006-blame-textconv test + +In test 'blame --textconv with local changes' of t8006-blame-textconv, +using /usr/xpg4/bin/sed (as set by SANE_TOOL_PATH), an additional newline +was added to the output from the 'helper' script. + +This was noted by sed with a message such as: +sed: Missing newline at end of file zero.bin. + +In turn, this was triggering a fatal error from git blame: +fatal: unable to read files to diff + +To work around this difference in sed behaviour, use perl -p instead of +sed -e as it will not insert the newline. + +Signed-off-by: Ben Walton +--- + t/t8006-blame-textconv.sh | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/t/t8006-blame-textconv.sh b/t/t8006-blame-textconv.sh +index 4ee42f1..c3c22f7 100755 +--- a/t/t8006-blame-textconv.sh ++++ b/t/t8006-blame-textconv.sh +@@ -10,7 +10,7 @@ find_blame() { + cat >helper <<'EOF' + #!/bin/sh + grep -q '^bin: ' "$1" || { echo "E: $1 is not \"binary\" file" 1>&2; exit 1; } +-sed 's/^bin: /converted: /' "$1" ++perl -p -e 's/^bin: /converted: /' "$1" + EOF + chmod +x helper + +-- +1.7.6.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sat Dec 31 12:04:47 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 31 Dec 2011 11:04:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[16629] csw/mgar/pkg/postgresql/branches Message-ID: Revision: 16629 http://gar.svn.sourceforge.net/gar/?rev=16629&view=rev Author: guengel Date: 2011-12-31 11:04:47 +0000 (Sat, 31 Dec 2011) Log Message: ----------- postgresql/branches/postgresql-9.1-raos: Branched to version 9.1. Took new extension management into account. man5 now goes into doc. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/Makefile csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/checksums csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/files/0000-Run-tests-in-var-tmp-pgsql-tmp_check.patch Added Paths: ----------- csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/ Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/Makefile 2011-12-30 17:29:31 UTC (rev 16626) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/Makefile 2011-12-31 11:04:47 UTC (rev 16629) @@ -88,10 +88,10 @@ NAME = postgresql -BASE_VERSION = 9.0 +BASE_VERSION = 9.1 VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION)) -PATCHLEVEL = 6 +PATCHLEVEL = 2 VERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = apps @@ -120,8 +120,8 @@ # 8.4 has removed ipcclean BIN_NAMES_SERVER = initdb pg_controldata pg_ctl pg_resetxlog postmaster postgres BIN_NAMES_DEVEL = ecpg pg_config -BIN_NAMES_CLIENT = clusterdb createdb createlang createuser dropdb droplang dropuser pg_dump pg_dumpall pg_restore psql reindexdb vacuumdb -BIN_NAMES_CONTRIB = oid2name pgbench pg_standby vacuumlo pg_upgrade pg_archivecleanup +BIN_NAMES_CLIENT = clusterdb createdb createlang createuser dropdb droplang dropuser pg_dump pg_dumpall pg_restore psql reindexdb vacuumdb pg_basebackup clusterdb +BIN_NAMES_CONTRIB = oid2name pgbench pg_standby vacuumlo pg_upgrade pg_archivecleanup pg_test_fsync # These are shared objects used by the server. Please note, contrib installs # also shared object in the same place, so make sure you don't mix up things SO_NAMES_SERVER = ascii_and_mic.so cyrillic_and_mic.so dict_snowball.so euc_cn_and_mic.so @@ -133,6 +133,10 @@ SO_NAMES_SERVER += utf8_and_johab.so utf8_and_sjis.so utf8_and_uhc.so utf8_and_win.so # This has been introduced with 9.0 SO_NAMES_SERVER += libpqwalreceiver.so +# Those are the extension provided by the server. +# +# This has been introduced with 9.1 +EXT_NAMES_SERVER = plpgsql--1.0.sql plpgsql--unpackaged--1.0.sql plpgsql.control # These are shared object used by contrib. Please note, the server installs # also shared object in the same place, so make sure you don't mix up things SO_NAMES_CONTRIB = _int.so adminpack.so autoinc.so btree_gist.so chkpass.so passwordcheck.so @@ -141,7 +145,49 @@ SO_NAMES_CONTRIB += isn.so lo.so ltree.so moddatetime.so pageinspect.so pg_buffercache.so SO_NAMES_CONTRIB += pg_freespacemap.so pg_trgm.so pgcrypto.so pgrowlocks.so pgstattuple.so SO_NAMES_CONTRIB += pgxml.so refint.so seg.so sslinfo.so tablefunc.so test_parser.so timetravel.so tsearch2.so -SO_NAMES_CONTRIB += auto_explain.so btree_gin.so citext.so pg_stat_statements.so unaccent.so +SO_NAMES_CONTRIB += auto_explain.so btree_gin.so citext.so pg_stat_statements.so unaccent.so dummy_seclabel.so +SO_NAMES_CONTRIB += auth_delay.so file_fdw.so +# Those are the extension provided by contrib. +# +# This has been introduced with 9.1 +EXT_NAMES_CONTRIB = adminpack--1.0.sql adminpack.control +EXT_NAMES_CONTRIB += autoinc--1.0.sql autoinc.control autoinc--unpackaged--1.0.sql +EXT_NAMES_CONTRIB += btree_gin--1.0.sql btree_gin.control btree_gin--unpackaged--1.0.sql +EXT_NAMES_CONTRIB += btree_gist--1.0.sql btree_gist.control btree_gist--unpackaged--1.0.sql +EXT_NAMES_CONTRIB += chkpass--1.0.sql chkpass.control chkpass--unpackaged--1.0.sql +EXT_NAMES_CONTRIB += citext--1.0.sql citext.control citext--unpackaged--1.0.sql +EXT_NAMES_CONTRIB += cube--1.0.sql cube.control cube--unpackaged--1.0.sql +EXT_NAMES_CONTRIB += dblink--1.0.sql dblink.control dblink--unpackaged--1.0.sql +EXT_NAMES_CONTRIB += dict_int--1.0.sql dict_int.control dict_int--unpackaged--1.0.sql +EXT_NAMES_CONTRIB += dict_xsyn--1.0.sql dict_xsyn.control dict_xsyn--unpackaged--1.0.sql +EXT_NAMES_CONTRIB += earthdistance--1.0.sql earthdistance.control earthdistance--unpackaged--1.0.sql +EXT_NAMES_CONTRIB += file_fdw--1.0.sql file_fdw.control +EXT_NAMES_CONTRIB += fuzzystrmatch--1.0.sql fuzzystrmatch.control fuzzystrmatch--unpackaged--1.0.sql +EXT_NAMES_CONTRIB += hstore--1.0.sql hstore.control hstore--unpackaged--1.0.sql +EXT_NAMES_CONTRIB += insert_username--1.0.sql insert_username.control insert_username--unpackaged--1.0.sql +EXT_NAMES_CONTRIB += intagg--1.0.sql intagg.control intagg--unpackaged--1.0.sql +EXT_NAMES_CONTRIB += intarray--1.0.sql intarray.control intarray--unpackaged--1.0.sql +EXT_NAMES_CONTRIB += isn--1.0.sql isn.control isn--unpackaged--1.0.sql +EXT_NAMES_CONTRIB += lo--1.0.sql lo.control lo--unpackaged--1.0.sql +EXT_NAMES_CONTRIB += ltree--1.0.sql ltree.control ltree--unpackaged--1.0.sql +EXT_NAMES_CONTRIB += moddatetime--1.0.sql moddatetime.control moddatetime--unpackaged--1.0.sql +EXT_NAMES_CONTRIB += pageinspect--1.0.sql pageinspect.control pageinspect--unpackaged--1.0.sql +EXT_NAMES_CONTRIB += pg_buffercache--1.0.sql pg_buffercache.control pg_buffercache--unpackaged--1.0.sql +EXT_NAMES_CONTRIB += pgcrypto--1.0.sql pgcrypto.control pgcrypto--unpackaged--1.0.sql +EXT_NAMES_CONTRIB += pg_freespacemap--1.0.sql pg_freespacemap.control pg_freespacemap--unpackaged--1.0.sql +EXT_NAMES_CONTRIB += pgrowlocks--1.0.sql pgrowlocks.control pgrowlocks--unpackaged--1.0.sql +EXT_NAMES_CONTRIB += pg_stat_statements--1.0.sql pg_stat_statements.control pg_stat_statements--unpackaged--1.0.sql +EXT_NAMES_CONTRIB += pgstattuple--1.0.sql pgstattuple.control pgstattuple--unpackaged--1.0.sql +EXT_NAMES_CONTRIB += pg_trgm--1.0.sql pg_trgm.control pg_trgm--unpackaged--1.0.sql +EXT_NAMES_CONTRIB += refint--1.0.sql refint.control refint--unpackaged--1.0.sql +EXT_NAMES_CONTRIB += seg--1.0.sql seg.control seg--unpackaged--1.0.sql +EXT_NAMES_CONTRIB += sslinfo--1.0.sql sslinfo.control sslinfo--unpackaged--1.0.sql +EXT_NAMES_CONTRIB += tablefunc--1.0.sql tablefunc.control tablefunc--unpackaged--1.0.sql +EXT_NAMES_CONTRIB += test_parser--1.0.sql test_parser.control test_parser--unpackaged--1.0.sql +EXT_NAMES_CONTRIB += timetravel--1.0.sql timetravel.control timetravel--unpackaged--1.0.sql +EXT_NAMES_CONTRIB += tsearch2--1.0.sql tsearch2.control tsearch2--unpackaged--1.0.sql +EXT_NAMES_CONTRIB += unaccent--1.0.sql unaccent.control unaccent--unpackaged--1.0.sql +EXT_NAMES_CONTRIB += xml2--1.0.sql xml2.control xml2--unpackaged--1.0.sql # Miscellaneous files MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/conversion_create.sql MISC_NAMES_SERVER += .*/share/$(NAME)/$(BASE_VERSION_NODOT)/information_schema.sql @@ -256,6 +302,7 @@ PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server = $(foreach n,$(BIN_NAMES_SERVER),.*$(n)$$) PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += $(foreach n,$(BIN_NAMES_SERVER),.*/man1/$(n)-$(BASE_VERSION_NODOT)\.1$$) PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += $(foreach n,$(SO_NAMES_SERVER),.*/$(NAME)/$(BASE_VERSION_NODOT)/*$(n)$$) +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += $(foreach n,$(EXT_NAMES_SERVER),.*/$(NAME)/$(BASE_VERSION_NODOT)/extension/$(n)$$) PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += $(MISC_NAMES_SERVER) PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*/$(NAME)/$(BASE_VERSION_NODOT)/timezone(sets|)/.* PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*/$(NAME)/$(BASE_VERSION_NODOT)/tsearch_.*/.* @@ -274,9 +321,6 @@ RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibxslt1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibgssapi-krb5-2 -CHECKPKG_OVERRIDES_CSW$(NAME)$(BASE_VERSION_NODOT)-server = $(foreach n,$(SO_NAMES_SERVER), soname-not-part-of-filename|soname=lib$(n).0|filename=$(n) ) -# This one isn't covered by the above. -CHECKPKG_OVERRIDES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += soname-not-part-of-filename|soname=libplpgsql.so.1|filename=plpgsql.so #ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-server = $(foreach i,$(NEEDED_ISAS), server_$(i)) PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-client @@ -302,7 +346,11 @@ PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = $(foreach n,$(BIN_NAMES_CONTRIB),.*$(n)$$) PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += $(foreach n,$(BIN_NAMES_CONTRIB),.*/man1/$(n)-$(BASE_VERSION_NODOT)\.1$$) PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += $(foreach n,$(SO_NAMES_CONTRIB),.*/$(NAME)/$(BASE_VERSION_NODOT)/*$(n)$$) -PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*/$(NAME)/$(BASE_VERSION_NODOT)/contrib.* +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += $(foreach n,$(EXT_NAMES_CONTRIB),.*/$(NAME)/$(BASE_VERSION_NODOT)/extension/$(n)$$) +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*$(sharedstatedir)/$(NAME)/$(BASE_VERSION_NODOT)/extension/.* +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*$(docdir)/$(NAME)/$(BASE_VERSION_NODOT)/extension/.* +# This has been removed as of 9.1 +#PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*/$(NAME)/$(BASE_VERSION_NODOT)/contrib.* PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_contrib.* PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*/CSW$(NAME)$(BASE_VERSION_NODOT)-contrib.postmsg PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_contrib/README.CSW @@ -314,8 +362,6 @@ RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibgssapi-krb5-2 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibreadline6 -# This will produce some 'unused overrides'. -CHECKPKG_OVERRIDES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = $(foreach n,$(SO_NAMES_CONTRIB), soname-not-part-of-filename|soname=lib$(n).0|filename=$(n) ) #ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = $(foreach i,$(NEEDED_ISAS), contrib_$(i)) PACKAGES += CSW$(NAME)-dev @@ -323,8 +369,7 @@ PKGFILES_CSW$(NAME)-dev = .*/pgxs/.* PKGFILES_CSW$(NAME)-dev += $(PKGFILES_DEVEL) PKGFILES_CSW$(NAME)-dev += $(foreach n,$(BIN_NAMES_DEVEL),.*$(n)$$) -PKGFILES_CSW$(NAME)-dev += $(foreach n,$(BIN_NAMES_DEVEL),.*/man1/$(n)-$(BASE_VERSION_NODOT)\.1$$) -PKGFILES_CSW$(NAME)-dev += .*/man5/.* +PKGFILES_CSW$(NAME)-dev += $(foreach n,$(BIN_NAMES_DEVEL),.*/man1/$(n)\.1$$) # Alternatives for -dev have no version appended PKGFILES_CSW$(NAME)-dev += .*/alternatives/$(NAME)_dev.* PKGFILES_CSW$(NAME)-dev += .*/CSW$(NAME)-dev.postmsg @@ -349,8 +394,10 @@ PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-doc ARCHALL_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = 1 SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = PostgreSQL $(VERSION), Documentation Files -PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = .*/doc/$(NAME)/$(BASE_VERSION_NODOT)/.*\.(html|css) +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = .*/doc/$(NAME)/$(BASE_VERSION_NODOT)/.*\.(html|css) +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-doc += .*/man5/.* + PACKAGES += CSWlibecpg-compat3 SPKG_DESC_CSWlibecpg-compat3 = PostgreSQL $(VERSION), libecpg_compat PKGFILES_CSWlibecpg-compat3 = $(call pkgfiles_lib,libecpg_compat.so.3) @@ -384,6 +431,9 @@ BUILD_DEP_PKGS += CSWlibz-dev BUILD_DEP_PKGS += CSWlibgnugetopt-dev +# See comment on the test-custom target. +TEST_SCRIPTS = custom + EXTRA_LD_OPTIONS = -R$(prefix)/lib/\$$ISALIST # Needed for thread safety check by configure LIBS = -lrt @@ -416,6 +466,13 @@ #SKIPTEST ?= 1 include gar/category.mk + +# If the check is not called from within the $(WORKSRC) dir, it +# fails... +test-custom: + cd $(WORKSRC) ; $(BUILD_ENV) gmake check + @$(MAKECOOKIE) + # This will generate the ALTERNATIVEs for the binaries in # $(libexecdir)/postgresql/XY. # @@ -487,10 +544,22 @@ $(foreach a,$(myALTERNATIVES), $(foreach i,$(NEEDED_ISAS), $(shell ginstall -d $(PKGROOT)$(sharedstatedir)/alternatives ; echo "$(ALTERNATIVE_$(a)_$(i))" > $(if $(subst dev,,$(a)),$(PKGROOT)$(sharedstatedir)/alternatives/$(NAME)$(BASE_VERSION_NODOT)_$(a)_$(i),$(PKGROOT)$(sharedstatedir)/alternatives/$(NAME)_$(a)_$(i)) ) ) ) # Create the PGDATA directory ginstall -d $(PKGROOT)$(PGDATA) -# Adjust the man page names for man1 - for f in $(PKGROOT)$(datadir)/man/man1/* ; do \ - f_no_suffix="`echo $$f | sed -e 's/.1$$//'`" ; \ - mv $$f $${f_no_suffix}-$(BASE_VERSION_NODOT).1 ; \ +# Adjust the man page names. + for i in 1 5 ; do \ + test -d $(PKGROOT)$(datadir)/man/man$$i || continue ; \ + for f in $(PKGROOT)$(datadir)/man/man$$i/* ; do \ + suffix="`echo $$f | awk 'BEGIN { FS="." } { print $$NF }'`" ; \ + f_no_suffix="`echo $$f | sed -e "s/\.$${suffix}$$//"`" ; \ + dont_move=0 ; \ + for d in $(BIN_NAMES_DEVEL) ; do \ + bname="`basename $${f_no_suffix}`" ; \ + if test "$${bname}" = "$$d" ; then \ + dont_move=1 ; \ + break ; \ + fi ; \ + done ; \ + test $${dont_move} -eq 0 && mv $$f $${f_no_suffix}-$(BASE_VERSION_NODOT).$${suffix} ; \ + done ;\ done # Change path names in documentation for f in $(PKGROOT)$(docdir)/$(NAME)/$(BASE_VERSION_NODOT)/html/*.html $(PKGROOT)$(mandir)/man1/*.1 $(PKGROOT)$(datadir)/$(NAME)/$(BASE_VERSION_NODOT)/*.sample ; do \ @@ -566,6 +635,14 @@ exit 1 ; \ fi ; \ done + for n in $(EXT_NAMES_SERVER) $(EXT_NAMES_CONTRIB) ; do \ + if [ -f $(PKGROOT)$(sharedstatedir)/$(NAME)/$(BASE_VERSION_NODOT)/extension/$$n ] ; then\ + : ; \ + else \ + echo "Extra extension defined $$n" ; \ + exit 1 ; \ + fi ; \ + done # Check if all binaries and libraries in the pkgroot are contained in # the respective recipe variables. for n in `gfind $(PKGROOT)$(PGBINDIR) -maxdepth 1 -type f` ; do \ @@ -573,7 +650,7 @@ if [ $$? -eq 0 ] ; then \ : ; \ else \ - echo "Binary `basename $$n` not defined" ; \ + echo "Binary `basename $$n` not defined in recipe" ; \ exit 1 ; \ fi ; \ done @@ -582,7 +659,16 @@ if [ $$? -eq 0 ] ; then \ : ; \ else \ - echo "Library `basename $$n` not defined" ; \ + echo "Library `basename $$n` not defined in recipe" ; \ exit 1 ; \ fi ; \ done + for n in `gfind $(PKGROOT)$(sharedstatedir)/$(NAME)/$(BASE_VERSION_NODOT)/extension -maxdepth 1 -type f` ; do \ + echo "$(EXT_NAMES_SERVER) $(EXT_NAMES_CONTRIB)" | grep `basename $$n` >/dev/null 2>&1 ; \ + if [ $$? -eq 0 ] ; then \ + : ; \ + else \ + echo "Extension `basename $$n` not defined in recipe" ; \ + exit 1 ; \ + fi ; \ + done Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/checksums =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/checksums 2011-12-30 17:29:31 UTC (rev 16626) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/checksums 2011-12-31 11:04:47 UTC (rev 16629) @@ -1 +1 @@ -4ad7e4fc31ef8b8a75a3e4243933963f postgresql-9.0.6.tar.bz2 +7dbff52221954c46595313eb7f92c3e0 postgresql-9.1.2.tar.bz2 Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/files/0000-Run-tests-in-var-tmp-pgsql-tmp_check.patch =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/0000-Run-tests-in-var-tmp-pgsql-tmp_check.patch 2011-12-30 17:29:31 UTC (rev 16626) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/files/0000-Run-tests-in-var-tmp-pgsql-tmp_check.patch 2011-12-31 11:04:47 UTC (rev 16629) @@ -1,43 +1,62 @@ -From 6087958b802424f91462b3a98cf75bc0d3471e09 Mon Sep 17 00:00:00 2001 +From 051eb505448cba2f98aa5926ef3bfe0eed50d74c Mon Sep 17 00:00:00 2001 From: Rafael Ostertag -Date: Fri, 30 Dec 2011 16:33:54 +0100 +Date: Fri, 30 Dec 2011 20:32:11 +0100 Subject: [PATCH] Run tests in /var/tmp/pgsql/tmp_check --- - src/test/regress/GNUmakefile | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) + src/Makefile.global.in | 4 ++-- + src/test/regress/GNUmakefile | 4 ++++ + 2 files changed, 6 insertions(+), 2 deletions(-) +diff --git a/src/Makefile.global.in b/src/Makefile.global.in +index 3bf658d..69523de 100644 +--- a/src/Makefile.global.in ++++ b/src/Makefile.global.in +@@ -438,10 +438,10 @@ endif + + pg_regress_locale_flags = $(if $(ENCODING),--encoding=$(ENCODING)) $(NOLOCALE) + +-pg_regress_check = $(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --temp-install=./tmp_check --top-builddir=$(top_builddir) $(pg_regress_locale_flags) ++pg_regress_check = $(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --temp-install=/var/tmp/pgsql/tmp_check --top-builddir=$(top_builddir) $(pg_regress_locale_flags) + pg_regress_installcheck = $(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --psqldir='$(PSQLDIR)' $(pg_regress_locale_flags) + +-pg_regress_clean_files = results/ regression.diffs regression.out tmp_check/ log/ ++pg_regress_clean_files = results/ regression.diffs regression.out /var/tmp/pgsql/tmp_check log/ + + + ########################################################################## diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile -index 31762b8..ffe0667 100644 +index 90aea6c..99c3905 100644 --- a/src/test/regress/GNUmakefile +++ b/src/test/regress/GNUmakefile -@@ -141,7 +141,8 @@ tablespace-setup: - pg_regress_call = ./pg_regress --inputdir=$(srcdir) --dlpath=. --multibyte=$(MULTIBYTE) $(NOLOCALE) +@@ -135,6 +135,7 @@ tablespace-setup: + REGRESS_OPTS = --dlpath=. - check: all -- $(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF) + check: all tablespace-setup + install -d /var/tmp/pgsql/tmp_check -+ $(pg_regress_call) --temp-install=/var/tmp/pgsql/tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF) + $(pg_regress_check) $(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF) $(EXTRA_TESTS) - installcheck: all - $(pg_regress_call) --psqldir="$(PSQLDIR)" --schedule=$(srcdir)/serial_schedule -@@ -162,7 +163,8 @@ bigtest: all - $(pg_regress_call) --psqldir="$(PSQLDIR)" --schedule=$(srcdir)/serial_schedule numeric_big + installcheck: all tablespace-setup +@@ -144,6 +145,7 @@ installcheck-parallel: all tablespace-setup + $(pg_regress_installcheck) $(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(EXTRA_TESTS) - bigcheck: all -- $(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) numeric_big + standbycheck: all + install -d /var/tmp/pgsql/tmp_check -+ $(pg_regress_call) --temp-install=/var/tmp/pgsql/tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) numeric_big + $(pg_regress_installcheck) $(REGRESS_OPTS) --schedule=$(srcdir)/standby_schedule --use-existing + # old interfaces follow... +@@ -153,9 +155,11 @@ runtest: installcheck + runtest-parallel: installcheck-parallel - ## -@@ -175,5 +177,5 @@ clean distclean maintainer-clean: clean-lib - # things created by various check targets - rm -f $(output_files) $(input_files) - rm -rf testtablespace -- rm -rf results tmp_check log -+ rm -rf results /var/tmp/pgsql/tmp_check log - rm -f regression.diffs regression.out regress.out run_check.out + bigtest: all tablespace-setup ++ install -d /var/tmp/pgsql/tmp_check + $(pg_regress_installcheck) $(REGRESS_OPTS) --schedule=$(srcdir)/serial_schedule numeric_big + + bigcheck: all tablespace-setup ++ install -d /var/tmp/pgsql/tmp_check + $(pg_regress_check) $(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) numeric_big + + -- 1.7.6.1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sat Dec 31 13:08:42 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 31 Dec 2011 12:08:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[16630] csw/mgar/pkg/postgresql/branches/postgresql-8. 3-raos/Makefile Message-ID: Revision: 16630 http://gar.svn.sourceforge.net/gar/?rev=16630&view=rev Author: guengel Date: 2011-12-31 12:08:41 +0000 (Sat, 31 Dec 2011) Log Message: ----------- postgresql/branches/postgresql-8.3-raos: Backported changes to -doc from 9.1 Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile 2011-12-31 11:04:47 UTC (rev 16629) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile 2011-12-31 12:08:41 UTC (rev 16630) @@ -319,8 +319,7 @@ PKGFILES_CSW$(NAME)-dev = .*/pgxs/.* PKGFILES_CSW$(NAME)-dev += $(PKGFILES_DEVEL) PKGFILES_CSW$(NAME)-dev += $(foreach n,$(BIN_NAMES_DEVEL),.*$(n)$$) -PKGFILES_CSW$(NAME)-dev += $(foreach n,$(BIN_NAMES_DEVEL),.*/man1/$(n)-$(BASE_VERSION_NODOT)\.1$$) -PKGFILES_CSW$(NAME)-dev += .*/man5/.* +PKGFILES_CSW$(NAME)-dev += $(foreach n,$(BIN_NAMES_DEVEL),.*/man1/$(n)\.1$$) # Alternatives for -dev have no version appended PKGFILES_CSW$(NAME)-dev += .*/alternatives/$(NAME)_dev.* PKGFILES_CSW$(NAME)-dev += .*/CSW$(NAME)-dev.postmsg @@ -346,6 +345,7 @@ ARCHALL_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = 1 SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = PostgreSQL $(VERSION), Documentation Files PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = .*/doc/$(NAME)/$(BASE_VERSION_NODOT)/.*\.(html|css) +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-doc += .*/man5/.* PACKAGES += CSWlibecpg-compat3 SPKG_DESC_CSWlibecpg-compat3 = PostgreSQL $(VERSION), libecpg_compat @@ -481,10 +481,22 @@ $(foreach a,$(myALTERNATIVES), $(foreach i,$(NEEDED_ISAS), $(shell ginstall -d $(PKGROOT)$(sharedstatedir)/alternatives ; echo "$(ALTERNATIVE_$(a)_$(i))" > $(if $(subst dev,,$(a)),$(PKGROOT)$(sharedstatedir)/alternatives/$(NAME)$(BASE_VERSION_NODOT)_$(a)_$(i),$(PKGROOT)$(sharedstatedir)/alternatives/$(NAME)_$(a)_$(i)) ) ) ) # Create the PGDATA directory ginstall -d $(PKGROOT)$(PGDATA) -# Adjust the man page names for man1 - for f in $(PKGROOT)$(datadir)/man/man1/* ; do \ - f_no_suffix="`echo $$f | sed -e 's/.1$$//'`" ; \ - mv $$f $${f_no_suffix}-$(BASE_VERSION_NODOT).1 ; \ +# Adjust the man page names. + for i in 1 5 ; do \ + test -d $(PKGROOT)$(datadir)/man/man$$i || continue ; \ + for f in $(PKGROOT)$(datadir)/man/man$$i/* ; do \ + suffix="`echo $$f | awk 'BEGIN { FS="." } { print $$NF }'`" ; \ + f_no_suffix="`echo $$f | sed -e "s/\.$${suffix}$$//"`" ; \ + dont_move=0 ; \ + for d in $(BIN_NAMES_DEVEL) ; do \ + bname="`basename $${f_no_suffix}`" ; \ + if test "$${bname}" = "$$d" ; then \ + dont_move=1 ; \ + break ; \ + fi ; \ + done ; \ + test $${dont_move} -eq 0 && mv $$f $${f_no_suffix}-$(BASE_VERSION_NODOT).$${suffix} ; \ + done ;\ done # Change path names in documentation for f in $(PKGROOT)$(docdir)/$(NAME)/$(BASE_VERSION_NODOT)/html/*.html $(PKGROOT)$(mandir)/man1/*.1 $(PKGROOT)$(datadir)/$(NAME)/$(BASE_VERSION_NODOT)/*.sample ; do \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sat Dec 31 13:39:40 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 31 Dec 2011 12:39:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[16631] csw/mgar/pkg/postgresql/branches/postgresql-8. 4-raos/Makefile Message-ID: Revision: 16631 http://gar.svn.sourceforge.net/gar/?rev=16631&view=rev Author: guengel Date: 2011-12-31 12:39:40 +0000 (Sat, 31 Dec 2011) Log Message: ----------- postgresql/branches/postgresql-8.4-raos: Backported changes to -doc from 9.1. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/Makefile Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/Makefile 2011-12-31 12:08:41 UTC (rev 16630) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/Makefile 2011-12-31 12:39:40 UTC (rev 16631) @@ -321,8 +321,7 @@ PKGFILES_CSW$(NAME)-dev = .*/pgxs/.* PKGFILES_CSW$(NAME)-dev += $(PKGFILES_DEVEL) PKGFILES_CSW$(NAME)-dev += $(foreach n,$(BIN_NAMES_DEVEL),.*$(n)$$) -PKGFILES_CSW$(NAME)-dev += $(foreach n,$(BIN_NAMES_DEVEL),.*/man1/$(n)-$(BASE_VERSION_NODOT)\.1$$) -PKGFILES_CSW$(NAME)-dev += .*/man5/.* +PKGFILES_CSW$(NAME)-dev += $(foreach n,$(BIN_NAMES_DEVEL),.*/man1/$(n)\.1$$) # Alternatives for -dev have no version appended PKGFILES_CSW$(NAME)-dev += .*/alternatives/$(NAME)_dev.* PKGFILES_CSW$(NAME)-dev += .*/CSW$(NAME)-dev.postmsg @@ -348,6 +347,7 @@ ARCHALL_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = 1 SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = PostgreSQL $(VERSION), Documentation Files PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = .*/doc/$(NAME)/$(BASE_VERSION_NODOT)/.*\.(html|css) +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-doc += .*/man5/.* PACKAGES += CSWlibecpg-compat3 SPKG_DESC_CSWlibecpg-compat3 = PostgreSQL $(VERSION), libecpg_compat @@ -483,10 +483,22 @@ $(foreach a,$(myALTERNATIVES), $(foreach i,$(NEEDED_ISAS), $(shell ginstall -d $(PKGROOT)$(sharedstatedir)/alternatives ; echo "$(ALTERNATIVE_$(a)_$(i))" > $(if $(subst dev,,$(a)),$(PKGROOT)$(sharedstatedir)/alternatives/$(NAME)$(BASE_VERSION_NODOT)_$(a)_$(i),$(PKGROOT)$(sharedstatedir)/alternatives/$(NAME)_$(a)_$(i)) ) ) ) # Create the PGDATA directory ginstall -d $(PKGROOT)$(PGDATA) -# Adjust the man page names for man1 - for f in $(PKGROOT)$(datadir)/man/man1/* ; do \ - f_no_suffix="`echo $$f | sed -e 's/.1$$//'`" ; \ - mv $$f $${f_no_suffix}-$(BASE_VERSION_NODOT).1 ; \ +# Adjust the man page names. + for i in 1 5 ; do \ + test -d $(PKGROOT)$(datadir)/man/man$$i || continue ; \ + for f in $(PKGROOT)$(datadir)/man/man$$i/* ; do \ + suffix="`echo $$f | awk 'BEGIN { FS="." } { print $$NF }'`" ; \ + f_no_suffix="`echo $$f | sed -e "s/\.$${suffix}$$//"`" ; \ + dont_move=0 ; \ + for d in $(BIN_NAMES_DEVEL) ; do \ + bname="`basename $${f_no_suffix}`" ; \ + if test "$${bname}" = "$$d" ; then \ + dont_move=1 ; \ + break ; \ + fi ; \ + done ; \ + test $${dont_move} -eq 0 && mv $$f $${f_no_suffix}-$(BASE_VERSION_NODOT).$${suffix} ; \ + done ;\ done # Change path names in documentation for f in $(PKGROOT)$(docdir)/$(NAME)/$(BASE_VERSION_NODOT)/html/*.html $(PKGROOT)$(mandir)/man1/*.1 $(PKGROOT)$(datadir)/$(NAME)/$(BASE_VERSION_NODOT)/*.sample ; do \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sat Dec 31 13:56:19 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 31 Dec 2011 12:56:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[16632] csw/mgar/pkg/postgresql/branches/postgresql-9. 1-raos/Makefile Message-ID: Revision: 16632 http://gar.svn.sourceforge.net/gar/?rev=16632&view=rev Author: guengel Date: 2011-12-31 12:56:19 +0000 (Sat, 31 Dec 2011) Log Message: ----------- postgresql/branches/postgresql-9.1-raos: Removed file clash of -server and -contrib. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/Makefile Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/Makefile 2011-12-31 12:39:40 UTC (rev 16631) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/Makefile 2011-12-31 12:56:19 UTC (rev 16632) @@ -347,7 +347,6 @@ PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += $(foreach n,$(BIN_NAMES_CONTRIB),.*/man1/$(n)-$(BASE_VERSION_NODOT)\.1$$) PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += $(foreach n,$(SO_NAMES_CONTRIB),.*/$(NAME)/$(BASE_VERSION_NODOT)/*$(n)$$) PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += $(foreach n,$(EXT_NAMES_CONTRIB),.*/$(NAME)/$(BASE_VERSION_NODOT)/extension/$(n)$$) -PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*$(sharedstatedir)/$(NAME)/$(BASE_VERSION_NODOT)/extension/.* PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*$(docdir)/$(NAME)/$(BASE_VERSION_NODOT)/extension/.* # This has been removed as of 9.1 #PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*/$(NAME)/$(BASE_VERSION_NODOT)/contrib.* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sat Dec 31 14:03:27 2011 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 31 Dec 2011 13:03:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[16633] csw/mgar/pkg/postgresql/branches/postgresql-9. 0-raos/Makefile Message-ID: Revision: 16633 http://gar.svn.sourceforge.net/gar/?rev=16633&view=rev Author: guengel Date: 2011-12-31 13:03:27 +0000 (Sat, 31 Dec 2011) Log Message: ----------- postgresql/branches/postgresql-9.0-raos: Backported changes to -doc from 9.1. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/Makefile Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/Makefile 2011-12-31 12:56:19 UTC (rev 16632) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/Makefile 2011-12-31 13:03:27 UTC (rev 16633) @@ -316,8 +316,7 @@ PKGFILES_CSW$(NAME)-dev = .*/pgxs/.* PKGFILES_CSW$(NAME)-dev += $(PKGFILES_DEVEL) PKGFILES_CSW$(NAME)-dev += $(foreach n,$(BIN_NAMES_DEVEL),.*$(n)$$) -PKGFILES_CSW$(NAME)-dev += $(foreach n,$(BIN_NAMES_DEVEL),.*/man1/$(n)-$(BASE_VERSION_NODOT)\.1$$) -PKGFILES_CSW$(NAME)-dev += .*/man5/.* +PKGFILES_CSW$(NAME)-dev += $(foreach n,$(BIN_NAMES_DEVEL),.*/man1/$(n)\.1$$) # Alternatives for -dev have no version appended PKGFILES_CSW$(NAME)-dev += .*/alternatives/$(NAME)_dev.* PKGFILES_CSW$(NAME)-dev += .*/CSW$(NAME)-dev.postmsg @@ -342,7 +341,8 @@ PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-doc ARCHALL_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = 1 SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = PostgreSQL $(VERSION), Documentation Files -PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = .*/doc/$(NAME)/$(BASE_VERSION_NODOT)/.*\.(html|css) +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = .*/doc/$(NAME)/$(BASE_VERSION_NODOT)/.*\.(html|css) +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-doc += .*/man5/.* PACKAGES += CSWlibecpg-compat3 SPKG_DESC_CSWlibecpg-compat3 = PostgreSQL $(VERSION), libecpg_compat @@ -480,10 +480,22 @@ $(foreach a,$(myALTERNATIVES), $(foreach i,$(NEEDED_ISAS), $(shell ginstall -d $(PKGROOT)$(sharedstatedir)/alternatives ; echo "$(ALTERNATIVE_$(a)_$(i))" > $(if $(subst dev,,$(a)),$(PKGROOT)$(sharedstatedir)/alternatives/$(NAME)$(BASE_VERSION_NODOT)_$(a)_$(i),$(PKGROOT)$(sharedstatedir)/alternatives/$(NAME)_$(a)_$(i)) ) ) ) # Create the PGDATA directory ginstall -d $(PKGROOT)$(PGDATA) -# Adjust the man page names for man1 - for f in $(PKGROOT)$(datadir)/man/man1/* ; do \ - f_no_suffix="`echo $$f | sed -e 's/.1$$//'`" ; \ - mv $$f $${f_no_suffix}-$(BASE_VERSION_NODOT).1 ; \ +# Adjust the man page names. + for i in 1 5 ; do \ + test -d $(PKGROOT)$(datadir)/man/man$$i || continue ; \ + for f in $(PKGROOT)$(datadir)/man/man$$i/* ; do \ + suffix="`echo $$f | awk 'BEGIN { FS="." } { print $$NF }'`" ; \ + f_no_suffix="`echo $$f | sed -e "s/\.$${suffix}$$//"`" ; \ + dont_move=0 ; \ + for d in $(BIN_NAMES_DEVEL) ; do \ + bname="`basename $${f_no_suffix}`" ; \ + if test "$${bname}" = "$$d" ; then \ + dont_move=1 ; \ + break ; \ + fi ; \ + done ; \ + test $${dont_move} -eq 0 && mv $$f $${f_no_suffix}-$(BASE_VERSION_NODOT).$${suffix} ; \ + done ;\ done # Change path names in documentation for f in $(PKGROOT)$(docdir)/$(NAME)/$(BASE_VERSION_NODOT)/html/*.html $(PKGROOT)$(mandir)/man1/*.1 $(PKGROOT)$(datadir)/$(NAME)/$(BASE_VERSION_NODOT)/*.sample ; do \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sat Dec 31 18:13:01 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 31 Dec 2011 17:13:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[16634] csw/mgar/pkg/pkgutil/trunk Message-ID: Revision: 16634 http://gar.svn.sourceforge.net/gar/?rev=16634&view=rev Author: bonivart Date: 2011-12-31 17:13:00 +0000 (Sat, 31 Dec 2011) Log Message: ----------- pkgutil/trunk: 2.6 final 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-12-31 13:03:27 UTC (rev 16633) +++ csw/mgar/pkg/pkgutil/trunk/Makefile 2011-12-31 17:13:00 UTC (rev 16634) @@ -1,5 +1,5 @@ NAME = pkgutil -VERSION = 2.6b1 +VERSION = 2.6 CATEGORIES = utils DESCRIPTION = Installs Solaris packages easily Modified: csw/mgar/pkg/pkgutil/trunk/checksums =================================================================== --- csw/mgar/pkg/pkgutil/trunk/checksums 2011-12-31 13:03:27 UTC (rev 16633) +++ csw/mgar/pkg/pkgutil/trunk/checksums 2011-12-31 17:13:00 UTC (rev 16634) @@ -1 +1 @@ -d5dcdac19a3e9cae017f8f64b2bdb9a2 pkgutil-2.6b1.zip +2ed2712aa0bed253ebe6a0b76e34fed0 pkgutil-2.6.zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Dec 31 23:14:45 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 31 Dec 2011 22:14:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[16635] csw/mgar/pkg/git/trunk/files/ 0006-Patch-out-a-few-usr-share-references.patch Message-ID: Revision: 16635 http://gar.svn.sourceforge.net/gar/?rev=16635&view=rev Author: bdwalton Date: 2011-12-31 22:14:45 +0000 (Sat, 31 Dec 2011) Log Message: ----------- git/trunk: update the path fixing patch Modified Paths: -------------- csw/mgar/pkg/git/trunk/files/0006-Patch-out-a-few-usr-share-references.patch Modified: csw/mgar/pkg/git/trunk/files/0006-Patch-out-a-few-usr-share-references.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/0006-Patch-out-a-few-usr-share-references.patch 2011-12-31 17:13:00 UTC (rev 16634) +++ csw/mgar/pkg/git/trunk/files/0006-Patch-out-a-few-usr-share-references.patch 2011-12-31 22:14:45 UTC (rev 16635) @@ -1,4 +1,4 @@ -From d2bae3e1637a0bf412c0223272bf402f66931f0b Mon Sep 17 00:00:00 2001 +From 2d0a70590d9f311dab3fbc47c98958a394daa561 Mon Sep 17 00:00:00 2001 From: Ben Walton Date: Mon, 31 Oct 2011 03:51:55 +0100 Subject: [PATCH] Patch out a few usr/share references @@ -8,9 +8,46 @@ Signed-off-by: Ben Walton --- + Documentation/gitweb.txt | 14 +++++++------- contrib/hooks/post-receive-email | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 2 files changed, 9 insertions(+), 9 deletions(-) +diff --git a/Documentation/gitweb.txt b/Documentation/gitweb.txt +index 605a085..dc90dce 100644 +--- a/Documentation/gitweb.txt ++++ b/Documentation/gitweb.txt +@@ -231,8 +231,8 @@ Unnamed repository; edit this file to name it for gitweb. + ------------------------------------------------------------------------------- + + + from the template during repository creation, usually installed in +-'/usr/share/git-core/templates/'. You can use the `gitweb.description` repo +-configuration variable, but the file takes precedence. ++'/opt/csw/share/git-core/templates/'. You can use the `gitweb.description` ++repo configuration variable, but the file takes precedence. + + category (or `gitweb.category`):: + Singe line category of a project, used to group projects if +@@ -456,15 +456,15 @@ Apache with FastCGI + ~~~~~~~~~~~~~~~~~~~ + Gitweb works with Apache and FastCGI. First you need to rename, copy + or symlink gitweb.cgi to gitweb.fcgi. Let's assume that gitweb is +-installed in '/usr/share/gitweb' directory. The following Apache ++installed in '/opt/csw/share/gitweb' directory. The following Apache + configuration is suitable (UNTESTED!) + + ----------------------------------------------------------------------- +-FastCgiServer /usr/share/gitweb/gitweb.cgi +-ScriptAlias /gitweb /usr/share/gitweb/gitweb.cgi ++FastCgiServer /opt/csw/share/gitweb/gitweb.cgi ++ScriptAlias /gitweb /opt/csw/share/gitweb/gitweb.cgi + +-Alias /gitweb/static /usr/share/gitweb/static +- ++Alias /gitweb/static /opt/csw/share/gitweb/static ++ + SetHandler default-handler + + ----------------------------------------------------------------------- diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email index e459cc3..0849265 100755 --- a/contrib/hooks/post-receive-email This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.